bug #58028, improved to be cleaner.

5 files changed, 110 insertions, 3 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index d06654646127..fd142622d1d1 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,9 @@
 # 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.31 2004/07/22 16:18:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.32 2004/07/26 03:24:27 robbat2 Exp $
+
+  25 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> :
+  bug #58028, improved to be cleaner.
 
   22 Jul 2004; Aron Griffis <agriffis@gentoo.org> graphviz-1.10.ebuild:
   Update SRC_URI #53602, bump to 1.12 #52343, run gnuconfig_update in src_unpack
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index c251d4a496b4..b2302ce1436d 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,7 +1,11 @@
 MD5 297beb1f832c3775da0c59f630a4bc00 graphviz-1.10.ebuild 1280
+MD5 48844a4fa20861f9ea3965983d974473 graphviz-1.12-r1.ebuild 1773
+MD5 341e6474ba727cd6c24908cea6d5cf01 ChangeLog 4490
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 MD5 e784856bcb9a9a11b1adaec31eab51d0 graphviz-1.12.ebuild 1375
-MD5 0424d7644b13f153381446e7b58e794b ChangeLog 4396
-MD5 ea7e00b7c49179d3961458a98aee9d6c files/digest-graphviz-1.10 66
+MD5 6700ac8c3ea388f54326ca2a57784a1c files/graphviz-1.12-build.patch 1514
+MD5 673dfc4f812d7e13c39517c1109d6b65 files/graphviz-1.12-configure.ac.bz2 7502
 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
diff --git a/media-gfx/graphviz/files/digest-graphviz-1.12-r1 b/media-gfx/graphviz/files/digest-graphviz-1.12-r1
new file mode 100644
index 000000000000..462b891cceb7
--- /dev/null
+++ b/media-gfx/graphviz/files/digest-graphviz-1.12-r1
@@ -0,0 +1,2 @@
+MD5 84910caae072c714d107ca9f3e54ace0 graphviz-1.12.tar.gz 3371279
+MD5 673dfc4f812d7e13c39517c1109d6b65 graphviz-1.12-configure.ac.bz2 7502
diff --git a/media-gfx/graphviz/files/graphviz-1.12-build.patch b/media-gfx/graphviz/files/graphviz-1.12-build.patch
new file mode 100644
index 000000000000..38c8b39b58f3
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-1.12-build.patch
@@ -0,0 +1,33 @@
+--- INSTALL	2 Nov 2000 01:15:04 -0000	1.2
++++ INSTALL	23 Apr 2004 18:09:34 -0000	1.3
+@@ -21,8 +21,8 @@ diffs or instructions to the address giv
+ be considered for the next release.  If at some point `config.cache'
+ contains results you don't want to keep, you may remove or edit it.
+ 
+-   The file `configure.in' is used to create `configure' by a program
+-called `autoconf'.  You only need `configure.in' if you want to change
++   The file `configure.ac' is used to create `configure' by a program
++called `autoconf'.  You only need `configure.ac' if you want to change
+ it or regenerate `configure' using a newer version of `autoconf'.
+ 
+ The simplest way to compile this package is:
+===================================================================
+--- Makefile.am	2004-03-02 00:03:27.000000000 +0100
++++ Makefile.am	2004-07-24 02:50:30.000000000 +0200
+@@ -8,7 +8,7 @@
+ SUBDIRS = cdt agraph agutil doc pathplan graph gd dotneato \
+ 	dotty graphs lefty lneato ns \
+ 	tclstubs tclhandle gdtclft tcldot tclpathplan \
+-        tkstubs tkspline tools contrib dynagraph windows
++        tkstubs tkspline tools contrib dynagraph
+ 
+ #dag fdp geo grid incr shape tcldgr tcldgl
+ 
+@@ -27,6 +27,6 @@
+ 	FAQ.txt MINTERMS.txt autogen.sh depcomp ast_common.h.in \
+ 	Makefile.old Config.mk configure.old INSTALL.old \
+ 	Makeargs config.h.old compat_getopt.h LICENSE.html iffe \
+-	makearch dot.demo features m4
++	makearch dot.demo features m4 windows
+ 
+ DISTCLEANFILES = pkgIndex.tcl ast_common.h FEATURE/* graphviz-@VERSION@*
diff --git a/media-gfx/graphviz/graphviz-1.12-r1.ebuild b/media-gfx/graphviz/graphviz-1.12-r1.ebuild
new file mode 100644
index 000000000000..c96b17a3b854
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-1.12-r1.ebuild
@@ -0,0 +1,65 @@
+# 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.1 2004/07/26 03:24:27 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="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+IUSE="tcltk"
+
+#remove this for 1.13
+#the d.g.o location is there until it propogates to mirrors
+SRC_URI="${SRC_URI} mirror://gentoo/${P}-configure.ac.bz2 http://dev.gentoo.org/~robbat2/distfiles/${P}-configure.ac.bz2"
+
+#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
+	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
+
+	# this next chunk will be obsolete when 1.13 comes out
+	# it's a buildfix so that graphviz will build when TckTk is NOT being used
+	# and is not installed.
+	epatch ${FILESDIR}/${P}-build.patch || die "Failed to patch"
+	einfo "Installing new configure.ac"
+	bzcat ${DISTDIR}/${P}-configure.ac.bz2 > ${S}/configure.ac || die "Failed to extract configure.ac"
+	einfo "Removing old configure.in"
+	rm -f ${S}/configure.in || die "Failed to remove old configure.in"
+	einfo "Running aclocal/automake/autoconf"
+	aclocal && automake && autoconf || die "Failed to aclocal/automake/autoconf"
+}
+
+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"
+
+	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
+}