bump to 2.26.0

Package-Manager: portage-2.2_rc61/cvs/Linux i686

3 files changed, 232 insertions, 2 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 07adcf6616ed..2dc379d88f62 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.208 2009/11/04 18:18:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.209 2009/12/29 13:02:28 maekke Exp $
+
+*graphviz-2.26.0 (29 Dec 2009)
+
+  29 Dec 2009; Markus Meier <maekke@gentoo.org> +graphviz-2.26.0.ebuild:
+  bump to 2.26.0
 
   04 Nov 2009; Raúl Porcel <armin76@gentoo.org> graphviz-2.24.0-r2.ebuild:
   ia64/s390/sh/sparc stable wrt #284689
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index ee2f12e556d2..d0529fc4475b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX graphviz-2.12-bindings.patch 4589 RMD160 129ec88bc42df0555ac96abfa9bf8d4e48378b6c SHA1 1f591d4a9e884fdc6181aad822eab9f06832901b SHA256 75120e3c7d9636fc35e2802d7c1b9902faa5e901a17ab88f939a020970776820
 AUX graphviz-2.12-configure.patch 856 RMD160 3d1fe3d11498629bb7738d5219a824857830a5e9 SHA1 d420c55e28bbcdbf030ff203f0581b40bbceca3e SHA256 660a8df758487f21810e6d7fa647221d4443463eca2c2053399b2e782b208348
 AUX graphviz-2.12-find-system-libgd.patch 379 RMD160 0e9fc08b07c038986955353f7063fd954e70b5ab SHA1 b1a6f1f950a0e7484960f6604e9b0d9469e71633 SHA256 b578b083ae55b959f6aac0208296aaa5513627802441e5a4a79ed4f09d26ccb8
@@ -12,11 +15,20 @@ DIST graphviz-2.20.3.tar.gz 13381532 RMD160 64c80f3af55668e487f911132407c332c3c3
 DIST graphviz-2.22.1.tar.gz 16671625 RMD160 14c190c2b0a940fef6cdc35555b57d5725540bc6 SHA1 ec5f1f62f70bcba7b58be1101ac8431809aef0de SHA256 6c2017cf15f50d49c399abf433a8787e41ad56823dfeff4e130d0f1004d22444
 DIST graphviz-2.22.2.tar.gz 16674049 RMD160 546eebc1a0b97ffdc431a986102c9e25d1ea216e SHA1 92b40b1fb596a6b3e880e74101921d7681f62c94 SHA256 fb08b49592bb83d4e7659776033f4137753d908681f19e3d1f8a8a415550edfb
 DIST graphviz-2.24.0.tar.gz 16746568 RMD160 d003cfa57e73c44fbb71ae8f8726ecc9c74735f9 SHA1 1d91b3a7d2c7fa15e5e718eb456210cd15731e14 SHA256 01182be7851ef6d292a916b19ac25a33bce5dccbd4661bf3101abbd3dfb1ae00
+DIST graphviz-2.26.0.tar.gz 16946980 RMD160 58af87cca486fb8aa42cef6d5a77cbb68af76607 SHA1 e78d93f62738b978d41641a05cc453b7edaa8398 SHA256 2f37344050de50e28dd04a625ae32f881542586ff20209e342ce17969f680691
 EBUILD graphviz-2.12.ebuild 5429 RMD160 331d3dd069d3390536f00ebf43465183ee0fa171 SHA1 2957165209c477efceea7aa30dca65171506d76d SHA256 2bc10ad6fb81afe462114ed4526942870b1994b2f6567266af3be8d9bb30a223
 EBUILD graphviz-2.20.3.ebuild 6335 RMD160 562ffc55fb3b59306358ea39e59309a9a7b9dc5b SHA1 4587a3516c3ea5ccb34623ab37103e3864968ba2 SHA256 a6fff79d3a39c47d63c59e841a48e2be85627c16d4265e5c40d7cacc6df16734
 EBUILD graphviz-2.22.1.ebuild 5492 RMD160 9dcc131c8ef257911817b2fa5f4bfb57ad8c5599 SHA1 b47222afb3b93c8c7fe367239efd6792bbb44ccc SHA256 c2dce3dd348ede60186c28bc27c9adbca96c1c4e27372cf1158eb5be4bab74fe
 EBUILD graphviz-2.22.2-r1.ebuild 5770 RMD160 c8fee1949b25cedaa2198519b7f444d1836cffdb SHA1 6aafee750a8d0db28d34f7f355ba1ac172805b5e SHA256 3e8f8a74b6bae7f03c2194290e550e51b45d90d0e6ed556302f42433021468f5
 EBUILD graphviz-2.22.2.ebuild 5492 RMD160 845030570dbe8af6ef3f9e8f0c57bff5ae5c531b SHA1 88130d74b14c3bb09c20ad535912c6537b7fd7c5 SHA256 4112282e8bc0b1003090cf32f270156ae3af72bbffd5854f6b3ed251dacd0522
 EBUILD graphviz-2.24.0-r2.ebuild 5679 RMD160 3b1ae9f1712738974b2afef71efb9bc5ce07f2df SHA1 9ea31efe5fca4f52b24e00e9c30dce479934e0fe SHA256 27b66e166a65c6c85a9a7d577702341a583a319e24ef21d626d799d59a07307f
