diff options
author | Markus Meier <maekke@gentoo.org> | 2008-03-15 14:20:02 +0000 |
---|---|---|
committer | Markus Meier <maekke@gentoo.org> | 2008-03-15 14:20:02 +0000 |
commit | f16e5a079eef830c6d93efe69444b480213198ec (patch) | |
tree | 58ee461c763fc32dfcefc74b28d60f3c4e6c5f69 /media-gfx/graphviz | |
parent | amd64 stable, bug #210670 (diff) | |
download | historical-f16e5a079eef830c6d93efe69444b480213198ec.tar.gz historical-f16e5a079eef830c6d93efe69444b480213198ec.tar.bz2 historical-f16e5a079eef830c6d93efe69444b480213198ec.zip |
fix (dead) python bindings, bug #212872
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'media-gfx/graphviz')
-rw-r--r-- | media-gfx/graphviz/ChangeLog | 8 | ||||
-rw-r--r-- | media-gfx/graphviz/Manifest | 14 | ||||
-rw-r--r-- | media-gfx/graphviz/files/graphviz-2.16.1-python-345.patch | 20 | ||||
-rw-r--r-- | media-gfx/graphviz/graphviz-2.16.1-r4.ebuild | 226 |
4 files changed, 266 insertions, 2 deletions
diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog index 30fa50d63d63..01d7818b9b93 100644 --- a/media-gfx/graphviz/ChangeLog +++ b/media-gfx/graphviz/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/graphviz # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.144 2008/03/11 16:44:56 ricmm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.145 2008/03/15 14:20:01 maekke Exp $ + +*graphviz-2.16.1-r4 (15 Mar 2008) + + 15 Mar 2008; Markus Meier <maekke@gentoo.org> + +files/graphviz-2.16.1-python-345.patch, +graphviz-2.16.1-r4.ebuild: + fix (dead) python bindings, bug #212872 11 Mar 2008; <ricmm@gentoo.org> graphviz-2.12.ebuild: Drop to ~mips due to unstable deps diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index 89e67a0b7fbb..952fc381b0ab 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 @@ -6,6 +9,7 @@ AUX graphviz-2.12-parallel-build.patch 3050 RMD160 61e104de3f8a7823b6c9669a9e70c AUX graphviz-2.16.1-bindings.patch 3849 RMD160 080b84194707b4e7621bcf1cfc32bf5f15ca7342 SHA1 973c75b8696eba5f44901ab758595a5f50177433 SHA256 a2244ceb69eb41a88dd9bec15629192cf49b80d3c153c44a3942d7b794be07d8 AUX graphviz-2.16.1-gcc43-missing-includes.patch 673 RMD160 64793cdf37eb24c3dd3dcfee99b617e34bd4b04c SHA1 f45d4b931490f8722d296dde582239f2299e8a0d SHA256 d9e90951abe96095727e39316d977ff59fdd3cf94e4be2e2fde9aa7526532403 AUX graphviz-2.16.1-pango-optional.patch 7232 RMD160 ec214317f51f230008b577bbbf7c1d513dcfe82c SHA1 bfc9f8baca11795d617acb129f176997507fdc2d SHA256 5ac9bf5eb961fae07793e2a95ddd4b73531b76ff54e125c60575c88ad905e567 +AUX graphviz-2.16.1-python-345.patch 776 RMD160 93a02790f3ee6c02c7182830e84a1fee19746591 SHA1 96dae2b1663bb03fbfa872e9160da120bc09ec09 SHA256 2dea46d50b959808acdb8e1b8f24ddac8182340291baf4a36cb8abb3d0cefb01 AUX graphviz-2.16.1-python-buildfix.patch 642 RMD160 4379fcaea7296e4d550477462a3d54f5229569c2 SHA1 ed58b8cfde1fc57ecfc930ffa2a012590c8d3e73 SHA256 fc441375a916bf6f68a6ad4aaaadb6ad8a24b2d801499f7e01ace8ac702552c8 AUX graphviz-2.16.1-tcltk.patch 623 RMD160 13c3764098a6229cef869962f9604737c97d7bae SHA1 905e2890106d7d8d9356f3346a06bfc403247838 SHA256 d455e80fcf948298d6aa78c84e54f954c031cae506925719c7d9cc8efeaeaa49 DIST graphviz-2.12.tar.gz 4607023 RMD160 68d55176cd5ce0e6a25c90b443529747e738d5c6 SHA1 aa48a926395a57c6c7e1e755b9432a29461538e3 SHA256 5191892d7950c28754659f703234f7888f132440a049f0d396f287b202f9e37f @@ -14,6 +18,14 @@ EBUILD graphviz-2.12.ebuild 5491 RMD160 02f9fb2eae2db541154c543ff07d0e82326ae73b EBUILD graphviz-2.16.1-r1.ebuild 6015 RMD160 6d5e2b87d9e9cd0bafbca8d07f0179f2290346e5 SHA1 33b4b45fc578d4ab049805a3cfe9bb59c2c55766 SHA256 fb8b699b05865d7edf1450f37b9c2157e173e770b0e6520eae7164d299277abd EBUILD graphviz-2.16.1-r2.ebuild 6090 RMD160 c342a50a5b31a66d51ff8af4138f88590bc98a28 SHA1 8891f299b9eb901ed2324c97c80d6c9b5a9beb01 SHA256 d78bf7fa23d8d3eb6550a5d467a2f93f3ab0bdbc93b3c7716648b0ad403fafd1 EBUILD graphviz-2.16.1-r3.ebuild 5927 RMD160 39fd174786f4d62d3e2f8d210cd1f1b813036a6d SHA1 6d3e386d7b1ea96107192c6c743481f4c4b88aae SHA256 d947963c493a317cbce8eea4aaf069fbb91fa8ba0046c799d5715ba621f7677b +EBUILD graphviz-2.16.1-r4.ebuild 6041 RMD160 88d805df69189f2fea67812af0a2e392f31a1cf9 SHA1 d23d9b159ae9ad047257b6ce4ff068cb5f6fe6d0 SHA256 33ac852c7ff25a4653a4308f37e725af326c5a055ebeb8bac164bd78a077e2e0 EBUILD graphviz-2.16.1.ebuild 5978 RMD160 01fe950a684fb11e79b5386e3c9c4b34b3179f71 SHA1 5b3039c8765ad367c4479907ddca14f72b6b3057 SHA256 21bb381d34054f500f023798e00a4f739fce67bba326469e2e6babef31b22c68 -MISC ChangeLog 22052 RMD160 fa6fa77afbeac4c9098d431a98cd0f61c8aa3e24 SHA1 2a00ba649a4502cc32e3d47aae488063b8544e75 SHA256 fbc51c6f943adf032dd1dbad1c15b3a75780c31290b114723797edc25bcd5b62 +MISC ChangeLog 22250 RMD160 cb6c03671024738a0a7f7617823fd35217a3f842 SHA1 0513e7a3874484d56c389b955d5b6dae7a21c907 SHA256 95b2923c57cfbe1db76ed41c8ae6f2f3550488f0b43c85d09b15fac90b9f2b75 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFH29tbkKaRLQcq0GIRApRuAKCTz/M1959KB6g5aDNOxe3Z8mzUuACdExgx +RCGX7UmwCPhNiRm0XI3hQBQ= +=qSNo +-----END PGP SIGNATURE----- diff --git a/media-gfx/graphviz/files/graphviz-2.16.1-python-345.patch b/media-gfx/graphviz/files/graphviz-2.16.1-python-345.patch new file mode 100644 index 000000000000..166198ddde28 --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.16.1-python-345.patch @@ -0,0 +1,20 @@ +don't instal dead symlinks, reported in bug #212872 + +diff -ru graphviz-2.16.1.orig/tclpkg/gv/Makefile.am graphviz-2.16.1/tclpkg/gv/Makefile.am +--- graphviz-2.16.1.orig/tclpkg/gv/Makefile.am 2008-03-15 14:51:01.000000000 +0100 ++++ graphviz-2.16.1/tclpkg/gv/Makefile.am 2008-03-15 14:57:18.000000000 +0100 +@@ -298,8 +298,14 @@ + endif + if WITH_PYTHON + (cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;) ++endif ++if WITH_PYTHON23 + (cd $(DESTDIR)$(pkgpython23dir); rm -f _gv.so; $(LN_S) libgv_python23.so _gv.so;) ++endif ++if WITH_PYTHON24 + (cd $(DESTDIR)$(pkgpython24dir); rm -f _gv.so; $(LN_S) libgv_python24.so _gv.so;) ++endif ++if WITH_PYTHON25 + (cd $(DESTDIR)$(pkgpython25dir); rm -f _gv.so; $(LN_S) libgv_python25.so _gv.so;) + endif + if WITH_RUBY diff --git a/media-gfx/graphviz/graphviz-2.16.1-r4.ebuild b/media-gfx/graphviz/graphviz-2.16.1-r4.ebuild new file mode 100644 index 000000000000..ba34556e23b9 --- /dev/null +++ b/media-gfx/graphviz/graphviz-2.16.1-r4.ebuild @@ -0,0 +1,226 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.16.1-r4.ebuild,v 1.1 2008/03/15 14:20:01 maekke Exp $ + +WANT_AUTOCONF=latest +WANT_AUTOMAKE=latest + +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 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="doc examples gnome gtk jpeg nls perl png python ruby tcl tk" + +# 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 + >=media-libs/jpeg-6b + >=media-libs/libpng-1.2.10 + virtual/libiconv + ruby? ( dev-lang/ruby ) + tcl? ( >=dev-lang/tcl-8.3 ) + tk? ( >=dev-lang/tk-8.3 ) + gtk? ( + >=x11-libs/gtk+-2 + x11-libs/libXaw + >=x11-libs/pango-1.12 + >=x11-libs/cairo-1.1.10 + gnome? ( gnome-base/libgnomeui ) + )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.20 + 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 +# Disabled, depends on ming-3.0 which is still p.masked. +# - 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 tcl && ! built_with_use dev-lang/swig tcl ; then + eerror "SWIG has to be built with tcl support." + die "Missing tcl USE-flag for dev-lang/swig" + fi + + # bug 181147 + local gdflags + use png && gdflags="png" + use jpeg && gdflags="${gdflags} jpeg" + if [[ -n ${gdflags} ]] && ! built_with_use media-libs/gd ${gdflags} ; then + local diemsg="Re-emerge media-libs/gd with USE=\"${gdflags}\"" + eerror "${diemsg}" + die "${diemsg}" + fi + + # bug 202781 + if use gtk && ! built_with_use x11-libs/cairo svg ; then + eerror "x11-libs/cairo has to be built with svg support" + die "emerge x11-libs/cairo with USE=\"svg\"" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-bindings.patch + epatch "${FILESDIR}"/${P}-gcc43-missing-includes.patch + epatch "${FILESDIR}"/${P}-python-buildfix.patch + epatch "${FILESDIR}"/${P}-pango-optional.patch + epatch "${FILESDIR}"/${P}-tcltk.patch + epatch "${FILESDIR}"/${P}-python-345.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 + + # Update this file from our local libtool which is much newer than the + # bundled one. This allows MAKEOPTS=-j2 to work on FreeBSD. + cp /usr/share/libtool/install-sh config + + # 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 + + eautoreconf +} + +src_compile() { + local myconf + + # Core functionality: + # All of X, cairo-output, gtk need the pango+cairo functionality + myconf="${myconf} + $(use_with gtk) + $(use_with gtk x) + $(use_with gtk pangocairo) + --without-ming + --with-digcola + --with-ipsepcola + --with-fontconfig + --with-freetype + --with-libgd + --without-gdk-pixbuf + --disable-python23 + --disable-python24 + --disable-python25" + + use gtk && myconf="${myconf} $(use_with gnome gnomeui)" + + # Bindings: + myconf="${myconf} + --disable-guile + --disable-java + --disable-io + --disable-lua + --disable-ocaml + $(use_enable perl) + --disable-php + $(use_enable python) + $(use_enable ruby) + --disable-sharp + $(use_enable tcl) + $(use_enable tk)" + + econf \ + --enable-ltdl \ + ${myconf} \ + || die "econf failed" + + emake || die "emake failed" +} + +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 +} |