12 files changed, 535 insertions, 14 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 9bed5f8c9880..e041a5a6a65a 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index d47172672ab6..40d410ddd3ad 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -7,8 +7,9 @@ DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee7
 DIST emacs-27.2-patches-6.tar.xz 11600 BLAKE2B ed8bfb8b2c086423e7bf9f8de5ffb929aa63d8b2781361a8a9d274124a9df52ececdb38c3d4d7d0f0d0fa3a8eaea337c0078929967b073a70209ecdb2bb4cb58 SHA512 11f8af976148c957aebaa5fd2edd46b12ffe24036c09c20a61c47e65d8a2febe6480636be2a7f8f3f7c70a8da7091c2a7c254fd853bde56ec45d7db6a9ca94f5
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
 DIST emacs-28.2-patches-3.tar.xz 5416 BLAKE2B c361fdebf375427cf25c4ac206161b5b55d8d6de88752de35491c778ba90eedf277159a8c317ccda7aaf5e000035d6e33d8e70282436d6e03fa311c4576abe03 SHA512 acae15b577af831bc94e102323836f3fa5b0d51ec1096b84063c81c58f1087b67487507c05d93ba5ddacfce0fea4f3e755906a9ec582b061b65095ee7d693eac
+DIST emacs-28.2-patches-4.tar.xz 6168 BLAKE2B d2968c5f96dcf285f987d32aa8e2ad38c8c2cc7757f9dd83a1faa75efc20c1ac44d6944cf9bcbafbfaa34caae2e7ec24a28fa250d8f5206e4d27649cc2719cec SHA512 94be2c6f715b073ab76a1b3f36194ba6f9c299599b4ba4292a14970f1a2974634ed961d20f62b3939a18347d02fb8025628a7622910f64df0b9879f98dcf5c14
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
-DIST emacs-28.3-patches-1.tar.xz 2280 BLAKE2B 1c6279801b15ddbc79aeaf997cf1f2d437dc5579bc76165d723333ac7f70a0570c4e4dcf166e479e897b006385cc4402d44ea55276abc778cdb71b982e60bfdc SHA512 1ffc28790ec05b1c6549a552d070e48890d8a3e3be9aa7582ad7761bf7ed867d0f1fd5261bc4954028917b6918e9f7b1e45b4086ee410c284c1212d6d129ea35
+DIST emacs-28.3-patches-2.tar.xz 3064 BLAKE2B 052ae1cbf0f04d4f2e99a7be91920bdbb7cd41b8c3a47ffc54523dd5d35800374db1c420a709e5ae4c102809887bebc8a32b2c4e4e96b91ed0965d3f1b800f5e SHA512 e448ab9ffe8d24773d9557262283d2fd3b79544bce8837df8b97729cee4f6c19d95bd3a7a6f0e3c6a477e4d7b6ec5215cf4d1911525f62fe0143f3990466864f
 DIST emacs-28.3-rc1.tar.xz 47896700 BLAKE2B 2d7da4a72cc1256c7b9d1157cd379a5373b6b55c01d94254d6aee25887991a8da694f3239a7f443adef0debbc300043ad4595b5934b6aa383daed10257bcbae0 SHA512 2cd4c5174a5ade6f928de3ff6aa1728fe0f18bd5b985d87b62f38aa083da14d9ae3db6372638548d33ef7bbb632823eabb051307d8fca6c78296bff3c79b2d2f
 DIST emacs-29.0.90.tar.xz 51961984 BLAKE2B a87f0ad81181cca3737d534702a79df9a50a659126d431a9fa0288297907bddc2d8593689c4f7e127d26498420878b48633c46e6f27945efe763314375ae6bfd SHA512 348b2173391f5fcc9ea445e10491d90289fb78664741b3909553e814d0370d5cd8abc17d66c53a6c2a6a6c60a25a226b9783039963bfc585d5bbaa4d0163436d
 DIST emacs-29.0.91.tar.xz 52037152 BLAKE2B 363c6ce29e04fca383b803fc9b7eced8966ee428fd18dd8a5199720e7b2d0b794328b0184cd6be9452f99989a16e23a3bfc48aabf644fa461a3d17d0d3a18fe1 SHA512 c4330b77bb09d4ef247792c5f06c3fe3e32e7d72d945ea34ff4dbc744499d9af64108deb70241a4def379e824451cc26207949c58fd5bf81a94cc7ebd4b98996
