From 2fc0178a73b14b6872cb550c5c84b42080e0b7dd Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Fri, 21 Aug 2015 04:29:51 +1000
Subject: kde4-functions.eclass: improve dependency version handling when
 mixing KDE SC and KDE Applications packages.

---
 eclass/kde4-functions.eclass | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

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

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index f7a3bda221e4..133fd264b841 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -292,10 +292,10 @@ add_kdeapps_dep() {
 		ver=${KDE_OVERRIDE_MINIMAL}
 	elif [[ ${KDEBASE} != kde-base ]]; then
 		ver=${KDE_MINIMAL}
-	# if building stable-live version depend just on the raw KDE version
-	# to allow merging packages against more stable basic stuff
-	elif [[ ${PV} == *.9999 ]]; then
-		ver=$(get_kde_version)
+	# if building kde-apps, live master or stable-live branch,
+	# use the final SC version since there are no further general releases.
+	elif [[ ${CATEGORY} == kde-apps || ${PV} == *9999 ]]; then
+		ver=4.14.3
 	else
 		ver=${PV}
 	fi
@@ -325,16 +325,15 @@ add_kdebase_dep() {
 		ver=${3}
 	elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
 		ver=${KDE_OVERRIDE_MINIMAL}
-	elif [[ -n ${KDE_MINIMAL} ]]; then
+	elif [[ ${KDEBASE} != kde-base ]]; then
 		ver=${KDE_MINIMAL}
-	# if building live version depend on the final release since there will
-	# not be any more major development. this solves dep errors as not all
-	# packages have kde-base live versions now
-
-	# depend on the last sane released version where the normal >=${PV} dep
-	# is not possible
-	elif [[ ${CATEGORY} == kde-apps || ${PV} == *9999 ]]; then
+	# if building live master or kde-apps, use the final SC version
+	# since there are no further general releases.
+	elif [[ ${CATEGORY} == kde-apps || ${PV} == 9999 ]]; then
 		ver=4.14.3
+	# if building a live version branch (eg. 4.11.49.9999) use the major version
+	elif [[ ${PV} == *.9999 ]]; then
+		ver=$(get_kde_version)
 	else
 		ver=${PV}
 	fi
-- 
cgit v1.2.3-65-gdbad