From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1029617-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 44E6A138334 for <garchives@archives.gentoo.org>; Sun, 10 Jun 2018 20:47:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4653CE092A; Sun, 10 Jun 2018 20:47:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1AAFFE092A for <gentoo-commits@lists.gentoo.org>; Sun, 10 Jun 2018 20:47:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0860A335C7A for <gentoo-commits@lists.gentoo.org>; Sun, 10 Jun 2018 20:47:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34BA929E for <gentoo-commits@lists.gentoo.org>; Sun, 10 Jun 2018 20:47:07 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1528663607.60c2870d5851ba3f67724969760cb5b032d20c61.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5-functions.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 60c2870d5851ba3f67724969760cb5b032d20c61 X-VCS-Branch: master Date: Sun, 10 Jun 2018 20:47:07 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6240e58a-cbfe-4d80-a858-dc67c37077f3 X-Archives-Hash: ec8f6a24d095483a48517b2494152c41 commit: 60c2870d5851ba3f67724969760cb5b032d20c61 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 10 20:46:47 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 10 20:46:47 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=60c2870d kde5-functions.eclass: Sync *_MINIMAL defs with tree eclass/kde5-functions.eclass | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index eb4cf7a0e4..8f8406bdf1 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -39,7 +39,6 @@ case ${CATEGORY} in ;; kde-plasma) if [[ ${PV} = 5.13* || ${PV} = 5.12.90 ]]; then - : ${FRAMEWORKS_MINIMAL:=5.46.0} : ${QT_MINIMAL:=5.10.1} fi if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then @@ -47,11 +46,6 @@ case ${CATEGORY} in : ${QT_MINIMAL:=5.10.1} fi ;; - kde-apps) - if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.04* ]]; then - : ${FRAMEWORKS_MINIMAL:=5.46.0} - fi - ;; esac # @ECLASS-VARIABLE: QT_MINIMAL @@ -62,12 +56,12 @@ esac # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL # @DESCRIPTION: # Minimum version of Frameworks to require. This affects add_frameworks_dep. -: ${FRAMEWORKS_MINIMAL:=5.43.0} +: ${FRAMEWORKS_MINIMAL:=5.46.0} # @ECLASS-VARIABLE: PLASMA_MINIMAL # @DESCRIPTION: # Minimum version of Plasma to require. This affects add_plasma_dep. -: ${PLASMA_MINIMAL:=5.11.5} +: ${PLASMA_MINIMAL:=5.12.5} # @ECLASS-VARIABLE: KDE_APPS_MINIMAL # @DESCRIPTION: