public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Mike Gilbert <floppym@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: freedesktop-bugs@gentoo.org
Subject: [gentoo-dev] [PATCH 5/5] xdg.eclass: support EAPI 7
Date: Sun, 30 Sep 2018 18:50:35 -0400	[thread overview]
Message-ID: <20180930225035.25434-5-floppym@gentoo.org> (raw)
In-Reply-To: <20180930225035.25434-1-floppym@gentoo.org>

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 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-bugs@gentoo.org
 # @AUTHOR:
 # Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @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



  parent reply	other threads:[~2018-09-30 22:51 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-30 22:50 [gentoo-dev] [PATCH 1/5] xdg-utils.eclass: avoid duplicate leading slashes Mike Gilbert
2018-09-30 22:50 ` [gentoo-dev] [PATCH 2/5] xdg-utils.eclass: support EAPI 7 Mike Gilbert
2018-09-30 22:50 ` [gentoo-dev] [PATCH 3/5] xdg.eclass: move deps to RDEPEND Mike Gilbert
2018-10-01  5:40   ` [gentoo-dev] " Rémi Cardona
2018-10-01 12:27     ` Gilles Dartiguelongue
2018-10-01 13:00       ` Mike Gilbert
2018-10-01 13:17         ` James Le Cuirot
2018-10-01 14:08           ` Mike Gilbert
2018-10-02  2:14             ` Marty E. Plummer
2018-10-03  2:22               ` Mike Gilbert
2018-10-03  7:12                 ` Andreas Sturmlechner
2018-10-03 13:23               ` Mike Gilbert
2018-09-30 22:50 ` [gentoo-dev] [PATCH 4/5] xdg.eclass: look for files in ED and cleanup array syntax Mike Gilbert
2018-09-30 22:50 ` Mike Gilbert [this message]
2018-10-01  6:10   ` [gentoo-dev] [PATCH 5/5] xdg.eclass: support EAPI 7 Ulrich Mueller

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=20180930225035.25434-5-floppym@gentoo.org \
    --to=floppym@gentoo.org \
    --cc=freedesktop-bugs@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