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

(Portage version: 2.1.1-r2)

3 files changed, 14 insertions, 10 deletions

diff --git a/dev-lang/gnu-smalltalk/ChangeLog b/dev-lang/gnu-smalltalk/ChangeLog
index 5b80c8871cd9..24f6e6ce279f 100644
--- a/dev-lang/gnu-smalltalk/ChangeLog
+++ b/dev-lang/gnu-smalltalk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/gnu-smalltalk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/ChangeLog,v 1.18 2006/11/05 17:14:22 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/ChangeLog,v 1.19 2006/11/29 15:47:50 opfer Exp $
+
+  29 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
+  gnu-smalltalk-2.1.12.ebuild, gnu-smalltalk-2.2-r1.ebuild:
+  moved tcltk USE flag over to separate tk and tcl flags, see bug #17808
 
   05 Nov 2006; Luis F. Araujo <araujo@gentoo.org> -gnu-smalltalk-2.2.ebuild:
   Removing broken version.
diff --git a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild
index 5bbd1a595971..c369e05d674d 100644
--- a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild
+++ b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild,v 1.4 2005/12/16 08:12:48 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild,v 1.5 2006/11/29 15:47:50 opfer Exp $
 
 inherit elisp-common flag-o-matic eutils toolchain-funcs
 
@@ -10,13 +10,13 @@ SRC_URI="http://ftp.gnu.org/gnu/smalltalk/smalltalk-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc x86"
-IUSE="tcltk readline emacs gtk gmp"
+IUSE="tk readline emacs gtk gmp"
 
 DEPEND="sys-libs/gdbm
 	sys-apps/debianutils
 	emacs? ( virtual/emacs )
 	readline? ( sys-libs/readline )
-	tcltk? ( dev-lang/tcl dev-lang/tk )
+	tk? ( dev-lang/tk )
 	gtk? ( =x11-libs/gtk+-2* )
 	gmp? ( dev-libs/gmp )"
 RDEPEND=""
@@ -33,7 +33,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf=""
-	if use tcltk; then
+	if use tk; then
 		myconf="
 		`use_with tcltk tcl=/usr/lib` \
 		`use_with tcltk tk=/usr/lib`"
diff --git a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-r1.ebuild b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-r1.ebuild
index 87357e0705b4..48fd922d73e7 100644
--- a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-r1.ebuild
+++ b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-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/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-r1.ebuild,v 1.1 2006/11/05 16:24:57 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/gnu-smalltalk-2.2-r1.ebuild,v 1.2 2006/11/29 15:47:50 opfer Exp $
 
 inherit elisp-common flag-o-matic eutils toolchain-funcs
 
@@ -10,13 +10,13 @@ SRC_URI="http://ftp.gnu.org/gnu/smalltalk/smalltalk-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~sparc ~x86 ~amd64"
-IUSE="tcltk readline emacs gtk gmp"
+IUSE="tk readline emacs gtk gmp"
 
 DEPEND="sys-libs/gdbm
 	sys-apps/debianutils
 	emacs? ( virtual/emacs )
 	readline? ( sys-libs/readline )
-	tcltk? ( dev-lang/tcl dev-lang/tk )
+	tk? ( dev-lang/tk )
 	gtk? ( =x11-libs/gtk+-2* )
 	gmp? ( dev-libs/gmp )"
 RDEPEND=""
@@ -35,7 +35,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf=""
-	if use tcltk; then
+	if use tk; then
 		myconf="
 		`use_with tcltk tcl=/usr/lib` \
 		`use_with tcltk tk=/usr/lib`"