gentoo resync : 09.07.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
commit: 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree: 8c816148bcbd22757d892089c989ae614eae4f5a /app-editors
parent: 0f558761aa2dee1017b4751e4017205e015a9560 (diff)
38 files changed, 814 insertions, 116 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 1ecc8685deb1..f439e330586e 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index a07cb65dfac3..7ab413503cb1 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -10,6 +10,7 @@ DIST emacs-26.3-patches-2.tar.xz 1780 BLAKE2B f5dc9d041ea8a07549a817a2b18f84c8a7
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e SHA512 a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
+DIST emacs-28.1.90.tar.xz 47712688 BLAKE2B 00aa886946de3247954ad3b113d8f5861ffe4d46757ff4d33f4a88d688e9ffa86733316ae73809dd3017d4f8c3fe755bca658a752975a4c1ca716dcc4c206528 SHA512 50452ad29919f63d11b751ac4bc082e877e5792dc53f27ff90c22924f2b504f1049d138a8a31072cab0542bb552f9ecb356a04a570fd7754f285cfe494c0bea2
 DIST emacs-28.1.tar.xz 47699512 BLAKE2B 42a12bec2dc74f4838ae79b5589fb7439ff415d8ddd34f2ff7a8c503f909ddd4144ad35ae19c758d8627cfa9ed29276b326c5bec3853a77cd179e9fb17d22ad7 SHA512 c146ff7086aba49fa6c18adf4e485a59eb4c6525fddb9d385034446830b8bb0ac9e6fb76e7b6d94a9fddc41643415f36acad57a1ae16a841c97f61bc211459d9
 EBUILD emacs-18.59-r14.ebuild 4426 BLAKE2B 836c0e10eb9bee637d215bc13d695a631ba495728b5c8da1a2b6a29e31f17be8de4bb0aebe6401fecaee8488da0d5302b898b1a8b528eb18a0ebb46b3ed04e43 SHA512 4540d9bb492309c983c75c2cfb2f3aad2653252303d7d25c5d59723f43b9ece3ee43a216e3775c86f75714b29d2387371aab734c94cbe59d29cde64e077f27cf
 EBUILD emacs-23.4-r21.ebuild 11040 BLAKE2B 5743514f4e5be8649ed1b2a8bafaa873876c71e5035632f61bc4ef808e540edf144af1277c355bbb215f922be7dd7ac843af34a42f6b6109aaecb2ef2027a6dd SHA512 049dfb3eff159a1cfe6e62e4ecbe04df614b5cbb79b9a8619bb9793e08191754270e36295124e6fa6fe79832c2d20e55138d42080d5cf7fc4dce5bbd8ad6fe54
@@ -17,7 +18,8 @@ EBUILD emacs-24.5-r11.ebuild 10781 BLAKE2B 436f02959a1aa71165682f8e133dc0d7964cf
 EBUILD emacs-25.3-r11.ebuild 11091 BLAKE2B 02e66e0142e1fe4a5bd262548ee01bc399328d3b3cfeaf81bf67ad76dd10405bac1013de66d648f0e3cf5aa09b46ec69989130b514ad9989c5962a06d465bc68 SHA512 1ec9fdc1c130274277da7dd689640c48b9f3e439bf948dada9d4b79d6f2dee74e22d53e2854c1a2bd223da4b81916f2217efb9dd788e344004d50a28ba9f2b7d
 EBUILD emacs-26.3-r7.ebuild 11779 BLAKE2B 69ef04e1707478913d6d574cc9569e1b7eece4152f68c70112e9caf1e192b6b2d5f74fff7e0e89f4d730429861c1b4e1d70a0c1e6b9cb42565fefe740085f8d3 SHA512 6757269a4fdd86292b107d138d8ac39f44f055858d017e988ce005dcb4985ed3b49ce58b61335aa61fb031865f8a15bd1cbb46c402ae5466529adcee6280b552
 EBUILD emacs-27.2-r5.ebuild 14310 BLAKE2B 8875ffdd3002c88240d58891d67c840ea67bba108009e7fbf5963050a36b9e4f1cc4903e38c37a7456c3becf9a5c42c29bb910e8797940b9389b3fad8747948d SHA512 e47f5035c3d687b7a58ef3a05952ec301a00d17ae7633a9d5055c15f8fe9631d7d60927966eaf0b3e9fb1a3f0d892e3830269dc995efc2ff3400aad23815df1c
-EBUILD emacs-28.1.9999.ebuild 14795 BLAKE2B 8f6313b9dc044f3a275b948b2d198b281a4422e36c6aa787b494cc13194cc1b6c26d816a275843dfdc9bd45b540b8cfc0e67f62cc0f10f4cfc1cc23e2c3dff6d SHA512 ee41220d8407d12b77ee6bfea0bad06992d8573e9b1e91a8ca8cf7e9d066b3ed07d89a84cd6d4591fec63770c79892b8b2ae069d7471b8684765c8bc1d9d2c79
+EBUILD emacs-28.1.90.ebuild 14797 BLAKE2B 1e781ab85ddfd1ac3e699c89ebf5ca08f127437a0a1fdb254ce85fa0a550abc2e650d2e81829b61d96dcc2567228e5bc0a083651af4a5a0dda8e4454da77a458 SHA512 d286a760d36d98ea0b445384e28049d519959b716fc85a5bbf6ff2b1d07fbf793b7238cc7fbed58463992ad0cd47dc89d47f5d750a58d71cf0a621eb2a40a210
+EBUILD emacs-28.1.9999.ebuild 14795 BLAKE2B 9c3e4056feb08a72443cae30db1a1bbe555b7b454964bd5e6ba7663e0b92a4276641c19018f117f7fdf6548d18872a32956aeb727bf25e9530aa7179b1d91581 SHA512 447012b92de8f4ae909e2a8233e8ff02353095960300a9a31d2edc6ccb536f1a2b69f65d09b30f6d26ca19bf990081181f68ea82b785da754d4565f54cb6c049
 EBUILD emacs-28.1.ebuild 14790 BLAKE2B 9555b8b3d692fd33b9575e5666a63345369070187799e1a33556565c15a4f1c07b91197223e9db311911ca9ee4e797e9840b525fe8a2e8a9255f153c1bb541a5 SHA512 22757ca82108d2a47ee187119e82460a33c1df1d7b6cfd543a7bedd87e22aaff63083b2dffe47bcbb795430fa40e0a43477d0ef415a0de6e8b6bc5aaae425670
-EBUILD emacs-29.0.9999.ebuild 16277 BLAKE2B d6d43701019061a4903c3d78187b3d25f306460a3bf9936b869843235e83dd46ad1423c74002318ddba40a7188ddc4a3460bc1d4a8f7ecaefd1f3068ff940261 SHA512 fc5098ac1e241fe6db6457a6fdf6f56d4f6e5e3608dfc81ff17abdf57ac640aa9ec15ec6066abba013ae75d56a7d9b4d53bd6cc5c9906d22a45d08d004c2a57a
+EBUILD emacs-29.0.9999.ebuild 16277 BLAKE2B 1c2ac9eca96417bd14d115d060411fb3d0999f9b0c9cd77afaa65163b7eab525e4ff816d2c90253bbd9304955ddd600f965df97c4d6520c12dfae1ff46e12443 SHA512 e9794123c564caf3bec05ac041e5ebb73622c073fa1f2c8a04f9a900aa259d65a33d5f4260bc4004282e9477535c3b9b02eb171e163b02a40dd8f5bf18f02ff4
 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
diff --git a/app-editors/emacs/emacs-28.1.90.ebuild b/app-editors/emacs/emacs-28.1.90.ebuild
new file mode 100644
index 000000000000..7875c15c2dcd
--- /dev/null
+++ b/app-editors/emacs/emacs-28.1.90.ebuild
@@ -0,0 +1,449 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-28"
+	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 ~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"
+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 json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+RESTRICT="test"
+
+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(-)] )
+	json? ( dev-libs/jansson:= )
+	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 )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		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:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			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
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
+			)
+		)
+		!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
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( 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"
+
+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
+
+	if use jit; then
+		# 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
+
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	#AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	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)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" --without-gconf"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --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 $(use_with 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
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${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 \
+		--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_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with jit native-compilation) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	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
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake 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
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# 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/$(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
+		assert
+	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
+		assert "gzip .el 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-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-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	   (setq Info-directory-list (prune-directory-list (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
+	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() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+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/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild
index fb9a507f39e2..a3ba699d12bc 100644
--- a/app-editors/emacs/emacs-28.1.9999.ebuild
+++ b/app-editors/emacs/emacs-28.1.9999.ebuild
@@ -138,7 +138,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+		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}"
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild
index 18990e39f457..571ff6e3636c 100644
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@@ -160,7 +160,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+		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}"
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 288844b01050..21167cc87057 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST gedit-plugins-42.0.tar.xz 949068 BLAKE2B d9076d7ef420177b5d859bdee651b4304da183430d651510ea4ab50bc7286d23f536c1be47e6a6f425bdf90dcb31f015fa315e9ed530d54eb235832d92c4f438 SHA512 b7b6b6c71538ca767e20e4bdde0a5530657bf3d444fee5e1b2918b768188f224acfd2a44c4b0b6203ee3bde9ec47d2bacb0e25426cf49e500120461d44ae6b9a
 DIST gedit-plugins-42.1.tar.xz 946368 BLAKE2B 6ee8c42d5d5214cdb9095bce71623f9486c973ade69aad91eed4ae13a1ad5ab59bcc43d30078bdb9db46527160f8bc6b183a56c255d10f8027c4ff2e603fffa6 SHA512 2e36919f7b7232e4471e2c1277c33e2f79ff513b76574cf765e451064979587c170ae003c9517d33f3b9cfce916cb7f25f9e3d0a4f6a6b203086fcfff9f265aa
 EBUILD gedit-plugins-42.0.ebuild 2729 BLAKE2B 0c78a2720f64215aee779ffce2b87ec5f9fdc27ad376d729556c8520d1f2ef9f8ddb40b0253e2b1eb36ad86cdc5bff57be6f2c51ac5d38f4cd1f258c16c0bc27 SHA512 26ee76a158f1d42341d402c1bc77a147e6ad54a480f909af16fc3fcad900773405d12fe38be180e1869fad5f99c8e0b19ecf3d42d72eb1099c3969a0a82b663d
-EBUILD gedit-plugins-42.1.ebuild 2731 BLAKE2B e371cbcac77e43bd9b5430de78ed1691ada16fe393f865e39938337b501426d1eea91b382e06fd4b33b74cb7036aff6106a2b19e3c0089b7ab9a0c6f9cba9012 SHA512 b91092eec9cf47f8a9d7d0fc58bb66079b30d9eb5b1d6dff8b2e80006a6f4aacfa03a44efd0f64c84a6f94da5b6ab840e54d56d6d91b6fd3b4ded32d60cf90fd
+EBUILD gedit-plugins-42.1.ebuild 2729 BLAKE2B 0c78a2720f64215aee779ffce2b87ec5f9fdc27ad376d729556c8520d1f2ef9f8ddb40b0253e2b1eb36ad86cdc5bff57be6f2c51ac5d38f4cd1f258c16c0bc27 SHA512 26ee76a158f1d42341d402c1bc77a147e6ad54a480f909af16fc3fcad900773405d12fe38be180e1869fad5f99c8e0b19ecf3d42d72eb1099c3969a0a82b663d
 MISC metadata.xml 481 BLAKE2B 5fbf2df78aa40fce971741bb7d04de00cdc7a6371c2652ae0ae4bf253ee469c4bbb5e5a7c2b88226f95bb8865930dd19e9adedb191fd5a173ce915890ce40b32 SHA512 3b4b858659d1597e6c1ee574143de4864be8b75d4a6399d47bff85c4b18ec35472523bfeaa0815189a9008764405ee3b2fa53e73fcdc3edc8eda00a5f943f762
diff --git a/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
index 1bb2deb8b219..e908fd082b71 100644
--- a/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ThirdPartyPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 SLOT="0"
 
 IUSE="charmap git +python terminal vala"
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 8e89a180180e..b3ef2e5476e0 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,5 @@
 DIST gedit-42.0.tar.xz 6923352 BLAKE2B 751c4cae8ad0c146f2607f259ab72f4723c433934f75356bf71e44daadc82d4403e19228b52ec2f98c3fa7bc61274a6ed648ef8af143adb7c89213d39db64473 SHA512 d0f3c05e0a6f96634cc2deb24d95d906e5bb9d380b248a810560b60ac8590831fb25672a41e143fe7bba3882a08ec7ec85208f896751a7b66cabe4ade00cdaca
 DIST gedit-42.1.tar.xz 6916780 BLAKE2B a4350a62811ee689f9a7f70a4b166aa82185a17ab6c6f0f6264404756a2e7f2b93e81b2cf88beaf4141527720437f9e6ee9f7584e65e63fe242975e346d26586 SHA512 b7b1dd4ab31412a2bdeb6298065d1e3f52a9c813e26e943aea606b30e3de9b7690cc8ba478e2d0e49fb51bed57dd3f7c441184964270629d51dc1f6d132045a6
 EBUILD gedit-42.0.ebuild 1931 BLAKE2B 3d9a00b326c1c696cd224f4a9a22d328ddb04b2cf29ee3f881396fa412fcf262e8517de984f33ac22052a37bf636fb476ea5dc02b768445a6174ab7e4135f3f8 SHA512 fe4e7e13da0fbe5209794a8d209555b9423b7b6c37a118a8a9ae825cf29b175f6ef6d10da8c65ade5f22bd56f7a7cf63af5f002d8f34524dd1929b5d49e734ef
-EBUILD gedit-42.1.ebuild 1939 BLAKE2B 51245ba03c4ba43baaf8a15f0b7e4fe5a87236ffe0ff4b7b4fb9f5baa50e4743572c03ef5d148319bcd514cb15e02a132e26aa2386ff7380c867e8228bf638a3 SHA512 8441cf0605a1e4df336a31f26ba0a10d8775c14b4871e1a878c5f60bd44cb1e1bcac5ca3c4b4178106b8fcee671fe8043aab869d6210be6df430ac8dd3f88e92
+EBUILD gedit-42.1.ebuild 1937 BLAKE2B 8960ecee7a80e961bc976274d9a4d3df50fb98305ecbbab8f809e2d8c580fb4563a90686514981cfce725421c30164269338f3ec6f2c9f45f837eb159ade79da SHA512 be35c5184d2f4538b87b153e9a16a4283d2a566f68bf4eba6a562280f9678fc7efab4d98e7eecb11aa025434a5530f76e7d3a481b801d850a2328185ea342baf
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gedit/gedit-42.1.ebuild b/app-editors/gedit/gedit-42.1.ebuild
index 5d3830ed2ae1..4db42be18e1e 100644
--- a/app-editors/gedit/gedit-42.1.ebuild
+++ b/app-editors/gedit/gedit-42.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+python gtk-doc spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64:2
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index b5161a4ab38a..50390b468cc8 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,6 +1,6 @@
 DIST ghex-42.2.tar.xz 1003120 BLAKE2B db44dbb7c2cb7447dea3dd48a1ad90ee75c6ce5b9c76178550be1f638f63a9748144e8aac7434d526c24c3eddd0c6f7c0178c6976d2a11e32e943127b7f09219 SHA512 d7c64013d894d1803e03b1afc025a3f39fa65d156aaf7885e692b2b10574f320fb329abd8059a9c084c701a655d7708b8f0dec09f8300c8491fc75a66b475bf7
 DIST ghex-42.3.tar.xz 1003928 BLAKE2B 26bb123fc5a56fc2ff891a057ac276a36bc500a2e23f29bd26a85d6888035e2b8af7aed7f7b679a898c0a98bf042bb4e05c66e55a8fac0eb63422ee03823dc74 SHA512 9eff44892d203a2a9aab7239d85f61a860458fd7a8b4d7410f94d4f596ca5e2ff269faa81e620e7fc08bebe40c819a4c0cafefb5278121a9f2c8885bfd17c59f
 EBUILD ghex-42.2.ebuild 1141 BLAKE2B 4115c3ce3a4d786dbc56b9d25f529306c6d9e1495dd8d8fa5544c494b2ef5c83c24935ec1de544bc0937320f80470eeb02624a7a091dc09c811ad39fdae8ed30 SHA512 ddcd5e958f36b07a77a08a57a0f63be8755047427881b1e306c28a7b2a0e92bc36cf31a32e9b88d0f070b13034f93e9e6042545fbd9d7b089a09fa3026da5ea4
-EBUILD ghex-42.3.ebuild 1145 BLAKE2B 099778e4549aaa45647450e023553a1d81e0136aaaaf15102f994b8bf175f90b32810d7fde0ac19207d5eac0f1562a859a3d059e638bf6bbaa3538dee4d070ed SHA512 9a479828bf3fe8588c2cd90bb235338d286cd5f4a2cb5e4a6d05a2119b8c0d8622e8a483a2deabea8f5b2ca929bd0b49c3aadff0953ce3378012547b89862729
+EBUILD ghex-42.3.ebuild 1143 BLAKE2B e449fdc3af2d70bf0cd09dbe9e08164b4b50a7bef19b2bfe71ea18484e429df52c3b08f3d77cb74c72bd0dc59544381b352a2ac166beb2549441a319f5ddc22c SHA512 448b107ff23f0c84772b265e2020bbdafa961d1594147f853f18913a198b27b2753208d37c42e61f8fdae5de7880e26bc2890cd12d4e9026ca2b8b49d040a49b
 EBUILD ghex-9999.ebuild 1133 BLAKE2B 292942cc63824ecc03559a0fa8cf8151fa28996cf9ee167fe76df7d8a65209917b93ab23d99e0232de494140448d0e5db59f3ebda252e9efddd8ff547fde5173 SHA512 3b18ffc6c3ac5ea2db326e140bba172ca95809a4412f508e56a39f4e2d30315331cc31c205f137d414a3900e56ff88c971d12ec85f318804ef470454cc66f1df
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/ghex/ghex-42.3.ebuild b/app-editors/ghex/ghex-42.3.ebuild
index 60b2aa480d88..561fd9f946d5 100644
--- a/app-editors/ghex/ghex-42.3.ebuild
+++ b/app-editors/ghex/ghex-42.3.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 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index b5c63a9e2c57..43991a1bef3d 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-latex-3.38.0.tar.xz 1094376 BLAKE2B 0c02996dbac48c3859d33a0d504a64462e306d346ca22397820231fa8fe7ce2aa621a1435a02d78ea424fc8e9f5b7ac6e3e60180d8212c170d52eb4baee3b94a SHA512 c42cc1ff2c59afe4d995e9f13d9a858e2297827d5f9359cecd969d305224fc4b4d0306e0ab6aa1d9b7fc92acc25e597319299afe176cff1903f734fbc2ddf29b
 DIST gnome-latex-3.40.0.tar.xz 1050088 BLAKE2B bd8764450ee122599fd96a7e889291805fc09d854d77aa4e7d3b01709cda8bf0c38327d05de6117a19f325ca6a61ab42e014d27b941ed8e40f0bfd963dd65680 SHA512 822d86eac81994593e71428f1c893ce7d6970bb8e98349c8ad9cc6a113e3fdb49209f1bc7f19fb8d5a22da98d7650a822c8f8ab1f5aa096e6ea0cbaf74dfafca
 EBUILD gnome-latex-3.38.0.ebuild 1133 BLAKE2B a94f6595a5a076d4329b2e686617c276d5de6cc480250c206d752502f92cd16b825b0f5690ea1dd65069485be78e9c592e96b9f035e478d6a8d67cbc7983ac94 SHA512 eaeb0721f8e13a60738b831ae94cd1aa067e4c33aa5dfdb570526810d2157166557d9affb4870268b4e8f4cab09a4160150c25089c6b1baddf555420c6080abc
-EBUILD gnome-latex-3.40.0.ebuild 1130 BLAKE2B d892607128dfb1c69f2e201a4db1ebc95ccd38dd8d875a23839ef4915d391bccfb9a8ddcb6672b78675e9519a226cebf1349300f3a0f07f0c01bcccea795b432 SHA512 75bfd8e46a2f341f82ad7a5f53b1c78147d2d8341d47c6897b8c6fb92d9d81600ff4c5e973701da704fc03790d888d979a8a2afafce7216dce085383bb517702
+EBUILD gnome-latex-3.40.0.ebuild 1128 BLAKE2B 03a5c6c42afc5037644a514bd015406f373e4f134b55535d6f4d8c3ff2b421571a278d50097ab8700bd371f90a528c9b9d24a564fce33b549d4fa14f723ca653 SHA512 c1726566142ad8529b445a3fb7894587e578471d461ebd296795422d0c49349b9293e1f7fc90555077d0b276d49cfaf94b046d7e97faa7a498bd254f15d533d1
 MISC metadata.xml 465 BLAKE2B a26c9cc411d697492d945046338c0f37c5a41dc750cb28237cb527db1d55716323f9c6520ffc4d86e838e05b9aabe42101985362fb130d6941082ea3e3af297e SHA512 e01b512e26c05fad079c5cec65df8ed58cadb60b230c87a89de128caad648d243b46c1dc6eea64c21c2e0e319edcbde3a952dece428035db04176c8e144706a7
diff --git a/app-editors/gnome-latex/gnome-latex-3.40.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.40.0.ebuild
index 1f9a45676081..30d68a995d13 100644
--- a/app-editors/gnome-latex/gnome-latex-3.40.0.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX https://gitlab.gnome.org/swilm
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="+introspection +latexmk rubber"
 
 DEPEND="
diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index edc2ede6155b..3f280f117258 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-text-editor-42.1.tar.xz 1131572 BLAKE2B 8d1b59131d8230af0dc9e3029798f1200b6a00f8991e912c34ce4808ca5517e14763825aa8ed7aecdac88e422e9d224d3c027282f6373c023c4ffe9f3e4896b6 SHA512 4616750d15d61b2bd2c708e414b564d0aa6c1202c765fbb895e60cdb46f8335fbefa70a24e8d99f208b186f2c8c244b752475cefdbe0184a67b60de116d5ac2f
 DIST gnome-text-editor-42.2.tar.xz 1168504 BLAKE2B 0bbd02fab92c3ac2df2a38352561dda27662b4ede30d9cfd05b54d58c4dc4824375ee427e764415dc450a2f8dd793ba539e5681df984a20b1d121bd97a3f3008 SHA512 4373b048118c7a4253fe99a6ec6091c054154399d34e5a33f933d535f0e6c659023603e08e1cbcddb972d6385632b2b9351455eaa1398dcd7c50b3b4562400ae
 EBUILD gnome-text-editor-42.1.ebuild 1034 BLAKE2B 529a22dedf22189af0f29a43f858cf45a85407ebe0a2e3381d0822c482c3106ed306f9d566615fce747114f002d1b7ef723a22e3858a5cb8fb26b9dd21e47447 SHA512 a42fe9bc4648c8f32beb360c20531ca0df19055231467214280b50390cb22463f4b2683d12d67a22400544753fa801840ac38c45a732914ac5c845d8b60384a8
-EBUILD gnome-text-editor-42.2.ebuild 1035 BLAKE2B 9acfd1099bdcf2f61b276d6022449e7b48aed1649395ddb40afbf23660b853023f7eb3f4b4361dfbe85e2f6055e88220d61e1556403959f18eeddc16c19bdd38 SHA512 372fccc9cd4c7ae22081b4ea1f7a09e999f364844951c5e555df05268661001d16ce9f19e10a30058e2c941d33410e7d544b62ecf1c16f13a3c382019fc12380
+EBUILD gnome-text-editor-42.2.ebuild 1034 BLAKE2B 529a22dedf22189af0f29a43f858cf45a85407ebe0a2e3381d0822c482c3106ed306f9d566615fce747114f002d1b7ef723a22e3858a5cb8fb26b9dd21e47447 SHA512 a42fe9bc4648c8f32beb360c20531ca0df19055231467214280b50390cb22463f4b2683d12d67a22400544753fa801840ac38c45a732914ac5c845d8b60384a8
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild
index 979bb30ca006..7b3a567e5004 100644
--- a/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild
+++ b/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 
 IUSE="spell"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	>=dev-libs/glib-2.69:2
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index edaa3c622e14..5107f17ae15c 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -2,6 +2,6 @@ AUX gentoo.nanorc 4206 BLAKE2B eacba1d5db1475aa53f177d9c04819ff2b81c5fa196365f65
 DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4
 DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3
 EBUILD nano-6.2.ebuild 2349 BLAKE2B 53dc3860dd5366d797e3cae3943de67c960ebb626c932d91743897c67ba1bfd99280f9bf5ceb707cdc452b29cf15c2ec84dba2b38ee42297e655bd02d85954c4 SHA512 ab0772726974a97039bdd42bfc6d94b1b1e57f70b082e6bd8a37f88659d2382c031fc7cb8df7187ecbbb8a9129c0cf5f7aa5574c08bf6f16695ec49918eb5641
-EBUILD nano-6.3.ebuild 2601 BLAKE2B f5c3d6099d58630b85666120c19cb35081c343dcf56dccef413ab320b13955a974b87dc2386352e34f51804a8e13d7b9cb51043586344da84c04ccae9f6df9aa SHA512 33fac004b01a9b4b44300b48fd549b141a2e3f6316990dce709e23efde3841f02ffbb36066cb1409b26b255554b4276dcc1f10a860409ad029878cb578f8a77d
-EBUILD nano-9999.ebuild 2350 BLAKE2B c158c4c173632d6b05ae33b0d4b56d308fffd04a39354d1d009819c2a04a7bc3648599b342d34f66dfb674453cd46b520da8be593e58a7dea3188420d81e1e6f SHA512 822a2a3fd233de2bbb2e176328ec5e2825a07078063cc90015ef9ace5513cbb68e324c9405b8c4adce1a7067828a6c5e1cae6a7d238e5b4693830bf5509cc0eb
+EBUILD nano-6.3.ebuild 2644 BLAKE2B 7b25b18ad221e996b50a2989e7ecc7742fd071997361f15dbb0cb52ed98c8a472b5dd33f4143d547dc074e744eed8250cb6ef45640682e06a7f283d3a690821f SHA512 bf3a4392c3b6b9ad036de50286a69c21ac8cbcb2246d0cde07322682ad5d8a583b05f6ed0b970da09ecaec76b5b3a47216146587e364c5c7ce340b9884763423
+EBUILD nano-9999.ebuild 2637 BLAKE2B b9f2db1e3fc8556067f5bf400fa25cbb590346a82522f62e885a0828b3829cc81be2ab8267cce53c9cbd046b092be31bfbb5840bcc0566ecfed8e12231b50eca SHA512 9787aca7f721fd1e08addf7ce8105217433346912e195009e9fabfdb958206e785de7705675df7cd3b4b959c697c22162b390f535e2e86591547138faaf4b9b6
 MISC metadata.xml 1666 BLAKE2B ee53e5f23c192741ff6d59594105a9365fa8fddff9547dc7bbc14fe967d49c0d294bb56fa2e6d0c40d53dc64e8a031fea3294e62ca6ea2fc31dd028b00a423ee SHA512 58691db7bb106774da8b59db6afb199e2c61444a6feedbef09a22d6fef184512102f1fa4d7cfe7edf9171f3e7a542fac294eacc5eb1a3cb7de724b986b6884a0
diff --git a/app-editors/nano/nano-6.3.ebuild b/app-editors/nano/nano-6.3.ebuild
index ff0fcf25cd44..877c7dd59496 100644
--- a/app-editors/nano/nano-6.3.ebuild
+++ b/app-editors/nano/nano-6.3.ebuild
@@ -94,6 +94,7 @@ src_install() {
 
 pkg_postrm() {
 	local e
+	[[ -n ${REPLACED_BY_VERSION} ]] && return
 	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
 	if [[ ${e##*/} == nano ]]; then
 		ewarn "The EDITOR variable is still set to ${e}."
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 25ad3e614940..c2da47a585b9 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -91,3 +91,13 @@ src_install() {
 
 	use split-usr && dosym ../../bin/nano /usr/bin/nano
 }
+
+pkg_postrm() {
+	local e
+	[[ -n ${REPLACED_BY_VERSION} ]] && return
+	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
+	if [[ ${e##*/} == nano ]]; then
+		ewarn "The EDITOR variable is still set to ${e}."
+		ewarn "You can update it with \"eselect editor\"."
+	fi
+}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 8584ee68b75a..6981131b18c3 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,11 +1,13 @@
 AUX neovim-0.4.4-cmake-darwin.patch 2599 BLAKE2B 7d5d5298f3b32385bcd17c582865f554edf8f1a164517dfd802590f8f7f85b3cbcce2ae7ffdd9163fa87b55000a582129b6fb93835decff135f0029c1f8cc681 SHA512 1b4f5b1baaecacb807c6c2d022dd17c887f4a6236c3d452fdc9e01c3e1a868ca395e727343bfe793bf9a667889e22413683e3a196d8aaa4f978514b91634c849
 AUX neovim-0.4.4-cmake-release-type.patch 627 BLAKE2B 87c6e6fd487b923ec4146f2cb38a9a30be00ffa7b9d0a41b43f17d4f79860e4f097b76e093af474dfe20538332a7c6f233ebd57d845a74d7a8aead9cae2fec76 SHA512 b236c0b703ec2763a1179149715fa241573803a27dcb05324e2f766f49aaf53dfe0efc62f1c10aa6d58333ce115835e852608778d9582689550fb537103f361a
 AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355ea01fbfc232306e86a13097a1c069ea3248972be9d4da7b175c8c3c7e0fde7581d4ed9b431d73c119e9f8a63a7a15007aba31 SHA512 a1be27ebd18be34fede632f695bacf65699e9dd1a8b219120372b5e0c48691f595ba42725c4f795456b8018d668f471e3a042622a5f541af50c84a089d53c83c
+AUX neovim-0.7.2-cmake-darwin.patch 2418 BLAKE2B 8b80ddeedbb96d58301045f7512f9fff3dd682571c4f2cd9de57d9587efed7af5d7a44a081385d2a122b9ff456149087869f788008435311a9e21dd6c0d411bd SHA512 e5393466a3c4ac0db593f664b956bb1683f4e341c00de8b145599dbf7d0f5300c6169415ca44af21cccd8393a82747db6e0ba5cb5086a24ca5f7d82c1d1bdfd8
+AUX neovim-9999-cmake-darwin.patch 2416 BLAKE2B 12395ed66834f755e35232c1227dd1ef69e7de9c14b76544657e4dd5f974054427cafd74f6c91957f62f47c860a15da1a91bb85dd663c5021fbb6f0cc50d8b25 SHA512 9743e998a584619bc1bc0a1f739e970cbe8a16127c743178a57dd024628fadf685a60704236345ff069e9fb7c78b6207c4dc7de0d7b8e2bf86116fe0394b18d3
 AUX neovim-9999-cmake_lua_version.patch 425 BLAKE2B bd4a2f9f92c5a625456905532b2e121478431267fcb8b7a59ce0e7a315b75f47795ba13686608143f618cef3c17c21c47ca50ae6c6cfaa568324fd515da57924 SHA512 5e4d51262e5098fd5fa596b5a1cb9cc8b49c1ad4b7ecdc333829d6f8745d082e199e4d68338c53bd09e7e57ae3235ad30ca4613eec8eb9fab14c61cad5ba502c
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.7.0.tar.gz 10925354 BLAKE2B 0524d008ba1ebbe823406e94cfb048014b26bc394c686b2dd84bb7fae5a1f7f3acd42764b03b6efec10c0f25045c5838f624542b5125947e5f42d3b0d2ad1f84 SHA512 3597c54fb925a4d607bca9ba0fdb37df90ecb816da99f52baf46cc2ec79727a55048ba1d8d22c8e7d61f0e8e35546326b1d0d15c0a91de8bf5bc529c45fb1ce0
 DIST neovim-0.7.2.tar.gz 10933623 BLAKE2B c2db449a91f1685233da7125e3d4b49cb8fe26db5e498fd3a83340bd14842399474fcc7f2c78b88783195c6f7b0b8df196985b70387ed88972372a8866e2c721 SHA512 04d0fa5b23018531b70b53271821bf6944cde1bcec2210b99f5888e1339cd38f57feaa8e40874a3a504930e6614980947f31852185cbcd2ce106a0867896dd79
 EBUILD neovim-0.7.0.ebuild 3140 BLAKE2B 3b64420a63edd801b3a51fc23c2902e9aa57e3000dfda0979be57e7dbf61c690f0096e080dc6182f640a9400efbdfe99fcf3ae88468ff1081eff84d33e057fcb SHA512 69a13c372fa79a70b58419cd968f0ee325e73a00600fe17cdea8316d8062dc6b099e59db396fb99acefda62b0ef08ffdc2d9cd21b35ca18134ceba1766b2b7ba
-EBUILD neovim-0.7.2.ebuild 3096 BLAKE2B aae637597e01ed723877404fa32460b20f4282d2c30a9207d3d3e20c7ccc05e25444f93c8fd1e199019c9e52f061762eada0304a7b5d4a6cc27e2255f8a9e658 SHA512 2663d83ce2aa631dda3a2f2b9d48938bbbcafa76e926f5922f48def780347105cf5db89ec865cb71fcf8beec740aafe92ecc188719f3c33b8d081060d8af6839
-EBUILD neovim-9999.ebuild 3251 BLAKE2B 419d217b1b218bb6ce9303e9cc84e94bacc498498e479a9f910c64b98a45506b005105c24981bb2d59bc2365098f0c99927e7cace6602db9c3c6eaa057499ac7 SHA512 3925295d3e3bf5668a0dae0f9c8f420ff65b9c26104c57cce6d699a0385044ea29ec48d126ec6e53aeb250e36237eab7c9b0b2c20983b4c071b1676c343487c4
+EBUILD neovim-0.7.2.ebuild 3142 BLAKE2B 31b19a9c5b03cb0222a2671acb6254f9e6201cb842424863ca402c229eb3ee18825d4424393c81e204420b75ff73af6c705a3e6b5d83690c0f704695fe0ac050 SHA512 05afe19f95a8490fa2a39e3880f1dc0761d2bfb0f1123193c3e23b6e6e62a7eee02033c159c2ca249cb34b487d9690032202d0448cf8d81efcd4563fd7742a42
+EBUILD neovim-9999.ebuild 3309 BLAKE2B af43af4e917828b36914e73f6060a3e411921b66a55c1d8805b02cdb820562ffd0421b5359b00ab3ae29dc8a5217de12f6b23882f0b5bdca38313a0afa43d387 SHA512 3bf4fd433fbb60e6605fba82558602f87213d88876819a8fb680ec91c69570fb5beb3a87fbbc7a5da4aa6113cefce62f8a95ccaec4f899332c1c94ceea77e8df
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8
diff --git a/app-editors/neovim/files/neovim-0.7.2-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.7.2-cmake-darwin.patch
new file mode 100644
index 000000000000..a8404bd4a97a
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.7.2-cmake-darwin.patch
@@ -0,0 +1,55 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,23 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
+ # used for check_c_compiler_flag
+ include(CheckCCompilerFlag)
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+-  # CMake tries to treat /sw and /opt/local as extension of the system path, but
+-  # that doesn't really work out very well.  Once you have a dependency that
+-  # resides there and have to add it as an include directory, then any other
+-  # dependency that could be satisfied from there must be--otherwise you can end
+-  # up with conflicting versions.  So, let's make them more of a priority having
+-  # them be included as one of the first places to look for dependencies.
+-  list(APPEND CMAKE_PREFIX_PATH /sw /opt/local)
+-
+-  # Work around some old, broken detection by CMake for knowing when to use the
+-  # isystem flag.  Apple's compilers have supported this for quite some time
+-  # now.
+-  if(CMAKE_COMPILER_IS_GNUCC)
+-    set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
+-  endif()
+-endif()
+-
+ if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+   # Ignore case when comparing filenames on Windows and Mac.
+   set(CASE_INSENSITIVE_FILENAME TRUE)
+--- a/src/nvim/CMakeLists.txt
++++ b/src/nvim/CMakeLists.txt
+@@ -205,10 +205,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
+ foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS})
+   list(APPEND gen_cflags "-I${gen_include}")
+ endforeach()
+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT)
+-  list(APPEND gen_cflags "-isysroot")
+-  list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
+-endif()
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type)
+ separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS})
+ separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}})
+--- a/third-party/CMakeLists.txt
++++ b/third-party/CMakeLists.txt
+@@ -117,13 +117,6 @@ if(CMAKE_CXX_COMPILER)
+   set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
+ endif()
+ 
+-if(CMAKE_OSX_SYSROOT)
+-  set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
+-  if(DEPS_CXX_COMPILER)
+-    set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
+-  endif()
+-endif()
+-
+ if(CMAKE_OSX_ARCHITECTURES)
+   string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}")
+   # The LuaJIT build does not like being passed multiple `-arch` flags
diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
new file mode 100644
index 000000000000..5b829904a13e
--- /dev/null
+++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
@@ -0,0 +1,55 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,23 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
+ # used for check_c_compiler_flag
+ include(CheckCCompilerFlag)
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+-  # CMake tries to treat /sw and /opt/local as extension of the system path, but
+-  # that doesn't really work out very well.  Once you have a dependency that
+-  # resides there and have to add it as an include directory, then any other
+-  # dependency that could be satisfied from there must be--otherwise you can end
+-  # up with conflicting versions.  So, let's make them more of a priority having
+-  # them be included as one of the first places to look for dependencies.
+-  list(APPEND CMAKE_PREFIX_PATH /sw /opt/local)
+-
+-  # Work around some old, broken detection by CMake for knowing when to use the
+-  # isystem flag.  Apple's compilers have supported this for quite some time
+-  # now.
+-  if(CMAKE_COMPILER_IS_GNUCC)
+-    set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
+-  endif()
+-endif()
+-
+ if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+   # Ignore case when comparing filenames on Windows and Mac.
+   set(CASE_INSENSITIVE_FILENAME TRUE)
+--- a/cmake.deps/CMakeLists.txt
++++ b/cmake.deps/CMakeLists.txt
+@@ -112,13 +112,6 @@ if(CMAKE_CXX_COMPILER)
+   set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
+ endif()
+ 
+-if(CMAKE_OSX_SYSROOT)
+-  set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
+-  if(DEPS_CXX_COMPILER)
+-    set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
+-  endif()
+-endif()
+-
+ if(CMAKE_OSX_ARCHITECTURES)
+   string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}")
+   # The LuaJIT build does not like being passed multiple `-arch` flags
+--- a/src/nvim/CMakeLists.txt
++++ b/src/nvim/CMakeLists.txt
+@@ -205,10 +205,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
+ foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS})
+   list(APPEND gen_cflags "-I${gen_include}")
+ endforeach()
+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT)
+-  list(APPEND gen_cflags "-isysroot")
+-  list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
+-endif()
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type)
+ separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS})
+ separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}})
diff --git a/app-editors/neovim/neovim-0.7.2.ebuild b/app-editors/neovim/neovim-0.7.2.ebuild
index a340a82ba6a5..0c951d155648 100644
--- a/app-editors/neovim/neovim-0.7.2.ebuild
+++ b/app-editors/neovim/neovim-0.7.2.ebuild
@@ -69,6 +69,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
 	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
+	"${FILESDIR}/${PN}-0.7.2-cmake-darwin.patch"
 )
 
 src_prepare() {
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 4316da6d93cc..dc40449cb307 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -68,12 +68,18 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
 )
+
 if [[ ${PV} == 9999 ]]; then
-	PATCHES+=("${FILESDIR}/${PN}-9999-cmake_lua_version.patch")
+	PATCHES+=(
+		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
+		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+	)
 else
-	PATCHES+=("${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch")
+	PATCHES+=(
+		"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
+		"${FILESDIR}/${PN}-0.7.2-cmake-darwin.patch"
+	)
 fi
 
 src_prepare() {
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 36667cd7cd08..e04001254dd4 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,7 +1,5 @@
 DIST okteta-0.26.7.tar.xz 983388 BLAKE2B abe5abb678c0cae7538ac5bdf68b3e9285c405996194e03dcb3f74c397124805496a67ee1b9b2d8c2676dc3fca7d743a012898056aef82f5f1a1e998ee36ef60 SHA512 829294e0ed8b01be940b215334d9291bba1af01fded05511be33a813e9d090bc06f0af90dfb49d45d44814ae38de7c9cb6427215ea076b8401a66734aa42ea25
-DIST okteta-0.26.8.tar.xz 980328 BLAKE2B f8cdc9246c24c922f3f5b7dd659d3d00c3db58682a7d00d4b5f19d84ec1b376d5a72b0ab548698f44bd34018897bc7aec30874a8bbdf37c1ee9832737519a51b SHA512 1e6cd6c0386573b13cc107ec735dc9319860cbb458b8fe72773a50005b3327cd0257b5d9fc5b3bee1cdaddc12accb9106b2ce566fdbbc1f698617a4ff4b5c5f6
 DIST okteta-0.26.9.tar.xz 990484 BLAKE2B 97430ed8a5c8dda422dfd43a91c04fe778581caf475c74b324a26d772777030d73ed799dafa6662b225258ae76c1c37bd38c7d3c97d89d28928106d10f84308a SHA512 cc98f7923a26de9548944ebc207284879607707f41065c847707ac5876c04d31926bb4edf82062cd4d6ade2df64d7a2363d8dfa711524574514ca0dd260b4a9f
 EBUILD okteta-0.26.7.ebuild 1759 BLAKE2B ee45723b1bc86ddacfb559b3dd178a7563e62e83150a1e3f61cabed62a34116744e4032ab6068653ccc0bb78c60262a3644d08c1e932afc82446cb15b1b1a9e5 SHA512 0843bdc737ed5a9bd214e49395b5468c7ae37230db3fd733d774d309722f778df7cd51b94f887544de083e53c50cdc697cbd7bc39ba660c4326eae6ae910a05c
-EBUILD okteta-0.26.8.ebuild 1762 BLAKE2B c5dd1eb6329f206be08bacea292fd3ff2b12da6a1dbfb8674c0cfb4117ee3bb299358fce6c6cba6a54a5b817594851678f5fdfb2fe7ce9b7fd529e47ea6e3cd3 SHA512 443435661b95a9604d6f0a78bc5922774db888a43038180a1c1373001d38a337fd6ea2fa54dfbccc8d3bb6957d327ab06568875471e72d8f6192d2de26337da5
 EBUILD okteta-0.26.9.ebuild 1760 BLAKE2B 2cb53768fe567cef703a5edd46d8031bb795e88b3ca30e362ae69a6f468449141ce189b7ac1704b4a6bcbbb816925058edd3ff40e912b437f88d51ba305fe435 SHA512 0efcc5f9b6b29d85e321b36d4f6f79f48bee9667f6a07ad502a3084f260f522907575f4b9608b590e7d9c00ae0dcf8aec9163e3e7faa8fc1d88715601d0383e3
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/app-editors/okteta/okteta-0.26.8.ebuild b/app-editors/okteta/okteta-0.26.8.ebuild
deleted file mode 100644
index cf8171388a8d..000000000000
--- a/app-editors/okteta/okteta-0.26.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Hex editor by KDE"
-HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2 handbook? ( FDL-1.2 )"
-SLOT="5"
-IUSE="crypt"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	crypt? ( >=app-crypt/qca-2.3.0:2 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOMIT_EXAMPLES=ON
-		$(cmake_use_find_package crypt Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=( -j1 )
-
-	ecm_src_test
-}
diff --git a/app-editors/ted/Manifest b/app-editors/ted/Manifest
index 8fefc649a28d..a1ca2e5f15f8 100644
--- a/app-editors/ted/Manifest
+++ b/app-editors/ted/Manifest
@@ -4,5 +4,5 @@ AUX ted-2.23-0003-avoid-compressing-man-page.patch 1116 BLAKE2B 861d52809598d0e9
 AUX ted-2.23-freetype261.patch 273 BLAKE2B 3a9b52da5de4b8d991298c438a5589b1c70e70b0733d561f0a0c259b7eb1cd39b418d6f472bfb24534b24f19bfe83623827c16a371dece16dd33171369006da7 SHA512 f8523865ad47a552d000ee14380c40ffe22cdd5287cb6fd6f79b7afe4a6ae4742aaa999c9c4d2d79e00b538f5b83106ebeb24f1aa25cabb656418759db9c0921
 AUX ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch 637 BLAKE2B bf905f5e5609b014256519587a7b640dfcf8fb0c45739a71df8fdbb3a269c834fa4aa96dc00bec79e63268e57faf9d5ded9568e72561e1f817cf7e630d1d1c1a SHA512 3e2c7ff378f9a537601cf3422c83deb32aa907bbaf80a6b87c68dee5b1fe44c90880230303b38eb9c6095ff5932d6e26fc764f8e69aac85241aadc4b44ee126b
 DIST ted-2.23.src.tar.gz 4672208 BLAKE2B ca5f0e0a6a1d00a50da6986455faedbb20cc1246737233c8a3a161b4f653c53b1647c7fb41c774082116ed3e4a0736f8dd35504a54a92dd8e6a6e9124e6e9850 SHA512 c6541e5a07545a08b30cb9b33429d9a7675f9252df32ccca5cdb4f2ff09978085d28d015a42922baf8c95db1ea6379a9d1088541aafd9ce45b8870212496849f
-EBUILD ted-2.23-r1.ebuild 2088 BLAKE2B d0bf64100769295cdae75c29ef2f68909c3f2a39a4b967f80ef60a07e1c6b4c93313352abc391a058920d14e0eafe2711354f982fa6a8ab6209504cd3793a70d SHA512 a961e9aa74977c55de053e6933480995d76401985c98a9a16a12404b9d512dfc9191f9cc2ae5cd8dce4b90f9d8fae8bd63a90b888451045837498264dd8173f0
+EBUILD ted-2.23-r2.ebuild 2102 BLAKE2B fdc3deb3e68cef0debb1e7b0e6c07fc712c72ed5f7aaf667163871a459af5242049e7cdc7c822c3a7626721b81a7f2932763f62c9d21c58906eca4742c161afb SHA512 32ab210d0ff903c7bc1124f28c2a6ed988093ff9b67d384178f1cbcb46ad0f859021a911d2c2e803757c1eba8f690960d4ae9af93473196bdfc3cbc9bb8ea5df
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-editors/ted/ted-2.23-r1.ebuild b/app-editors/ted/ted-2.23-r2.ebuild
index bf664679bfba..4ae1b4f5741b 100644
--- a/app-editors/ted/ted-2.23-r1.ebuild
+++ b/app-editors/ted/ted-2.23-r2.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=7
@@ -18,10 +18,10 @@ RDEPEND="
 	dev-libs/libpcre2
 	media-libs/fontconfig
 	media-libs/freetype
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	media-libs/tiff:=
 	sys-libs/zlib
-	virtual/jpeg
 	virtual/libiconv
 	x11-libs/libXft
 	x11-libs/libXpm
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index d3647ffe77c5..cd031b84495c 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -2,6 +2,8 @@ AUX qt5.15-support.patch 632 BLAKE2B c2e4f3801231a08ecccde92d84b1836c62d44f2ae63
 AUX texworks-0.6.5-cmake_lua_version.patch 219 BLAKE2B c09494099363fa26e4110c23b0e1c06caf44cb0040578bfa33457741fdc8fe4698a2f4000a6dc6da4cd19dca6039c251cd1b875a27dc41abfea03b5cb79c341a SHA512 66ccbbcf313596c674833b36f222c8aa8bde541dfd58a706814aef3eaeec50247bec954a4f7137dfda31df9cd7b15163200592acb8433ed252d961ebf2b9ea32
 DIST texworks-0.6.5.tar.gz 12140935 BLAKE2B 660606fe2e53d5f2a53e80792efbee368f5f2f402ab974761efc6e11a6f2233fd04672dcc3bf0155a070162616c1d5a9c7313825890e6fb0c6c4dc7af2c62d29 SHA512 d97bb7c3ad7bbb402be80556027ef19076dae91bb9449df2b45d54e89b492e32b8d6f109d1bda9388424af6218866d84a8c296c9bc2ef644cf2fac0d4b24939e
 DIST texworks-0.6.6.tar.gz 12385550 BLAKE2B 241a9e4649e489964c62bd44ca310ffa7d67ebcb6187568dbf5e5b7916d81e3d846f0492a22e35d2c8a57d182d32d129600570e3836c671ae723c236f82d6bd8 SHA512 65300dfbe4e0e2f3b387c868e343f6caeff4602b47afee5a02cce82e0e23b74fe559b4b54fb65d778748de56f38581305a9b3a53d743c957b7dc14ecce4546d1
+DIST texworks-0.6.7.tar.gz 12394465 BLAKE2B 0a2e0531ef0f296cd2be176baed14eb0c21733aeaf3ca3c43e3ff02e48bf68be8953db67f955db0b5a56676b391e2f7700404e9ea52907092d58cbbccaa02adf SHA512 b1c22c1f9bfae2595e77f0c98297cc690f62aac38125bb576d57cc3a0666d779e75af23ccf430a3547215065596b4ea60758233947cda06df8e1a7fc95c46b65
 EBUILD texworks-0.6.5-r100.ebuild 1697 BLAKE2B 221acad932dcb1242852069ff66f88eca9fa1b0e51bf592392a4de80b04c95db801c594854d4f7baa004a2e7d36f9ccd5cca4447595ec2297b56e0ddfb91f671 SHA512 1ac86be4dd2ee4d3509b323a0176a5cb9f1469bf5282a29be1b2a047a62073b217064e2af8ff0eaf1dfb674834206af160b0284c74cb29aca00315e217a798c9
 EBUILD texworks-0.6.6.ebuild 1670 BLAKE2B 47207b745b6e15bffbc18c33ee0043187a185ed59649b8851fefb96a2b11cf36b922283fd09c48bd5b11eb54717ac4a1f783646d7f5f8925557b33090606cfee SHA512 589674da802fa5c2679f463a6853515a992151b94ebb5cb8d3133df882208106afda2a43d35c041373e75c614346c5d7ef2b44160365e0c683e4d92f08a42a6d
+EBUILD texworks-0.6.7.ebuild 1622 BLAKE2B 54f95d89f93ea2652c8121256c6e1138d16a6b7da437c03c27304657c1fca396d7309d8b27bb658123e1f77a6dcdd39f4dedd9852fdcf9b18e10bfd21128baf1 SHA512 ca300c1ed4767212c99cd6ab8adc806603c06e3cbc61c4618b01a8dd6584bfab913bbbf5612ca617289e5b570801eff4c1b70bbbd8046bee09ea51ed9891ba1b
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/app-editors/texworks/texworks-0.6.7.ebuild b/app-editors/texworks/texworks-0.6.7.ebuild
new file mode 100644
index 000000000000..c0305cb4055c
--- /dev/null
+++ b/app-editors/texworks/texworks-0.6.7.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{8..11} )
+CMAKE_REMOVE_MODULES_LIST=( FindLua )
+inherit lua-single python-single-r1 cmake virtualx xdg
+
+DESCRIPTION="A simple interface for working with TeX documents"
+HOMEPAGE="http://tug.org/texworks/"
+SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-release-${PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="lua python"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="app-text/hunspell:=
+	app-text/poppler[qt5]
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	lua? ( ${LUA_DEPS} )
+	python? ( ${PYTHON_DEPS} ) "
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.5-cmake_lua_version.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Wno-dev
+
+		-DPREFER_BUNDLED_SYNCTEX=ON
+		-DWITH_LUA=$(usex lua)
+		-DWITH_PYTHON=$(usex python)
+		-DWITH_TESTS=$(usex test)
+		-DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks"
+		-DTeXworks_DOCS_DIR="/share/doc/${PF}"
+		-DQTPDF_VIEWER=ON
+		-DBUILD_SHARED_PLUGINS=ON
+	)
+
+	use lua && mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" )
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index de68a38c881b..b179dbe7bc1b 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -3,8 +3,9 @@ AUX vimrc-r5 7337 BLAKE2B 3f28db016b3956b4c5e2833ff4440417d3ccdc446618a776119513
 AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e29513da8caa6c28c27e44131b2873258e3ff5a0ab232d66f75a8f051ccf7a4d940b3b0102e6967dd SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
+DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18
 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
 EBUILD vim-core-8.2.4586.ebuild 7145 BLAKE2B b80dc1b8ef8b8b8601445d66396d0e3ee4a13115552930cacf8de13be456cd54c474025a7e45de83926d691ba0c4850524e5a076ec6905a5cdcfc117185d6adb SHA512 86e425f416065660943f5ef7f34bad34e5fe97ae95c07d3c17f391abc99f0326515ac4718d10a2e8b6dccf3197397cd84fe78f3e4a5bc2b27be6107a1c3c14f5
-EBUILD vim-core-8.2.5066.ebuild 7223 BLAKE2B 6093be8f1623e297f7d2a68c606b6016395dc0a7b66039e8bed2eb72b822b5653e93de8c5c40bcc8d15185d1d0779115f825ed143e1e4fa8a5fc2ea09578be54 SHA512 998ca21a03d528e4f45cb90512be707ca1a90f44c18db2e5a8ef3a76d76f1a56f73454cfdaa500e5e4a75fe867ae1cf541c3f2320ddbcbb71aa628d49309c9e1
-EBUILD vim-core-9999.ebuild 7223 BLAKE2B 6093be8f1623e297f7d2a68c606b6016395dc0a7b66039e8bed2eb72b822b5653e93de8c5c40bcc8d15185d1d0779115f825ed143e1e4fa8a5fc2ea09578be54 SHA512 998ca21a03d528e4f45cb90512be707ca1a90f44c18db2e5a8ef3a76d76f1a56f73454cfdaa500e5e4a75fe867ae1cf541c3f2320ddbcbb71aa628d49309c9e1
+EBUILD vim-core-8.2.5066-r1.ebuild 7135 BLAKE2B 517fbdaf0d2f4f7d03f72bb148d2d1d93940f2eeb9deb1dad3adc022da3375097e85fea0b2ff9565dd73057d31ce5cd25b757301df1a40f68517d5b99d2395ad SHA512 fa9abcfc6a2986844bf5f8056cd9044fc00d709a0aec6f7fc26c78e1e7555e9da36fe9d356afbe94e685fb3d4873fe1ca744f0fbc463b5b2f34be4de016fe73c
+EBUILD vim-core-9999.ebuild 7135 BLAKE2B 517fbdaf0d2f4f7d03f72bb148d2d1d93940f2eeb9deb1dad3adc022da3375097e85fea0b2ff9565dd73057d31ce5cd25b757301df1a40f68517d5b99d2395ad SHA512 fa9abcfc6a2986844bf5f8056cd9044fc00d709a0aec6f7fc26c78e1e7555e9da36fe9d356afbe94e685fb3d4873fe1ca744f0fbc463b5b2f34be4de016fe73c
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
diff --git a/app-editors/vim-core/vim-core-8.2.5066.ebuild b/app-editors/vim-core/vim-core-8.2.5066-r1.ebuild
index 3663d9c774fc..2ab640fe7da3 100644
--- a/app-editors/vim-core/vim-core-8.2.5066.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.5066-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+		https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 S="${WORKDIR}"/vim-${PV}
@@ -44,8 +44,6 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die
-
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches
 	fi
@@ -82,7 +80,7 @@ src_prepare() {
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
 	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
+		echo >> "$c" || die "echo failed"
 	done
 
 	# Try to avoid sandbox problems. Bug #114475.
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 3663d9c774fc..2ab640fe7da3 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+		https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 S="${WORKDIR}"/vim-${PV}
@@ -44,8 +44,6 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die
-
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches
 	fi
@@ -82,7 +80,7 @@ src_prepare() {
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
 	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
+		echo >> "$c" || die "echo failed"
 	done
 
 	# Try to avoid sandbox problems. Bug #114475.
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index ffe2f7d3f15f..ceb8838bd68d 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,8 +1,9 @@
 AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e987cb287d802c964baa502da4d08f09cb8684307481fec503c1d8cae7f4f6e61500f1cb06033a2c4 SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
+DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18
 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
 EBUILD vim-8.2.4586.ebuild 10091 BLAKE2B 9073b2cdbd5e910154e4f5ecf845d46b10407e1b363a05d98dd0e688071abfe5d67209efece7997f48197de5951f8a1369ca3b424cb44d69a1d532ff7167ee2b SHA512 3907db9b383f43378ce0c87c8abcbf64aa64212462be5873595a796a562af34e8875a5f38b9bc55363c94d0a9eae9ed9f58f386062ab2a73e1fa7dcee5479478
-EBUILD vim-8.2.5066.ebuild 10508 BLAKE2B 494cd178edbd39072180dc1b995820db78d1f1589e6f7697d927ad418fd551e0f6f752168e629f212776a67c9b84f3e3806008329bcc40e62325a144d6c359ad SHA512 8a318f4d1e5ac03d356bca7f8e2a79e9658f4bede8271f09dc4f6d813ebd51850dbf012bb6dfb92d6acec54e55e90da88fdbee59c59de012697eba58b8b99a37
-EBUILD vim-9999.ebuild 10508 BLAKE2B 494cd178edbd39072180dc1b995820db78d1f1589e6f7697d927ad418fd551e0f6f752168e629f212776a67c9b84f3e3806008329bcc40e62325a144d6c359ad SHA512 8a318f4d1e5ac03d356bca7f8e2a79e9658f4bede8271f09dc4f6d813ebd51850dbf012bb6dfb92d6acec54e55e90da88fdbee59c59de012697eba58b8b99a37
+EBUILD vim-8.2.5066-r1.ebuild 10420 BLAKE2B 04e5471f93e5883fb3d6a4177b1a09937ce247bf227c71f0056d912554aa64676e66e86aee044cd2f31c90b0544b1033988e159811b3188a41a05537084878f3 SHA512 78aaecc2b156e8fbe304a3d3af5bcbf4b5d8806b199d12221bf2203035cfbdb0d2c497f9c28ea7d2f5100c58f2d5e205c1bd2990aa4aeee955ba662d6c80f07e
+EBUILD vim-9999.ebuild 10420 BLAKE2B 04e5471f93e5883fb3d6a4177b1a09937ce247bf227c71f0056d912554aa64676e66e86aee044cd2f31c90b0544b1033988e159811b3188a41a05537084878f3 SHA512 78aaecc2b156e8fbe304a3d3af5bcbf4b5d8806b199d12221bf2203035cfbdb0d2c497f9c28ea7d2f5100c58f2d5e205c1bd2990aa4aeee955ba662d6c80f07e
 MISC metadata.xml 891 BLAKE2B 00a55660fecbeca3df9b50e7400510fb92bbcdd42ba588725580c153d74a4731b31dd0ebaade4f60a4db88c695a7f60663773d63046c1b38aab0363520b8858d SHA512 76eebfe4d34eb609b29946b724ae450916eeab2573edf0f5aa87325f1e9abc8a2ca45d7abe3bfa9d996670d90e7cde17cb84662f69502a4b4a5b44b14b4c8890
diff --git a/app-editors/vim/vim-8.2.5066.ebuild b/app-editors/vim/vim-8.2.5066-r1.ebuild
index 0afdaaef7172..bcec32097911 100644
--- a/app-editors/vim/vim-8.2.5066.ebuild
+++ b/app-editors/vim/vim-8.2.5066-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+		https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -80,8 +80,6 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die
-
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches/
 	fi
@@ -120,7 +118,7 @@ src_prepare() {
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
 	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
+		echo >> "$c" || die "echo failed"
 	done
 
 	# conditionally make the manpager.sh script
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 0afdaaef7172..bcec32097911 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+		https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -80,8 +80,6 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die
-
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches/
 	fi
@@ -120,7 +118,7 @@ src_prepare() {
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
 	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
+		echo >> "$c" || die "echo failed"
 	done
 
 	# conditionally make the manpager.sh script
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index bf7a9d8bb66d..2bc15e02f35d 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -10,6 +10,7 @@ AUX xemacs-21.5.34-autoloads-parallell-make.patch 8290 BLAKE2B c9bd81b499cd94a95
 AUX xemacs-21.5.34-configure-libc-version.patch 957 BLAKE2B ae69bc6a5d3858571fec40d65bd097c65909fdccb282dbc05fe7014e654f73736f742c68ac24b8118c209b05dc399e2d1cc6109f288ae049e48bfee140d71d1f SHA512 e41b6fd7601dbd59c775e62f390e17c194eab9360cce2ae3d03e1b5f4f7fc59080ecd76401eab5211c2f0ab4fea4baf9746e10675ba00f05115067008cce5a6f
 AUX xemacs-21.5.34-gcc5.patch 1194 BLAKE2B 1b042f7a7034fa7066279e91d96e6f1c2f962273b4aa26ca3a6bfb5cf737572d97c1d7f11dc87a15e44a2516e9112cb8f4ba8d916feb856bab15beeecce6cbe9 SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b
 AUX xemacs-21.5.34-glibc-macro.patch 1369 BLAKE2B cd03d4c6d3629ab186c60a869cd99483dec1192dddecb91466e72c83b3f2969a0f02ae34953da3511edc80bd17ed880168b98f661fab1a0642d4e2944cc0411c SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176
+AUX xemacs-21.5.34-module-autoloads.patch 5056 BLAKE2B d36535bb6ea75d832dae0300be4e46af7cfb5a657b4ab888337a9b22b66e489a1e2d7a45ca680c1e79b7a7752d0761d9b2324748a6322575fb806496de28d35e SHA512 875b9a59a77174a1c591e54cf70fd1b07d2dc36e2591209a4335c74c89911a06230ebef38d53dab8b2de95e3177253af54dffc3e8b107f4dbce64f5063d447f6
 AUX xemacs-21.5.34-ncurses-tinfo.patch 699 BLAKE2B 0978b118040b1399bb042efbdfa54968a701b37a5b2f505f4dd1af9971b38c0a52cbe8fb9272ecc19c030bfa79fe28d56df358484116eadf3db9396b7ce09d17 SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765
 AUX xemacs-21.5.34-no-lock-on-finder-inf.patch 3946 BLAKE2B 195cb81df5ff7aecdb5f616178388a620d05e41975697df238928c2209a15652762aefb461eb681e3b6eb0f1736127d45101b6da478d2bb01d7b0735d0a94329 SHA512 754031e82c4c5236a3119973ee9d6635fc93a1d5b27eb4ae1ada2bf06ae45fbd306f00dc3bd8fbd1df9b855b1b031b24801bf1ba4c6f5e8f66903b151a3d0781
 AUX xemacs-21.5.34-process-test-qa.patch 501 BLAKE2B 11130d14b564181e35820acd99266e2fb8ba18b742f993ac6161d6b6cc04b8a14f92f4ddd8f21912e1521db88b8b6df0efa47df5dfd2cb1fe0bc20338d9553fa SHA512 03676ffa352871e278cf1cffb8bdc1e1c9052b49517d4009079734b5ff1de647e9808fb4c8a620ab9a8ec5dcbe02a454df0e11ef1f9e7867014c8fec830c90f5
@@ -21,6 +22,6 @@ DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31
 EBUILD xemacs-21.4.24-r5.ebuild 7114 BLAKE2B 051a221c2973c4d54741e89ecd3152cc95b65ac63318099c98c73c16ce5ba43dc940331371ee88c79af6023c7c9ac8a4720d99483e5ce91688d0858a302a5fa7 SHA512 fefe0fb6d1c3f9ff66a50acdbe0e2c9769df01b5447a8e25fd9243733da728d16c9ac5d54539d40c0a0dc83cdc5c3e949d661c7c9b6c9aabe63cbbf78ff8f287
 EBUILD xemacs-21.4.24-r6.ebuild 7139 BLAKE2B a8e8c5c1cc41f60ebf88f454d7198936df70c47ccca00c5abd10a901d2e8a2c003699d336d0ce018385fe2cacea2cc0d53cce24c174293216f1b8beb6a2266c5 SHA512 c7c09d1195d6f5bf291b463700d1caa05fa3803ab8f7a4b29ed7cfdf2c1e2beccb24a14fc904992e66c0190d6fb70db936e348512f479cc5aec42b072bff6b49
 EBUILD xemacs-21.5.34-r8.ebuild 7339 BLAKE2B be0b1d94b9ab0e113c14d9563b82a4feb2c9fd7601597269efa608df7eba950b03dc6f5502c5b439962eac2fedd953285f4a45d7f212e5e34147a7530b66e4a8 SHA512 e44fcec4cf5eee02f3800c153f35295454f0d8c3f10cda3d30245518e7199f997908333a1d7f9f37ca79dd2264bd397b06cfac89e6be7f6ab0113beff7ae824f
-EBUILD xemacs-21.5.34-r9.ebuild 7346 BLAKE2B 6516c9543c5381cd83964c7170f88db536c88cd0b7457250e33140949d9d77fbc93cb64e54344adee820c222554669702d4ba9591aa69594bf91bdccc1909673 SHA512 ae36bc78eb159759b05b3f367fc1a56b79a92c80bae1d3ba27d481b6475dd95549516a665f358d2ca787e7a50b1e09ecb09834c00a46ff0adec9a015e4954723
+EBUILD xemacs-21.5.34-r9.ebuild 7396 BLAKE2B 1af85c64a63e4783969a554542c3f2bbf1bd0bfbdcca9ea49024952a14768d71c8de06d6b5003322bee61bf571c05a1548023a5d0c2fda609a4634c0a51c75d4 SHA512 57e95f0c1b338b52d1f0f1cbd834e06bb50eec4aafaf0eec350f0c65b347a83cadd5deee9a0528d8b8ec186ee070852fbbfb10018a7f68fdaafc62d8bc87d3ea
 EBUILD xemacs-21.5.9999.ebuild 7224 BLAKE2B d3907244a27a25b0def8ec0f47d82a54a7356632c5024d7e740ee8992bbc6da9a309a480599a10fda686731da78ae2fe23610b112e81575b2dda785adf23d60c SHA512 1bca46da3f9fe5749c7bc144899c005a982cf84d30692eb107be5298f92288308984ce31eeafda9887056f7ffd09bc06f4077c8e124a46b9ff46ad6fe42268c5
 MISC metadata.xml 683 BLAKE2B 060e4f7830a96404813a550debecf83c2de3993183d41638362ed01a3a6240bdd33a83c0db5e31a2f2e821046fb1c15199688271c27611689aac1bdf02bcde14 SHA512 176625d3c972766aaecd10125e69b4cdcbedff958b842b2ac2b6a39d728ec868b3311ef13f6854122063810c5125f48d73cd1e68083de5ddf3ef85f7f2b09cdc
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch b/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch
new file mode 100644
index 000000000000..8b5443dfcb10
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch
@@ -0,0 +1,115 @@
+diff -u b/lisp/update-elc-2.el b/lisp/update-elc-2.el
+--- b/lisp/update-elc-2.el	Mon Jun 27 22:14:53 2022 +0900
++++ b/lisp/update-elc-2.el	Thu Jun 30 16:36:19 2022 +0100
+@@ -144,12 +144,12 @@
+     (load (expand-file-name "auto-autoloads" lisp-directory))
+     (when (featurep 'mule)
+       (load (expand-file-name "mule/auto-autoloads" lisp-directory)))
++    (when (featurep 'modules)
++      (load (expand-file-name "auto-autoloads" module-directory)))
+     ;; We remove all the bad .elcs before any byte-compilation, because
+     ;; there may be dependencies between one .el and another (even across
+     ;; directories), and we don't want to load an out-of-date .elc while
+     ;; byte-compiling a file.
+-    (when (featurep 'modules)
+-      (load (expand-file-name "auto-autoloads" module-directory)))
+     (message "Removing old or spurious .elcs in directory tree `%s'..." dir)
+     (do-update-elc-2 dir nil nil)
+     (message "Removing old or spurious .elcs in directory tree `%s'...done"
+unchanged:
+--- a/src/Makefile.in.in	Mon Jun 27 13:31:39 2022 +0100
++++ b/src/Makefile.in.in	Mon Jun 27 22:14:53 2022 +0900
+@@ -95,7 +95,12 @@
+ SHELL=/bin/sh
+ RM = rm -f
+ 
+-LISP = $(SRC)/../lisp
++## Earlier versions had $(SRC)/../lisp here, but currently ../lisp is a
++## link to $(SRC)/../lisp in out-of-source builds.  $(SRC)/../lisp breaks
++## the modules build because the autoloads end up in $(SRCMODULES), but
++## update-elc-2.el looks for them in $(BLDMODULES).
++LISP = ../lisp
++
+ ETC = $(SRC)/../etc
+ SRCMODULES = $(SRC)/../modules
+ LIB_SRC = ../lib-src
+@@ -944,10 +949,14 @@
+ 	-$(RM) $(RAW_EXE) $(DUMP_TARGET) $(DUMP_TARGET).dmp $(LIB_SRC)/DOC
+ ##      Remove the generated load files here; they cause lots of problems
+ ##      when they don't work right.
++##      Some older versions tried to put module load files in the SRC tree,
++##      but that breaks module builds, which expect them in the BLD tree,
++##      and that's where they belong anyway.  Clean both.
+ clean: mostlyclean versionclean
+ 	-$(RM) libextcli* $(LISP)/auto-autoloads.el* $(LISP)/custom-load.el* \
+ 	$(LISP)/mule/auto-autoloads.el* $(LISP)/mule/custom-load.el* \
+-	$(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el*
++	$(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el* \
++	$(BLDMODULES)/auto-autoloads.el* $(BLDMODULES)/custom-load.el*
+ ## This is used in making a distribution.
+ ## Do not use it on development directories!
+ distclean-noconfig: clean
+only in patch2:
+unchanged:
+--- a/lisp/update-elc.el
++++ b/lisp/update-elc.el
+@@ -87,8 +87,8 @@
+ 
+ (defvar source-lisp-mule (expand-file-name "mule" source-lisp))
+ (defvar source-directory (expand-file-name ".." source-lisp))
+-(defconst module-directory (expand-file-name "modules" source-directory))
+-
++(defvar source-modules (expand-file-name "../modules" (file-truename source-lisp)))
++(defconst module-directory (expand-file-name "modules" build-directory))
+ (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp))
+ (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp))
+ (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule))
+@@ -280,15 +280,13 @@ If any of these files are changed, we need to redump.")
+ 
+   ;; Check for the module autoloads separately, given the need to run
+   ;; directory-files on subdirectories.
+-  (let ((autoload-file
+-        (expand-file-name "auto-autoloads.el" module-directory)))
+-    (mapc
+-     #'(lambda (full-dir)
+-        (mapc #'(lambda (full-arg)
+-                  (when (file-newer-than-file-p full-arg autoload-file)
+-                    (setq need-to-rebuild-module-autoloads t)))
+-              (directory-files full-dir t "\\.c$" nil t)))
+-     (directory-files module-directory t nil t 'subdirs)))
++  (mapc
++   #'(lambda (full-dir)
++       (mapc #'(lambda (full-arg)
++		 (when (file-newer-than-file-p full-arg aa-modules)
++		   (setq need-to-rebuild-module-autoloads t)))
++	     (directory-files full-dir t "\\.c$" nil t)))
++   (directory-files source-modules t nil t 'subdirs))
+ 
+   (if dump-target-out-of-date-wrt-dump-files
+       (condition-case nil
+@@ -346,9 +344,22 @@ If any of these files are changed, we need to redump.")
+ 	(if need-to-rebuild-mule-autoloads
+ 	    (list "-f" "batch-update-directory-autoloads"
+ 		  "mule" source-lisp-mule))
+-        (if need-to-rebuild-module-autoloads
+-            (list "-f" "batch-update-directory-autoloads"
+-                  "auto" module-directory))
++	(if need-to-rebuild-module-autoloads
++	    (list "-eval"
++		  (concat
++		   "(update-autoload-files '("
++		   (mapconcat #'prin1-to-string
++			      (mapcan
++			       #'(lambda (full-dir)
++				   (unless (member*
++					    (file-name-nondirectory full-dir)
++					    '("." "..") :test #'equal)
++				     (directory-files full-dir
++						      t "\\.c$" nil t)))
++			       (directory-files source-modules
++						t nil t 'subdirs))
++			      " ")
++		   ") \"modules\" " (prin1-to-string aa-modules) ")")))
+ 	(if need-to-recompile-autoloads
+ 	    (list "-f" "batch-byte-compile-one-file"
+ 		  aa-lisp))
diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
index cbf425e1c83b..e6c5da2b2155 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
@@ -69,6 +69,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-process-test-qa.patch"
 	eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch"
 	eapply "${FILESDIR}/${P}-no-lock-on-finder-inf.patch"
+	eapply "${FILESDIR}/${P}-module-autoloads.patch"
 
 	eapply_user
author	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
commit	2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree	8c816148bcbd22757d892089c989ae614eae4f5a /app-editors
parent	0f558761aa2dee1017b4751e4017205e015a9560 (diff)