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 21A6D158CB7 for ; Wed, 18 Aug 2021 14:12:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 768E4E07FA; Wed, 18 Aug 2021 14:12:21 +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 5A82AE07FA for ; Wed, 18 Aug 2021 14:12:21 +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 CAC0F340F79 for ; Wed, 18 Aug 2021 14:12:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F9667BD for ; Wed, 18 Aug 2021 14:12:18 +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: <1629295931.dc28662e0bbc33e86df44ed2ce13c979a43e81d8.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde.org.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: dc28662e0bbc33e86df44ed2ce13c979a43e81d8 X-VCS-Branch: master Date: Wed, 18 Aug 2021 14:12:18 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7636e9c9-fff4-4ff2-ba0f-e49e3ec6b4aa X-Archives-Hash: 0e353ef314877f9e17364f4b70d0948c commit: dc28662e0bbc33e86df44ed2ce13c979a43e81d8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 18 11:59:46 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 18 14:12:11 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dc28662e kde.org.eclass: Revert "Allow KDE_BUILD_TYPE to hold "snapshot" value" Not enough resulting simplification in eclass to justify complicating an ebuild facing variable. Partially reverts commit 19b4ef26c52864d1e0dce7d07e7d2d009ea73094. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde.org.eclass | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass index 18f198e522..aab7abcd6c 100644 --- a/eclass/kde.org.eclass +++ b/eclass/kde.org.eclass @@ -15,7 +15,7 @@ # It also contains default meta variables for settings not specific to any # particular build system. -case ${EAPI:-0} in +case ${EAPI} in 7|8) ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac @@ -25,6 +25,20 @@ EXPORT_FUNCTIONS pkg_nofetch src_unpack if [[ -z ${_KDE_ORG_ECLASS} ]]; then _KDE_ORG_ECLASS=1 +# @ECLASS-VARIABLE: KDE_BUILD_TYPE +# @DESCRIPTION: +# If PV matches "*9999*", this is automatically set to "live". +# Otherwise, this is automatically set to "release". +KDE_BUILD_TYPE="release" +if [[ ${PV} == *9999* ]]; then + KDE_BUILD_TYPE="live" +fi +export KDE_BUILD_TYPE + +if [[ ${KDE_BUILD_TYPE} == live ]]; then + inherit git-r3 +fi + # @ECLASS-VARIABLE: KDE_ORG_CATEGORIES # @INTERNAL # @DESCRIPTION: @@ -101,25 +115,6 @@ if [[ ${CATEGORY} == kde-apps ]]; then KDE_GEAR=true fi -# @ECLASS-VARIABLE: KDE_BUILD_TYPE -# @DESCRIPTION: -# By default, this is set to "release". -# If PV matches "*9999*", this is automatically set to "live" and will cause -# git-r3.eclass to be inherited. -# In EAPI-8, if KDE_ORG_COMMIT is set, this is automatically set to "snapshot". -KDE_BUILD_TYPE="release" -if [[ ${PV} == *9999* ]]; then - KDE_BUILD_TYPE="live" -fi -if [[ ${EAPI} == 8 ]] && [[ -n ${KDE_ORG_COMMIT} ]]; then - KDE_BUILD_TYPE="snapshot" -fi -export KDE_BUILD_TYPE - -if [[ ${KDE_BUILD_TYPE} == live ]]; then - inherit git-r3 -fi - # @ECLASS-VARIABLE: KDE_SELINUX_MODULE # @PRE_INHERIT # @DESCRIPTION: @@ -158,7 +153,7 @@ case ${CATEGORY} in kde-frameworks) HOMEPAGE="https://kde.org/products/frameworks/" SLOT=5/${PV} - [[ ${KDE_BUILD_TYPE} != live ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2) + [[ ${KDE_BUILD_TYPE} == release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2) ;; *) ;; esac @@ -295,7 +290,6 @@ case ${KDE_BUILD_TYPE} in *) _kde.org_calculate_src_uri debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" - # TODO: simplify after dropping support for EAPI-7 if [[ -n ${KDE_ORG_COMMIT} ]]; then S=${WORKDIR}/${KDE_ORG_NAME}-${KDE_ORG_COMMIT} [[ ${CATEGORY} == dev-qt ]] && QT5_BUILD_DIR="${S}_build"