Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH] elisp.eclass: Depend on virtual/emacs on the build system.
Date: Fri, 01 Jun 2018 17:19:34
Message-Id: 23313.32794.562102.225253@a1i15.kph.uni-mainz.de
1 For byte-compilation, Emacs is required to run on the native
2 build system. Therefore BDEPEND on virtual/emacs in EAPI 7.
3
4 Reorganise EAPI conditionals to be more compact.
5 ---
6 eclass/elisp.eclass | 24 ++++++++++++------------
7 1 file changed, 12 insertions(+), 12 deletions(-)
8
9 diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
10 index 9a66ec58ce50..0f07a3ef1f7e 100644
11 --- a/eclass/elisp.eclass
12 +++ b/eclass/elisp.eclass
13 @@ -65,24 +65,24 @@
14 # files by dodoc in src_install().
15
16 inherit elisp-common
17 +case ${EAPI:-0} in
18 + 0|1|2|3|4|5) inherit epatch ;;
19 + 6|7) ;;
20 + *) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
21 +esac
22
23 case ${EAPI:-0} in
24 - 0|1)
25 - inherit epatch
26 - EXPORT_FUNCTIONS src_{unpack,compile,install} \
27 - pkg_{setup,postinst,postrm} ;;
28 - 2|3|4|5)
29 - inherit epatch
30 - EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
31 + 0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \
32 pkg_{setup,postinst,postrm} ;;
33 - 6|7)
34 - EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
35 + *) EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
36 pkg_{setup,postinst,postrm} ;;
37 - *) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
38 esac
39
40 -DEPEND=">=virtual/emacs-${NEED_EMACS:-23}"
41 -RDEPEND="${DEPEND}"
42 +RDEPEND=">=virtual/emacs-${NEED_EMACS:-23}"
43 +case ${EAPI:-0} in
44 + 0|1|2|3|4|5|6) DEPEND="${RDEPEND}" ;;
45 + *) BDEPEND="${RDEPEND}" ;;
46 +esac
47
48 # @FUNCTION: elisp_pkg_setup
49 # @DESCRIPTION:
50 --
51 2.17.1