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 64A5B138334 for ; Fri, 1 Jun 2018 18:07:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55219E0828; Fri, 1 Jun 2018 18:07:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 0E00FE0828 for ; Fri, 1 Jun 2018 18:07:40 +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 25DAE335C30 for ; Fri, 1 Jun 2018 18:07:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 581E02B7 for ; Fri, 1 Jun 2018 18:07:37 +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: <1527876432.9e025d71f8304db07e4e086fd8289f0d5e1789b5.ulm@gentoo> Subject: [gentoo-commits] repo/proj/emacs:master commit in: eclass/ X-VCS-Repository: repo/proj/emacs X-VCS-Files: eclass/elisp.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 9e025d71f8304db07e4e086fd8289f0d5e1789b5 X-VCS-Branch: master Date: Fri, 1 Jun 2018 18:07:37 +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: 0732f60e-ddc0-42a5-9a68-904fe155b29e X-Archives-Hash: 9451462ad9dade9f6952f27ebe227a26 commit: 9e025d71f8304db07e4e086fd8289f0d5e1789b5 Author: Ulrich Müller gentoo org> AuthorDate: Fri Jun 1 16:51:24 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Jun 1 18:07:12 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=9e025d71 elisp.eclass: Depend on virtual/emacs on the build system. For byte-compilation, Emacs is required to run on the native build system. Therefore BDEPEND on virtual/emacs in EAPI 7. Reorganise EAPI conditionals to be more compact. eclass/elisp.eclass | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 9a66ec5..0f07a3e 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -65,24 +65,24 @@ # files by dodoc in src_install(). inherit elisp-common +case ${EAPI:-0} in + 0|1|2|3|4|5) inherit epatch ;; + 6|7) ;; + *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; +esac case ${EAPI:-0} in - 0|1) - inherit epatch - EXPORT_FUNCTIONS src_{unpack,compile,install} \ - pkg_{setup,postinst,postrm} ;; - 2|3|4|5) - inherit epatch - EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ + 0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \ pkg_{setup,postinst,postrm} ;; - 6|7) - EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ + *) 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}" -RDEPEND="${DEPEND}" +RDEPEND=">=virtual/emacs-${NEED_EMACS:-23}" +case ${EAPI:-0} in + 0|1|2|3|4|5|6) DEPEND="${RDEPEND}" ;; + *) BDEPEND="${RDEPEND}" ;; +esac # @FUNCTION: elisp_pkg_setup # @DESCRIPTION: