diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2011-02-16 19:16:24 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2011-02-16 19:16:24 +0000 |
| commit | 33e5e17e3a8e2fc5f288849caec002282a0d8cdc (patch) | |
| tree | 1354b1be128b0da3327abf1f29a70f2985b72e98 /media-libs/gegl | |
| parent | mark -x64-macos, bug 354071 (diff) | |
| download | gentoo-2-33e5e17e3a8e2fc5f288849caec002282a0d8cdc.tar.gz gentoo-2-33e5e17e3a8e2fc5f288849caec002282a0d8cdc.tar.bz2 gentoo-2-33e5e17e3a8e2fc5f288849caec002282a0d8cdc.zip | |
gegl: fix installation of docs into DESTDIR/DESTDIR
(Portage version: 2.1.9.40/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/gegl')
| -rw-r--r-- | media-libs/gegl/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/gegl/files/gegl-doubledestdir.diff | 12 | ||||
| -rw-r--r-- | media-libs/gegl/gegl-0.1.6.ebuild | 6 |
3 files changed, 22 insertions, 2 deletions
diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog index 74a6e20ac705..77c24d3a1457 100644 --- a/media-libs/gegl/ChangeLog +++ b/media-libs/gegl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/gegl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.36 2011/02/15 23:40:34 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.37 2011/02/16 19:16:24 hanno Exp $ + + 16 Feb 2011; Hanno Boeck <hanno@gentoo.org> gegl-0.1.6.ebuild, + +files/gegl-doubledestdir.diff: + Fix installation into DESTDIR/DESTDIR, see #355193. *gegl-0.1.6 (15 Feb 2011) diff --git a/media-libs/gegl/files/gegl-doubledestdir.diff b/media-libs/gegl/files/gegl-doubledestdir.diff new file mode 100644 index 000000000000..8a9bf33461c9 --- /dev/null +++ b/media-libs/gegl/files/gegl-doubledestdir.diff @@ -0,0 +1,12 @@ +diff -Naur gegl-0.1.6/docs/Makefile.am gegl-0.1.6-1//docs/Makefile.am +--- gegl-0.1.6/docs/Makefile.am 2010-10-08 18:51:41.000000000 +0200 ++++ gegl-0.1.6-1//docs/Makefile.am 2011-02-16 20:05:30.458043758 +0100 +@@ -6,7 +6,7 @@ + # is very small, and should probably be documented in a tutorial. + # + +-gtkdochtmldir = $(DESTDIR)$(datadir)/gtk-doc/html/gegl ++gtkdochtmldir = $(datadir)/gtk-doc/html/gegl + + HTML_FILES = \ + operations.html \ diff --git a/media-libs/gegl/gegl-0.1.6.ebuild b/media-libs/gegl/gegl-0.1.6.ebuild index 6c619c767e2b..08e6a4b72ae5 100644 --- a/media-libs/gegl/gegl-0.1.6.ebuild +++ b/media-libs/gegl/gegl-0.1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.6.ebuild,v 1.1 2011/02/15 23:40:34 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.6.ebuild,v 1.2 2011/02/16 19:16:24 hanno Exp $ EAPI="2" @@ -41,6 +41,10 @@ RDEPEND="${DEPEND}" RESTRICT="test" src_prepare() { + # upstream bug report: + # https://bugzilla.gnome.org/show_bug.cgi?id=642494 + epatch "${FILESDIR}"/gegl-doubledestdir.diff + # fix OSX loadable module filename extension sed -i -e 's/\.dylib/.bundle/' configure.ac || die eautoreconf |