From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D73F1138334 for ; Sun, 30 Sep 2018 22:51:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B834E08AD; Sun, 30 Sep 2018 22:50:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1656E08AA for ; Sun, 30 Sep 2018 22:50:41 +0000 (UTC) Received: from naomi.gilbertsystems.net (d192-24-229-26.try.wideopenwest.com [24.192.26.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: floppym) by smtp.gentoo.org (Postfix) with ESMTPSA id AE07B335CEB; Sun, 30 Sep 2018 22:50:40 +0000 (UTC) From: Mike Gilbert 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 Message-Id: <20180930225035.25434-5-floppym@gentoo.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180930225035.25434-1-floppym@gentoo.org> References: <20180930225035.25434-1-floppym@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: ed8e826a-3301-4ec6-9a80-ac697a1d9853 X-Archives-Hash: bac9c675ec2fb1e1eacd283bd1c7925b 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-bugs@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