* [gentoo-dev] [PATCH 1/2] rpm.eclass: Drop support for EAPI 5
@ 2023-06-16 8:20 Ulrich Müller
2023-06-16 8:20 ` [gentoo-dev] [PATCH 2/2] rpm.eclass: Don't inherit eutils in EAPI 7 Ulrich Müller
0 siblings, 1 reply; 2+ messages in thread
From: Ulrich Müller @ 2023-06-16 8:20 UTC (permalink / raw
To: gentoo-dev; +Cc: base-system, Ulrich Müller
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-dev] [PATCH 2/2] rpm.eclass: Don't inherit eutils in EAPI 7
2023-06-16 8:20 [gentoo-dev] [PATCH 1/2] rpm.eclass: Drop support for EAPI 5 Ulrich Müller
@ 2023-06-16 8:20 ` Ulrich Müller
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2023-06-16 8:20 UTC (permalink / raw
To: gentoo-dev; +Cc: base-system, Ulrich Müller
None of the ebuilds inheriting rpm in EAPI 7 needs any of the remaining
eutils features.
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
eclass/rpm.eclass | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
index d03493466e1e..d8bb0ad2814d 100644
--- a/eclass/rpm.eclass
+++ b/eclass/rpm.eclass
@@ -9,8 +9,7 @@
case ${EAPI} in
6) inherit epatch eutils ;; # eutils for eqawarn
- 7) inherit eutils ;; # not needed, but ebuilds may still rely on it
- 8) ;;
+ 7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
--
2.41.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-16 8:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-16 8:20 [gentoo-dev] [PATCH 1/2] rpm.eclass: Drop support for EAPI 5 Ulrich Müller
2023-06-16 8:20 ` [gentoo-dev] [PATCH 2/2] rpm.eclass: Don't inherit eutils in EAPI 7 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox