split USE='tcltk' to 'tcl' & 'tk' per bug #17808

(Portage version: 2.1.1_pre2-r6)

7 files changed, 30 insertions, 25 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 28fb4ba9d2b0..370abd81df26 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.201 2006/07/05 07:49:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.202 2006/07/08 18:04:43 cardoe Exp $
+
+  08 Jul 2006; Doug Goldstein <cardoe@gentoo.org> xchat-2.4.3.ebuild,
+  xchat-2.4.5.ebuild, xchat-2.4.5-r1.ebuild, xchat-2.6.1.ebuild,
+  xchat-2.6.2.ebuild, xchat-2.6.4.ebuild:
+  split USE='tcltk' to 'tcl' & 'tk' per bug #17808
 
   05 Jul 2006; Markus Ullmann <jokey@gentoo.org>
   -files/xchat-dccserver-0.5.patch, xchat-2.4.5.ebuild,
diff --git a/net-irc/xchat/xchat-2.4.3.ebuild b/net-irc/xchat/xchat-2.4.3.ebuild
index 654bcf368e47..12d0a6a1d1e2 100644
--- a/net-irc/xchat/xchat-2.4.3.ebuild
+++ b/net-irc/xchat/xchat-2.4.3.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-irc/xchat/xchat-2.4.3.ebuild,v 1.16 2006/06/10 03:06:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.4.3.ebuild,v 1.17 2006/07/08 18:04:43 cardoe Exp $
 
 inherit flag-o-matic eutils versionator
 
@@ -12,14 +12,14 @@ HOMEPAGE="http://www.xchat.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="perl tcltk python ssl mmx ipv6 nls xchattext xchatnogtk xchatdccserver"
+IUSE="perl tcl python ssl mmx ipv6 nls xchattext xchatnogtk xchatdccserver"
 
 RDEPEND=">=dev-libs/glib-2.0.3
 	!xchatnogtk? ( >=x11-libs/gtk+-2.0.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
 	python? ( dev-lang/python )
-	tcltk? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl )
 	!<net-irc/xchat-gnome-0.9"
 
 DEPEND="${RDEPEND}
