Clean up. Remove deprecated slot_rebuild() check.

Package-Manager: portage-2.1.4.4

7 files changed, 13 insertions, 264 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 7c5a3bfb34bf..29461aa8bf89 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.113 2008/04/30 20:19:11 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.114 2008/05/17 15:50:12 carlo Exp $
+
+  17 May 2008; Carsten Lohrke <carlo@gentoo.org>
+  -files/digikam-0.9.1-exiv2.patch, -digikam-0.9.1.ebuild,
+  digikam-0.9.2.ebuild, digikam-0.9.3.ebuild, digikam-0.9.4_beta4.ebuild:
+  Clean up. Remove deprecated slot_rebuild() check.
 
 *digikam-0.9.4_beta4 (30 Apr 2008)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index b3d89150ea94..c380c680415a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,40 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX digikam-0.9.1-exiv2.patch 4571 RMD160 28cf8f766eeafa1871933805eb4b2dab37495754 SHA1 b5b1ed15d55fe35e55ef35e2e4f78d659f0d440a SHA256 efbf2f55011d42c276e9c854b94e9c66bb709a2ac8246cb1bc9de25d2eabf0f1
 AUX digikam-lcms-1.17.patch 468 RMD160 2dfd58fe72450b94cac4b36ce64c02a6055ea356 SHA1 f4c84bb8166876f8a12a7543d262eda15acbd63f SHA256 534877c73bdee6714c3ddd74cb365d5f866b48f4f7bf1eb50d874595afd80d6c
-DIST digikam-0.9.1.tar.bz2 6781756 RMD160 920cb49315dfbbe8c9944209568a8430b5e0404f SHA1 92c9c9a943ad5a806be900758dbdc02ad94b8061 SHA256 7d6a4d9828f05024b206964ddda9119a9767da351c44cd7bbab342d11b24a5a4
 DIST digikam-0.9.2.tar.bz2 10514411 RMD160 c9f1faacea00362595a400e0514d388055f53243 SHA1 8344355c3a9e4b8648d2e1a853cdf54e90918d91 SHA256 0b1c3f83c8be3578f2d94a31dc51139a167a078aca1522a8571bf31d633fcf0f
 DIST digikam-0.9.3.tar.bz2 10911417 RMD160 006d535aa56f174de0153e07f66d4aea62fea89d SHA1 5cea651e498ff8adffeb72cdf59a3364c9aac0cc SHA256 1706a5318a4a555b03e9a7cbeba146ecea25cbb9c445baf22c33e362cba74b4b
 DIST digikam-0.9.4-beta2.tar.bz2 10851573 RMD160 83ac4e2b15ddf546b8a0b1d8ed7fe7c4a68ceef0 SHA1 71e02bc0e5e22639001deb7adcf5e00610dfca58 SHA256 20b92cf1a639af76f30e2c24843f4d233345d11274108c775e6fcde873821158
 DIST digikam-0.9.4-beta3.tar.bz2 10936761 RMD160 b2f35312ac25f062fa4a01e2c326beab439e01a0 SHA1 9791960951eeacf6222411c9b9d5c2ca8fb4fd5b SHA256 1fcac03505dca5054c245c0f69b00395e7b7faef63eb19f77454008667a7f102
 DIST digikam-0.9.4-beta4.tar.bz2 10932685 RMD160 6d2409ea47d9ed9d6022cb0a0dbc6a0135ac3100 SHA1 83aa22fd19adbef4b116ff766fb2336e94a8be3c SHA256 2d5c6e9f562b558f75a6cfdbb35aa699ff13e5e06b535cf8d72c0afb15112e2d
-DIST digikam-doc-0.8.2-da.tar.bz2 50158 RMD160 c78a62d17045e5a47d562acbc4a5cb3f1b62e558 SHA1 4fdb5caca7e627074bf7c5d7b90dbc5d19770bea SHA256 5b3301301dbbfae999d7398d7ee2651c6c4b94f4baa8566d5d1c9914b2bfe142
-DIST digikam-doc-0.8.2-de.tar.bz2 52448 RMD160 2f48efc9a470da0f18e5b8028b40f15f5d133b19 SHA1 556063435fd6c86fe064b7d812fbf8574515ec89 SHA256 5968243bff59ef2a81482479a8b6c2b7570394c702fe6c41fb179411c12a58f1
-DIST digikam-doc-0.8.2-es.tar.bz2 18932790 RMD160 33fe060abd338af7f2f06ab9a4a4a48d73f9f0cb SHA1 0191c7b894b5c6ea405f78b42ca94116296f8786 SHA256 45ec5d2995535a8ce721895fe140a0a284bdd6f0af879a497ea0317ca4d83f29
-DIST digikam-doc-0.8.2-et.tar.bz2 49932 RMD160 bcecae36e125d5cdf31025e31ecb8b6c80c17929 SHA1 9aef50ff56d7a878dd62ec5453a6c28cf7d3f267 SHA256 7c94a068d45e6c93ea54ab1ccdc053a0eb77b36050925b8beaec00f77efd2790
-DIST digikam-doc-0.8.2-fr.tar.bz2 28805 RMD160 a1910268db988269461822535accf375c533afcc SHA1 2a84158deb64672bbeb45692ca08008b18d47646 SHA256 054e9ec711251576d20d20323a1a1a2ce15026ebe7611b7934e7c163326fbf4c
-DIST digikam-doc-0.8.2-it.tar.bz2 702534 RMD160 44e5a1d0834cdba90bb7da3eb627945c8c79605e SHA1 3aeec8bcad89ff09c67b8c1ed1d67b5115313bc8 SHA256 881ca55f51c23ac12ab8487349b394a4931d9ee167a0454fcb01a344fb27d025
-DIST digikam-doc-0.8.2-main.tar.bz2 8763651 RMD160 e1668f5fe596d57e4da55aaa455429b70cd4ce55 SHA1 4681519e4229426be07a03c4d821de8504737711 SHA256 87499ec384b825f57f651af033178802e5ec2e472712e3be4c03bcb93db01596
-DIST digikam-doc-0.8.2-nl.tar.bz2 9763453 RMD160 c71580f8e4cac77ffe424aad6a2cf97e2f2bb89b SHA1 b002344679f5b00f7b4e9cb6fbba5951d7a6f617 SHA256 11ec5f6fee836c5e8950f5774f3fc9797088109bb16fd53bf569a0dc89b470c5
-DIST digikam-doc-0.8.2-pl.tar.bz2 53888 RMD160 3c8511908647821edf37a7b5ef52f5967cd75895 SHA1 b060b898417b03f6dc67de7b7ca8febc11981a34 SHA256 eb0dc2d87f7427f7f930bd0c3b2e942fe2650c9165ecc6084df51da752fdee3f
-DIST digikam-doc-0.8.2-pt.tar.bz2 52447 RMD160 2beb73e84520e8508ef67c9c72944f406f2acbff SHA1 d72992396b87deb22a767be9a4ed9fe2ac9f0e07 SHA256 bdd974b2c903e999ace96a5fa771f4228b05173a963f9ce8859f16ae9aa558c9
-DIST digikam-doc-0.8.2-pt_BR.tar.bz2 1987997 RMD160 521b7b1a2bcdfcd1282cbafaf8dad844838a08a4 SHA1 ed711ce5cf58ac4d1d791be2c80756f025aa4bd8 SHA256 1f557ef8cd8ca013027ccb6f4025f9a83280c8b0742c412a3f170fae580f38b8
-DIST digikam-doc-0.8.2-sv.tar.bz2 261002 RMD160 9a1c2e3b7a6957a2597e08492a967634bc0744a9 SHA1 3ff7b1b87b16fdee87f0824f3fcc706eb76a903a SHA256 c40087176d04f7dbd89458aa2e4ce21ef825633924347e7c0b62c9ad5fd72f67
 DIST digikam-doc-0.9.2-beta2.tar.bz2 40596219 RMD160 32a26bcc1f89da53464e2dd1cd9ca7c5be227a9b SHA1 998900d3327e852dc09aa2baf7fef43ee271eaf3 SHA256 bffcf0de73bbc16870eb68abec7836ab3b997cdb30634f984bd5036658806ceb
 DIST digikam-doc-0.9.4.tar.bz2 58242503 RMD160 6315f32a98c0442ae8577cc06230f88ce2850826 SHA1 16ba0b1e74b405625c166652b72b8c02def08f51 SHA256 0fe52595f7a992fb9749ad2fe26050d19421fe5960cb8b6c328b774bfee5f3e7
