summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-04-08 23:51:59 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-04-08 23:51:59 +0200
commit696a07882b68220f598d16f3c1a318b04283cd3f (patch)
tree190961e69f6820331b4dcca2b7244076ce3d7025 /eclass
parent16ea869945ec8240e0a876b91967ca2bfc35b0ac (diff)
downloadkde-696a07882b68220f598d16f3c1a318b04283cd3f.tar.gz
kde-696a07882b68220f598d16f3c1a318b04283cd3f.tar.bz2
kde-696a07882b68220f598d16f3c1a318b04283cd3f.zip
kde5.eclass: Add additional blocker for <kde-apps/kde4-l10n-16.12.0:4
There would be file collisions in the event that someone is upgrading straight from 16.08 to 17.04, specifically packages that were ported to KF5 in the meantime.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kde5.eclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0fc2d72f6b1..e071a82b5d0 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -180,7 +180,11 @@ case ${KDE_AUTODEPS} in
kde-apps)
[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
[[ $(get_version_component_range 1) -ge 17 ]] && \
- RDEPEND+=" !kde-apps/kde-l10n !kde-apps/kdepim-l10n:5"
+ RDEPEND+="
+ !kde-apps/kde-l10n
+ !<kde-apps/kde4-l10n-16.12.0:4
+ !kde-apps/kdepim-l10n:5
+ "
;;
esac
;;