Use add_kdebase_dep() for KDE deps

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

4 files changed, 36 insertions, 32 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/Manifest b/media-gfx/digikam/Manifest
index 422f6be78808..b9ae42e52251 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -7,24 +7,24 @@ AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced
 AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d842b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
-EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 48c089acb9877c64d52f9596d8bfae42933c562c SHA1 a99fd713c345bc396811e1eb4ae76898dfbf55f7 SHA256 eab9b63180fefe06150a4dabedbb2926b4c7837700f4c13292bcb9f649302cb0
-EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
-MISC ChangeLog 31084 RMD160 5bb24099d8fc5e1c9fb41cfc71ec09f431234158 SHA1 b761428116dce1a9af28a9c51acd3d87f1e5ec70 SHA256 d686b1b6f7916a89587a51f802045c5f80a52bf444d07d9335bfbb78ac26f7b5
+EBUILD digikam-1.9.0-r1.ebuild 3302 RMD160 651bb1cda69238d61bd43ef31aafe9ce98555b99 SHA1 f96691ec4799f822888c42abf28d3b7c2556bace SHA256 31450bcc222db00d0a62dc434e140c46a8f1ab2af15c622461f5957630b5da3a
+EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75
+MISC ChangeLog 31215 RMD160 82fac76fb1bbd16d8f79fcc150f053a775f38950 SHA1 aef52eee9e74a461777b53b5fe03156085558c43 SHA256 a4cd7e290322e0b02d911ef9de8c2de7011274fd441b541fa3124b2a45abebcf
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN1u/9AAoJENwGBM22xffecHAP/i+xGeCX7qsrmVLNeSu4bKWq
-XpX05Y532hMC0c6Ev4mD+fVHebFI4FScWDxNwuePX/UIg4Z2G3YinHOs7hiLXbqm
-gHhEdK4sEZqsFBA7dx9W/YXhz1hDTUOyfn2jIZx7Kx0XI7MG5LJj9Sb0BApp39eJ
-LYyq16gg1w9RuLl8iKHH+MdTidzKQXtzmOldGJsiIDDZ9MKq5rfS2ABaQPh2SAcR
-bSRkaoEDmbhYh68tQ4r9enZ9sdecyl2POLFI04UwQ3/osfOsIva3l3CyIMMyIEeC
-rnYGBRuD3FA1O7l/3Aio2v4G25GlXDEk+8Ig2BFYyQ/LRcdWQmOjAuXUgstxYrOc
-nkvKYgKEVNIYoUHSXoX+O/rl16hSe0YpYqe0uFUojxZ10O4xLohKF5rkx6m2cZN9
-B6nVtpqElKXv2GRQ1R1aAJlqNWk47csazVbHKpCtFMZG+BxWffECmC6ZIn9Fi72t
-PUKLu3Oc32Z5UjZMhzREAFjpK1YA5LEWKZ3WlYTShYOypAVxN8XSnV5dYTJcgfCG
-SG5GSH0Z5FfWxlXIDx1qNYKDoAI3tQtgQJBTCtGcSgBenzDbMT/quhPCV6agsdCw
-0UBmJawDAPYTKUM1EAG4Z+3Ml7p8U+YuEDXZme/g8T8d+RPYz3Sy4IbGBuFF+5t5
-m+xQNtCiN/T7GuR/3b1+
-=0jAz
+iQIcBAEBCgAGBQJN7ZIvAAoJELHSF2kinlg4qxAP/14GPQnANih8z8EcQgOuN+No
+n0lPT8ggTV/1EvwyEbi/91wzUO/O1Ed0AskpbjugD9l8vtFYNueHS7WAipRgiqul
+s5x8u5DsUjUa/6RakF7uvuvAK4tgJsSPfQI1axI6LWjl38XEMriou0Y9aIb5buX8
+LvhBm8+ltCY2KZWB4nGJmD29wMt12PNE87oalLO7GtgP2zWCuB59AFm3NxVSVYpK
+I5H7GAUuZA4EzOYM96I/eHinOk7VoIv2Ug3Ryh2ittid7EJl8PeT9sCXpi++7BPA
+XgbSWIBCEzcl0SDyoiWscQW8HKEdYZ3wA8RR2ggCcPk6SbDSiUIWMMN4zcDZx6t+
+NPTyOdyYFurHVa9hfnYKjcsWFdIpiqQ8kzEhk9V11y4Xx7DwpUHCiqKrr7u8p/Ur
+Oua+pPU562HvOuilUo852+NpzcduwIml59hfU5tr9bROL5WeM1EW9PYidGcEhy3X
+riCTipApNhyD1+kHtKyaagY816hQMUmEunRhpszbjq3YHSpG2bM348VRBcGwAYoq
+2hmlE/1dlxwM1oEqryQKHWX7/LTngSeH/j0SW0LqFdwGa52qJR4ysVKHtwuunCgu
+EncHOUHSrBebdMvJxvWLyHg3M26t1qw0gqBaimhOACWi4JnpmQjZfoQhmyfIXYDP
+Gss5ZwtPdgpEdRaVQDCS
+=KAZf
 -----END PGP SIGNATURE-----
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
 }