| 1 |
commit: 696a07882b68220f598d16f3c1a318b04283cd3f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 8 21:51:59 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 8 21:51:59 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=696a0788 |
| 7 |
|
| 8 |
kde5.eclass: Add additional blocker for <kde-apps/kde4-l10n-16.12.0:4 |
| 9 |
|
| 10 |
There would be file collisions in the event that someone is upgrading |
| 11 |
straight from 16.08 to 17.04, specifically packages that were ported |
| 12 |
to KF5 in the meantime. |
| 13 |
|
| 14 |
eclass/kde5.eclass | 6 +++++- |
| 15 |
1 file changed, 5 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 18 |
index 0fc2d72f6b..e071a82b5d 100644 |
| 19 |
--- a/eclass/kde5.eclass |
| 20 |
+++ b/eclass/kde5.eclass |
| 21 |
@@ -180,7 +180,11 @@ case ${KDE_AUTODEPS} in |
| 22 |
kde-apps) |
| 23 |
[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4" |
| 24 |
[[ $(get_version_component_range 1) -ge 17 ]] && \ |
| 25 |
- RDEPEND+=" !kde-apps/kde-l10n !kde-apps/kdepim-l10n:5" |
| 26 |
+ RDEPEND+=" |
| 27 |
+ !kde-apps/kde-l10n |
| 28 |
+ !<kde-apps/kde4-l10n-16.12.0:4 |
| 29 |
+ !kde-apps/kdepim-l10n:5 |
| 30 |
+ " |
| 31 |
;; |
| 32 |
esac |
| 33 |
;; |
Archives