Clean out old versions. Version bump fixes bug 442412.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

6 files changed, 29 insertions, 121 deletions

diff --git a/dev-vcs/fossil/ChangeLog b/dev-vcs/fossil/ChangeLog
index add33bcb8424..80826b14f5d5 100644
--- a/dev-vcs/fossil/ChangeLog
+++ b/dev-vcs/fossil/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/fossil
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/ChangeLog,v 1.11 2012/03/04 20:29:37 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/ChangeLog,v 1.12 2012/11/13 01:41:23 titanofold Exp $
+
+*fossil-20121022124804 (13 Nov 2012)
+
+  13 Nov 2012; <titan@gentoo.org> -files/20101101142335-gentoo.patch,
+  -fossil-20101111133638.ebuild, -fossil-20110301190432.ebuild,
+  -fossil-20111021125253.ebuild, +fossil-20121022124804.ebuild:
+  Clean out old versions. Version bump fixes bug 442412.
 
 *fossil-20111213135356 (04 Mar 2012)
 
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index cc0e3c9e6ef2..6efcd81f209c 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,11 +1,16 @@
-AUX 20101101142335-gentoo.patch 1390 SHA256 544860177e24ffb03f4b770bf014d9d46d40046a401aff2f2b42be1abb65d7d0 SHA512 16afcdde7585b6773c7060203918a5b600e73d9723ddc963de22c42fc563f08f7f9c5f1e26d247a6306a033e5549525e2b2fdb054a785e7afe1a02c3d28d7c7b WHIRLPOOL 22b0767aa798b2da0a2c3f1fdcb245e12a31c9b20b5c86c9259e89813d30a913f5ababe890bf9a2fd0acc7545be1b8d1a9d00ed938d055750ce754cf30bebb23
-DIST fossil-src-20101111133638.tar.gz 2063609 SHA256 bbd6115e901e963aad2d160935de656d9f302b0abef1297066da23f069aec89e SHA512 81930e127b593b83752c75d25d9215f59d9772c43099e3f92215b39064ebd3ad06d7c6bab477eebaff600f134fe07ded91547f2e99286ec229b2663a75af6fae WHIRLPOOL 9c091fb51143f442e812cd38af19cd09af09eef6fcd18046b09f439f978219ed99dd81473f17492e7441012dfaa5fe9f2c983368a4aada0b6b90585a6c5dd982
-DIST fossil-src-20110301190432.tar.gz 2245573 SHA256 68dc9bffdc607f95882eb1a59ba94553aafc3c994d547386d430f6ecb1636cb7 SHA512 5178d7b489a9d8e5fe3b1438ea00b8d8780462f3ae2a5613b09c9fec072a60980ecffd675b0d16bf8b2d2bfd4eddabaf1c85b35996d5a1c65d30a4d1796ae9d7 WHIRLPOOL defaa03cbdd44ca6832d9c146c8ebd878271d85dab98fc9e75505c96b96ea75c902bf3dba8c61b56ff4a16a701e7fefece778c88b4de55307875bd2ddc6b105c
-DIST fossil-src-20111021125253.tar.gz 2590036 SHA256 636f201f236178ce9a3a9987ed43b0ce849021b2ae872ad71c5ee5780e9fe554 SHA512 0931976e7ef6f0244daa454fe0607cf459636696bf76a1d9865f2e4fd4107dbb0b59dbb38e170231798321b7684afc9d1993e2f6aaac0615eb905c718ca0f9b7 WHIRLPOOL 30319b0f1e8f10cde652a3da4d958b08c380335bf358d56b4740f0ccbacf4bfd18de1439910917a1d658ed569e74a8a93eb83a5bf4c7b38ed0daea60bdf62649
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST fossil-src-20111213135356.tar.gz 2765234 SHA256 c98556cd1fa6abc2e02aa38de1af425fa9ff09247e72f631c9ff6c239c46e71d SHA512 17975864f1247db2fe348a7787c1994f93a5d7534bd482ca8e621dac2ad08c6981050a6c1b29d71c8df74a279bf4c5ac7823cc5da1239243ac052ffb2b13d212 WHIRLPOOL 7841d3b43dcc220abd8958e16bea5ffa6da9d61ac4b2b527320ea16a965e73933926ff84af2a77d5a6ceed4ac474533349a59843d9f7ea3390eb879d7f5d19ce
-EBUILD fossil-20101111133638.ebuild 1017 SHA256 f301602c95add106a4be373ee9b7f90267e436968eee7da85fcb51bd76e0b73d SHA512 7c68a1d7b779ead0b0f9aad0be61b2d5d8a5066869fe52a99545aac929ae09c2335e2aa2a33cfb9802ba3b59fb8b4f449b61d413446445c27b66d9564405a6ae WHIRLPOOL 3fc18bdad27c791d581bbabdbb29a0f8632e69285cdeec4d33c8cca38abd4df7c6954edbeae553082c54e152c7b05bbb78f361a728c6938e110610fae6c66755
-EBUILD fossil-20110301190432.ebuild 1007 SHA256 1d776f02ee93fc63ed5133d621e1758dcfe8eb1dd4c978ef1eadf579f88e3bd7 SHA512 be675d33535ad48cc3403ffb405312590d0e999cde87d79089322826dcc9f9481f7570a54c1d8519ea7acfc86528e852a9bf33cf64446246ef61253326ad4290 WHIRLPOOL 55359fea16ccbc612acfa7a936391ad4a8bf4388dda3e9b32b0aeed50affe674bef44542b9ba4d2405d78e912ff244e57edb5b8f35ca7835ee13b1750b3ce4b6
-EBUILD fossil-20111021125253.ebuild 849 SHA256 384bc6419b1821b54a735e566319dada3844420d2dcf9338c9da56dc96ebe668 SHA512 57111a12a27f3b1a0ccfa432d2b71a61d5a7b630379b395f01521d02c10621fe84bfead7b43616d3674af00d5c6a00571244a3763f02108a2fa7f8a7c5da6e91 WHIRLPOOL 42668b216efb6b64eab36615069a46d06da333f880e0f27ed184393ee0d27495b4267e8e5d35679ec2448ece891969d9b3d8b0ebcb29c2d1bfc5ab35c5ea1810
+DIST fossil-src-20121022124804.tar.gz 2843987 SHA256 35a6bf235ae3d5615c1411587380030d3f16153bf7c0974eeb4c21335a669b3d SHA512 df9e4e72d6e2e9c82b341a004ef45a8d3b014fb6e14745e530ff23d1812c492c06307529d81d651861a874843c6c1a4c4166aef57816451d22d4f37f2d82c449 WHIRLPOOL d52bc001bec6bbf8231ca01b32431ea052aca23349c88b2a2723191b23464d3239349f845c3ea61e680e2d814066bf7cc25411dd9c77c90be9cf1380f4c9c255
 EBUILD fossil-20111213135356.ebuild 956 SHA256 9ad58783a8df80d819b80035602145ee602be49c7890dd33840f86d6bb6e9205 SHA512 4aed3bca32786b49c796c42308161e754e8a0a2195b0976dd1546db9dfb75616db6add207c53f8f2ff7a918207cd01bb0de39afed0a265429ecb1134afccd245 WHIRLPOOL cac7fc218311a7dfe3df80c344acacd50a83cd67606acdc021ee089b03a51e5bf506c33db06b64d605e2b66f613cf80ac4ad3bfa97abc2a7ebcac81a7003743d
