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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 93AAF15864F for ; Sun, 26 Mar 2023 12:28:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BDAE8E076B; Sun, 26 Mar 2023 12:28:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A23FBE076B for ; Sun, 26 Mar 2023 12:28:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C0EC63411F4 for ; Sun, 26 Mar 2023 12:28:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05DD4959 for ; Sun, 26 Mar 2023 12:28:42 +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: <1679833645.0bbdf985a4221d17467fda761dd798096a03516e.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass eclass/qt6-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0bbdf985a4221d17467fda761dd798096a03516e X-VCS-Branch: master Date: Sun, 26 Mar 2023 12:28:42 +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: 26b52734-9eb8-4cbd-9e97-70f7c14f9c38 X-Archives-Hash: b4b6cb224f26b45a85871d100dd2027f commit: 0bbdf985a4221d17467fda761dd798096a03516e Author: David Seifert gentoo org> AuthorDate: Fri Mar 17 22:04:31 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 26 12:27:25 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0bbdf985 eclass: standardize prologue/epilogue Closes: https://github.com/gentoo/gentoo/pull/30061 Signed-off-by: David Seifert gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 16 ++++++++++------ eclass/qt6-build.eclass | 22 +++++++++++++--------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index a3a7c881..ae74c2e0 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -11,15 +11,17 @@ # @DESCRIPTION: # This eclass contains various functions that are used when building Qt5. -if [[ ${CATEGORY} != dev-qt ]]; then - die "${ECLASS} is only to be used for building Qt 5" -fi - case ${EAPI} in 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac +if [[ -z ${_QT5_BUILD_ECLASS} ]]; then +_QT5_BUILD_ECLASS=1 + +[[ ${CATEGORY} != dev-qt ]] && + die "${ECLASS} is only to be used for building Qt 5" + # @ECLASS_VARIABLE: QT5_BUILD_TYPE # @DESCRIPTION: # Default value is "release". @@ -171,8 +173,6 @@ fi ###### Phase functions ###### -EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm - # @FUNCTION: qt5-build_src_prepare # @DESCRIPTION: # Prepares the environment and patches the sources if necessary. @@ -971,3 +971,7 @@ qt5_regenerate_global_configs() { ewarn "${qmodule_pri} or ${qmodule_pri_orig} does not exist or is not a regular file" fi } + +fi + +EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index b7e062e6..f92d37eb 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: qt6-build.eclass @@ -10,15 +10,17 @@ # This eclass contains various functions that are used when building Qt6. # Requires EAPI 8. -if [[ ${CATEGORY} != dev-qt ]]; then - die "qt6-build.eclass is only to be used for building Qt 6" -fi - case ${EAPI} in - 8) : ;; - *) die "qt6-build.eclass: unsupported EAPI=${EAPI:-0}" ;; + 8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac +if [[ -z ${_QT6_BUILD_ECLASS} ]]; then +_QT6_BUILD_ECLASS=1 + +[[ ${CATEGORY} != dev-qt ]] && + die "${ECLASS} is only to be used for building Qt 6" + # @ECLASS_VARIABLE: QT6_MODULE # @PRE_INHERIT # @DESCRIPTION: @@ -99,8 +101,6 @@ BDEPEND=" # DEPEND+=" test? ( ~dev-qt/qttest-${PV} )" #fi -EXPORT_FUNCTIONS src_prepare src_configure - ###### Phase functions ###### # @FUNCTION: qt6-build_src_prepare @@ -166,3 +166,7 @@ qt6_prepare_env() { QT6_QMLDIR QT6_DATADIR QT6_DOCDIR QT6_TRANSLATIONDIR \ QT6_EXAMPLESDIR QT6_TESTSDIR QT6_SYSCONFDIR } + +fi + +EXPORT_FUNCTIONS src_prepare src_configure