| 1 |
commit: 32537869bbf98938b76ecd31eea0ffd64cded99e |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 20 15:31:40 2015 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 20 15:35:20 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/emacs.git/commit/?id=32537869 |
| 7 |
|
| 8 |
elisp*.eclass: Merge changes from Portage tree. |
| 9 |
|
| 10 |
eclass/ChangeLog | 4 ++++ |
| 11 |
eclass/elisp-common.eclass | 2 +- |
| 12 |
eclass/elisp.eclass | 43 +++++++++++++++++++++++++++++-------------- |
| 13 |
3 files changed, 34 insertions(+), 15 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/ChangeLog b/eclass/ChangeLog |
| 16 |
index 3cfdab5..087edf2 100644 |
| 17 |
--- a/eclass/ChangeLog |
| 18 |
+++ b/eclass/ChangeLog |
| 19 |
@@ -1,3 +1,7 @@ |
| 20 |
+2015-12-20 Ulrich Müller <ulm@g.o> |
| 21 |
+ |
| 22 |
+ * elisp.eclass: Support EAPI 6. |
| 23 |
+ |
| 24 |
2015-05-25 Ulrich Müller <ulm@g.o> |
| 25 |
|
| 26 |
* elisp-common.eclass (elisp-site-file-install): Fix filename |
| 27 |
|
| 28 |
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass |
| 29 |
index 4ccbfb1..1517788 100644 |
| 30 |
--- a/eclass/elisp-common.eclass |
| 31 |
+++ b/eclass/elisp-common.eclass |
| 32 |
@@ -1,6 +1,6 @@ |
| 33 |
# Copyright 1999-2015 Gentoo Foundation |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
-# $Header: $ |
| 36 |
+# $Id$ |
| 37 |
# |
| 38 |
# @ECLASS: elisp-common.eclass |
| 39 |
# @MAINTAINER: |
| 40 |
|
| 41 |
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass |
| 42 |
index c24613b..93a7d4b 100644 |
| 43 |
--- a/eclass/elisp.eclass |
| 44 |
+++ b/eclass/elisp.eclass |
| 45 |
@@ -1,6 +1,6 @@ |
| 46 |
# Copyright 1999-2015 Gentoo Foundation |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
-# $Header: $ |
| 49 |
+# $Id$ |
| 50 |
# |
| 51 |
# @ECLASS: elisp.eclass |
| 52 |
# @MAINTAINER: |
| 53 |
@@ -65,13 +65,21 @@ |
| 54 |
# DOCS="blah.txt ChangeLog" is automatically used to install the given |
| 55 |
# files by dodoc in src_install(). |
| 56 |
|
| 57 |
-inherit elisp-common eutils |
| 58 |
- |
| 59 |
-case "${EAPI:-0}" in |
| 60 |
- 0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \ |
| 61 |
- pkg_{setup,postinst,postrm} ;; |
| 62 |
- *) EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ |
| 63 |
- pkg_{setup,postinst,postrm} ;; |
| 64 |
+inherit elisp-common |
| 65 |
+ |
| 66 |
+case ${EAPI:-0} in |
| 67 |
+ 0|1) |
| 68 |
+ inherit eutils |
| 69 |
+ EXPORT_FUNCTIONS src_{unpack,compile,install} \ |
| 70 |
+ pkg_{setup,postinst,postrm} ;; |
| 71 |
+ 2|3|4|5) |
| 72 |
+ inherit eutils |
| 73 |
+ EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ |
| 74 |
+ pkg_{setup,postinst,postrm} ;; |
| 75 |
+ 6) |
| 76 |
+ EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ |
| 77 |
+ pkg_{setup,postinst,postrm} ;; |
| 78 |
+ *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; |
| 79 |
esac |
| 80 |
|
| 81 |
DEPEND=">=virtual/emacs-${NEED_EMACS:-23}" |
| 82 |
@@ -105,7 +113,7 @@ elisp_src_unpack() { |
| 83 |
[[ -d ${S} ]] || S=${WORKDIR} |
| 84 |
fi |
| 85 |
|
| 86 |
- case "${EAPI:-0}" in |
| 87 |
+ case ${EAPI:-0} in |
| 88 |
0|1) [[ -d ${S} ]] && cd "${S}" |
| 89 |
elisp_src_prepare ;; |
| 90 |
esac |
| 91 |
@@ -117,21 +125,28 @@ elisp_src_unpack() { |
| 92 |
# for in the current working dir, WORKDIR, and FILESDIR. |
| 93 |
|
| 94 |
elisp_src_prepare() { |
| 95 |
- local patch |
| 96 |
+ local patch file |
| 97 |
for patch in ${ELISP_PATCHES}; do |
| 98 |
if [[ -f ${patch} ]]; then |
| 99 |
- epatch "${patch}" |
| 100 |
+ file="${patch}" |
| 101 |
elif [[ -f ${WORKDIR}/${patch} ]]; then |
| 102 |
- epatch "${WORKDIR}/${patch}" |
| 103 |
+ file="${WORKDIR}/${patch}" |
| 104 |
elif [[ -f ${FILESDIR}/${patch} ]]; then |
| 105 |
- epatch "${FILESDIR}/${patch}" |
| 106 |
+ file="${FILESDIR}/${patch}" |
| 107 |
else |
| 108 |
die "Cannot find ${patch}" |
| 109 |
fi |
| 110 |
+ case ${EAPI:-0} in |
| 111 |
+ 0|1|2|3|4|5) epatch "${file}" ;; |
| 112 |
+ 6) eapply "${file}" ;; |
| 113 |
+ esac |
| 114 |
done |
| 115 |
|
| 116 |
# apply any user patches |
| 117 |
- epatch_user |
| 118 |
+ case ${EAPI:-0} in |
| 119 |
+ 0|1|2|3|4|5) epatch_user ;; |
| 120 |
+ 6) eapply_user ;; |
| 121 |
+ esac |
| 122 |
|
| 123 |
if [[ -n ${ELISP_REMOVE} ]]; then |
| 124 |
rm ${ELISP_REMOVE} || die |
Archives