Re: [gentoo-dev] [PATCH 5/5] xdg.eclass: support EAPI 7

[Ulrich Mueller]

> On Mon, 01 Oct 2018, Mike Gilbert wrote:

> @@ -15,7 +15,7 @@
>  inherit xdg-utils
 
>  case "${EAPI:-0}" in

This was there before your change, but the ":-0" isn't needed here ...

> - 4|5|6)
> + 4|5|6|7)
>   EXPORT_FUNCTIONS src_prepare pkg_preinst pkg_postinst pkg_postrm
>   ;;
>   *) die "EAPI=${EAPI} is not supported" ;;

... while this line could profit from it.

> @@ -35,7 +35,7 @@ fi
>  xdg_src_prepare() {
>   xdg_environment_reset
>  
> - has ${EAPI:-0} 6 && default
> + has "${EAPI:-0}" 4 5 || default

Ditto.

Ulrich


signature.asc
Description: PGP signature

[gentoo-dev] [PATCH 5/5] xdg.eclass: support EAPI 7

[Mike Gilbert]

Signed-off-by: Mike Gilbert 
---
 eclass/xdg.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
index 4f4a38b05cb3..cca9b34df957 100644
--- a/eclass/xdg.eclass
+++ b/eclass/xdg.eclass
@@ -6,7 +6,7 @@
 # freedesktop-b...@gentoo.org
 # @AUTHOR:
 # Original author: Gilles Dartiguelongue 
-# @SUPPORTED_EAPIS: 4 5 6
+# @SUPPORTED_EAPIS: 4 5 6 7
 # @BLURB: Provides phases for XDG compliant packages.
 # @DESCRIPTION:
 # Utility eclass to update the desktop and shared mime info as laid
@@ -15,7 +15,7 @@
 inherit xdg-utils
 
 case "${EAPI:-0}" in
-   4|5|6)
+   4|5|6|7)
EXPORT_FUNCTIONS src_prepare pkg_preinst pkg_postinst pkg_postrm
;;
*) die "EAPI=${EAPI} is not supported" ;;
@@ -35,7 +35,7 @@ fi
 xdg_src_prepare() {
xdg_environment_reset
 
-   has ${EAPI:-0} 6 && default
+   has "${EAPI:-0}" 4 5 || default
 }
 
 # @FUNCTION: xdg_pkg_preinst
-- 
2.19.0