1 |
This replaces the indirect dependency on virtual/emacs. |
2 |
|
3 |
Update pkg_setup() to call elisp-check-emacs-version instead of the |
4 |
now deprecated elisp-need-emacs. |
5 |
|
6 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
7 |
--- |
8 |
eclass/elisp.eclass | 15 +++++---------- |
9 |
1 file changed, 5 insertions(+), 10 deletions(-) |
10 |
|
11 |
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass |
12 |
index df160ea01e2..2b50111a535 100644 |
13 |
--- a/eclass/elisp.eclass |
14 |
+++ b/eclass/elisp.eclass |
15 |
@@ -30,8 +30,8 @@ |
16 |
# @DEFAULT_UNSET |
17 |
# @DESCRIPTION: |
18 |
# If you need anything different from Emacs 23, use the NEED_EMACS |
19 |
-# variable before inheriting elisp.eclass. Set it to the major version |
20 |
-# your package uses and the dependency will be adjusted. |
21 |
+# variable before inheriting elisp.eclass. Set it to the version your |
22 |
+# package uses and the dependency will be adjusted. |
23 |
|
24 |
# @ECLASS-VARIABLE: ELISP_PATCHES |
25 |
# @DEFAULT_UNSET |
26 |
@@ -70,7 +70,7 @@ esac |
27 |
EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ |
28 |
pkg_{setup,postinst,postrm} |
29 |
|
30 |
-RDEPEND=">=virtual/emacs-${NEED_EMACS:-23}" |
31 |
+RDEPEND=">=app-editors/emacs-${NEED_EMACS}:*" |
32 |
case ${EAPI} in |
33 |
4|5|6) DEPEND="${RDEPEND}" ;; |
34 |
*) BDEPEND="${RDEPEND}" ;; |
35 |
@@ -78,16 +78,11 @@ esac |
36 |
|
37 |
# @FUNCTION: elisp_pkg_setup |
38 |
# @DESCRIPTION: |
39 |
-# Test if the eselected Emacs version is sufficient to fulfil the major |
40 |
+# Test if the eselected Emacs version is sufficient to fulfil the |
41 |
# version requirement of the NEED_EMACS variable. |
42 |
|
43 |
elisp_pkg_setup() { |
44 |
- elisp-need-emacs "${NEED_EMACS:-23}" |
45 |
- case $? in |
46 |
- 0) ;; |
47 |
- 1) die "Emacs version too low" ;; |
48 |
- *) die "Could not determine Emacs version" ;; |
49 |
- esac |
50 |
+ elisp-check-emacs-version |
51 |
} |
52 |
|
53 |
# @FUNCTION: elisp_src_unpack |
54 |
-- |
55 |
2.24.1 |