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

(Portage version: 2.1.1-r2)

3 files changed, 13 insertions, 11 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/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"