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, 30 deletions

diff --git a/app-text/active-dvi/ChangeLog b/app-text/active-dvi/ChangeLog
index 9a47783ba920..65d2045f8786 100644
--- a/app-text/active-dvi/ChangeLog
+++ b/app-text/active-dvi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/active-dvi
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/active-dvi/ChangeLog,v 1.12 2006/07/08 09:27:04 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/active-dvi/ChangeLog,v 1.13 2006/11/28 20:16:27 opfer Exp $
+
+  28 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
+  active-dvi-1.4.0.ebuild, active-dvi-1.6.0.ebuild,
+  active-dvi-1.6.0-r1.ebuild:
+  moved tcltk USE flag over to separate tk and tcl flags, see bug #17808
 
 *active-dvi-1.6.0-r1 (08 Jul 2006)
 
diff --git a/app-text/active-dvi/active-dvi-1.4.0.ebuild b/app-text/active-dvi/active-dvi-1.4.0.ebuild
index 5112e60cd7cc..dfe11e607279 100644
--- a/app-text/active-dvi/active-dvi-1.4.0.ebuild
+++ b/app-text/active-dvi/active-dvi-1.4.0.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/app-text/active-dvi/active-dvi-1.4.0.ebuild,v 1.9 2005/02/08 12:48:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/active-dvi/active-dvi-1.4.0.ebuild,v 1.10 2006/11/28 20:16:27 opfer Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/${MY_PN}/${MY_P}.tar.gz"
 HOMEPAGE="http://pauillac.inria.fr/advi/"
 LICENSE="LGPL-2.1"
 
-IUSE="cjk tcltk"
+IUSE="cjk tk"
 SLOT="0"
 KEYWORDS="x86"
 
@@ -28,19 +28,19 @@ DOCS="README TODO"
 
 pkg_setup() {
 
-	# warn those who have USE="tcltk" but no ocaml tcltk support
-	# because we cant force ocaml to be build with tcltk.
-	if use tcltk; then
+	# warn those who have USE="tk" but no ocaml tk support
+	# because we cant force ocaml to be build with tk.
+	if use tk; then
 		if [ ! -d /usr/lib/ocaml/labltk ]; then
 
 			echo ""
-			ewarn "You have requested tcltk support, but it appears"
-			ewarn "your ocaml wasnt compiled with tcltk support, "
+			ewarn "You have requested tk support, but it appears"
+			ewarn "your ocaml wasnt compiled with tk support, "
 			ewarn "so it can't be included for active-dvi."
 			echo ""
 			ewarn "Please stop this build, and emerge ocaml with "
-			ewarn "USE=\"tcltk\" ocaml"
-			ewarn "before emerging active-dvi if you want tcltk support."
+			ewarn "USE=\"tk\" ocaml"
+			ewarn "before emerging active-dvi if you want tk support."
 			echo ""
 			# give the user some time to read this, but leave the
 			# choice up to them
diff --git a/app-text/active-dvi/active-dvi-1.6.0-r1.ebuild b/app-text/active-dvi/active-dvi-1.6.0-r1.ebuild
index 91458dd729bc..6e548cce201b 100644
--- a/app-text/active-dvi/active-dvi-1.6.0-r1.ebuild
+++ b/app-text/active-dvi/active-dvi-1.6.0-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/app-text/active-dvi/active-dvi-1.6.0-r1.ebuild,v 1.1 2006/07/08 09:27:04 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/active-dvi/active-dvi-1.6.0-r1.ebuild,v 1.2 2006/11/28 20:16:27 opfer Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/${MY_PN}/${MY_P}.tgz"
 HOMEPAGE="http://pauillac.inria.fr/advi/"
 LICENSE="LGPL-2.1"
 
-IUSE="cjk tcltk"
+IUSE="cjk tk"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 
@@ -28,19 +28,19 @@ DOCS="README TODO"
 
 pkg_setup() {
 
-	# warn those who have USE="tcltk" but no ocaml tcltk support
-	# because we cant force ocaml to be build with tcltk.
-	if use tcltk; then
+	# warn those who have USE="tk" but no ocaml tk support
+	# because we cant force ocaml to be build with tk.
+	if use tk; then
 		if [ ! -d /usr/lib/ocaml/labltk ]; then
 
 			echo ""
-			ewarn "You have requested tcltk support, but it appears"
-			ewarn "your ocaml wasnt compiled with tcltk support, "
+			ewarn "You have requested tk support, but it appears"
+			ewarn "your ocaml wasnt compiled with tk support, "
 			ewarn "so it can't be included for active-dvi."
 			echo ""
 			ewarn "Please stop this build, and emerge ocaml with "
-			ewarn "USE=\"tcltk\" ocaml"
-			ewarn "before emerging active-dvi if you want tcltk support."
+			ewarn "USE=\"tk\" ocaml"
+			ewarn "before emerging active-dvi if you want tk support."
 			echo ""
 			# give the user some time to read this, but leave the
 			# choice up to them
diff --git a/app-text/active-dvi/active-dvi-1.6.0.ebuild b/app-text/active-dvi/active-dvi-1.6.0.ebuild
index c60805ac0a16..a519ee609f93 100644
--- a/app-text/active-dvi/active-dvi-1.6.0.ebuild
+++ b/app-text/active-dvi/active-dvi-1.6.0.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/app-text/active-dvi/active-dvi-1.6.0.ebuild,v 1.4 2005/09/21 21:28:24 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/active-dvi/active-dvi-1.6.0.ebuild,v 1.5 2006/11/28 20:16:27 opfer Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/${MY_PN}/${MY_P}.tgz"
 HOMEPAGE="http://pauillac.inria.fr/advi/"
 LICENSE="LGPL-2.1"
 
-IUSE="cjk tcltk"
+IUSE="cjk tk"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 
@@ -28,19 +28,19 @@ DOCS="README TODO"
 
 pkg_setup() {
 
-	# warn those who have USE="tcltk" but no ocaml tcltk support
-	# because we cant force ocaml to be build with tcltk.
-	if use tcltk; then
+	# warn those who have USE="tk" but no ocaml tk support
+	# because we cant force ocaml to be build with tk.
+	if use tk; then
 		if [ ! -d /usr/lib/ocaml/labltk ]; then
 
 			echo ""
-			ewarn "You have requested tcltk support, but it appears"
-			ewarn "your ocaml wasnt compiled with tcltk support, "
+			ewarn "You have requested tk support, but it appears"
+			ewarn "your ocaml wasnt compiled with tk support, "
 			ewarn "so it can't be included for active-dvi."
 			echo ""
 			ewarn "Please stop this build, and emerge ocaml with "
-			ewarn "USE=\"tcltk\" ocaml"
-			ewarn "before emerging active-dvi if you want tcltk support."
+			ewarn "USE=\"tk\" ocaml"
+			ewarn "before emerging active-dvi if you want tk support."
 			echo ""
 			# give the user some time to read this, but leave the
 			# choice up to them