1 |
commit: 34646d3df06eec4547dedd73a8175b49987c088c |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jun 26 09:00:48 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 26 09:02:40 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=34646d3d |
7 |
|
8 |
kde5.eclass: Simplify blocked kde4-l10n logic |
9 |
|
10 |
1) 15.08.x has left the tree |
11 |
2) Prepare for a future kde4-l10n without USE=minimal |
12 |
Version block makes sure of no ancient kde4-l10n anyway |
13 |
|
14 |
eclass/kde5.eclass | 10 ++-------- |
15 |
1 file changed, 2 insertions(+), 8 deletions(-) |
16 |
|
17 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
18 |
index 7c0ce36..9c871b9 100644 |
19 |
--- a/eclass/kde5.eclass |
20 |
+++ b/eclass/kde5.eclass |
21 |
@@ -173,15 +173,9 @@ case ${KDE_AUTODEPS} in |
22 |
fi |
23 |
|
24 |
if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then |
25 |
- local blocked_version=15.08.0-r1 |
26 |
- |
27 |
- if [[ ${CATEGORY} = kde-plasma && $(get_version_component_range 2) -ge 6 ]]; then |
28 |
- blocked_version=15.12.3-r1 |
29 |
- fi |
30 |
- |
31 |
RDEPEND+=" |
32 |
- !kde-apps/kde4-l10n[-minimal(-)] |
33 |
- !<kde-apps/kde4-l10n-${blocked_version} |
34 |
+ !kde-apps/kde4-l10n[-minimal(+)] |
35 |
+ !<kde-apps/kde4-l10n-15.12.3-r1 |
36 |
" |
37 |
fi |