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 D6CA7139085 for ; Thu, 26 Jan 2017 10:16:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0241B234071; Thu, 26 Jan 2017 10:16:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D2940234071 for ; Thu, 26 Jan 2017 10:16:02 +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 2475E340FC1 for ; Thu, 26 Jan 2017 10:16:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 903443021 for ; Thu, 26 Jan 2017 10:16:00 +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: <1485425736.1b54dba9916b069f17d072048c03a8156f424c6e.kensington@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: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 1b54dba9916b069f17d072048c03a8156f424c6e X-VCS-Branch: master Date: Thu, 26 Jan 2017 10:16:00 +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: 05a91ad8-db6e-432a-9a98-4cd67fc24a8d X-Archives-Hash: af4f9448d2bbddcc2aef64f58ea0e4e2 commit: 1b54dba9916b069f17d072048c03a8156f424c6e Author: Michael Palimaka gentoo org> AuthorDate: Thu Jan 26 10:12:48 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Jan 26 10:15:36 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b54dba9 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 e87cf93..cadeda9 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: