Remove need_kde=any and prepare for enhancement of need_kde=latest. Please see coments around line 196.

3 files changed, 35 insertions, 55 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index fa6ad2746cf..342707137c1 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -108,7 +108,7 @@ RDEPEND="${RDEPEND} ${COMMONDEPEND}"
 # Add the kdeprefix use flag
 case "${EAPI}" in
 	2 | 2_pre3 | 2_pre2 | 2_pre1)
-		[[ "${NEED_KDE}" != "any" ]] && IUSE="${IUSE} kdeprefix"
+		IUSE="${IUSE} kdeprefix"
 		;;
 esac
 
@@ -168,13 +168,6 @@ fi
 export NEED_KDE
 
 case ${NEED_KDE} in
-	any)
-		_kdedir=""
-		_operator=">="
-		_pv="-3.9" # we do not specify version only that it needs 4
-		# kdedir is not set and it needs to be detected (maybe fallback for
-		# latest version availible)
-		;;
 	latest)
 		# Should only be used by 'kde-base'-ebuilds
 		if [[ "${KDEBASE}" == "kde-base" ]]; then
@@ -199,6 +192,10 @@ case ${NEED_KDE} in
 			esac
 			_operator=">="
 		else
+			# we need to set up correct kdedir based on what we find
+			# not to do it by versioning but based on what is on system
+			# we might also be cool and install app for all kde installs
+			# but i guess that is just insane.
 			case ${PV} in
 				4.2 | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6* ) _kdedir="4.2" ;;
 				4.1 | 4.0.9* | 4.0.8*) _kdedir="4.1" ;;
@@ -207,6 +204,9 @@ case ${NEED_KDE} in
 				9999*) _kdedir="live" ;;
 				*) die "NEED_KDE=latest not supported for PV=${PV}" ;;
 			esac
+			# this creates dependency on any version of kde4
+			_operator=">="
+			_pv="-3.9*"
 		fi
 		;;
 
@@ -320,55 +320,40 @@ if [[ ${NEED_KDE} != none ]]; then
 			for KDE_SLOT in ${KDE_SLOTS[@]}; do
 				# block non kdeprefix ${PN} on other slots
 				# we do this only if we do not depend on any version of kde
-				if [[ ${NEED_KDE} != "any" ]]; then
-					if [[ ${SLOT} != ${KDE_SLOT} ]]; then
-						DEPEND="${DEPEND}
-							!kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )"
-						RDEPEND="${RDEPEND}
-							!kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )"
-					fi
+				if [[ ${SLOT} != ${KDE_SLOT} ]]; then
+					DEPEND="${DEPEND}
+						!kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )"
+					RDEPEND="${RDEPEND}
+						!kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )"
 				fi
 			done
 			;;
 	esac
 
 	# We only need to add the dependencies if ${PN} is not "kdelibs" or "kdepimlibs"
-	if [[ ${NEED_KDE} != "any" ]]; then
-		if  [[ ${PN} != "kdelibs" ]]; then
+	if  [[ ${PN} != "kdelibs" ]]; then
+		case "${EAPI}" in
+			2 | 2_pre3 | 2_pre2 | 2_pre1)
+				DEPEND="${DEPEND} ${_operator}kde-base/kdelibs${_pv}[kdeprefix=]"
+				RDEPEND="${RDEPEND}	${_operator}kde-base/kdelibs${_pv}[kdeprefix=]"
+				;;
+			*)
+				DEPEND="${DEPEND} ${_operator}kde-base/kdelibs${_pv}"
+				RDEPEND="${RDEPEND} ${_operator}kde-base/kdelibs${_pv}"
+				;;
+		esac
+		if [[ ${PN} != "kdepimlibs" ]]; then
 			case "${EAPI}" in
 				2 | 2_pre3 | 2_pre2 | 2_pre1)
-					DEPEND="${DEPEND} ${_operator}kde-base/kdelibs${_pv}[kdeprefix=]"
-					RDEPEND="${RDEPEND}	${_operator}kde-base/kdelibs${_pv}[kdeprefix=]"
+					DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=]"
+					RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=]"
 					;;
 				*)