-MISC ChangeLog 2394 SHA256 2716ed6d6e70bebd62b37fe2764a524270b2d4edef0483532592c73865b91026 SHA512 08d6fb10c5e534f7d82d7c979ec478c0c6eba8f7fd69ffa73fb55d3414bac85a1f3d60410df4708429a3c47fed618066ba7ffa467816941c2245068d575c3d23 WHIRLPOOL 7d5e5c2cfa37992900684083007271d49f818de9d2d6277bf1713adaf19015ee52ccaac8e6175e8b6895dae6c77a5b39eed484940563f5b4ecf36565b189cd5e
+EBUILD fossil-20121022124804.ebuild 956 SHA256 6e995df4998627424e5a0d536d4010b717c0eaf94581d646bd39bf7ed1b09d3b SHA512 62be16dfba0513b64c457e3467ae223d374d911691c2c6a3f7f39497e176118bbb570b01281851abaaeeefbe0133b95505dcb0b23fb276b22ac2c23afe6ac58b WHIRLPOOL c3c5b6dfd5912ae3d635c744b2c645b5162fa2567c162681e5a80094478075a2bac7cf350a3b424ace4404e530a1e36738f0396cad6654eb74d122f4bc4de315
+MISC ChangeLog 2688 SHA256 8de27e5da66998fbc14972ee8788d3e04fe0c792eedd65c571bf6c9977c59d02 SHA512 dc1c8bdb8eca0bf4991ab53bbd71799956f7b1c172c9ac6883cfd52bf8305324093b5131fa11b8d307f088443806f377bc0654b255251d42d2637d4b8cecffb4 WHIRLPOOL 20a23a70520088207a87fc755a62cf5a76204e880ecb7120af3af2a700ec827a470d2684c86f06d2d22e64ddaec64f53cb4363146cf22103d14564d3d82df7dd
 MISC metadata.xml 479 SHA256 2bcb75b33d8813034256df44d2d8b41691d306bc5a411b140659b08994b941bf SHA512 3a30dd02f4f95b0a7d8b12ca392cf14940017a71f0acddd383ef4fdcba91a73d51addffd899e208229039d90208b8ab6b7fe3eeaaa4babcc62e71e19bffb5130 WHIRLPOOL 7b08ada65dc82c349edd3a4d1fd593d95c4749b138058aeae581ea88763c4c0f7721c0d9dcd95e16105937f66d5ddfcc03745a76013fddfd6cff6a6450f2863d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlChpVoACgkQVxOqA9G7/aCSkAD+Papf/vQbTwpS4lfCGcl12HsS
