moved tcltk USE flag over to separate tk and tcl flags, see bug #17808

Package-Manager: portage-2.1.1-r2

3 files changed, 26 insertions, 14 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 25e8bd752b7c..3f740e77fa07 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/plplot
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.8 2006/11/18 04:54:33 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.9 2006/11/28 18:41:50 opfer Exp $
+
+  28 Nov 2006; Christian Faulhammer <opfer@gentoo.org> plplot-5.5.2.ebuild:
+  moved tcltk USE flag over to separate tk and tcl flags, see bug #17808
 
   18 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org> plplot-5.5.2.ebuild:
   Drop gnome useflag for gnome-1.x removal
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index b68d168e7609..e82c4babe8c0 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX plplot-5.5.1-gcc-3.4-fix.patch 1396 RMD160 8854c2f315a5443cc5c29082a949e2ee359e6746 SHA1 ee321d24c5534bb4a86f9dda17579ae21965ef43 SHA256 1142ad469f6cc6dbf6331de9ceac0967e0128bef26e1ece2bb6b4f200f7e638f
 MD5 41a5eade36ce8c6f875dc087ba1fc40a files/plplot-5.5.1-gcc-3.4-fix.patch 1396
 RMD160 8854c2f315a5443cc5c29082a949e2ee359e6746 files/plplot-5.5.1-gcc-3.4-fix.patch 1396
 SHA256 1142ad469f6cc6dbf6331de9ceac0967e0128bef26e1ece2bb6b4f200f7e638f files/plplot-5.5.1-gcc-3.4-fix.patch 1396
 DIST plplot-5.5.2.tar.gz 5891255 RMD160 55ea8e7dde5c0542ce8f360228a676049ad7d701 SHA1 72e0830b12d7d50ff9ac5b54e49aa1813a580786 SHA256 267d9c4070b8b6de75590efc24388da670dd5d0039a5dc21ecb803366d14730c
-EBUILD plplot-5.5.2.ebuild 5757 RMD160 860f41e96b2987bf626ed2952d5bff1ea5118126 SHA1 084f05e42b845b7b161ddd70dad9439583c65445 SHA256 35e1aff419e33e4d156077eaab7272df87a65d6460896a61bb0bf569c49e8039
-MD5 59d4e0abd01441f932eb97879eb08a7e plplot-5.5.2.ebuild 5757
-RMD160 860f41e96b2987bf626ed2952d5bff1ea5118126 plplot-5.5.2.ebuild 5757
-SHA256 35e1aff419e33e4d156077eaab7272df87a65d6460896a61bb0bf569c49e8039 plplot-5.5.2.ebuild 5757
-MISC ChangeLog 1672 RMD160 acb1194638476d89704aba716eec6f35a9edfed0 SHA1 62ff012fd440bf21247a6ceb1ac1518a63e5f673 SHA256 cb3afd0d39a4e27c319dba42113c19b06a75a03297fea83d42de48e01584b83a
-MD5 c3cd1334a6e02a505803ab310a00f94e ChangeLog 1672
-RMD160 acb1194638476d89704aba716eec6f35a9edfed0 ChangeLog 1672
-SHA256 cb3afd0d39a4e27c319dba42113c19b06a75a03297fea83d42de48e01584b83a ChangeLog 1672
+EBUILD plplot-5.5.2.ebuild 5725 RMD160 ad3e0c5d64e061578f0b9a65f677ee9f14adecc7 SHA1 5ae4595451589c64495b0f2d5c5442c13c78c917 SHA256 9774057f573b2da2789a97682b06882fcd5799be017b5dcb0af0ad2541b0a4e4
+MD5 74ed5d83e1bf3bec62a571e08963663e plplot-5.5.2.ebuild 5725
+RMD160 ad3e0c5d64e061578f0b9a65f677ee9f14adecc7 plplot-5.5.2.ebuild 5725
+SHA256 9774057f573b2da2789a97682b06882fcd5799be017b5dcb0af0ad2541b0a4e4 plplot-5.5.2.ebuild 5725
+MISC ChangeLog 1819 RMD160 44a2afbd93593d134a12ff08533a1f52d5268432 SHA1 63b99a5e6e8c9c8e12d6f8d07de5870e2a1454a4 SHA256 d036013f45a8bdf4277906c3a3aa61603936eac10dbc798c6e1b133332195886
+MD5 fbef79e49285889b884f4dccdfa8cc76 ChangeLog 1819
+RMD160 44a2afbd93593d134a12ff08533a1f52d5268432 ChangeLog 1819
+SHA256 d036013f45a8bdf4277906c3a3aa61603936eac10dbc798c6e1b133332195886 ChangeLog 1819
 MISC metadata.xml 1063 RMD160 3af3224cba8a6f6b4fda4a216a9343372ca6f962 SHA1 fe669fef8974ff0705f3fbebf387f3d0efd5fc97 SHA256 45416c40b8f8bbf8d850d976889600a8b90c87a4f43d098866d622acf7fdc381
 MD5 c3b6ebfa4bc606e61260dba27014f49a metadata.xml 1063
 RMD160 3af3224cba8a6f6b4fda4a216a9343372ca6f962 metadata.xml 1063
@@ -18,3 +21,10 @@ SHA256 45416c40b8f8bbf8d850d976889600a8b90c87a4f43d098866d622acf7fdc381 metadata
 MD5 8728507adbf4a0ae4ac2cd862c123f0f files/digest-plplot-5.5.2 241
 RMD160 50865be0b4c8d636338c61c08df41a78a24dccec files/digest-plplot-5.5.2 241
 SHA256 85e6f4f0a0c165a9b70e203570741b5b52d4ce85cccff2420230a40e44739814 files/digest-plplot-5.5.2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFbIL0NQqtfCuFneMRAg+5AJ9JDqgsLu/1lqnZYjYO4n5jw4wsNQCfVLeJ
+JF2jgRFQK/ZzmgwMB3DKpiM=
+=/rqw
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/plplot-5.5.2.ebuild b/sci-libs/plplot/plplot-5.5.2.ebuild
index 100768965364..839b798f4495 100644
--- a/sci-libs/plplot/plplot-5.5.2.ebuild
+++ b/sci-libs/plplot/plplot-5.5.2.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/sci-libs/plplot/plplot-5.5.2.ebuild,v 1.6 2006/11/18 04:54:33 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.5.2.ebuild,v 1.7 2006/11/28 18:41:50 opfer Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="X debug doc fortran ifc itcl java jpeg octave png python tcltk tetex truetype"
+IUSE="X debug doc fortran ifc itcl java jpeg octave png python tk tetex truetype"
 
 RDEPEND="virtual/libc
 		 dev-lang/perl
@@ -31,8 +31,7 @@ RDEPEND="virtual/libc
 					  x11-libs/libXdmcp
 						)
 					virtual/x11 )
-				tcltk? ( dev-lang/tcl
-						 dev-lang/tk
+				tk? ( dev-lang/tk
 						itcl? ( dev-tcltk/itcl )
 						)
 			   )"
@@ -127,7 +126,7 @@ src_compile() {
 	# Additional X-dependent language bindings and device drivers.
 	if use X; then
 		EXTRA_CONF="${EXTRA_CONF} --with-x"
-		if use tcltk; then
+		if use tk; then
 			EXTRA_CONF="${EXTRA_CONF} --enable-tcl"
 			EXTRA_CONF="${EXTRA_CONF} $(use_enable itcl)"
 		else