1 |
commit: e543d9d8a52e29dd939f425ba6d947754f4b59b4 |
2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
3 |
AuthorDate: Tue Jan 1 22:19:41 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 11 17:14:03 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e543d9d8 |
7 |
|
8 |
xdg.eclass: enable EAPI 7 |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman 2.3.11 |
11 |
Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com> |
12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
13 |
|
14 |
eclass/xdg.eclass | 6 +++--- |
15 |
1 file changed, 3 insertions(+), 3 deletions(-) |
16 |
|
17 |
diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass |
18 |
index 967a9fd023f..219be712e84 100644 |
19 |
--- a/eclass/xdg.eclass |
20 |
+++ b/eclass/xdg.eclass |
21 |
@@ -6,7 +6,7 @@ |
22 |
# freedesktop-bugs@g.o |
23 |
# @AUTHOR: |
24 |
# Original author: Gilles Dartiguelongue <eva@g.o> |
25 |
-# @SUPPORTED_EAPIS: 4 5 6 |
26 |
+# @SUPPORTED_EAPIS: 4 5 6 7 |
27 |
# @BLURB: Provides phases for XDG compliant packages. |
28 |
# @DESCRIPTION: |
29 |
# Utility eclass to update the desktop, icon and shared mime info as laid |
30 |
@@ -15,7 +15,7 @@ |
31 |
inherit xdg-utils |
32 |
|
33 |
case "${EAPI:-0}" in |
34 |
- 4|5|6) |
35 |
+ 4|5|6|7) |
36 |
EXPORT_FUNCTIONS src_prepare pkg_preinst pkg_postinst pkg_postrm |
37 |
;; |
38 |
*) die "EAPI=${EAPI} is not supported" ;; |
39 |
@@ -35,7 +35,7 @@ fi |
40 |
xdg_src_prepare() { |
41 |
xdg_environment_reset |
42 |
|
43 |
- has ${EAPI:-0} 6 && default |
44 |
+ [[ ${EAPI:-0} != [45] ]] && default |
45 |
} |
46 |
|
47 |
# @FUNCTION: xdg_pkg_preinst |