Updates from kde overlay

4 files changed, 33 insertions, 23 deletions

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 6d83472079fe..92237f82f8c2 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -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/eclass/cmake-utils.eclass,v 1.36 2009/12/10 19:58:42 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.37 2009/12/14 19:44:15 abcd Exp $
 
 # @ECLASS: cmake-utils.eclass
 # @MAINTAINER:
@@ -303,6 +303,7 @@ enable_cmake-utils_src_configure() {
 			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
 			SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)"
 			CACHE STRING "" FORCE)
+			SET (CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL "" FORCE)
 			ENDIF (NOT APPLE)
 		_EOF_
 	fi
@@ -327,7 +328,7 @@ enable_cmake-utils_src_configure() {
 	# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
 	local cmakeargs=(
 		-C "${common_config}"
-		-DCMAKE_INSTALL_PREFIX="${PREFIX:-${EPREFIX}/usr}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX:-/usr}"
 		"${mycmakeargs[@]}"
 		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
 		-DCMAKE_INSTALL_DO_STRIP=OFF
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a17ae039fc3e..ef9bde4ca4a2 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -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/eclass/kde4-base.eclass,v 1.56 2009/12/10 17:35:52 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.57 2009/12/14 19:44:15 abcd Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -440,9 +440,9 @@ kde4-base_pkg_setup() {
 
 	if [[ ${KDEBASE} = kde-base ]]; then
 		if use kdeprefix; then
-			KDEDIR=${EPREFIX}/usr/kde/${_kdedir}
+			KDEDIR=/usr/kde/${_kdedir}
 		else
-			KDEDIR=${EPREFIX}/usr
+			KDEDIR=/usr
 		fi
 		: ${PREFIX:=${KDEDIR}}
 	else
@@ -453,9 +453,9 @@ kde4-base_pkg_setup() {
 			[[ -z ${kde_minimal_met} ]] && [[ ${slot} = ${KDE_MINIMAL} ]] && kde_minimal_met=1
 			if [[ -n ${kde_minimal_met} ]] && has_version "kde-base/kdelibs:${slot}"; then
 				if has_version "kde-base/kdelibs:${slot}[kdeprefix]"; then
-					KDEDIR=${EPREFIX}/usr/kde/${slot}
+					KDEDIR=/usr/kde/${slot}
 				else
-					KDEDIR=${EPREFIX}/usr
+					KDEDIR=/usr
 				fi
 				break;
 			fi
@@ -466,15 +466,17 @@ kde4-base_pkg_setup() {
 		if [[ ${KDE_REQUIRED} = always ]] || { [[ ${KDE_REQUIRED} = optional ]] && use kde; }; then
 			[[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!"
 		else
-			[[ -z ${KDEDIR} ]] && KDEDIR=${EPREFIX}/usr
+			[[ -z ${KDEDIR} ]] && KDEDIR=/usr
 		fi
 
-		: ${PREFIX:=${EPREFIX}/usr}
+		: ${PREFIX:=/usr}
 	fi
+	EKDEDIR=${EPREFIX}${KDEDIR}
+
 	# Point pkg-config path to KDE *.pc files
-	export PKG_CONFIG_PATH="${KDEDIR}/$(get_libdir)/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
+	export PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
 	# Point to correct QT plugins path
-	QT_PLUGIN_PATH="${KDEDIR}/$(get_libdir)/kde4/plugins/"
+	QT_PLUGIN_PATH="${EKDEDIR}/$(get_libdir)/kde4/plugins/"
 
 	# Fix XDG collision with sandbox
 	export XDG_CONFIG_HOME="${T}"
@@ -573,7 +575,7 @@ kde4-base_src_configure() {
 	[[ ${PN} = kdelibs ]] && cmakeargs+=(-DKDE_DISTRIBUTION_TEXT=Gentoo)
 
 	# Here we set the install prefix
-	cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${PREFIX}")
+	cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}")
 
 	# Use colors
 	QTEST_COLORED=1
@@ -582,18 +584,18 @@ kde4-base_src_configure() {
 	unset KDEDIRS
 
 	# Handle kdeprefix-ed KDE
-	if [[ ${KDEDIR} != ${EPREFIX}/usr ]]; then
+	if [[ ${KDEDIR} != /usr ]]; then
 		# Override some environment variables - only when kdeprefix is different,
 		# to not break ccache/distcc
-		PATH="${KDEDIR}/bin:${PATH}"
-		LDPATH="${KDEDIR}/$(get_libdir):${LDPATH}"
+		PATH="${EKDEDIR}/bin:${PATH}"
+		LDPATH="${EKDEDIR}/$(get_libdir)${LDPATH+:}${LDPATH}"
 
 		# Append full RPATH
 		cmakeargs+=(-DCMAKE_SKIP_RPATH=OFF)
 
 		# Set cmake prefixes to allow buildsystem to locate valid KDE installation
 		# when more are present
-		cmakeargs+=(-DCMAKE_SYSTEM_PREFIX_PATH="${KDEDIR}")
+		cmakeargs+=(-DCMAKE_SYSTEM_PREFIX_PATH="${EKDEDIR}")
 	fi
 
 	# Handle kdeprefix in application itself
@@ -602,7 +604,7 @@ kde4-base_src_configure() {
 		cmakeargs+=(-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc)
 	fi
 
-	if [[ $(declare -p mycmakeargs) != "declare -a mycmakeargs="* ]]; then
+	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
 		mycmakeargs=(${mycmakeargs})
 	fi
 
@@ -640,6 +642,11 @@ kde4-base_src_test() {
 kde4-base_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	# Prefix support, for usage in ebuilds
+	if [[ ${EAPI} == 2 ]] && ! use prefix; then
+		ED=${D}
+	fi
+
 	if [[ -n ${KMSAVELIBS} ]] ; then
 		install_library_dependencies
 	fi
@@ -669,7 +676,7 @@ kde4-base_src_make_doc() {
 		done
 	fi
 
-	[[ -z ${ED} ]] && ED=${D}${EPREFIX}
+	[[ -z ${ED} ]] && ED=${D}
 
 	if [[ -n ${KDEBASE} ]] && [[ -d ${ED}usr/share/doc/${PF} ]]; then
 		# work around bug #97196
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 8dee78100bfa..1e80f29f026d 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -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/eclass/kde4-functions.eclass,v 1.28 2009/12/10 17:35:52 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.29 2009/12/14 19:44:15 abcd Exp $
 
 inherit versionator
 
@@ -65,7 +65,9 @@ slot_is_at_least() {
 buildsycoca() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	[[ -z ${EROOT} ]] && EROOT=${ROOT}${EPREFIX}
+	if [[ ${EAPI} == 2 ]] && ! use prefix; then
+		EROOT=${ROOT}
+	fi
 
 	local KDE3DIR="${EROOT}usr/kde/3.5"
 	if [[ -z ${EROOT%%/} && -x "${KDE3DIR}"/bin/kbuildsycoca ]]; then
@@ -85,7 +87,7 @@ buildsycoca() {
 
 	# fix permission for some directories
 	for x in share/{config,kde4}; do
-		[[ ${KDEDIR} = ${EROOT}usr ]] && DIRS=${EROOT}usr || DIRS="${EROOT}usr ${KDEDIR}"
+		[[ ${KDEDIR} == /usr ]] && DIRS=${EROOT}usr || DIRS="${EROOT}usr ${EROOT}${KDEDIR}"
 		for y in ${DIRS}; do
 			[[ -d "${y}/${x}" ]] || break # nothing to do if directory does not exist
 			if [[ $(stat --format=%a "${y}/${x}") != 755 ]]; then
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index aaf4aef54f7d..6da52a00bb82 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -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/eclass/kde4-meta.eclass,v 1.30 2009/12/10 17:35:52 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.31 2009/12/14 19:44:15 abcd Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -635,7 +635,7 @@ kde4-meta_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	# backwards-compatibility: make mycmakeargs an array, if it isn't already
-	if [[ $(declare -p mycmakeargs) != "declare -a mycmakeargs="* ]]; then
+	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
 		mycmakeargs=(${mycmakeargs})
 	fi