kde5.eclass: Block old kde4-l10n for kde-{frameworks,plasma}
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>
Sun, 6 Sep 2015 21:49:33 +0000 (23:49 +0200)
committerMichael Palimaka <kensington@gentoo.org>
Thu, 10 Sep 2015 17:50:29 +0000 (03:50 +1000)
Versions older than <kde-apps/kde4-l10n-15.08.0-r1 haven't been updated to keep
up with file collisions in current releases of kde-frameworks and kde-plasma.
Make sure everyone gets what they need. Fixes e.g. kde-plasma/kinfocenter-5.4.0
as reported in IRC but also https://bugs.gentoo.org/show_bug.cgi?id=559740

eclass/kde5.eclass

index 46925c6370ae6f8bbf16e910905170455a0ec548..23e31275b1508954811764a898c9ccbecea43fcf 100644 (file)
@@ -139,9 +139,10 @@ case ${KDE_AUTODEPS} in
                RDEPEND+=" >=kde-frameworks/kf-env-3"
                COMMONDEPEND+=" >=dev-qt/qtcore-${QT_MINIMAL}:5"
 
-               if [[ ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
+               if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
                        RDEPEND+="
                                !kde-apps/kde4-l10n[-minimal(-)]
+                               !<kde-apps/kde4-l10n-15.08.0-r1
                        "
                fi