Fix bug #116709

Package-Manager: portage-2.1.2.3

5 files changed, 35 insertions, 111 deletions

diff --git a/dev-tcltk/thread/ChangeLog b/dev-tcltk/thread/ChangeLog
index 7d72bd0b1fd0..b60235d78962 100644
--- a/dev-tcltk/thread/ChangeLog
+++ b/dev-tcltk/thread/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/thread
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/ChangeLog,v 1.5 2006/12/09 14:27:50 drizzt Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/ChangeLog,v 1.6 2007/04/07 10:26:01 jokey Exp $
+
+  07 Apr 2007; Markus Ullmann <jokey@gentoo.org> -thread-2.6.1.ebuild,
+  thread-2.6.2.ebuild:
+  Fix bug #116709
 
   09 Dec 2006; Timothy Redaelli <drizzt@gentoo.org> thread-2.6.2.ebuild:
   Add ~x86-fbsd keyword
diff --git a/dev-tcltk/thread/Manifest b/dev-tcltk/thread/Manifest
index ff12f55e6116..4d9cc6df3b97 100644
--- a/dev-tcltk/thread/Manifest
+++ b/dev-tcltk/thread/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST thread2.6.1.tar.gz 262963 RMD160 8aa69c7c5a52925c0d1d545ae078770268d50327 SHA1 5db3ea370b303d8404b2fe92076bfd86e9393430 SHA256 ba6d892c2f1145d25cacd54911465a8a12c933227c2cbebf029d0fab189301fc
 DIST thread2.6.2.tar.gz 267344 RMD160 320988e4cd05c8166fb079b612607cf4b5adbcf4 SHA1 60fb5a385f39900a7d21a70d9d4c9f40feb098cc SHA256 7f7b6a10102989f55b57946837e965e307b3dddfc65ac50438422ce937dcff7c
-EBUILD thread-2.6.1.ebuild 1362 RMD160 7716866d6800eb9ccfe93ecf69a7a375b4644098 SHA1 35c0b9cdbfe700b18055b2ff917280c360baf401 SHA256 af6f93589dc576c96761eeb0add0567fba8fb30f8db18813e1865333c27749dc
-MD5 0485e2ab2787a91f581d98d07cd85cf5 thread-2.6.1.ebuild 1362
-RMD160 7716866d6800eb9ccfe93ecf69a7a375b4644098 thread-2.6.1.ebuild 1362
-SHA256 af6f93589dc576c96761eeb0add0567fba8fb30f8db18813e1865333c27749dc thread-2.6.1.ebuild 1362
-EBUILD thread-2.6.2.ebuild 1439 RMD160 5adefc606dcb6be579bcc56f9b104517397beee6 SHA1 a23278d4299f2b18972b098e350e85e486035ef9 SHA256 864c27fdd30a4c0bffb56042560f14b0cf6f2d843e4743abcbdc196db2efeaf3
-MD5 dfe6facee824b9eccea3e505bbdee6a1 thread-2.6.2.ebuild 1439
-RMD160 5adefc606dcb6be579bcc56f9b104517397beee6 thread-2.6.2.ebuild 1439
-SHA256 864c27fdd30a4c0bffb56042560f14b0cf6f2d843e4743abcbdc196db2efeaf3 thread-2.6.2.ebuild 1439
-MISC ChangeLog 816 RMD160 69f8ff13be2d6edc3bcafe1d16bab9358ba8cfec SHA1 7d31678572c2483f95efd8af013f30a4edec758a SHA256 70ea041633982880625cb63edf26591dc998a158f4f2b6beca4ef1a33a0dc9a4
-MD5 82134f9edf168cfe03c3339c4387e41b ChangeLog 816
-RMD160 69f8ff13be2d6edc3bcafe1d16bab9358ba8cfec ChangeLog 816
-SHA256 70ea041633982880625cb63edf26591dc998a158f4f2b6beca4ef1a33a0dc9a4 ChangeLog 816
+EBUILD thread-2.6.2.ebuild 1356 RMD160 9c85ee705eed7b703a5e49548b8dd9d5b84dbb19 SHA1 110a6683e3d3aba886761b82a0415e4485c7d2e1 SHA256 47335b8eafff209e10fb7e681bed6548541b39a1a9e2ca398d292c7966f2233a
+MD5 c47d09a72a2cd6ad25a2563e6637c971 thread-2.6.2.ebuild 1356
+RMD160 9c85ee705eed7b703a5e49548b8dd9d5b84dbb19 thread-2.6.2.ebuild 1356
+SHA256 47335b8eafff209e10fb7e681bed6548541b39a1a9e2ca398d292c7966f2233a thread-2.6.2.ebuild 1356
+MISC ChangeLog 928 RMD160 3c7d6de57a35398f6e78eb5fcaf9a3ce7edb01a1 SHA1 2f2e475accadd1566d583ca6ebf7ac43150e0b88 SHA256 22344c8ac6a5dd4da7a312b37d925613e8c548ab3a4979ddd62dce8f31db9b18
+MD5 47d59cb762cf56609fff446725ce15a4 ChangeLog 928
+RMD160 3c7d6de57a35398f6e78eb5fcaf9a3ce7edb01a1 ChangeLog 928
+SHA256 22344c8ac6a5dd4da7a312b37d925613e8c548ab3a4979ddd62dce8f31db9b18 ChangeLog 928
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158
 RMD160 f197c34c7dd71f6025e93436e3f999137928554a metadata.xml 158
 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 metadata.xml 158
