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

Package-Manager: portage-2.1.2-r9

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index d68eb82452660028738da231dafb1413368221b3..675fb25346523dd3498a805d1027d62459aec484 100644 (file)
--- 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/Manifest b/media-gfx/graphviz/Manifest
index caf18e2ab5bcc898de116041e6e35445d48fdbc1..9f1e4e3f4a23af6bd50fbd7c204f947e15c88062 100644 (file)
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -36,8 +36,8 @@ SHA256 9158e2ee37b537d58e7325f76e677dcfab640c43554cbf35d22d1b618cef12a8 files/gr
 DIST graphviz-1.10.tar.gz 3357416 RMD160 2cccc756d4156936d32659e77348238d8e9ac49c SHA1 ddb54a6050800837c8dd6613676ff17bf31d5e4b SHA256 2400b786c605d8b022b52767038942f93494b0239da1d5541c7b5394207753a0
 DIST graphviz-1.12-configure.ac.bz2 7502 RMD160 976c94a596a3b991f7e247cbcdfe23772387dea6 SHA1 1312bf9d28e271c5b8a5850b5dc8e63877ea7e31 SHA256 d03368f0cb81e05dd200735dbd90b355518cd1c9ed2681b80e10a8ab147a70af
 DIST graphviz-1.12.tar.gz 3371279 RMD160 bba80d67e94c140e0977e02c13f15fc096ecfe64 SHA1 78f56aaa92f5d58436e5bb5bafd18bb09e04e2d0 SHA256 6f7b5f72258e1254f62ff0baed1faeab83e764b7946384d417e306ae0e04e64e
-DIST graphviz-1.16-panic.patch.tar.bz2 201 RMD160 99c11a90d912e05040aa08b8765a37da99a64745 SHA256 96a2b2a1f84116b4ca10b46a554cad2845742dd3b294e0affde431c9d1e30fa1
-DIST graphviz-1.16.tar.gz 4387670 RMD160 c21988105cc1fe29b65abe5c26977c0a0083092f SHA256 5efa714f0634b42da99696db8610f82d734cb94d06efb5deae5b7c8e755b08df
+DIST graphviz-1.16-panic.patch.tar.bz2 201 RMD160 99c11a90d912e05040aa08b8765a37da99a64745 SHA1 7bc8a2a51fa7554b8d91cf2876bb1cacb38bc5f9 SHA256 96a2b2a1f84116b4ca10b46a554cad2845742dd3b294e0affde431c9d1e30fa1
+DIST graphviz-1.16.tar.gz 4387670 RMD160 c21988105cc1fe29b65abe5c26977c0a0083092f SHA1 f613884100c62fb409ec5a2571df46d9caafe5e0 SHA256 5efa714f0634b42da99696db8610f82d734cb94d06efb5deae5b7c8e755b08df
 DIST graphviz-2.2.1.tar.gz 4371071 RMD160 9e82389d40dfa71643ba1a8b0867051fe32175d2 SHA1 ee32fef44627289e6631e0606c3e8aeb619924aa SHA256 281fb1a4692ef26fd2bb4ebdecc9a86a965922b6a319dc2b4375cfb6b2ad9ca2
 DIST graphviz-2.2.tar.gz 4379295 RMD160 d1f97c236d045a43f8369f2fba3e4167b778eda7 SHA1 2583bdd3ff082bf3a93ad7313b3261bea23a0f90 SHA256 ede074976937086b490882c203da986213e80e2a02b20b8b1349f0b9a9f6ca7b
 DIST graphviz-2.4.tar.gz 4074857 RMD160 a9cf7ea13d01eb7e06f3dd1c705a0f9f36db9b48 SHA1 f8740ba2c78f3fd44c765dcb61b87a1f7e533ed5 SHA256 1b1b9348af629fd58a4a16ab0fbff9954a183194f72466255b2bd08a2ded095b
@@ -55,10 +55,10 @@ EBUILD graphviz-1.12.ebuild 1310 RMD160 70be99be02b60d8ef50cb28971876db521714af8
 MD5 4f32aa4cb7d011f89b37d36c79525b6e graphviz-1.12.ebuild 1310
 RMD160 70be99be02b60d8ef50cb28971876db521714af8 graphviz-1.12.ebuild 1310
 SHA256 5c26dc6ec01a2520726099d1d4d9f8e9b7c962b6f928918a5b5ebf56de0991e1 graphviz-1.12.ebuild 1310
