diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-06-26 11:00:48 +0200 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2016-07-07 04:49:45 +1000 |
| commit | a460d7a3e5ce6cc9eb2a5e744779dda17614ccb5 (patch) | |
| tree | 2beee6d227ea28025400e5dff879a55c7c4ad6e1 | |
| parent | kde5-functions.eclass: only perform the GCC version check if KDE_GCC_MINIMAL ... (diff) | |
| download | gentoo-a460d7a3e5ce6cc9eb2a5e744779dda17614ccb5.tar.gz gentoo-a460d7a3e5ce6cc9eb2a5e744779dda17614ccb5.tar.bz2 gentoo-a460d7a3e5ce6cc9eb2a5e744779dda17614ccb5.zip | |
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
| -rw-r--r-- | eclass/kde5.eclass | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 5c4bbba8e4ad..72657f433549 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 |