[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ulrich Müller]

commit:     4e64b46923a18a5804012e1c164e274b0f77f831
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 09:43:08 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 09:44:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e64b469

elisp-common.eclass: Fix QA warning in elisp-site-file-install.

Thanks to ago for pointing this out.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 eclass/elisp-common.eclass | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index e6346d43ccf..66a3a325e67 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -407,9 +407,12 @@ elisp-site-file-install() {
        sf="${T}/${sf}"
        ebegin "Installing site initialisation file for GNU Emacs"
        [[ $1 = "${sf}" ]] || cp "$1" "${sf}"
-       [[ ${EAPI} == [45] ]] && grep -q "@EMACSMODULES@" "${sf}" \
-               && die "${ECLASS}: Dynamic modules not supported in EAPI 
${EAPI}"
-       modules=${EMACSMODULES//@libdir@/$(get_libdir)}
+       if [[ ${EAPI} == [45] ]]; then
+               grep -q "@EMACSMODULES@" "${sf}" \
+                       && die "${ECLASS}: Dynamic modules not supported in 
EAPI ${EAPI}"
+       else
+               modules=${EMACSMODULES//@libdir@/$(get_libdir)}
+       fi
        sed -i -e 
"1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \
                -e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_pn}:g" \
                -e "s:@SITEETC@:${EPREFIX}${SITEETC}/${my_pn}:g" \