diff options
| -rw-r--r-- | dev-vcs/fossil/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-vcs/fossil/Manifest | 25 | ||||
| -rw-r--r-- | dev-vcs/fossil/files/20100318142033-gentoo.patch | 29 | ||||
| -rw-r--r-- | dev-vcs/fossil/fossil-20100918155143.ebuild | 39 | ||||
| -rw-r--r-- | dev-vcs/fossil/fossil-20101005035549.ebuild | 39 | ||||
| -rw-r--r-- | dev-vcs/fossil/fossil-20110301190432.ebuild (renamed from dev-vcs/fossil/fossil-20101101142335.ebuild) | 26 |
6 files changed, 41 insertions, 129 deletions
diff --git a/dev-vcs/fossil/ChangeLog b/dev-vcs/fossil/ChangeLog index 91d793906c92..7f2357ef4aca 100644 --- a/dev-vcs/fossil/ChangeLog +++ b/dev-vcs/fossil/ChangeLog @@ -1,6 +1,14 @@ # 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.7 2010/11/11 22:53:14 rafaelmartins Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/ChangeLog,v 1.8 2011/03/08 19:22:34 rafaelmartins Exp $ + +*fossil-20110301190432 (08 Mar 2011) + + 08 Mar 2011; Rafael G. Martins <rafaelmartins@gentoo.org> + -files/20100318142033-gentoo.patch, -fossil-20100918155143.ebuild, + -fossil-20101005035549.ebuild, -fossil-20101101142335.ebuild, + +fossil-20110301190432.ebuild: + Version bump. Clean up old versions. *fossil-20101111133638 (11 Nov 2010) diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest index 6323291d1054..47e1ebcada5a 100644 --- a/dev-vcs/fossil/Manifest +++ b/dev-vcs/fossil/Manifest @@ -1,12 +1,21 @@ -AUX 20100318142033-gentoo.patch 1220 RMD160 6737fa732f9762f3fb4c45103ea59203e8c12547 SHA1 55d3704b90b0060ec7d1da836d7431af1923c662 SHA256 56305ca990349208e03b7a8f07236c76228c2d63803f99008f4d134d55f05638 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 20101101142335-gentoo.patch 1390 RMD160 7c1f11aab69de1a7bf2b882433ec18fcdde2751c SHA1 510f0d0692a5a43507d2ed7609384bd4049a4c5c SHA256 544860177e24ffb03f4b770bf014d9d46d40046a401aff2f2b42be1abb65d7d0 -DIST fossil-src-20100918155143.tar.gz 1992373 RMD160 36a08b9c1e40518257f9dc1a07a4450e3d9aa536 SHA1 47e634488a2e73ee183792b37fe9c92db3bd229c SHA256 69bd3793097b32c3c27d9462f158d3f74f452622ca57470af50a6e9ee32b73f6 -DIST fossil-src-20101005035549.tar.gz 2019946 RMD160 281ce2d954fb7e2b7ef629d4d93532d2813e844c SHA1 3049d15e145a837fe40834b11f8d4b1640539a15 SHA256 6ba28be54bd503783b5074f404eceda900d04d2f2a2add4d5ad5edf457d4a791 -DIST fossil-src-20101101142335.tar.gz 2055516 RMD160 6a556e54ba149cfabcf36c5fb62091aaddd98c4e SHA1 f71a539ea7ce075f96c05d1c43b320704872387f SHA256 7081ae860605522395223fc1fcb4cefb4de8c30c63d65aed4903df5fdc172a89 DIST fossil-src-20101111133638.tar.gz 2063609 RMD160 14db9067fef56c57efd60e416a50c28bb0274708 SHA1 bec59879965e456100c84365ddc8fc83cd64b3c1 SHA256 bbd6115e901e963aad2d160935de656d9f302b0abef1297066da23f069aec89e -EBUILD fossil-20100918155143.ebuild 1017 RMD160 9322c2bc446e71a4431dd285f8b3c464c04f2ee3 SHA1 954d0b326a046902fb138fc6ac2dddc09db0566e SHA256 57ab127d03f4b01bd20e2387a85427859df4b64faf0018d08d9e1eaf0363e3e5 -EBUILD fossil-20101005035549.ebuild 1017 RMD160 bffee5c597a3db5dae276af2673b07945220752c SHA1 e8351dac8e43227028920e6e0f11792a03ae2690 SHA256 4cc399f7443b69d5465c1aedf1dabb63be9f12f32cd2ffb751b6ffe6ec296974 -EBUILD fossil-20101101142335.ebuild 985 RMD160 e935e66049b1cb95a2cc0ff651e620f15551cf60 SHA1 b0011d126f3d00f848e60fa732d4c7c64b4e945b SHA256 54126e787923f18831ba33c99833ceb43c5f882bbd5ad7c8ec82efcf00b47c4c +DIST fossil-src-20110301190432.tar.gz 2245573 RMD160 2da55edda4de5f439d0c93b22ad021caf1ac8b32 SHA1 4332f6369332e118633c9a7f896b5cd3fd275217 SHA256 68dc9bffdc607f95882eb1a59ba94553aafc3c994d547386d430f6ecb1636cb7 EBUILD fossil-20101111133638.ebuild 1017 RMD160 a4aee6f7d427090f8f9f8f45bbf50a6e47944a86 SHA1 672d6e008890d07a7f497c238bc3f575cd46c8cb SHA256 f301602c95add106a4be373ee9b7f90267e436968eee7da85fcb51bd76e0b73d -MISC ChangeLog 1665 RMD160 b7de31f18695a60fbbb21846dce51995c7b1d12c SHA1 bf788bf7aa84444ba16c5a28573e304836cc3f07 SHA256 eec5e39b7435f95bd8143e3f92092e70376963a65bc3f01b44354d4cac88c03b +EBUILD fossil-20110301190432.ebuild 1007 RMD160 a8df0fcd8fad24bebb57a5259802a7c9c2a02d9d SHA1 d9edf4988b139c79736bc6fa8cd04490a121a5f9 SHA256 1d776f02ee93fc63ed5133d621e1758dcfe8eb1dd4c978ef1eadf579f88e3bd7 +MISC ChangeLog 1969 RMD160 3c09dddab4dbcd106dd3925ac28ed15de0aea1be SHA1 ade1486695adf3b76d98c787036d2621ff61880e SHA256 342e820d2fa08a3b91bc05e7632fa01d7aecb5e4f125cb51fe5f06a70b65e308 MISC metadata.xml 262 RMD160 3601f495ef760e5b28828b76dc44ec5608107db2 SHA1 a267f79ce76d9f27d6ba6d85faa8ca1b7365aaf5 SHA256 e6eba1666401962385f1eeb0ea60c8be52de250ced41ad221352d7e189a7b269 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQEcBAEBAgAGBQJNdoIEAAoJEMmH5mwCk1NvtNIIAKJYRZJk0Tv+pXKMicYp+eGU +DkQnbXEVqGa5Si1FuQKK8xze6q1MiRFiwZrdTj0eXaJgB1Pmp5boQLbafQ8gIC49 +P4iXwdoWfhWgmof22m0C/KB05SRORa0pTDVNLko0LB3l44yaNNfVUCYQQg/PNiWg +bZ6enFJNyGbj9BvAoZmbZ0VRU22qIf3rKUM8GuhqZ1FGIFt0JvhDDtc/vAE9k5mn ++HrqQpb+zZyDiPlWfHk5tRnws7mmQMm9PBS3bh139OiJqIS50JpeMUxevELCHiUx +8ZlHcpoPIvG0+J2ZsHl1/qs0hagO1HFjzIdsemm/Dw/GZ2DBHgY1N9rISCWYisI= +=5Ya1 +-----END PGP SIGNATURE----- diff --git a/dev-vcs/fossil/files/20100318142033-gentoo.patch b/dev-vcs/fossil/files/20100318142033-gentoo.patch deleted file mode 100644 index 751327cf56c7..000000000000 --- a/dev-vcs/fossil/files/20100318142033-gentoo.patch +++ /dev/null @@ -1,29 +0,0 @@ -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-20100918155143.ebuild b/dev-vcs/fossil/fossil-20100918155143.ebuild deleted file mode 100644 index ec8ee9d2b87b..000000000000 --- a/dev-vcs/fossil/fossil-20100918155143.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# 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-20100918155143.ebuild,v 1.2 2010/10/20 05:31:21 rafaelmartins Exp $ - -EAPI="2" - -inherit eutils toolchain-funcs - -MY_P="${PN}-src-${PV}" -PATCH_PV="20100318142033" - -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-db/sqlite-3.7.0 - dev-libs/openssl - sys-libs/zlib" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/${PATCH_PV}-gentoo.patch" - sed -i \ - -e "/^TCC *=/s:=.*:=$(tc-getCC) -Wall \$(CFLAGS) \$(CPPFLAGS):" \ - -e "/^BCC/s:gcc:$(tc-getBUILD_CC):" \ - Makefile || die 'sed failed.' -} - -src_install() { - dobin fossil || die 'dobin failed.' - dodoc ci_cvs.txt ci_fossil.txt cvs2fossil.txt || die 'dodoc failed.' -} diff --git a/dev-vcs/fossil/fossil-20101005035549.ebuild b/dev-vcs/fossil/fossil-20101005035549.ebuild deleted file mode 100644 index 3b0de6d432b8..000000000000 --- a/dev-vcs/fossil/fossil-20101005035549.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# 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-20101005035549.ebuild,v 1.2 2010/10/20 05:31:21 rafaelmartins Exp $ - -EAPI="2" - -inherit eutils toolchain-funcs - -MY_P="${PN}-src-${PV}" -PATCH_PV="20100318142033" - -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-db/sqlite-3.7.0 - dev-libs/openssl - sys-libs/zlib" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/${PATCH_PV}-gentoo.patch" - sed -i \ - -e "/^TCC *=/s:=.*:=$(tc-getCC) -Wall \$(CFLAGS) \$(CPPFLAGS):" \ - -e "/^BCC/s:gcc:$(tc-getBUILD_CC):" \ - Makefile || die 'sed failed.' -} - -src_install() { - dobin fossil || die 'dobin failed.' - dodoc ci_cvs.txt ci_fossil.txt cvs2fossil.txt || die 'dodoc failed.' -} diff --git a/dev-vcs/fossil/fossil-20101101142335.ebuild b/dev-vcs/fossil/fossil-20110301190432.ebuild index d7dda6f8cdea..70399c9e36b6 100644 --- a/dev-vcs/fossil/fossil-20101101142335.ebuild +++ b/dev-vcs/fossil/fossil-20110301190432.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/fossil-20101101142335.ebuild,v 1.1 2010/11/02 06:34:58 rafaelmartins Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/fossil-20110301190432.ebuild,v 1.1 2011/03/08 19:22:34 rafaelmartins Exp $ EAPI="2" @@ -15,21 +15,23 @@ SRC_URI="http://www.fossil-scm.org/download/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="+ssl" -DEPEND=">=dev-db/sqlite-3.7.0 - dev-libs/openssl - sys-libs/zlib" +DEPEND="sys-libs/zlib + ssl? ( dev-libs/openssl )" 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 'sed failed.' +src_compile() { + local tcc lib + tcc="$(tc-getCC)" + lib="${LDFLAGS} -lz" + if use ssl; then + tcc="${tcc} -DFOSSIL_ENABLE_SSL" + lib="${lib} -lcrypto -lssl" + fi + emake TCC="${tcc}" BCC="$(tc-getBUILD_CC)" LIB="${lib}" || die 'emake failed.' } src_install() { |