[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     0bc3da861baed950bf23e0cb1f26c1afb5a8ae9a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 11:05:43 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 18 11:15:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc3da86

media-gfx/graphviz: Bump to version 2.40.1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/graphviz/Manifest                        |   1 +
 .../files/graphviz-2.34.0-Xaw-configure.patch      |   4 +-
 .../graphviz-2.34.0-dot-pangocairo-link.patch      |   4 +-
 media-gfx/graphviz/graphviz-2.40.1.ebuild          | 276 +++++++++++++++++++++
 4 files changed, 281 insertions(+), 4 deletions(-)

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 64a0ea90523..2592d8f9ccc 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1 +1,2 @@
 DIST graphviz-2.38.0.tar.gz 25848858 SHA256 81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531 WHIRLPOOL b59bb517c4aa690ffd23e1b4d448d5dbaae5594eb1059d574e0cb3bf2091beb9ed867bd4fa7e8ca0259863f24849c96d4d1da056091922bf33ace7da43c8b5d4
+DIST graphviz-2.40.1.tar.gz 25633455 SHA256 ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5 WHIRLPOOL 0ff4a23cf8c3e0bcbf12776d65ea0aa538050286d6b25bcc3707c7c1ad2d0f8c282239f57bfc0c3795bccf276e9d6627d77ed2920781008a2558af126787a72c

diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
index ac91d4bd4d4..2283cc5dab4 100644
--- a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
+++ b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
@@ -1,5 +1,5 @@
---- configure.ac	2011-05-07 05:25:24.000000000 +0200
-+++ configure.ac	2011-06-24 13:24:49.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -560,8 +560,8 @@
    use_xlib="Yes"
  #no x11.pc on centos4

diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch b/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
index 143beabe505..df5ea34d329 100644
--- a/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
+++ b/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
@@ -1,5 +1,5 @@
---- cmd/dot/Makefile.am	2013-01-14 04:11:21.000000000 +0100
-+++ cmd/dot/Makefile.am	2013-02-01 17:19:30.893949329 +0100
+--- a/cmd/dot/Makefile.am
++++ b/cmd/dot/Makefile.am
 @@ -115,12 +115,8 @@
  dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS)
  dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS)

diff --git a/media-gfx/graphviz/graphviz-2.40.1.ebuild b/media-gfx/graphviz/graphviz-2.40.1.ebuild
new file mode 100644
index 00000000000..6cb0b627577
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.40.1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1 qmake-utils
+
+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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-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:2
+	dev-libs/libltdl:0
+	>=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:0
+	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 )
+	perl?   ( dev-lang/perl:= )
+	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:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	sys-devel/libtool
+	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
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
+	"${FILESDIR}"/${PN}-2.38.0-ghostscript-9.18.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# 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 -r libltdl || die
+
+	# no nls, no gettext, no iconv macro, so disable it
+	if ! use nls ; then
+		sed -i -e '/^AM_ICONV/d' configure.ac || die
+	fi
+
+	# 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
+
+	# use correct version of qmake. bug #567236
+	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt4_get_bindir)/qmake)" configure.ac || 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() {
+	local myconf=(
+		--enable-ltdl
+		--disable-silent-rules
+		$(use_enable static-libs static)
+	)
+
+	# libtool file collision, bug 276609
+	myconf+=( --without-included-ltdl --disable-ltdl-install )
+
+	myconf+=(
+		$(use_with cairo pangocairo)
+		$(use_with devil)
+		$(use_with gtk)
+		$(use_with gts)
+		$(use_with qt4 qt)
+		$(use_with lasi)
+		$(use_with pdf poppler)
+		$(use_with postscript ghostscript)
+		$(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+=(
+		--with-cgraph
+		--without-glitz
+		--without-ipsepcola
+		--without-smyrna
+		--without-visio
+	)
+
+	# Bindings:
+	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 ${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
+}
+
+pkg_postrm() {
+	# Remove cruft, bug #547344
+	rm -f "${EROOT}usr/lib/graphviz/config{,6}"
+}