From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 053DE138334 for ; Thu, 11 Oct 2018 19:12:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3558E083D; Thu, 11 Oct 2018 19:12:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BE573E083D for ; Thu, 11 Oct 2018 19:12:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DF291335CF9 for ; Thu, 11 Oct 2018 19:12:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 809A93CF for ; Thu, 11 Oct 2018 19:12:46 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1539280511.eeb7b7910a6df1e61720aa3cbb930e2547acbd57.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: eeb7b7910a6df1e61720aa3cbb930e2547acbd57 X-VCS-Branch: master Date: Thu, 11 Oct 2018 19:12:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 731a5031-7463-44c2-8c62-2e60a00d0211 X-Archives-Hash: feef54ec9726dc8103bc5756fb3c40d2 commit: eeb7b7910a6df1e61720aa3cbb930e2547acbd57 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 11 17:53:43 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 11 17:55:11 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=eeb7b791 kde5-functions.eclass: Sync with Gentoo ebuild repository Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde5-functions.eclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index dc0123f863..95a4dff9aa 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -38,8 +38,7 @@ case ${CATEGORY} in [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} ;; kde-plasma) - [[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.4} - [[ ${PV} = 5.13.?? || ${PV} = 5.14* ]] && : ${FRAMEWORKS_MINIMAL:=5.50.0} + [[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.6} if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then : ${FRAMEWORKS_MINIMAL:=9999} fi @@ -47,7 +46,6 @@ case ${CATEGORY} in ;; kde-apps) [[ ${PV} = 18.04.3 ]] && : ${FRAMEWORKS_MINIMAL:=5.46.0} - : ${FRAMEWORKS_MINIMAL:=5.50.0} ;; esac @@ -59,7 +57,7 @@ esac # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL # @DESCRIPTION: # Minimum version of Frameworks to require. This affects add_frameworks_dep. -: ${FRAMEWORKS_MINIMAL:=5.46.0} +: ${FRAMEWORKS_MINIMAL:=5.50.0} # @ECLASS-VARIABLE: PLASMA_MINIMAL # @DESCRIPTION: @@ -69,7 +67,7 @@ esac # @ECLASS-VARIABLE: KDE_APPS_MINIMAL # @DESCRIPTION: # Minimum version of KDE Applications to require. This affects add_kdeapps_dep. -: ${KDE_APPS_MINIMAL:=17.12.3} +: ${KDE_APPS_MINIMAL:=18.04.3} # @ECLASS-VARIABLE: KDE_GCC_MINIMAL # @DEFAULT_UNSET