| 1 |
commit: 04d9a90c8f5b90c903557033a4059a0e5981b619 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 25 14:45:09 2021 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 26 08:13:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d9a90c |
| 7 |
|
| 8 |
app-editors/emacs: Make PATCHES an array |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-editors/emacs/emacs-18.59-r13.ebuild | 4 ++-- |
| 14 |
app-editors/emacs/emacs-23.4-r20.ebuild | 4 ++-- |
| 15 |
app-editors/emacs/emacs-24.5-r10.ebuild | 4 ++-- |
| 16 |
app-editors/emacs/emacs-25.3-r9.ebuild | 4 ++-- |
| 17 |
app-editors/emacs/emacs-26.3-r4.ebuild | 3 +-- |
| 18 |
app-editors/emacs/emacs-27.1-r4.ebuild | 2 +- |
| 19 |
app-editors/emacs/emacs-27.2.9999.ebuild | 2 +- |
| 20 |
app-editors/emacs/emacs-27.2.ebuild | 2 +- |
| 21 |
app-editors/emacs/emacs-28.0.9999.ebuild | 2 +- |
| 22 |
9 files changed, 13 insertions(+), 14 deletions(-) |
| 23 |
|
| 24 |
diff --git a/app-editors/emacs/emacs-18.59-r13.ebuild b/app-editors/emacs/emacs-18.59-r13.ebuild |
| 25 |
index 8b1d8fc4bd2..105fc78984d 100644 |
| 26 |
--- a/app-editors/emacs/emacs-18.59-r13.ebuild |
| 27 |
+++ b/app-editors/emacs/emacs-18.59-r13.ebuild |
| 28 |
@@ -1,4 +1,4 @@ |
| 29 |
-# Copyright 1999-2020 Gentoo Authors |
| 30 |
+# Copyright 1999-2021 Gentoo Authors |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
|
| 33 |
EAPI=7 |
| 34 |
@@ -34,7 +34,7 @@ BDEPEND="app-eselect/eselect-emacs |
| 35 |
RDEPEND="${RDEPEND} |
| 36 |
app-eselect/eselect-emacs" |
| 37 |
|
| 38 |
-PATCHES="../patch" |
| 39 |
+PATCHES=("${WORKDIR}/patch") |
| 40 |
|
| 41 |
src_prepare() { |
| 42 |
default |
| 43 |
|
| 44 |
diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild |
| 45 |
index f46ce1b68c8..834facf2604 100644 |
| 46 |
--- a/app-editors/emacs/emacs-23.4-r20.ebuild |
| 47 |
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild |
| 48 |
@@ -90,10 +90,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" |
| 49 |
# operations later on |
| 50 |
FULL_VERSION="${PV%%_*}" |
| 51 |
S="${WORKDIR}/emacs-${FULL_VERSION}" |
| 52 |
+PATCHES=("${WORKDIR}/patch") |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
- eapply ../patch |
| 56 |
- eapply_user |
| 57 |
+ default |
| 58 |
|
| 59 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
| 60 |
|| die "unable to sed ctags.1" |
| 61 |
|
| 62 |
diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild b/app-editors/emacs/emacs-24.5-r10.ebuild |
| 63 |
index c9d98111c2b..5720b4449dc 100644 |
| 64 |
--- a/app-editors/emacs/emacs-24.5-r10.ebuild |
| 65 |
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild |
| 66 |
@@ -97,10 +97,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" |
| 67 |
# operations later on |
| 68 |
FULL_VERSION="${PV%%_*}" |
| 69 |
S="${WORKDIR}/emacs-${FULL_VERSION}" |
| 70 |
+PATCHES=("${WORKDIR}/patch") |
| 71 |
|
| 72 |
src_prepare() { |
| 73 |
- eapply ../patch |
| 74 |
- eapply_user |
| 75 |
+ default |
| 76 |
|
| 77 |
# Fix filename reference in redirected man page |
| 78 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
| 79 |
|
| 80 |
diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild b/app-editors/emacs/emacs-25.3-r9.ebuild |
| 81 |
index b7a2c457507..0995daeae65 100644 |
| 82 |
--- a/app-editors/emacs/emacs-25.3-r9.ebuild |
| 83 |
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild |
| 84 |
@@ -100,10 +100,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" |
| 85 |
# operations later on |
| 86 |
FULL_VERSION="${PV%%_*}" |
| 87 |
S="${WORKDIR}/emacs-${FULL_VERSION}" |
| 88 |
+PATCHES=("${WORKDIR}/patch") |
| 89 |
|
| 90 |
src_prepare() { |
| 91 |
- eapply ../patch |
| 92 |
- eapply_user |
| 93 |
+ default |
| 94 |
|
| 95 |
# Fix filename reference in redirected man page |
| 96 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
| 97 |
|
| 98 |
diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild |
| 99 |
index 4dc17e9bd91..fe5c125a481 100644 |
| 100 |
--- a/app-editors/emacs/emacs-26.3-r4.ebuild |
| 101 |
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild |
| 102 |
@@ -110,8 +110,7 @@ FULL_VERSION="${PV%%_*}" |
| 103 |
S="${WORKDIR}/emacs-${FULL_VERSION}" |
| 104 |
|
| 105 |
src_prepare() { |
| 106 |
- #eapply ../patch |
| 107 |
- eapply_user |
| 108 |
+ default |
| 109 |
|
| 110 |
# Fix filename reference in redirected man page |
| 111 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die |
| 112 |
|
| 113 |
diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild |
| 114 |
index a296afd19d0..86cf0e3326d 100644 |
| 115 |
--- a/app-editors/emacs/emacs-27.1-r4.ebuild |
| 116 |
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild |
| 117 |
@@ -150,7 +150,7 @@ src_prepare() { |
| 118 |
|| die "Upstream version number changed to ${FULL_VERSION}" |
| 119 |
fi |
| 120 |
|
| 121 |
- eapply_user |
| 122 |
+ default |
| 123 |
|
| 124 |
# Fix filename reference in redirected man page |
| 125 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die |
| 126 |
|
| 127 |
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild |
| 128 |
index d565c8aad9a..1efba0ded78 100644 |
| 129 |
--- a/app-editors/emacs/emacs-27.2.9999.ebuild |
| 130 |
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild |
| 131 |
@@ -149,7 +149,7 @@ src_prepare() { |
| 132 |
|| die "Upstream version number changed to ${FULL_VERSION}" |
| 133 |
fi |
| 134 |
|
| 135 |
- eapply_user |
| 136 |
+ default |
| 137 |
|
| 138 |
# Fix filename reference in redirected man page |
| 139 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die |
| 140 |
|
| 141 |
diff --git a/app-editors/emacs/emacs-27.2.ebuild b/app-editors/emacs/emacs-27.2.ebuild |
| 142 |
index 45899a7477f..4c0d1595de9 100644 |
| 143 |
--- a/app-editors/emacs/emacs-27.2.ebuild |
| 144 |
+++ b/app-editors/emacs/emacs-27.2.ebuild |
| 145 |
@@ -149,7 +149,7 @@ src_prepare() { |
| 146 |
|| die "Upstream version number changed to ${FULL_VERSION}" |
| 147 |
fi |
| 148 |
|
| 149 |
- eapply_user |
| 150 |
+ default |
| 151 |
|
| 152 |
# Fix filename reference in redirected man page |
| 153 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die |
| 154 |
|
| 155 |
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild |
| 156 |
index e37d8033bea..68c27b5b493 100644 |
| 157 |
--- a/app-editors/emacs/emacs-28.0.9999.ebuild |
| 158 |
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild |
| 159 |
@@ -145,7 +145,7 @@ src_prepare() { |
| 160 |
# for live ebuilds FULL_VERSION doesn't exist in global scope |
| 161 |
use jit && QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" |
| 162 |
|
| 163 |
- eapply_user |
| 164 |
+ default |
| 165 |
|
| 166 |
# Fix filename reference in redirected man page |
| 167 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die |
Archives