-EBUILD graphviz-1.16-r1.ebuild 2168 RMD160 77b97694aee5a1a0e42cdc0c77629efbbb9afed2 SHA1 09228298f7337623b1c9ef3a78d962557dc269eb SHA256 420cd1467d81589e0d1e82a93c6414c0ee095f036bc2d16f35ad70896f300421
-MD5 215cd8896c51fb2528753f1204e013fc graphviz-1.16-r1.ebuild 2168
-RMD160 77b97694aee5a1a0e42cdc0c77629efbbb9afed2 graphviz-1.16-r1.ebuild 2168
-SHA256 420cd1467d81589e0d1e82a93c6414c0ee095f036bc2d16f35ad70896f300421 graphviz-1.16-r1.ebuild 2168
+EBUILD graphviz-1.16-r1.ebuild 2157 RMD160 e06c2d755bff2dcda514cbd03e7b57ce165c274b SHA1 6b7d1ebd9ed15c99adec36aa7f5173d48e0cea90 SHA256 85a4911173f864e918f0c4ec66b4eb0d63a699393295c2dd91ddb66f9210f772
+MD5 6404113200e946d8d5e9a0d219483cf5 graphviz-1.16-r1.ebuild 2157
+RMD160 e06c2d755bff2dcda514cbd03e7b57ce165c274b graphviz-1.16-r1.ebuild 2157
+SHA256 85a4911173f864e918f0c4ec66b4eb0d63a699393295c2dd91ddb66f9210f772 graphviz-1.16-r1.ebuild 2157
 EBUILD graphviz-1.16.ebuild 2136 RMD160 19759b410d8b0a40d2c08f64dbe2066db64d7dcb SHA1 fb5cd4d84e9b28010a780e75a5abe2bd74238d6e SHA256 57d1c0fbe99855c4789b6b36aa78462ac3c6a88214d53b36d3d1d1e86ce84ee8
 MD5 f05e4cd6103930b68847d78e2f92a765 graphviz-1.16.ebuild 2136
 RMD160 19759b410d8b0a40d2c08f64dbe2066db64d7dcb graphviz-1.16.ebuild 2136
@@ -67,10 +67,10 @@ EBUILD graphviz-2.2.1-r1.ebuild 1213 RMD160 e3ce949068d73e510c922441214c291a1977
 MD5 020a478a3a507e2198cb7702314075ab graphviz-2.2.1-r1.ebuild 1213
 RMD160 e3ce949068d73e510c922441214c291a197739b1 graphviz-2.2.1-r1.ebuild 1213
 SHA256 18af603051442e37aa423196168177062f4c59cb36d537fabddd5d50d7e9108d graphviz-2.2.1-r1.ebuild 1213
-EBUILD graphviz-2.2.1.ebuild 1157 RMD160 7d769c162c76a65dd968372e067716287b7604f9 SHA1 fb737228ca0e982b410dabbaa03c3b7bd186732a SHA256 9dabbe11356dee0d596788572dc5fc145e87ed77a4cd8bb50ab17e1430bea5cf
-MD5 19a66f4c372e8f427c3fa3e738f7b05a graphviz-2.2.1.ebuild 1157
-RMD160 7d769c162c76a65dd968372e067716287b7604f9 graphviz-2.2.1.ebuild 1157
-SHA256 9dabbe11356dee0d596788572dc5fc145e87ed77a4cd8bb50ab17e1430bea5cf graphviz-2.2.1.ebuild 1157
+EBUILD graphviz-2.2.1.ebuild 1142 RMD160 3b7dde4b2d64dbaf69075e0fdf9bdc424623d929 SHA1 5a4092c5096f8e4af98b03ed5c61ba34a7d7aa68 SHA256 b3d786ab8103743972953dada69ae07fd2317f1bd1bcb61ca64bb3f25965d3e4
+MD5 1613fdbcd189747a588d1debc2bbe047 graphviz-2.2.1.ebuild 1142
+RMD160 3b7dde4b2d64dbaf69075e0fdf9bdc424623d929 graphviz-2.2.1.ebuild 1142
+SHA256 b3d786ab8103743972953dada69ae07fd2317f1bd1bcb61ca64bb3f25965d3e4 graphviz-2.2.1.ebuild 1142
 EBUILD graphviz-2.2.ebuild 1827 RMD160 0438ccde8c59ac6c1cfc5495079b97034cc343ad SHA1 5f5a2f935aab4ae244e5f3abc3312ef83582f95b SHA256 c414afaf8fa672f9f2535a1d559d7e19a50cc6fbd2d0a904a766b4ecd6787bfe
 MD5 69df1dd254c25b10973dcd9e8445ccac graphviz-2.2.ebuild 1827
 RMD160 0438ccde8c59ac6c1cfc5495079b97034cc343ad graphviz-2.2.ebuild 1827
@@ -87,22 +87,22 @@ EBUILD graphviz-2.6.ebuild 1502 RMD160 82e8ee89306b3e5859b7753ecec608b2b6f23a0e
 MD5 15a9dbb53505f39ab9f421b060a9d01e graphviz-2.6.ebuild 1502
 RMD160 82e8ee89306b3e5859b7753ecec608b2b6f23a0e graphviz-2.6.ebuild 1502
 SHA256 2caa5100f878469ff07ad92c1f0f1af48aa7a2774a0723a295ba7f999857e6d8 graphviz-2.6.ebuild 1502
-EBUILD graphviz-2.8-r1.ebuild 1940 RMD160 c7e7dbafecd6098b8d655c26ce3d16bca133b8a3 SHA1 3a3eb4abfc5702155cca21afa1a8353921b50bab SHA256 a7b3650daccf7ee94fe57c55354cddcc54f566f283e6479f996dba82ddfd5fbf
-MD5 2d0393cffa855774ef65b2848026af14 graphviz-2.8-r1.ebuild 1940
-RMD160 c7e7dbafecd6098b8d655c26ce3d16bca133b8a3 graphviz-2.8-r1.ebuild 1940
-SHA256 a7b3650daccf7ee94fe57c55354cddcc54f566f283e6479f996dba82ddfd5fbf graphviz-2.8-r1.ebuild 1940
-EBUILD graphviz-2.8-r2.ebuild 2648 RMD160 069c14fd880ace939a9df3ec4ed90191a227d775 SHA1 38a1ff01ca31e12eb45efb2bb1f61d7ddc88a242 SHA256 ec73faa62049bd71223f7e2f6e1b7ec7404d769d1f2d0c800cb1512893b5a62a
-MD5 dc8108293ca93862412ee2a90c7ce5d6 graphviz-2.8-r2.ebuild 2648
-RMD160 069c14fd880ace939a9df3ec4ed90191a227d775 graphviz-2.8-r2.ebuild 2648
-SHA256 ec73faa62049bd71223f7e2f6e1b7ec7404d769d1f2d0c800cb1512893b5a62a graphviz-2.8-r2.ebuild 2648
+EBUILD graphviz-2.8-r1.ebuild 1928 RMD160 9b6b32fbff6573505a3c57ffeabce4c449101e6f SHA1 a5ccfe41c1dadbd28d76f2a8377217cd04993071 SHA256 e51da43b0bd6779da290c2b3df98a6169cfc26d2bf77daa70a92f572ee29b5ba
+MD5 f8096d4eed06d01d6c8dbff94c596888 graphviz-2.8-r1.ebuild 1928
+RMD160 9b6b32fbff6573505a3c57ffeabce4c449101e6f graphviz-2.8-r1.ebuild 1928
+SHA256 e51da43b0bd6779da290c2b3df98a6169cfc26d2bf77daa70a92f572ee29b5ba graphviz-2.8-r1.ebuild 1928
+EBUILD graphviz-2.8-r2.ebuild 2660 RMD160 a9538b871658354fb99abb2042fb0bdd147ea328 SHA1 5dd87c5ae328bae228615b48c77c2984e9052f43 SHA256 e4e7bf48c90728d6f9f2c05226d1671452832b7fb3bd5a27a040d237d8033473
+MD5 ed2915174715bc820de97aa94133da52 graphviz-2.8-r2.ebuild 2660
+RMD160 a9538b871658354fb99abb2042fb0bdd147ea328 graphviz-2.8-r2.ebuild 2660
+SHA256 e4e7bf48c90728d6f9f2c05226d1671452832b7fb3bd5a27a040d237d8033473 graphviz-2.8-r2.ebuild 2660
 EBUILD graphviz-2.8.ebuild 1930 RMD160 0a511fe44f62392f7d538197c2f3e88175566ab9 SHA1 e4f6ce146120ec1000e93a2727932432a7bfe2eb SHA256 a4b0ea0504f1aaec83ebbcfc4c3fafe71afa9a610860dc7d1d5ae84b8b571af7
 MD5 1030c0ba274eb6ae5e9c0b4e503b1d6f graphviz-2.8.ebuild 1930
 RMD160 0a511fe44f62392f7d538197c2f3e88175566ab9 graphviz-2.8.ebuild 1930
 SHA256 a4b0ea0504f1aaec83ebbcfc4c3fafe71afa9a610860dc7d1d5ae84b8b571af7 graphviz-2.8.ebuild 1930
-MISC ChangeLog 14701 RMD160 9f67fc0371e713689ae55d5c44c60fbf53e6ca06 SHA1 994ff8311fa61e49e5c6a1dea849f498c67800e8 SHA256 787e289c5bfc8554f4f52cf98f37298bd4c13ee5ebf495d93309ae686bd6fabc
-MD5 62f24f955565d93b5cc1b252c1359a44 ChangeLog 14701
-RMD160 9f67fc0371e713689ae55d5c44c60fbf53e6ca06 ChangeLog 14701
-SHA256 787e289c5bfc8554f4f52cf98f37298bd4c13ee5ebf495d93309ae686bd6fabc ChangeLog 14701
+MISC ChangeLog 14921 RMD160 bf18ef55d54e478f90b78220c8e9d0fca7113a5a SHA1 37cd4810fe737cc5a97cd3b10e4d3313bbc2cb9d SHA256 0a2d0d78d1d63c12321d770dcc0d2e13e92c524dac20d0826b9fb4ad1be8149f
+MD5 bedb8e89927b28b39a5dd85fca26bcd4 ChangeLog 14921
+RMD160 bf18ef55d54e478f90b78220c8e9d0fca7113a5a ChangeLog 14921
+SHA256 0a2d0d78d1d63c12321d770dcc0d2e13e92c524dac20d0826b9fb4ad1be8149f ChangeLog 14921
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
@@ -150,9 +150,9 @@ MD5 e3e4ae371fc2d864bfc0abf37ed6a8e7 files/digest-graphviz-2.8-r2 241
 RMD160 5fb21035102566ae43b15e15cfa41c26e5d1a195 files/digest-graphviz-2.8-r2 241
 SHA256 46c7992c928f975cf353d76bf16f2c1f95442c40aa8d95f9a6914d69f567e802 files/digest-graphviz-2.8-r2 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFpTQippoStNGKGywRAt+pAKC2+wLGI31qFOQ9PlK5gNfLfh3vWACfWAgT
-z79bacGVgBc9rG3FZLvPU78=
-=A+sn
+iD8DBQFFzl/FNQqtfCuFneMRAgrOAJwPR0dhbYFfiw1bU20IZpDwVx8ToQCcCqRD
+SP5Qn/dql20UmwWMjBsNv70=
+=Hlt+
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/graphviz/graphviz-1.16-r1.ebuild b/media-gfx/graphviz/graphviz-1.16-r1.ebuild
index 3b9f59687be1ffef1791cf2a9aa45d041dfd80fa..d0beb229d9e2fe29adbdb40f9865b7fb58d075be 100644 (file)
--- 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 2d490520861ef1b6084d3f33287a5545a60c1376..6ca28e0faf86633426d17af978ef31cc0212362d 100644 (file)
--- 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 f43304332e2fce811ff26855926d35ba83994ffc..b92c0f76fbe64408cbb9e2c8b6a92150b77017fa 100644 (file)
--- 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 d1666f954a50239ef4f8b7a168a1d45833ae4ecd..cf97d3b923cb22d7a93428ea0e5b8b54e98304f2 100644 (file)
--- 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
 }