Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 278 insertions, 3 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 650f7aa2ace8..135749376a55 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphviz
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.276 2013/11/19 07:06:35 nerdboy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.277 2014/01/31 08:02:40 radhermit Exp $
+
+*graphviz-2.36.0 (31 Jan 2014)
+
+  31 Jan 2014; Tim Harder <radhermit@gentoo.org> +graphviz-2.36.0.ebuild:
+  Version bump.
 
 *graphviz-2.34.0 (19 Nov 2013)
 
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index ae57ace9893c..db1e5565f468 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX graphviz-2.26.3-automake-1.11.2.patch 1207 SHA256 859e59ad317fdca86ee4fc85001f9988c28a88d5becc472e7174f91d51b084d3 SHA512 c3e3c155a36b3cd2910efe2fa9c69f51561a32686b51b0ce746fbebaadd044ce924e0c3c7909809b7383392c2601940f7a995064861d8f9af3875fa3e9f3b728 WHIRLPOOL 618ea0569731e1b89c0fca533c0c1ece8d79550dec9522efe86425e607bafa58bc52e4c5dadf5bb270bb0c9c16088b43924ff425453c6849030342d5d0c725fa
 AUX graphviz-2.26.3-libtool.patch 557 SHA256 a1d5f1ee6e181b78d1bd3daa36d49103ff1f2d90c85b58c1b5f3cfc7941f4b46 SHA512 89f94085fde3d496b64f903c2c1bc70b8714a89142a7ae4135aed25545e1a7cb3189617ca38606034bfa3946b089baf2917b08aed5a383e1ab62d75749a9f0c9 WHIRLPOOL 5987a50101800cc0c5db1e074628211f3ba94c220f0d457193b37c410615aa3d2ead98053435a000927bc5c90e3d7e1edda0f3b42e14abad3b102ec94f92c2f4
 AUX graphviz-2.28.0-Xaw-configure.patch 2129 SHA256 7c5c37aa637031aee0001ec57f80229a697ba184540366204fe99d2bc8ae878a SHA512 c87de7ccf1a2033499b5e4bce3765956a0b06df778a029a2db237120b8ef3870acc79a5b737e95611cffe65977f33f6ed2325ea8bc16404614d77011e6a1d6e6 WHIRLPOOL 4f41768ae1d9aa677c7e455e551c79746e90068ca2f4a71e38346a0a1403a957b3b9eb754dc5ba063e64e1e1f68039514d06f97b144f0a12f2d1ecf349b3c3cb
@@ -8,9 +11,22 @@ AUX graphviz-2.34.0-dot-pangocairo-link.patch 950 SHA256 1f44e988d99dc1781266b5c
 DIST graphviz-2.26.3.tar.gz 17092429 SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1 SHA512 6225141752318af0b50714d70d31dd1ef1bc414d134d22f066f159843991194215bb9bc4e8df38a194e1de67ebbf137d371e875948fa6a6eebfca9df1a414a6d WHIRLPOOL ca35d0ed9cb3751ae968e1c6d425efe42e8b681685eb66f975c0ff1b73e245fc3db6418ec69300331c94275fe3bfcdcd168b931b880c280f3dd63f1f03c4d4db
 DIST graphviz-2.28.0.tar.gz 19620087 SHA256 d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76 SHA512 d6dbcd99487e382f9ca83ef63a3ff3fbe9208f6d3969cf03d15b8944dfb58c7fefe1bf96939e3e69019ae9a562619c6d64ad24e390c408b7271caade443233e0 WHIRLPOOL f0274567661f16993a107f45685f0716e64ea493e064efd2e72a4680120cbee8989fb0eab6429d432d18106d42bfc37d4113816efb14e7888d00014b83dea72a
 DIST graphviz-2.34.0.tar.gz 23921350 SHA256 d94abca5745aa4c5808ab56cd3d0ec9ed14fb76a5a88d39e1f234fa84d22d764 SHA512 73dc8c25bc5747fda717d6d2162a8b37bf883544a13b487354a6000d528816a69a021f33cbeec0f6e718a7e9905ab2a04ee63f787ca7f79226055b2da21f4832 WHIRLPOOL 0fe3bf7420eccef9de51789ae9a8d8cab55b6fae7382e557604fb974e04eaa1e0610392dc7f6d5fa85a0b83a3cc955a4ff08d594bf8805c7f06625c7d9ac9007