@@ -17,7 +18,8 @@ EBUILD emacs-25.3-r18.ebuild 11103 BLAKE2B 64be034cea7fbe62eabf0765e137d8ec28c2d
 EBUILD emacs-26.3-r15.ebuild 11832 BLAKE2B d180b093feefc98486bca2c449b9544248b0913a84ae4b6f635992011b93e68010809266c40c953a0c72670d40931ff86b3ef4f841dadf02cb9e2b197cbc54b2 SHA512 2163c3f58f6f3abe594665c1f21deb9d26485d5eac65b590e03a2294810eb4b0a1aec2244baefcdd3e321c019abd9d2290676af092b672c19ea46b0f24f69395
 EBUILD emacs-27.2-r13.ebuild 14352 BLAKE2B 9a45e3c66078375a9bbfc5fa57a3da7b592ff0f00f292fa3c2fe787ec6f3faa964763072a86d871887a2610b74652cfa7ffbe769d9e782c3da8f7d8cc10eac4a SHA512 f599f73e1587df13aaf7a7e203a909213bbf67e2302cb27b342398e18e400fdb439c95a4e12a2bc68a2c141315a46cc7436496e56d4eda54deabb548b75f0565
 EBUILD emacs-28.2-r8.ebuild 16861 BLAKE2B 7d327e82604c0cc682b38824741e222d71250226f2d82dd4d99d23fbee4809a84d6ef457252d00ef9beed5ad3083d65d3482ee00c5161dbea1485e510a9b03a6 SHA512 3b21dabbb13ee8f316bafa47702980af83ea1e008340d930f3d5bd0ea98a789f34af049760cca90b02b7da3363253c99f6f6c037a107815a8bb450cf234f2a3b
-EBUILD emacs-28.3_rc1-r3.ebuild 17178 BLAKE2B c905317ab82efc4d8c7e7b14b2690f4af823802d1dc77d49da7a13122e00452213cff1f9a252a29a863a4fceb282df28698a0bb390388a7bc7b9e1795fecc542 SHA512 e91114bda645a4282f092875e384f30457c63f5beb924a5cc717ab2059ba7e7e26344e236854bc2267376f7925a965b27e40f05dba819d67a630d32e4107a2ad
+EBUILD emacs-28.2-r9.ebuild 16869 BLAKE2B cafb2dfdbae0a1db5ca3ec4663b083b06708dcbe3e8d648afad5e8143d8c2cbed9b11ee587fc3de5a5efe858c69fc5c9c285dc293d4d2ec5f83fb10a0c63c368 SHA512 50a67e5f1f7148bd3c6750a7fa1d19eecdbc4d3b859113391d115a99a0af15270bbf68ee135d0b7dbd512f0039220d112f084086238485d1a56ce799a6fd2211
+EBUILD emacs-28.3_rc1-r4.ebuild 17178 BLAKE2B b69e4d05c920166f5918e4d28658ef3e643eff5d057fcee3e0f987405b85124834eedade3138335b60bedfc01267b52b8e896f8d2f1160013e9e4d99a8a42d5b SHA512 c6d1d0318412c800d632ee400faf4b1c531dc2b03b7bb4abad92199faaed8e43dd05c60627ee57958ff57956dd4c05bdaf2b02d878071cee88db02254b60646a
 EBUILD emacs-29.0.90.ebuild 18297 BLAKE2B f923f6a4e7cfc6c3ff044cc33d57c88b690af057fc232704e7c74c9dc9da23d7dc60b3e24faab751686b2c044b5c4351a6afb895ef99bede63f64c374e53abbc SHA512 4cf178150f7724d249bb2517ea61d6afc5ef34811a25b955139d0b9642128fa3fe60bd34b45007bab4d52b93955f88e11ddb81827a00eb5ef11c8ff6a7b47abe
 EBUILD emacs-29.0.91.ebuild 18297 BLAKE2B f923f6a4e7cfc6c3ff044cc33d57c88b690af057fc232704e7c74c9dc9da23d7dc60b3e24faab751686b2c044b5c4351a6afb895ef99bede63f64c374e53abbc SHA512 4cf178150f7724d249bb2517ea61d6afc5ef34811a25b955139d0b9642128fa3fe60bd34b45007bab4d52b93955f88e11ddb81827a00eb5ef11c8ff6a7b47abe
 EBUILD emacs-29.0.9999-r1.ebuild 18297 BLAKE2B f923f6a4e7cfc6c3ff044cc33d57c88b690af057fc232704e7c74c9dc9da23d7dc60b3e24faab751686b2c044b5c4351a6afb895ef99bede63f64c374e53abbc SHA512 4cf178150f7724d249bb2517ea61d6afc5ef34811a25b955139d0b9642128fa3fe60bd34b45007bab4d52b93955f88e11ddb81827a00eb5ef11c8ff6a7b47abe
