From: Michael Palimaka <kensington@gentoo.org>
Date: Thu, 27 Aug 2015 15:46:35 +0000 (+1000)
Subject: kde5.eclass: don't make kde-plasma/polkit-kde-agent block kde-apps/kde4-l10n.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8e9ac9c9d7aceb5f763767ba8a78d683ab30767;p=gentoo.git

kde5.eclass: don't make kde-plasma/polkit-kde-agent block kde-apps/kde4-l10n.

As sys-auth/polkit-kde-agent was never part of KDE SC 4, it's translations
were never installed by kde-l10n, so there's no need to have a blocker.

In addition to not being required, the blocker was encountered by all
KDE 4 users who had kde-apps/kde4-l10n installed and tried to install a
package that requires kde-frameworks/kauth (which pulls in kde-plasma/polkit-kde-agent).

Resolving the blocker manually by enabling the minimal USE flag on kde-apps/kde4-l10n
caused Plasma 4 translations to be removed.
---

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 921f08559b36..81a1b9623c13 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -139,7 +139,7 @@ case ${KDE_AUTODEPS} in
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+="	>=dev-qt/qtcore-${QT_MINIMAL}:5"
 
-		if [[ ${CATEGORY} = kde-plasma ]]; then
+		if [[ ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
 			RDEPEND+="
 				!kde-apps/kde4-l10n[-minimal(-)]
 			"