Added patch to compile with >=media-gfx/exiv2-0.14. Fixes bug 178939. Fixed manifest, fixes bug 166516.

Package-Manager: portage-2.1.2.7

4 files changed, 143 insertions, 15 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 8dda936e8060..8086dd3b48f9 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.88 2007/05/20 18:48:47 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.89 2007/05/21 20:15:56 philantrop Exp $
+
+  21 May 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/digikam-0.9.1-exiv2.patch, digikam-0.9.1.ebuild:
+  Added patch to compile with >=media-gfx/exiv2-0.14. Fixes bug 178939. Fixed
+  manifest, fixes bug 166516.
 
   20 May 2007; Matti Bickel <mabi@gentoo.org> digikam-0.9.1.ebuild:
   keyworded ~ppc (bug #169160)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index ff8a3a5f48b6..043a92483f1a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX digikam-0.9.1-exiv2.patch 4571 RMD160 28cf8f766eeafa1871933805eb4b2dab37495754 SHA1 b5b1ed15d55fe35e55ef35e2e4f78d659f0d440a SHA256 efbf2f55011d42c276e9c854b94e9c66bb709a2ac8246cb1bc9de25d2eabf0f1
+MD5 2ec404646c6ec18fb9b32c39f491ed6b files/digikam-0.9.1-exiv2.patch 4571
+RMD160 28cf8f766eeafa1871933805eb4b2dab37495754 files/digikam-0.9.1-exiv2.patch 4571
+SHA256 efbf2f55011d42c276e9c854b94e9c66bb709a2ac8246cb1bc9de25d2eabf0f1 files/digikam-0.9.1-exiv2.patch 4571
 DIST digikam-0.7.4.tar.bz2 2322119 RMD160 c69b2b90ec56cf5e3f536b017db2310e325927b8 SHA1 abbd313517786c0a710c0faffc0a0d9f2771f641 SHA256 38139c41863064d7d388b1d927747392f43f2c97cb55700d7a8f697378cc8cc2
 DIST digikam-0.8.2.tar.bz2 4015299 RMD160 6dfc3626d606427e06327c2451010fc50f96df2e SHA1 6305b1c485a3fe82257907410b256966bb012406 SHA256 f6f18c2ad2587cc8477512abb648fed7c9da53ef63dc36e7925e995cf6a2e043
 DIST digikam-0.9.0.tar.bz2 5692707 RMD160 f99e95ac99b5c21d248391ebe2dca1018bd51bd0 SHA1 5ccf282ddd3b1df7730536f9e9b360dd0ed2c139 SHA256 8fff9b2277c58ca027100fa4af05dea8b955c8a98b79b6befa90b47ac34c77d2
@@ -30,14 +34,14 @@ EBUILD digikam-0.9.0.ebuild 2555 RMD160 e8d609afadd0a8814052dd33b0910789a2ca6674
 MD5 a17b3a6cf64229cc1c7791f808ca5319 digikam-0.9.0.ebuild 2555
 RMD160 e8d609afadd0a8814052dd33b0910789a2ca6674 digikam-0.9.0.ebuild 2555
 SHA256 456fa1ddfb470ac93d71cd501f1a59a2f0885485e4cb0f4dce8415f5cc9c5b33 digikam-0.9.0.ebuild 2555
-EBUILD digikam-0.9.1.ebuild 2501 RMD160 b664cf1677684cdf41a354a318fe093448feb3fb SHA1 d77f108ecdff6e132b9b1194da6ff824fb705a6e SHA256 cc03dd36bb0919bab1a545595967dd3cbfecea6caf0c65b60ea290ab77dc5c0b
-MD5 8d43106f631dc246d27e9546580bf1db digikam-0.9.1.ebuild 2501
-RMD160 b664cf1677684cdf41a354a318fe093448feb3fb digikam-0.9.1.ebuild 2501
-SHA256 cc03dd36bb0919bab1a545595967dd3cbfecea6caf0c65b60ea290ab77dc5c0b digikam-0.9.1.ebuild 2501
-MISC ChangeLog 14618 RMD160 6aba848695c19621ebea1ba2eb316eb84917d183 SHA1 3cbd7d77cbd40b0fe445e990c48c361006146cdf SHA256 1ffd6463ceee68896399689eefa186b62f7774549209c661abb41cc90a5b0a65
-MD5 84be01afc7cd6ba282ed97432a3ebeef ChangeLog 14618
-RMD160 6aba848695c19621ebea1ba2eb316eb84917d183 ChangeLog 14618
-SHA256 1ffd6463ceee68896399689eefa186b62f7774549209c661abb41cc90a5b0a65 ChangeLog 14618
+EBUILD digikam-0.9.1.ebuild 2598 RMD160 9e4eee65316ade29c7b4f52b6a227ac9b1fbadd9 SHA1 88f7c165bf856c5f866f697acb8e75cdde2d6b86 SHA256 d8845889a80baa449b26f7ef83de6d85fb93967ed0f42e8ecd01d6121cfe1295
+MD5 8bfe50ac08a89d7478b6eadb4a91be42 digikam-0.9.1.ebuild 2598
+RMD160 9e4eee65316ade29c7b4f52b6a227ac9b1fbadd9 digikam-0.9.1.ebuild 2598
+SHA256 d8845889a80baa449b26f7ef83de6d85fb93967ed0f42e8ecd01d6121cfe1295 digikam-0.9.1.ebuild 2598
+MISC ChangeLog 14846 RMD160 0629ffbda95a28719027198bf841a3e38ffaaf3d SHA1 a28a0cfb22640a37dd5fb38aa71f9e549d8d66f7 SHA256 2c54d144e440e557ae8db15362f0398bf4633b3add2c007b9b0e996bf0df0cc0
+MD5 761c88b238cf9ffe77d88d44631b65e6 ChangeLog 14846
+RMD160 0629ffbda95a28719027198bf841a3e38ffaaf3d ChangeLog 14846
+SHA256 2c54d144e440e557ae8db15362f0398bf4633b3add2c007b9b0e996bf0df0cc0 ChangeLog 14846
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -55,9 +59,9 @@ MD5 df6e495147a49b0d4dada786075d2eaa files/digest-digikam-0.9.1 3439
 RMD160 89ac6a32cfc80985f98f1f7404e053f6b3175a9e files/digest-digikam-0.9.1 3439
 SHA256 bbc5395cbb89df2ffb704e3e8f2091131b4f025b35183bbda3310f8b1d984cec files/digest-digikam-0.9.1 3439
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGUJeIfNMcoUhJ7GwRAvxoAJ4iGsYpcjNK0qzUb7YimVRMbcNNBgCfW8ld
-jD7sFmJGbg7nlPCCkxKeiDU=
-=j/wF
+iD8DBQFGUf4FCkvF58q80IkRAuIKAJ4rqF1DEfrJJzdEo+ZKkaRSKDRa1gCdEUmJ
+Z260EVSTg4CZYmoK9UlX52U=
+=m8Lq
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-0.9.1.ebuild b/media-gfx/digikam/digikam-0.9.1.ebuild
index 5aaae5af9a9a..feefb07018f9 100644
--- a/media-gfx/digikam/digikam-0.9.1.ebuild
+++ b/media-gfx/digikam/digikam-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.1.ebuild,v 1.7 2007/05/20 18:48:47 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.1.ebuild,v 1.8 2007/05/21 20:15:55 philantrop Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -63,6 +63,10 @@ src_unpack(){
 	kde_src_unpack
 	rm -f "${S}/configure" "${S_DOC}/configure"
 
+	if has_version ">=media-gfx/exiv2-0.14"; then
+		epatch "${FILESDIR}/${P}-exiv2.patch"
+	fi
+
 	local MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
 	elog "Enabling translations for: en ${MAKE_PO}"
 	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = . ${MAKE_PO}:" "${S}/po/Makefile.am" || die "sed for locale failed"
@@ -91,4 +95,3 @@ src_install(){
 	mv "${D}/usr/share/applnk/Graphics/digikam.desktop" \
 		"${D}/usr/share/applications/kde"
 }
-
diff --git a/media-gfx/digikam/files/digikam-0.9.1-exiv2.patch b/media-gfx/digikam/files/digikam-0.9.1-exiv2.patch
new file mode 100644
index 000000000000..2b6c72db38f2
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-0.9.1-exiv2.patch
@@ -0,0 +1,116 @@
+--- digikam-0.9.1.orig/digikam/libs/widgets/metadata/exifwidget.cpp	2007-03-04 21:33:32.000000000 +0100
++++ digikam-0.9.1/digikam/libs/widgets/metadata/exifwidget.cpp	2007-05-17 15:05:43.000000000 +0200
+@@ -181,7 +181,7 @@
+     catch (Exiv2::Error& e)
+     {
+         DDebug() << "Cannot parse EXIF metadata using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return false;
+     }
+@@ -211,7 +211,7 @@
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag title using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("Unknown");
+     }
+@@ -228,7 +228,7 @@
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag description using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("No description available");
+     }
+--- digikam-0.9.1.orig/digikam/libs/widgets/metadata/gpswidget.cpp	2007-03-04 21:33:32.000000000 +0100
++++ digikam-0.9.1/digikam/libs/widgets/metadata/gpswidget.cpp	2007-05-17 15:06:40.000000000 +0200
+@@ -305,7 +305,7 @@
+     {
+         setMetadataEmpty();
+         DDebug() << "Cannot parse EXIF metadata using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return false;
+     }
+@@ -343,7 +343,7 @@
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag title using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("Unknown");
+     }
+@@ -360,7 +360,7 @@
+     catch (Exiv2::Error& e) 
+     {   
+         DDebug() << "Cannot get metadata tag description using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("No description available");
+     }
+--- digikam-0.9.1.orig/digikam/libs/widgets/metadata/iptcwidget.cpp	2007-03-04 21:33:32.000000000 +0100
++++ digikam-0.9.1/digikam/libs/widgets/metadata/iptcwidget.cpp	2007-05-17 15:05:04.000000000 +0200
+@@ -156,7 +156,7 @@
+     catch (Exiv2::Error& e)
+     {
+         DDebug() << "Cannot parse IPTC metadata using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return false;
+     }
+@@ -185,7 +185,7 @@
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag title using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("Unknow");
+     }
+@@ -202,7 +202,7 @@
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag description using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("No description available");
+     }
+--- digikam-0.9.1.orig/digikam/libs/widgets/metadata/makernotewidget.cpp	2007-03-04 21:33:32.000000000 +0100
++++ digikam-0.9.1/digikam/libs/widgets/metadata/makernotewidget.cpp	2007-05-17 15:06:18.000000000 +0200
+@@ -198,7 +198,7 @@
+     catch (Exiv2::Error& e)
+     {
+         DDebug() << "Cannot parse MAKERNOTE metadata using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return false;
+     }
+@@ -227,7 +227,7 @@
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag title using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("Unknown");
+     }
+@@ -244,7 +244,7 @@
+     catch (Exiv2::Error& e) 
+     {
+         DDebug() << "Cannot get metadata tag description using Exiv2 ("
+-                  << QString::fromAscii(e.what().c_str())
++                  << QString::fromAscii(e.what())
+                   << ")" << endl;
+         return i18n("No description available");
+     }