Use add_kdebase_dep() for KDE deps

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

4 files changed, 30 insertions, 26 deletions

diff --git a/x11-themes/qtcurve-qt4/ChangeLog b/x11-themes/qtcurve-qt4/ChangeLog
index 950a20b40c04..9932440f85a7 100644
--- a/x11-themes/qtcurve-qt4/ChangeLog
+++ b/x11-themes/qtcurve-qt4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/qtcurve-qt4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.126 2011/03/26 23:02:55 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.127 2011/06/07 02:55:37 abcd Exp $
+
+  07 Jun 2011; Jonathan Callen <abcd@gentoo.org> qtcurve-qt4-0.69.2.ebuild,
+  qtcurve-qt4-1.6.4-r1.ebuild:
+  Use add_kdebase_dep() for KDE deps
 
 *qtcurve-qt4-1.8.6 (26 Mar 2011)
 
diff --git a/x11-themes/qtcurve-qt4/Manifest b/x11-themes/qtcurve-qt4/Manifest
index d022ec5802ca..871229572788 100644
--- a/x11-themes/qtcurve-qt4/Manifest
+++ b/x11-themes/qtcurve-qt4/Manifest
@@ -1,31 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX qtcurve-qt4_kwin_automagic_fix.patch 1556 RMD160 0322e218b9f2ff8327c536e8abad1186030d54b4 SHA1 ef992eb5ec10d42cdff0db5882dec62c7e5e24b3 SHA256 f1023b308bb44c19f5d60847f3e8187627b9c459d8902b14c6d2dd7584fcd39e
 DIST QtCurve-KDE4-0.69.2.tar.bz2 171056 RMD160 3708c453bd85d24eb7fa9270f2119d3fa81d2ccc SHA1 6db0e51ce06fcc3d3f26a5af439517e552ded163 SHA256 8606fd66f6686c2c29e8b8516c0c5a5fe0dce049636d36be037714a55a0d5d5f
 DIST QtCurve-KDE4-1.6.4.tar.bz2 308223 RMD160 711f34d71a4063947f723ed860319eed24602478 SHA1 555032fd72d8540d23ea3f2782140798ff6dbd92 SHA256 14a534d54fdae63582d94535f46c2d11019ad27b1462c97867ce73fcabbe138f
 DIST QtCurve-KDE4-1.8.4.tar.bz2 360319 RMD160 52b5bf86883db69d927ae1511f7702cfa053d273 SHA1 7a2d77d841ae936d8e1411c572970ba0694b4466 SHA256 68acd929ef3c45631ebc98bb48ad975a2926eff231e687a02edf550004f7a725
 DIST QtCurve-KDE4-1.8.6.tar.bz2 341816 RMD160 6ff5e899eadb8aec75004fc1c4ebea763e76db7a SHA1 0e703ed63975a97aa1dac2dea96f280fdb7611da SHA256 e237d2a51eb0be5738fe9d154e1f933e9ab552493013fced52e2040d0939598d
