gentoo auto-resync : 21:12:2024 - 06:30:51

7 files changed, 632 insertions, 4 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index fa0f04ed7d79..0548777783b0 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 78266a522edb..9edb6cdd15f7 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -13,6 +13,7 @@ DIST emacs-29.4-patches-3.tar.xz 2364 BLAKE2B bf0d044ad0b12eeea1b87d76f143f3a542
 DIST emacs-29.4.tar.xz 52210344 BLAKE2B 825fd2665b6427dbc3cb618b40df2f71fa6b08883bdd07be6d8acf0039df2aeebd294e679e98f4c64a9dd9bdad93589fc7c176cf3860d4fb823fce23f7f2b3cd SHA512 66b38081cb01d2c46ff7beefb45986cc225b4c922c30712ad0d456c6cae5507176ed99418c8f26948c5375c8afde4e4b2507d23ed997dbb5392d12150a121d80
 DIST emacs-30.0.91.tar.xz 54782188 BLAKE2B 9ef6f6bcca6b33fb9f70530ff1bb2ff8d56d88d201b8a9267d503e75f23efdb6e9707353495d1c504fbdd26a6a260d39cf98077188f41d65118af21e02715069 SHA512 43dd5d21dab16d88c1ca2e430a11dad1e4a7e173f217f5762aea0b6e68b526c6486a9e2856622c1f9aa06553192d2d0fa04454115f1e77e221b14b6b03dc31b6
 DIST emacs-30.0.92.tar.xz 54813380 BLAKE2B adb5eb9e9b8f6eb059688d28730276db07ac82878bc56c98f68c790053d7d7803c16e7898dc2497464d2394c6778e917104df7f0ca869c48decc5c4e41feac1a SHA512 d5cf786733986d8233379859eb15d382c69e71737b790a8732d66818361e1632c9137c26a14534ad14baa4f38bfdc5e4e3e0d94017cfe54586693067e5ff7d05
+DIST emacs-30.0.93.tar.xz 54820220 BLAKE2B 5c9a48eae9beaaa1a2ab2c4f3d4e3c4d1f4d71c180c07dfe1569df79d750479f7d96bbb6786608a2da748de89fdbd870b25ef04d27fec2c8f0642be76b945dc2 SHA512 030e9ecefc91c8088c6638a6b3a438c3999ccf0445f4362027d62bb56dcbdde744a7d003bd149cc1a2ad1528e4062cf42c6cfb3121890595d1e2b668a028dc28
 EBUILD emacs-18.59-r15.ebuild 4463 BLAKE2B 3267a4c5911926609cde01416dcc7cb21f50f3c2faaa7a9ee946d1547fecad96f0b7e41036d1ec661571a67565ce477c66d321be100a6d29e18066f939e0e9c3 SHA512 0f027571450d78913531cd91af1cb0091543fd35df3ab86a07b981d5cf7deaffe705279abfd59b59dafade81758b867f7365411ce1276bcd2c142e2daabb1bde
 EBUILD emacs-26.3-r19.ebuild 11823 BLAKE2B 0ddb554f48e9f62d06cd6df2a840436d516b2ed1301cd639ce19584ea9350d7ec765cf249fcfa7a1e7ff139f135bcd96aaacd2e20d450aee126d0d7c02915ec1 SHA512 10475df4b0c9685f0f3f491ecc625524146af1e850e60425ebdad46c288f2f7be57f0c98e899086cb7ee3a405f25c3c79b03f0dc4deee9b24e560690e6426354
 EBUILD emacs-26.3-r21.ebuild 11701 BLAKE2B 44e7a1d354545d728b8cc580a9cd7040c66a6d2aec25f6d81970310bf221ee5787010af50ded83c1a20c59aeb8ce916dda0a78c4ff2693014b6da20d3f533ff3 SHA512 b685b0337f40bcc922c9d68fcd2a49b37642bc6d8bb49048991cd4414655d1bb5d92926832ce5dfceb0f72dc94137f27a68dbe549acd5e536dd6057959798c5e