diff --git a/app-editors/emacs/emacs-28.2-r9.ebuild b/app-editors/emacs/emacs-28.2-r9.ebuild
new file mode 100644
index 000000000000..65e04e528526
--- /dev/null
+++ b/app-editors/emacs/emacs-28.2-r9.ebuild
@@ -0,0 +1,519 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools 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-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
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	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 valgrind wide-int Xaw3d xft +xpm xwidgets zlib"
+
+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
+	)
+	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 )
+	valgrind? ( dev-util/valgrind )
+	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:= )
+		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[X] )
+			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.1=
+				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
+		export NATIVE_FULL_AOT=1
+		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
+
+	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
+
+	# Prevents e.g. tests interfering with running Emacs.
+	unset EMACS_SOCKET_NAME
+
+	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 jit; then
+		use zlib || ewarn \
+			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
+		myconf+=" --with-zlib"
+	else
+		myconf+=" $(use_with zlib)"
+	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) \
+		${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
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+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: not yet known
+		# mml-secure-en-decrypt-{1,2,3,4}
+		# mml-secure-find-usable-keys-{1,2}
+		# mml-secure-key-checks
+		# mml-secure-select-preferred-keys-4
+		# mml-secure-sign-verify-1
+		%lisp/gnus/mml-sec-tests.el
+
+		# Reason: race condition
+		# Looks like it should be fixed in 29.x at least:
+		# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706
+		# files-tests-file-name-non-special-file-in-directory-p
+		%lisp/files-tests.el
+
+		# 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: fails if bubblewrap (bwrap) is installed
+		# "bwrap: setting up uid map: Permission denied"
+		#
+		# bytecomp-tests--dest-mountpoint
+		%lisp/emacs-lisp/bytecomp-tests.el
+	)
+
+	# See test/README for possible options
+	emake \
+		EMACS_TEST_VERBOSE=1 \
+		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TEST_BACKTRACE_LINE_LENGTH=nil \
+		check
+}
+
+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
+
+	# 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/$(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	   (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
+	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/emacs/emacs-28.3_rc1-r3.ebuild b/app-editors/emacs/emacs-28.3_rc1-r4.ebuild
index f56f106b3d9a..6124017848c0 100644
--- a/app-editors/emacs/emacs-28.3_rc1-r3.ebuild
+++ b/app-editors/emacs/emacs-28.3_rc1-r4.ebuild
@@ -32,7 +32,7 @@ else
 		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
 	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${PN}-28.3-patches-1.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${PN}-28.3-patches-2.tar.xz"
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 87801023290f..d1948a86e819 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -4,6 +4,6 @@ DIST vim-9.0.1403.tar.gz 16976705 BLAKE2B 9664d52de488086308fcbcda0b0a1167161afb
 DIST vim-9.0.1503.tar.gz 17010118 BLAKE2B 4f74d52a3fcf7875031378f86fc3411c64c92e4b82bee371148b19042478d3f974793477c3fc2d9ddff9233fa1ec3c864962880840867544e92464f1a0876f51 SHA512 2f3242ec0f79cf6affc2f7fdaf689c35d8597706ac1689dbbdc01352676199605bb37f22bd901f1e8d59f312237d3fce4bee8b979b28a744ea9e40558621980e
 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
 EBUILD gvim-9.0.1403.ebuild 9780 BLAKE2B 63a9987ece13a7a752673cb7d8baf31ba357b630eb476c5911ece8a70cbf29e5e213c25e5be39e1d78236f3717b5e93c97c912df8f1d4cbe068ffc24cba5bf3d SHA512 ad3058cffba5520251e6da4a28974fc663d1a054cb7e49fa9b241e5f2445b722f249cd25d3a94da5857b3ad4b6ea21515a4fa03afc80b98a8e79b85dda31493f
