From: Johannes Huber <johu@gentoo.org>
Date: Thu, 20 Apr 2017 15:34:56 +0000 (+0200)
Subject: kde5*eclass: KDE Applications 17.04.0 improvements
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6a042ca93acfe1ac0ff94b5da9e13566d86b55d2;p=gentoo.git

kde5*eclass: KDE Applications 17.04.0 improvements

Sync with kde overlay.
---

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index c4e2ad774bf2..ba4abbd44905 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: kde5-functions.eclass
@@ -43,6 +43,14 @@ case ${CATEGORY} in
 			: ${QT_MINIMAL:=5.7.1}
 		fi
 		;;
+	kde-apps)
+		if [[ $(get_version_component_range 1) -ge 17 ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.32.0}
+		fi
+		if [[ ${KDE_BUILD_TYPE} = live ]]; then
+			: ${QT_MINIMAL:=5.7.1}
+		fi
+		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 106383bb05c3..e071a82b5d0e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -172,13 +172,21 @@ case ${KDE_AUTODEPS} in
 		RDEPEND+=" >=kde-frameworks/kf-env-4"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
-		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
-			RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1"
-		fi
-
-		if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then
-			RDEPEND+=" !kde-apps/${PN}:4"
-		fi
+		case ${CATEGORY} in
+			kde-frameworks | \
+			kde-plasma)
+				RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1"
+				;;
+			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/kde4-l10n-16.12.0:4
+						!kde-apps/kdepim-l10n:5
+					"
+				;;
+		esac
 		;;
 esac
 
@@ -546,6 +554,7 @@ kde5_src_prepare() {
 				rm -r ${lang} || die
 				if [[ -e CMakeLists.txt ]] ; then
 					cmake_comment_add_subdirectory ${lang}
+					sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" -i CMakeLists.txt || die
 				fi
 			elif [[ -f ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
 				if [[ ${lang} != CMakeLists.txt && ${lang} != ${PN}.pot ]] ; then