Gentoo Archives: gentoo-dev

From: David Michael <fedora.dm0@×××××.com>
To: gentoo-dev@l.g.o
Cc: base-system@g.o
Subject: [gentoo-dev] Re: [PATCH] rpm.eclass: use BDEPEND for EAPI 7
Date: Mon, 20 Apr 2020 14:17:15
Message-Id: CAEvUa7=dV5GCgsaTTABfX570eNiFeojEeaaVyK84k-x=WdUfEw@mail.gmail.com
In Reply to: [gentoo-dev] [PATCH] rpm.eclass: use BDEPEND for EAPI 7 by David Michael
1 On Sat, Apr 18, 2020 at 11:15 AM David Michael <fedora.dm0@×××××.com> wrote:
2 > The build system's rpm2tar command is executed during unpack, so it
3 > must be install in /.
4 >
5 > Signed-off-by: David Michael <fedora.dm0@×××××.com>
6 > ---
7 >
8 > This patch fixes failures like this:
9 > >>> Unpacking source...
10 > >>> Unpacking urw-fonts-2.4-9.fc13.src.rpm to /var/tmp/portage/media-fonts/urw-fonts-2.4.9/work
11 > /var/tmp/portage/media-fonts/urw-fonts-2.4.9/temp/environment: line 850: rpm2tar: command not found
12 >
13 > eclass/rpm.eclass | 5 ++++-
14 > 1 file changed, 4 insertions(+), 1 deletion(-)
15 >
16 > diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
17 > index 3a29c7e9f76..d27f0a386c7 100644
18 > --- a/eclass/rpm.eclass
19 > +++ b/eclass/rpm.eclass
20 > @@ -8,7 +8,10 @@
21 >
22 > inherit estack eutils
23 >
24 > -DEPEND=">=app-arch/rpm2targz-9.0.0.3g"
25 > +case "${EAPI:-0}" in
26 > + [0-6]) DEPEND=">=app-arch/rpm2targz-9.0.0.3g" ;;
27 > + *) BDEPEND=">=app-arch/rpm2targz-9.0.0.3g" ;;
28 > +esac
29 >
30 > # @FUNCTION: rpm_unpack
31 > # @USAGE: <rpms>
32 > --
33 > 2.21.1
34
35 Can someone apply this?