+DIST graphviz-2.36.0.tar.gz 23846318 SHA256 37fd66d8def158575c75c4f6dbf536839e4ee468aa59314eb472d1aecb076361 SHA512 cca1339cea8d36acbae647a78ff6743a4f77bfa208e74fef615a99dc7d380d2a0a0f0b3fc00de09a9f67c3fad16dc3837ef3aefbfce5a8a3d0f974ed5afbbab5 WHIRLPOOL c9f25f28869afef943121a24b580518d822eb76f30b4c874554f2f1dd4f16ffaf2683644c59746f4295aa574c4b5541f1205787870eed5567cd4bd5c755e5f8b
 EBUILD graphviz-2.26.3-r3.ebuild 6138 SHA256 7d4e109b7396d65b077cea80f620e3e1c7c30ce2562e016ad8e38dcba6679df6 SHA512 76b4197f5060fdd82a978bda50b8bafe1c979e17a70ab09ad115edf13cc91525d3067cfab10bfc65bab1fcd5a66fc52559b647301a68acd106c2d4bed7a18ffc WHIRLPOOL 95c95c225d647c7f4da7df2ff5a101591e64babb52ba291dc4a21520dcfe3064975f5d3e07cb9ec14c4fe3800c6ad47e5cbe6ab5808fc63dc6ff7fd2b3ce9b39
 EBUILD graphviz-2.26.3-r4.ebuild 6364 SHA256 2a66f61cb6e04ba701e8968c53e7ecab12f84746548c3847859e183b013ce229 SHA512 64d3c7aee8401c00d49bc905acf78f8072c6ed139fd93d8f99ba72976cd4cc5807a8b8ee8a0540772af971d6048972f8557e7ad6465bf5cb033da03861f6d752 WHIRLPOOL 8aa92086f0f851a5bf560855a36745e2a03281b3b559352d3de389fd1b1708b530bb67e907161c1d88cc9653d7e542d8bd3a9094609608b945bec79144f5ef4b
 EBUILD graphviz-2.28.0.ebuild 7536 SHA256 13be71a9f0676a58b1574dc929b7526e6bc2e237492749fce32a15c0b868adbc SHA512 63edfd40746345b70fa4e7e52a3889e1c15dd3fd158241298687b788f409478ed72c08b4c88a7f05bed5fe367999799c31789abdf13214edbeca7d71892e4bba WHIRLPOOL f96818b60893d0bbe654308c3eb8b07d2d60de604677375a9626e7d36d2e083038dd5fd86a78c6e6cd1840718fc975840b090ac625bfdaf884f98ce7dcda1d0d
 EBUILD graphviz-2.34.0.ebuild 7725 SHA256 2f4a51880ce69f6a38e193f81e7892a044a3a3121d858f8a57821b8c9512abb6 SHA512 a40cc69a2a44cc164f56f64fc7a6834477c28fb601ad1b9975d65e77fefac881923a25e1f78ac673792be9e92fc79ade4df3c0d347bbe3519cb56b14116c4176 WHIRLPOOL 44eac2d5781aebd3bb7a8703473d353519eb7f0cccff6a4dc1312c1dc22551e9383ca0bc4f39cba77e6f55815b237efaa263550cf5b31ef33cc83e4874bc87ae
