kde5.eclass: Simplify blocked kde4-l10n logic
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>
Sun, 26 Jun 2016 09:00:48 +0000 (11:00 +0200)
committerMichael Palimaka <kensington@gentoo.org>
Wed, 6 Jul 2016 18:49:45 +0000 (04:49 +1000)
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

index 5c4bbba8e4ad250974268196d19af09c682330a5..72657f433549aa4f8446f21ebd18abb3a0519a40 100644 (file)
@@ -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