Fixed missing debug in IUSE, #364811; Fix build with USE=-gdbm, #247586

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 28 insertions, 22 deletions

diff --git a/dev-tcltk/thread/ChangeLog b/dev-tcltk/thread/ChangeLog
index 76e590a0537b..3596f27e016a 100644
--- a/dev-tcltk/thread/ChangeLog
+++ b/dev-tcltk/thread/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/thread
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/ChangeLog,v 1.17 2010/12/07 13:40:29 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/ChangeLog,v 1.18 2011/04/25 17:17:46 jlec Exp $
+
+  25 Apr 2011; Justin Lecher <jlec@gentoo.org> thread-2.6.2.ebuild,
+  thread-2.6.6.ebuild:
+  Fixed missing debug in IUSE, #364811; Fix build with USE=-gdbm, #247586
 
 *thread-2.6.6 (07 Dec 2010)
 
diff --git a/dev-tcltk/thread/Manifest b/dev-tcltk/thread/Manifest
index fdec940c1cf3..05af5452b3f8 100644
--- a/dev-tcltk/thread/Manifest
+++ b/dev-tcltk/thread/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST thread2.6.2.tar.gz 267344 RMD160 320988e4cd05c8166fb079b612607cf4b5adbcf4 SHA1 60fb5a385f39900a7d21a70d9d4c9f40feb098cc SHA256 7f7b6a10102989f55b57946837e965e307b3dddfc65ac50438422ce937dcff7c
 DIST thread2.6.6.tar.gz 281212 RMD160 ec874ee95f0f710ee2da346e5cb215114b7799aa SHA1 7cda8a9c18df8a14d27739e858a21991e48b2e61 SHA256 d8fbfab2bed21d4c43bb0eb6d17b095378849e5a2e1a748b1b3d02e75b5aeb29
-EBUILD thread-2.6.2.ebuild 1162 RMD160 66acddb8f63e28b896f947152b3159ed893cb3f3 SHA1 bf791ae5551ce14c6ff57e3f32ed85b674946e40 SHA256 d6e50ff8b48e339cdbbdd836e05b1ab87b8688a8f3ddcddf6e610ecdc62ebe0c
-EBUILD thread-2.6.6.ebuild 1111 RMD160 7fad713bb94fd3e049449da8b9ff5d55d9ac3b77 SHA1 1759cc5c737af5a575814c6a905e4d1e2d00e70b SHA256 4dc27212832417cf8799b3f9e32e1ba746c6b3ff9f919da2b61d80f627bf5d6e
-MISC ChangeLog 2135 RMD160 96464dca6bd1fe6d12157a2ccbbfe32258a41105 SHA1 9502d7678aa436b1034a3b1751456e56929fc27e SHA256 563f4a20860169c5bcf99abed69516403b41fcedc473acf587a5849440496259
+EBUILD thread-2.6.2.ebuild 1163 RMD160 7d5f819c96fcd31723fbd2f825049aaa0a5dac90 SHA1 6cadf8ae4fa92cdd7ebac0c09300fdb849c08426 SHA256 5c28db762026f39c9c36df61f1962f3324157e1724a279d6ec264c5ab42160fe
+EBUILD thread-2.6.6.ebuild 1174 RMD160 5a4d0a44336cae250e3c97c9ceff2232d8658174 SHA1 9e50e38cc5f882ac2127b8ea749a84afdae7d73d SHA256 73c478d91f8f6b2cfa8786b519cd5180e1ae345c912079297358ef0a627baa0e
+MISC ChangeLog 2301 RMD160 4a31b36715f61cd1e0a31056dca3378479f6a37a SHA1 6f591ad68d88fd5770aa37fd50ec82f7d55046bd SHA256 f6f884a1e4ccf583d5f4185a0d55618eb01bdc2981e0e1869d037eec673a99e2
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkz+OVUACgkQgAnW8HDreRb4BwCgv8gBLWEaazMbY0ZV5+zMYUcE
-P4oAoMoAwNRf7lpVuOUGdiMdN20xgK7q
-=1Gat
+iEYEARECAAYFAk21rMAACgkQgAnW8HDreRaq4wCaA57hwFrpHVM334HUFs3DrTHI
+tX0AoMrdLB6je9HKu/IUmQYn+tLCvBG4
+=4kaZ
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/thread/thread-2.6.2.ebuild b/dev-tcltk/thread/thread-2.6.2.ebuild
index 5765584c26ad..23b43ae5e8e7 100644
--- a/dev-tcltk/thread/thread-2.6.2.ebuild
+++ b/dev-tcltk/thread/thread-2.6.2.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-tcltk/thread/thread-2.6.2.ebuild,v 1.16 2010/12/07 13:40:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/thread-2.6.2.ebuild,v 1.17 2011/04/25 17:17:46 jlec Exp $
 
 EAPI=2
 
@@ -31,18 +31,17 @@ src_prepare() {
 
 	sed -i -e "s/relid'/relid/" tclconfig/tcl.m4
 
-	eaclocal
-	eautoconf
+	eautoreconf
 }
 
 src_configure() {
-	local use_gdbm=""
-	if use gdbm; then use_gdbm="--with-gdbm"; fi
+	local myconf=""
+	use gdbm && myconf+=" --with-gdbm"
+	use debug && myconf+=" --enable-symbols"
 	econf \
-		--with-threads \
 		--with-tclinclude=/usr/include \
 		--with-tcl="/usr/$(get_libdir)" \
-		${use_gdbm}
+		${myconf}
 }
 
 src_install() {
diff --git a/dev-tcltk/thread/thread-2.6.6.ebuild b/dev-tcltk/thread/thread-2.6.6.ebuild
index 38aac39f5daa..b6c8cee5a093 100644
--- a/dev-tcltk/thread/thread-2.6.6.ebuild
+++ b/dev-tcltk/thread/thread-2.6.6.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-tcltk/thread/thread-2.6.6.ebuild,v 1.1 2010/12/07 13:40:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/thread/thread-2.6.6.ebuild,v 1.2 2011/04/25 17:17:46 jlec Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="gdbm"
+IUSE="debug gdbm"
 
 DEPEND="
 	dev-lang/tcl[threads]
@@ -35,11 +35,14 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf=""
+	use gdbm && myconf+=" --with-gdbm"
+	use debug && myconf+=" --enable-symbols"
 	econf \
 		--with-tclinclude=/usr/include \
 		--with-tcl="/usr/$(get_libdir)" \
-		$(use_with gdbm) \
-		$(use_enable debug symbols)
+		${myconf}
+
 }
 
 src_install() {