version bump (reported in bug #213609), this should also fix the libtool-2.2 breakage (bug #212755). Our patches aren't needed anymore, I sent them to upstream.

Package-Manager: portage-2.1.4.4

3 files changed, 237 insertions, 5 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 01d7818b9b93..cec1e47c3e2e 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.145 2008/03/15 14:20:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.146 2008/03/16 20:50:02 maekke Exp $
+
+*graphviz-2.18 (16 Mar 2008)
+
+  16 Mar 2008; Markus Meier <maekke@gentoo.org> +graphviz-2.18.ebuild:
+  version bump (reported in bug #213609), this should also fix the
+  libtool-2.2 breakage (bug #212755). Our patches aren't needed anymore, I
+  sent them to upstream.
 
 *graphviz-2.16.1-r4 (15 Mar 2008)
 
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 952fc381b0ab..289d72b3f576 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -14,18 +14,20 @@ AUX graphviz-2.16.1-python-buildfix.patch 642 RMD160 4379fcaea7296e4d550477462a3
 AUX graphviz-2.16.1-tcltk.patch 623 RMD160 13c3764098a6229cef869962f9604737c97d7bae SHA1 905e2890106d7d8d9356f3346a06bfc403247838 SHA256 d455e80fcf948298d6aa78c84e54f954c031cae506925719c7d9cc8efeaeaa49
 DIST graphviz-2.12.tar.gz 4607023 RMD160 68d55176cd5ce0e6a25c90b443529747e738d5c6 SHA1 aa48a926395a57c6c7e1e755b9432a29461538e3 SHA256 5191892d7950c28754659f703234f7888f132440a049f0d396f287b202f9e37f
 DIST graphviz-2.16.1.tar.gz 8076271 RMD160 6d0f23fa176a1bef7ee0ca48cf1b700fe6cbfb42 SHA1 46b704bd9b81922bcd17167c88f3278a9645e894 SHA256 32c1a185ba39961935f104cc47d2bceea327c0de8c5636edc6ab83ac3c0c56d1
+DIST graphviz-2.18.tar.gz 13322519 RMD160 2c7f23af1a9e480ab6cc5f5f39edad7a5da3ceae SHA1 b638181cf776bc4bb1fa8f95525a3943feb18b4a SHA256 6bc51969fa54c6ee3e64d8a4277c576931d50577b02114115668eeb5e515b42c
 EBUILD graphviz-2.12.ebuild 5491 RMD160 02f9fb2eae2db541154c543ff07d0e82326ae73b SHA1 fc0dd7a6528f30fd261cbe7a3dd460e1ebf52f29 SHA256 759f2539a16fa7037848819df8a80c1896b65ca6cde7f6c3ad476fe26b8c6719
 EBUILD graphviz-2.16.1-r1.ebuild 6015 RMD160 6d5e2b87d9e9cd0bafbca8d07f0179f2290346e5 SHA1 33b4b45fc578d4ab049805a3cfe9bb59c2c55766 SHA256 fb8b699b05865d7edf1450f37b9c2157e173e770b0e6520eae7164d299277abd
 EBUILD graphviz-2.16.1-r2.ebuild 6090 RMD160 c342a50a5b31a66d51ff8af4138f88590bc98a28 SHA1 8891f299b9eb901ed2324c97c80d6c9b5a9beb01 SHA256 d78bf7fa23d8d3eb6550a5d467a2f93f3ab0bdbc93b3c7716648b0ad403fafd1
 EBUILD graphviz-2.16.1-r3.ebuild 5927 RMD160 39fd174786f4d62d3e2f8d210cd1f1b813036a6d SHA1 6d3e386d7b1ea96107192c6c743481f4c4b88aae SHA256 d947963c493a317cbce8eea4aaf069fbb91fa8ba0046c799d5715ba621f7677b
 EBUILD graphviz-2.16.1-r4.ebuild 6041 RMD160 88d805df69189f2fea67812af0a2e392f31a1cf9 SHA1 d23d9b159ae9ad047257b6ce4ff068cb5f6fe6d0 SHA256 33ac852c7ff25a4653a4308f37e725af326c5a055ebeb8bac164bd78a077e2e0
 EBUILD graphviz-2.16.1.ebuild 5978 RMD160 01fe950a684fb11e79b5386e3c9c4b34b3179f71 SHA1 5b3039c8765ad367c4479907ddca14f72b6b3057 SHA256 21bb381d34054f500f023798e00a4f739fce67bba326469e2e6babef31b22c68
-MISC ChangeLog 22250 RMD160 cb6c03671024738a0a7f7617823fd35217a3f842 SHA1 0513e7a3874484d56c389b955d5b6dae7a21c907 SHA256 95b2923c57cfbe1db76ed41c8ae6f2f3550488f0b43c85d09b15fac90b9f2b75
+EBUILD graphviz-2.18.ebuild 5889 RMD160 2213050a04767bc2031b7954a70f0bc1e275a373 SHA1 1a8212995816f2a3319da5a84f6574fe01c4d096 SHA256 ed857af4b557cb0b59bee9c94545c023a09a080c25c6ae2ab2bcff4b0c7e7440
+MISC ChangeLog 22519 RMD160 dc32f7f32d0c67c346644385e4cc771ade6965f1 SHA1 947356474292b3ee27edc04d0baab2269fc861c6 SHA256 d310de445371f145ffaac3ba56a497a60c6146139d43a1404d4dbbc73053b290
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH29tbkKaRLQcq0GIRApRuAKCTz/M1959KB6g5aDNOxe3Z8mzUuACdExgx
-RCGX7UmwCPhNiRm0XI3hQBQ=
-=qSNo
+iD8DBQFH3YhBkKaRLQcq0GIRAqV7AKCyuUXSJQzprnmdDdVjl2jd83ltLwCggTOW
+p8s68M/MjvqPZH2gNvmTRBo=
+=fgsT
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.18.ebuild b/media-gfx/graphviz/graphviz-2.18.ebuild
new file mode 100644
index 000000000000..e70236efe0ca
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.18.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.18.ebuild,v 1.1 2008/03/16 20:50:02 maekke Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit eutils autotools multilib python
+
+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 ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="doc examples gnome gtk jpeg nls perl png python ruby tcl tk"
+
+# Requires ksh
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/expat-2.0.0
+	>=dev-libs/glib-2.11.1
+	>=media-libs/fontconfig-2.3.95
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.28
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.10
+	virtual/libiconv
+	ruby?	( dev-lang/ruby )
+	tcl?	( >=dev-lang/tcl-8.3 )
+	tk?		( >=dev-lang/tk-8.3 )
+	gtk?	(
+		>=x11-libs/gtk+-2
+		x11-libs/libXaw
+		>=x11-libs/pango-1.12
+		>=x11-libs/cairo-1.1.10
+		gnome? ( gnome-base/libgnomeui )
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.20
+	nls?	( >=sys-devel/gettext-0.14.5 )
+	perl?	( dev-lang/swig )
+	python?	( dev-lang/swig )
+	ruby?	( dev-lang/swig )
+	tcl?	( dev-lang/swig )"
+
+# Dependency description / Maintainer-Info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+#   the ones which are always compiled in, depend on zlib, gd
+# - gtk
+#   Directly depends on gtk-2.
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Disabled, GTK-1 junk.
+# - ming
+#   Disabled, depends on ming-3.0 which is still p.masked.
+# - cairo:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib :
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support,
+#   needs libXaw for UI
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... broken on ~x86
+# - io (disabled)
+# - java (enabled via java) *2
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, dotty, gvpr, lefty, lneato, tools/* :)
+# Lefty needs Xaw and X to build
+
+pkg_setup() {
+	if use tcl && ! built_with_use dev-lang/swig tcl ; then
+		eerror "SWIG has to be built with tcl support."
+		die "Missing tcl USE-flag for dev-lang/swig"
+	fi
+
+	# bug 181147
+	local gdflags
+	use png && gdflags="png"
+	use jpeg && gdflags="${gdflags} jpeg"
+	if [[ -n ${gdflags} ]] && ! built_with_use media-libs/gd ${gdflags} ; then
+		local diemsg="Re-emerge media-libs/gd with USE=\"${gdflags}\""
+		eerror "${diemsg}"
+		die "${diemsg}"
+	fi
+
+	# bug 202781
+	if use gtk && ! built_with_use x11-libs/cairo svg ; then
+		eerror "x11-libs/cairo has to be built with svg support"
+		die "emerge x11-libs/cairo with USE=\"svg\""
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# ToDo: Do the same thing for examples and/or
+	#       write a patch for a configuration-option
+	#       and send it to upstream
+	if ! use doc ; then
+		find . -iname Makefile.am \
+			| xargs sed -i -e '/html_DATA/d' -e '/pdf_DATA/d' || die
+	fi
+
+	# This is an old version of libtool
+	rm -rf libltdl
+	sed -i -e '/libltdl/d' configure.ac || die
+
+	# Update this file from our local libtool which is much newer than the
+	# bundled one. This allows MAKEOPTS=-j2 to work on FreeBSD.
+	if has_version ">=sys-devel/libtool-2" ; then
+		cp /usr/share/libtool/config/install-sh config
+	else
+		cp /usr/share/libtool/install-sh config
+	fi
+
+	# no nls, no gettext, no iconv macro, so disable it
+	use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
+
+	# Nuke the dead symlinks for the bindings
+	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
+
+	# replace the whitespace with tabs
+	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	# Core functionality:
+	# All of X, cairo-output, gtk need the pango+cairo functionality
+	myconf="${myconf}
+		$(use_with gtk)
+		$(use_with gtk x)
+		$(use_with gtk pangocairo)
+		--without-ming
+		--with-digcola
+		--with-ipsepcola
+		--with-fontconfig
+		--with-freetype
+		--with-libgd
+		--without-gdk-pixbuf"
+
+	use gtk && myconf="${myconf} $(use_with gnome gnomeui)"
+
+	# Bindings:
+	myconf="${myconf}
+		--disable-guile
+		--disable-java
+		--disable-io
+		--disable-lua
+		--disable-ocaml
+		$(use_enable perl)
+		--disable-php
+		$(use_enable python)
+		$(use_enable ruby)
+		--disable-sharp
+		$(use_enable tcl)
+		$(use_enable tk)"
+
+	econf \
+		--enable-ltdl \
+		${myconf} \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
+
+	emake DESTDIR="${D}" \
+		txtdir=/usr/share/doc/${PF} \
+		htmldir=/usr/share/doc/${PF}/html \
+		htmlinfodir=/usr/share/doc/${PF}/html/info \
+		pdfdir=/usr/share/doc/${PF}/pdf \
+		pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+		install || die "emake install failed"
+
+	use examples || rm -rf "${D}/usr/share/graphviz/demo"
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	# This actually works if --enable-ltdl is passed
+	# to configure
+	dot -c
+	if use python ; then
+		python_mod_optimize
+	fi
+}
+
+pkg_postrm() {
+	if use python ; then
+		python_mod_cleanup
+	fi
+}