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 30753138334 for ; Mon, 11 Feb 2019 17:18:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 241D8E084A; Mon, 11 Feb 2019 17:18:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 ED06FE084A for ; Mon, 11 Feb 2019 17:18:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B936D335D7D for ; Mon, 11 Feb 2019 17:18:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 567BF542 for ; Mon, 11 Feb 2019 17:18:51 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1549905243.e543d9d8a52e29dd939f425ba6d947754f4b59b4.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/xdg.eclass X-VCS-Directories: eclass/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: e543d9d8a52e29dd939f425ba6d947754f4b59b4 X-VCS-Branch: master Date: Mon, 11 Feb 2019 17:18:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a60afaf0-0cb2-48bd-9f20-521acd77538e X-Archives-Hash: 37c8efd4f539827d819ce7d004640b8a commit: e543d9d8a52e29dd939f425ba6d947754f4b59b4 Author: Marty E. Plummer startmail com> AuthorDate: Tue Jan 1 22:19:41 2019 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Mon Feb 11 17:14:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e543d9d8 xdg.eclass: enable EAPI 7 Package-Manager: Portage-2.3.51, Repoman 2.3.11 Signed-off-by: Marty E. Plummer startmail.com> Signed-off-by: Mart Raudsepp gentoo.org> eclass/xdg.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass index 967a9fd023f..219be712e84 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, icon 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 + [[ ${EAPI:-0} != [45] ]] && default } # @FUNCTION: xdg_pkg_preinst