From 332482ab5b2ff22136f832f5171139cccb5ef98b Mon Sep 17 00:00:00 2001
From: Maciej Mrozowski <reavertm@gentoo.org>
Date: Thu, 10 Feb 2011 20:00:55 +0100
Subject: [eclass/kde4-{base,meta}] Move kdebase 4.6 to git. A little cleanup
 (a'ka move stuff around for fun and profit).

---
 eclass/kde4-functions.eclass | 60 +++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

(limited to 'eclass/kde4-functions.eclass')

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index bc9f03f9235..60ca3ab1929 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -45,37 +45,6 @@ elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
 	KDEBASE=kdevelop
 fi
 
-# @ECLASS-VARIABLE: KDE_SCM
-# @DESCRIPTION:
-# If this is a live package which scm does it use
-
-# Set reponame and SCM for moduleses that have fully migrated to git
-case ${PV} in
-	9999*)
-		case "${KMNAME}" in
-			kdebase-workspace)
-				KDE_SCM="git"
-				ESCM_REPONAME=${ESCM_REPONAME:=kde-workspace}
-			;;
-			kdebase-runtime)
-				KDE_SCM="git"
-				ESCM_REPONAME=${ESCM_REPONAME:=kde-runtime}
-			;;
-			kdebase-apps)
-				KDE_SCM="git"
-				ESCM_REPONAME=${ESCM_REPONAME:=kde-baseapps}
-			;;
-		esac
-	;;
-esac
-
-# Everything else uses svn by default
-KDE_SCM="${KDE_SCM:-svn}"
-case ${KDE_SCM} in
-	svn|git) ;;
-	*) die "KDE_SCM: ${KDE_SCM} is not supported" ;;
-esac
-
 # @ECLASS-VARIABLE: KDE_SLOTS
 # @DESCRIPTION:
 # The slots used by all KDE versions later than 4.0. The live KDE releases use
@@ -95,6 +64,35 @@ else
 fi
 export BUILD_TYPE
 
+# Set reponame and SCM for moduleses that have fully migrated to git
+# (hack - it's here because it needs to be before SCM inherits from kde4-base)
+if [[ ${BUILD_TYPE} == live ]]; then
+	case "${KMNAME}" in
+		kdebase-workspace)
+			KDE_SCM="git"
+			ESCM_REPONAME=${ESCM_REPONAME:=kde-workspace}
+		;;
+		kdebase-runtime)
+			KDE_SCM="git"
+			ESCM_REPONAME=${ESCM_REPONAME:=kde-runtime}
+		;;
+		kdebase-apps)
+			KDE_SCM="git"
+			ESCM_REPONAME=${ESCM_REPONAME:=kde-baseapps}
+		;;
+	esac
+fi
+
+# @ECLASS-VARIABLE: KDE_SCM
+# @DESCRIPTION:
+# If this is a live package which scm does it use
+# Everything else uses svn by default
+KDE_SCM="${KDE_SCM:-svn}"
+case ${KDE_SCM} in
+	svn|git) ;;
+	*) die "KDE_SCM: ${KDE_SCM} is not supported" ;;
+esac
+
 # @ECLASS-VARIABLE: KDE_LINGUAS
 # @DESCRIPTION:
 # This is a whitespace-separated list of translations this ebuild supports.
-- 
cgit v1.2.3