From: Dan Armak <danarmak@gentoo.org>
Date: Fri, 14 Jan 2005 23:43:32 +0000 (+0000)
Subject: made dep on a monolithic kde-base package accept the equivalent split package as... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d583ae888026846fe481e598cd1cf1d7ea2910c;p=gentoo.git

made dep on a monolithic kde-base package accept the equivalent split package as an alternative
---

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 9ec4432df195..78bd11c994f6 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.20 2005/01/04 22:12:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.21 2005/01/14 23:43:32 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> digikam-0.6.2.ebuild:
+  Changed dep on kdesdk to accept kdesdk-misc, the split package containing
+  xml2pot.
 
 *digikam-0.7.1 (04 Jan 2005)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 349488b00fc4..ebbc93fd5d64 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,6 @@
-MD5 d570bdad107b175e0ab661ef6234ec8f digikam-0.6.2.ebuild 831
+MD5 39e9ad6bec1d265882709b6b27cea5ba digikam-0.6.2.ebuild 862
 MD5 3f52c257bc75d4604efab639e6561267 digikam-0.7.ebuild 804
-MD5 f39ece1f8559f2a954f0979e2b907167 ChangeLog 2484
+MD5 2dd708c37bd14a9663db15c29f329168 ChangeLog 2644
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 4726b68c46f8eb6b3aec7b907c0dcf8e digikam-0.7.1.ebuild 666
 MD5 072474cfde157191cee4b2e8777cff40 files/digest-digikam-0.7 65
diff --git a/media-gfx/digikam/digikam-0.6.2.ebuild b/media-gfx/digikam/digikam-0.6.2.ebuild
index 3d68189bde8f..989589dd9da8 100644
--- a/media-gfx/digikam/digikam-0.6.2.ebuild
+++ b/media-gfx/digikam/digikam-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.6.2.ebuild,v 1.7 2005/01/04 22:12:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.6.2.ebuild,v 1.8 2005/01/14 23:43:32 danarmak Exp $
 
 inherit kde
 
@@ -21,7 +21,7 @@ IUSE=""
 # kdesdk dependency, because of xml2pot usage, this is a
 # known upstream bug, that should be fixed in the final
 # * still in 0.6.2
-DEPEND="kde-base/kdesdk
+DEPEND="|| ( kde-base/kdesdk-misc kde-base/kdesdk )
 	>=media-gfx/gphoto2-2.0-r1
 	media-libs/imlib"
 RDEPEND=">=media-gfx/gphoto2-2.0-r1