From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1005100-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id A3AB9138331
for <garchives@archives.gentoo.org>; Thu, 22 Feb 2018 13:25:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DB315E089E;
Thu, 22 Feb 2018 13:25:04 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B9C78E089E
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Feb 2018 13:25:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6CE74335C4C
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Feb 2018 13:25:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id EA23F231
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Feb 2018 13:25:01 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1519305883.6cb5c28ebe2d41da07fd7bcf217a68eb84ee2efd.ulm@gentoo>
Subject: [gentoo-commits] repo/proj/emacs:master commit in: eclass/
X-VCS-Repository: repo/proj/emacs
X-VCS-Files: eclass/elisp-common.eclass eclass/elisp.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 6cb5c28ebe2d41da07fd7bcf217a68eb84ee2efd
X-VCS-Branch: master
Date: Thu, 22 Feb 2018 13:25:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3da4f1c5-2f47-4e31-9586-002889e9e6f6
X-Archives-Hash: 832b96590d1997e1337c31910451141b
commit: 6cb5c28ebe2d41da07fd7bcf217a68eb84ee2efd
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 13:24:43 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 13:24:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=6cb5c28e
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 <gnu-emacs@gentoo.org>
@@ -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 <gnu-emacs@gentoo.org>
@@ -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)