+yQVB7xIi2fLgBdNcRbEA+wT7IizPMmXywlmp6EV8Je7a7MzEjDaZTSmFa3/J9/8X
+=YhpN
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/fossil/files/20101101142335-gentoo.patch b/dev-vcs/fossil/files/20101101142335-gentoo.patch
deleted file mode 100644
index 9af6ac0371d8..000000000000
--- a/dev-vcs/fossil/files/20101101142335-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -uNr fossil-src-20101101142335.orig/Makefile fossil-src-20101101142335/Makefile
---- fossil-src-20101101142335.orig/Makefile	2010-11-01 15:16:44.000000000 -0200
-+++ fossil-src-20101101142335/Makefile	2010-11-02 04:14:27.645206756 -0200
-@@ -42,7 +42,7 @@
- #    so that we can build a static executable that will run in a
- #    chroot jail.
- #
--LIB = -lz $(LDFLAGS)
-+LIB = -lz -lsqlite3
- 
- # If using HTTPS:
- LIB += -lcrypto -lssl
-diff -uNr fossil-src-20101101142335.orig/src/main.mk fossil-src-20101101142335/src/main.mk
---- fossil-src-20101101142335.orig/src/main.mk	2010-11-01 15:16:44.000000000 -0200
-+++ fossil-src-20101101142335/src/main.mk	2010-11-02 04:19:50.511128354 -0200
-@@ -266,10 +266,10 @@
- 	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
- 
--EXTRAOBJ =  $(OBJDIR)/sqlite3.o  $(OBJDIR)/shell.o  $(OBJDIR)/th.o  $(OBJDIR)/th_lang.o
-+EXTRAOBJ =  $(OBJDIR)/shell.o  $(OBJDIR)/th.o  $(OBJDIR)/th_lang.o
- 
- $(APPNAME):	headers $(OBJ) $(EXTRAOBJ)
--	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
-+	$(TCC) $(LDFLAGS) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(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-20101111133638.ebuild b/dev-vcs/fossil/fossil-20101111133638.ebuild
deleted file mode 100644
index aac852525da4..000000000000
--- a/dev-vcs/fossil/fossil-20101111133638.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-20101111133638.ebuild,v 1.1 2010/11/11 22:53:14 rafaelmartins Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-MY_P="${PN}-src-${PV}"
-PATCH_PV="20101101142335"
-
-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-20110301190432.ebuild b/dev-vcs/fossil/fossil-20110301190432.ebuild
deleted file mode 100644
index 70399c9e36b6..000000000000
--- a/dev-vcs/fossil/fossil-20110301190432.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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-20110301190432.ebuild,v 1.1 2011/03/08 19:22:34 rafaelmartins 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="+ssl"
-
-DEPEND="sys-libs/zlib
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-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() {
-	dobin fossil || die 'dobin failed.'
-	dodoc ci_cvs.txt ci_fossil.txt cvs2fossil.txt || die 'dodoc failed.'
-}
diff --git a/dev-vcs/fossil/fossil-20111021125253.ebuild b/dev-vcs/fossil/fossil-20121022124804.ebuild
index 3181ca5bc42b..4d1259bdbf51 100644
--- a/dev-vcs/fossil/fossil-20111021125253.ebuild
+++ b/dev-vcs/fossil/fossil-20121022124804.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/fossil-20111021125253.ebuild,v 1.1 2011/11/01 01:38:13 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/fossil-20121022124804.ebuild,v 1.1 2012/11/13 01:41:23 titanofold Exp $
 
 EAPI="4"
 
@@ -13,11 +13,12 @@ SRC_URI="http://www.fossil-scm.org/download/${MY_P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="sqlite +ssl"
+IUSE="sqlite +ssl tcl"
 
 DEPEND="sys-libs/zlib
 		ssl? ( dev-libs/openssl )
 		sqlite? ( dev-db/sqlite:3 )
+		tcl? ( dev-lang/tcl )
 "
 
 RDEPEND="${DEPEND}"
@@ -25,10 +26,12 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
-	local myconf=' --with-openssl='
+	# --with-tcl: works
+	# --without-tcl: dies
+	local myconf='--with-openssl='
 	use ssl    && myconf+='auto' || myconf+='none'
 	use sqlite && myconf+=' --disable-internal-sqlite'
-
+	use tcl    && myconf+=' --with-tcl'
 	econf ${myconf}
 }