Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde

2 files changed, 39 insertions, 56 deletions

diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
index 5376ba346d9..43241dbf928 100644
--- a/eclass/git-2.eclass
+++ b/eclass/git-2.eclass
@@ -62,13 +62,6 @@ git-2_init_variables() {
 	# @DESCRIPTION:
 	# URI for the repository
 	# e.g. http://foo, git://bar
-	# Supported protocols:
-	#   http://
-	#   https://
-	#   git://
-	#   git+ssh://
-	#   rsync://
-	#   ssh://
 	#
 	# Support multiple values:
 	# EGIT_REPO_URI="git://a/b.git http://c/d.git"
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 5d91beeb762..d043fd1ae26 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -144,7 +144,7 @@ kde4-meta_pkg_pretend() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	slot_is_at_least 4.6 ${SLOT} && ( [[ $(gcc-major-version) -lt 4 ]] || \
-		( [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -le 3 ]] ) ) \
+		( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) ) \
 		&& die "Sorry, but gcc-4.3 and earlier wont work for KDE SC 4.6 (see bug 354837)."
 }
 
@@ -168,20 +168,21 @@ kde4-meta_src_unpack() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ ${BUILD_TYPE} = live ]]; then
-		if [[ "$KDE_SCM" == "svn" ]]; then
-			migrate_store_dir
-			S="${WORKDIR}/${P}"
-			mkdir -p "${S}"
-			ESVN_RESTRICT="export" subversion_src_unpack
-			subversion_wc_info
-			subversion_bootstrap
-		elif [[ "${KDE_SCM}" == "git" ]]; then
-			git-2_src_unpack
-		fi
-		kde4-meta_src_extract
-	else
-		kde4-meta_src_extract
+		case "${KDE_SCM}" in
+			svn)
+				migrate_store_dir
+				S="${WORKDIR}/${P}"
+				mkdir -p "${S}"
+				ESVN_RESTRICT="export" subversion_src_unpack
+				subversion_wc_info
+				subversion_bootstrap
+				;;
+			git)
+				git-2_src_unpack
+				;;
+		esac
 	fi
+	kde4-meta_src_extract
 }
 
 # FIXME: the difference between kde4-meta_src_extract and kde4-meta_src_unpack?
@@ -195,13 +196,14 @@ kde4-meta_src_extract() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ ${BUILD_TYPE} = live ]]; then
-		local rsync_options subdir kmnamedir targetdir wc_path escm
 		# Export working copy to ${S}
 		einfo "Exporting parts of working copy to ${S}"
 		kde4-meta_create_extractlists
 
 		case "${KDE_SCM}" in
 			svn)
+				local rsync_options subdir kmnamedir targetdir wc_path escm
+
 				rsync_options="--group --links --owner --perms --quiet --exclude=.svn/ --exclude=.git/"
 				wc_path="${ESVN_WC_PATH}"
 				escm="{ESVN}"
@@ -237,15 +239,10 @@ kde4-meta_src_extract() {
 			kdebase-apps)
 				# kdebase/apps -> kdebase-apps
 				tarball="kdebase-${PV}.tar.${postfix}"
-				case ${PV} in
-					4.6.1)
-						;;
-					*)
-						# Go one level deeper for kdebase-apps in tarballs
-						moduleprefix=apps/
-						KMTARPARAMS+=" --transform=s|apps/||"
-						;;
-				esac
+				if ! slot_is_at_least 4.6 ${SLOT} || [[ ${PV} == "4.6.0" ]]; then
+					moduleprefix=apps/
+					KMTARPARAMS+=" --transform=s|apps/||"
+				fi
 				;;
 			*)
 				# Create tarball name from module name (this is the default)
@@ -337,18 +334,15 @@ kde4-meta_create_extractlists() {
 	# In those cases you should care to add the relevant files to KMEXTRACTONLY
 	case ${KMNAME} in
 		kdebase)
-			case ${PV} in
-				4.6.1)
-					KMEXTRACTONLY+="
-						config-apps.h.cmake
-						ConfigureChecks.cmake"
-						;;
-					*)
-					KMEXTRACTONLY+="
-						apps/config-apps.h.cmake
-						apps/ConfigureChecks.cmake"
-						;;
-				esac
+			if ! slot_is_at_least 4.6 ${SLOT} || [[ ${PV} == "4.6.0" ]]; then
+				KMEXTRACTONLY+="
+					apps/config-apps.h.cmake
+					apps/ConfigureChecks.cmake"
+			else
+				KMEXTRACTONLY+="
+					config-apps.h.cmake
+					ConfigureChecks.cmake"
+			fi
 			;;
 		kdebase-apps)
 			KMEXTRACTONLY+="
@@ -416,19 +410,15 @@ kde4-meta_create_extractlists() {
 			;;
 	esac
 	# Don't install cmake modules for split ebuilds, to avoid collisions.
-	case ${KMNAME} in
-		kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics)
-			case ${PN} in
-				libkdegames|libkdeedu|libkworkspace)
-					KMEXTRA+="
-						cmake/modules/"
-					;;
-				*)
-					KMCOMPILEONLY+="
-						cmake/modules/"
-					;;
-			esac
-		;;
+	case ${PN} in
+		libkdegames|libkdeedu|libkworkspace)
+			KMEXTRA+="
+				cmake/modules/"
+			;;
+		*)
+			KMCOMPILEONLY+="
+				cmake/modules/"
+			;;
 	esac
 
 	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}"