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 AFD5E1395E1 for ; Thu, 3 Nov 2016 16:07:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 358FCE0AAA; Thu, 3 Nov 2016 16:07:30 +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 19E0BE0AAA for ; Thu, 3 Nov 2016 16:07:30 +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 9A840341072 for ; Thu, 3 Nov 2016 16:07:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11E9E344 for ; Thu, 3 Nov 2016 16:07:27 +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: <1478189236.040cef12f24e64267d5c60bd0b2fbcc5a3280cec.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 040cef12f24e64267d5c60bd0b2fbcc5a3280cec X-VCS-Branch: master Date: Thu, 3 Nov 2016 16:07:27 +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: b2e97456-229c-4d63-9297-1ba6f2ced736 X-Archives-Hash: f9603f45527a94ce17021557cffeaa3d commit: 040cef12f24e64267d5c60bd0b2fbcc5a3280cec Author: Michael Palimaka gentoo org> AuthorDate: Thu Nov 3 16:02:54 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Nov 3 16:07:16 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=040cef12 kde5.eclass: only set FRAMEWORKS_MINIMAL if undefined Unconditionally setting FRAMEWORKS_MINIMAL prevents it being overridden in an ebuild (or somewhere else...). eclass/kde5.eclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index a8915d4..9ef7c15 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -145,10 +145,11 @@ case ${KDE_AUTODEPS} in if [[ ${KDE_BUILD_TYPE} = live ]]; then case ${CATEGORY} in kde-frameworks) - FRAMEWORKS_MINIMAL=9999 + : ${FRAMEWORKS_MINIMAL:=9999} ;; kde-plasma) - FRAMEWORKS_MINIMAL=9999 + + : ${FRAMEWORKS_MINIMAL:=9999} ;; *) ;; esac @@ -156,14 +157,14 @@ case ${KDE_AUTODEPS} in 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 + : ${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 + : ${FRAMEWORKS_MINIMAL:=5.28.0} fi unset vcr2 fi