moved from USE flag tcltk to split tcl and tk, see bug 17808

(Portage version: 2.1.2-r9)

5 files changed, 37 insertions, 29 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index d68eb8245266..675fb2534652 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.99 2007/01/10 18:44:42 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.100 2007/02/11 00:14:35 opfer Exp $
+
+  11 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+  graphviz-1.16-r1.ebuild, graphviz-2.2.1.ebuild, graphviz-2.8-r1.ebuild,
+  graphviz-2.8-r2.ebuild:
+  moved from USE flag tcltk to split tcl and tk, see bug 17808
 
   10 Jan 2007; Piotr Jaroszyński <peper@gentoo.org> Manifest:
   Fix Manifest.
diff --git a/media-gfx/graphviz/graphviz-1.16-r1.ebuild b/media-gfx/graphviz/graphviz-1.16-r1.ebuild
index 3b9f59687be1..d0beb229d9e2 100644
--- a/media-gfx/graphviz/graphviz-1.16-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-1.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.16-r1.ebuild,v 1.5 2007/01/05 08:00:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.16-r1.ebuild,v 1.6 2007/02/11 00:14:35 opfer Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz
 LICENSE="as-is ATT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sh sparc x86"
-IUSE="tcltk"
+IUSE="tk"
 
 #Can use freetype-1.3 or 2.0, but not both
 DEPEND=">=sys-libs/zlib-1.1.3
@@ -23,7 +23,7 @@ DEPEND=">=sys-libs/zlib-1.1.3
 	sys-devel/gettext
 	>=media-libs/gd-2.0.29
 	media-libs/fontconfig
-	tcltk? ( >=dev-lang/tk-8.3 )"
+	tk? ( >=dev-lang/tk-8.3 )"
 
 src_unpack() {
 	unpack ${A}
@@ -48,9 +48,9 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	# if no tcltk, this will generate configure warnings, but will
-	# compile without tcltk support
-	use tcltk || myconf="${myconf} --without-tcl --without-tk"
+	# if no tk, this will generate configure warnings, but will
+	# compile without tcl and tk support
+	use tk || myconf="${myconf} --without-tcl --without-tk"
 
 	myconf="${myconf} --enable-dynagraph --with-mylibgd"
 	use ppc-macos && myconf="${myconf} --with-expatincludedir=/usr/X11R6/include --with-expatlibdir=/usr/X11R6/lib --with-fontconfigincludedir=/usr/X11R6/include --with-fontconfiglibdir=/usr/X11R6/lib"
diff --git a/media-gfx/graphviz/graphviz-2.2.1.ebuild b/media-gfx/graphviz/graphviz-2.2.1.ebuild
index 2d490520861e..6ca28e0faf86 100644
--- a/media-gfx/graphviz/graphviz-2.2.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.2.1.ebuild,v 1.7 2006/09/10 22:54:53 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.2.1.ebuild,v 1.8 2007/02/11 00:14:35 opfer Exp $
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="http://www.graphviz.org/"
@@ -9,7 +9,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~x86"
-IUSE="dynagraph tcltk X"
+IUSE="dynagraph tk X"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
 		 >=media-libs/libpng-1.2
@@ -19,7 +19,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 		   dev-libs/expat
 		   sys-libs/zlib
 		   sys-devel/gettext
-		 tcltk? ( >=dev-lang/tk-8.3 )"
+		 tk? ( >=dev-lang/tk-8.3 )"
 
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 src_compile() {
 	econf --with-mylibgd \
 		  $(use_with dynagraph dynagraph) \
-		  $(use_with tcltk tcl) $(use_with tcltk tk) \
+		  $(use_with tk tcl) $(use_with tk) \
 		  $(use_with X x) || die "Configure Failed!"
 	emake || die "Compile Failed!"
 }
diff --git a/media-gfx/graphviz/graphviz-2.8-r1.ebuild b/media-gfx/graphviz/graphviz-2.8-r1.ebuild
index f43304332e2f..b92c0f76fbe6 100644
--- a/media-gfx/graphviz/graphviz-2.8-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.8-r1.ebuild,v 1.4 2006/10/07 05:52:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.8-r1.ebuild,v 1.5 2007/02/11 00:14:35 opfer Exp $
 
 inherit eutils libtool
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="cairo tcltk X static minimal"
+IUSE="cairo tcl tk X static minimal"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
 	>=media-libs/libpng-1.2
@@ -21,10 +21,11 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 	media-libs/fontconfig
 	dev-libs/expat
 	sys-libs/zlib
-	tcltk? ( >=dev-lang/tk-8.3 >=dev-lang/tcl-8.3 )
+	tcltk? ( >=dev-lang/tcl-8.3 )
+	tk? ( >=dev-lang/tk-8.3 )
 	cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
 	X? ( || (
-	    ( x11-libs/libXaw x11-libs/libXpm )
+		( x11-libs/libXaw x11-libs/libXpm )
 	virtual/x11 )
 	)"
 
@@ -47,8 +48,8 @@ src_compile() {
 	econf ${my_conf}  \
 		--disable-dependency-tracking \
 		$(use_enable static) \
-		$(use_with tcltk tcl) \
-		$(use_with tcltk tk) \
+		$(use_with tcl) \
+		$(use_with tk) \
 		$(use_with X x) || die "Configure Failed!"
 	LC_ALL=C emake || die "Compile Failed!"
 }
@@ -63,8 +64,8 @@ src_install() {
 		pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
 		install || die "Install Failed!"
 	if use minimal ; then
-	    rm -rf "${D}"usr/share/doc/${PF}/{pdf,html}
-	    rm -rf "${D}"usr/$(get_libdir)/${PN}/{tcl,lua,perl,python,ruby}
+		rm -rf "${D}"usr/share/doc/${PF}/{pdf,html}
+		rm -rf "${D}"usr/$(get_libdir)/${PN}/{tcl,lua,perl,python,ruby}
 	fi
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/media-gfx/graphviz/graphviz-2.8-r2.ebuild b/media-gfx/graphviz/graphviz-2.8-r2.ebuild
index d1666f954a50..cf97d3b923cb 100644
--- a/media-gfx/graphviz/graphviz-2.8-r2.ebuild
+++ b/media-gfx/graphviz/graphviz-2.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.8-r2.ebuild,v 1.9 2007/01/10 17:39:53 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.8-r2.ebuild,v 1.10 2007/02/11 00:14:35 opfer Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -14,7 +14,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="cairo tcltk X static guile java lua perl php python ruby ocaml"
+IUSE="cairo tcl tk X static guile java lua perl php python ruby ocaml"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
 	>=media-libs/libpng-1.2
@@ -25,7 +25,8 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 	dev-libs/expat
 	sys-libs/zlib
 	cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
-	tcltk? ( >=dev-lang/tk-8.3 >=dev-lang/tcl-8.3 )
+	tk? ( >=dev-lang/tk-8.3 )
+	tcl? ( >=dev-lang/tcl-8.3 )
 	guile? ( dev-scheme/guile )
 	java? ( virtual/jdk )
 	perl? ( dev-lang/perl )
@@ -39,7 +40,8 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	tcltk? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )
+	tk? ( dev-lang/swig )
 	guile? ( dev-lang/swig )
 	java? ( dev-lang/swig )
 	perl? ( dev-lang/swig )
@@ -66,8 +68,8 @@ src_compile() {
 	econf ${my_conf}  \
 		--disable-dependency-tracking \
 		$(use_enable static) \
-		$(use_with tcltk tcl) \
-		$(use_with tcltk tk) \
+		$(use_with tcl) \
+		$(use_with tk) \
 		$(use_enable guile) \
 		$(use_enable java) \
 		$(use_enable lua) \
@@ -92,8 +94,8 @@ src_install() {
 		pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
 		install || die "Install Failed!"
 	if use minimal ; then
-	    rm -rf "${D}"/usr/share/doc/${PF}/{pdf,html}
-	    rm -rf "${D}"/usr/$(get_libdir)/${PN}/{tcl,lua,perl,python,ruby}
+		rm -rf "${D}"/usr/share/doc/${PF}/{pdf,html}
+		rm -rf "${D}"/usr/$(get_libdir)/${PN}/{tcl,lua,perl,python,ruby}
 	fi
 	dodoc AUTHORS ChangeLog NEWS README
 }