From 6cb5c28ebe2d41da07fd7bcf217a68eb84ee2efd Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Thu, 22 Feb 2018 14:24:43 +0100 Subject: elisp*.eclass: Sync from gentoo repo. --- eclass/elisp-common.eclass | 4 ++-- eclass/elisp.eclass | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index 3b9a4a3..05b03f4 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# + # @ECLASS: elisp-common.eclass # @MAINTAINER: # Gentoo GNU Emacs project @@ -344,7 +344,7 @@ elisp-site-file-install() { # directory. elisp-site-regen() { - local sitelisp=${ROOT}${EPREFIX}${SITELISP} + local sitelisp=${ROOT%/}${EPREFIX}${SITELISP} local sf i ret=0 null="" page=$'\f' local -a sflist diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 4e5846c..6745973 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# + # @ECLASS: elisp.eclass # @MAINTAINER: # Gentoo GNU Emacs project @@ -68,11 +68,11 @@ inherit elisp-common case ${EAPI:-0} in 0|1) - inherit eutils + inherit epatch EXPORT_FUNCTIONS src_{unpack,compile,install} \ pkg_{setup,postinst,postrm} ;; 2|3|4|5) - inherit eutils + inherit epatch EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ pkg_{setup,postinst,postrm} ;; 6) -- cgit v1.2.3-65-gdbad