fixed deps and made gd external (per upstream recommendation)

Package-Manager: portage-2.1_rc1-r3

6 files changed, 49 insertions, 38 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index dadbf92228ca..776fb7430721 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.77 2006/05/28 01:28:54 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.78 2006/05/28 02:44:07 nerdboy Exp $
+
+  28 May 2006; Steve Arnold <nerdboy@gentoo.org> graphviz-2.4.ebuild,
+  graphviz-2.6.ebuild, graphviz-2.6-r1.ebuild, graphviz-2.8.ebuild:
+  fixed deps and made gd external (per upstream recommendation)
 
 *graphviz-2.8 (28 May 2006)
 
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 385b62d84642..e60a64762e73 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -72,26 +72,26 @@ EBUILD graphviz-2.2.ebuild 1917 RMD160 02edd3e7c2b3117641ef0ef967df0ff11f28557a
 MD5 1d8314727c6cbd655072c67f39b30f0a graphviz-2.2.ebuild 1917
 RMD160 02edd3e7c2b3117641ef0ef967df0ff11f28557a graphviz-2.2.ebuild 1917
 SHA256 ec55f9493ded531cc95342e8143665e08e711a98b740c82f7bcce96518a56d13 graphviz-2.2.ebuild 1917
-EBUILD graphviz-2.4.ebuild 1177 RMD160 d84b00ab0307aa6c436be3636d04a3970cdd3a51 SHA1 db195d4a528f93761a68c5c7f7b7a111f886d4c0 SHA256 bc17fa5f5d2234ad0637078390d83c4b6dc33f02bba1f7e10ccf504d93caa41f size 1177
-MD5 f2c97c52530d9c3213ef196f3f21e961 graphviz-2.4.ebuild 1177
-RMD160 d84b00ab0307aa6c436be3636d04a3970cdd3a51 graphviz-2.4.ebuild 1177
-SHA256 bc17fa5f5d2234ad0637078390d83c4b6dc33f02bba1f7e10ccf504d93caa41f graphviz-2.4.ebuild 1177
-EBUILD graphviz-2.6-r1.ebuild 1666 RMD160 7ee3f28d23ee1c9c28906fd409e2ad7ea1d5cdef SHA1 e4f49aafcf61a7af8076bcf11556a834b6ecaa60 SHA256 ca5c914a198449417da53785c108ddaa46c890fcfc92157256570dfb750145af size 1666
-MD5 7fa89b1113370d328a6b0172e49b4ea4 graphviz-2.6-r1.ebuild 1666
-RMD160 7ee3f28d23ee1c9c28906fd409e2ad7ea1d5cdef graphviz-2.6-r1.ebuild 1666
-SHA256 ca5c914a198449417da53785c108ddaa46c890fcfc92157256570dfb750145af graphviz-2.6-r1.ebuild 1666
-EBUILD graphviz-2.6.ebuild 1541 RMD160 34c7c4ebdda35783b1b4f155aa01f03e4f6a72e1 SHA1 d0e4a0ae6e2494de4acc2cca3ed52146b108c16d SHA256 16c0a70a6229cf7a0b3db403b2391465c2fd63f6f23c4b3dffdb397ab6546250 size 1541
-MD5 ad0efa52c248454595a6da577f1e7a24 graphviz-2.6.ebuild 1541
-RMD160 34c7c4ebdda35783b1b4f155aa01f03e4f6a72e1 graphviz-2.6.ebuild 1541
-SHA256 16c0a70a6229cf7a0b3db403b2391465c2fd63f6f23c4b3dffdb397ab6546250 graphviz-2.6.ebuild 1541
-EBUILD graphviz-2.8.ebuild 1535 RMD160 0dfb9101eb4fc6df523f92ede88ce93fba2af8a4 SHA1 bba458613eff8bfa588c40658f291f31258cffa1 SHA256 9415d62ea5605d73cf29614aae071b81806e7448102a92d80db953c51e6200a6 size 1535
-MD5 4aaf7d5c5cbf47c3ee426047ea7eebf4 graphviz-2.8.ebuild 1535
-RMD160 0dfb9101eb4fc6df523f92ede88ce93fba2af8a4 graphviz-2.8.ebuild 1535
-SHA256 9415d62ea5605d73cf29614aae071b81806e7448102a92d80db953c51e6200a6 graphviz-2.8.ebuild 1535
-MISC ChangeLog 11671 RMD160 a3cd03524c8739ca20941103777416139a08405e SHA1 c837436a37ac122a207acc536e9a9c5c7279c773 SHA256 78118c6810ed280a92ba7d43e63ce391647f9db1e8a37bfca07235052215c113 size 11671
-MD5 86814a2361eadf0777909d5670a18440 ChangeLog 11671
-RMD160 a3cd03524c8739ca20941103777416139a08405e ChangeLog 11671
-SHA256 78118c6810ed280a92ba7d43e63ce391647f9db1e8a37bfca07235052215c113 ChangeLog 11671
+EBUILD graphviz-2.4.ebuild 1224 RMD160 8df9cccac03003a58134fb2eb85f9649cf5cd513 SHA1 370c12c39c54016e15d18eafd3957bfc4a4ed45b SHA256 f0828037cfbc58f4fe14a34536e633815bbffe96728730b6f83bc2df5323097f size 1224
+MD5 85bf3999272cfed381c79305cb879dd4 graphviz-2.4.ebuild 1224
+RMD160 8df9cccac03003a58134fb2eb85f9649cf5cd513 graphviz-2.4.ebuild 1224
+SHA256 f0828037cfbc58f4fe14a34536e633815bbffe96728730b6f83bc2df5323097f graphviz-2.4.ebuild 1224
+EBUILD graphviz-2.6-r1.ebuild 1671 RMD160 3244a28dbd1bd4fd95f7104fa168dc2055bf8243 SHA1 9002e8a5ef0ac10381278b5d483700cdde50fcdf SHA256 7f70d7f39d55d26806940d7804efab3d73562776d48283616f0217938a7f8042 size 1671
+MD5 a7dec2871d4d7dd2ea0d537fd00bfd66 graphviz-2.6-r1.ebuild 1671
+RMD160 3244a28dbd1bd4fd95f7104fa168dc2055bf8243 graphviz-2.6-r1.ebuild 1671
+SHA256 7f70d7f39d55d26806940d7804efab3d73562776d48283616f0217938a7f8042 graphviz-2.6-r1.ebuild 1671
+EBUILD graphviz-2.6.ebuild 1549 RMD160 ba299f881c440ced6eb472742f79a36806e37ddd SHA1 b095dacd219c92bf2aa08f00eb983186935b8cc5 SHA256 63c480f638d44d9f7de01a9b19955e2cc1f2514c09c1f03c186501b544bf8262 size 1549
+MD5 438266fbe0eee283d43b946f5f400cfb graphviz-2.6.ebuild 1549
+RMD160 ba299f881c440ced6eb472742f79a36806e37ddd graphviz-2.6.ebuild 1549
+SHA256 63c480f638d44d9f7de01a9b19955e2cc1f2514c09c1f03c186501b544bf8262 graphviz-2.6.ebuild 1549
+EBUILD graphviz-2.8.ebuild 1623 RMD160 a03d86270a8726eb45f21d78047677b53f111eaa SHA1 35a247e53d4bca91742ebcb5874e105784b97c56 SHA256 2204531e5ef5b2931414bd923e89b6c74538dd3f1cde724d31708500ae8d3284 size 1623
+MD5 fcdc8533207f5ff293652ea0ab229f78 graphviz-2.8.ebuild 1623
+RMD160 a03d86270a8726eb45f21d78047677b53f111eaa graphviz-2.8.ebuild 1623
+SHA256 2204531e5ef5b2931414bd923e89b6c74538dd3f1cde724d31708500ae8d3284 graphviz-2.8.ebuild 1623
+MISC ChangeLog 11874 RMD160 3ef99a66a815d86bc3d1265b98cb9fcb2509dc23 SHA1 b98546aff75b4335185efe2e59653bb13295a0bf SHA256 980b25c0a366c8689176ff105ad13c9c50d67b957750c5094211fc77bc1fb8f0 size 11874
+MD5 8660c2f1a0ed6e5caea1af0283b9b32a ChangeLog 11874
+RMD160 3ef99a66a815d86bc3d1265b98cb9fcb2509dc23 ChangeLog 11874
+SHA256 980b25c0a366c8689176ff105ad13c9c50d67b957750c5094211fc77bc1fb8f0 ChangeLog 11874
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1 size 1540
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
diff --git a/media-gfx/graphviz/graphviz-2.4.ebuild b/media-gfx/graphviz/graphviz-2.4.ebuild
index ab954ed72062..41436e27e67d 100644
--- a/media-gfx/graphviz/graphviz-2.4.ebuild
+++ b/media-gfx/graphviz/graphviz-2.4.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.4.ebuild,v 1.4 2006/05/28 01:28:54 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.4.ebuild,v 1.5 2006/05/28 02:44:07 nerdboy 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="~amd64 ~arm ~ppc ~ppc-macos ~ppc64 ~s390 ~x86"
-IUSE="cairo tcltk X"
+IUSE="cairo dynagraph tcltk X"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
 	>=media-libs/libpng-1.2
@@ -21,17 +21,18 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 	sys-libs/zlib
 	tcltk? ( >=dev-lang/tk-8.3 )
 	cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
-	X? || (
+	X? ( || (
 	    ( x11-libs/libXaw x11-libs/libXpm )
-	virtual/x11 )"
+	virtual/x11 )
+	)"
 
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
 src_compile() {
 	econf --with-mylibgd \
-		  $(use_with tcltk tcl) \
-		  $(use_with tcltk tk) \
+		  $(use_with dynagraph dynagraph) \
+		  $(use_with tcltk tcl) $(use_with tcltk tk) \
 		  $(use_with X x) || die "Configure Failed!"
 	emake || die "Compile Failed!"
 }
diff --git a/media-gfx/graphviz/graphviz-2.6-r1.ebuild b/media-gfx/graphviz/graphviz-2.6-r1.ebuild
index 8350437067ba..7255a1a4ef61 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.3 2006/05/28 01:28:54 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.6-r1.ebuild,v 1.4 2006/05/28 02:44:07 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -22,9 +22,10 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 	sys-libs/zlib
 	tcltk? ( >=dev-lang/tk-8.3 )
 	cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
-	X? || (
+	X? ( || (
 	    ( x11-libs/libXaw x11-libs/libXpm )
-	virtual/x11 )"
+	virtual/x11 )
+	)"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/media-gfx/graphviz/graphviz-2.6.ebuild b/media-gfx/graphviz/graphviz-2.6.ebuild
index 65d492526703..b096f17e1060 100644
--- a/media-gfx/graphviz/graphviz-2.6.ebuild
+++ b/media-gfx/graphviz/graphviz-2.6.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.ebuild,v 1.8 2006/05/28 01:28:54 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.6.ebuild,v 1.9 2006/05/28 02:44:07 nerdboy Exp $
 
 inherit eutils
 
@@ -10,7 +10,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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="cairo tcltk X static"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
@@ -22,9 +22,10 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 	sys-libs/zlib
 	tcltk? ( >=dev-lang/tk-8.3 )
 	cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
-	X? || (
+	X? ( || (
 	    ( x11-libs/libXaw x11-libs/libXpm )
-	virtual/x11 )"
+	virtual/x11 )
+	)"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/media-gfx/graphviz/graphviz-2.8.ebuild b/media-gfx/graphviz/graphviz-2.8.ebuild
index ee985e68460e..f14a83d24ec4 100644
--- a/media-gfx/graphviz/graphviz-2.8.ebuild
+++ b/media-gfx/graphviz/graphviz-2.8.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.8.ebuild,v 1.1 2006/05/28 01:28:54 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.8.ebuild,v 1.2 2006/05/28 02:44:07 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -16,15 +16,17 @@ IUSE="cairo tcltk X static"
 RDEPEND=">=sys-libs/zlib-1.1.3
 	>=media-libs/libpng-1.2
 	>=media-libs/jpeg-6b
+	media-libs/gd
 	media-libs/freetype
 	media-libs/fontconfig
 	dev-libs/expat
 	sys-libs/zlib
 	tcltk? ( >=dev-lang/tk-8.3 )
 	cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
-	X? || (
+	X? ( || (
 	    ( x11-libs/libXaw x11-libs/libXpm )
-	virtual/x11 )"
+	virtual/x11 )
+	)"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -36,7 +38,9 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --with-mylibgd \
+	local my_conf
+	use no-bindings && my_conf="${my_conf} --disable-swig"
+	econf ${my_conf}  \
 		--disable-dependency-tracking \
 		$(use_enable static) \
 		$(use_with tcltk tcl) \