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

Package-Manager: portage-2.1.1-r2

4 files changed, 35 insertions, 23 deletions

diff --git a/media-libs/hamlib/ChangeLog b/media-libs/hamlib/ChangeLog
index beaebc70c1a2..31a4f99c3fb8 100644
--- a/media-libs/hamlib/ChangeLog
+++ b/media-libs/hamlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/hamlib
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.18 2006/07/06 23:34:41 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/ChangeLog,v 1.19 2006/11/28 18:17:28 opfer Exp $
+
+  28 Nov 2006; Christian Faulhammer <opfer@gentoo.org> hamlib-1.2.4.ebuild,
+  hamlib-1.2.5.ebuild:
+  moved tcltk USE flag over to separate tk and tcl flags, see bug #17808
 
 *hamlib-1.2.5 (06 Jul 2006)
 
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 92f8bda2f5b1..1cd8a48266c9 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,21 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hamlib-pkgconfig-fix.diff 373 RMD160 fe7a8275b28ea73480b9bf1eb916302d84eb351f SHA1 bc0abd242bc35897000d405bc1fb831a48fad976 SHA256 6c45445bf2bc12b9738b6315543df662a0dd36167a57a3623bb11446e882802c
 MD5 2d4e1df9c7fa10b146286ef764530f68 files/hamlib-pkgconfig-fix.diff 373
 RMD160 fe7a8275b28ea73480b9bf1eb916302d84eb351f files/hamlib-pkgconfig-fix.diff 373
 SHA256 6c45445bf2bc12b9738b6315543df662a0dd36167a57a3623bb11446e882802c files/hamlib-pkgconfig-fix.diff 373
 DIST hamlib-1.2.4.tar.gz 1423048 RMD160 ec03d4ec5deafe2a148e363a65cd9664a17da84f SHA1 c01748039bbb31b9b3559cd8ec95d504d0949baa SHA256 d6e0f170e0ce4fda05302402bbb019325e0b043c8b172c071d22cd5a7bf17132
 DIST hamlib-1.2.5.tar.gz 1420619 RMD160 72e664d54abd298feb19c0206fc026d1d32f1d16 SHA1 6173742153b86bbace7962f05cb08fca851c0e84 SHA256 1a66cee68486087305b1f9ccfc2ea816aa88a50817257d6213608ec16a65c1ba
-EBUILD hamlib-1.2.4.ebuild 1732 RMD160 d569a62d8ba4b01335469338e7246820c765d6fa SHA1 6245fe1b6162f8afd9cd1786784bfe2dcdab78e5 SHA256 79ce29e4a30d131c0aa7f81ab45d3532583b250ee5b5a1c571f896743b396a9d
-MD5 34513b8538cd736042bb1b02086a3a6b hamlib-1.2.4.ebuild 1732
-RMD160 d569a62d8ba4b01335469338e7246820c765d6fa hamlib-1.2.4.ebuild 1732
-SHA256 79ce29e4a30d131c0aa7f81ab45d3532583b250ee5b5a1c571f896743b396a9d hamlib-1.2.4.ebuild 1732
-EBUILD hamlib-1.2.5.ebuild 1735 RMD160 3de6d18e7511e2325c1f94b862cfdba1a39f81b2 SHA1 25fdd6cc9b54bf0a2864d43ec33a9193cd0887c0 SHA256 b78ed0c718b1268b0dbf819ad4c828aa803b5f2505abf589f740c24101567cdb
-MD5 4bf025046a0d03f290cd1a687d7681dc hamlib-1.2.5.ebuild 1735
-RMD160 3de6d18e7511e2325c1f94b862cfdba1a39f81b2 hamlib-1.2.5.ebuild 1735
-SHA256 b78ed0c718b1268b0dbf819ad4c828aa803b5f2505abf589f740c24101567cdb hamlib-1.2.5.ebuild 1735
-MISC ChangeLog 3437 RMD160 831ef8bb58a71ad9a4f6f552b486f87886ff51b3 SHA1 54819c92b33ed59fab99e954a5be4d84f9adcaf3 SHA256 80eb8a1ab63ed466bfa037d4cbf8bb57a920372b9a166ba249dd95fff492c120
-MD5 530e3142f1b3a3199d4bdc3d58503957 ChangeLog 3437
-RMD160 831ef8bb58a71ad9a4f6f552b486f87886ff51b3 ChangeLog 3437
-SHA256 80eb8a1ab63ed466bfa037d4cbf8bb57a920372b9a166ba249dd95fff492c120 ChangeLog 3437
+EBUILD hamlib-1.2.4.ebuild 1700 RMD160 9303136040f5d767ffccc2d95d9b7fb8f72fec5c SHA1 f9038da4104da9f77a9c32c97d9b819e5bd35c0f SHA256 99387bb3c841a9850f3bcb13476e81606cfa1e3fc7fcf6c17289aaa32469f1be
+MD5 1f80e4c0d10f9be837c0c42802f44781 hamlib-1.2.4.ebuild 1700
+RMD160 9303136040f5d767ffccc2d95d9b7fb8f72fec5c hamlib-1.2.4.ebuild 1700
+SHA256 99387bb3c841a9850f3bcb13476e81606cfa1e3fc7fcf6c17289aaa32469f1be hamlib-1.2.4.ebuild 1700
+EBUILD hamlib-1.2.5.ebuild 1703 RMD160 8591b7eee216136d7e60e17dd3c25882a0a79bac SHA1 a49273419ef3c255ebca5558fcace65ccf9a8aa6 SHA256 bb79a331ff4164d74e3a5cb79d5bd24354d949fba432178bc85da82410c28679
+MD5 272b305436ca1d78483cd208cbdc80d5 hamlib-1.2.5.ebuild 1703
+RMD160 8591b7eee216136d7e60e17dd3c25882a0a79bac hamlib-1.2.5.ebuild 1703
+SHA256 bb79a331ff4164d74e3a5cb79d5bd24354d949fba432178bc85da82410c28679 hamlib-1.2.5.ebuild 1703
+MISC ChangeLog 3606 RMD160 69922a0b64e08594210ad7875d76a24d650cc3af SHA1 3c47e5f5350d59d8875058c6764adca47aad73bc SHA256 601c63bad0f54a784db172c9d85ac59ab89388db751a7acf1013bae305e6e87c
+MD5 72c74550e7e9cf2feba34b4fb42c014f ChangeLog 3606
+RMD160 69922a0b64e08594210ad7875d76a24d650cc3af ChangeLog 3606
+SHA256 601c63bad0f54a784db172c9d85ac59ab89388db751a7acf1013bae305e6e87c ChangeLog 3606
 MISC metadata.xml 269 RMD160 db32c3f6333d9d443dc57593f5ddf1ebbfebfb06 SHA1 121ea86b1bcc7e9815db04cfc19d4ef3a255a9cd SHA256 91e2fbe162d28169b6d852a358737d2e535babf764827246f23dd31e967d447f
 MD5 8fd0f938f32024e0c4ac5db3962040a4 metadata.xml 269
 RMD160 db32c3f6333d9d443dc57593f5ddf1ebbfebfb06 metadata.xml 269
