Nothing exciting there, basically s/epatch/eapply/ and don't inherit eutils in EAPI 6.
I'll commit this tomorrow unless someone will point out a bug. Ulrich From 37929a17e2e3977b6f811915e6ef23f557c0f241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <[email protected]> Date: Sat, 19 Dec 2015 13:08:36 +0100 Subject: [PATCH] elisp.eclass: Support EAPI 6. --- eclass/elisp.eclass | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 1178880..93a7d4b 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -65,13 +65,21 @@ # DOCS="blah.txt ChangeLog" is automatically used to install the given # files by dodoc in src_install(). -inherit elisp-common eutils +inherit elisp-common case ${EAPI:-0} in - 0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \ - pkg_{setup,postinst,postrm} ;; - *) EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ - pkg_{setup,postinst,postrm} ;; + 0|1) + inherit eutils + EXPORT_FUNCTIONS src_{unpack,compile,install} \ + pkg_{setup,postinst,postrm} ;; + 2|3|4|5) + inherit eutils + EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ + pkg_{setup,postinst,postrm} ;; + 6) + EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ + pkg_{setup,postinst,postrm} ;; + *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; esac DEPEND=">=virtual/emacs-${NEED_EMACS:-23}" @@ -117,21 +125,28 @@ elisp_src_unpack() { # for in the current working dir, WORKDIR, and FILESDIR. elisp_src_prepare() { - local patch + local patch file for patch in ${ELISP_PATCHES}; do if [[ -f ${patch} ]]; then - epatch "${patch}" + file="${patch}" elif [[ -f ${WORKDIR}/${patch} ]]; then - epatch "${WORKDIR}/${patch}" + file="${WORKDIR}/${patch}" elif [[ -f ${FILESDIR}/${patch} ]]; then - epatch "${FILESDIR}/${patch}" + file="${FILESDIR}/${patch}" else die "Cannot find ${patch}" fi + case ${EAPI:-0} in + 0|1|2|3|4|5) epatch "${file}" ;; + 6) eapply "${file}" ;; + esac done # apply any user patches - epatch_user + case ${EAPI:-0} in + 0|1|2|3|4|5) epatch_user ;; + 6) eapply_user ;; + esac if [[ -n ${ELISP_REMOVE} ]]; then rm ${ELISP_REMOVE} || die -- 2.6.4
pgpIH3NldUEXn.pgp
Description: PGP signature
