summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-05-29 08:55:47 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-05-29 08:55:47 +0000
commit2c674bf7ecdd487d4151a1362cef869b16f3e43c (patch)
tree3ea060d4f682b622950c2beff2d8b4a4120be4c0 /media-gfx/digikam
parentRevision bump for new genpatches. (diff)
downloadhistorical-2c674bf7ecdd487d4151a1362cef869b16f3e43c.tar.gz
historical-2c674bf7ecdd487d4151a1362cef869b16f3e43c.tar.bz2
historical-2c674bf7ecdd487d4151a1362cef869b16f3e43c.zip
Fix the patching when doc was enabled. Thanks to zzam for spotting and fixing. Per bug #271629.
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'media-gfx/digikam')
-rw-r--r--media-gfx/digikam/ChangeLog7
-rw-r--r--media-gfx/digikam/Manifest10
-rw-r--r--media-gfx/digikam/digikam-0.9.5-r1.ebuild4
3 files changed, 13 insertions, 8 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/Manifest b/media-gfx/digikam/Manifest
index 81633b15d0ad..58c0e03a3092 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -14,14 +14,14 @@ EBUILD digikam-0.10.0.ebuild 1982 RMD160 b28c8b18dddcdd9ef3b8718e5e9078308fc47ef
EBUILD digikam-0.9.2.ebuild 2370 RMD160 77b6d84e34f9f910ffda7c8c0eeabadd0aaf0e73 SHA1 e529fae064225e9d220e584642ef3fbdc8a536da SHA256 eb7258739ddce1829eb9b14ee27f1498b4e41898b97abf60df3f38b9252f5dd2
EBUILD digikam-0.9.4-r2.ebuild 2708 RMD160 d75b9143d232ae32ff8d8fc8ae951234ac93802f SHA1 0a2746ac7e9cc10f37bb133b1a7dfc1b1f3b2ddc SHA256 99956ec5acb00f4dbcec22a6bcc8302e88c9e60cbf429b8b397a4031f359c4d3
EBUILD digikam-0.9.4.ebuild 2361 RMD160 166e3b5ca9e3851302855683123cc1fd4fe871e3 SHA1 f3072e752df77128598493b656fa676c4535a6ac SHA256 18709a7cd0b330b5be9455fea9f519ac282004339f97087e8ff42b625a79c55d
-EBUILD digikam-0.9.5-r1.ebuild 2760 RMD160 6ef2d7e04c502868dd1771fe40ab8cd24e46fb66 SHA1 8787a16b7a1353c0334206e669817570f71a085b SHA256 69a411162516837425064cf1bf3f5db9200d7b3b1e8d744ea2e4093735d37372
+EBUILD digikam-0.9.5-r1.ebuild 2760 RMD160 3e3131d5d7ba0e9ff901c9397a97dbc28cd05fa7 SHA1 89d2330e68f5182397bec67f5d5f8f7af391b9cd SHA256 3927b565f5f8940403ec404b3dda67d3a5a28ae98a0384c4a5ca2f9d1aa5f78b
EBUILD digikam-0.9.5.ebuild 2710 RMD160 7075867a0ba72211b5adf9abec8f2ccc704c2ea8 SHA1 448191a0a7b95fe1e8ceed6e916400f6fa574440 SHA256 b1f43b03411166499a9ce2e10bed0da40a14f86953ddaafd58f8b31f0e49bc2a
-MISC ChangeLog 22624 RMD160 0306130030b6889d0df1e98f1954eacb3c303d58 SHA1 07363e86f8018ce6a37c5766185c1f220e5b7d86 SHA256 1fb1ecaeb565cb2b19f9b1b9ddc4d5a835a04288c5974f32cf24f5202116d0e8
+MISC ChangeLog 22807 RMD160 8ed05b655bd1cb86c78b76edf718729d43045871 SHA1 60dd57cce4ae3e96c0a7150878895effe35ddcbc SHA256 e3bb315d449dbbe9e392c4375b5c1b11c8e0550cbd9c5cc544d8b510bbf2ce50
MISC metadata.xml 376 RMD160 3158e2babdd75064d05a08420e0f1d2d3b318fae SHA1 bf9026c227e27333e688b7a4d639e7eaf7ba5993 SHA256 9ea05856a338312e6d9d3ebe15b935d371bd4bd21eeaa796d71db1a92b4e7231
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEUEARECAAYFAkoeXxgACgkQHB6c3gNBRYdPQQCggeztuvCQghhSvxT2fbhu3F+F
-Y4AAl3FHEXO+4CZ3UdFAyQemi6MZlwE=
-=yyUP
+iEYEARECAAYFAkofoyAACgkQHB6c3gNBRYcvzACgpN/BDkvWCE0Lfr0CDZwmtbwp
+NSAAnj+xZJDug2ZTiiq8LJDibBnkdtAw
+=192f
-----END PGP SIGNATURE-----
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(){