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 B6DF4158020 for ; Mon, 26 Dec 2022 10:26:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0C53E0990; Mon, 26 Dec 2022 10:26:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 D3E8BE0990 for ; Mon, 26 Dec 2022 10:26: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 05EB933BED4 for ; Mon, 26 Dec 2022 10:26:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F5796F8 for ; Mon, 26 Dec 2022 10:26: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: <1672050064.5ecdb90c0fe91d0724bb5947f9f16b81f41f23b6.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: 5ecdb90c0fe91d0724bb5947f9f16b81f41f23b6 X-VCS-Branch: master Date: Mon, 26 Dec 2022 10:26: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: 83d402ac-e2f4-4b38-b99c-3126630c9d1a X-Archives-Hash: 2f94d84038637607030e403b362f94fa commit: 5ecdb90c0fe91d0724bb5947f9f16b81f41f23b6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 26 10:21:04 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 26 10:21:04 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5ecdb90c ecm.eclass: Drop EAPI-7 support Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 1827f07b1d..c388e397da 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -4,7 +4,7 @@ # @ECLASS: ecm.eclass # @MAINTAINER: # kde@gentoo.org -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 8 # @PROVIDES: cmake virtualx # @BLURB: Support eclass for packages that use KDE Frameworks with ECM. # @DESCRIPTION: @@ -22,7 +22,7 @@ # any phase functions are overridden the version here should also be called. case ${EAPI} in - 7|8) ;; + 8) ;; *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;; esac @@ -143,9 +143,9 @@ fi # @DEFAULT_UNSET # @DESCRIPTION: # Minimum version of Frameworks to require. Default value for kde-frameworks -# is ${PV} and 5.64.0 baseline for everything else. This is not going to be +# is ${PV} and 5.82.0 baseline for everything else. This is not going to be # changed unless we also bump EAPI, which usually implies (rev-)bumping. -# Version will later be used to differentiate between KF5/Qt5 and KF6/Qt6. +# Version will also be used to differentiate between KF5/Qt5 and KF6/Qt6. if [[ ${CATEGORY} = kde-frameworks ]]; then : ${KFMIN:=$(ver_cut 1-2)} fi @@ -630,16 +630,14 @@ ecm_src_install() { cmake_src_install # bug 621970 - if [[ ${EAPI} != 7 ]]; then - if [[ -d "${ED}"/usr/share/applications ]]; then - local f - for f in "${ED}"/usr/share/applications/*.desktop; do - if [[ -x ${f} ]]; then - einfo "Removing executable bit from ${f#${ED}}" - fperms a-x "${f#${ED}}" - fi - done - fi + if [[ -d "${ED}"/usr/share/applications ]]; then + local f + for f in "${ED}"/usr/share/applications/*.desktop; do + if [[ -x ${f} ]]; then + einfo "Removing executable bit from ${f#${ED}}" + fperms a-x "${f#${ED}}" + fi + done fi } @@ -691,8 +689,4 @@ 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 +EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test src_install pkg_preinst pkg_postinst pkg_postrm