Use add_kdebase_dep() for KDE deps

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

3 files changed, 20 insertions, 16 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 271fb85cbea2..89364fe69047 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.186 2011/05/20 22:29:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.187 2011/06/07 02:51:20 abcd Exp $
+
+  07 Jun 2011; Jonathan Callen <abcd@gentoo.org> digikam-1.9.0.ebuild,
+  digikam-1.9.0-r1.ebuild:
+  Use add_kdebase_dep() for KDE deps
 
   20 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-turbo.patch:
diff --git a/media-gfx/digikam/digikam-1.9.0-r1.ebuild b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
index 83997cdd2fd5..9f199bf97018 100644
--- a/media-gfx/digikam/digikam-1.9.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.3 2011/05/20 22:29:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.4 2011/06/07 02:51:20 abcd Exp $
 
 EAPI=4
 
@@ -52,8 +52,8 @@ RDEPEND="${CDEPEND}
 	$(add_kdebase_dep kreadconfig)
 	video? (
 		|| (
-			$(add_kdebase_dep ffmpegthumbs)
-			$(add_kdebase_dep mplayerthumbs)
+			( $(add_kdebase_dep ffmpegthumbs) )
+			( $(add_kdebase_dep mplayerthumbs) )
 		)
 	)
 "
diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/digikam-1.9.0.ebuild
index ee18dc5a9665..5d28d3410c9e 100644
--- a/media-gfx/digikam/digikam-1.9.0.ebuild
+++ b/media-gfx/digikam/digikam-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0.ebuild,v 1.4 2011/05/09 23:10:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0.ebuild,v 1.5 2011/06/07 02:51:21 abcd Exp $
 
 EAPI=3
 
@@ -26,11 +26,11 @@ SLOT="4"
 IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
 
 CDEPEND="
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	>=kde-base/solid-${KDE_MINIMAL}
+	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep solid)
 	media-libs/jasper
 	virtual/jpeg
 	media-libs/lcms:0
@@ -44,16 +44,16 @@ CDEPEND="
 	virtual/mysql
 	x11-libs/qt-gui[qt3support]
 	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
-	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[plasma] )
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	geolocation? ( $(add_kdebase_dep marble plasma) )
 	gphoto2? ( media-libs/libgphoto2 )
 "
 RDEPEND="${CDEPEND}
-	>=kde-base/kreadconfig-${KDE_MINIMAL}
+	$(add_kdebase_dep kreadconfig)
 	video? (
 		|| (
-			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
-			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+			( $(add_kdebase_dep mplayerthumbs) )
+			( $(add_kdebase_dep ffmpegthumbs) )
 		)
 	)
 "
@@ -120,6 +120,6 @@ pkg_postinst() {
 	kde4-base_pkg_postinst
 
 	if use doc; then
-		elog The digikam api documentation has been installed at /usr/share/doc/${PF}/html
+		elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
 	fi
 }