tweaking a bit bug #17808

Package-Manager: portage-2.1.2_rc2-r3

5 files changed, 32 insertions, 36 deletions

diff --git a/dev-lang/gnu-smalltalk/ChangeLog b/dev-lang/gnu-smalltalk/ChangeLog
index 24f6e6ce279f..932e9d42e5b3 100644
--- a/dev-lang/gnu-smalltalk/ChangeLog
+++ b/dev-lang/gnu-smalltalk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/gnu-smalltalk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/ChangeLog,v 1.19 2006/11/29 15:47:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/ChangeLog,v 1.20 2006/12/01 10:38:55 araujo Exp $
+
+  01 Dec 2006; Luis F. Araujo <araujo@gentoo.org>
+  gnu-smalltalk-2.1.12.ebuild, gnu-smalltalk-2.2-r1.ebuild:
+  Tweaking a bit the tcltk -> tcl, tk use flag bug #17808
 
   29 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
   gnu-smalltalk-2.1.12.ebuild, gnu-smalltalk-2.2-r1.ebuild:
diff --git a/dev-lang/gnu-smalltalk/Manifest b/dev-lang/gnu-smalltalk/Manifest
index 371791318d17..bc63a4220cab 100644
--- a/dev-lang/gnu-smalltalk/Manifest
+++ b/dev-lang/gnu-smalltalk/Manifest
@@ -5,34 +5,34 @@ AUX 50gnu-smalltalk-gentoo.el 268 RMD160 a6d540fa013e0b687137642ef85e18898844162
 MD5 1b43b00217fd402ab0f309202f633e46 files/50gnu-smalltalk-gentoo.el 268
 RMD160 a6d540fa013e0b687137642ef85e188988441629 files/50gnu-smalltalk-gentoo.el 268
 SHA256 acfa1581fd8871a0a7ab610afbf678ecbfbe1b2c7b844316b96aebf43dd5b141 files/50gnu-smalltalk-gentoo.el 268
-DIST smalltalk-2.1.12.tar.gz 3336852
+DIST smalltalk-2.1.12.tar.gz 3336852 RMD160 2ede388e0ce5e463b00f24a23b3c9f423729f2fa SHA1 1945f1b622d8e533ccf4ee21117e33c9f76b1907 SHA256 4201a9803036c12b8e7d0432c418ee0f778f7e93130d36f4f4b6a3f68d3183a0
 DIST smalltalk-2.2.tar.gz 4187113 RMD160 ed517e0cf3ba4cbedfdfc7f9e59e9bf8dc59b790 SHA1 82e5c7d062878700d38913a34b85079efa1c22b7 SHA256 ca134253f45bf5e3f34113c8d2a677f7733c464e2c3d75316f05e1d1437541b0
