commit: 6937b367c618f82930e200f8f72efbf42c8126da Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Mon Jul 12 14:45:30 2021 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon Jul 12 14:52:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6937b367
app-editors/emacs: Bump to EAPI 8 Move app-eselect/eselect-emacs from BDEPEND to IDEPEND. Closes: https://bugs.gentoo.org/716334 Suggested-by: David Michael <fedora.dm0 <AT> gmail.com> Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> .../emacs/{emacs-27.2.9999.ebuild => emacs-27.2-r3.ebuild} | 12 ++++++++---- app-editors/emacs/emacs-27.2.9999.ebuild | 7 ++++--- app-editors/emacs/emacs-28.0.9999.ebuild | 7 ++++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2-r3.ebuild similarity index 98% copy from app-editors/emacs/emacs-27.2.9999.ebuild copy to app-editors/emacs/emacs-27.2-r3.ebuild index 7089e4a9a73..0245ab3cc2d 100644 --- a/app-editors/emacs/emacs-27.2.9999.ebuild +++ b/app-editors/emacs/emacs-27.2-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs @@ -31,6 +31,9 @@ else elif [[ ${PV//[0-9]} != "." ]]; then SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"; fi + # Patchset from proj/emacs-patches.git + SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"; + PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" @@ -125,8 +128,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] DEPEND="${RDEPEND} gui? ( !aqua? ( x11-base/xorg-proto ) )" -BDEPEND="app-eselect/eselect-emacs - sys-apps/texinfo +BDEPEND="sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip )" @@ -134,6 +136,8 @@ RDEPEND="${RDEPEND} !app-editors/emacs-vcs:27 app-eselect/eselect-emacs" +IDEPEND="app-eselect/eselect-emacs" + EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" @@ -154,7 +158,7 @@ src_prepare() { # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die - AT_M4DIR=m4 eautoreconf + #AT_M4DIR=m4 eautoreconf } src_configure() { diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild index 7089e4a9a73..6e936382b21 100644 --- a/app-editors/emacs/emacs-27.2.9999.ebuild +++ b/app-editors/emacs/emacs-27.2.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs @@ -125,8 +125,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] DEPEND="${RDEPEND} gui? ( !aqua? ( x11-base/xorg-proto ) )" -BDEPEND="app-eselect/eselect-emacs - sys-apps/texinfo +BDEPEND="sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip )" @@ -134,6 +133,8 @@ RDEPEND="${RDEPEND} !app-editors/emacs-vcs:27 app-eselect/eselect-emacs" +IDEPEND="app-eselect/eselect-emacs" + EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index e3586a88f10..f5a41b7f06e 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs @@ -118,14 +118,15 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] DEPEND="${RDEPEND} gui? ( !aqua? ( x11-base/xorg-proto ) )" -BDEPEND="app-eselect/eselect-emacs - sys-apps/texinfo +BDEPEND="sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip )" RDEPEND="${RDEPEND} app-eselect/eselect-emacs" +IDEPEND="app-eselect/eselect-emacs" + EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
