commit:     696a07882b68220f598d16f3c1a318b04283cd3f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 21:51:59 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 21:51:59 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=696a0788

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.

 eclass/kde5.eclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0fc2d72f6b..e071a82b5d 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
                ;;

Reply via email to