tk&tcl+tclsh fix, see bug #139333

Package-Manager: portage-2.1.1_pre2-r1

3 files changed, 20 insertions, 14 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index e6248ff475b4..9a3e579189ee 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.82 2006/07/03 15:59:39 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.83 2006/07/05 16:56:01 lu_zero Exp $
+
+  05 Jul 2006; Luca Barbato <lu_zero@gentoo.org> graphviz-2.6-r1.ebuild:
+  Move to split tck and tk useflag, thanks to Fabian Groffen
+  <grobian@gentoo.org> for the fix about tclsh, bug #139333
 
   03 Jul 2006; Lars Weiler <pylon@gentoo.org> graphviz-2.6-r1.ebuild:
   Stable on ppc; needed for bug #138937.
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index b59e9997094a..590b4138bca4 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -80,10 +80,10 @@ EBUILD graphviz-2.4.ebuild 1243 RMD160 186fc0153a12b0d9a086653a29f4d8b20ffe40a0
 MD5 d450dad4e5d2bbb13780ae7962a2f496 graphviz-2.4.ebuild 1243
 RMD160 186fc0153a12b0d9a086653a29f4d8b20ffe40a0 graphviz-2.4.ebuild 1243
 SHA256 a0f38c2af00286f8543355f808d4d3d6f62daf1dc4e18cbbd848def2f8e0eb51 graphviz-2.4.ebuild 1243
-EBUILD graphviz-2.6-r1.ebuild 1687 RMD160 60a97cb92e121ec429e0cf00aa6c67c1ca6e740e SHA1 f82dd6fbb482d8c2cccedebfe97248d15e161541 SHA256 fc16403f3474ba45c230dc763032098ba822d3d6af14df9abc44b9d77d58a48c
-MD5 b4caf1f3034ac8aeb7602b2c786fa3ac graphviz-2.6-r1.ebuild 1687
-RMD160 60a97cb92e121ec429e0cf00aa6c67c1ca6e740e graphviz-2.6-r1.ebuild 1687
-SHA256 fc16403f3474ba45c230dc763032098ba822d3d6af14df9abc44b9d77d58a48c graphviz-2.6-r1.ebuild 1687
+EBUILD graphviz-2.6-r1.ebuild 1711 RMD160 f988ebcadaa41177bf344780260cadc7edb3fc32 SHA1 5cd6b82161133663c8d22840d7011fad46900326 SHA256 88932f1c94a1d1b7e744c2614daca6f1648eff6395506c55313adf821e44a5b8
+MD5 a713322dddfc086fd9044d33dea85b33 graphviz-2.6-r1.ebuild 1711
+RMD160 f988ebcadaa41177bf344780260cadc7edb3fc32 graphviz-2.6-r1.ebuild 1711
+SHA256 88932f1c94a1d1b7e744c2614daca6f1648eff6395506c55313adf821e44a5b8 graphviz-2.6-r1.ebuild 1711
 EBUILD graphviz-2.6.ebuild 1569 RMD160 06b9e7d6c784d2520b6f3c8d00575c17d5f13e27 SHA1 704537110c9afb1cdba31acfdde6fec796227e5e SHA256 7bad565a5ae2c0597115281236fbd99427e2a7f2594276eb365a588ece032eb2
 MD5 9e8dbaa982649ef17c3e8ac3ed4ade1d graphviz-2.6.ebuild 1569
 RMD160 06b9e7d6c784d2520b6f3c8d00575c17d5f13e27 graphviz-2.6.ebuild 1569
@@ -92,10 +92,10 @@ EBUILD graphviz-2.8.ebuild 1950 RMD160 5acfc2de134b707d355e02a52dece58e0a5e3107
 MD5 73facb1158185211c88f1c31b49c5c8a graphviz-2.8.ebuild 1950
 RMD160 5acfc2de134b707d355e02a52dece58e0a5e3107 graphviz-2.8.ebuild 1950
 SHA256 130308ca2dacfb7d4a9b1363cd6409afca01f284f8de510dbbac72d947057301 graphviz-2.8.ebuild 1950
-MISC ChangeLog 12525 RMD160 3693985602b702ec3cf9686b1e60376c66faffa0 SHA1 6653db91682a5642cfd5f379349b44376a2bb741 SHA256 32f796ab9841cbc48b7469f7febd8746e3d9c0eb46fe2bfb918c11ae0b6c92bf
-MD5 cf98c9661122dc4ebbe2b2666e2779ec ChangeLog 12525
-RMD160 3693985602b702ec3cf9686b1e60376c66faffa0 ChangeLog 12525
-SHA256 32f796ab9841cbc48b7469f7febd8746e3d9c0eb46fe2bfb918c11ae0b6c92bf ChangeLog 12525
+MISC ChangeLog 12722 RMD160 211afb9361a1d6bb49b6edd3e84285dfadbaeaf0 SHA1 239febb04acda64de588050b8eb901218a8b7a65 SHA256 e51d76aba22f18182f3f777edfc0bd3cf8e2d1afa50f86a1cbd3af628306f476
+MD5 291156ab02866c46c84a8812f07caca9 ChangeLog 12722
+RMD160 211afb9361a1d6bb49b6edd3e84285dfadbaeaf0 ChangeLog 12722
+SHA256 e51d76aba22f18182f3f777edfc0bd3cf8e2d1afa50f86a1cbd3af628306f476 ChangeLog 12722
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
diff --git a/media-gfx/graphviz/graphviz-2.6-r1.ebuild b/media-gfx/graphviz/graphviz-2.6-r1.ebuild
index 38dddf738f52..6a689b0d3596 100644
--- a/media-gfx/graphviz/graphviz-2.6-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.6-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/media-gfx/graphviz/graphviz-2.6-r1.ebuild,v 1.6 2006/07/03 15:59:39 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.6-r1.ebuild,v 1.7 2006/07/05 16:56:01 lu_zero 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cairo tcltk X static"
+IUSE="cairo tcl tk X static"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
 	>=media-libs/libpng-1.2
@@ -20,7 +20,8 @@ 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 )
+	tk? ( >=dev-lang/tk-8.3 )
+	tcl? ( >=dev-lang/tcl-8.3 )
 	cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
 	X? ( || (
 	    ( x11-libs/libXaw x11-libs/libXpm )
@@ -43,8 +44,9 @@ src_compile() {
 	econf --with-mylibgd \
 		--disable-dependency-tracking \
 		$(use_enable static) \
-		$(use_with tcltk tcl) \
-		$(use_with tcltk tk) \
+		$(use_with tcl tclsh) \
+		$(use_with tcl) \
+		$(use_with tk) \
 		$(use_with X x) || die "Configure Failed!"
 	emake || die "Compile Failed!"
 }