-EBUILD gvim-9.0.1503.ebuild 9787 BLAKE2B cb699be1621891fee029f3e6bbff24dcb9b84c0412f9b4b266ec282cb93cd9b9846e2628f3fb9423eb5f6d64d0ae9c1d3a0bed8f2cdaf7f8816167d35dcce31d SHA512 54651866d2462d15801d13d3156b37f9108eb93ebdfbecb096cd3c59c288eab07f8464d423c1e354ed2eece0d88e99666c91d91a6a8a8a258dafe941314b493d
+EBUILD gvim-9.0.1503.ebuild 9784 BLAKE2B ab1dad948afe95cf1587678dfc7cb21d779aaeedf05af240aa5aa01913ac43bea2413e5850fe9b2d1d19ef5b957e864d3b8fd0dd6838734d07c43923a9b31e98 SHA512 1102fa0ba4bcb1cc48486a385a3fb8d4b8c10ff66c39266e364794beaf636e400f1512760bd64b49fadf45e1796491131dbf4e3c9113d5426f50a595324f1ca7
 EBUILD gvim-9999.ebuild 9766 BLAKE2B 89df799618580c8ec0f23abb9628c04eee62727e534c8152aa9126d472eec0ecd91eddf82defc97f671ad08af76e8a34ae7a4aaaf576c5ade902650485fa50cb SHA512 ad3043a1b8e5043089671e7086602db6a48fcd052fa5f4006cadb2b183408b5479266ea1e8aaaae1efe20b7018ba57e8235e2161d92e43df6f94574b3c44c9df
 MISC metadata.xml 938 BLAKE2B 14b5a8f0a77608a07d2d8241cf4b48b4b418f905e688962f995495ccd2dc649d1ab2ab14076042d814e8a33df21557f2a76f78e9df5e8eb810f361a5c0930fa5 SHA512 3e6cb69512c6a02fb56e78c7d1f4e5223ba15ce0036df81dc536dd3b4c16bb76bb37f403a767473a2a2a8fa55e075e9f5142f6b7a0037d282569841a1032293f
