vapier 15/02/15 04:21:58 Modified: graphviz-2.26.3-r4.ebuild ChangeLog Log: Backport libtool logic from newer versions to fix building with newer autotools #539032 by Jeff. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.16 media-gfx/graphviz/graphviz-2.26.3-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild?r1=1.15&r2=1.16 Index: graphviz-2.26.3-r4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- graphviz-2.26.3-r4.ebuild 15 Feb 2015 02:18:59 -0000 1.15 +++ graphviz-2.26.3-r4.ebuild 15 Feb 2015 04:21:58 -0000 1.16 @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.15 2015/02/15 02:18:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild,v 1.16 2015/02/15 04:21:58 vapier Exp $ EAPI=3 PYTHON_DEPEND="python? 2" @@ -107,6 +107,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-libtool.patch \ + "${FILESDIR}"/${P}-libtool-configure.patch \ "${FILESDIR}"/${P}-automake-1.11.2.patch # ToDo: Do the same thing for examples and/or @@ -118,9 +119,9 @@ 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 - sed -i -e '/libltdl/d' configure.ac || die - sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac || die # no nls, no gettext, no iconv macro, so disable it use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; } @@ -139,7 +140,7 @@ src_configure() { # libtool file collision, bug 276609 - local myconf="--disable-ltdl-install" + local myconf="--without-included-ltdl --disable-ltdl-install" # Core functionality: # All of X, cairo-output, gtk need the pango+cairo functionality 1.283 media-gfx/graphviz/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphviz/ChangeLog?rev=1.283&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphviz/ChangeLog?rev=1.283&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphviz/ChangeLog?r1=1.282&r2=1.283 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v retrieving revision 1.282 retrieving revision 1.283 diff -u -r1.282 -r1.283 --- ChangeLog 15 Feb 2015 02:18:59 -0000 1.282 +++ ChangeLog 15 Feb 2015 04:21:58 -0000 1.283 @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/graphviz # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.282 2015/02/15 02:18:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.283 2015/02/15 04:21:58 vapier Exp $ + + 15 Feb 2015; Mike Frysinger <[email protected]> + +files/graphviz-2.26.3-libtool-configure.patch, graphviz-2.26.3-r4.ebuild: + Backport libtool logic from newer versions to fix building with newer + autotools #539032 by Jeff. 15 Feb 2015; Mike Frysinger <[email protected]> graphviz-2.26.3-r3.ebuild, graphviz-2.26.3-r4.ebuild:
