Use add_kdebase_dep() for KDE deps

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

3 files changed, 13 insertions, 9 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/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
 }