Adjusted tcl/tk use flag(s) on 1.5.0 ebuild

Package-Manager: portage-2.1.2_pre2-r9

3 files changed, 26 insertions, 21 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 29b668be93b8..87f2e399c1f4 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.410 2006/10/13 12:23:41 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.411 2006/10/13 14:01:23 gothgirl Exp $
+
+  13 Oct 2006; gothgirl <gothgirl@gentoo.org> gaim-1.5.0.ebuild:
+  Adjusted tcl/tk use flags in 1.5.0
 
   13 Oct 2006; gothgirl <gothgirl@gentoo.org> -files/gaim-1.5.0-icq.patch,
   -files/gaim-2.0.0_beta3-icq.patch, gaim-1.5.0.ebuild,
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 929f989b3bdc..ef1ae97fc9fb 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -17,10 +17,10 @@ SHA256 b6a66176356011bdb62e419b03ec6b1e42498214dc3143f006cbeb25f48b87ce files/ga
 DIST gaim-1.5.0.tar.bz2 6123237 RMD160 13f74e2d2ed69a775a5884b807c365177455ae0e SHA1 a280d005f01be7fa89c9fa210efb86cc6a9eb9c7 SHA256 58e3b0340cfc9e54e46f8d8835e5a02e31201c9ed8820bbb4cea36c59b9682aa
 DIST gaim-2.0.0beta3.1.tar.bz2 5445059 RMD160 5987586fee212a5c5e9287a9dce55a35c30ea7b7 SHA1 5897cc8b89e0937645be21a0655a6ebb4fb3e626 SHA256 a282c56f32a37f7838c5332f182bdd920d4e80099b96313e503c6acc020931f4
 DIST gaim-2.0.0beta3.tar.bz2 8056708 RMD160 f7c7273ebb5149b5eb3b3759f4a1d756f68392c5 SHA1 e23363cdcf928d503c6fa583239537b409d10b84 SHA256 5ce3a0054b26e96cacb5471d0d3456fde00223cadc267a3e010155b6a2ffe710
-EBUILD gaim-1.5.0.ebuild 4190 RMD160 68625c8fcbd7191e80f741303840fbbd010ba3a9 SHA1 a4a5b5413e4450c5945c59a107dfcc28778e85ac SHA256 019cd2a6a2b62a2ae24f70173b3b0e7c0e14364ad5eaabbf144314aaec33d2cf
-MD5 8956382af48f7c8bc12561bc491ec1e5 gaim-1.5.0.ebuild 4190
-RMD160 68625c8fcbd7191e80f741303840fbbd010ba3a9 gaim-1.5.0.ebuild 4190
-SHA256 019cd2a6a2b62a2ae24f70173b3b0e7c0e14364ad5eaabbf144314aaec33d2cf gaim-1.5.0.ebuild 4190
+EBUILD gaim-1.5.0.ebuild 3992 RMD160 84b47bb03025f8d67db4b11732d0c5c9a6abe27a SHA1 86b37f2fcf7214666e2a1af0c820fcf699590b4b SHA256 457471149db4aa7f983378ca7bbb04b7769792a965a1426acbd4d90c09bb1816
+MD5 8701b6feb4abd22a0b0ca5605b4efc36 gaim-1.5.0.ebuild 3992
+RMD160 84b47bb03025f8d67db4b11732d0c5c9a6abe27a gaim-1.5.0.ebuild 3992
+SHA256 457471149db4aa7f983378ca7bbb04b7769792a965a1426acbd4d90c09bb1816 gaim-1.5.0.ebuild 3992
 EBUILD gaim-2.0.0_beta3-r1.ebuild 6437 RMD160 6614356288a2653f03d311e902ac412badffe35a SHA1 4bc0a91e6a22e4a46619e5dee2aafed91f3a5f46 SHA256 4ac16bbf145293d287e81c5f5db145027ddd4d5149fe0a7bcbc1dbca63544bdf
 MD5 e5c853f7c9290d69f320d35fd3b4153b gaim-2.0.0_beta3-r1.ebuild 6437
 RMD160 6614356288a2653f03d311e902ac412badffe35a gaim-2.0.0_beta3-r1.ebuild 6437
@@ -33,10 +33,10 @@ EBUILD gaim-2.0.0_beta3-r3.ebuild 6236 RMD160 8396d0f363b563dd0421472d441c79707a
 MD5 3de349eeb6d47724546abf64a61ac958 gaim-2.0.0_beta3-r3.ebuild 6236
 RMD160 8396d0f363b563dd0421472d441c79707a342abb gaim-2.0.0_beta3-r3.ebuild 6236
 SHA256 bc9b7866401ab920a2622f0ae57e492c6826daf0375e8a54e46f51d9549ce2fe gaim-2.0.0_beta3-r3.ebuild 6236
-MISC ChangeLog 59773 RMD160 23c5b4c932bfe997f82718c4157e31c0c8b76969 SHA1 bbed678ee2d738a8b7e63f7ab680c688f345a50c SHA256 2f533d6d98c509215e05247cfbe4e69de3df0b2a5e9cc2179695640f477dc127
-MD5 6cad6683d51f372c739f0232e155ef73 ChangeLog 59773
-RMD160 23c5b4c932bfe997f82718c4157e31c0c8b76969 ChangeLog 59773
-SHA256 2f533d6d98c509215e05247cfbe4e69de3df0b2a5e9cc2179695640f477dc127 ChangeLog 59773
+MISC ChangeLog 59876 RMD160 cd7b02d036e6d362fcc36269fa8c39277572c54a SHA1 2732d57f265f5c5e2ee6d76ddf2846ddc5128476 SHA256 85d596c66c5e1347fbfd1bdfcf71acaf25fa8dcc22ae8d95e307a17926eedf24
+MD5 efa586a48be033310770911dae68c399 ChangeLog 59876
+RMD160 cd7b02d036e6d362fcc36269fa8c39277572c54a ChangeLog 59876
+SHA256 85d596c66c5e1347fbfd1bdfcf71acaf25fa8dcc22ae8d95e307a17926eedf24 ChangeLog 59876
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
diff --git a/net-im/gaim/gaim-1.5.0.ebuild b/net-im/gaim/gaim-1.5.0.ebuild
index 87bc7d010071..65c60d5836ae 100644
--- a/net-im/gaim/gaim-1.5.0.ebuild
+++ b/net-im/gaim/gaim-1.5.0.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/net-im/gaim/gaim-1.5.0.ebuild,v 1.20 2006/10/13 12:23:41 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.5.0.ebuild,v 1.21 2006/10/13 14:01:23 gothgirl Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib perl-module perl-app
 
@@ -25,8 +25,8 @@ RDEPEND=">=x11-libs/gtk+-2.0
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
 	eds? ( gnome-extra/evolution-data-server )
 	krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 )
-	tcltk? ( dev-lang/tcl
-			dev-lang/tk )
+	tcl? ( dev-lang/tcl )
+	tk?  ( dev-lang/tk )
 	x11-libs/startup-notification"
 
 DEPEND="$RDEPEND
@@ -100,14 +100,6 @@ src_compile() {
 	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
 
 	local myconf
-	use debug && myconf="${myconf} --enable-debug"
-	use perl || myconf="${myconf} --disable-perl"
-	use spell || myconf="${myconf} --disable-gtkspell"
-	use nls  || myconf="${myconf} --disable-nls"
-	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
-	use eds || myconf="${myconf} --disable-gevolution"
-	use krb4 && myconf="${myconf} --with-krb4"
-	use tcltk || myconf="${myconf} --disable-tcl --disable-tk"
 
 	if use gnutls ; then
 		einfo "Disabling NSS, using GnuTLS"
@@ -124,7 +116,17 @@ src_compile() {
 	fi
 
 
-	econf ${myconf} || die "Configuration failed"
+	econf\
+		$(use_enable debug) \
+		$(use_enable perl) \
+		$(use_enable spell gtkspell) \
+		$(use_enable nls) \
+		$(use_enable nas) \
+		$(use_enable eds gevolution) \
+		$(use_enable krb4) \
+		$(use_enable tcl) \
+		$(use_enable tk) \
+		${myconf} || die "Configuration failed"
 
 	emake -j1 || die "Make failed"
 }