@@ -54,7 +54,7 @@ src_compile() {
 		$(use_enable ssl openssl) \
 		$(use_enable perl) \
 		$(use_enable python) \
-		$(use_enable tcltk tcl) \
+		$(use_enable tcl) \
 		$(use_enable mmx) \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
diff --git a/net-irc/xchat/xchat-2.4.5-r1.ebuild b/net-irc/xchat/xchat-2.4.5-r1.ebuild
index 4401c1cc4cb4..b6ab33518729 100644
--- a/net-irc/xchat/xchat-2.4.5-r1.ebuild
+++ b/net-irc/xchat/xchat-2.4.5-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/net-irc/xchat/xchat-2.4.5-r1.ebuild,v 1.8 2006/07/05 07:49:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.4.5-r1.ebuild,v 1.9 2006/07/08 18:04:43 cardoe Exp $
 
 inherit flag-o-matic eutils versionator
 
@@ -13,14 +13,14 @@ HOMEPAGE="http://www.xchat.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86"
-IUSE="perl tcltk python ssl mmx ipv6 nls xchattext xchatnogtk xchatdccserver"
+IUSE="perl tcl python ssl mmx ipv6 nls xchattext xchatnogtk xchatdccserver"
 
 RDEPEND=">=dev-libs/glib-2.0.3
 	!xchatnogtk? ( >=x11-libs/gtk+-2.0.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
 	python? ( >=dev-lang/python-2.2 )
-	tcltk? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl )
 	!<net-irc/xchat-gnome-0.9"
 
 DEPEND="${RDEPEND}
@@ -58,7 +58,7 @@ src_compile() {
 		$(use_enable ssl openssl) \
 		$(use_enable perl) \
 		$(use_enable python) \
-		$(use_enable tcltk tcl) \
+		$(use_enable tcl) \
 		$(use_enable mmx) \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
diff --git a/net-irc/xchat/xchat-2.4.5.ebuild b/net-irc/xchat/xchat-2.4.5.ebuild
index a49b724399bf..203d78bdc5d1 100644
--- a/net-irc/xchat/xchat-2.4.5.ebuild
+++ b/net-irc/xchat/xchat-2.4.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/net-irc/xchat/xchat-2.4.5.ebuild,v 1.14 2006/07/05 07:49:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.4.5.ebuild,v 1.15 2006/07/08 18:04:43 cardoe Exp $
 
 inherit flag-o-matic eutils versionator
 
@@ -13,14 +13,14 @@ HOMEPAGE="http://www.xchat.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 hppa ia64 ~mips -ppc ppc64 -sparc x86"
-IUSE="perl tcltk python ssl mmx ipv6 nls xchattext xchatnogtk xchatdccserver"
+IUSE="perl tcl python ssl mmx ipv6 nls xchattext xchatnogtk xchatdccserver"
 
 RDEPEND=">=dev-libs/glib-2.0.3
 	!xchatnogtk? ( >=x11-libs/gtk+-2.0.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
 	python? ( >=dev-lang/python-2.2 )
-	tcltk? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl )
 	!<net-irc/xchat-gnome-0.9"
 
 DEPEND="${RDEPEND}
@@ -57,7 +57,7 @@ src_compile() {
 		$(use_enable ssl openssl) \
 		$(use_enable perl) \
 		$(use_enable python) \
-		$(use_enable tcltk tcl) \
+		$(use_enable tcl) \
 		$(use_enable mmx) \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
diff --git a/net-irc/xchat/xchat-2.6.1.ebuild b/net-irc/xchat/xchat-2.6.1.ebuild
index 625c9938040e..5e0d8518fa7b 100644
--- a/net-irc/xchat/xchat-2.6.1.ebuild
+++ b/net-irc/xchat/xchat-2.6.1.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-irc/xchat/xchat-2.6.1.ebuild,v 1.5 2006/06/10 03:06:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.1.ebuild,v 1.6 2006/07/08 18:04:43 cardoe Exp $
 
 inherit eutils versionator gnome2
 
@@ -12,14 +12,14 @@ HOMEPAGE="http://www.xchat.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="perl dbus tcltk python ssl mmx ipv6 nls xchattext xchatnogtk"
+IUSE="perl dbus tcl python ssl mmx ipv6 nls xchattext xchatnogtk"
 
 RDEPEND=">=dev-libs/glib-2.6.0
 	!xchatnogtk? ( >=x11-libs/gtk+-2.6.0 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
 	python? ( >=dev-lang/python-2.2 )
-	tcltk? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl )
 	dbus? ( >=sys-apps/dbus-0.35 )
 	!<net-irc/xchat-gnome-0.9"
 
@@ -55,7 +55,7 @@ src_compile() {
 		$(use_enable ssl openssl) \
 		$(use_enable perl) \
 		$(use_enable python) \
-		$(use_enable tcltk tcl) \
+		$(use_enable tcl) \
 		$(use_enable mmx) \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
diff --git a/net-irc/xchat/xchat-2.6.2.ebuild b/net-irc/xchat/xchat-2.6.2.ebuild
index bc9d662a6747..5ba0dce415eb 100644
--- a/net-irc/xchat/xchat-2.6.2.ebuild
+++ b/net-irc/xchat/xchat-2.6.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/net-irc/xchat/xchat-2.6.2.ebuild,v 1.3 2006/06/10 03:06:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.2.ebuild,v 1.4 2006/07/08 18:04:43 cardoe Exp $
 
 inherit eutils versionator gnome2
 
@@ -12,14 +12,14 @@ HOMEPAGE="http://www.xchat.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86"
-IUSE="perl dbus tcltk python ssl mmx ipv6 nls xchattext xchatnogtk"
+IUSE="perl dbus tcl python ssl mmx ipv6 nls xchattext xchatnogtk"
 
 RDEPEND=">=dev-libs/glib-2.6.0
 	!xchatnogtk? ( >=x11-libs/gtk+-2.6.0 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
 	python? ( >=dev-lang/python-2.2 )
-	tcltk? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl )
 	dbus? ( >=sys-apps/dbus-0.35 )
 	!<net-irc/xchat-gnome-0.9"
 
@@ -53,7 +53,7 @@ src_compile() {
 		$(use_enable ssl openssl) \
 		$(use_enable perl) \
 		$(use_enable python) \
-		$(use_enable tcltk tcl) \
+		$(use_enable tcl) \
 		$(use_enable mmx) \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
diff --git a/net-irc/xchat/xchat-2.6.4.ebuild b/net-irc/xchat/xchat-2.6.4.ebuild
index 58e8041f4d6a..62f75d8d1c54 100644
--- a/net-irc/xchat/xchat-2.6.4.ebuild
+++ b/net-irc/xchat/xchat-2.6.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/net-irc/xchat/xchat-2.6.4.ebuild,v 1.1 2006/07/05 07:40:15 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.4.ebuild,v 1.2 2006/07/08 18:04:43 cardoe Exp $
 
 inherit eutils versionator gnome2
 
@@ -13,14 +13,14 @@ HOMEPAGE="http://www.xchat.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86"
-IUSE="perl dbus tcltk python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
+IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
 
 RDEPEND=">=dev-libs/glib-2.6.0
 	!xchatnogtk? ( >=x11-libs/gtk+-2.6.0 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
 	python? ( >=dev-lang/python-2.2 )
-	tcltk? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl )
 	dbus? ( >=sys-apps/dbus-0.35 )
 	spell? ( app-text/gtkspell )
 	!<net-irc/xchat-gnome-0.9"
@@ -60,7 +60,7 @@ src_compile() {
 		$(use_enable ssl openssl) \
 		$(use_enable perl) \
 		$(use_enable python) \
-		$(use_enable tcltk tcl) \
+		$(use_enable tcl) \
 		$(use_enable mmx) \
 		$(use_enable ipv6) \
 		$(use_enable nls) \