commit: 2be2743f9051f67ca5d5f49780c08cd9ed2b4721
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 22 05:05:55 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 05:06:49 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2be2743f
[eclass] Fix live (9999) dependency logic.
---
eclass/kde4-functions.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index ba681f7..51e70d6 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -327,12 +327,12 @@ add_kdebase_dep() {
ver=${KDE_OVERRIDE_MINIMAL}
elif [[ ${KDEBASE} != kde-base ]]; then
ver=${KDE_MINIMAL}
+ # if building a live version branch (eg. 4.11.49.9999) use the major
version
elif [[ ${PV} == *.9999 ]]; then
ver=$(get_kde_version)
- # 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 [[ ${CATEGORY} == kde-apps ]]; 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
else
ver=${PV}