-					DEPEND="${DEPEND} ${_operator}kde-base/kdelibs${_pv}"
-					RDEPEND="${RDEPEND} ${_operator}kde-base/kdelibs${_pv}"
-					;;
-			esac
-			if [[ ${PN} != "kdepimlibs" ]]; then
-				case "${EAPI}" in
-					2 | 2_pre3 | 2_pre2 | 2_pre1)
-						DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=]"
-						RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=]"
-						;;
-					*)
-						DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
-						RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
-					esac
-			fi
-		fi
-	else
-		if [[ ${PN} != "kdelibs" ]]; then
-			# need_kde == any
-			DEPEND="${DEPEND} ${_operator}kde-base/kdelibs${_pv}"
-			RDEPEND="${RDEPEND} ${_operator}kde-base/kdelibs${_pv}"
-			if [[ ${PN} != "kdepimlibs" ]]; then
-				DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
-				RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
-			fi
+					DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
+					RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
+				esac
 		fi
 	fi
-
 	unset _operator _pv
 fi
 
@@ -477,14 +462,9 @@ kde4-base_pkg_setup() {
 		# Set PREFIX
 		case "${EAPI}" in
 			2 | 2_pre3 | 2_pre2 | 2_pre1)
-				if [[ ${NEED_KDE} != "any" ]]; then
-					if use kdeprefix; then
-						KDEDIR="/usr/kde/${_kdedir}"
-						KDEDIRS="/usr:/usr/local:${KDEDIR}"
-					else
-						KDEDIR="/usr"
-						KDEDIRS="/usr:/usr/local"
-					fi
+				if use kdeprefix; then
+					KDEDIR="/usr/kde/${_kdedir}"
+					KDEDIRS="/usr:/usr/local:${KDEDIR}"
 				else
 					KDEDIR="/usr"
 					KDEDIRS="/usr:/usr/local"
diff --git a/x11-themes/gtk-engines-qt/Manifest b/x11-themes/gtk-engines-qt/Manifest
index 8dd480317a7..fbe09baa455 100644
--- a/x11-themes/gtk-engines-qt/Manifest
+++ b/x11-themes/gtk-engines-qt/Manifest
@@ -1,5 +1,5 @@
 AUX 1.1-stdlib.patch 340 RMD160 c9cccc1716fcf52369c3da8a5760723afa57cae8 SHA1 07210aabdbdb6b2ff7d8fa216e68a856410f2d89 SHA256 ffc45b4c00e9a62c13130a6a84f45ae4bdd40b46fb959a7d9d9b23714382f398
 DIST gtk-qt-engine-1.1.tar.bz2 58079 RMD160 c1d0cfab2443bb7dbd315d3ff72158c1c164b351 SHA1 25cf693945948a22d3d51e0528f7d30a18d3c711 SHA256 4310f8f179c5ab70cea614a07b0c3e84234d05388dded85596200fa754c290a6
-EBUILD gtk-engines-qt-1.1-r1.ebuild 763 RMD160 084f9c1624ebbb9c7f8bdbee46131db00b165de7 SHA1 9c19b2ceb8bb40633ba605e605396967bf8cfa58 SHA256 fcd380e9bde6a89f2ee3607ce67145ee183c3e0ec3d2792aa0a2ea8c9e4ece66
+EBUILD gtk-engines-qt-1.1-r1.ebuild 763 RMD160 d0490d7616012ed0813a1f30cdeacb1ee8a7d26c SHA1 e0c25587f1ac70ce10c81a2b51e2209bd7b61d3c SHA256 3a82fdac4607188bfb918fb841787aa3fbea69c9de10ee7dd31ba8219e9102b6
 MISC ChangeLog 1266 RMD160 792839f3c53790a91e2d6bb186cea3f069f56b75 SHA1 9a869c802fb603ae63a39a2d7a855adb41f526d7 SHA256 b6c1567c918083054a6328e028e6031b0ed1e0c45464c06e33d6df0cf8bb2360
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r1.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r1.ebuild
index d3e82c4e8bd..e22299c310a 100644
--- a/x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r1.ebuild
+++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-NEED_KDE="any"
+NEED_KDE="4.1"
 KDE_LINGUAS="bg cs de es fr it nn ru sv tr"
 inherit kde4-base