gentoo resync : 29.01.2021

23 files changed, 487 insertions, 298 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index fdb36520c925..e1f0ce5319d8 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index b0eefd153fc5..18bfbd4294e9 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -7,6 +7,7 @@ DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7
 DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf SHA512 f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
+DIST emacs-27.1.91.tar.xz 44608052 BLAKE2B 50d4da099bb542a01f7a62d73ac33cf445fc667af9c81a7c44f4a477d50a29854b14be2fd28eb937d2a039b9d3726b84e5d66d5a667109473e9485ab36b70fcd SHA512 37efc0e472522f498cbd45b6bd734ed34348f7ccf07fb06aed106df6ec86cb0b077d5a54df76abc3147e5d97284f6e9e1a7166d3c32b9a072aecca8c13f8965b
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
 EBUILD emacs-23.4-r20.ebuild 11194 BLAKE2B 5a6ad012bc880a168592aaaa13ea478c40b33e3a4ab3e57e137be5e3ed6565263f406e75ee968c18b015524613ef8de9db1cbec990094c27220c22125d813297 SHA512 efbf5f07548f6e5faa5390322a06f05b40137994c0a85cadbdddc2f1359408fe16ec0a008734d0284119d78209e89894ac1904d3b27572b9878e747dc8d47be1
@@ -14,7 +15,8 @@ EBUILD emacs-24.5-r9.ebuild 11064 BLAKE2B 230c4e7f4a42442abb9c5dd1b00e5d07c3c180
 EBUILD emacs-25.3-r8.ebuild 11406 BLAKE2B 491e985bbef6ebb2b9fb59fb1c93934814439d6e01a7e1c96fe755f50974366afd86741b65743c36cd4f7cd5ba436768ff0ac6809a8ed4a53a9b8138df96b7e9 SHA512 6883b698c30ce51b5cc4aa65e001201567dc46182cc001ccbb6ae2fbec7d89689fa6a3c25ba9c93801dfb43073ceda4a83cfbe29261e3bfa620fd939b7669127
 EBUILD emacs-26.3-r3.ebuild 12224 BLAKE2B 0a6e7b4a2efa929000bebfd1a507d5862c5216b256719256bd5c63c4728d3b33204f7abf37108eb613fce89843ea283c51f8e07fb34dc671d6aa3cdfe3164256 SHA512 fb60f96f86d7b051cf0a8009365973e8275f14245e4b1bb1937f491b467c300405f3439c8c3c2eb5fefcc881f2b7fc726b090816711bec4094f8ea497c8bfec8
 EBUILD emacs-27.1-r2.ebuild 13769 BLAKE2B ea25627394cbdd0ba574631df460808dd13965846424a937f1cadcaa5345fea05b05820af6bbe4db5dd2478fed88d79002b60ce5a8a04de555a6e4b2e992e26d SHA512 1e73bf9d4ec1492654b007cf1211f0f2a9a5ee8fda0928fe18006b18c215f94d1c1e388a0607e8d1afb2608c6484b5978e444a7dfd6ff41537e93d698cebdad4
-EBUILD emacs-27.1-r3.ebuild 14752 BLAKE2B c6690b6065eaf8aca2fa736ec24cb6e5881be36fd52116101c3bba596223490ed181d09eb693c798e7cbba9618009f52a9a8326067929fb56ffd3a3531939f37 SHA512 57a13313e7a032aa52e771e75e2d940de1b635e2a358417eac57943f15c98dd512db27d66ee4468273537b9c2cdb66fc7f9cfe95e123d255fbf0b69c51698c52
+EBUILD emacs-27.1-r3.ebuild 14749 BLAKE2B 5871e853636440afefc3b351dd5a2758044460ca5880748f977a61be2f4fbb741902efddc9f7dd933adb56f61367fe160e27f6ae30fdd10e4cedd37ec07f0888 SHA512 c357da0db47c3d9d810fc5dc5e26a3494b77069e318e124deb78f698e13ee089ecd02616b248707424f3b3669720cf6a0007519be1b8464f3c57382221ed413b
+EBUILD emacs-27.1.91.ebuild 14710 BLAKE2B c369d96259b7f1699916a82e795132d9b5ee382241d45a6fe55d6f86333a073e83b6976ae0525eefb2f5d1fa045783a6340095197dbc59b613d6903465cc2582 SHA512 2c044cdd45c21f330e31ecf114b7f82b0cf9e6d5a8108456a3ee47acc081f9737245894b66134f3956c152a20e407314bac0b4453dd3dbf1761f77e0b9606da5
 EBUILD emacs-27.1.9999-r1.ebuild 14709 BLAKE2B be4d4e9455f17dccd45d6684bc7df95256d4420c95818f504117cef09abee3d59498e92aaed141bdbe2e4343758425ec3fc9ecaf3cc6e3397c9ca06eebfd540a SHA512 b9bb10eac9c6cb4df462fbaa9884e73fd73f1bf69324380f27738a5644090d4df8d82228acc6ff6a945b34ec6ebff3e3a5728fbd725b451c177d2ece5fb842b9
 EBUILD emacs-28.0.9999.ebuild 14680 BLAKE2B 41e448cffe10be975b6a3d6efd8442870c355cc167fc39da0d85fcadd482f8f2e09536cd80db555d5fac1c03521e182a8ef26e72de93b129ed83364314c4d8bc SHA512 6a102ceab1d4636a01add3d4f778ef99257d7cc366340f6e3a4db15ceb4eff0ef6df05d7eb1ca989896d8775ac39212c9bb55ea8e8eb560f0f232c2462dc0fe2
 MISC metadata.xml 3000 BLAKE2B f580f25a92f18d36e29880184ddacfc3f59af8e86c9e9b5e0ab0deeff7fb367a79a0331db4d8d85f9c338feba342d683caa3294d06d11e2c1a3c715a5c2649b8 SHA512 ce622b330c89f3c545ccf0f899efd19795cb3279d15762b04248ebaed07e288b51f45f6f0776f5cf6f44f90500220b8026384016808d722085dad2cad020cb51
diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild b/app-editors/emacs/emacs-27.1-r3.ebuild
index 87ed9455b8fd..09d1cb0f7ced 100644
--- a/app-editors/emacs/emacs-27.1-r3.ebuild
+++ b/app-editors/emacs/emacs-27.1-r3.ebuild
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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"
diff --git a/app-editors/emacs/emacs-27.1.91.ebuild b/app-editors/emacs/emacs-27.1.91.ebuild
new file mode 100644
index 000000000000..71b3f312c1de
--- /dev/null
+++ b/app-editors/emacs/emacs-27.1.91.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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-27"
+	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="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz imagemagick +inotify 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-gentoo[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 ) )
+	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
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg: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? (
+			gtk2? ( x11-libs/gtk+:2 )
+			!gtk2? (
+				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="app-eselect/eselect-emacs
+	sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	!app-editors/emacs-vcs:27
+	app-eselect/eselect-emacs"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\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
+
+	eapply_user
+
+	# 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() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	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+=" $(use_with 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://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				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
+			if use gtk2; then
+				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
+				use xwidgets && ewarn \
+					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
+			else
+				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			fi
+			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
+		if ! use gtk; then
+			use gtk2 && ewarn \
+				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
+			use xwidgets && ewarn \
+				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+		fi
+	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"
+	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 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}.appdata.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
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	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
+		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 --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
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index ca338f626e9a..0180a0b72917 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -7,7 +7,7 @@ AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac33
 DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d
 DIST gedit-3.36.2.tar.xz 14770004 BLAKE2B 505c01aa60e64e418a09c9fbd0c397a487c612117c3068e35a41b075a8d5440cf85daf6e011eeacee7b228306342cc5c4a3dc1af24d52583c9a896531355f6d0 SHA512 20c3592aaf08ad4a5842b14ecb1eb0c9ddbef190412dc3f70b60bbf6125c9c4791a48260c89402ce4773720ae65b36fab510f9d1e104f548e243d11bc49279b5
 DIST gedit-3.38.1.tar.xz 6861368 BLAKE2B 3b202dbb7df8e91b58bd345fcaa309546af07bce60dc4638a3c344996d6c04ef7fe8a4824360c0f55970b759f9d7e2929c207992a9c80ad686d39e94ff741b7a SHA512 cd52cbcece3b007692294ab01b95fae7deb744b08a44da2d3cafa82a86d94c104abcdd4dcbe10630e0d633c8cc3c75f5e5dc6c8452a8c4bc2e6bb3c0de7d5547
-EBUILD gedit-3.34.1.ebuild 2259 BLAKE2B 9d4db7c46cdafbdbc5e1da53062659df961febf00e8e7c625a38f28d2da054ea4ffabafed1f6df3175a8b3b2531a55736f25910df137f09eef43dac84ffc3b5d SHA512 b3c4127b204c99a8c350662c5dfa09ad2498d890723051458a5633a92aeec349c53a9665ee92b0f67f8d1d9eb168b5e6ca0f6a2158b152b2d1aed600cf3151a3
-EBUILD gedit-3.36.2.ebuild 2454 BLAKE2B af8b8e2fa943c9a80d8ffa9d42a8d620207d6f170e187177815f7a037bc0cada8ebff990789b7af786c306ae87ea329e86f9ce6742c681736882c7cdcac24355 SHA512 274a54a606648b3604b78a99e9a932794236c68f1c14916636807da4d1eca42813e477742e4f377354267f3036d0434a66b6b5c250d8d494b6e98e131fc6b267
-EBUILD gedit-3.38.1.ebuild 2311 BLAKE2B eaf4b0925c8ab83f1a2d30fd117c022c5b474bdbbe08db598b6a5defed5bc85a7b51ce6ee770db298d58b08e73efa506297714c85bb3b0446eef070afa240ce1 SHA512 f8661bc217ca2c1c7ee580aabf4cb16e883dfc624f8da1bbae093b46b63453144890493bf09397f76116c2b320cade7a8157c840205c0b29cd222e302a9db1e3
+EBUILD gedit-3.34.1.ebuild 2196 BLAKE2B 3bf307e512ade795d424acd5f83b39242bd189fc3d855803305797967531a29d7e30b2de41b562c728195ab837ede7eec7f3749a505e7e4017f48c511ba3af69 SHA512 996d6ef09b6053e34d3045f5b388dda30af38fe78bccd696c7340c849c07d2ba2dfe1c4c119d1e327a8beea2e7a2b40308d4bbe6e280433556d14d0cfca7e3c7
+EBUILD gedit-3.36.2.ebuild 2415 BLAKE2B 880e334d7473672530635034911d05e34668e7dff62c855ad1dae408b41c96f3f90b78f865b59a77d99243c0e29639d00ec6e9179390ccc94d46aaf439970f0a SHA512 4be122136d2c4fd464abebfedf8689e6ac122d781d8b635fab8b67cb2d27cd40bc3459d3a80bbe51b36a6fe1f695917ce3451147c48c659257298f80d67e2dfa
+EBUILD gedit-3.38.1.ebuild 2272 BLAKE2B baaf0de312dac114d602266c4db68099111c24434b46395da23f81aba3a5aa5acd4b0a6c3b6dccf248f79b2ffa5dd169725d0658682753ee0de7cd284f5ac789 SHA512 1b6168adedec9671b9f5be8eda994e691b7c1223384f0a56f18b52a935d08365511d34b9166541fe2bbaa556c9b857fa1d658c76fa1d122a0e1b5a9e1330dab8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.34.1.ebuild b/app-editors/gedit/gedit-3.34.1.ebuild
index 751718b3cf62..22f6ee929e83 100644
--- a/app-editors/gedit/gedit-3.34.1.ebuild
+++ b/app-editors/gedit/gedit-3.34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,8 @@ SLOT="0"
 IUSE="+introspection +python gtk-doc spell vala"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
-# X libs are not needed for OSX (aqua)
 DEPEND="
 	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.22.0:3[introspection?]
diff --git a/app-editors/gedit/gedit-3.36.2.ebuild b/app-editors/gedit/gedit-3.36.2.ebuild
index 3b78f351f474..8ef6f6f5a322 100644
--- a/app-editors/gedit/gedit-3.36.2.ebuild
+++ b/app-editors/gedit/gedit-3.36.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,6 @@ REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
 
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
-# X libs are not needed for OSX (aqua)
 DEPEND="
 	>=dev-libs/glib-2.52:2
 	>=dev-libs/libpeas-1.14.1[gtk]
diff --git a/app-editors/gedit/gedit-3.38.1.ebuild b/app-editors/gedit/gedit-3.38.1.ebuild
index f387f481f9aa..2ba8573eba89 100644
--- a/app-editors/gedit/gedit-3.38.1.ebuild
+++ b/app-editors/gedit/gedit-3.38.1.ebuild
@@ -19,7 +19,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-# X libs are not needed for OSX (aqua)
 DEPEND="
 	>=dev-libs/glib-2.64:2
 	>=dev-libs/libpeas-1.14.1[gtk]
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index e595ccf2c079..9bd0874e0f32 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -9,7 +9,7 @@ DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9
 EBUILD gvim-8.2.0360.ebuild 10315 BLAKE2B 4c1b35b2d2537268194d42befdfeee87e4e23f7ef5a8b2d8fd094f2c2604669f147a12dc67a8f957be172633769a97aa6b20cb479216f318eef568395c52f75a SHA512 a57d51fd95b464e7d1eea345f43c50f4797045b3f7c1c9d7e288adc467d491807dce74545ac7e1abd99a26152447f481ea388b956c9b8d9b7a93578060059a5e
 EBUILD gvim-8.2.0508.ebuild 10341 BLAKE2B c871b703bf332abbc960740665acd93ab0c8addcd976335f2b640875ec7834fd00c56bccfa1397ed15024b80f15ed79fb8627da093169eaf401abbf4509472e7 SHA512 ba60e11d8602810563f70bb96359da99e1c35dd5c791d25ef2517447995a3c886a3615049aee37e51766faffa069911fe504881dc3376f64bb6622f363e12705
 EBUILD gvim-8.2.0638.ebuild 10347 BLAKE2B 9de67c1104ed3870fe86119c89dcb833a750eb71cdb92a4adc0ef2c2bcdf3791a0328dcb4413093c6bf439bea3b658c31b0e19036750d344994742e22ac19814 SHA512 74d6bd5f2c92951e7cd43f60c2abf3cc9ea5766300f9df4456944c98912845348e3ca83169d3254cc579d7fc5c8209cdc0a67d93078ea73e61117942500b4165
-EBUILD gvim-8.2.0814-r100.ebuild 10549 BLAKE2B 9d6705d0359e096511d847e109bd98d2866c60352ff26603b2c0ede17318af33f638aee862d0914d5a7b4a36ca791ffcfa6a081df538d9e921a17e38b44bc131 SHA512 63e84d1573fba10f27fae24d86bed97809daddd1527bcc6d76b87f6e672fddf5da4584c0b44ea916d4168e85609ab90cbb235683b5d0156a31754059619bb88f
+EBUILD gvim-8.2.0814-r100.ebuild 10542 BLAKE2B da24dcbe86ec5ac395dd501584baa540c02db7763f179a016b35a078878ec530dd763e3c5d1b0730c71a2fa42cd6f8878605c64bb97f3a7b3a71962e337986db SHA512 9c0614bb0161c252950af72c2d59d466d09936821b33d6b84a32fcf36ffb73ebee4893a5e83f73f7ae68023fd0a54f940ef11b624860872fa98647b875486fa4
 EBUILD gvim-8.2.0814.ebuild 10309 BLAKE2B 760acf4fba14b48dab053ddac8f779346c2d12fca68939db1b5b37940ca58eeeca1c5b0710ca90863ab3a009c46cfb042051e854f2ec411005544df09ad811a0 SHA512 ab5fe4309fd886cbe32a2add953d45249b94c26bd63b63393f28877a8247fae057608925ec1e151129d9b8d28907298037209538aed6a7ccabcaf8feafdfeb98
 EBUILD gvim-9999.ebuild 10549 BLAKE2B 9d6705d0359e096511d847e109bd98d2866c60352ff26603b2c0ede17318af33f638aee862d0914d5a7b4a36ca791ffcfa6a081df538d9e921a17e38b44bc131 SHA512 63e84d1573fba10f27fae24d86bed97809daddd1527bcc6d76b87f6e672fddf5da4584c0b44ea916d4168e85609ab90cbb235683b5d0156a31754059619bb88f
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.2.0814-r100.ebuild b/app-editors/gvim/gvim-8.2.0814-r100.ebuild
index 7166331b2c29..8c83dac7e489 100644
--- a/app-editors/gvim/gvim-8.2.0814-r100.ebuild
+++ b/app-editors/gvim/gvim-8.2.0814-r100.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 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"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 2c768a9692f1..888f79ed9bba 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -2,10 +2,7 @@ AUX neovim-0.4.3-gcc-10-fix.patch 7417 BLAKE2B 5632a2427337e7b4d1b793381a074d2d7
 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 sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5
 DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183
-EBUILD neovim-0.4.3.ebuild 1896 BLAKE2B ba5466ec3e33e1e13da42edaf4c13003f62ca0ccb7495d1e76cd716c28619444bfe4c6fa61f49aef1982296553e04c504c33cb93ff7366702728438768ca9853 SHA512 c6d6ec282f937beab1171f57bcf55a3efb97f8d0676a57c43a477f44586c2ee7fa9c59967fee332ddb3164ba754be5f26af9be2f249a31968fada653235432d1
-EBUILD neovim-0.4.4-r100.ebuild 2731 BLAKE2B 4c77f2e8204ceff784448cce89645c8711e29b79ea3941a17610a7deab9ac40a4b2107749305e3bef45181954345ea0eb9395b63fc4212db677f6ecd41a66c39 SHA512 392c56339bfef9d744ba9c6447fe9f456b109c4ddbe28726132afd4da19d9dbd9fd17026ff1396a7d59f65f4ee17ef78c1c605a38db92bcaf9ebf1a72a576686
-EBUILD neovim-0.4.4.ebuild 2412 BLAKE2B aec8572ee84bc68d99cbe3d1885f5998ac1198e92f4fb06c3eaeed6ad24fe134d1a0b47ab383f1b8b765e146525189fd63a7f5ab191365c1f39d4b462ed00f1b SHA512 f22853bb06156c3d096587736856a8a121c2bcf6359b8e7e0a74269805b6c0ed6fe7c73d7ed13e76f4310142b7724a7c2607a30500b65c745dd4d656a0d66ad9
+EBUILD neovim-0.4.4-r100.ebuild 2729 BLAKE2B c57d4fe7b38c0db34547f2b49c6ec1162aea76ff3e3a940c364d9c2df60f73d6f360ca3d44ac334a0d3f4ead5ce77d962520ff87457a4f14324f2ceb190cc30f SHA512 2729880f0817b1ce2323df33a2c0d9cfec8cfc6230a9dd166807b087ea31209a6fe3da9cecbdd099123890996d6c489544d5b83d14adeeee22b50062038e82a2
 EBUILD neovim-9999.ebuild 2779 BLAKE2B a629bad5945a0054fc56eb28c759e80c39ff44735bc0ef48edf50238fa6a891789324303c8fb27709efe71056763b987a12c907c62736b197b59c9fd55afb2fb SHA512 87f6afbf6d9ca151a8019761f53d9bd9137ecc0943adc7a875ed019134dc772794f64419fd959198ecbb1ea81a978368e92d20f4015d96be7c24fc030a5f25bd
 MISC metadata.xml 535 BLAKE2B 7cebdc1b7adafafdcc2fe266f8696ad0dff927e8a9383ee34ac66e2c8910d3863d1f7603f2a82dec75f586ab22814d7268475ae3ce02fc3dca12a665e1e8ce5e SHA512 71fcf593a1b9587e6af0e30e851fb17e8552568a4e8bd38341c150ada7dbf72f962250f3306403c0be2d334932f63fe183850efe1c67d515ba79577cdf7aa561
diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild
deleted file mode 100644
index 55644dda6a6f..000000000000
--- a/app-editors/neovim/neovim-0.4.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+luajit +nvimpager +tui"
-
-BDEPEND="
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/libuv:0=
-	>=dev-libs/libvterm-0.1.2
-	dev-libs/msgpack:0=
-	dev-lua/lpeg[luajit=]
-	dev-lua/luv[luajit=]
-	dev-lua/mpack[luajit=]
-	net-libs/libnsl
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:0=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		dev-libs/libtermkey
-		>=dev-libs/unibilium-2.0.0:0=
-	)
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-10-fix.patch )
-
-src_prepare() {
-	# use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DPREFER_LUA=$(usex luajit no yes)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild
index 2fdf25560fce..987745e5962e 100644
--- a/app-editors/neovim/neovim-0.4.4-r100.ebuild
+++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0 vim"
diff --git a/app-editors/neovim/neovim-0.4.4.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild
deleted file mode 100644
index b9f0be5d76b6..000000000000
--- a/app-editors/neovim/neovim-0.4.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+lto +luajit +nvimpager +tui"
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-#REQUIRED_USE="test? ( luajit )"
-#RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# Once dev-lua/busted has luajit support, we can add tests.
-# bug #584694
-DEPEND="
-	dev-libs/libuv:0=
-	>=dev-libs/libvterm-0.1.2
-	dev-libs/msgpack:0=
-	dev-lua/lpeg[luajit=]
-	dev-lua/luv[luajit=]
-	dev-lua/mpack[luajit=]
-	net-libs/libnsl
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:0=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		dev-libs/libtermkey
-		>=dev-libs/unibilium-2.0.0:0=
-	)
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-)
-
-src_prepare() {
-	# use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Upstream default to LTO on non-debug builds
-	# Let's expose it as a USE flag because upstream
-	# have preferences for how we should use LTO
-	# if we want it on (not just -flto)
-	# ... but allow turning it off.
-	local mycmakeargs=(
-		-DENABLE_LTO=$(usex lto)
-		-DFEAT_TUI=$(usex tui)
-		-DPREFER_LUA=$(usex luajit no yes)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index f883ffb22a04..69fde39c2f95 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -3,6 +3,6 @@ DIST scite-4.3.3.tgz 2714086 BLAKE2B f31db7147c102ea19317d5a0bfb64e2ccd34914a8b6
 DIST scite-4.4.4.tgz 2775628 BLAKE2B a7607b53bf529c56f6525d44b052a08c914d8aa1d90d475dcf46927ac5ce83c06d68b70e8d8e8969c77c367240ba1e7ac10d599c77002575e84b9baf6445d03b SHA512 1e8529286206d542e0c07353b73ab38aa9ee2e2256ed8e15328965e00a33eb026f79bd7d330253e8743cf5503fadb32c64162973ad21da16993f11e124842ec0
 EBUILD scite-4.2.1.ebuild 2973 BLAKE2B 3aac0ea6df96d31b14e32cf1947470f6b5f968b5fae3e8285e9c4170c8aea58aad3a2326d2cee4c2a7108754cbd5d2a34678e5abe85e9648a0d02242c244bece SHA512 833e3974d555f9cda3b538dbe89d5771c9a886e43b6dd74964d22ee70f4af300551c0251ddfbb62e137f8c97ddeac8bc8db714cdad2c5d8fd7aa59e2ec8c7c29
 EBUILD scite-4.3.3.ebuild 2857 BLAKE2B 8fb7183f7c8a340658ae270aa1197a03f22e03eaeb5106b3c5120254d278ee8b424e6769e04e1ddfcd7dcce5fd4a2cf19dbc13b2334baeca2fe59b0d228aa5fd SHA512 ccb75a47fd3a2dd4786dea41daca7d6ff29e4fe18b16d6628f147a2d46788c22c497180c27a98c980555ca72cf8d7aea99a7c642ac22b16a343e0a25185a1def
-EBUILD scite-4.4.4-r10.ebuild 2928 BLAKE2B ff03297d82e1933ec7c5c30fa7639cd284ef80ef95774550afb56c75951a412d351c4b8f8ccaa4942f1060bd5698dbe989cdbce1d517dcf6494b9523a43c5bd2 SHA512 33aa0f98a0df85c2f2be209f99021c7c1c96d38138a3754af23996045ba6861c636918652ebce4328c7fe8e6964e7133a1e256d9ef8f66b2cf3be3a392a05099
+EBUILD scite-4.4.4-r10.ebuild 2975 BLAKE2B d11639ddcede16d0bb062f824f483e7148799cb4a690a457102d5d85714eb4a271f200da5b76f76315c08de078873c5f5e9695245aca01747c41944d68a11f87 SHA512 8436c3c2129dc22ef640534214691a4ba56242ea784141f81f04f53a0f93ca7603a4f551fc9f08c074091eb15b6ad38fc201224d7eb7c6226cf78926eadb6d03
 EBUILD scite-4.4.4.ebuild 2857 BLAKE2B 8fb7183f7c8a340658ae270aa1197a03f22e03eaeb5106b3c5120254d278ee8b424e6769e04e1ddfcd7dcce5fd4a2cf19dbc13b2334baeca2fe59b0d228aa5fd SHA512 ccb75a47fd3a2dd4786dea41daca7d6ff29e4fe18b16d6628f147a2d46788c22c497180c27a98c980555ca72cf8d7aea99a7c642ac22b16a343e0a25185a1def
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.4.4-r10.ebuild b/app-editors/scite/scite-4.4.4-r10.ebuild
index cc44dcb5cad6..1f2fd9e64c95 100644
--- a/app-editors/scite/scite-4.4.4-r10.ebuild
+++ b/app-editors/scite/scite-4.4.4-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -53,6 +53,10 @@ pkg_pretend() {
 	fi
 }
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	tc-export AR CC CXX RANLIB
 
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index d73f7fe3ffbc..0b990025f418 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,6 +1,5 @@
 AUX qt5.15-support.patch 632 BLAKE2B c2e4f3801231a08ecccde92d84b1836c62d44f2ae631f709b651519298af624d6a9a28d13ebbe03f707351c9d51bebee2a198d35b8a8e709d574a99f751521dd SHA512 8cdc834a2d0d8d843e326a825a13418c765079ec41c15f1fe5b7a3eb2c158928db594ba7d7e946dd72a936af4bf86a302dd5b042fad64d20fe033f2b64dea3e8
 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
-EBUILD texworks-0.6.5-r100.ebuild 1701 BLAKE2B 4c3305ea00765573b36bf9cf9a57274aae4512e495eb2ad97c7c4c6afeac2f7fbb24d81e93a624307b8e336e5bac236a761e5920211bbbd8eda6bfd5650c56f3 SHA512 34054fbfa2020d29983f6c0ff05ebf190e428ca41df3391f726802a0e6fb04f50d59301beead51ec219abac90867eced3e17d5b9e5c78361d048830e88a0ddce
-EBUILD texworks-0.6.5.ebuild 1481 BLAKE2B 50e5b2f73baf61f5e65fcfc12a2358d288d71884c0e5341a0bd95a3bd0159b506bb47be1654f5bd47fbee02e10cfd50f1ad65b272f32eadb87e7c5bb20e33ec3 SHA512 2beea7a02dd41c53e4a592dc9aac000abc1f6a0bc3cceeaf1ebe088dfcda26b8ee26719ff5290372329a3e5c168ebf27156ba7dfb8298e27c41001fd3b1faf3c
+EBUILD texworks-0.6.5-r100.ebuild 1703 BLAKE2B a63771ce6a21cbed33a625e12518ac732eec3799835724bfe817d68ce9e8774bf7764c98f13660571a86a9ca5380bcfdec285ff855eef9da0f73632c9426eef3 SHA512 ec249821dd61fea92fb386dd28510361adebadcb526685ed42ff27d8dd1897f5f6e402ef3265572a709a2657a7638996455695ebf8bb46601a0600cba0808b69
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-editors/texworks/texworks-0.6.5-r100.ebuild b/app-editors/texworks/texworks-0.6.5-r100.ebuild
index f5e982753633..dc9044f0eba6 100644
--- a/app-editors/texworks/texworks-0.6.5-r100.ebuild
+++ b/app-editors/texworks/texworks-0.6.5-r100.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit lua-single python-single-r1 cmake virtualx xdg-utils
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="lua python"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-editors/texworks/texworks-0.6.5.ebuild b/app-editors/texworks/texworks-0.6.5.ebuild
deleted file mode 100644
index 49609fec4e86..000000000000
--- a/app-editors/texworks/texworks-0.6.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit python-single-r1 cmake virtualx xdg-utils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="lua python"
-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/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtscript:5[scripttools]
-	lua? ( dev-lang/lua:0 )
-	python? ( ${PYTHON_DEPS} ) "
-
-DEPEND="dev-qt/linguist-tools:5
-	${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-release-${PV}
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	eapply "${FILESDIR}"/qt5.15-support.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DPREFER_BUNDLED_SYNCTEX=ON
-		-DWITH_LUA=$(usex lua ON OFF)
-		-DWITH_PYTHON=$(usex python ON OFF)
-		-DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks"
-		-DTeXworks_DOCS_DIR="/share/doc/${PF}"
-		-DQTPDF_VIEWER=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_SHARED_PLUGINS=ON
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx default_src_test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 4970294b4f40..f63f64883045 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -10,6 +10,6 @@ DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9
 EBUILD vim-core-8.2.0360.ebuild 6875 BLAKE2B 6881ab9720a664ec105daa3159f359ef4daf63e6c687d235b0c3eecce4a9629be5f06a887cc4fce0e621a39a5eda3f34bd7355d2084f8b7719bf97a2caf820d4 SHA512 3502ea1efcbd9be140367dbaa8bbd22fd069e2a72fa82be10ab6953019d7840912db332b74adc09934c5e3e4a4d460214b939b3c8ecd4a4b4ca464e7db39480b
 EBUILD vim-core-8.2.0508.ebuild 6901 BLAKE2B 967b665e303eb59ea0bff03db8c38b5b6c9828c0c019303422191837ccff5bc1f8ec4ae737e2e8312169266f1bd70b8852c78e5e8ac79cca3e996bcc85f6701b SHA512 dffbb03dd8d94454a718bf280859100b87199fc3fa6b9d8d6758219e573bc8abefc8ad75897b78687dc1c4053d162de56c63da04d1c7cb7cd73b54fe9d60c51b
 EBUILD vim-core-8.2.0638.ebuild 6901 BLAKE2B 967b665e303eb59ea0bff03db8c38b5b6c9828c0c019303422191837ccff5bc1f8ec4ae737e2e8312169266f1bd70b8852c78e5e8ac79cca3e996bcc85f6701b SHA512 dffbb03dd8d94454a718bf280859100b87199fc3fa6b9d8d6758219e573bc8abefc8ad75897b78687dc1c4053d162de56c63da04d1c7cb7cd73b54fe9d60c51b
-EBUILD vim-core-8.2.0814.ebuild 6898 BLAKE2B 12413f5748072519c1638b4c162c42bbd87e1602514943b7c6c486bcd01d29ca480fd48285ff2030400150e192a07fa79f7403e8182148f4970a09301e48da18 SHA512 d63523ed3cfe6a2d9e9f3504080d9c84d92f78c11199c40717f13c4e58b4fd6050cbac6c42a54265cb1a699e2fad4bb383b2a95d6298e5b817d38fb1908d2737
+EBUILD vim-core-8.2.0814.ebuild 6894 BLAKE2B c207d2a9d26a1642f581010111502c6f391d1626fa89ea1aae4e45b7bcc628094d930763bac5409f70aa74efc9247a4c329ea0e27cb7701d2ca34f7e7d5a2146 SHA512 cb6324e25e7fc0713500ad39750a0af3bf4dfea4e0b396cc08193189d89df726305455348a9a1b980e3abcae355cc272d186118d55588cf27166d94cc07cbcc9
 EBUILD vim-core-9999.ebuild 6882 BLAKE2B 3ef7200aecfa15b15e5ed1871606b6474aa2e06d7ce4292312c90fbab0792752ee0839014c82bba841deb7d0b1702cc38c6001945e5cc1beb8bac45f02912939 SHA512 4b4b4d6d2c3cd1ce9f5e44c63dd7939c9f75685dd2101709d396a779ee45c90881191bd99cd07fd711c0c7234bcc99aca80b808955f8e30b7b08d16839af1aaf
 MISC metadata.xml 372 BLAKE2B 6a58d097c342a656a226d27d236fb952b31fb4c71a29333a60ec42db7b8bb1ae601e3c717d9c0fda939ff17eab70be2150a0dfeb26ca5b3d786c9b6050efde86 SHA512 63bca13db3d5830cb58e6a848eb444e72ceaf442bf41be1858d80805dc36cc9b9cd363f480feb8dfe1c7bf09cf4685a665657353867742d13f10fd133eba66f2
diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild
index 5ef38f9a81c2..202875e760b9 100644
--- a/app-editors/vim-core/vim-core-8.2.0814.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 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"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~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"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 042db0ad344d..9d0bc8d82fba 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -8,7 +8,7 @@ DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9
 EBUILD vim-8.2.0360.ebuild 9046 BLAKE2B 8459058d3949155d1e2082574a6b781911adc33b8bf595036313ff4c32133711a6775a7c0b112c9a25dacac430335f2b28891ac34720bebb79ccdbf2d8964e36 SHA512 1e4ec08d88549c0422bd72a67e778b71b6ee10dad3615e8b6ad1b1ada7106376099016a6f291f744e7091998734aabb2871a9734e5e4ac9e68a64a71d3f23381
 EBUILD vim-8.2.0508.ebuild 9072 BLAKE2B fd0c7ad49a1ff9c4b6e645038fd77573cd901803865486c5160a2887301bb2508513368e8437a75864e5091ca215963d94ae7f89c3136241ba9b60538fbacf8a SHA512 5664877249256f51a2753ba0e7026e4eed8e5bc9250b3acfd0463ff99babf227391233f007bf56437d758e5039ac7bf941b49c4381c22a319657891695878688
 EBUILD vim-8.2.0638.ebuild 9072 BLAKE2B fd0c7ad49a1ff9c4b6e645038fd77573cd901803865486c5160a2887301bb2508513368e8437a75864e5091ca215963d94ae7f89c3136241ba9b60538fbacf8a SHA512 5664877249256f51a2753ba0e7026e4eed8e5bc9250b3acfd0463ff99babf227391233f007bf56437d758e5039ac7bf941b49c4381c22a319657891695878688
-EBUILD vim-8.2.0814-r100.ebuild 9230 BLAKE2B a1076be848ed46f432ab9d390ecf93fdd6d5c50956d0c773da95e38a620e8baab6acaaf918ba8b547c0ef6b57bd6aa30242c243e4c75814ef804965a60559ebc SHA512 ef408b1466f375f18ba3abe59e2269d476beba282907df69efac831bc72d9fa83e8250f96e0351d669144daa57e296aa89f80aa5e790ff472801f425616b9f17
+EBUILD vim-8.2.0814-r100.ebuild 9223 BLAKE2B 4330a028b02ccf7fca5c1a2626368b0efb351ad2573fe1e73462666d4d4a1c0189a9b3bb35bbb75648be3757445c369566903b15286bc4bd8eb2e5502a3fc8f3 SHA512 e422f0bc9a0142037e80b6f764587b9a9ef99765a8ed5de1554fe783fb712e1abdf4d8b3b0d25bb50b7acdfa671696e0a06d3984cf74a0a9d0b25c76c998183f
 EBUILD vim-8.2.0814.ebuild 9037 BLAKE2B 147f818f86a123f990ebb6301c7a860f9547060965f34add77d2b3ae215195c362a108e5f4c31c78e386750876afbf56a7b7939ca0fdf7982956d52b96e995b7 SHA512 5b36257b17dc28ec9a0b505e750ff3e147eecf76e906b20702f75ec28d7dde1493dad53266940076aa6b0e93f98482a1e4d8ef63ea7b2cd6b3c828d5981dc586
 EBUILD vim-9999.ebuild 9230 BLAKE2B a1076be848ed46f432ab9d390ecf93fdd6d5c50956d0c773da95e38a620e8baab6acaaf918ba8b547c0ef6b57bd6aa30242c243e4c75814ef804965a60559ebc SHA512 ef408b1466f375f18ba3abe59e2269d476beba282907df69efac831bc72d9fa83e8250f96e0351d669144daa57e296aa89f80aa5e790ff472801f425616b9f17
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/vim-8.2.0814-r100.ebuild b/app-editors/vim/vim-8.2.0814-r100.ebuild
index 53ce2e38ed21..3e3886e51bf6 100644
--- a/app-editors/vim/vim-8.2.0814-r100.ebuild
+++ b/app-editors/vim/vim-8.2.0814-r100.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
 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"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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
 
 DESCRIPTION="Vim, an improved vi-style text editor"