Pull in changes from overlay and prefix support

Package-Manager: portage--svn/cvs/Linux i686

6 files changed, 40 insertions, 27 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 9c108019a094..9f376bc8e1f0 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.44 2009/12/10 20:29:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.45 2009/12/23 00:05:00 abcd Exp $
+
+  23 Dec 2009; Jonathan Callen <abcd@gentoo.org>
+  kdeplasma-addons-4.3.4.ebuild:
+  Pull in changes from overlay and prefix support
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -kdeplasma-addons-4.3.1.ebuild:
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.3.4.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.3.4.ebuild
index 197727788923..0d4f70cd0ec1 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.3.4.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.3.4.ebuild,v 1.1 2009/12/01 10:27:58 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.3.4.ebuild,v 1.2 2009/12/23 00:05:00 abcd Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug desktopglobe exif semantic-desktop"
 
 # krunner is only needed to generate dbus interface for lancelot
-COMMON_DEPEND="
+RDEPEND="
 	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
 	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep krunner)
@@ -26,10 +26,9 @@ COMMON_DEPEND="
 	desktopglobe? ( $(add_kdebase_dep marble) )
 	exif? ( $(add_kdebase_dep libkexiv2) )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	dev-cpp/eigen:2
 "
-RDEPEND="${COMMON_DEPEND}"
 
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
@@ -49,12 +48,13 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DDBUS_INTERFACES_INSTALL_DIR=${KDEDIR}/share/dbus-1/interfaces/
+	mycmakeargs=(
+		-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"
 		$(cmake-utils_use_with exif Kexiv2)
 		$(cmake-utils_use_with desktopglobe Marble)
 		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)"
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+	)
 
 	kde4-base_src_configure
 }
diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog
index 7bada133bec7..1c71da1026d5 100644
--- a/kde-base/kdesdk-kioslaves/ChangeLog
+++ b/kde-base/kdesdk-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk-kioslaves
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.132 2009/12/10 20:30:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.133 2009/12/23 00:06:22 abcd Exp $
+
+  23 Dec 2009; Jonathan Callen <abcd@gentoo.org>
+  kdesdk-kioslaves-4.3.4.ebuild:
+  Pull in changes from overlay and prefix support
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -kdesdk-kioslaves-4.3.1.ebuild:
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.3.4.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.3.4.ebuild
index af73bfda2578..2a32b47f2a98 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.3.4.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.3.4.ebuild,v 1.1 2009/12/01 10:28:20 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.3.4.ebuild,v 1.2 2009/12/23 00:06:22 abcd Exp $
 
 EAPI="2"
 
@@ -19,8 +19,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DAPRCONFIG_EXECUTABLE=/usr/bin/apr-1-config"
+	mycmakeargs=(
+		-DAPRCONFIG_EXECUTABLE="${EPREFIX}"/usr/bin/apr-1-config
+	)
 
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 3fd224c671c9..4c41c4f17662 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.196 2009/12/10 20:45:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.197 2009/12/23 00:07:27 abcd Exp $
+
+  23 Dec 2009; Jonathan Callen <abcd@gentoo.org> kdm-4.3.4.ebuild:
+  Pull in changes from overlay and prefix support
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -kdm-4.3.1-r2.ebuild:
   Drop KDE SC-4.3.1.
diff --git a/kde-base/kdm/kdm-4.3.4.ebuild b/kde-base/kdm/kdm-4.3.4.ebuild
index 21733a88adbc..bb4da80dbba6 100644
--- a/kde-base/kdm/kdm-4.3.4.ebuild
+++ b/kde-base/kdm/kdm-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.3.4.ebuild,v 1.1 2009/12/01 10:33:05 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.3.4.ebuild,v 1.2 2009/12/23 00:07:27 abcd Exp $
 
 EAPI="2"
 
@@ -49,10 +49,11 @@ src_configure() {
 	# last checked in 4.2.95
 	replace-flags -O3 -O2
 
-	mycmakeargs="${mycmakeargs}
+	mycmakeargs=(
 		$(cmake-utils_use kerberos KDE4_KRB5AUTH)
 		$(cmake-utils_use_with pam)
-		$(cmake-utils_use_with consolekit CkConnector)"
+		$(cmake-utils_use_with consolekit CkConnector)
+	)
 
 	kde4-meta_src_configure
 }
@@ -63,12 +64,12 @@ src_install() {
 	kde4-meta_src_install
 
 	# Customize the kdmrc configuration
-	sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=/usr/share/xsessions:" \
-		"${D}"/${PREFIX}/share/config/kdm/kdmrc \
+	sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions:" \
+		"${ED}"/${PREFIX}/share/config/kdm/kdmrc \
 		|| die "Failed to set SessionsDirs correctly."
 
 	# Don't install empty dir
-	rmdir "${D}${KDEDIR}"/share/config/kdm/sessions
+	rmdir "${ED}${KDEDIR}"/share/config/kdm/sessions
 }
 
 pkg_postinst() {
@@ -76,15 +77,15 @@ pkg_postinst() {
 
 	# Set the default kdm face icon if it's not already set by the system admin
 	# because this is user-overrideable in that way, it's not in src_install
-	if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]];	then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+	if [[ ! -e "${EROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]]; then
+		mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
+			"${EROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
 	fi
-	if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
+	if [[ ! -e "${EROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then
+		mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
+			"${EROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
 	fi
 
 	if use consolekit; then