version bump

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

3 files changed, 225 insertions, 5 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 1f6dd5b04d35..97dc4b770123 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.213 2010/01/14 17:57:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.214 2010/02/07 22:42:21 maekke Exp $
+
+*graphviz-2.26.3 (07 Feb 2010)
+
+  07 Feb 2010; Markus Meier <maekke@gentoo.org> +graphviz-2.26.3.ebuild:
+  version bump
 
   14 Jan 2010; Markus Meier <maekke@gentoo.org> -graphviz-2.12.ebuild,
   -files/graphviz-2.12-bindings.patch, -files/graphviz-2.12-configure.patch,
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 06fbdc611d31..be8bd50b062d 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 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
+DIST graphviz-2.26.3.tar.gz 17092429 RMD160 b2fbaf03b2006b43ed70e2a710363d7efbcfda77 SHA1 04503ac5a9eaa579859f0d017811fa245717edec SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1
 EBUILD graphviz-2.24.0-r2.ebuild 5674 RMD160 ea2e7cf1666c7c6edfc6709d5934468c60cd0699 SHA1 5c4032bbbe7c5ad3fd95528b6009a6c48322b25c SHA256 174548894be80d6c3553d7d024cd88b14335b3d5c13a72063cc25b45fcce6b54
 EBUILD graphviz-2.26.0.ebuild 5715 RMD160 6101605e437865fa75e2d3e6f40f72ff28af8675 SHA1 8200c0683ed4335a5846481fa2848f55136ea606 SHA256 5ae01dd6c889c45e8124106009830739a4f1913561fde95a032c72a44aa8b416
-MISC ChangeLog 31370 RMD160 0744246284e21f23ac6bf8a8be37f5083600cc22 SHA1 2c6f2c3ae47f677129eea91a4e3841a424e3d7f3 SHA256 706ad24cb514ee81c7d62d8d42bd00a45a6bdee7d60a7b9b0d81579f5708cfd8
+EBUILD graphviz-2.26.3.ebuild 5715 RMD160 74c6de4898524917f5d83772ae46409035ffdf23 SHA1 9a85f58f90619791a97d622787449955450e6483 SHA256 0acdf6951ee68d630996775fb4112a66fb25ebc2923a18651d983793aa37e3fc
+MISC ChangeLog 31491 RMD160 f53bf2b8cbcab1c19b56f0b16a59ea878636da15 SHA1 d51f0b98921d7353169e6af7468bc65c04d34c0e SHA256 eb9774861eea692c9db1f55e73c48de0668e23399803ee84455c907cb3aa6a3a
 MISC metadata.xml 1649 RMD160 e2238f2d7f945b9d05aa7cea65ed3a5b4f635251 SHA1 68476203394f16fd247976409d614596138431db SHA256 1d35d9b4fbceffa67229a5e0fcf3537f77bf05e00fbdb5ec0c3c82c4c845cc2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktPW3MACgkQkKaRLQcq0GKkxQCeNPW8TiyxVuyZPsr1hSLbfOAD
-tk0Aniem2kJtQ03fCRVIPUwV7PW4qOGo
-=YoO8
+iEYEARECAAYFAktvQicACgkQkKaRLQcq0GKfJgCdHSlt4CQoMkM8em0VbDSUJMVg
+uRAAoJQjRSCKSq9DffyqrfAaM+vEqQ65
+=3ykQ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.26.3.ebuild b/media-gfx/graphviz/graphviz-2.26.3.ebuild
new file mode 100644
index 000000000000..20e1b81ebe65
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.26.3.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3.ebuild,v 1.1 2010/02/07 22:42:21 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
+}