@@ -24,6 +25,7 @@ EBUILD emacs-29.4-r1.ebuild 20117 BLAKE2B 9dd80da3559364e3d8d39693b2b44e6fc26b2f
 EBUILD emacs-29.4.ebuild 20313 BLAKE2B 1bed634eb42caf03b67df68474bf7d8b02b0f2086e8bbe820dd82096b81630af01fa184201fbc6c7b3797ff125ccf45b5dd465eae64443854781e9588acbd4d3 SHA512 d0ba494964d39737ed536e7e00a33212f215820971a449401ca6b60d7dc51715ae39f7fe6910e5673d7eba62683a1cc7d7dc20ef50e5dc5bb71c334f70387261
 EBUILD emacs-30.0.91.ebuild 19708 BLAKE2B f05c29c3c21cfb2822713b9555aa0c6e422ecfd603119382819405e3b852c99b827f8e8bd518112b8fb95b53a4feba79631f54c7f458093b29313e3c70808dcf SHA512 728e5bc3961453931e7fdab4f39d5465a1a54093fc4f5df68c307bc4fb475c61b0416d719cc3124b9546d097fe5ef9ab0b9df06a2a7a3d228feff7f3049c80fd
 EBUILD emacs-30.0.92.ebuild 19708 BLAKE2B f05c29c3c21cfb2822713b9555aa0c6e422ecfd603119382819405e3b852c99b827f8e8bd518112b8fb95b53a4feba79631f54c7f458093b29313e3c70808dcf SHA512 728e5bc3961453931e7fdab4f39d5465a1a54093fc4f5df68c307bc4fb475c61b0416d719cc3124b9546d097fe5ef9ab0b9df06a2a7a3d228feff7f3049c80fd
+EBUILD emacs-30.0.93.ebuild 19708 BLAKE2B f05c29c3c21cfb2822713b9555aa0c6e422ecfd603119382819405e3b852c99b827f8e8bd518112b8fb95b53a4feba79631f54c7f458093b29313e3c70808dcf SHA512 728e5bc3961453931e7fdab4f39d5465a1a54093fc4f5df68c307bc4fb475c61b0416d719cc3124b9546d097fe5ef9ab0b9df06a2a7a3d228feff7f3049c80fd
 EBUILD emacs-30.0.9999-r1.ebuild 19708 BLAKE2B f05c29c3c21cfb2822713b9555aa0c6e422ecfd603119382819405e3b852c99b827f8e8bd518112b8fb95b53a4feba79631f54c7f458093b29313e3c70808dcf SHA512 728e5bc3961453931e7fdab4f39d5465a1a54093fc4f5df68c307bc4fb475c61b0416d719cc3124b9546d097fe5ef9ab0b9df06a2a7a3d228feff7f3049c80fd
 EBUILD emacs-31.0.9999.ebuild 19706 BLAKE2B cd7ab9432b2e240586be9861299493d85c3e7238b43bbcb3fcd752729d538f23eae52d38f7742b5161e0203239675e396cd900d31a86100620289b1e4453f8f1 SHA512 1af09d26810ab06a0b1569bd4ea164a03fea7025048174c0e8d333ecea4a354b4455cd57e2e8c14371db6eb58f28e92d64ad48636c5b6eb94205b62b8173a28a
 MISC metadata.xml 3434 BLAKE2B aaeef31ce265ae3b3c67ddfe01b3b41724b6fed7353e83f3efa1fe401944707391f3160d7cfea423802c67e78830387e210966f5fdc03a5a0a20b0e38f493b6d SHA512 2ad8128bfe05cbef0cdf19840e809918331c5e98976fb1af14127e0cb7adfba597ff83457a45079d1facd571953210c1650eb11b87d9bce2352e9ca865ebcc38