diff --git a/app-editors/gvim/gvim-9.0.1503.ebuild b/app-editors/gvim/gvim-9.0.1503.ebuild
index 197a9f4c45b5..5bc1e41c8faf 100644
--- a/app-editors/gvim/gvim-9.0.1503.ebuild
+++ b/app-editors/gvim/gvim-9.0.1503.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 S="${WORKDIR}"/vim-${PV}
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index c36a95676eec..19600fe00824 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -5,6 +5,6 @@ DIST vim-9.0.1403.tar.gz 16976705 BLAKE2B 9664d52de488086308fcbcda0b0a1167161afb
 DIST vim-9.0.1503.tar.gz 17010118 BLAKE2B 4f74d52a3fcf7875031378f86fc3411c64c92e4b82bee371148b19042478d3f974793477c3fc2d9ddff9233fa1ec3c864962880840867544e92464f1a0876f51 SHA512 2f3242ec0f79cf6affc2f7fdaf689c35d8597706ac1689dbbdc01352676199605bb37f22bd901f1e8d59f312237d3fce4bee8b979b28a744ea9e40558621980e
 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
 EBUILD vim-core-9.0.1403.ebuild 6688 BLAKE2B e709bbbf9fa5afae22893483285f0f1af9d3b39faa4b50096372c6761a6e8f4fde4ce0295130a75915e61431acf79f0ab6982eb826600a9b44cd37c72d05c41e SHA512 b4fcececb36790193dcad48f7b3a2a58d98c9b79f64665c187c6941b6262477b815ccdae48bd96cf1e2ff76fa4d57b599424351534920464cf769b16593dbf7c
-EBUILD vim-core-9.0.1503.ebuild 6709 BLAKE2B b8b0c1d63375284858e18955e63d31aea666c4ed33721c6c897aac156973d916bf892972e780e38402afceaaf83551c4b7818f1110a4f0bdaec6c9be7f85c8d4 SHA512 ae6bc963cb0f22b0d4be7f9e34989b4f532196d0573e6e510fd4db898d5c9f0fe053d1c450c95b9a724c593339936451f92e12b7119e5e45353dca0909030db1
+EBUILD vim-core-9.0.1503.ebuild 6706 BLAKE2B 2e5f4407b6cc1a46bd36e01f120c87e11ea00d116929021cef6b68edbcd240bebeae51f94f92f616e99631cd5711534499c759061806fc3d006cd0d03958833d SHA512 5429da95dc0ccf8745d72c3ef186703c4d23f74b3e866691d8256b874699cf0efbec04bc465b0005a912156bda48a699b7f6aaf8b5b5d04e8c50896c01c970e5
 EBUILD vim-core-9999.ebuild 6696 BLAKE2B 6481063149056af386c1412f8b64233ba2a4b03ec247b24358047a744ab7a16319da94943eb6fd52166026b3fe1c3952c0e2202a5f5fea2885b357af8a36f051 SHA512 58408e0ced6f08f500f2c69b1aa3eb3b4f75c619346c57343808e4cd7d72782af1b29a84bea87525b16ae8ef2a069e4170ceb1fb6041ec5b6f27e953ac8a6eb6
 MISC metadata.xml 634 BLAKE2B 3f1b64411e3535e9d5f1541e104f3616be4793999c526dd87f478cc948ac4c564bd68a6477ca713cd2e73f775098a835dc071d66ba35d2a0abc9572e1107c2ce SHA512 b472d227fb1e3c97b0ede3ea67beb4969ef3ced95d040eef6f3ff35d4a669dddf5ad4db22bd1dd3178c4f2ea76b4ec49ad780b5c94c14324da5fd57607d4d32e
diff --git a/app-editors/vim-core/vim-core-9.0.1503.ebuild b/app-editors/vim-core/vim-core-9.0.1503.ebuild
index e077dcbef75b..f969ee540bbb 100644
--- a/app-editors/vim-core/vim-core-9.0.1503.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.1503.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 S="${WORKDIR}/vim-${PV}"
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index abca5ae54d85..a1fe8dd419d5 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -3,6 +3,6 @@ DIST vim-9.0.1403.tar.gz 16976705 BLAKE2B 9664d52de488086308fcbcda0b0a1167161afb
 DIST vim-9.0.1503.tar.gz 17010118 BLAKE2B 4f74d52a3fcf7875031378f86fc3411c64c92e4b82bee371148b19042478d3f974793477c3fc2d9ddff9233fa1ec3c864962880840867544e92464f1a0876f51 SHA512 2f3242ec0f79cf6affc2f7fdaf689c35d8597706ac1689dbbdc01352676199605bb37f22bd901f1e8d59f312237d3fce4bee8b979b28a744ea9e40558621980e
 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
 EBUILD vim-9.0.1403.ebuild 10585 BLAKE2B f9717278917c3f6954fe0cf4a93a116cdbfc24bc467e7eec5680f35b9923ba619d26a61bef5a3c0271d8526e260f341e761ac4e512b876a63c740ec4b2bbff35 SHA512 343d4f37ef40c85b5ad48fa058e279caaf822df2d22f6e0030445f5b116b227e8dca8e3a8075a9ad313196aee1117a4ec02cb5c8c8e00b6a936b4d4d2d526637
-EBUILD vim-9.0.1503.ebuild 10606 BLAKE2B 66413e2ebdc144eed6a651d0bdb18427345f18a5f9425165b7d06f18caef3646800108af8b4ef058686919e99f879ba69edbdc31577b5e960b521c61bb5516fc SHA512 bd7b60b7cdd61e3bff5732f4b25f5d77d01de78a23bfd4dc19bebd24ee3228b5b3edf118b853fed07010f89648c11e45ac04371d7b6f6fcfaeda7eec8a3d3bdd
+EBUILD vim-9.0.1503.ebuild 10603 BLAKE2B c7a7177a18c17f0f5c73e4910d6cd9a999a3c7cb4d306d3be40e4287b9de2941be12da6270559c0f3dcece80fc00dc4d945f1c3fbe967b0d539b62b55eeb988f SHA512 42e8c6595d011ed5a5c14490006473f1da9a11b0c7f98a7dd9d5127c364e79998e0e5016446ad15e7434d4a59cf9310fe6bc114112122d7eb7e35a6898794b2d
 EBUILD vim-9999.ebuild 10593 BLAKE2B 4eb4b41cc0e6988ef0e056ddcc2ea939cd2260d5130037b2da4692e1812cf5c202a9bf9b8105ffe2bbeb631744caeb768a743f6044058dbcde435f5afad83463 SHA512 72d05a1771ec7d1923f906520bfc80aff2c28c0f3be17f807016ffa006516fa687ab8fbeab70fa19448fa3afe20762b2801174cd36d79c970c1b559e6bffc9f3
 MISC metadata.xml 1164 BLAKE2B 39fb0d92234f77f68213d7185ca6c4f9145cca22f8a4c27f8bafeec464232b493bfea9f853ba0d5cd613885728ac0b10f1e11a16910af8fcd211a3a338904264 SHA512 d89a143dc214c3397c2a299b18e3499dc7797a39fbaa731dee2887c9f62b367f1d3f79b7f76b7014ad31caf8ef3bd612c9881b2f72a6b79142684f222483b157
diff --git a/app-editors/vim/vim-9.0.1503.ebuild b/app-editors/vim/vim-9.0.1503.ebuild
index 60fb1da6156b..f837a2e317bd 100644
--- a/app-editors/vim/vim-9.0.1503.ebuild
+++ b/app-editors/vim/vim-9.0.1503.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 6100515aab84..54c2fae17034 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -2,12 +2,12 @@ AUX vscode-url-handler-wayland.desktop 351 BLAKE2B 8b1d295572865fb25beeb14d9762c
 AUX vscode-url-handler.desktop 291 BLAKE2B 364ce7de060a947d48486a639aed515f5b17e1720ac1eaee1aa4e13559047622e2897c0426aed792e3d8aed440771c6f5bb3e36873140401c951ec3b749cd661 SHA512 4607346645781f67daeb6cff2425924133537d620bf7dac9c2619cd5a1a29252e7ecf1a27f27e7bb917c413d462f129f9ae26f50ec8b531e5ac872bc8b96dd93
 AUX vscode-wayland.desktop 580 BLAKE2B fb70f6b28e975368550735f2dab8be6ccab9510481c794e6b44545a690224bc93b51cbc6beb809886eee1cde3648eb284374c87c0b74a1fcc3bdf0af0e700a9f SHA512 615cacda3121b4a839816722382c23bfa2cb162e2a772ba91bded9e161a92763bb536778ea8f716e4c6c46f4f6c289a9c922347523d278ba3714569eb64c0234
 AUX vscode.desktop 451 BLAKE2B 3c0cbe4a9bf71d47c3534bf6f7a265a04a0949b0bb86e060a0ecccb3b9f242ba9b46f1fc0dea37ff0d982ec88417da980b31b9658906a8f23c707e9b100183c6 SHA512 334b8c025c4a99e0f1390c56dd89e529c23b0ea3f6ec5a83105eb6acc4ff62b4d25419353d7bf4bb69dec611bd98778e7b8c728d2392827aa97690b5b91c7fb8
