[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     c98da6b634b9aff8d12970a3a985fdaa79994263
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Sep  6 21:49:33 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 17:50:29 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c98da6b6

kde5.eclass: Block old kde4-l10n for kde-{frameworks,plasma}

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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 46925c6..23e3127 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -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