[gentoo-commits] proj/lisp:master commit in: eclass/

[José María Alonso]

commit:     db532929210df5e4625730eff0c617629c09a7df
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 14:40:42 2018 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 14:40:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=db532929

elisp.eclass: Sync with main repo

 eclass/elisp.eclass | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 4447f125..0f07a3ef 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -65,24 +65,24 @@
 # files by dodoc in src_install().
 
 inherit elisp-common
+case ${EAPI:-0} in
+       0|1|2|3|4|5) inherit epatch ;;
+       6|7) ;;
+       *) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
+esac
 
 case ${EAPI:-0} in
-       0|1)
-               inherit epatch
-               EXPORT_FUNCTIONS src_{unpack,compile,install} \
-                       pkg_{setup,postinst,postrm} ;;
-       2|3|4|5)
-               inherit epatch
-               EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} 
\
+       0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \
                        pkg_{setup,postinst,postrm} ;;
-       6|7)
-               EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} 
\
+       *) 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}"
-RDEPEND="${DEPEND}"
+RDEPEND=">=virtual/emacs-${NEED_EMACS:-23}"
+case ${EAPI:-0} in
+       0|1|2|3|4|5|6) DEPEND="${RDEPEND}" ;;
+       *) BDEPEND="${RDEPEND}" ;;
+esac
 
 # @FUNCTION: elisp_pkg_setup
 # @DESCRIPTION:
@@ -137,14 +137,14 @@ elisp_src_prepare() {
                fi
                case ${EAPI:-0} in
                        0|1|2|3|4|5) epatch "${file}" ;;
-                       6) eapply "${file}" ;;
+                       *) eapply "${file}" ;;
                esac
        done
 
        # apply any user patches
        case ${EAPI:-0} in
                0|1|2|3|4|5) epatch_user ;;
-               6) eapply_user ;;
+               *) eapply_user ;;
        esac
 
        if [[ -n ${ELISP_REMOVE} ]]; then