From 04d9a90c8f5b90c903557033a4059a0e5981b619 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Tue, 25 May 2021 16:45:09 +0200 Subject: app-editors/emacs: Make PATCHES an array MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ulrich Müller --- app-editors/emacs/emacs-18.59-r13.ebuild | 4 ++-- app-editors/emacs/emacs-23.4-r20.ebuild | 4 ++-- app-editors/emacs/emacs-24.5-r10.ebuild | 4 ++-- app-editors/emacs/emacs-25.3-r9.ebuild | 4 ++-- app-editors/emacs/emacs-26.3-r4.ebuild | 3 +-- app-editors/emacs/emacs-27.1-r4.ebuild | 2 +- app-editors/emacs/emacs-27.2.9999.ebuild | 2 +- app-editors/emacs/emacs-27.2.ebuild | 2 +- app-editors/emacs/emacs-28.0.9999.ebuild | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) (limited to 'app-editors') diff --git a/app-editors/emacs/emacs-18.59-r13.ebuild b/app-editors/emacs/emacs-18.59-r13.ebuild index 8b1d8fc4bd28..105fc78984d1 100644 --- a/app-editors/emacs/emacs-18.59-r13.ebuild +++ b/app-editors/emacs/emacs-18.59-r13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,7 @@ BDEPEND="app-eselect/eselect-emacs RDEPEND="${RDEPEND} app-eselect/eselect-emacs" -PATCHES="../patch" +PATCHES=("${WORKDIR}/patch") src_prepare() { default diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild index f46ce1b68c8a..834facf26043 100644 --- a/app-editors/emacs/emacs-23.4-r20.ebuild +++ b/app-editors/emacs/emacs-23.4-r20.ebuild @@ -90,10 +90,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" # operations later on FULL_VERSION="${PV%%_*}" S="${WORKDIR}/emacs-${FULL_VERSION}" +PATCHES=("${WORKDIR}/patch") src_prepare() { - eapply ../patch - eapply_user + default sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ || die "unable to sed ctags.1" diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild b/app-editors/emacs/emacs-24.5-r10.ebuild index c9d98111c2be..5720b4449dcb 100644 --- a/app-editors/emacs/emacs-24.5-r10.ebuild +++ b/app-editors/emacs/emacs-24.5-r10.ebuild @@ -97,10 +97,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" # operations later on FULL_VERSION="${PV%%_*}" S="${WORKDIR}/emacs-${FULL_VERSION}" +PATCHES=("${WORKDIR}/patch") src_prepare() { - eapply ../patch - eapply_user + default # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild b/app-editors/emacs/emacs-25.3-r9.ebuild index b7a2c457507d..0995daeae65c 100644 --- a/app-editors/emacs/emacs-25.3-r9.ebuild +++ b/app-editors/emacs/emacs-25.3-r9.ebuild @@ -100,10 +100,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" # operations later on FULL_VERSION="${PV%%_*}" S="${WORKDIR}/emacs-${FULL_VERSION}" +PATCHES=("${WORKDIR}/patch") src_prepare() { - eapply ../patch - eapply_user + default # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild index 4dc17e9bd912..fe5c125a481c 100644 --- a/app-editors/emacs/emacs-26.3-r4.ebuild +++ b/app-editors/emacs/emacs-26.3-r4.ebuild @@ -110,8 +110,7 @@ FULL_VERSION="${PV%%_*}" S="${WORKDIR}/emacs-${FULL_VERSION}" src_prepare() { - #eapply ../patch - eapply_user + default # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild index a296afd19d0b..86cf0e3326d7 100644 --- a/app-editors/emacs/emacs-27.1-r4.ebuild +++ b/app-editors/emacs/emacs-27.1-r4.ebuild @@ -150,7 +150,7 @@ src_prepare() { || die "Upstream version number changed to ${FULL_VERSION}" fi - eapply_user + default # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild index d565c8aad9a9..1efba0ded788 100644 --- a/app-editors/emacs/emacs-27.2.9999.ebuild +++ b/app-editors/emacs/emacs-27.2.9999.ebuild @@ -149,7 +149,7 @@ src_prepare() { || die "Upstream version number changed to ${FULL_VERSION}" fi - eapply_user + default # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die diff --git a/app-editors/emacs/emacs-27.2.ebuild b/app-editors/emacs/emacs-27.2.ebuild index 45899a7477ff..4c0d1595de94 100644 --- a/app-editors/emacs/emacs-27.2.ebuild +++ b/app-editors/emacs/emacs-27.2.ebuild @@ -149,7 +149,7 @@ src_prepare() { || die "Upstream version number changed to ${FULL_VERSION}" fi - eapply_user + default # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index e37d8033beab..68c27b5b493d 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -145,7 +145,7 @@ src_prepare() { # for live ebuilds FULL_VERSION doesn't exist in global scope use jit && QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" - eapply_user + default # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die -- cgit v1.2.3-65-gdbad