Add one missed patch for the eclasses. Affect only live stuff so no breakage for tree users. Thanks reavertm for pointing out.

3 files changed, 41 insertions, 28 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 439ee242ba8a..042f17f46516 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.22 2009/01/12 17:25:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.23 2009/01/12 19:40:34 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -465,30 +465,7 @@ kde4-base_src_unpack() {
 	debug-print-function $FUNCNAME "$@"
 
 	if [[ $BUILD_TYPE = live ]]; then
-		local cleandir
-		cleandir="${ESVN_STORE_DIR}/KDE"
-		if [[ -d "${cleandir}" ]]; then
-			ewarn "'${cleandir}' has been found. Moving contents to new location."
-			addwrite "${ESVN_STORE_DIR}"
-			# Split kdebase
-			local module
-			if pushd "${cleandir}"/kdebase/kdebase > /dev/null; then
-				for module in `find . -maxdepth 1 -type d -name [a-z0-9]\*`; do
-					module="${module#./}"
-					mkdir -p "${ESVN_STORE_DIR}/kdebase-${module}" && mv -f "${module}" "${ESVN_STORE_DIR}/kdebase-${module}" || \
-						die "Failed to move to '${ESVN_STORE_DIR}/kdebase-${module}'."
-				done
-				popd > /dev/null
-				rm -fr "${cleandir}/kdebase" || \
-					die "Failed to remove ${cleandir}/kdebase. You need to remove it manually."
-			fi
-			# Move the rest
-			local pkg
-			for pkg in "${cleandir}"/*; do
-				mv -f "${pkg}" "${ESVN_STORE_DIR}"/ || eerror "failed to move ${pkg}"
-			done
-			rmdir "${cleandir}" || die "Could not move obsolete KDE store dir. Please move '${cleandir}' contents to appropriate location (possibly ${ESVN_STORE_DIR}) and manually remove '${cleandir}' in order to continue."
-		fi
+		migrate_store_dir
 		subversion_src_unpack
 	else
 		[[ -z $KDE_S ]] && KDE_S="${S}"
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index a97dc703f2d6..106ccaeb0713 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.10 2009/01/12 17:25:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.11 2009/01/12 19:40:34 scarabeus Exp $
 
 # @ECLASS: kde4-functions.eclass
 # @MAINTAINER:
@@ -267,6 +267,37 @@ get_latest_kdedir() {
 	fi
 }
 
+# @FUNCTION: migrate_store_dir
+# @DESCRIPTION:
+# Migrate the remnants of ${ESVN_STORE_DIR}/KDE/ to ${ESVN_STORE_DIR}/.
+# Perform experimental split of kdebase to kdebase-apps.
+migrate_store_dir() {
+	local cleandir
+	cleandir="${ESVN_STORE_DIR}/KDE"
+	if [[ -d "${cleandir}" ]]; then
+		ewarn "'${cleandir}' has been found. Moving contents to new location."
+		addwrite "${ESVN_STORE_DIR}"
+		# Split kdebase
+		local module
+		if pushd "${cleandir}"/kdebase/kdebase > /dev/null; then
+			for module in `find . -maxdepth 1 -type d -name [a-z0-9]\*`; do
+				module="${module#./}"
+				mkdir -p "${ESVN_STORE_DIR}/kdebase-${module}" && mv -f "${module}" "${ESVN_STORE_DIR}/kdebase-${module}" || \
+					die "Failed to move to '${ESVN_STORE_DIR}/kdebase-${module}'."
+			done
+			popd > /dev/null
+			rm -fr "${cleandir}/kdebase" || \
+				die "Failed to remove ${cleandir}/kdebase. You need to remove it manually."
+		fi
+		# Move the rest
+		local pkg
+		for pkg in "${cleandir}"/*; do
+			mv -f "${pkg}" "${ESVN_STORE_DIR}"/ || eerror "failed to move ${pkg}"
+		done
+		rmdir "${cleandir}" || die "Could not move obsolete KDE store dir. Please move '${cleandir}' contents to appropriate location (possibly ${ESVN_STORE_DIR}) and manually remove '${cleandir}' in order to continue."
+	fi
+}
+
 # Functions handling KMLOADLIBS and KMSAVELIBS
 
 # @FUNCTION: save_library_dependencies
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 9ae7ad1b5c76..3052e97a9b45 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.9 2009/01/12 17:25:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.10 2009/01/12 19:40:34 scarabeus Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -163,7 +163,12 @@ kde4-meta_pkg_setup() {
 kde4-meta_src_unpack() {
 	debug-print-function  ${FUNCNAME} "$@"
 	if [[ $BUILD_TYPE = live ]]; then
-		kde4-base_src_unpack
+		migrate_store_dir
+		S="${WORKDIR}/${PN}-${PV}"
+		mkdir -p "${S}"
+		ESVN_RESTRICT="export" subversion_src_unpack
+		subversion_wc_info
+		subversion_bootstrap
 		kde4-meta_src_extract
 	else
 		kde4-meta_src_extract