Make NEED_KDE=none packages pick correct kdedir :] Fixed thanks to Tomáš Caithaml and pva for helping with this. Per bug #257616.

2 files changed, 44 insertions, 48 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 5d658a5603ce..89f5b61c4d1a 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.28 2009/02/02 21:35:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.29 2009/02/10 20:07:24 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -439,17 +439,15 @@ kde4-base_pkg_setup() {
 
 	# Search for best suitable kde installation for misc kde package.
 	# Computation based on NEED_KDE and KDE_MINIMAL
-	get_latest_kdedir
+	[[ ${NEED_KDE} = latest || ${NEED_KDE} = none ]] && get_latest_kdedir
 
-	if [[ $NEED_KDE != none ]]; then
-		# Set PREFIX
-		if use kdeprefix; then
-			KDEDIR="/usr/kde/${_kdedir}"
-			KDEDIRS="/usr/local/:/usr:${KDEDIR}"
-		else
-			KDEDIR="/usr"
-			KDEDIRS="/usr/local/:/usr"
-		fi
+	# Set PREFIX
+	if use kdeprefix; then
+		KDEDIR="/usr/kde/${_kdedir}"
+		KDEDIRS="/usr/local/:/usr:${KDEDIR}"
+	else
+		KDEDIR="/usr"
+		KDEDIRS="/usr/local/:/usr"
 	fi
 	# Set the prefix based on KDEDIR
 	# Make it a consequence of kdeprefix
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 106ccaeb0713..c4de74dfcd26 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.11 2009/01/12 19:40:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.12 2009/02/10 20:07:24 scarabeus Exp $
 
 # @ECLASS: kde4-functions.eclass
 # @MAINTAINER:
@@ -226,45 +226,43 @@ get_build_type() {
 # We can check for kdelibs because it is the most basic package; no KDE package
 # working without it. This might be changed in future.
 get_latest_kdedir() {
-	if [[ $NEED_KDE = latest && $KDEBASE != kde-base ]]; then
-		case ${KDE_WANTED} in
-			# note this will need to be updated as stable moves and so on
-			live)
-				_versions="9999 4.1.69 4.1.0"
-				;;
-			snapshot)
-				_versions="4.1.69 4.1.0 9999"
+	case ${KDE_WANTED} in
+		# note this will need to be updated as stable moves and so on
+		live)
+			_versions="9999 4.1.69 4.1.0"
+			;;
+		snapshot)
+			_versions="4.1.69 4.1.0 9999"
+			;;
+		testing)
+			_versions="4.1.0 4.1.69 9999"
+			;;
+		stable)
+			_versions="4.1.0 4.1.69 9999"
+			;;
+		*) die "KDE_WANTED=${KDE_WANTED} not supported here." ;;
+	esac
+	# check if exists and fallback as we go
+	for X in ${_versions}; do
+		if has_version ">=kde-base/kdelibs-${X}"; then
+			# figure out which X we are in and set it into _kdedir
+			case ${X} in
+				# also keep track here same for kde_wanted
+				9999)
+					_kdedir="live"
+					break
 				;;
-			testing)
-				_versions="4.1.0 4.1.69 9999"
+				4.1.69)
+					_kdedir="4.2"
+					break
 				;;
-			stable)
-				_versions="4.1.0 4.1.69 9999"
+				4.1.0)
+					_kdedir="4.1"
+					break
 				;;
-			*) die "KDE_WANTED=${KDE_WANTED} not supported here." ;;
-		esac
-		# check if exists and fallback as we go
-		for X in ${_versions}; do
-			if has_version ">=kde-base/kdelibs-${X}"; then
-				# figure out which X we are in and set it into _kdedir
-				case ${X} in
-					# also keep track here same for kde_wanted
-					9999)
-						_kdedir="live"
-						break
-					;;
-					4.1.69)
-						_kdedir="4.2"
-						break
-					;;
-					4.1.0)
-						_kdedir="4.1"
-						break
-					;;
-				esac
-			fi
-		done
-	fi
+			esac
+		fi
+	done
 }
 
 # @FUNCTION: migrate_store_dir