-DIST vscode-1.78.2-amd64.tar.gz 134674196 BLAKE2B 314ab07185d91bf20d4016b327496924c111c7b7ef6e2775c7abbb5a497a35ad09e5a7176691849ab36e28f4d291e6a4e2cfa4024c00fc45e5b13514997d71c2 SHA512 a5919a7f04257c529a7c0a0147e2f8d18181c90a64198d822957d74e5bc8e5d3c60f7732a4f3c456f0036907d82688d51435dbe26aa25264bd1014fe97da4a1b
-DIST vscode-1.78.2-arm.tar.gz 119250112 BLAKE2B 3a0bf7ea25b85202a3d0be196721e2aacf79dc8c6bcf5ae97d37d04c82ca782b3641435997b029170618f4cab31c59978faf70a5bf89ac2e834e7743e1822063 SHA512 ffeff708c553903c10c9ce833e28286144e1407e59298a05f00ce75912605061914268fff34f74e5e0e6a21989191fa9c5e757c271a784ec0ccfa2db02567679
-DIST vscode-1.78.2-arm64.tar.gz 130761570 BLAKE2B 6fbd079ca89f49419e53e1daf108e6508036a654395bbdc1ce61bed4c9fbb0425738ba39f8d7682b889f80f5c08fdff947f819c36e932bf652f1441182981e07 SHA512 877ce23498c68f2c3eadae5eafc83cecedefa0d290efb2578f3ab0faa6c9aa8d2fe22e9e4f33afbe9a95cfb12b994411de3303b902da73af5c33be43345d52e7
 DIST vscode-1.79.0-amd64.tar.gz 134771216 BLAKE2B eff3918fdc4c48cb9b0dd0ba09f5cf10c707c3fe491905a4150cfd634722d66e49a13c3d08828c3eafcc8b507356308d829b32e5c57313194157c27b9d895e6a SHA512 586898b17af29bf218af765cf7a8c3aefd7b73d181c9bafa3a98fc8f2f74d14c6c132179542b1b5ffa364b153bb8c5d71150d0ef40266913685640c2640c7209
 DIST vscode-1.79.0-arm.tar.gz 119314354 BLAKE2B 23ffd7c9202e5491e41c5b99a707807ca3cd06ba5323f5c67859344c95dc19848ec9daa83bc97f2afa585cd93a4cf62da0608a3cc4788d9e4b71a468a1fad6c3 SHA512 9eecbeaf34b4248915e4c0f922c7033c140cb4944e73775c116bd1e03c8cd3feb2f702e6d089df057b307637e2b4065a06e377b156d22ea92dee1741c846934f
 DIST vscode-1.79.0-arm64.tar.gz 130967654 BLAKE2B fe5a484b12ad1ef6c9cccbe95cab149a0caf9fe6d5f2b5f6354dbf154346f5cfb6d6c4da839149dfff2194b43ac72639a2e5df457aedcd2bcf96cd8fff9515e9 SHA512 b2541ea525ae82b8468b6b41990f73cb881461f352691959402d7927423a1ec215a43db7aac7f9b3ae83e6507cdf5c7645431fc08872dde8df7d6b4ce47c20f3