-EBUILD qtcurve-qt4-0.69.2.ebuild 939 RMD160 646687e69aec9efa44955d3132104e489bd8aa87 SHA1 6b4793ee73d876609ebdc60a8b2fed719eb3cbfe SHA256 c30b31437d6583140d700fd65e5cc895d2acdce145f1adc2a3ccc4960b11a377
-EBUILD qtcurve-qt4-1.6.4-r1.ebuild 1367 RMD160 d4d3b88240e579599ec8185c563cbc7a195eb399 SHA1 dfcb96b8eeaaee971bb0564a1e2c55de0a4255d8 SHA256 41d8f10e211b3c0d17150702cbcbe4a7d8db12dfbf1dbd3c8102b1d9fbc8be65
+EBUILD qtcurve-qt4-0.69.2.ebuild 927 RMD160 0e6bd35728e53cd212c1c55db77bba0765ffb4f0 SHA1 8dc6ae9dc272a6b250566736e63e17d6fd224b3c SHA256 6cf2e064c8afc36308b920e220778283bbeed27c9b3155bb9dab5ab0aa0f9137
+EBUILD qtcurve-qt4-1.6.4-r1.ebuild 1347 RMD160 dd0ed7655f0618f55c114ed5933d1adb9435d04f SHA1 b50405909f1e38d8e16a3867e92c6806450a179c SHA256 958fd6ec5f6b334349ac28d30aa4a872a27e7a718588090a7e6e4e2551f2e760
 EBUILD qtcurve-qt4-1.8.4.ebuild 1218 RMD160 d8213a3bafa437219ef15eddf75e9000453fa1bb SHA1 65826a7785c59e40b4c428a59f6d610be245755a SHA256 91059b4b017a4e2c037210b062e333bbb11d91ccbc44316480fb159ab191af60
 EBUILD qtcurve-qt4-1.8.6.ebuild 1214 RMD160 f180f5740d500666427066c5fc55f8c5a1376de0 SHA1 d93471e2941b3fcc3c505511dcc5b3e0862e8044 SHA256 33a0d20793b0e3f7766f397464c95d9d4c1b17c0c045ac905a565206bb873206
-MISC ChangeLog 20008 RMD160 9f00a5060af3c10fd52ca0c0fe409b7dd311e32e SHA1 7fa8dcb825606e5e0e06afa8e78ec5bb18a213fa SHA256 8bee11eacffe6061a2d97a612e24e6bee3fb63fb265b741d035d30560ec69459
+MISC ChangeLog 20152 RMD160 2495f0edfd78c53b3c913a3a697e1d2b849748ac SHA1 e41f57914374a70ffe480ebda9dcc0d332c57d36 SHA256 1aa8206737c6340c8e726b581be286b54768e632920583acb46e323755f6e4f6
 MISC metadata.xml 360 RMD160 71a731bc331e9846fef348a5a245da9b7f7caee5 SHA1 31471c68178cabf05d833a37ac004091d367a010 SHA256 a9b23f37afbe82447385ea144cdde15b54cbb7a5fef3daeb24ed18bc275a5b8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNjnE/AAoJEDZF8K7rm0r6OhIP/2OMeBkk7sDbw3MVnjVX4k2k