diff --git a/app-editors/emacs/emacs-30.0.93.ebuild b/app-editors/emacs/emacs-30.0.93.ebuild
new file mode 100644
index 000000000000..115d3351a136
--- /dev/null
+++ b/app-editors/emacs/emacs-30.0.93.ebuild
@@ -0,0 +1,626 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools eapi9-pipestatus elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-30"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm zlib"
+
+X_DEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-misc/xbitmaps
+	xpm? ( x11-libs/libXpm )
+	xft? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXrender
+		cairo? ( >=x11-libs/cairo-1.12.18[X] )
+		!cairo? ( x11-libs/libXft )
+		harfbuzz? ( media-libs/harfbuzz:0= )
+		m17n-lib? (
+			>=dev-libs/libotf-0.9.4
+			>=dev-libs/m17n-lib-1.5.1
+		)
+	)
+	gtk? ( x11-libs/gtk+:3 )
+	!gtk? (
+		motif? (
+			>=x11-libs/motif-2.3:0
+			x11-libs/libXpm
+			x11-libs/libXmu
+			x11-libs/libXt
+		)
+		!motif? (
+			Xaw3d? (
+				x11-libs/libXaw3d
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!Xaw3d? ( athena? (
+				x11-libs/libXaw
+				x11-libs/libXmu
+				x11-libs/libXt
+			) )
+		)
+	)"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	jit? (
+		sys-devel/gcc:=[jit(-)]
+		sys-libs/zlib
+	)
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	tree-sitter? ( dev-libs/tree-sitter:= )
+	valgrind? ( dev-debug/valgrind )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+	gui? (
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:= )
+		webp? ( media-libs/libwebp:0= )
+		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
+		!aqua? (
+			gsettings? (
+				app-emacs/emacs-common[gsettings(-)]
+				>=dev-libs/glib-2.28.6
+			)
+			gtk? ( !X? (
+				media-libs/fontconfig
+				media-libs/freetype
+				>=x11-libs/cairo-1.12.18
+				x11-libs/gtk+:3
+				harfbuzz? ( media-libs/harfbuzz:0= )
+				m17n-lib? (
+					>=dev-libs/libotf-0.9.4
+					>=dev-libs/m17n-lib-1.5.1
+				)
+			) )
+			!gtk? ( ${X_DEPEND} )
+			X? ( ${X_DEPEND} )
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? (
+		!gtk? ( x11-base/xorg-proto )
+		X? ( x11-base/xorg-proto )
+	) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+# Suppress false positive QA warnings #898304 #925091
+QA_CONFIG_IMPL_DECL_SKIP=(
+	malloc_set_state malloc_get_state MIN static_assert alignof unreachable
+	statvfs64 re_set_syntax re_compile_pattern re_search re_match
+)
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	default
+
+	if use jit; then
+		find lisp -type f -name "*.elc" -delete || die
+
+		# These files ignore LDFLAGS. We assign the variable here, because
+		# for live ebuilds FULL_VERSION doesn't exist in global scope
+		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+		# gccjit doesn't play well with ccache or distcc #801580
+		# For now, work around the problem with an explicit LIBRARY_PATH
+		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
+			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+				| sed -n '/^libraries:/{s:^[^/]*::;p}')
+	fi
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	# libseccomp is detected by configure but doesn't appear to have any
+	# effect on the installed image. Suppress it by supplying pkg-config
+	# with a wrong library name.
+	sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
+	# Tests that use bubblewrap don't work in the sandbox:
+	# "bwrap: setting up uid map: Permission denied"
+	# So, disrupt the search for the bwrap executable.
+	sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
+		test/lisp/emacs-lisp/bytecomp-tests.el || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
+	# We want floating-point arithmetic to be correct #933380
+	replace-flags -Ofast -O2
+	append-flags -fno-fast-math -ffp-contract=off
+
+	# Prevents e.g. tests interfering with running Emacs.
+	unset EMACS_SOCKET_NAME
+
+	local myconf=(
+		--program-suffix="-${EMACS_SUFFIX}"
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX}
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX}
+		--localstatedir="${EPREFIX}"/var
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}"
+		--without-compress-install
+		--without-hesiod
+		--without-pop
+		--with-file-notification=$(usev inotify || usev gfile || echo no)
+		--with-pdumper
+		$(use_enable acl)
+		$(use_enable xattr)
+		$(use_with dbus)
+		$(use_with dynamic-loading modules)
+		$(use_with games gameuser ":gamestat")
+		$(use_with gmp libgmp)
+		$(use_with gpm)
+		$(use_with jit native-compilation aot)
+		$(use_with kerberos) $(use_with kerberos kerberos5)
+		$(use_with lcms lcms2)
+		$(use_with libxml2 xml2)
+		$(use_with mailutils)
+		$(use_with selinux)
+		$(use_with sqlite sqlite3)
+		$(use_with ssl gnutls)
+		$(use_with systemd libsystemd)
+		$(use_with threads)
+		$(use_with tree-sitter)
+		$(use_with wide-int)
+	)
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=( --with-sound=alsa )
+	else
+		myconf+=( --with-sound=$(usex sound oss no) )
+	fi
+
+	if use jit; then
+		use zlib || ewarn \
+			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
+		myconf+=( --with-zlib )
+	else
+		myconf+=( $(use_with zlib) )
+	fi
+
+	# Emacs supports these window systems:
+	# X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa).
+	# General GUI support is enabled by the "gui" USE flag, then
+	# the window system is selected as follows:
+	#   "aqua" -> Nextstep
+	#   "gtk -X" -> pure GTK
+	#   otherwise -> X11
+	# For X11 there is the further choice of toolkits GTK, Motif,
+	# Athena (Lucid), or no toolkit. They are enabled (in order of
+	# preference) with the "gtk", "motif", "Xaw3d", and "athena" flags.
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=(
+			--without-x --without-pgtk --without-ns
+		)
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=(
+			--with-ns --disable-ns-self-contained
+			--without-x --without-pgtk
+		)
+	elif use gtk && ! use X; then
+		einfo "Configuring to build with pure GTK (without X11) support"
+		myconf+=(
+			--with-pgtk --without-x --without-ns
+			--with-toolkit-scroll-bars #836392
+			--without-gconf
+			--without-xwidgets
+			$(use_with gsettings)
+			$(use_with harfbuzz)
+			$(use_with m17n-lib libotf)
+			$(use_with m17n-lib m17n-flt)
+		)
+	else
+		# X11
+		myconf+=(
+			--with-x --without-pgtk --without-ns
+			--without-gconf
+			$(use_with gsettings)
+			$(use_with toolkit-scroll-bars)
+			$(use_with xpm)
+		)
+
+		if use xft; then
+			myconf+=(
+				--with-xft
+				$(use_with cairo)
+				$(use_with harfbuzz)
+				$(use_with m17n-lib libotf)
+				$(use_with m17n-lib m17n-flt)
+			)
+		else
+			myconf+=(
+				--without-xft
+				--without-cairo
+				--without-libotf --without-m17n-flt
+			)
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=( --with-x-toolkit=gtk3 --without-xwidgets )
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=( --with-x-toolkit=motif )
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) )
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=( --with-x-toolkit=no )
+		fi
+	fi
+
+	if use gui; then
+		# Common flags recognised for all GUIs
+		myconf+=(
+			$(use_with gif)
+			$(use_with jpeg)
+			$(use_with png)
+			$(use_with svg rsvg)
+			$(use_with tiff)
+			$(use_with webp)
+			$(use_with imagemagick)
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir -p "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		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
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
+		emake "${EMACS_EMAKE_ARGS[@]}" actual-all
+	else
+		EMACS_EMAKE_ARGS=()
+		emake
+	fi
+}
+
+src_test() {
+	# List .el test files with a comment above listing the exact
+	# subtests which caused failure. Elements should begin with a %.
+	# e.g. %lisp/gnus/mml-sec-tests.el.
+	local exclude_tests=(
+		# Reason: permission denied on /nonexistent
+		# (vc-*-bzr only fails if breezy is installed, as they
+		# try to access cache dirs under /nonexistent)
+		#
+		# rmail-undigest-test-multipart-mixed-digest
+		# rmail-undigest-test-rfc1153-less-strict-digest
+		# rmail-undigest-test-rfc1153-sloppy-digest
+		# rmail-undigest-test-rfc934-digest
+		# vc-test-bzr02-state
+		# vc-test-bzr05-rename-file
+		# vc-test-bzr06-version-diff
+		# vc-bzr-test-bug9781
+		%lisp/mail/undigest-tests.el
+		%lisp/vc/vc-tests.el
+		%lisp/vc/vc-bzr-tests.el
+
+		# Reason: tries to access network
+		# internet-is-working
+		%src/process-tests.el
+
+		# Reason: fails with stable version of tree-sitter-json due to
+		# ast changes. Bug #922525
+		%src/treesit-tests.log
+
+		# Reason: test is not skipped if tree-sitter-tsx is not installed
+		# Bug #922525
+		%lisp/progmodes/typescript-ts-mode-tests.el
+	)
+	use threads || exclude_tests+=(
+			%lisp/server-tests.el
+			%lisp/progmodes/eglot-tests.el
+			%src/emacs-module-tests.el
+			%src/keyboard-tests.el
+		)
+	use xpm || exclude_tests+=( %src/image-tests.el )
+
+	# Redirect GnuPG's sockets, in order not to exceed the 108 char limit
+	# for socket paths on Linux.
+	mkdir -p "${T}"/gpg || die
+	local f
+	for f in browser extra ssh; do
+		printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \
+			> "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" || die
+	done
+
+	# See test/README for possible options
+	emake \
+		EMACS_TEST_VERBOSE=1 \
+		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TERM=dumb \
+		TEST_BACKTRACE_LINE_LENGTH=nil \
+		check
+}
+
+src_install() {
+	emake \
+		"${EMACS_EMAKE_ARGS[@]}" \
+		DESTDIR="${D}" \
+		NO_BIN_LINK=t \
+		BLESSMAIL_TARGET="" \
+		install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
+
+	# dissuade Portage from removing our dir file #257260
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}"/usr/share/glib-2.0 || die #911117
+	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		pipestatus || die
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		pipestatus || die "gzip .el pipeline failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-equal emacs-version "${FULL_VERSION}")
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	if ! use mailutils; then
+		DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs'
+		own e-mail features are going to be used as an e-mail client
+		(e.g. Rmail), you are strongly encouraged to enable it. If not,
+		Emacs will use its own implementation of movemail; which has
+		fewer features and is less secure. For more information see:
+		https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html"
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 4b5183d76246..5859c9712861 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,6 +1,6 @@
 DIST ghex-45.2.tar.xz 902616 BLAKE2B 24e42b6d719280ab459d0ed7b96a502df7a5502e3d6cf385c0aa73b11808e40cac6112a3e0c3a228d5363578ccb875836efd8a13d6fc6c7e8ea4fe5a76bdb9c7 SHA512 2843b23a0673457ec72bd2aad20888fbc2ca890d3d859e6c2657af24cedc6185f6e11244574b603c0e32db2f54968e6584adf2c7e5abee84521c55148f536496
 DIST ghex-46.0.tar.xz 920568 BLAKE2B fe1608faa58e36d6c6f7aa01044acbfbf21a46547f755b37cf0ad673d7c58c882512c1790c74dde0e7fd18af92d0d9a3fc6c42c687413c5811bf8fc30e937adc SHA512 7f6c26b0644c1a253eef6eded0265ffaf882fb2400d1c4c40e9cefd9291d412b1425452930269d35c110fc88e6cf994f33a0ca9e937a419885f3c1820003220d
 EBUILD ghex-45.2.ebuild 1310 BLAKE2B c3ebd59b4ed6a3281087987fdb7beabb50917a36746823e6b3eb317377ec4069da7013b1807883f565abaed2900d010afa4fd2fb8fd60dea858684fec36b9f27 SHA512 22cf7e8336ce0ce5b805a3be6eac11b42a9c5bd6b541fda634bdcb41157ec6cdec4fff352fbf3d6df565174518aa0d95c89f94787ae06f09715f413fc2be551e