-EBUILD digikam-0.9.1.ebuild 2645 RMD160 0aada051c7c4b056894836e76e24f5dc8b263969 SHA1 5007c1415352837a8f278b44ac4f712efe93e270 SHA256 7a34db882f9ab5f6a3e8789646d2ec6ecf46a69405315dd67dcb03126804e731
-EBUILD digikam-0.9.2.ebuild 2491 RMD160 94c8cc958e77b8eaba7c2427b6ace78194339a3a SHA1 67af7d463a92dd8490ae5ae2c45bb226b088a43a SHA256 6e84b39716e92d1f7675e8f54fd5295b8066a26aa4ebff687db8ab4363c82a9b
-EBUILD digikam-0.9.3.ebuild 2516 RMD160 98e9e8dcc5b4b3ef5e0c592c69b3adcced167184 SHA1 a725bb50eb10a1efc57f278fbb31c0bec46c29a0 SHA256 c184717bf92934d1207690a577e2d1cf7141b52b498e700213e933514e8a3f7f
+EBUILD digikam-0.9.2.ebuild 2418 RMD160 317167da7f93e8b98a5c076a3a679204e5527ccd SHA1 13a5d0cee9834d8ebe135279724b9fe65a497765 SHA256 1821779efc68c130d926122f5c8d06524faff386daa55d5fa645a70dd3f3d06b
+EBUILD digikam-0.9.3.ebuild 2442 RMD160 b73b53e8df8a93de3e63803c364e09de418934a2 SHA1 d95624f68acff28e8d0cdebe1c5d7522a5edf466 SHA256 5ffe1542b792389271c8e0715491076756055e0ee196c5d09e23786a86b29998
 EBUILD digikam-0.9.4_beta2.ebuild 2527 RMD160 17915e6dc1ee4f684afab7188dc07ffdf98b3af2 SHA1 98b8a9e0059d5000c67c0a5aac15285afc9a787f SHA256 834b5c72c84de34a40eda8f0c764b8103af2627d50cb6b93cb5825926e140944
 EBUILD digikam-0.9.4_beta3.ebuild 2526 RMD160 d1baeccbb441c5c678eedede55cca709c7f653c3 SHA1 af1a044b0075f0cca70bdadc654bc7a8781fd3a6 SHA256 21a3a6376147bd0b64d6d8e01e481c9d26fe548d383d7c49dccfa19ad2c2e5e0
