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

[Michael Palimaka]

commit:     1e05fd1f2e56d247399e797f754255b20246d2aa
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Feb  2 18:49:38 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb  3 11:39:34 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1e05fd1f

[eclass] Fix breakage by KDE_APPS_MINIMAL

commit 6c68003fda689d2240ea45df4614166655f6b8ae made live packages depend on
e.g. >=14.12 instead of 5.9999. This change helps out as long as there exist
packages with separate frameworks branch. Alternative would be to add 5.9999
version to add_kdeapps_dep calls in every affected ebuild.

Package-Manager: portage-2.2.15

---
 eclass/kde5-functions.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 2f30ab4..24ee1b8 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -187,7 +187,8 @@ add_kdeapps_dep() {
        elif [[ ${CATEGORY} = kde-apps ]]; then
                version=${PV}
        elif [[ -z "${version}" ]] ; then
-               version=${KDE_APPS_MINIMAL}
+               # In KDE applications world, 5.9999 > yy.mm.x
+               [[ ${PV} = 5.9999 ]] && version=5.9999 || 
version=${KDE_APPS_MINIMAL}
        fi
 
        _add_kdecategory_dep kde-apps "${1}" "${2}" "${version}"