-EBUILD ghex-46.0.ebuild 1308 BLAKE2B fe9a046c3767dcbbffdda25548547f22c879d0dd614a3b8516671c89a997b41837b169cf7915df4b841a36f46de598514eab0c5cadc297704fcaf4fdcf0faf8b SHA512 3db440253c6dcf4e6b198891fe8ed1491890918e99b6ff69bf5116fbafad682a6cdb4bf86ad4e1e13bf2607eafa73e8d4701635e4d8a7c6251c57afc77c1dea1
+EBUILD ghex-46.0.ebuild 1306 BLAKE2B 9da40557912e4526b054eb0e419cad0962cafc1dc259bf942f647fce13f2e361fb2f35153cf6eb199d39196a44e0cb98243f9dd5146f97d0bd41e2804bb0a077 SHA512 990b17c7f8e51114cb72c028d2298ef8e40767733b8e0a2a57fe0ceeec15b8ccb801221a25eed902df8a26f29384f5678c2cac78150672ca51aeafd11b936032
 EBUILD ghex-9999.ebuild 1308 BLAKE2B fe9a046c3767dcbbffdda25548547f22c879d0dd614a3b8516671c89a997b41837b169cf7915df4b841a36f46de598514eab0c5cadc297704fcaf4fdcf0faf8b SHA512 3db440253c6dcf4e6b198891fe8ed1491890918e99b6ff69bf5116fbafad682a6cdb4bf86ad4e1e13bf2607eafa73e8d4701635e4d8a7c6251c57afc77c1dea1
 MISC metadata.xml 345 BLAKE2B 4c2385371bb42d47643f2a9d48ee5ed675267f812467fa03f69151bcdbeb996602be0a3995f976b61e0c018c8d69e3dcd37392f5927bbe24942f11c23794bac4 SHA512 c3f3cc3f436137299082ccdcaa57221d1b3f490b34febfcd6ca586769b0a8c76ce11cc5b8be823c8c88b942effc0b68d9c078ba3a28594c41419830dff04fcad
