| 1 |
commit: 5b994c174e855b38c8c6cef78278ea28b43c81c0 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 2 23:23:17 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 2 23:23:17 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5b994c17 |
| 7 |
|
| 8 |
kde5.eclass: Cleanup obsolete blocker |
| 9 |
|
| 10 |
eclass/kde5.eclass | 23 ++++++++--------------- |
| 11 |
1 file changed, 8 insertions(+), 15 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 14 |
index 84346f5a00..346838570a 100644 |
| 15 |
--- a/eclass/kde5.eclass |
| 16 |
+++ b/eclass/kde5.eclass |
| 17 |
@@ -204,21 +204,14 @@ case ${KDE_AUTODEPS} in |
| 18 |
RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )" |
| 19 |
fi |
| 20 |
|
| 21 |
- case ${CATEGORY} in |
| 22 |
- kde-frameworks | \ |
| 23 |
- kde-plasma) |
| 24 |
- RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1" |
| 25 |
- ;; |
| 26 |
- kde-apps) |
| 27 |
- [[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4" |
| 28 |
- [[ $(get_version_component_range 1) -ge 17 ]] && \ |
| 29 |
- RDEPEND+=" |
| 30 |
- !kde-apps/kde-l10n |
| 31 |
- !<kde-apps/kde4-l10n-16.12.0:4 |
| 32 |
- !kde-apps/kdepim-l10n:5 |
| 33 |
- " |
| 34 |
- ;; |
| 35 |
- esac |
| 36 |
+ if [[ ${CATEGORY} = kde-apps ]]; then |
| 37 |
+ [[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4" |
| 38 |
+ RDEPEND+=" |
| 39 |
+ !kde-apps/kde-l10n |
| 40 |
+ !<kde-apps/kde4-l10n-16.12.0:4 |
| 41 |
+ !kde-apps/kdepim-l10n:5 |
| 42 |
+ " |
| 43 |
+ fi |
| 44 |
;; |
| 45 |
esac |
Archives