3 files changed, 42 insertions, 60 deletions
diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 002d17824bce..e438a7271d59 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.48 2005/06/20 21:12:03 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.49 2005/06/26 15:43:30 lu_zero Exp $
+
+  26 Jun 2005; Luca Barbato <lu_zero@gentoo.org> graphviz-2.2.1.ebuild:
+  New version, kindly provided by John Ellson <ellson@research.att.com> in bug
+  #89403
 
   20 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org> graphviz-1.16.ebuild:
   Stable on hppa.
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index db8cbd5fc468..d48414dd5597 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,18 +1,18 @@
-MD5 c0e1368e5d386324e659015a04e00491 graphviz-1.16.ebuild 2123
-MD5 c984115aba076256f2fcce02f63fb625 graphviz-1.10.ebuild 1285
-MD5 7f3f898eedddc37d11de10dd430c38c9 graphviz-2.2.1.ebuild 1905
-MD5 1f5816cd9fda124f103c6c3e3f90f269 graphviz-1.12.ebuild 1389
-MD5 53690a1e00379324ba2c20aafebed50d ChangeLog 6661
-MD5 938c7e9bd5812a82cd91635d4c8023a2 graphviz-2.2.ebuild 1898
-MD5 b081ace823ace2361edbb975e8af27cd graphviz-1.12-r1.ebuild 1894
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
-MD5 cea8244a5db85a3bc5e74e4ecd3c9a2b files/digest-graphviz-1.12 66
+MD5 b081ace823ace2361edbb975e8af27cd graphviz-1.12-r1.ebuild 1894
+MD5 6cf75496e4aa5788a57b08598233e0cc graphviz-2.2.1.ebuild 1138
+MD5 938c7e9bd5812a82cd91635d4c8023a2 graphviz-2.2.ebuild 1898
+MD5 1f5816cd9fda124f103c6c3e3f90f269 graphviz-1.12.ebuild 1389
+MD5 43c048d211922fb17635d8f4eadf987e ChangeLog 6820
+MD5 c984115aba076256f2fcce02f63fb625 graphviz-1.10.ebuild 1285
+MD5 c0e1368e5d386324e659015a04e00491 graphviz-1.16.ebuild 2123
+MD5 5c7f01258da58810d0175461e0c1d14b files/graphviz-1.16-common_h.patch 292
 MD5 54cdc52906c56a19e4e09cd0773d4633 files/digest-graphviz-1.12-r1 139
+MD5 5e8726d7d859188692efcfe9e9155761 files/gdgen.c.patch 756
+MD5 280fc858f990639d5d8fb7102b2636ac files/graphviz-1.16-build.patch 6200
 MD5 6700ac8c3ea388f54326ca2a57784a1c files/graphviz-1.12-build.patch 1514
-MD5 5c7f01258da58810d0175461e0c1d14b files/graphviz-1.16-common_h.patch 292
+MD5 cea8244a5db85a3bc5e74e4ecd3c9a2b files/digest-graphviz-1.12 66
 MD5 ea7e00b7c49179d3961458a98aee9d6c files/digest-graphviz-1.10 66
 MD5 9ebf9ffcce27ea71d28da323a9221356 files/digest-graphviz-2.2 65
-MD5 fd083ee967ab029fd47a155ba572ac60 files/digest-graphviz-2.2.1 67
-MD5 280fc858f990639d5d8fb7102b2636ac files/graphviz-1.16-build.patch 6200
-MD5 5e8726d7d859188692efcfe9e9155761 files/gdgen.c.patch 756
 MD5 f903a12f0ed9c89432dee821776f4e97 files/digest-graphviz-1.16 141
+MD5 fd083ee967ab029fd47a155ba572ac60 files/digest-graphviz-2.2.1 67
diff --git a/media-gfx/graphviz/graphviz-2.2.1.ebuild b/media-gfx/graphviz/graphviz-2.2.1.ebuild
index b207699cd331..83498fe30d5d 100644
--- a/media-gfx/graphviz/graphviz-2.2.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.2.1.ebuild
@@ -1,62 +1,40 @@
 # Copyright 1999-2005 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.2 2005/06/14 03:33:02 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.2.1.ebuild,v 1.3 2005/06/26 15:43:30 lu_zero Exp $
 
-inherit gnuconfig eutils flag-o-matic
-
-DESCRIPTION="open source graph drawing software"
-HOMEPAGE="http://www.research.att.com/sw/tools/graphviz/"
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="http://www.graphviz.org/"
 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 ~sparc ~x86"
-IUSE="tcltk"
-
-#Can use freetype-1.3 or 2.0, but not both
-DEPEND=">=sys-libs/zlib-1.1.3
-	>=media-libs/libpng-1.2
-	>=media-libs/jpeg-6b
-	media-libs/freetype
-	dev-util/pkgconfig
-	>=media-libs/gd-2.0.32
-	media-libs/fontconfig
-	tcltk? ( >=dev-lang/tk-8.3 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Run gnuconfig_update on all arches, needed at least for mips
-	gnuconfig_update
-
-	if ! use ppc-macos; then
-		#EPATCH_OPTS="-p1 -d${S}" epatch ${FILESDIR}/${P}-fontconfig-externalgd.diff || die "Failed to patch"
-		einfo "Running aclocal/automake/autoconf"
-		aclocal && libtoolize --copy --force && automake -a -c -f && autoconf || die "Failed	to aclocal/libtoolize/automake/autoconf"
-	fi
-}
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cairo dynagraph tcltk X"
+
+RDEPEND=">=sys-libs/zlib-1.1.3
+		 >=media-libs/libpng-1.2
+		 >=media-libs/jpeg-6b
+		   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 )"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
 
 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"
-
-	myconf="${myconf} --disable-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"
-	econf ${myconf} || die "econf failed"
-
-	emake || die
+	econf --with-mylibgd \
+		  $(use_with dynagraph dynagraph) \
+		  $(use_with tcltk tcl) $(use_with tcltk tk) \
+		  $(use_with X x) || die "Configure Failed!"
+	emake || die "Compile Failed!"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "Install Failed!"
 
-	dodoc AUTHORS ChangeLog FAQ.txt INSTALL*  MINTERMS.txt \
-		NEWS README*
-
-	dohtml -r .
+	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
 	dodoc doc/*.pdf doc/Dot.ref
+	dohtml -r .
 }