-MISC ChangeLog 41103 SHA256 e6b47c1cd7beb0976dca1de473a322e73693403ab8d4715d3215efdb78864a23 SHA512 263bdb162ce0c43809c40aa548c1ee239de042369e39fa3a0b9f46fcb55d47a27a60a27c62a540c62fae406e0fc34c76fb928e84cde9c7696985a9c72e23b2df WHIRLPOOL 7cf42e63f63a405e457544893fdec72de6d1165f70903ffebc862f2b69e1ea1e2d763da36febd13e57f6cfc291eee0066f3b6e47b41407d911dee4a396e16327
+EBUILD graphviz-2.36.0.ebuild 7504 SHA256 6ae5b9ccee331b4a2457096b968d5037f03f10cf10aedcbf6e581cb963bab35b SHA512 e08b7e63707ee8e54e62027abf81ae8ca0339691736e7f75ec4216f34ed4dda371c984aa8d3970db67c08aa34fd8d313007547dbe7d7c3790c9f3a3eec7c8ac3 WHIRLPOOL 17692e663550f3b59c1597cce647a0a3de31eac579d5e88e3bd50b8615bc97dd7a4e39598e82b70dcff72017b517853dc7b338ae38da259c3553f7900926d293
+MISC ChangeLog 41228 SHA256 ff948130b2c56f1abde9596871694660b51cdfc56cc6a0b834bb4e64e6db3bd8 SHA512 757a97c08e7d6c368d536844eb579ad65eeec40a3bfbc929d87506b873022d71f40caf5897f6687aeaac8f054a2130a3d3015979803e91e1c492292edb6c4a0d WHIRLPOOL 6156ed36d7a955ef596eba228c426801e4eadcc01d21d4f1a25cc3f7d2d892fa43887aee60e38052603c179803241e23bf26459e34d23b37895c7ed950661929
 MISC metadata.xml 2141 SHA256 6b3987caeb4fa056866bd10ccbc02e70c0b265a171444e79a580566e9f36bfc9 SHA512 e1d5704faecb2d5ba8011cc9eaaaf0a7efe5c92ab06765d14db78cf29933589bbc6b802e9b0661a9808cd145b314caf9f3b3f767dfbd1d4e243a7d8ae7fab4fc WHIRLPOOL 960b186445cee7e15d60eed6702adccec21b6da296085fad91316a5bb1acff29e8a656446af7bcc0add5966f402bac251253f2b26c5c13dedcc9879156a0dad5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJS61ilAAoJEEqz6FtPBkyj6t8H/0K/nKezN3tueVJCZBwokg70
