public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: base-system@gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Subject: [gentoo-dev] [PATCH 1/2] rpm.eclass: Drop support for EAPI 5
Date: Fri, 16 Jun 2023 10:20:04 +0200	[thread overview]
Message-ID: <20230616082013.5360-1-ulm@gentoo.org> (raw)

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 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



             reply	other threads:[~2023-06-16  8:20 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-16  8:20 Ulrich Müller [this message]
2023-06-16  8:20 ` [gentoo-dev] [PATCH 2/2] rpm.eclass: Don't inherit eutils in EAPI 7 Ulrich Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230616082013.5360-1-ulm@gentoo.org \
    --to=ulm@gentoo.org \
    --cc=base-system@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox