diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-05-29 08:55:47 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-05-29 08:55:47 +0000 |
commit | 9e016a06a81f4159981da7f1b01235f7d502d39e (patch) | |
tree | cbbc74d5f433b150ccac069e75cba7be2bfed8e7 | |
parent | Revision bump for new genpatches. (diff) | |
download | gentoo-2-9e016a06a81f4159981da7f1b01235f7d502d39e.tar.gz gentoo-2-9e016a06a81f4159981da7f1b01235f7d502d39e.tar.bz2 gentoo-2-9e016a06a81f4159981da7f1b01235f7d502d39e.zip |
Fix the patching when doc was enabled. Thanks to zzam for spotting and fixing. Per bug #271629.
(Portage version: 2.2_rc33/cvs/Linux i686)
-rw-r--r-- | media-gfx/digikam/ChangeLog | 7 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-0.9.5-r1.ebuild | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index b58d321dd947..7469ab4fc2f7 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/digikam # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.135 2009/05/28 09:53:09 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.136 2009/05/29 08:55:47 scarabeus Exp $ + + 29 May 2009; Tomáš Chvátal <scarabeus@gentoo.org> + digikam-0.9.5-r1.ebuild: + Fix the patching when doc was enabled. Thanks to zzam for spotting and + fixing. Per bug #271629. *digikam-0.9.5-r1 (28 May 2009) diff --git a/media-gfx/digikam/digikam-0.9.5-r1.ebuild b/media-gfx/digikam/digikam-0.9.5-r1.ebuild index 37ba90a1f6a8..5368d59a6e60 100644 --- a/media-gfx/digikam/digikam-0.9.5-r1.ebuild +++ b/media-gfx/digikam/digikam-0.9.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.5-r1.ebuild,v 1.1 2009/05/28 09:53:09 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.5-r1.ebuild,v 1.2 2009/05/29 08:55:47 scarabeus Exp $ EAPI="1" @@ -61,6 +61,7 @@ src_unpack(){ local MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | tr ' ' '\n' | sort | uniq -d | tr '\n' ' ') elog "Preparing to build translations for: en ${MAKE_PO}" sed -i -e "s:^SUBDIRS =.*:SUBDIRS = . ${MAKE_PO}:" "${S}/po/Makefile.am" || die "sed for locale failed" + epatch "${FILESDIR}/${PV}-cam_download.patch" if use doc; then cd "${S_DOC}/doc" @@ -77,7 +78,6 @@ src_unpack(){ DIRS="$(echo ${DIRS} | tr '\n' ' ')" sed -i -e "s:^SUBDIRS =.*:SUBDIRS = digikam showfoto ${DIRS}:" "${S_DOC}/doc/Makefile.am" || die "sed for locale (docs) failed" fi - epatch "${FILESDIR}/${PV}-cam_download.patch" } src_compile(){ |