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 1CEC71580B2 for ; Thu, 2 Sep 2021 18:14:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E77CE095C; Thu, 2 Sep 2021 18:14:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 35421E095C for ; Thu, 2 Sep 2021 18:14:49 +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 643093406DD for ; Thu, 2 Sep 2021 18:14:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 000BD95 for ; Thu, 2 Sep 2021 18:14:46 +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: <1630606467.a2efb902352fffc48ff27bef73b8ff24b7b05b39.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a2efb902352fffc48ff27bef73b8ff24b7b05b39 X-VCS-Branch: master Date: Thu, 2 Sep 2021 18:14:46 +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: 9b5e0854-41f1-4496-b253-9b1d7749684f X-Archives-Hash: 21a24733174b2eacdfcb9f729f553f01 commit: a2efb902352fffc48ff27bef73b8ff24b7b05b39 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 2 18:14:27 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 2 18:14:27 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a2efb902 ecm.eclass: Sync with Gentoo ebuild repository Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 1f62d7f7af..a2c8ed1c95 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -5,6 +5,7 @@ # @MAINTAINER: # kde@gentoo.org # @SUPPORTED_EAPIS: 7 8 +# @PROVIDES: cmake # @BLURB: Support eclass for packages that use KDE Frameworks with ECM. # @DESCRIPTION: # This eclass is intended to streamline the creation of ebuilds for packages @@ -22,16 +23,9 @@ case ${EAPI} in 7|8) ;; - *) die "EAPI=${EAPI:-0} is not supported" ;; + *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;; esac -if [[ -v KDE_GCC_MINIMAL ]]; then - EXPORT_FUNCTIONS pkg_pretend -fi - -EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst pkg_postinst pkg_postrm -[[ ${EAPI} != 7 ]] && EXPORT_FUNCTIONS src_install - if [[ -z ${_ECM_ECLASS} ]]; then _ECM_ECLASS=1 @@ -42,6 +36,8 @@ _ECM_ECLASS=1 # for tests you should proceed with setting VIRTUALX_REQUIRED=test. : ${VIRTUALX_REQUIRED:=manual} +inherit cmake flag-o-matic toolchain-funcs virtualx + # @ECLASS-VARIABLE: ECM_NONGUI # @DEFAULT_UNSET # @DESCRIPTION: @@ -54,8 +50,6 @@ if [[ ${CATEGORY} = kde-frameworks ]] ; then fi : ${ECM_NONGUI:=false} -inherit cmake flag-o-matic toolchain-funcs virtualx - if [[ ${ECM_NONGUI} = false ]] ; then inherit xdg fi @@ -272,7 +266,7 @@ unset COMMONDEPEND # @DESCRIPTION: # Determine if the current GCC version is acceptable, otherwise die. _ecm_check_gcc_version() { - if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]] && tc-is-gcc; then + if [[ ${MERGE_TYPE} != binary && -v ${KDE_GCC_MINIMAL} ]] && tc-is-gcc; then local version=$(gcc-version) @@ -601,3 +595,13 @@ ecm_pkg_postrm() { } fi + +if [[ -v ${KDE_GCC_MINIMAL} ]]; then + EXPORT_FUNCTIONS pkg_pretend +fi + +EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst pkg_postinst pkg_postrm + +if [[ ${EAPI} != 7 ]]; then + EXPORT_FUNCTIONS src_install +fi