-EBUILD digikam-0.9.4_beta4.ebuild 2520 RMD160 26e58da0db0b218063e96ec2f3b1fa88e42915ec SHA1 ac5b36929fecd00189bf449b053b328181e4af55 SHA256 47c451cbd7af318311fc1ff0610d23666114eebf2bd7a56164d497dd6217b9c5
-MISC ChangeLog 18639 RMD160 c281ab16d51b9a1e2a6f7f8d8abe34040ae3a4bd SHA1 6aa0daa84bc3f3a3c35055ff7cca69e7679d9626 SHA256 d0b67e0218ad00e9e3907ef726e7afb89afe330735ef6f215083673042d3be8f
+EBUILD digikam-0.9.4_beta4.ebuild 2442 RMD160 a3be7b55b8c231df9eaf06c6bb7948e5f3d59eb4 SHA1 e996eb2ab9ded5527c6abb107a6d91947d7f2e82 SHA256 4b32d5d4d1f462a8b198067ee4cc370962ebdd59177e397a7ec3a74e8e6a1615
+MISC ChangeLog 18869 RMD160 fa3bbc26d26a1694afe26fed271274140addb324 SHA1 6e98b7350cac5c3215cc5f073481558f8027963b SHA256 c465b5a86f93c7eb19087518efd938c9d953bb87ca6bbf60ada408e0fa38b002
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgY1FQACgkQKfQzuokD2Ipo/gCePam9lx2EdmTg4k7p4apS14Tc
-YR8An2N5SzA6jyNrlJK8G0M2Zp0KJ/eo
-=zP79
------END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-0.9.1.ebuild b/media-gfx/digikam/digikam-0.9.1.ebuild
deleted file mode 100644
index a6766b5fca97..000000000000
--- a/media-gfx/digikam/digikam-0.9.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2008 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.17 2008/02/19 03:28:00 ingmar Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit kde eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-P_DOC="${PN}-doc-0.8.2"
-S_DOC="${WORKDIR}/${P_DOC}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="nfs doc kdehiddenvisibility kdeenablefinal"
-
-DEPEND=">=media-libs/libgphoto2-2.2
-	>=dev-db/sqlite-3
-	>=media-libs/libkipi-0.1
-	>=media-libs/tiff-3.8.2
-	>=media-gfx/exiv2-0.12
-	>=media-libs/lcms-1.14
-	>=media-libs/libpng-1.2
-	>=media-libs/jasper-1.7
-	media-libs/libkexiv2"
-
-RDEPEND="${DEPEND}
-	|| ( ( kde-base/kgamma kde-base/kamera ) kde-base/kdegraphics )"
-
-need-kde 3.5
-
-LANGS="ar bg br ca cs cy da de el en_GB es et fi fr ga gl he hu is it ja ka lt
-mk ms mt nb nl nn pa pl pt pt_BR ro ru rw sk sl sr sr@Latn sv ta th tr uk vi zh_CN
-zh_TW"
-
-LANGS_DOC="da de es et fr it nl pl pt pt_BR sv"
-
-for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-for lang in ${LANGS_DOC}; do
-	SRC_URI="${SRC_URI}
-	linguas_${lang}? ( http://gentoo-sunrise.org/svndump/peper/distfiles/${P_DOC}-${lang}.tar.bz2 )"
-done
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	doc? ( http://gentoo-sunrise.org/svndump/peper/distfiles/${P_DOC}-main.tar.bz2
-		${SRC_URI} )"
-
-pkg_setup(){
-	slot_rebuild "media-libs/libkipi" && die
-	kde_pkg_setup
-}
-
-src_unpack(){
-	kde_src_unpack
-
-	epatch "${FILESDIR}/${PN}-lcms-1.17.patch"
-
-	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"
-
-	if use doc; then
-		local MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
-		elog "Enabling documentation for: en ${MAKE_DOC}"
-	fi
-}
-
-src_compile(){
-	local myconf
-
-	myconf="$(use_enable nfs nfs-hack)"
-	kde_src_compile
-	myconf=""
-	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_compile
-}
-
-src_install(){
-	kde_src_install
-	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_install
-
-	# Install the .desktop in FDO's suggested directory
-	dodir /usr/share/applications/kde
-	mv "${D}/usr/share/applnk/Graphics/digikam.desktop" \
-		"${D}/usr/share/applications/kde"
-}
diff --git a/media-gfx/digikam/digikam-0.9.2.ebuild b/media-gfx/digikam/digikam-0.9.2.ebuild
index b98c87d3ffa2..ea2c4efb6cac 100644
--- a/media-gfx/digikam/digikam-0.9.2.ebuild
+++ b/media-gfx/digikam/digikam-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.2.ebuild,v 1.9 2008/02/19 01:49:57 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.2.ebuild,v 1.10 2008/05/17 15:50:12 carlo Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -48,11 +48,6 @@ for lang in ${LANGS}; do
 	IUSE="${IUSE} linguas_${lang}"
 done
 
-pkg_setup(){
-	slot_rebuild "media-libs/libkipi" && die
-	kde_pkg_setup
-}
-
 src_unpack(){
 	kde_src_unpack
 
diff --git a/media-gfx/digikam/digikam-0.9.3.ebuild b/media-gfx/digikam/digikam-0.9.3.ebuild
index 2bf318f24de1..1a56199465eb 100644
--- a/media-gfx/digikam/digikam-0.9.3.ebuild
+++ b/media-gfx/digikam/digikam-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.3.ebuild,v 1.3 2008/02/19 01:49:57 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.3.ebuild,v 1.4 2008/05/17 15:50:12 carlo Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -49,11 +49,6 @@ for lang in ${LANGS}; do
 	IUSE="${IUSE} linguas_${lang}"
 done
 
-pkg_setup(){
-	slot_rebuild "media-libs/libkipi" && die
-	kde_pkg_setup
-}
-
 src_unpack(){
 	kde_src_unpack
 
diff --git a/media-gfx/digikam/digikam-0.9.4_beta4.ebuild b/media-gfx/digikam/digikam-0.9.4_beta4.ebuild
index 00b796e882a0..ecdb310292cd 100644
--- a/media-gfx/digikam/digikam-0.9.4_beta4.ebuild
+++ b/media-gfx/digikam/digikam-0.9.4_beta4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.4_beta4.ebuild,v 1.1 2008/04/30 20:19:11 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.4_beta4.ebuild,v 1.2 2008/05/17 15:50:12 carlo Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -49,11 +49,6 @@ for lang in ${LANGS}; do
 	IUSE="${IUSE} linguas_${lang}"
 done
 
-pkg_setup(){
-	slot_rebuild "media-libs/libkipi" && die
-	kde_pkg_setup
-}
-
 src_unpack(){
 	kde_src_unpack
 
diff --git a/media-gfx/digikam/files/digikam-0.9.1-exiv2.patch b/media-gfx/digikam/files/digikam-0.9.1-exiv2.patch
deleted file mode 100644
index 2b6c72db38f2..000000000000
--- a/media-gfx/digikam/files/digikam-0.9.1-exiv2.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- 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");
-     }