From 7cfb20cb0a483eeb4bf1bf513fa0c661df4c52f8 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 18 May 2019 21:20:43 +0200
Subject: kde5-functions.eclass: Set FRAMEWORKS_MINIMAL=5.57.0, cleanup
 versions

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 eclass/kde5-functions.eclass | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'eclass/kde5-functions.eclass')

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 61d0fa6e482..d87dbcf9043 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,19 +38,10 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.14.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.52.0}
-		[[ ${PV} = 5.15.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.57.0}
-		if [[ ${PV} = 5.15.90 || ${PV} = 5.16* ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.58.0}
-			: ${QT_MINIMAL:=5.12.3}
-		fi
-		if [[ ${KDE_BUILD_TYPE} = live ]]; then
-			: ${FRAMEWORKS_MINIMAL:=9999}
-			: ${QT_MINIMAL:=5.12.3}
-		fi
-		;;
-	kde-apps)
-		[[ ${KDE_BUILD_TYPE} = live || ${PV} = 19* ]] && : ${FRAMEWORKS_MINIMAL:=5.57.0}
+		[[ ${PV} = 5.15.5 ]] && : ${QT_MINIMAL:=5.11.1}
+		[[ ${PV} = 5.15.90 || ${PV} = 5.16* ]] && : ${FRAMEWORKS_MINIMAL:=5.58.0}
+		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
+		: ${QT_MINIMAL:=5.12.3}
 		;;
 esac
 
@@ -62,7 +53,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.54.0}
+: ${FRAMEWORKS_MINIMAL:=5.57.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
-- 
cgit v1.2.3