[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

[Ulrich Müller]

commit:     e9a6afccb18a7c2bb00e881ac2ad2e6a023be9df
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 15 13:03:02 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 13:03:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a6afcc

app-editors/emacs: Sync live ebuilds from 28.0.91 pretest version

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/emacs/emacs-28.0.9999-r1.ebuild | 7 +++++--
 app-editors/emacs/emacs-29.0.9999.ebuild    | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-editors/emacs/emacs-28.0.9999-r1.ebuild 
b/app-editors/emacs/emacs-28.0.9999-r1.ebuild
index 156f7ef44d15..d6dd658ed162 100644
--- a/app-editors/emacs/emacs-28.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ else
        fi
        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"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
@@ -253,6 +253,9 @@ src_configure() {
                popd >/dev/null || die
                # Don't try to execute the binary for dumping during the build
                myconf+=" --with-dumping=none"
+       elif use m68k; then
+               # Workaround for https://debbugs.gnu.org/44531
+               myconf+=" --with-dumping=unexec"
        else
                myconf+=" --with-dumping=pdumper"
        fi

diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild 
b/app-editors/emacs/emacs-29.0.9999.ebuild
index cc1da333c7fd..9018d1a13b21 100644
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ else
        fi
        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"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
@@ -253,6 +253,9 @@ src_configure() {
                popd >/dev/null || die
                # Don't try to execute the binary for dumping during the build
                myconf+=" --with-dumping=none"
+       elif use m68k; then
+               # Workaround for https://debbugs.gnu.org/44531
+               myconf+=" --with-dumping=unexec"
        else
                myconf+=" --with-dumping=pdumper"
        fi