| 1 |
commit: 06c1c0f8718db24298c7868f65bf133577988584 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 17 21:27:07 2019 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 17 21:27:07 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=06c1c0f8 |
| 7 |
|
| 8 |
elisp.eclass: Sync from gentoo repo. |
| 9 |
|
| 10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/elisp.eclass | 35 +++++++++++++---------------------- |
| 13 |
1 file changed, 13 insertions(+), 22 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass |
| 16 |
index 0f07a3e..c885345 100644 |
| 17 |
--- a/eclass/elisp.eclass |
| 18 |
+++ b/eclass/elisp.eclass |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 1999-2018 Gentoo Foundation |
| 21 |
+# Copyright 1999-2019 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
# @ECLASS: elisp.eclass |
| 25 |
@@ -9,6 +9,7 @@ |
| 26 |
# Jeremy Maitin-Shepard <jbms@×××××.com> |
| 27 |
# Christian Faulhammer <fauli@g.o> |
| 28 |
# Ulrich Müller <ulm@g.o> |
| 29 |
+# @SUPPORTED_EAPIS: 4 5 6 7 |
| 30 |
# @BLURB: Eclass for Emacs Lisp packages |
| 31 |
# @DESCRIPTION: |
| 32 |
# |
| 33 |
@@ -66,21 +67,17 @@ |
| 34 |
|
| 35 |
inherit elisp-common |
| 36 |
case ${EAPI:-0} in |
| 37 |
- 0|1|2|3|4|5) inherit epatch ;; |
| 38 |
+ 4|5) inherit epatch ;; |
| 39 |
6|7) ;; |
| 40 |
- *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; |
| 41 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 42 |
esac |
| 43 |
|
| 44 |
-case ${EAPI:-0} in |
| 45 |
- 0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \ |
| 46 |
- pkg_{setup,postinst,postrm} ;; |
| 47 |
- *) EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ |
| 48 |
- pkg_{setup,postinst,postrm} ;; |
| 49 |
-esac |
| 50 |
+EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ |
| 51 |
+ pkg_{setup,postinst,postrm} |
| 52 |
|
| 53 |
RDEPEND=">=virtual/emacs-${NEED_EMACS:-23}" |
| 54 |
-case ${EAPI:-0} in |
| 55 |
- 0|1|2|3|4|5|6) DEPEND="${RDEPEND}" ;; |
| 56 |
+case ${EAPI} in |
| 57 |
+ 4|5|6) DEPEND="${RDEPEND}" ;; |
| 58 |
*) BDEPEND="${RDEPEND}" ;; |
| 59 |
esac |
| 60 |
|
| 61 |
@@ -101,8 +98,7 @@ elisp_pkg_setup() { |
| 62 |
# @FUNCTION: elisp_src_unpack |
| 63 |
# @DESCRIPTION: |
| 64 |
# Unpack the sources; also handle the case of a single *.el file in |
| 65 |
-# WORKDIR for packages distributed that way. For EAPIs without |
| 66 |
-# src_prepare, call elisp_src_prepare. |
| 67 |
+# WORKDIR for packages distributed that way. |
| 68 |
|
| 69 |
elisp_src_unpack() { |
| 70 |
[[ -n ${A} ]] && unpack ${A} |
| 71 |
@@ -111,11 +107,6 @@ elisp_src_unpack() { |
| 72 |
mv ${P}.el ${PN}.el || die |
| 73 |
[[ -d ${S} ]] || S=${WORKDIR} |
| 74 |
fi |
| 75 |
- |
| 76 |
- case ${EAPI:-0} in |
| 77 |
- 0|1) [[ -d ${S} ]] && cd "${S}" |
| 78 |
- elisp_src_prepare ;; |
| 79 |
- esac |
| 80 |
} |
| 81 |
|
| 82 |
# @FUNCTION: elisp_src_prepare |
| 83 |
@@ -135,15 +126,15 @@ elisp_src_prepare() { |
| 84 |
else |
| 85 |
die "Cannot find ${patch}" |
| 86 |
fi |
| 87 |
- case ${EAPI:-0} in |
| 88 |
- 0|1|2|3|4|5) epatch "${file}" ;; |
| 89 |
+ case ${EAPI} in |
| 90 |
+ 4|5) epatch "${file}" ;; |
| 91 |
*) eapply "${file}" ;; |
| 92 |
esac |
| 93 |
done |
| 94 |
|
| 95 |
# apply any user patches |
| 96 |
- case ${EAPI:-0} in |
| 97 |
- 0|1|2|3|4|5) epatch_user ;; |
| 98 |
+ case ${EAPI} in |
| 99 |
+ 4|5) epatch_user ;; |
| 100 |
*) eapply_user ;; |
| 101 |
esac |
Archives