-EBUILD gnu-smalltalk-2.1.12.ebuild 2182 RMD160 6a24a023652bf0eb33ca39b51496e6893573af6c SHA1 249dbf4a6f843b5877099154c968b2af1083743f SHA256 1bdf9fd10ba61ff6d7b21f485974927640af8d9abacea9e1c224a67645040d12
-MD5 7ef340c4d181809287a25e07ee098a44 gnu-smalltalk-2.1.12.ebuild 2182
-RMD160 6a24a023652bf0eb33ca39b51496e6893573af6c gnu-smalltalk-2.1.12.ebuild 2182
-SHA256 1bdf9fd10ba61ff6d7b21f485974927640af8d9abacea9e1c224a67645040d12 gnu-smalltalk-2.1.12.ebuild 2182
-EBUILD gnu-smalltalk-2.2-r1.ebuild 2331 RMD160 cab5e4cc79bdb4d22f28d8c68685bb2a2e22d09f SHA1 13ebfe5d9c2b409cc95235af75354dcd77ad46a7 SHA256 9687bcf05126bde66331a7b146f481c56a496562b9e8731d7fab937d09c9e9f0
-MD5 19966b064a21f7d8c44145928d3fa456 gnu-smalltalk-2.2-r1.ebuild 2331
-RMD160 cab5e4cc79bdb4d22f28d8c68685bb2a2e22d09f gnu-smalltalk-2.2-r1.ebuild 2331
-SHA256 9687bcf05126bde66331a7b146f481c56a496562b9e8731d7fab937d09c9e9f0 gnu-smalltalk-2.2-r1.ebuild 2331
-MISC ChangeLog 3576 RMD160 12ae943ec6104faeb646904bc27e3a2a8e3ace86 SHA1 f3725aff02e481cecf57036289c95a974aa90e3f SHA256 b69dd7a8e61e4a5ebe415d07d92a2a6709ec81c78b2b84c714a8f09d55f56dcc
-MD5 a7f1efc8464e38fdf68a7fe9c85858c3 ChangeLog 3576
-RMD160 12ae943ec6104faeb646904bc27e3a2a8e3ace86 ChangeLog 3576
-SHA256 b69dd7a8e61e4a5ebe415d07d92a2a6709ec81c78b2b84c714a8f09d55f56dcc ChangeLog 3576
+EBUILD gnu-smalltalk-2.1.12.ebuild 2115 RMD160 9e3238488799ab4b0d783cf51150c1605ec8f1ff SHA1 98b2016d0582d0d8b8871ae7d48aa020cd5ea2b5 SHA256 dc651a8fb4121ece0deff1f70a06982e3dd0c295957f6a2eecbc21e238fb7f73
+MD5 aff3b3ca9c08f81bc08e360c20742968 gnu-smalltalk-2.1.12.ebuild 2115
+RMD160 9e3238488799ab4b0d783cf51150c1605ec8f1ff gnu-smalltalk-2.1.12.ebuild 2115
+SHA256 dc651a8fb4121ece0deff1f70a06982e3dd0c295957f6a2eecbc21e238fb7f73 gnu-smalltalk-2.1.12.ebuild 2115
+EBUILD gnu-smalltalk-2.2-r1.ebuild 2264 RMD160 b2f42d5a46cc3ecec8e6482ca6fc86244bf6c4e7 SHA1 7bee0cb4fec7ed1a8324d891344c370ed271c227 SHA256 98e158805a8ec2ca3d66662fd02293adf9ca031cc8f2fe2296f9857941075a93
+MD5 4f99d294053451705b850adf68f0c15b gnu-smalltalk-2.2-r1.ebuild 2264
+RMD160 b2f42d5a46cc3ecec8e6482ca6fc86244bf6c4e7 gnu-smalltalk-2.2-r1.ebuild 2264
+SHA256 98e158805a8ec2ca3d66662fd02293adf9ca031cc8f2fe2296f9857941075a93 gnu-smalltalk-2.2-r1.ebuild 2264
+MISC ChangeLog 3746 RMD160 97c5fec8e8c4b182a947ecaf5505ab6cbdfb80c8 SHA1 1c06744da86406263b83ae1c66332f91e959179c SHA256 0f80ac8f6b1c776d7f6d9f79361c187be39ebfd691a607b7b39f02403a448146
+MD5 d53159200e592cab76f4dc5de3368823 ChangeLog 3746
+RMD160 97c5fec8e8c4b182a947ecaf5505ab6cbdfb80c8 ChangeLog 3746
+SHA256 0f80ac8f6b1c776d7f6d9f79361c187be39ebfd691a607b7b39f02403a448146 ChangeLog 3746
 MISC metadata.xml 630 RMD160 f51286089e8b1f0d99e5f00325337e58c1fe10b2 SHA1 be3f644621404755facf742dca21512ea4b3a20f SHA256 d8667ecc9a1b85b467360efa352f537768c01397a08db13c39b8368917de58cb
 MD5 54532d9cd3833e3c65d9136f3a1b6458 metadata.xml 630
 RMD160 f51286089e8b1f0d99e5f00325337e58c1fe10b2 metadata.xml 630
 SHA256 d8667ecc9a1b85b467360efa352f537768c01397a08db13c39b8368917de58cb metadata.xml 630
