From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0CA9B1384B4 for ; Sun, 20 Dec 2015 12:25:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7654321C020; Sun, 20 Dec 2015 12:25:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1EBA721C020 for ; Sun, 20 Dec 2015 12:25:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB2A833BEBE for ; Sun, 20 Dec 2015 12:25:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82135A97 for ; Sun, 20 Dec 2015 12:25:22 +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: <1450613980.d0d5ea0dfc160d2e86a2f5ac5684ca8cf7f65fa9.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/elisp.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: d0d5ea0dfc160d2e86a2f5ac5684ca8cf7f65fa9 X-VCS-Branch: master Date: Sun, 20 Dec 2015 12:25:22 +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-Archives-Salt: 824259fa-78cc-40fe-a77f-428bfaf903ff X-Archives-Hash: 355da16966bbf27e538f48d950d1f26c commit: d0d5ea0dfc160d2e86a2f5ac5684ca8cf7f65fa9 Author: Ulrich Müller gentoo org> AuthorDate: Sat Dec 19 12:08:36 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Dec 20 12:19:40 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d5ea0d elisp.eclass: Support EAPI 6. eclass/elisp.eclass | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 1178880..93a7d4b 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -65,13 +65,21 @@ # DOCS="blah.txt ChangeLog" is automatically used to install the given # files by dodoc in src_install(). -inherit elisp-common eutils +inherit elisp-common case ${EAPI:-0} in - 0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \ - pkg_{setup,postinst,postrm} ;; - *) EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ - pkg_{setup,postinst,postrm} ;; + 0|1) + inherit eutils + EXPORT_FUNCTIONS src_{unpack,compile,install} \ + pkg_{setup,postinst,postrm} ;; + 2|3|4|5) + inherit eutils + EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ + pkg_{setup,postinst,postrm} ;; + 6) + 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}" @@ -117,21 +125,28 @@ elisp_src_unpack() { # for in the current working dir, WORKDIR, and FILESDIR. elisp_src_prepare() { - local patch + local patch file for patch in ${ELISP_PATCHES}; do if [[ -f ${patch} ]]; then - epatch "${patch}" + file="${patch}" elif [[ -f ${WORKDIR}/${patch} ]]; then - epatch "${WORKDIR}/${patch}" + file="${WORKDIR}/${patch}" elif [[ -f ${FILESDIR}/${patch} ]]; then - epatch "${FILESDIR}/${patch}" + file="${FILESDIR}/${patch}" else die "Cannot find ${patch}" fi + case ${EAPI:-0} in + 0|1|2|3|4|5) epatch "${file}" ;; + 6) eapply "${file}" ;; + esac done # apply any user patches - epatch_user + case ${EAPI:-0} in + 0|1|2|3|4|5) epatch_user ;; + 6) eapply_user ;; + esac if [[ -n ${ELISP_REMOVE} ]]; then rm ${ELISP_REMOVE} || die