diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2012-06-07 23:01:30 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-06-07 23:01:30 +0000 |
| commit | 5cfe4a522f300c7024eadb3c9ead41c64296bf13 (patch) | |
| tree | c1eae41abcfecbb10157bbdc38eb85e63dc266e7 /media-gfx/geeqie | |
| parent | Bump to update components to latest maintenance release ones, mostly fixes fo... (diff) | |
| download | gentoo-2-5cfe4a522f300c7024eadb3c9ead41c64296bf13.tar.gz gentoo-2-5cfe4a522f300c7024eadb3c9ead41c64296bf13.tar.bz2 gentoo-2-5cfe4a522f300c7024eadb3c9ead41c64296bf13.zip | |
Be compatible with >=automake-1.11.4, thanks marienz for the patch in bug #414863
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/geeqie')
| -rw-r--r-- | media-gfx/geeqie/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/geeqie/files/geeqie-1.0-automake-1.11.patch | 22 | ||||
| -rw-r--r-- | media-gfx/geeqie/geeqie-1.0-r2.ebuild | 5 |
3 files changed, 32 insertions, 2 deletions
diff --git a/media-gfx/geeqie/ChangeLog b/media-gfx/geeqie/ChangeLog index a0bbedf312bb..fa3273bd8ff8 100644 --- a/media-gfx/geeqie/ChangeLog +++ b/media-gfx/geeqie/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/geeqie # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.20 2012/05/21 19:05:12 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.21 2012/06/07 23:01:30 voyageur Exp $ + + 07 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org> geeqie-1.0-r2.ebuild, + +files/geeqie-1.0-automake-1.11.patch: + Be compatible with >=automake-1.11.4, thanks marienz for the patch in bug + #414863 21 May 2012; Kacper Kowalik <xarthisius@gentoo.org> geeqie-1.0-r2.ebuild: Add missing inheritance of eutils.eclass diff --git a/media-gfx/geeqie/files/geeqie-1.0-automake-1.11.patch b/media-gfx/geeqie/files/geeqie-1.0-automake-1.11.patch new file mode 100644 index 000000000000..b6a33997f239 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-1.0-automake-1.11.patch @@ -0,0 +1,22 @@ +=== modified file 'doc/Makefile.am' +--- doc/Makefile.am 2012-06-02 13:33:57 +0000 ++++ doc/Makefile.am 2012-06-02 13:35:03 +0000 +@@ -2,9 +2,6 @@ + + helpdir = @htmldir@ + +-# empty help_DATA just installs the directory +-help_DATA = +- + EXTRA_DIST = docbook2html.sh docbook + + html/GuideIndex.html: docbook/GuideIndex.xml +@@ -19,6 +16,7 @@ + + install-data-hook: html + if [ -x "$(GNOME_DOC_TOOL)" ]; then \ ++ $(MKDIR_P) "$(DESTDIR)$(helpdir)" || exit 1; \ + cd html; for f in * ; do $(INSTALL_DATA) "$$f" "$(DESTDIR)$(helpdir)/$$f" ; done; \ + ln -s GuideIndex.html "$(DESTDIR)$(helpdir)/index.html" ; \ + fi + diff --git a/media-gfx/geeqie/geeqie-1.0-r2.ebuild b/media-gfx/geeqie/geeqie-1.0-r2.ebuild index ed5d75270261..e20ec683626e 100644 --- a/media-gfx/geeqie/geeqie-1.0-r2.ebuild +++ b/media-gfx/geeqie/geeqie-1.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0-r2.ebuild,v 1.5 2012/05/21 19:05:12 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0-r2.ebuild,v 1.6 2012/06/07 23:01:30 voyageur Exp $ EAPI=4 inherit autotools eutils @@ -27,6 +27,7 @@ DEPEND="${RDEPEND} sys-devel/gettext" src_prepare() { + epatch "${FILESDIR}"/${P}-automake-1.11.patch epatch "${FILESDIR}"/${P}-lfs_support.patch eautoreconf } @@ -47,6 +48,8 @@ src_configure() { } src_install() { + # Bug 414863 + dodir /usr/share/doc/${PF}/html emake DESTDIR="${D}" install rm -f "${D}/usr/share/doc/${MY_P}/COPYING" } |