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

[Andreas Sturmlechner]

commit:     f7109aafaae8ffa72f97124e21979293fbeab363
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 10:12:48 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 14:39:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7109aaf

kde5-functions.eclass: raise FRAMEWORKS_MINIMAL to latest stable

 eclass/kde5-functions.eclass | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 31597be..2012c53 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -36,21 +36,11 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		if [[ $(get_version_component_range 2) -eq 8 && $(get_version_component_range 3) -lt 50 ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.26.0}	# special 5.8 LTS rule to not get overwritten below
-		elif ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
+		if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
 			: ${QT_MINIMAL:=5.7.1}
-			: ${FRAMEWORKS_MINIMAL:=5.29.0}
 		fi
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
-	kde-apps)
-		local vcr2=$((10#$(get_version_component_range 2)))
-		if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.28.0}
-		fi
-		unset vcr2
-		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
@@ -61,7 +51,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.26.0}
+: ${FRAMEWORKS_MINIMAL:=5.29.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION: