Non-maintainer fix: Adding compatibility patch for automake-1.11.2, #396741; thanks...
authorJustin Lecher <jlec@gentoo.org>
Mon, 9 Jan 2012 11:22:14 +0000 (11:22 +0000)
committerJustin Lecher <jlec@gentoo.org>
Mon, 9 Jan 2012 11:22:14 +0000 (11:22 +0000)
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

media-gfx/graphviz/ChangeLog
media-gfx/graphviz/Manifest
media-gfx/graphviz/files/graphviz-2.26.3-automake-1.11.2.patch [new file with mode: 0644]
media-gfx/graphviz/graphviz-2.26.3-r4.ebuild [new file with mode: 0644]

index 2317da4bb1aa8eccfbd151e9c2dd4b561bb479ec..02b34f9c1218b063b729b5b5270cb4c201f2af80 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/graphviz
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.240 2011/10/16 15:23:03 grobian Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.241 2012/01/09 11:22:14 jlec Exp $
+
+*graphviz-2.26.3-r4 (09 Jan 2012)
+
+  09 Jan 2012; Justin Lecher <jlec@gentoo.org> +graphviz-2.26.3-r4.ebuild,
+  +files/graphviz-2.26.3-automake-1.11.2.patch:
+  Non-maintainer fix: Adding compatibility patch for automake-1.11.2, #396741;
+  thanks Alphat-PC for the patch
 
   16 Oct 2011; Fabian Groffen <grobian@gentoo.org> graphviz-2.26.3-r3.ebuild:
   Marked/restored ~x86-macos
index bcd12872257fb26d9812da382e8fe6128ee73274..aed14a9e011a8e6bcc69951fdf68805885fd341a 100644 (file)
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX graphviz-2.26.3-automake-1.11.2.patch 1207 RMD160 e0d11e4bfdc940b51e3a913b2c1178d84336f8c5 SHA1 4c43de8d197ac02a5373614f14269e45b4597b44 SHA256 859e59ad317fdca86ee4fc85001f9988c28a88d5becc472e7174f91d51b084d3
 AUX graphviz-2.26.3-libtool.patch 557 RMD160 72ea3b515777ec31d9ead7095a02e09f8d040d89 SHA1 bb5f091cba06fc821f6cc0ad543a4344c2300832 SHA256 a1d5f1ee6e181b78d1bd3daa36d49103ff1f2d90c85b58c1b5f3cfc7941f4b46
 DIST graphviz-2.26.3.tar.gz 17092429 RMD160 b2fbaf03b2006b43ed70e2a710363d7efbcfda77 SHA1 04503ac5a9eaa579859f0d017811fa245717edec SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1
 EBUILD graphviz-2.26.3-r2.ebuild 6046 RMD160 9a5568baec0b2cedc4614567854a1cad5492b316 SHA1 0d7418a80ccca1d6040424a3768c30daff7145ce SHA256 fc33ffc428c76bf4900c97ab8d8aabbccd8328af028d3328d0a3084211b43328
 EBUILD graphviz-2.26.3-r3.ebuild 6115 RMD160 de636d6a8fece4c81cf8c600e18293b61f078a5e SHA1 e53df017c8a1544b4ed6f1f16a55270fca6ad024 SHA256 e99a81d7b582c7f9496c75cf6db541e5faa8417168647fbb5b03f2b8592caf68
-MISC ChangeLog 34910 RMD160 791102138a084958c18393c8771a5754c38d918c SHA1 c373963c28e2ef0df8ec6bbdaa7cecf9c901aa6a SHA256 3c45b97bacb49105d9bc2f9bc0a80d5204bfe40e04550de4aaaefc42590158e0
+EBUILD graphviz-2.26.3-r4.ebuild 6172 RMD160 209b697b56e8eed9bbf7228ef8f5510f5b7aaa2e SHA1 ea02d167feeba9ce732a9939d891416462fdd2e1 SHA256 6bd4c61e025aba31f383355d11cebd241c888f5a7d295173247c3f4010671cd2
+MISC ChangeLog 35178 RMD160 0e6d894fcd13b16737d35aeb0eaaef0402960dc7 SHA1 d10c581c080df70088cd389a1572d157aba1adba SHA256 74fc449a322829b1f2be8fa813d8e098d3df14aa9b023bb80b719b64ad58d6bc
 MISC metadata.xml 1649 RMD160 e2238f2d7f945b9d05aa7cea65ed3a5b4f635251 SHA1 68476203394f16fd247976409d614596138431db SHA256 1d35d9b4fbceffa67229a5e0fcf3537f77bf05e00fbdb5ec0c3c82c4c845cc2b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (SunOS)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6a9twACgkQX3X2B8XHTomxVACeP2H1LDwIJbFGLyx9BVxZ1sCf
-IWMAn3/dpercZeGgXYFabn1qohTFLVd/
-=+0D3
+iEYEAREKAAYFAk8KzewACgkQgAnW8HDreRZGlACglFdKZd6+b4Ax44dUH1HUx/Mc
+O1AAoLHkv1uotbzi1itVA+8egtlpPn3V
+=F/yD
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/files/graphviz-2.26.3-automake-1.11.2.patch b/media-gfx/graphviz/files/graphviz-2.26.3-automake-1.11.2.patch
new file mode 100644 (file)
index 0000000..86280f2
--- /dev/null
@@ -0,0 +1,35 @@
+Install dir ( buiding with media-libs/ming ):
+    /usr/$(get_libdir)/graphviz/Bitstream_Vera_Serif.fdb
+    /usr/$(get_libdir)/graphviz/Bitstream_Vera_Sans.fdb
+    /usr/include/graphviz/gv.cpp
+    /usr/include/graphviz/gv.i
+
+Due to the following change, {pkglib,pkginclude}_DATA is invalid:
+    http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
+
+---
+diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am
+--- a/plugin/ming/Makefile.am
++++ b/plugin/ming/Makefile.am
+@@ -17,7 +17,8 @@ lib_LTLIBRARIES = libgvplugin_ming.la
+ else
+ pkglib_LTLIBRARIES = libgvplugin_ming.la
+ endif
+-pkglib_DATA = Bitstream_Vera_Sans.fdb  Bitstream_Vera_Serif.fdb
++fdblibdir = $(libdir)/@PACKAGE@
++fdblib_DATA = Bitstream_Vera_Sans.fdb  Bitstream_Vera_Serif.fdb
+ endif
+ libgvplugin_ming_C_la_SOURCES = \
+diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
+--- a/tclpkg/gv/Makefile.am
++++ b/tclpkg/gv/Makefile.am
+@@ -258,7 +258,7 @@ libgv_tcl_la_CPPFLAGS = $(BASECPPFLAGS) 
+ gv_tcl.cpp: gv.i
+       $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
+-pkginclude_DATA = gv.i gv.cpp
++pkginclude_HEADERS = gv.i gv.cpp
+ pkglib_LTLIBRARIES = 
+ man_MANS =
+ pdf_DATA = 
diff --git a/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild b/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild
new file mode 100644 (file)
index 0000000..67ac63f
--- /dev/null
@@ -0,0 +1,227 @@
+# Copyright 1999-2012 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-r4.ebuild,v 1.1 2012/01/09 11:22:14 jlec Exp $
+
+EAPI=3
+PYTHON_DEPEND="python? 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="cairo doc examples gtk java lasi nls perl python ruby static-libs 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[fontconfig,jpeg,png,truetype]
+       >=media-libs/libpng-1.4
+       virtual/jpeg
+       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 )"
+
+# 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
+
+pkg_setup() {
+       if use python; then
+               python_set_active_version 2
+               python_pkg_setup
+       fi
+}
+
+src_prepare() {
+       epatch \
+               "${FILESDIR}"/${P}-libtool.patch \
+               "${FILESDIR}"/${P}-automake-1.11.2.patch
+
+       # 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 "${EPREFIX}"/usr/share/libtool/config/install-sh config || die
+       else
+               cp "${EPREFIX}"/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
+               --with-sfdp
+               --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-rsvg
+               --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 \
+               $(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 || die "emake install failed"
+
+       use examples || rm -rf "${D}/usr/share/graphviz/demo"
+
+       if ! use static-libs; then
+               find "${ED}"/usr/$(get_libdir)/ -name '*.la' -delete || die
+       fi
+
+       dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+       # This actually works if --enable-ltdl is passed
+       # to configure
+       dot -c
+       use python && python_mod_optimize gv.py
+}
+
+pkg_postrm() {
+       use python && python_mod_cleanup gv.py
+}