Bugs #58592, #73218.

5 files changed, 65 insertions, 14 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 99f3add830e3..3fa8339889b5 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,14 +1,18 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.34 2004/11/07 20:37:10 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.35 2004/12/14 10:17:47 robbat2 Exp $
 
-*graphviz-1.12-r1 (07 Nov 2004)
+*graphviz-1.16 (14 Dec 2004)
+
+  14 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> graphviz-1.12-r1.ebuild,
+  graphviz-1.16:
+  Bugs #58592, #73218.
 
   07 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
   graphviz-1.10.ebuild, graphviz-1.12-r1.ebuild, graphviz-1.12.ebuild:
   Fixed URI_SRC to download new configure script. bug #70086 and fixed LICENCEs
 
-*graphviz-1.22-r1 (25 Jul 2004)
+*graphviz-1.12-r1 (25 Jul 2004)
 
   25 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> :
   bug #58028, improved to be cleaner.
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 65fb5c2d7f50..d30dbe310767 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 7fcb08a10306bfe8cf031451d01d62eb graphviz-1.16.ebuild 1240
 MD5 67732cb5b21729d0b06c9ace3c2c8b19 graphviz-1.10.ebuild 1288
 MD5 e64cab5af15602e9087e7ede9f01a333 graphviz-1.12-r1.ebuild 1870
 MD5 cd78fc96a9e73a1cacf80bb26a5d0203 ChangeLog 4793
@@ -11,10 +9,4 @@ MD5 5e8726d7d859188692efcfe9e9155761 files/gdgen.c.patch 756
 MD5 54cdc52906c56a19e4e09cd0773d4633 files/digest-graphviz-1.12-r1 139
 MD5 ea7e00b7c49179d3961458a98aee9d6c files/digest-graphviz-1.10 66
 MD5 cea8244a5db85a3bc5e74e4ecd3c9a2b files/digest-graphviz-1.12 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBjod/Z/iYVBmujdURAiKPAJ45Xrbq1GH6aUeQ4RRIRRDZIDHFVwCdHdYN
-RtqMt7ki/iJFo3lRch/o4ao=
-=BYFq
------END PGP SIGNATURE-----
+MD5 436cf9347b2758967b44b6f4db7174f2 files/digest-graphviz-1.16 66
diff --git a/media-gfx/graphviz/files/digest-graphviz-1.16 b/media-gfx/graphviz/files/digest-graphviz-1.16
new file mode 100644
index 000000000000..77d32bb2f943
--- /dev/null
+++ b/media-gfx/graphviz/files/digest-graphviz-1.16
@@ -0,0 +1 @@
+MD5 a2a3bd1b9fe807c46e676fb9a3f0ba22 graphviz-1.16.tar.gz 4387670
diff --git a/media-gfx/graphviz/graphviz-1.12-r1.ebuild b/media-gfx/graphviz/graphviz-1.12-r1.ebuild
index fb03e7b35d5f..941832fabd66 100644
--- a/media-gfx/graphviz/graphviz-1.12-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-1.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.12-r1.ebuild,v 1.4 2004/11/07 20:37:10 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.12-r1.ebuild,v 1.5 2004/12/14 10:17:47 robbat2 Exp $
 
 inherit gnuconfig eutils
 
@@ -19,6 +19,7 @@ DEPEND=">=sys-libs/zlib-1.1.3
 	>=media-libs/libpng-1.2
 	>=media-libs/jpeg-6b
 	media-libs/freetype
+	dev-util/pkgconfig
 	tcltk? ( >=dev-lang/tk-8.3 )"
 
 src_unpack() {
diff --git a/media-gfx/graphviz/graphviz-1.16.ebuild b/media-gfx/graphviz/graphviz-1.16.ebuild
new file mode 100644
index 000000000000..87e81eab928d
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-1.16.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.16.ebuild,v 1.1 2004/12/14 10:17:47 robbat2 Exp $
+
+inherit gnuconfig eutils
+
+DESCRIPTION="open source graph drawing software"
+HOMEPAGE="http://www.research.att.com/sw/tools/graphviz/"
+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 ~ppc64 ~s390 ~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
+	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
+}
+
+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} --enable-dynagraph"
+	econf ${myconf} || die "econf failed"
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS ChangeLog FAQ.txt INSTALL*  MINTERMS.txt \
+		NEWS README*
+
+	dohtml -r .
+	dodoc doc/*.pdf doc/Dot.ref
+}