@@ -26,3 +29,10 @@ SHA256 f0d3eff93f01e5442022a496f8d85874846095a1021e6944914348c32d917d05 files/di
 MD5 aea5196d0d5c972907d7b23758d755b7 files/digest-hamlib-1.2.5 241
 RMD160 1d794accd0a8fef997276adec307bc859e08f9a2 files/digest-hamlib-1.2.5 241
 SHA256 27219db8f8db5d4f874f7e86214d3d25424d223406cfaad3f7450226673aed2d files/digest-hamlib-1.2.5 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFbH0+NQqtfCuFneMRAgvJAKCEhIxRAZPCdzwqONQ77UZmdxkZ6gCfeAkS
+yok4hcol5TPyRt+PyBVeh5s=
+=w5/X
+-----END PGP SIGNATURE-----
diff --git a/media-libs/hamlib/hamlib-1.2.4.ebuild b/media-libs/hamlib/hamlib-1.2.4.ebuild
index 72f9e9e8fc32..6f8d69061f60 100644
--- a/media-libs/hamlib/hamlib-1.2.4.ebuild
+++ b/media-libs/hamlib/hamlib-1.2.4.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/media-libs/hamlib/hamlib-1.2.4.ebuild,v 1.6 2006/07/06 23:34:41 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.4.ebuild,v 1.7 2006/11/28 18:17:28 opfer Exp $
 
 inherit eutils multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~ppc x86"
-IUSE="doc gd python tcltk X"
+IUSE="doc gd python tk X"
 
 RESTRICT="test"
 
@@ -19,8 +19,7 @@ RDEPEND="virtual/libc
 	gd? ( media-libs/gd )
 	python? ( dev-lang/python
 		dev-lang/tcl )
-	tcltk? ( dev-lang/tk
-		dev-lang/tcl )"
+	tk? dev-lang/tk"
 DEPEND=">=sys-devel/libtool-1.5
 	>=sys-devel/autoconf-2.54
 	>=sys-devel/automake-1.7
@@ -44,7 +43,7 @@ src_compile() {
 		--without-rpc-backends \
 		--without-perl-binding \
 		$(use_with python python-binding) \
-		$(use_with tcltk tcl-binding) \
+		$(use_with tk tcl-binding) \
 		$(use_with gd rigmatrix) \
 		$(use_with X x) \
 		|| die "configure failed"
diff --git a/media-libs/hamlib/hamlib-1.2.5.ebuild b/media-libs/hamlib/hamlib-1.2.5.ebuild
index f66c9a010964..fc8061fd9a21 100644
--- a/media-libs/hamlib/hamlib-1.2.5.ebuild
+++ b/media-libs/hamlib/hamlib-1.2.5.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/media-libs/hamlib/hamlib-1.2.5.ebuild,v 1.1 2006/07/06 23:34:41 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hamlib/hamlib-1.2.5.ebuild,v 1.2 2006/11/28 18:17:28 opfer Exp $
 
 inherit eutils multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="doc gd python tcltk X"
+IUSE="doc gd python tk X"
 
 RESTRICT="test"
 
@@ -19,8 +19,7 @@ RDEPEND="virtual/libc
 	gd? ( media-libs/gd )
 	python? ( dev-lang/python
 		dev-lang/tcl )
-	tcltk? ( dev-lang/tk
-		dev-lang/tcl )"
+	tk? dev-lang/tk"
 DEPEND=">=sys-devel/libtool-1.5
 	>=sys-devel/autoconf-2.54
 	>=sys-devel/automake-1.7
@@ -44,7 +43,7 @@ src_compile() {
 		--without-rpc-backends \
 		--without-perl-binding \
 		$(use_with python python-binding) \
-		$(use_with tcltk tcl-binding) \
+		$(use_with tk tcl-binding) \
 		$(use_with gd rigmatrix) \
 		$(use_with X x) \
 		|| die "configure failed"