From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 D70E21382C5 for ; Mon, 12 Apr 2021 19:09:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21032E09CA; Mon, 12 Apr 2021 19:09:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 ED2B1E09CA for ; Mon, 12 Apr 2021 19:09:05 +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 E1F27340EA7 for ; Mon, 12 Apr 2021 19:09:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42C595B8 for ; Mon, 12 Apr 2021 19:09:00 +0000 (UTC) From: "Ulrich Müller" 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" Message-ID: <1618254514.feff6487fa132ae9384647f34c90f1ce81a902cd.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: feff6487fa132ae9384647f34c90f1ce81a902cd X-VCS-Branch: master Date: Mon, 12 Apr 2021 19:09:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 553e71f0-5e50-41af-b594-39009485cc5f X-Archives-Hash: cf8f525999eebb914d6d18bf924f4686 commit: feff6487fa132ae9384647f34c90f1ce81a902cd Author: Ulrich Müller gentoo org> AuthorDate: Mon Apr 12 19:08:34 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Apr 12 19:08:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=feff6487 elisp*.eclass: Drop support for EAPI 4 Signed-off-by: Ulrich Müller gentoo.org> eclass/elisp-common.eclass | 7 ++++--- eclass/elisp.eclass | 13 ++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index bdf97f4..9de2581 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -10,6 +10,7 @@ # Mamoru Komachi # Christian Faulhammer # Ulrich Müller +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: Emacs-related installation utilities # @DESCRIPTION: # @@ -165,7 +166,7 @@ # to above calls of elisp-site-regen(). case ${EAPI:-0} in - 4|5|6) inherit eapi7-ver ;; + 5|6) inherit eapi7-ver ;; 7) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -382,7 +383,7 @@ elisp-modules-install() { shift # Don't bother inheriting multilib.eclass for get_libdir(), but # error out in old EAPIs that don't support it natively. - [[ ${EAPI} == [45] ]] \ + [[ ${EAPI} == 5 ]] \ && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}" ebegin "Installing dynamic modules for GNU Emacs support" ( # subshell to avoid pollution of calling environment @@ -411,7 +412,7 @@ elisp-site-file-install() { sf="${T}/${sf}" ebegin "Installing site initialisation file for GNU Emacs" [[ $1 = "${sf}" ]] || cp "$1" "${sf}" - if [[ ${EAPI} == [45] ]]; then + if [[ ${EAPI} == 5 ]]; then grep -q "@EMACSMODULES@" "${sf}" \ && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}" else diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 7876928..a568a05 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -1,4 +1,4 @@ -# Copyright 2002-2020 Gentoo Authors +# Copyright 2002-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: elisp.eclass @@ -9,7 +9,7 @@ # Jeremy Maitin-Shepard # Christian Faulhammer # Ulrich Müller -# @SUPPORTED_EAPIS: 4 5 6 7 +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: Eclass for Emacs Lisp packages # @DESCRIPTION: # @@ -62,7 +62,7 @@ inherit elisp-common case ${EAPI:-0} in - 4|5) inherit epatch ;; + 5) inherit epatch ;; 6|7) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -72,7 +72,6 @@ EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ RDEPEND=">=app-editors/emacs-${NEED_EMACS}:*" case ${EAPI} in - 4) RDEPEND="${RDEPEND%:*}"; DEPEND="${RDEPEND}" ;; 5|6) DEPEND="${RDEPEND}" ;; *) BDEPEND="${RDEPEND}" ;; esac @@ -118,14 +117,14 @@ elisp_src_prepare() { die "Cannot find ${patch}" fi case ${EAPI} in - 4|5) epatch "${file}" ;; + 5) epatch "${file}" ;; *) eapply "${file}" ;; esac done # apply PATCHES (if supported in EAPI), and any user patches case ${EAPI} in - 4|5) epatch_user ;; + 5) epatch_user ;; *) default ;; esac @@ -172,7 +171,7 @@ elisp_src_install() { fi # install documentation only when explicitly requested case ${EAPI} in - 4|5) [[ -n ${DOCS} ]] && dodoc ${DOCS} ;; + 5) [[ -n ${DOCS} ]] && dodoc ${DOCS} ;; *) [[ $(declare -p DOCS 2>/dev/null) == *=* ]] && einstalldocs ;; esac if declare -f readme.gentoo_create_doc >/dev/null; then