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 035C81395E2 for ; Thu, 17 Nov 2016 19:27:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F18E6E0AB3; Thu, 17 Nov 2016 19:27:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6687E0AB3 for ; Thu, 17 Nov 2016 19:27:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 486CD341375 for ; Thu, 17 Nov 2016 19:27:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B05CC48B for ; Thu, 17 Nov 2016 19:27:40 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1479410364.14ad094657f03c6b9e7c5fa179602691f54ecdb3.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5-functions.eclass eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 14ad094657f03c6b9e7c5fa179602691f54ecdb3 X-VCS-Branch: master Date: Thu, 17 Nov 2016 19:27:40 +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: d2f35c69-c29a-48ca-9f9b-f401a0e4afeb X-Archives-Hash: b1f0506eebdc3a98f9206b1c7e0596fb commit: 14ad094657f03c6b9e7c5fa179602691f54ecdb3 Author: Andreas Sturmlechner gmail com> AuthorDate: Thu Nov 17 14:24:16 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Nov 17 19:19:24 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=14ad0946 kde5-functions.eclass: Move *_MINIMAL setup here from kde5.eclass Makes sure that 5.8 LTS stable branch does not raise FRAMEWORKS_MINIMAL Also bumping FRAMEWORKS_MINIMAL to 5.28.0 for >=Plasma-5.9 eclass/kde5-functions.eclass | 37 +++++++++++++++++++++++++++++-------- eclass/kde5.eclass | 27 --------------------------- 2 files changed, 29 insertions(+), 35 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index a6bf976..1724a69 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -23,6 +23,35 @@ case ${EAPI} in *) die "EAPI=${EAPI:-0} is not supported" ;; esac +# determine the build type +if [[ ${PV} = *9999* ]]; then + KDE_BUILD_TYPE="live" +else + KDE_BUILD_TYPE="release" +fi +export KDE_BUILD_TYPE + +case ${CATEGORY} in + kde-frameworks) + [[ ${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 + : ${FRAMEWORKS_MINIMAL:=5.28.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 # @DESCRIPTION: # Minimal Qt version to require for the package. @@ -70,14 +99,6 @@ case ${KDE_SCM} in *) die "KDE_SCM: ${KDE_SCM} is not supported" ;; esac -# determine the build type -if [[ ${PV} = *9999* ]]; then - KDE_BUILD_TYPE="live" -else - KDE_BUILD_TYPE="release" -fi -export KDE_BUILD_TYPE - # @FUNCTION: _check_gcc_version # @INTERNAL # @DESCRIPTION: diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 9ef7c15..4876d7c 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -142,33 +142,6 @@ fi case ${KDE_AUTODEPS} in false) ;; *) - if [[ ${KDE_BUILD_TYPE} = live ]]; then - case ${CATEGORY} in - kde-frameworks) - : ${FRAMEWORKS_MINIMAL:=9999} - ;; - kde-plasma) - - : ${FRAMEWORKS_MINIMAL:=9999} - ;; - *) ;; - esac - fi - - if [[ ${CATEGORY} = kde-plasma && ${FRAMEWORKS_MINIMAL} != 9999 ]]; then - if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then - : ${FRAMEWORKS_MINIMAL:=5.27.0} - fi - fi - - if [[ ${CATEGORY} = kde-apps ]]; then - 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 - fi - DEPEND+=" $(add_frameworks_dep extra-cmake-modules)" RDEPEND+=" >=kde-frameworks/kf-env-3" COMMONDEPEND+=" $(add_qt_dep qtcore)"