fixed deps and made gd external (per upstream recommendation)

(Portage version: 2.1_rc1-r3)

5 files changed, 29 insertions, 18 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/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) \