diff --git a/app-editors/ghex/ghex-46.0.ebuild b/app-editors/ghex/ghex-46.0.ebuild
index a1bb4fdd3f75..23c196b0974e 100644
--- a/app-editors/ghex/ghex-46.0.ebuild
+++ b/app-editors/ghex/ghex-46.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index bcb867c55474..8d5493f4f6f2 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-text-editor-45.3.tar.xz 618756 BLAKE2B 45a6a78a665f833b0fb2e179125224e1d3757390deee5845b750bbc13368cd9b0b8521b290e42a2c5be82e2e7d78bab5e3aad256d1c87eade22547696807a8ba SHA512 d9fbdbb0dfbb5d10dc1b817f9ebf114a63e20724c3c230da683c8b7f1332371acf869c723a7067dbdafb5b4df23529944b40e5ec212e52a5a3220ca725388c95
 DIST gnome-text-editor-46.3.tar.xz 654128 BLAKE2B 42a3b89bfe977cb2160c390a0391da1634ae4b2490aaf2ba8dc3230695d6064aa5c3aa03596e3f3e075fef50bf4ed5890d52acfe053fe2e98e238c9a839e58b1 SHA512 576b60e3f005cefd9930838d12173609cf7a0e9f6cb16b91be0e68a215c5c814df67c18c8adcf5083b5e1a3280149ed4b0aa1d830ab367aa76949a9ce81efea4
 EBUILD gnome-text-editor-45.3.ebuild 1072 BLAKE2B e1562b655b253a1d4ce93a37a11af6a3682654d5c0da8738e67f7908ee6f3aef6d6be385430d2f673e424211578cebe4f24c446f771c97c7acbd749bee5a1e6e SHA512 512e455ad2d85d552c0cea41f5c6aff5b3b993dabfb15a0947a738a871c1bc0dd0f49860effac348038fce924889ba71a26dda72000c3fc94b079b7a0e30082c