-wwUYO6M38/dX3gVVMXf7hFFLhkuTNY02CTVb2UaEsW7FvJNfdRZ6HrOzUI/pAxWj
-x4I07onuSGhYeW9QUczJF4tyOYsVR1Va9GxLEvRAwt6pZGfv5TMocimlL8Qqo+Tk
-AmRGy24GIl9kXdRbfzgvJ1XVNfnXFjbJsp3uie5nJk629d1e7bYabFvUaUBy5pWi
-9+InVNX0bVGyPDl2KiqlMy07pyB28A98tp4OjNGkJeW9Rl7ysXPCBdd/MqZ9403I
-AP2giX+yPsijvnGWQ+cVFrAz38IBGECb9y3K0xy5HDeBY0j5+TxZeyCRHlpOE95Q
-TkItPBnMRa70wDMF2mSV9krXizgeL1ydCOD+YGhaR3f8oVYbgKRfJmzMl6qPqruB
-2m5SpcC/Io1ziefoUOKGyKGnGb4f2NJwPiGDLpBVDupzQdE8uqmRl/bO5XwGWHU9
-IAH2VtSGrJdBwNyXD1mDFjvy34F/MrHO/vqtyYXs2ae8r4nNM1JpmDEPIOPqjlzz
-cwdr1hcEm+uNt3pbBbUWXtOpbNDM6j0CSAS/uI6aB3yaEEL3KSw0ZT6kT6n4PYqj
-swOMP6j8AszYt+DzZ8kvtmw7qqij3OAlREFsqM6A68fje9kqP56cnGIMCr/YBNMK
-70dLB9WrhCwiXgnmTQXF
-=vXAc
+iQIcBAEBCgAGBQJN7ZMvAAoJELHSF2kinlg4PPQQAJwvRDDGUZ1ChJ98qlgIqrdy
+zBG0pPSYzpj3mfxa55ufmVylTjKJIXQPEtOeNKSA89B9pRPyEXjcTAQmqsXOrcdl
+Y9NmDW0huqHwAtECy4VhWcIbKPq81kJ3qFShPq9z3+NS8dNP5scYl+ZerBMZzlLe
+IcKh9mv+3pu19VvDAYFqIiAUVmrfGlf+MR4OWPdZQy9XjwQfVXpCNV+p5hfmJEpJ
+ozfZrB39P46vgJsIJS4PQka8j9ld8IsbPscqg9CYFWRTkiV8q6AxnzKa726ctvJO
+TjsKLe+bIBpYVqKhOUDgk7uIEajRd/qDKzhPbbP5RCX+lVm3zwCl4A9zvM1tekka
+TYYax8YtUAXdGmsBwgWtotw1qL8yzKHftfWVTimxSwp9jHP+3Rbm55Ol6t0gxInl
+xZbt/Kboq8LKKpBwz1wa198i3sa5SILegCCUZlGX1bjph3d+ImJC0qRgrXCYByOq
+i9NGyo0vvjil8vddzEQj9KiLKcOc4NMkOcPMsSCCWoNKS6VgeO1qdSGWaOk+5C/r
+/h4LcEQreF0ZmG2HTcTIj8QVKWFv2wbklsDta5YZj05nSGQlK31/uU0tq7Pi2qWJ
+B0zNbtDkTLM5hbQqOpVQKPEr+gST121xSe1qYKGGIlobRDrnHz4Yw+XPey/1MpyV
+EnDfoLQ4IfJsPn9pI3i3
+=WWOo
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.69.2.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.69.2.ebuild
index 9f2b098c3841..b179a0dc4a44 100644
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.69.2.ebuild
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.69.2.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/x11-themes/qtcurve-qt4/qtcurve-qt4-0.69.2.ebuild,v 1.10 2011/01/29 18:12:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.69.2.ebuild,v 1.11 2011/06/07 02:55:37 abcd Exp $
 
 EAPI=3
 KDE_REQUIRED="optional"
@@ -17,7 +17,7 @@ KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
 IUSE="kde"
 
 DEPEND="x11-libs/qt-gui:4[dbus]
-	kde? ( >=kde-base/kwin-${KDE_MINIMAL} )"
+	kde? ( $(add_kdebase_dep kwin) )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,7 @@ src_configure() {
 	if use kde ; then
 		kde4-base_src_configure
 	else
-		mycmakeargs="-DQTC_QT_ONLY=true"
+		mycmakeargs=(-DQTC_QT_ONLY=true)
 		cmake-utils_src_configure
 	fi
 }
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-r1.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-r1.ebuild
index f0f6310f68e3..f5a75b5b7217 100644
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-r1.ebuild
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-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/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-r1.ebuild,v 1.9 2011/03/05 13:56:14 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-r1.ebuild,v 1.10 2011/06/07 02:55:37 abcd Exp $
 
 EAPI=3
 KDE_REQUIRED="optional"
@@ -18,8 +18,8 @@ IUSE="kde windeco"
 
 DEPEND="x11-libs/qt-gui:4[dbus]
 	x11-libs/qt-svg:4
-	kde? ( >=kde-base/systemsettings-${KDE_MINIMAL}
-		windeco? ( >=kde-base/kwin-${KDE_MINIMAL} ) )"
+	kde? ( $(add_kdebase_dep systemsettings)
+		windeco? ( $(add_kdebase_dep kwin) ) )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -39,10 +39,10 @@ pkg_setup() {
 
 src_configure() {
 	if use kde; then
-		mycmakeargs="$(use windeco && echo "-DQTC_KWIN=true")"
+		mycmakeargs=( $(cmake-utils_use windeco QTC_KWIN) )
 		kde4-base_src_configure
 	else
-		mycmakeargs="-DQTC_QT_ONLY=true"
+		mycmakeargs=( -DQTC_QT_ONLY=true )
 		cmake-utils_src_configure
 	fi
 }