+bVUKIcCsxD3D7GLtHYGFWeVvhLoWgFIo2Xv0uLfC8Qe1Mw6SiugVWD+dYfYnBB1V
+f1w91kij+bEheVZktNM3HQWv/IdZcB12cPA3S7jN+QUPeSWCz9xJNjwHO44snr+c
+VSOcSd5NaBUcqtd1AGA4+y3GXC6PiNfrPwE06zzIhqdJjzxgbrX5wPbYQQ7MfiyV
+VMlZzUa0PTcCO+K6FS0r9Rby+vCfoFn6USxLdb56+KMM+P7zLyOlYaGlDSPu7uOC
+RWGeIemNK765Iu202jg6JoBpOqyFhoOn5ckwxRSdTLZ8PYHY9zeOtrmN7Ei03aY=
+=mzg5
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.36.0.ebuild b/media-gfx/graphviz/graphviz-2.36.0.ebuild
new file mode 100644
index 000000000000..c77cf5ccd639
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.36.0.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.36.0.ebuild,v 1.1 2014/01/31 08:02:40 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="http://www.graphviz.org/"
+SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
+
+# Requires ksh
+RESTRICT="test"
+
+RDEPEND="
+	sys-libs/zlib
+	>=dev-libs/expat-2
+	>=dev-libs/glib-2.11.1
+	>=media-libs/fontconfig-2.3.95
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
+	>=media-libs/libpng-1.2:0
+	!<=sci-chemistry/cluster-1.3.081231
+	virtual/jpeg
+	virtual/libiconv
+	X? (
+		x11-libs/libXaw
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+	)
+	cairo?	(
+		>=x11-libs/pango-1.12
+		>=x11-libs/cairo-1.1.10[svg]
+	)
+	devil?	( media-libs/devil[png,jpeg] )
+	postscript? ( app-text/ghostscript-gpl )
+	gtk?	( x11-libs/gtk+:2 )
+	gts?	( sci-libs/gts )
+	lasi?	( media-libs/lasi )
+	pdf?	( app-text/poppler )
+	python?	( ${PYTHON_DEPS} )
+	qt4?	(
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	ruby?	( dev-lang/ruby )
+	svg?	( gnome-base/librsvg )
+	tcl?	( >=dev-lang/tcl-8.3 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	guile?	( dev-scheme/guile dev-lang/swig )
+	java?	( >=virtual/jdk-1.5 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 )"
+REQUIRED_USE="
+	!cairo? ( !X !gtk !postscript !lasi )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# 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.
+#   needs 'pangocairo' enabled in graphviz configuration
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Disabled, GTK-1 junk.
+# - glitz
+#   Disabled, no particular reason
+#   needs 'pangocairo' enabled in graphviz configuration
+# - ming
+#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+#   incomplete.
+# - cairo/pango:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support (??? unsure),
+#   needs libXaw for UI
+#   UI also links directly against libX11, libXmu, and libXt
+#   and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer 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, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
+#   sci-libs/gts can be used for some of these
+# - lefty:
+#   needs Xaw and X to build
+# - gvedit (via 'qt4'):
+#   based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+#   currently disabled -- it segfaults a lot
+#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
+#   with flags enabled at configure time
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
+		"${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
+
+	# ToDo: Do the same thing for examples and/or
+	#       write a patch for a configuration-option
+	#       and send it to upstream
+	# note - the longer sed expression removes multi-line assignments that are extended via '\'
+	if ! use doc ; then
+		find . -iname Makefile.am \
+			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
+				-e '/^\(html\|pdf\)_DATA/d' || die
+	fi
+
+	# This is an old version of libtool
+	# use the ./configure option to exclude its use, and
+	# delete the dir since we don't need to eautoreconf it
+	rm -rf libltdl
+
+	# 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
+
+	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
+	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
+
+	use java && append-cppflags $(java-pkg_get-jni-cflags)
+
+	eautoreconf
+}
+
+src_configure() {
+	# libtool file collision, bug 276609
+	local myconf="--without-included-ltdl --disable-ltdl-install"
+
+	myconf="${myconf}
+		$(use_with cairo pangocairo)
+		$(use_with devil)
+		$(use_with gtk)
+		$(use_with gts)
+		$(use_with qt4)
+		$(use_with lasi)
+		$(use_with svg rsvg)
+		$(use_with X x)
+		$(use_with X xaw)
+		$(use_with X lefty)
+		--with-digcola
+		--with-fontconfig
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		$(use_enable gdk-pixbuf)
+		--without-ming"
+
+	# new/experimental features, to be tested, disable for now
+	myconf="${myconf}
+		--with-cgraph
+		--without-glitz
+		--without-ipsepcola
+		--without-smyrna
+		--without-visio"
+
+	# Bindings:
+	myconf="${myconf}
+		$(use_enable 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 \
+		--disable-silent-rules \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_install() {
+	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
+
+	emake DESTDIR="${D}" \
+		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
+		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
+		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
+		install
+
+	use examples || rm -rf "${ED}"/usr/share/graphviz/demo
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	use python && python_optimize \
+		"${D}$(python_get_sitedir)" \
+		"${D}/usr/$(get_libdir)/graphviz/python"
+}
+
+pkg_postinst() {
+	# This actually works if --enable-ltdl is passed
+	# to configure
+	dot -c
+}