Reverts bug #153535. Fixes bug #153639.

Package-Manager: portage-2.1.2_rc1-r1

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 64dc091dfeb2e4cd009c5727e29f313fc04eaf98..50dbfb8e12403bb9e33e743ff2eaaaacded7e303 100644 (file)
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.64 2006/10/31 18:15:05 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.65 2006/11/05 01:04:32 deathwing00 Exp $
+
+  05 Nov 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  digikam-0.9.0_beta3.ebuild:
+  Reverted restriction of bug #153535 about media-libs/libgphoto2. Added
+  dependency for media-gfx/exiv2 to be at least version 0.11 as detailed in
+  bug #153639.
 
 *digikam-0.9.0_beta3 (31 Oct 2006)
 

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 2a7286c8c20d01dba4ede34cd6495029fe7da45d..e0985b643c45ce296cd81cad98023cbc63803c4a 100644 (file)
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -82,14 +82,14 @@ EBUILD digikam-0.9.0_beta2.ebuild 2628 RMD160 043951359e46ec3b649db6d465f54a61b3
 MD5 073623ff7022b815108482db71a5468c digikam-0.9.0_beta2.ebuild 2628
 RMD160 043951359e46ec3b649db6d465f54a61b31cd908 digikam-0.9.0_beta2.ebuild 2628
 SHA256 2c5c896d88ec70d7b536bb61c8e17f57f02df13811e892d30c7e071dd5cff6d1 digikam-0.9.0_beta2.ebuild 2628
-EBUILD digikam-0.9.0_beta3.ebuild 2377 RMD160 af9d3e0686ceab5e24836d9a9b0e3f0615011648 SHA1 be35486b0b15f4d83547a0caacfc261bfa43b5be SHA256 34cf2855e49d1740acb29a50fbc7dc4b3b3ef417544a51494081539d4271a2e2
-MD5 bee268ddf0c9ad89588359e4baf3e47a digikam-0.9.0_beta3.ebuild 2377
-RMD160 af9d3e0686ceab5e24836d9a9b0e3f0615011648 digikam-0.9.0_beta3.ebuild 2377
-SHA256 34cf2855e49d1740acb29a50fbc7dc4b3b3ef417544a51494081539d4271a2e2 digikam-0.9.0_beta3.ebuild 2377
-MISC ChangeLog 10475 RMD160 1b6450a8604118387d9973e51ab0e7799f42ac62 SHA1 a9bbca80574fe3ff6514c6fd9c9588e1e948114e SHA256 4d655ff692012bafe642893b25a1eee50ffaafa9696c97fb92eb53980e7cc2c8
-MD5 a9de8bf72733e48ff83c93a668c38ece ChangeLog 10475
-RMD160 1b6450a8604118387d9973e51ab0e7799f42ac62 ChangeLog 10475
-SHA256 4d655ff692012bafe642893b25a1eee50ffaafa9696c97fb92eb53980e7cc2c8 ChangeLog 10475
+EBUILD digikam-0.9.0_beta3.ebuild 2380 RMD160 5be8a219bf7338d1c8fdb44cca5801b5976501a2 SHA1 0bf812d865cb97aa33c8d1d0f4187b86563232af SHA256 fdc36bb3bd40e42793e293639ff2eaf8ea2d141c6a791b749d81dca281dd7d5d
+MD5 69709e47090ae919663820ca0a3b153d digikam-0.9.0_beta3.ebuild 2380
+RMD160 5be8a219bf7338d1c8fdb44cca5801b5976501a2 digikam-0.9.0_beta3.ebuild 2380
+SHA256 fdc36bb3bd40e42793e293639ff2eaf8ea2d141c6a791b749d81dca281dd7d5d digikam-0.9.0_beta3.ebuild 2380
+MISC ChangeLog 10728 RMD160 cfa5a078742964419985b95e8f5be2f597110c5f SHA1 d65680e92f6bd36180d91b7363fdef99fa8d0059 SHA256 17102c1ada15f51a07ff556b4c83c2be4efe56020699fd510ebe31adff062640
+MD5 6aaad1a1366fb764c01414a30aa20db9 ChangeLog 10728
+RMD160 cfa5a078742964419985b95e8f5be2f597110c5f ChangeLog 10728
+SHA256 17102c1ada15f51a07ff556b4c83c2be4efe56020699fd510ebe31adff062640 ChangeLog 10728
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -130,7 +130,7 @@ SHA256 31b0ba19c7d61dce69e574d5f1398396efbcf6522354286094db0e3c6db89e27 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFR5KpQVeVlgLp4x8RApjiAJ9ldf6vxWLY0A+UwdclwAWUWgX2aQCfXeOt
-59Rz7ri01VKWl3iA4xcxL7Y=
-=EsO7
+iD8DBQFFTTikQVeVlgLp4x8RAjiWAJ0QTWVkIg/BG2VFNQr1yNRy2RYsGwCdEJRo
+6n/Cu2wPARxCEKnRqvy4eKo=
+=JfeW
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/digikam/digikam-0.9.0_beta3.ebuild b/media-gfx/digikam/digikam-0.9.0_beta3.ebuild
index 02c92c0d1903ecf16c7e2335b615ad5d3ea39b90..2b9a101b943927cf1ee85997bdcbdd93b25c02d8 100644 (file)
--- a/media-gfx/digikam/digikam-0.9.0_beta3.ebuild
+++ b/media-gfx/digikam/digikam-0.9.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.0_beta3.ebuild,v 1.1 2006/10/31 18:15:05 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.0_beta3.ebuild,v 1.2 2006/11/05 01:04:32 deathwing00 Exp $
 
 inherit kde
 
@@ -17,13 +17,13 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="nfs doc kdehiddenvisibility"
 
-DEPEND="=media-libs/libgphoto2-2.1.6*
+DEPEND=">=media-libs/libgphoto2-2
        >=dev-db/sqlite-3
        >=media-libs/libkipi-0.1.1
        media-libs/tiff
        sys-libs/gdbm
        media-gfx/dcraw
-       media-gfx/exiv2
+       >=media-gfx/exiv2-0.11
        media-libs/lcms"
 
 RDEPEND="${DEPEND}