-EBUILD gnome-text-editor-46.3.ebuild 1077 BLAKE2B 6e14aae43ed0e68147d952851051d0a15b381af5038b7dfad91cc2c5881056e7620207ab51afa605ca145682cb56c1771814a50b818799ef92014f6e7fd4c598 SHA512 251a4fee9a069d61eccfe15c633da8c8968f8de6ea858e1356f474d08eed27cdc710cfa2fd97aab084ebc15fed35164a8d8b9592bf40ceb3c16fa27920d9de79
+EBUILD gnome-text-editor-46.3.ebuild 1074 BLAKE2B 34ada3e249ffd560a506ae99cb75a4ed070e7f330b586da7e3c7a8e80c1f1f1711377c355637a1fc14da0d4d469e8bde6c5578b7cf3558fce13e52eacba724fc SHA512 1a0896c81a9398d14fe19efba317567c76d8463d48b92eafaff5441d827bc095c23822db5f02e4f8b6b385d0432cd13a221c7ce0f650c7770cdeb069e8b9b7e4
 MISC metadata.xml 358 BLAKE2B 908c67ba226a7e65b72a1cbaea99350f05fe9f904644c99b9c4e1e0c81f795c1420a0ca9cba1d56f59fb1b841151ffcf7d088add9f36a0e88314f7f52da94fcf SHA512 5862fb965119f76e19ed997e53e651778458604f1f9b69a1ee04db8eac52bdb6352da84ecb92555b31d3b8c62aa544c57c6040ed358af3beddd35fe356744d85
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-46.3.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-46.3.ebuild
index 817ed3c09384..252e4ae98ccd 100644
--- a/app-editors/gnome-text-editor/gnome-text-editor-46.3.ebuild
+++ b/app-editors/gnome-text-editor/gnome-text-editor-46.3.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 IUSE="spell"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.73.0:2