-MD5 4335632b4c5c11b3d8d38f821befc042 files/digest-gnu-smalltalk-2.1.12 69
-RMD160 548ea060b8654d0475ad899e7a8c0d6e8444bb70 files/digest-gnu-smalltalk-2.1.12 69
-SHA256 c54471ca531e97672380256978eadca0f8d005e2f3e1a65db5445204861b8496 files/digest-gnu-smalltalk-2.1.12 69
+MD5 ffeb3a7ff865beeca921c74249ee7d69 files/digest-gnu-smalltalk-2.1.12 253
+RMD160 a29ccb51322068344baa87a0a7eaecb5316e70e2 files/digest-gnu-smalltalk-2.1.12 253
+SHA256 44a6ca3e2d0937d9b0097aa23ace1913bb763e8b52a221690a28b6e84041a592 files/digest-gnu-smalltalk-2.1.12 253
 MD5 22a9649331410adddef155478d1aa38b files/digest-gnu-smalltalk-2.2-r1 244
 RMD160 0a4dd5afa2fcbfca7fdd833008c57c28dcc70597 files/digest-gnu-smalltalk-2.2-r1 244
 SHA256 47ef6d56bad23943ca4b256f46c3b15ef6632b84bea5fdda553e03aedd009320 files/digest-gnu-smalltalk-2.2-r1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFbavBNQqtfCuFneMRAjczAJwMsTEgCuq/sjOEutnfong04M7+BwCfW20W
-pcTAn4saAyqTSoOTdzujLWk=
-=iXF6
+iD8DBQFFcAYKaTNpke9pJcURApX0AJ9GOlUBSQLzqGqwTIOnQocIFDcdxQCcDjZB
+T6YPj81Xlhc5Hanefvbn1Co=
+=9Kms
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/gnu-smalltalk/files/digest-gnu-smalltalk-2.1.12 b/dev-lang/gnu-smalltalk/files/digest-gnu-smalltalk-2.1.12
index 276964978ea5..c6181b441016 100644
--- a/dev-lang/gnu-smalltalk/files/digest-gnu-smalltalk-2.1.12
+++ b/dev-lang/gnu-smalltalk/files/digest-gnu-smalltalk-2.1.12
@@ -1 +1,3 @@
 MD5 209219aea25b11d516256f24af97e5ad smalltalk-2.1.12.tar.gz 3336852
+RMD160 2ede388e0ce5e463b00f24a23b3c9f423729f2fa smalltalk-2.1.12.tar.gz 3336852
+SHA256 4201a9803036c12b8e7d0432c418ee0f778f7e93130d36f4f4b6a3f68d3183a0 smalltalk-2.1.12.tar.gz 3336852
diff --git a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild
index c369e05d674d..c4748ad51abf 100644
--- a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild
+++ b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild,v 1.5 2006/11/29 15:47:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild,v 1.6 2006/12/01 10:38:55 araujo Exp $
 
 inherit elisp-common flag-o-matic eutils toolchain-funcs
 
@@ -32,19 +32,14 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
-	if use tk; then
-		myconf="
-		`use_with tcltk tcl=/usr/lib` \
-		`use_with tcltk tk=/usr/lib`"
-	fi
 	replace-flags '-O3' '-O2'
 	./configure --prefix=/usr \
 		`use_with emacs emacs` \
 		`use_with readline readline` \
 		`use_with gmp gmp` \
+		`use_with tk tcl=/usr/lib` \
+		`use_with tk tk=/usr/lib` \
 		`use_enable gtk gtk` \
-		${myconf} \
 		|| die
 	emake || die "emake failed"
 	use emacs && elisp-compile *.el
diff --git a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-r1.ebuild b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-r1.ebuild
index 48fd922d73e7..01e8c5c5b05f 100644
--- a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-r1.ebuild
+++ b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-r1.ebuild,v 1.2 2006/11/29 15:47:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-r1.ebuild,v 1.3 2006/12/01 10:38:55 araujo Exp $
 
 inherit elisp-common flag-o-matic eutils toolchain-funcs
 
@@ -34,19 +34,14 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
-	if use tk; then
-		myconf="
-		`use_with tcltk tcl=/usr/lib` \
-		`use_with tcltk tk=/usr/lib`"
-	fi
 	replace-flags '-O3' '-O2'
 	./configure --prefix=/usr \
 		`use_with emacs emacs` \
 		`use_with readline readline` \
 		`use_with gmp gmp` \
+		`use_with tk tcl=/usr/lib` \
+		`use_with tk tk=/usr/lib` \
 		`use_enable gtk gtk` \
-		${myconf} \
 		|| die
 	emake || die "emake failed"
 	use emacs && elisp-compile *.el