| 1 |
commit: e9a6afccb18a7c2bb00e881ac2ad2e6a023be9df |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 15 13:03:02 2022 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 15 13:03:02 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a6afcc |
| 7 |
|
| 8 |
app-editors/emacs: Sync live ebuilds from 28.0.91 pretest version |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-editors/emacs/emacs-28.0.9999-r1.ebuild | 7 +++++-- |
| 14 |
app-editors/emacs/emacs-29.0.9999.ebuild | 7 +++++-- |
| 15 |
2 files changed, 10 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-editors/emacs/emacs-28.0.9999-r1.ebuild b/app-editors/emacs/emacs-28.0.9999-r1.ebuild |
| 18 |
index 156f7ef44d15..d6dd658ed162 100644 |
| 19 |
--- a/app-editors/emacs/emacs-28.0.9999-r1.ebuild |
| 20 |
+++ b/app-editors/emacs/emacs-28.0.9999-r1.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2021 Gentoo Authors |
| 23 |
+# Copyright 1999-2022 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=8 |
| 27 |
@@ -33,7 +33,7 @@ else |
| 28 |
fi |
| 29 |
SLOT="${PV%%.*}" |
| 30 |
[[ ${PV} == *.*.* ]] && SLOT+="-vcs" |
| 31 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 32 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 33 |
fi |
| 34 |
|
| 35 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
| 36 |
@@ -253,6 +253,9 @@ src_configure() { |
| 37 |
popd >/dev/null || die |
| 38 |
# Don't try to execute the binary for dumping during the build |
| 39 |
myconf+=" --with-dumping=none" |
| 40 |
+ elif use m68k; then |
| 41 |
+ # Workaround for https://debbugs.gnu.org/44531 |
| 42 |
+ myconf+=" --with-dumping=unexec" |
| 43 |
else |
| 44 |
myconf+=" --with-dumping=pdumper" |
| 45 |
fi |
| 46 |
|
| 47 |
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild |
| 48 |
index cc1da333c7fd..9018d1a13b21 100644 |
| 49 |
--- a/app-editors/emacs/emacs-29.0.9999.ebuild |
| 50 |
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-# Copyright 1999-2021 Gentoo Authors |
| 53 |
+# Copyright 1999-2022 Gentoo Authors |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
EAPI=8 |
| 57 |
@@ -33,7 +33,7 @@ else |
| 58 |
fi |
| 59 |
SLOT="${PV%%.*}" |
| 60 |
[[ ${PV} == *.*.* ]] && SLOT+="-vcs" |
| 61 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 62 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 63 |
fi |
| 64 |
|
| 65 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
| 66 |
@@ -253,6 +253,9 @@ src_configure() { |
| 67 |
popd >/dev/null || die |
| 68 |
# Don't try to execute the binary for dumping during the build |
| 69 |
myconf+=" --with-dumping=none" |
| 70 |
+ elif use m68k; then |
| 71 |
+ # Workaround for https://debbugs.gnu.org/44531 |
| 72 |
+ myconf+=" --with-dumping=unexec" |
| 73 |
else |
| 74 |
myconf+=" --with-dumping=pdumper" |
| 75 |
fi |
Archives