[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     a460d7a3e5ce6cc9eb2a5e744779dda17614ccb5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jun 26 09:00:48 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 18:49:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a460d7a3

kde5.eclass: Simplify blocked kde4-l10n logic

1) 15.08.x has left the tree
2) Prepare for a future kde4-l10n without USE=minimal
   Version block makes sure of no ancient kde4-l10n anyway

 eclass/kde5.eclass | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 5c4bbba..72657f4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,15 +157,9 @@ case ${KDE_AUTODEPS} in
                fi
 
                if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma 
&& ${PN} != polkit-kde-agent ]]; then
-                       local blocked_version=15.08.0-r1
-
-                       if [[ ${CATEGORY} = kde-plasma && 
$(get_version_component_range 2) -ge 6 ]]; then
-                               blocked_version=15.12.3-r1
-                       fi
-
                        RDEPEND+="
-                               !kde-apps/kde4-l10n[-minimal(-)]
-                               !<kde-apps/kde4-l10n-${blocked_version}
+                               !kde-apps/kde4-l10n[-minimal(+)]
+                               !<kde-apps/kde4-l10n-15.12.3-r1
                        "
                fi