From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 6 Sep 2015 21:49:33 +0000 (+0200)
Subject: kde5.eclass: Block old kde4-l10n for kde-{frameworks,plasma}
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c98da6b634b9aff8d12970a3a985fdaa79994263;p=gentoo.git

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
---

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 46925c6370ae..23e31275b150 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