-EBUILD vscode-1.78.2.ebuild 2916 BLAKE2B ae628ff4f137e052333cfb1ec28c245e66944ef1e7e01982050883825e11f19dfbaa259bfbfc98f30d8e15a3e9aa9f373e1f27385a29b427e14047d19dc8eee6 SHA512 6fa0f6f3328e8f330c252fe30de5d0b4e8f2529cc9950d23d0c116bf4638ee9ce5d94180c7dba1376d2130fdd481a61f193d06d80ecf6f473d5bdb7849458c95
+DIST vscode-1.79.1-amd64.tar.gz 134787612 BLAKE2B 65b8cd1695c92dc3d1cd3cf1ddd5b2e048ed8df3bd0d8284bff6a1980947adbc9fb85fe48a79ce20405151d33422c6f0677a4a2cf7cbb572eff6b866d9f951d1 SHA512 15f48715bffe22aceada44cc5da3b7e47983e3acb5ecc04aca5babe465f2da0c2dd143540f231ce6d8e3f6879d66b494d9be57afa23161ab65448430f294ea2c
+DIST vscode-1.79.1-arm.tar.gz 119311072 BLAKE2B 5f6a48fb3b915894aa90488c0c80fd47d886c614d46821a61a3d97899e4d8c02a22730944f50e1ecc4c7f729db19ef054e3e46be570d6a19e63a8b730084b41e SHA512 f61c3bb2570621c3e20b3b056e4d06178a674e63d9fbc132f885734ba5ec030456177657e81c7d2a98054dce4dde2ca6387d8c84841dc26c0dd6bcea1dc386aa
+DIST vscode-1.79.1-arm64.tar.gz 130964437 BLAKE2B ae7d5a14a0d31de1ac984f74805191d3323cad8861949c4cbf342e7f6e5b0a4d5ee046ad314be4eb39b33e17120a700964c9d7696922ac1fd487d7e1b5374915 SHA512 e99fed7bdf7b8557cdcaa4bfe5ee7509dd34a34e6643f522439736d84d172070586cf7216b9d06f3110bdb2487bbd389777ee2a14929c04c963db982196e2a87
 EBUILD vscode-1.79.0.ebuild 2862 BLAKE2B f935e3c07dd88704fa82bfa86cfa460bc58a8f769125bbd9a93b9963ead92bb83700263b8740ee0829938f32caf0f68f5867b9e884ad8774d544cb7c860cf911 SHA512 8327ee741916aa3a518b1996416dbe61af77c1d05a4c07e57528baf0cb50ddbb470e763d3b89211cc61f44472cf73941b709b14a82d71d54ddff3e86a8ea304f
+EBUILD vscode-1.79.1.ebuild 2862 BLAKE2B f935e3c07dd88704fa82bfa86cfa460bc58a8f769125bbd9a93b9963ead92bb83700263b8740ee0829938f32caf0f68f5867b9e884ad8774d544cb7c860cf911 SHA512 8327ee741916aa3a518b1996416dbe61af77c1d05a4c07e57528baf0cb50ddbb470e763d3b89211cc61f44472cf73941b709b14a82d71d54ddff3e86a8ea304f
 MISC metadata.xml 1058 BLAKE2B cf7606233d99e4429debe5ef824f235f1ff3083ab5553030453e982bfb5860dd5ccecca3792319665835d604b6ff2cb53ebd885bb959236784c62885087750b2 SHA512 961552953336ad9606c9fc004fc3e0fb8d7481a017b6ba5da683db5ba989f58d474ccb4ea3a001851b2cfe705e7fe3f70ba01a14dd1f048523e73af522d50410
diff --git a/app-editors/vscode/vscode-1.78.2.ebuild b/app-editors/vscode/vscode-1.79.1.ebuild
index eed866455058..0362e867fb48 100644
--- a/app-editors/vscode/vscode-1.78.2.ebuild
+++ b/app-editors/vscode/vscode-1.79.1.ebuild
@@ -95,7 +95,7 @@ src_install() {
 	fi
 
 	# Cleanup
-	rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
+	rm -r ./resources/app/ThirdPartyNotices.txt || die
 
 	# Disable update server
 	sed -e "/updateUrl/d" -i ./resources/app/product.json || die