[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     b944887359a9ea094533d1502186be32eca68a45
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  3 15:28:03 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb  3 15:28:03 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b9448873

[eclass] Improve add_kdebase_dep logic to handle new point releases out of the normal SC schedule.

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

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 3706168..65c7052 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -330,14 +330,13 @@ add_kdebase_dep() {
 	# 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
-	elif [[ ${PV} == *9999 ]]; then
+
+	# depend on the last sane released version where the normal >=${PV} dep
+	# is not possible
+	elif [[ ${CATEGORY} == kde-apps || ${PV} > 4.14.3 || ${PV} == *9999 ]]; then
 		ver=4.14.3
 	else
-		if [[ ${CATEGORY} == kde-apps ]]; then
-			ver=4.14.3
-		else
-			ver=${PV}
-		fi
+		ver=${PV}
 	fi
 
 	[[ -z ${1} ]] && die "Missing parameter"