-MD5 e23f2a7e53d418f9c130afccae674d4d files/digest-thread-2.6.1 235
-RMD160 9eff30bee4c9e1b78667959826e02467e106325d files/digest-thread-2.6.1 235
-SHA256 abc64491d4684138d8c619e0eca8d2c11d0101d18a348c3282b1c68f73236ce1 files/digest-thread-2.6.1 235
 MD5 787a8e56ed1b1731f6f24a24b79eb00b files/digest-thread-2.6.2 235
 RMD160 68f63337f06dca5a8c453d7b28dd315f08fa49af files/digest-thread-2.6.2 235
 SHA256 30ceb8ae101085815d224bf8e785756d9e554e5825d36a00634f02699f11cc50 files/digest-thread-2.6.2 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFesfzGDyatLGpTbYRAkIVAJ4iQf8inidGR9ZN0lP9/0Jf22j3ggCfYoXY
-C2+4jKlNvQC+Xtt5glapoqY=
-=Slg0
------END PGP SIGNATURE-----
diff --git a/dev-tcltk/thread/files/digest-thread-2.6.1 b/dev-tcltk/thread/files/digest-thread-2.6.1
deleted file mode 100644
index b7a0ab6f82c4..000000000000
--- a/dev-tcltk/thread/files/digest-thread-2.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea680625659eb0a0afc354c7dadf3031 thread2.6.1.tar.gz 262963
-RMD160 8aa69c7c5a52925c0d1d545ae078770268d50327 thread2.6.1.tar.gz 262963
-SHA256 ba6d892c2f1145d25cacd54911465a8a12c933227c2cbebf029d0fab189301fc thread2.6.1.tar.gz 262963
diff --git a/dev-tcltk/thread/thread-2.6.1.ebuild b/dev-tcltk/thread/thread-2.6.1.ebuild
deleted file mode 100644
index c3b2e9c24c82..000000000000
--- a/dev-tcltk/thread/thread-2.6.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/thread-2.6.1.ebuild,v 1.3 2005/11/16 11:27:05 herbs Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="the Tcl Thread extension"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="gdbm"
-
-DEPEND="gdbm? ( sys-libs/gdbm )
-	>=dev-lang/tcl-8.4"
-
-S=${WORKDIR}/${PN}${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Search for libs in libdir not just exec_prefix/lib
-	sed -i -e 's:${exec_prefix}/lib:${libdir}:' \
-		aclocal.m4 || die "sed failed"
-	aclocal || die "aclocal failed"
-	autoconf || die "autoconf failed"
-}
-
-pkg_setup() {
-	if ! built_with_use dev-lang/tcl threads ; then
-		eerror "dev-lang/tcl was not merged with threading enabled."
-		eerror "please re-emerge dev-lang/tcl with USE=threads"
-		die "threading not enabled in dev-lang/tcl"
-	fi
-}
-
-src_compile() {
-	local myconf="--with-threads --with-tclinclude=/usr/include \
-			--with-tcl=/usr/$(get_libdir)"
-
-	if use gdbm ; then
-		myconf="${myconf} --with-gdbm"
-	fi
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog README
-}
diff --git a/dev-tcltk/thread/thread-2.6.2.ebuild b/dev-tcltk/thread/thread-2.6.2.ebuild
index 92c294000b6b..5cccb487aca2 100644
--- a/dev-tcltk/thread/thread-2.6.2.ebuild
+++ b/dev-tcltk/thread/thread-2.6.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/thread-2.6.2.ebuild,v 1.3 2006/12/09 14:27:50 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/thread-2.6.2.ebuild,v 1.4 2007/04/07 10:26:01 jokey Exp $
 
-inherit eutils multilib
+inherit autotools eutils multilib
 
 DESCRIPTION="the Tcl Thread extension"
 HOMEPAGE="http://www.tcl.tk/"
@@ -14,10 +14,18 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="gdbm"
 
 DEPEND="gdbm? ( sys-libs/gdbm )
-	>=dev-lang/tcl-8.4"
+	dev-lang/tcl"
 
 S=${WORKDIR}/${PN}${PV}
 
+pkg_setup() {
+	if ! built_with_use dev-lang/tcl threads ; then
+		eerror "dev-lang/tcl was not merged with threading enabled."
+		eerror "please re-emerge dev-lang/tcl with USE=threads"
+		die "threading not enabled in dev-lang/tcl"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -26,34 +34,22 @@ src_unpack() {
 	sed -i -e 's:${exec_prefix}/lib:${libdir}:' \
 		aclocal.m4 || die "sed failed"
 
-	sed -i -e "s/relid'/relid/" tclconfig/tcl.m4 || die
-
-	aclocal || die "aclocal failed"
-	autoconf || die "autoconf failed"
-}
+	sed -i -e "s/relid'/relid/" tclconfig/tcl.m4
 
-pkg_setup() {
-	if ! built_with_use dev-lang/tcl threads ; then
-		eerror "dev-lang/tcl was not merged with threading enabled."
-		eerror "please re-emerge dev-lang/tcl with USE=threads"
-		die "threading not enabled in dev-lang/tcl"
-	fi
+	eaclocal
+	eautoconf
 }
 
 src_compile() {
-	local myconf="--with-threads --with-tclinclude=/usr/include \
-			--with-tcl=/usr/$(get_libdir)"
-
-	if use gdbm ; then
-		myconf="${myconf} --with-gdbm"
-	fi
-
-	econf ${myconf} || die "econf failed"
+	econf \
+		--with-threads \
+		--with-tclinclude=/usr/include \
+		--with-tcl="/usr/$(get_libdir)" \
+		$(use_with gdbm) || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc ChangeLog README
 }