commit: 04d9a90c8f5b90c903557033a4059a0e5981b619
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 14:45:09 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed May 26 08:13:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d9a90c
app-editors/emacs: Make PATCHES an array
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
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(-)
diff --git a/app-editors/emacs/emacs-18.59-r13.ebuild
b/app-editors/emacs/emacs-18.59-r13.ebuild
index 8b1d8fc4bd2..105fc78984d 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 f46ce1b68c8..834facf2604 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 c9d98111c2b..5720b4449dc 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 b7a2c457507..0995daeae65 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 4dc17e9bd91..fe5c125a481 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 a296afd19d0..86cf0e3326d 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 d565c8aad9a..1efba0ded78 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 45899a7477f..4c0d1595de9 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 e37d8033bea..68c27b5b493 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