-MISC ChangeLog 30395 RMD160 e4493d0aaacaa53711c8d8e642f3b804ec30cc85 SHA1 6931cb2d769ba9d057cf8ff8072682eba3fb5070 SHA256 1f8f20216322b7893222c39d8f55afedab4cf08e13cd9f28c6d5984b47177783
+EBUILD graphviz-2.26.0.ebuild 5715 RMD160 6101605e437865fa75e2d3e6f40f72ff28af8675 SHA1 8200c0683ed4335a5846481fa2848f55136ea606 SHA256 5ae01dd6c889c45e8124106009830739a4f1913561fde95a032c72a44aa8b416
+MISC ChangeLog 30517 RMD160 aabb50cf8fbce9509411d6d12b1a1c818f755613 SHA1 cde0e04860fa88f092030057f58e7d2eaf064eb9 SHA256 3007c6023c8847a7a92f2313b5f5ad5e9756114f6826d9037f2546317ddbbe6d
 MISC metadata.xml 1860 RMD160 81088772ed3740ea2203e44658810083131f73b1 SHA1 693e6bee10a852950747df9a9eebc19e560bcc8e SHA256 6356eef06b745c3f8275d10df402d635f4470be57e426c2a5efb6dd898fc26aa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAks5/jEACgkQkKaRLQcq0GJopQCgjABHE+biowgJQURtjA3Nx4cw
+OiAAoIH4vHNBHgKrAeDUUU9eVMd8k93g
+=0c2G
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.26.0.ebuild b/media-gfx/graphviz/graphviz-2.26.0.ebuild
new file mode 100644
index 000000000000..23f23ccf255d
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.26.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.0.ebuild,v 1.1 2009/12/29 13:02:28 maekke Exp $
+
+EAPI=2
+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 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="cairo doc examples gtk java lasi nls perl python ruby tcl"
+
+# 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[jpeg,png]
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.10
+	virtual/libiconv
+	cairo?	(
+		x11-libs/libXaw
+		>=x11-libs/pango-1.12
+		>=x11-libs/cairo-1.1.10[svg]
+	)
+	gtk?	(
+		>=x11-libs/gtk+-2
+		x11-libs/libXaw
+		>=x11-libs/pango-1.12
+		>=x11-libs/cairo-1.1.10
+	)
+	lasi?	( media-libs/lasi )
+	ruby?	( dev-lang/ruby )
+	tcl?	( >=dev-lang/tcl-8.3 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/flex
+	java?	( dev-lang/swig )
+	nls?	( >=sys-devel/gettext-0.14.5 )
+	perl?	( dev-lang/swig )
+	python?	( dev-lang/swig )
+	ruby?	( dev-lang/swig )
+	tcl?	( || ( <dev-lang/swig-1.3.38[tcl]
+		>=dev-lang/swig-1.3.38 ) )"
+
+# 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
+#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+#   incomplete.
+# - 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
+
+src_prepare() {
+	# 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
+	sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' 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 || die
+	else
+		cp /usr/share/libtool/install-sh config || die
+	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_configure() {
+	# libtool file collision, bug 276609
+	local myconf="--disable-ltdl-install"
+
+	# Core functionality:
+	# All of X, cairo-output, gtk need the pango+cairo functionality
+	if use gtk || use cairo; then
+		myconf="${myconf} --with-x"
+	else
+		myconf="${myconf} --without-x"
+	fi
+	myconf="${myconf}
+		$(use_with cairo pangocairo)
+		$(use_with gtk)
+		$(use_with lasi)
+		--with-digcola
+		--with-fontconfig
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--without-gdk-pixbuf
+		--without-ming"
+
+	# new/experimental features, to be tested, disable for now
+	myconf="${myconf}
+		--without-cgraph
+		--without-devil
+		--without-digcola
+		--without-ipsepcola
+		--without-sfdp
+		--without-smyrna"
+
+	# Bindings:
+	myconf="${myconf}
+		--disable-guile
+		--disable-io
+		$(use_enable java)
+		--disable-lua
+		--disable-ocaml
+		$(use_enable perl)
+		--disable-php
+		$(use_enable python)
+		--disable-r
+		$(use_enable ruby)
+		--disable-sharp
+		$(use_enable tcl)"
+
+	econf \
+		--enable-ltdl \
+		${myconf}
+}
+
+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
+}