Re: [gentoo-dev] [PATCH] rpm.eclass: use BDEPEND for EAPI 7

2020-04-18 Thread James Le Cuirot
On Sat, 18 Apr 2020 11:15:49 -0400
David Michael  wrote:

> The build system's rpm2tar command is executed during unpack, so it
> must be install in /.
> 
> Signed-off-by: David Michael 
> ---
> 
> This patch fixes failures like this:
> >>> Unpacking source...
> >>> Unpacking urw-fonts-2.4-9.fc13.src.rpm to 
> /var/tmp/portage/media-fonts/urw-fonts-2.4.9/work  
> /var/tmp/portage/media-fonts/urw-fonts-2.4.9/temp/environment: line 850: 
> rpm2tar: command not found
> 
>  eclass/rpm.eclass | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
> index 3a29c7e9f76..d27f0a386c7 100644
> --- a/eclass/rpm.eclass
> +++ b/eclass/rpm.eclass
> @@ -8,7 +8,10 @@
>  
>  inherit estack eutils
>  
> -DEPEND=">=app-arch/rpm2targz-9.0.0.3g"  
> +case "${EAPI:-0}" in
> + [0-6]) DEPEND=">=app-arch/rpm2targz-9.0.0.3g" ;;
> + *) BDEPEND=">=app-arch/rpm2targz-9.0.0.3g" ;;
> +esac
>  
>  # @FUNCTION: rpm_unpack
>  # @USAGE: 

+1

-- 
James Le Cuirot (chewi)
Gentoo Linux Developer


pgpmzAsPzo17I.pgp
Description: OpenPGP digital signature


[gentoo-dev] [PATCH] rpm.eclass: use BDEPEND for EAPI 7

2020-04-18 Thread David Michael
The build system's rpm2tar command is executed during unpack, so it
must be install in /.

Signed-off-by: David Michael 
---

This patch fixes failures like this:
>>> Unpacking source...
>>> Unpacking urw-fonts-2.4-9.fc13.src.rpm to 
/var/tmp/portage/media-fonts/urw-fonts-2.4.9/work
/var/tmp/portage/media-fonts/urw-fonts-2.4.9/temp/environment: line 850: 
rpm2tar: command not found

 eclass/rpm.eclass | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
index 3a29c7e9f76..d27f0a386c7 100644
--- a/eclass/rpm.eclass
+++ b/eclass/rpm.eclass
@@ -8,7 +8,10 @@
 
 inherit estack eutils
 
-DEPEND=">=app-arch/rpm2targz-9.0.0.3g"
+case "${EAPI:-0}" in
+   [0-6]) DEPEND=">=app-arch/rpm2targz-9.0.0.3g" ;;
+   *) BDEPEND=">=app-arch/rpm2targz-9.0.0.3g" ;;
+esac
 
 # @FUNCTION: rpm_unpack
 # @USAGE: 
-- 
2.21.1