Version Bump #319503; unbundle sqlite; link as-needed conform

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 82 insertions, 6 deletions

diff --git a/dev-vcs/fossil/ChangeLog b/dev-vcs/fossil/ChangeLog
index 1c6c6f006d1b..aa22726df4ba 100644
--- a/dev-vcs/fossil/ChangeLog
+++ b/dev-vcs/fossil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/fossil
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/ChangeLog,v 1.1 2010/05/07 18:44:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/ChangeLog,v 1.2 2010/05/19 07:52:44 jlec Exp $
+
+*fossil-20100318142033 (19 May 2010)
+
+  19 May 2010; Justin Lecher <jlec@gentoo.org>
+  +files/20100318142033-gentoo.patch, +fossil-20100318142033.ebuild:
+  Version Bump #319503; unbundle sqlite; link as-needed conform
 
   07 May 2010; Ulrich Mueller <ulm@gentoo.org>
   +fossil-20100124175507.ebuild, +metadata.xml:
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 003034b93ff3..93b3a53de5be 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 20100318142033-gentoo.patch 1220 RMD160 6737fa732f9762f3fb4c45103ea59203e8c12547 SHA1 55d3704b90b0060ec7d1da836d7431af1923c662 SHA256 56305ca990349208e03b7a8f07236c76228c2d63803f99008f4d134d55f05638
 DIST fossil-src-20100124175507.tar.gz 1841861 RMD160 a63abcfce6a166dda17c215f67ea2959a100e939 SHA1 7d0d043c764d6cc27ccdefc3965611f76072c12c SHA256 faf3a9ad9b2e46401eaf22f9f628bcad86143f1fe00981460ad14ebef74b4d02
+DIST fossil-src-20100318142033.tar.gz 1903035 RMD160 65de59211b79c75c13bbddf74ce934f3dd4ffd13 SHA1 51d64935bc9dba00beb506974cc9df1fafdd2e9a SHA256 bbd3aecba3acad269b3139c8edc28966fc2cad2ff9bd6413291be9949e4e6d9a
 EBUILD fossil-20100124175507.ebuild 824 RMD160 6b8b9b374e29225539adc5a9bdf00a10e400f118 SHA1 25fe99f3d507a12011ec210c650abe6de9449233 SHA256 0df4f6166111a0b429d2287bc4dc7e237e43a54d958e7c13abe4db15640d37ee
-MISC ChangeLog 501 RMD160 c27b98e3f1a87b6bd843ffe91c79de32b6038c43 SHA1 9670b8c79c7022a4fbe50a73912be5c7ecda7974 SHA256 57b104d01b94c48a96c3c7ba204c17ba2e5c819a113f81654e3352e4f4a45112
+EBUILD fossil-20100318142033.ebuild 907 RMD160 fcbb48165037587de39c9d9f5690087b8a555af0 SHA1 fe00c6b3b2fb33d2d811578cb4b1f18ac93e9e14 SHA256 e843b59f9c0c90656fac31163b1c9c36723eb20734298ae9f7542df8760c74ac
+MISC ChangeLog 721 RMD160 8f4acd928137cdd983a3d8c674331f8d547a4d00 SHA1 99002c24a57106d9536686f9fbc157778704ac09 SHA256 581b040a189ca301ece1cea649edbb1e646c88711745f09d1065f825cc93c405
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvkX7gACgkQOeoy/oIi7uxqhwCgjhKq4t8duT/SvQXA/u8uLEJr
-YkcAn11rSmjbx6TJIavNoRjWurVn5RF3
-=DcA5
+iEYEARECAAYFAkvzmNEACgkQgAnW8HDreRbKWwCgtbVPvrxPHP/RXrT8KbYk45L+
+EVsAnRljAg9LBNsqvSQiL6VzrcUkT8RG
+=7qZF
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/fossil/files/20100318142033-gentoo.patch b/dev-vcs/fossil/files/20100318142033-gentoo.patch
new file mode 100644
index 000000000000..751327cf56c7
--- /dev/null
+++ b/dev-vcs/fossil/files/20100318142033-gentoo.patch
@@ -0,0 +1,29 @@
+diff --git a/Makefile b/Makefile
+index 18d5ea5..962e295 100644
+--- a/Makefile
++++ b/Makefile
+@@ -40,7 +40,8 @@ TCC += -DFOSSIL_ENABLE_SSL
+ #    so that we can build a static executable that will run in a
+ #    chroot jail.
+ #
+-LIB = -lz $(LDFLAGS)
++
++LIB = -lz -lsqlite3
+ # If you're on OpenSolaris:
+ # LIB += lsocket
+ # Solaris 10 needs:
+diff --git a/src/main.mk b/src/main.mk
+index 470bedd..a8bbc38 100644
+--- a/src/main.mk
++++ b/src/main.mk
+@@ -266,8 +266,8 @@ VERSION.h:	$(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest
+ 	awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}'  $(SRCDIR)/../manifest.uuid >>VERSION.h
+ 	awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12)}'  $(SRCDIR)/../manifest >>VERSION.h
+ 
+-$(APPNAME):	headers $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
+-	$(TCC) -o $(APPNAME) $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(LIB)
++$(APPNAME):	headers $(OBJ) $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
++	$(TCC) $(LDFLAGS) -o $(APPNAME) $(OBJ) $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(LIB)
+ 
+ # This rule prevents make from using its default rules to try build
+ # an executable named "manifest" out of the file named "manifest.c"
diff --git a/dev-vcs/fossil/fossil-20100318142033.ebuild b/dev-vcs/fossil/fossil-20100318142033.ebuild
new file mode 100644
index 000000000000..1ae5e9ef8d9b
--- /dev/null
+++ b/dev-vcs/fossil/fossil-20100318142033.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/fossil-20100318142033.ebuild,v 1.1 2010/05/19 07:52:44 jlec Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_P="${PN}-src-${PV}"
+
+DESCRIPTION="simple, high-reliability, distributed software configuration management"
+HOMEPAGE="http://www.fossil-scm.org/"
+SRC_URI="http://www.fossil-scm.org/download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/openssl
+	sys-libs/zlib"
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	sed -i \
+		-e "/^TCC *=/s:=.*:=$(tc-getCC) -Wall \$(CFLAGS) \$(CPPFLAGS):" \
+		-e "/^BCC/s:gcc:$(tc-getBUILD_CC):" \
+		Makefile || die
+}
+
+src_install() {
+	dobin fossil || die
+	dodoc ci_cvs.txt ci_fossil.txt cvs2fossil.txt || die
+}