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 6B0E9158008 for ; Fri, 16 Jun 2023 08:20:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84F7CE0953; Fri, 16 Jun 2023 08:20:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 41C36E094E for ; Fri, 16 Jun 2023 08:20:25 +0000 (UTC) From: =?UTF-8?q?Ulrich=20M=C3=BCller?= To: gentoo-dev@lists.gentoo.org Cc: base-system@gentoo.org, =?UTF-8?q?Ulrich=20M=C3=BCller?= Subject: [gentoo-dev] [PATCH 1/2] rpm.eclass: Drop support for EAPI 5 Date: Fri, 16 Jun 2023 10:20:04 +0200 Message-ID: <20230616082013.5360-1-ulm@gentoo.org> X-Mailer: git-send-email 2.41.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 09d2f64b-18e4-4aa0-aef6-b34d7e9639e7 X-Archives-Hash: 288311679fbe396c54317ab35402c866 Signed-off-by: Ulrich Müller --- eclass/rpm.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass index c97e23144c2b..d03493466e1e 100644 --- a/eclass/rpm.eclass +++ b/eclass/rpm.eclass @@ -1,14 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rpm.eclass # @MAINTAINER: # base-system@gentoo.org -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: convenience class for extracting RPMs case ${EAPI} in - 5|6) inherit epatch eutils ;; # eutils for eqawarn + 6) inherit epatch eutils ;; # eutils for eqawarn 7) inherit eutils ;; # not needed, but ebuilds may still rely on it 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; @@ -20,7 +20,7 @@ _RPM_ECLASS=1 inherit estack case ${EAPI} in - 5|6) DEPEND="app-arch/rpm2targz" ;; + 6) DEPEND="app-arch/rpm2targz" ;; *) BDEPEND="app-arch/rpm2targz" ;; esac @@ -98,7 +98,7 @@ rpm_src_unpack() { # files around, well this won't handle that. rpm_spec_epatch() { # no epatch in EAPI 7 and later - [[ ${EAPI} == [56] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}" + [[ ${EAPI} == 6 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}" local p spec=$1 local dir -- 2.41.0