gentoo resync : 17.07.2021

19 files changed, 654 insertions, 134 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 6cc10ba2663a..76fcce90e15d 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 121aff842d75..b961ee444dc9 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -17,6 +17,7 @@ EBUILD emacs-25.3-r9.ebuild 11142 BLAKE2B 2eb2fe9e84133d53d874e66b05fe8f98c5460f
 EBUILD emacs-26.3-r4.ebuild 11785 BLAKE2B 807bbd1eda823268087003da546d68b5837c4984736e85db519e8ab02924b366a34e8df9d08dcfc0da8b7996c2d4a82a0abe305ceab26eb3783c895e6894c8c7 SHA512 2fb3a6622224509586aaea43dfde63d07e1d568baaa4d808e4285b5466f369fd34a21c56519b0a15e131cfd48f6cd046010eb62cdc6c3ac8e238f3ba4c1a22c5
 EBUILD emacs-27.1-r4.ebuild 14334 BLAKE2B c524e15aa87eebb1eacb52368fc11b17c429a10c83509e883cea3fada349d7a63e7947b1f3c050641ed65fabfbad2ebe965ec19f96b062ddc62162d344bc044a SHA512 7238304e452cf3bae3930c25726fb92a8b76c35155c35793a69aae08b23b7066b34cbb1ae18bd385388ec07170da14008cd89397bd9483a9033f4feaf1632baa
 EBUILD emacs-27.2-r2.ebuild 14431 BLAKE2B 037523522bc7036fdb4b612a6684ce37d213b16b8472b04ffe317d3f9d721d67a7bb7b7ed527f4d970b9030b0dae26b6f1c622238556522f71a9933dc7bd7399 SHA512 25c0edc1c7eee90126ca5b25e55542409ca727914613a1ee3c4aee4c6f28cd401a15f9606e6418afc507844df75f577701825255c8e216e5b4f3eb1514f160bc
-EBUILD emacs-27.2.9999.ebuild 14298 BLAKE2B 5649b3f948225639e73f6b4570f6facf9e81f57476354604c78a178be8f146d0e9325d98f3eb52689d2e02ba522ffe690e33e9c610b6e99584704a2f140b805e SHA512 e22fe0e2da09c9823bcedb148060a56d5b481826fe98f09a6112b3b27d65778e0db12a748e7ec42805345729a0ed0bc0ea46a7878e12588cf4cf999d69f6746b
-EBUILD emacs-28.0.9999.ebuild 14450 BLAKE2B dd079bf7a0a17ef35b16787419aef1531b4b7145fb74f4b9626aabac389ea18beb78f9a8668eb9f6e3d705c0d6644f1ffdd57428f98a034263a0a80e00f5b434 SHA512 9ccc3676c8b09e41a1734cbb8ad527072195667856f545807842e3aa25cb600d834bb6e8a1878ece4abe72e082d18115b6d2cc26a513c24cd08ddf89933fa6ba
+EBUILD emacs-27.2-r3.ebuild 14448 BLAKE2B 2e26400062699395c3aa1f6e78119d059a25ad5c5451e253f087a7bfaf42e5ef0344fa1f126e00d51631d79111b0f85efc2b1a493917f2120790bae1dec668e4 SHA512 f67cbb4f8cf247fb81c29dae8fe78f79aebfc9e6d50278b7f68a549f30430b7a671004ea04dd1b77b10a05379a9c251c69eb8856b8ac7d8dd285bf9d2fcbbc11
+EBUILD emacs-27.2.9999.ebuild 14308 BLAKE2B a56b974705669cfb5c2fe6a4d02d6640d2b8158891296c4948a7877a3681f6b634312e9dda78fb414122f66cfa4030079f296e7f3352330c66f405e6400558ae SHA512 dc909f5e206999c6572c65d81bd10abb7c8c9848403d852d433c0caf2830790d24df5525fe7c38e50ef8a518547acaf3a32c9d31439ee34c76702d029986588c
+EBUILD emacs-28.0.9999.ebuild 14473 BLAKE2B 8d7f734adcaf62e867fd3e70b74b9f0c360471ec4b75b53df8cda2c2609585efd52f3240c93019f8a28861c99a250ee82312aa5fda870b7f9395b8396fcbe13a SHA512 c368160c1c948ffea1267fbda0601ce6365022ad119cc14cbefbacd2293e463ae3f8d168a66656f68fe06c627c9481c6dbdc7d51cc0fd708be326a19dd2f8178
 MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
diff --git a/app-editors/emacs/emacs-27.2-r3.ebuild b/app-editors/emacs/emacs-27.2-r3.ebuild
new file mode 100644
index 000000000000..0245ab3cc2db
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2-r3.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2021 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-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="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-2.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	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 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[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? (
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	!app-editors/emacs-vcs:27
+	app-eselect/eselect-emacs"
+
+IDEPEND="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
+
+	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() {
+	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://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"
+	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 || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild
index 7089e4a9a735..6e936382b210 100644
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
@@ -125,8 +125,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 DEPEND="${RDEPEND}
 	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-	sys-apps/texinfo
+BDEPEND="sys-apps/texinfo
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
@@ -134,6 +133,8 @@ RDEPEND="${RDEPEND}
 	!app-editors/emacs-vcs:27
 	app-eselect/eselect-emacs"
 
+IDEPEND="app-eselect/eselect-emacs"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 682e0651a360..f5a41b7f06e7 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
@@ -118,14 +118,15 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 DEPEND="${RDEPEND}
 	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-	sys-apps/texinfo
+BDEPEND="sys-apps/texinfo
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
 	app-eselect/eselect-emacs"
 
+IDEPEND="app-eselect/eselect-emacs"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
@@ -148,7 +149,7 @@ src_prepare() {
 
 		# gccjit doesn't play well with ccache #801580
 		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} \
+		has ccache ${FEATURES} && tc-is-gcc \
 			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
 				| sed -n '/^libraries:/{s:^[^/]*::;p}')
 	fi
diff --git a/app-editors/ng/Manifest b/app-editors/ng/Manifest
index e29213bad9a4..a2d6012ea10d 100644
--- a/app-editors/ng/Manifest
+++ b/app-editors/ng/Manifest
@@ -1,5 +1,5 @@
 AUX ng-1.5beta1-configure.patch 658 BLAKE2B c76c062312f36e59c4f31f6d24ab992b7722ea3f8d323954b4a3981acc708e751b869e5ce3aafd47869e3893effc3d5705cde7648bb948d7acb7d79d906953e0 SHA512 afea99d16b06308feed87512ccfe084b3f3c222afdb9a3f430ec02882d99cf81d7506dd329601a58ab62d8def05e48f3ff502d0d76ecada8cca2c42931bdca1b
 AUX ng-1.5beta1-ncurses.patch 556 BLAKE2B 87321f8f920609a64cf356a45517b3f3328a204dd65c3fb02faf891c748d4b0dd9fb61814b13d6e99f75255b6b3f544e12f757ac393fdd31ff74a889e0fa619e SHA512 0c53ac22f5452af1ce59dfd6e2bd35868e824a922bbd4742ed20d9e2e24752c2fab52504b1365736dde04ba212c458ace9335a8399509d1043b686d997bfbfbf
 DIST ng-1.5beta1.tar.gz 662557 BLAKE2B 02f1f5277aaba279226d732351eb604205e8bfc030678551a5f2439bde61651bf5aa4e02e06f3283fdab710cc5a1ed9a3eae1e42fd4fa8a8145699b425c4e61e SHA512 eaf3ee067cd98aebc757def9880c5a324975e9f5d0f1db030b11853e86631bca892bf344358ca21b778f5e10ae0d2ed97553221a368326f7a4d9d41f6867abcd
-EBUILD ng-1.5_beta1-r2.ebuild 1210 BLAKE2B d35be1984b0551ded8200846ae9202ff3b2420cdd48e89c1376702737fffe96eb4be8038efe8986955ad2e6b5992b6ab8b9ac10e035e5fe92f47114ee6ad83e0 SHA512 94ef226b7adcd8133f7d245c0b457ae0d43b024d504db7da5a7ab1941de07df03f4387546c46fbfdf6f6ac32578f545e44a11d523830db3b95dfff21718fd26e
+EBUILD ng-1.5_beta1-r3.ebuild 1148 BLAKE2B 3aff452538e9ecf6cf08cad63c9012a19084e993703bc5bcdf47097ba5b1d5e80e4a167a6dc015fbe1e53c5becf9128ecec48acb6b8e843ed06184573534f19b SHA512 f8502ff42b24dd3901a16b3771ac041f588f26eab8a3a9476df2378580453abe147a441e950030481030ae9e25c61aeeaf1634df808f5a11040c329103c15ed6
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-editors/ng/ng-1.5_beta1-r2.ebuild b/app-editors/ng/ng-1.5_beta1-r3.ebuild
index f7b2c66ceb44..428dbda5a7d9 100644
--- a/app-editors/ng/ng-1.5_beta1-r2.ebuild
+++ b/app-editors/ng/ng-1.5_beta1-r3.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=6
@@ -10,22 +10,16 @@ MY_P="${P/_beta/beta}"
 DESCRIPTION="Emacs like micro editor Ng -- based on mg2a"
 HOMEPAGE="http://tt.sakura.ne.jp/~amura/ng/"
 SRC_URI="http://tt.sakura.ne.jp/~amura/archives/ng/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Emacs"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="canna"
 
 RDEPEND="
 	sys-libs/ncurses:0=
-	!dev-java/nailgun
-	canna? ( app-i18n/canna )"
-
-DEPEND="
-	${RDEPEND}
-	sys-apps/sed"
-
-S="${WORKDIR}/${MY_P}"
+	!dev-java/nailgun"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${MY_P}-ncurses.patch"
@@ -43,7 +37,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable canna)
+	econf --disable-canna
 }
 
 src_compile() {
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index b4af4ef45756..6f253a2ec16f 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,6 +1,6 @@
 DIST ReText-7.1.0.tar.gz 484989 BLAKE2B 74f07218cba1d76d011e5347c65ec03ef84da29119c177f35cca206cb269ae4755fdb85448562a378d2ab610930d23b4eccb62a39807409c6e80a68102be2034 SHA512 92333f31f7a57440d642246ed30156384285bb44640a0d6e7654e82749681893eaef3cb16e41fa2d7b618aa59f1ea8cb07d431736b00f35cb9130d7294e3d105
 DIST ReText-7.2.1.tar.gz 522364 BLAKE2B 6334fd6dc1c625378426e408a0d4ad6bb9c02dcba18fcfa566d61ce006a44c34327686a8eb756f2195620e644e096b9393a7cfa73229aa0dab7d29ddf715edaa SHA512 1a375acb40792e3cae9f955a75ebac7c30c9e5cc719477989b28d8d7f06e18ad14d98f1a600a5b6d050b3276ef22bd46b5f1f07af90d561cca500674ff461604
 EBUILD retext-7.1.0.ebuild 1817 BLAKE2B 2d9d2f42c16af2849031e8f43f73d9848268dc9b82f7a863d9b0b1679d9cc52f4d45ec836b637daef785abf0a26f90e621fe1fb85fdc17a0315f81acc74cf477 SHA512 a1160568d324e1a5d240f27d01a978e412ec8f49832dc1661be049f3608a0407ddb152ec1d1a0ef79b274010ba7e1168a0afd747203bd561f37345acdc8431c6
-EBUILD retext-7.2.1.ebuild 1973 BLAKE2B a83f2e5da937ad51bb882b004313a649081e2bf7d19096521e6e62a9fab7dca755c511fc121a9293d0cf0d705c01ea0c31fc739eb500e7998ed677c9f08e29e7 SHA512 cad0fa71050cbd4446bfadbf1cae5575e154f1927db8e4147fb8065dfc57f4761da4d1325dc53cd3097043e635043d59c254ae567d86bcb86a27ec27263a0d7f
+EBUILD retext-7.2.1.ebuild 1971 BLAKE2B cb9b7cab80763e63ee71842f311d0fe3ead40e09184e76daacc85fdc0a7129f2f230d6e81680de0c8cdfa3a4af078c497b736c3235ae126fa9cecc5f9fec2d62 SHA512 97224ae9ec06fde4a75817ad918b795045d14ba147a5704d235f4867c848f4f438ce5c977581b547adead13e7178d26828d8b0d4d1633d0180e6c8b1360011e7
 EBUILD retext-9999.ebuild 1973 BLAKE2B a83f2e5da937ad51bb882b004313a649081e2bf7d19096521e6e62a9fab7dca755c511fc121a9293d0cf0d705c01ea0c31fc739eb500e7998ed677c9f08e29e7 SHA512 cad0fa71050cbd4446bfadbf1cae5575e154f1927db8e4147fb8065dfc57f4761da4d1325dc53cd3097043e635043d59c254ae567d86bcb86a27ec27263a0d7f
 MISC metadata.xml 526 BLAKE2B 62c3e6a8421b9698328bb9eae7040f56a4612b9b9ed94e0435673ee68e2d5b99e96b54bc30eb777bd91f6e47fc37b985552aa2575d7d5cdbbc0885c24b191ab3 SHA512 e46d73af70b8fdb762957cc0d84163f0c24139deab2f24c0bbeb4281e50ff7f5456a95f519ea95f084b46c601eff1419dbec324ce6d9305db71f8b25f759c287
diff --git a/app-editors/retext/retext-7.2.1.ebuild b/app-editors/retext/retext-7.2.1.ebuild
index 13399224b736..ecca89965b21 100644
--- a/app-editors/retext/retext-7.2.1.ebuild
+++ b/app-editors/retext/retext-7.2.1.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == *9999 ]]
 		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
 	else
 		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-		KEYWORDS="~amd64 ~x86"
+		KEYWORDS="amd64 x86"
 		S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
index 065f45b588f3..f52547c3e8ea 100644
--- a/app-editors/sublime-text/Manifest
+++ b/app-editors/sublime-text/Manifest
@@ -3,6 +3,8 @@ AUX sublime-text-4_p4107-set-explicit-startupwmclass-in-launcher.patch 800 BLAKE
 DIST sublime_text_3_build_3211_x32.tar.bz2 13806489 BLAKE2B 1e07df2fc9fb9fb60a6fbfe27a3d657ff80ef46ae91967fa384cfc84bfdc2b5952aea8dbfd9ff015f669b148c1a302cbe01521a72b584abccd51efdab51ac0d8 SHA512 4d19947459046407316382d187ea6fa4cff9b7d3e7ae3c46667d691b6ca425a1f1dfc8599a26cf61b970290a58924a3b605e111ff2802ed124683872c1802803
 DIST sublime_text_3_build_3211_x64.tar.bz2 13677324 BLAKE2B e2ac54c1e8ab90c0fcefb4baf225b02d13a3405e846f08163773ed52c6278f8e89a7b13c15e6c2d6241139d58be9c2c5a1201abb04a3cd68efdffc723075c5af SHA512 a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1
 DIST sublime_text_build_4107_x64.tar.xz 17096632 BLAKE2B 37c1839ef1edecb1f3017e4d99d2b8b0bf5c0aa1490495fe19a48cf38bb436e94913572a4dd5ad5f84e6b5445b6a9a2df35fec607beb0b520471b2dde7ef63fd SHA512 552051b34c612aa6ff53ef6275488467061221715de054dc1e657519c82899e24df1a9f8000086b68c5c1c6e0c98341c641f19a2d97c880efb25aa93ad82f8aa
+DIST sublime_text_build_4113_x64.tar.xz 17105200 BLAKE2B 6a23e9eb7ec5b7b5dfef2ef496e0b7fcf053be3349c8318e85373bc9c3d4d69da3e4e94971ae83832aa254c175a58062a33ffb14d2103c1cdb6888c1223f28ed SHA512 f0e5e8e28754c21bf5c9fc3e50502d22d72fec4819c68d8444cb341aa7ee4d6bc43edfda594fba3c446c2b252bd7a65340dd7a407d81f875971c219bb2236479
 EBUILD sublime-text-3_p3211-r1.ebuild 1645 BLAKE2B 5bdf8d1fdae1df2bc59937e2bd2382385aad77fb60a99e3ea4830239adc027f2c09663c9bec3b795d5f633d3625b2ff5a17b328b46986968e99e45ceeb71e515 SHA512 339364d412f075d97ae576e75dfc50a021fdbf2953a0a6de78f45b97d1db21f335a43a2373631b2a42becd8877b4003fc06b4669f3b092f86df0ff09b3c11f2d
 EBUILD sublime-text-4_p4107.ebuild 2055 BLAKE2B 71fc79523f06b4e66ad3469bd9b62aadc13f2ad66eb2028d80fd69ac358df2a303d71375d0cd406ef3460a299b9f467cbf4917a54a3c58c1a859b656d31408d0 SHA512 b871dbe20734510f84b2b0c421c27552f33786ef1e7f8715ba9bc34ec0eb20a02456f2d668b458cf591ff86f24c91f256c5aff0165a2be94549c749fcdf0d90c
+EBUILD sublime-text-4_p4113.ebuild 1944 BLAKE2B 6ea2f6b0705c7a0f3ae083deb217c7421b75f809f34051e04807f235f2c41cb5f7acbc0e1b7f5859cdacd5fefc3e78b447861456b1a57f796518f9e8ca250634 SHA512 ac4e7c50496ee6e67366f83e6fadb78c8284cb1db640258f9249db0e108fe50eda02081c63e08488548d75ca12882646594f5515c35e30fbe9888e74c6b18426
 MISC metadata.xml 215 BLAKE2B e5b704d936932650ad333b6ee575d0f6fb54f7b01e62f59912a5d88c8a76bfff888e9de639a9a4d6ec5882a3e9a57874eb89935bb3d1a3c3a79a4b1f58b944fb SHA512 d803656f1527d3fc8a2b3474c0ff52d86170950b70057a65ab412ce1adc926545393fe1cfb71731d573f057de2145edd90d642c644ef26222a2b413cd8922d47
diff --git a/app-editors/sublime-text/sublime-text-4_p4113.ebuild b/app-editors/sublime-text/sublime-text-4_p4113.ebuild
new file mode 100644
index 000000000000..6b349eca211e
--- /dev/null
+++ b/app-editors/sublime-text/sublime-text-4_p4113.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper xdg
+
+# get the major version from PV
+MY_PV=$(ver_cut 3)
+MY_PN=${PN/-/_}
+
+DESCRIPTION="Sophisticated text editor for code, markup and prose"
+HOMEPAGE="https://www.sublimetext.com"
+SRC_URI="
+	amd64? ( https://download.sublimetext.com/sublime_text_build_${MY_PV}_x64.tar.xz )"
+S="${WORKDIR}/${MY_PN}"
+
+LICENSE="Sublime"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	dbus? ( sys-apps/dbus )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch
+	"${FILESDIR}"/${PN}-4_p4107-set-explicit-startupwmclass-in-launcher.patch
+)
+
+QA_PREBUILT="*"
+
+# Sublime bundles the kitchen sink, which includes python and other assorted
+# modules. Do not try to unbundle these because you are guaranteed to fail.
+
+src_install() {
+	insinto /opt/${MY_PN}
+	doins -r Packages Lib Icon # /Icon is used at runtime by the application
+	doins changelog.txt libcrypto.so.1.1 libssl.so.1.1 sublime_text.desktop
+
+	# sublime_merge looks for /opt/sublime_text/sublime_text
+	exeinto /opt/${MY_PN}
+	doexe crash_reporter plugin_host-3.3 plugin_host-3.8 sublime_text
+
+	# sublime-text sets its WM_CLASS based on its argv[0]. A wrapper script is
+	# used instead of a symlink to preserve a consistent WM_CLASS regardless of
+	# how the application is launched. This causes the WM_CLASS to be
+	# "sublime_text" which matches the .desktop entry.
+	make_wrapper subl "/opt/${MY_PN}/sublime_text --fwdargv0 \"\$0\""
+	domenu sublime_text.desktop
+
+	local size
+	for size in 16 32 48 128 256; do
+		doicon --size ${size} Icon/${size}x${size}/${PN}.png
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog 'Sublime Text 4'"'"'s window class changes from WM_CLASS="subl" to'
+	elog 'WM_CLASS="sublime_text" matching other distributions.'
+}
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 108f6452a36d..e691aed0406c 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -3,5 +3,9 @@ AUX vscode.desktop 458 BLAKE2B 98bb17607ad9d8f82e0cbbd032718481cfc3d5118de6f15d8
 DIST vscode-1.57.1-amd64.tar.gz 104850563 BLAKE2B b3690382adfa3f8414b38bb784a6a595409fd766d21da05960a4d39344be0dc80bcb99b8b7b7d0d7f4bf5244bb35227e301696a4c16b1e0f9665a4f1f244f15a SHA512 928664a24a65c85db53d74c07b29d5e8bb1c204481fdc9204b3e254dc7f82c1a3090ffac933d331c29c1c9c4a9417200aa0216170058249fc539529130e9dfbc
 DIST vscode-1.57.1-arm.tar.gz 95393169 BLAKE2B dd004a41ec92796d9c2235be032c2cd5a79464926b392fb3c6d73bf0a49265bfeb0c234fd383a267578553501ad23d3e21f8e2edba591e2cb6d7f8a4118dda26 SHA512 3df5f8c15b0622c0d4cb470f095280c817675ccc160b51caeb04ed5471ae41da5d72da8128d5dd689c33d82718433786bdddeb87cca82d80a5eb638094be18e9
 DIST vscode-1.57.1-arm64.tar.gz 110176471 BLAKE2B 40765526445565714c4e487327af4d34d8b83d2eda8cb74431df680a0ad212fa7b24312d07759be077bba30c0ab721af6ced24d31262863524bacd41e4fc5f82 SHA512 f20f22b2e524918bce1bd0d2e43e1f15a11bf40b54c6b8e55fd4dbe2f39c5eb724c3354ab6e8b00b6f8a81f01d0dfe2c6483fc81344a538ee782ae2c1e0ec5bc
+DIST vscode-1.58.2-amd64.tar.gz 105591644 BLAKE2B bc130bfeab48f60f4149aa9d44aebbfba121cb629f1295acb23361a06e5071ddb2dc147c7d161b67f57d45fdb1337784a85bb4f08c6f82a48675c35be0037047 SHA512 00e4012d133e8755b13b1b0136078db872b7f202c59663ea46b137451338ca77f8020cc7fffa807ba5e5963105f0ce8ea0d2a0f29702078a64ace5743da6c83e
+DIST vscode-1.58.2-arm.tar.gz 96167069 BLAKE2B 1c19cf29c9419663216e3ccf521314e0102efcd18a69b0e3668259f8172a377300f1ca900e2d0cda325619a855fdcd6def5db34ebab0e6f79bc0ffd1cb2eb609 SHA512 32c4011c0a10827b73388b469246c179fc3aa06e883c1264f215cd96695821945401b4d0bfc7cf324768977eeb0c785ab4948fdb50899b26b9ca469087ab3b45
+DIST vscode-1.58.2-arm64.tar.gz 110942132 BLAKE2B 3fb2a83087789690ba930ae0910b931f8f2ed129049e536d172bd67be6d928afb2e17ba09756c1dd3f9c145354fa8eface31928f419f74df165bb0c60588dc57 SHA512 f1ae69955251b6e8e92eebf01edfd820cdbf06c887349ba1cb6db2ff8aee170183029a0f2b5075b8a07ed9a26e982b87d63fe0fe4a193fa71ff5ebb52fdf1221
 EBUILD vscode-1.57.1.ebuild 2498 BLAKE2B 6f0b4c2d4c6c9fc109fe05611d54bc953436e183cdcbd3f3fd4cba200ef35dcd60310a87d27a9282daab5bf738803f5c47ab9b64e4ad994673d815df469a1299 SHA512 e53bb2318c995aff9bc38444f4a09e726a6373b3737828b61c58dd638619a8ec877e754001ddc11a1bf8d869814bd0af098205a1199c967fbb79bed193767867
+EBUILD vscode-1.58.2.ebuild 2498 BLAKE2B 6f0b4c2d4c6c9fc109fe05611d54bc953436e183cdcbd3f3fd4cba200ef35dcd60310a87d27a9282daab5bf738803f5c47ab9b64e4ad994673d815df469a1299 SHA512 e53bb2318c995aff9bc38444f4a09e726a6373b3737828b61c58dd638619a8ec877e754001ddc11a1bf8d869814bd0af098205a1199c967fbb79bed193767867
 MISC metadata.xml 946 BLAKE2B 7c5b479e70b6b44c5614a30db4c1aac3ecf8ba399a01d9028888719fc76fb33f083ed248c853ce086a4124c40532254dc4a1fe19c196ca3720a75daecca27442 SHA512 0ddadafbf6dd1eb77e70669eeaff7ce22da48ee801b257ca6447ac16f8c22090510fdf84f432fc3a631d50dece3bd90a46f6a570faee8a5daab06a361d858050
diff --git a/app-editors/vscode/vscode-1.58.2.ebuild b/app-editors/vscode/vscode-1.58.2.ebuild
new file mode 100644
index 000000000000..044c01c33002
--- /dev/null
+++ b/app-editors/vscode/vscode-1.58.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils xdg
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret[crypt]
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libpng:0/16
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libnotify
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscode/code
+	/opt/vscode/libEGL.so
+	/opt/vscode/libffmpeg.so
+	/opt/vscode/libGLESv2.so
+	/opt/vscode/libvulkan.so*
+	/opt/vscode/chrome-sandbox
+	/opt/vscode/libvk_swiftshader.so
+	/opt/vscode/swiftshader/libEGL.so
+	/opt/vscode/swiftshader/libGLESv2.so
+	/opt/vscode/resources/app/extensions/*
+	/opt/vscode/resources/app/node_modules.asar.unpacked/*
+"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
+
+	# Install
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}code
+	fperms +x /opt/${PN}/chrome-sandbox
+	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+	dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
+	domenu "${FILESDIR}/vscode.desktop"
+	domenu "${FILESDIR}/vscode-url-handler.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "You may want to install some additional utils, check in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index caea39b91760..885d4584eda2 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -1,15 +1,11 @@
 AUX vscodium-url-handler.desktop 294 BLAKE2B 340dc0ae856092ec5d4d044ea1ac2ccbd4d4ac8eaa3bab6eb7a48eb21090b1bed24eda15f3eb4c22d0326a802b7ada77a5b6d7277b80d7885c529edb062e85f4 SHA512 6916dbcb0ff1eb131b1bc17aa8c601cf34bf1264702ca574bd6427d3b3daa6d7d69cf0591c48734205b0f12cec396917b89317107b2158b58a0a4ba8ca04cd86
 AUX vscodium.desktop 460 BLAKE2B f07817a1c718b3b981bf353a8b73c9457828b9f48524f01c2a7673111a729b2f81674beae006d566946b81e52a0df162e7ec8a97e050607ecf413f22f6f5b9b3 SHA512 fc05408dcb33ccab0a91e71da36e461bb40f5b8a2b8477f283080d050cb612f55385022228d73bc3b48ae2b7ebcedd63bfc5924c0d87928d91929da8577051c7
-DIST vscodium-1.56.2-amd64.tar.gz 108032091 BLAKE2B e6d66885f79a8f29e9316cf759d6b562029a3da9c3fc6d14742adda0ae20e4be05b6c08f8c1698f3340cd0ca97836c49d3ef82bca9a27318d5f6d5e36555455d SHA512 831444221a3055fde829920ad6c0b8c007aa539b614918b20af0e676ecd31f341497f9c7fb8d8fe95f757bc360446cac93e00ee1a828183e0feb1eefad1e0c11
-DIST vscodium-1.56.2-arm.tar.gz 96683293 BLAKE2B bdc6b89ebfa9e1be765aef63f8a2bcdbf2074b64d70833447b3a3caf148c7887c672077827b7467a681219eef0101bdf82581f589586a263397d2cc9951a8c0c SHA512 023c59d4ae6590437c9425fa02f70cd957c125ea69cfa1c4fe8812f2b7521b747421efe89fd3e4bd95b54f0bdea177941f72467af5d8036d51426b8139a48fc2
-DIST vscodium-1.56.2-arm64.tar.gz 113358341 BLAKE2B f7f8c8589985edd11ba80b4fff9ab1174d436a2516eabc02cd6b3f5d03559295f3fe6772a16e6825d6a23953107b5b7537ab28cedc040a8b35a4b25182ee8d29 SHA512 f0aec2074e93bc26cfc615029bbc9ab360993f00a70272002982c058c7746824f6d97fffb34a5d6c16597b4ad8453730f28b04c11e4d0fd8ccea873490b260d5
-DIST vscodium-1.57.0-amd64.tar.gz 107752144 BLAKE2B c7f6f07a526e25b52f5a93eecdcf285f32bf5af38ff4e0b4882303078c110555134e37d85fad01d92970758e867e17e199586878a0a3abebd6fc18866d1c557a SHA512 e58d6161cff2ab0ef206ae629c65d03a947cc9112826a880f86c296d19462edf03e66c2d17399268b32aed597ea688f93b20cade8aac79d97871306c4d967073
-DIST vscodium-1.57.0-arm.tar.gz 96394761 BLAKE2B 3fc3ab8d4be7343cc8597cf9c09a13e1e28a1bfce12b19a11f5bdf46c1d6931c12718306f19c78fd7c567b622bf40434165009b0b0b6b9de3b86005833188511 SHA512 d7eb1776ceedd0072b039a04ec194779d6c27decc92d311cc9bd8c630b776ec1c85e46b8c3afe93c3cae904f27a2e05d69c6ca4155cae6a90c44570f59afedb2
-DIST vscodium-1.57.0-arm64.tar.gz 113075134 BLAKE2B eeead9b70a8e7b353ac744b65b3854ce5954f242a777e974ba4c8a586aa8c99d6dc5ee793e01568275a3edc48f8287ee3c3c8d1ae6b3c54b9df8913d4f32f96d SHA512 0c8a282b36ec3067246b590c241b3301a623cc9b0bd15bdbc3a2ad6303399c24bb721264ea69f4342717d8ad29046e6ed25ff6b3449923a315e2df2ccc85e0db
 DIST vscodium-1.57.1-amd64.tar.gz 107747154 BLAKE2B 0a348d77616eb691b9a7ef7ded4a2f3b07cf6e44b0e37fdc4f93f0a2327d040aa8a5442f1b978d6c5086d188bcb1aedbefef5f449da05a3f772b1d029bf38e26 SHA512 f4560725d67e690a99b6c1911a1542f877a0caa44e5b6be1aa4a06e0c3c3b16454c06a1a3d881a6af43b4ab97619b9fa464dc979c99c2af0882fe2b2960499d6
 DIST vscodium-1.57.1-arm.tar.gz 96383568 BLAKE2B 13140773fe7442d0c947dba2e9b30ea80fda5f42bdf8557e214bca2741e92d99f8e11821e569fe69b1ade84cc277604a931422610cfdd8a35dfe05be30c9d20a SHA512 2d7e406674b22ce9ca12aee423147b31df8381e615e2a7341c3373509cd63146325dd276bacebd63221dac0cde8b6c0c3b9406c4a437612b46e2e55bf4bb6531
 DIST vscodium-1.57.1-arm64.tar.gz 113062013 BLAKE2B 8befda9f99183097963842fd86e5721563562aba540a4634c273de88fff344f4f3e0554329d5a964f610b5eef02e7f34fd3a2380a96abfa44debbcc7f250e3f2 SHA512 22254e07ea9527b4ecdc77b63aedd55a56b7ede719178a74eeea7134fadda0beab7b604549625c0a48dafe3d18e14c997111ffea261086a608faa9567af911b6
-EBUILD vscodium-1.56.2.ebuild 2353 BLAKE2B b0d5df95befc92bc17316a3948c93ae5cb0f7cc12d3cde72b92b805fbcbfde61913bac6a438d2cc1b809ae55b4cea7ee7775d5cbe87961addc7572b161b55f82 SHA512 7003ddd421cc3416d7aa26181e1da148ab152fcecda780c0fecba4b8f1d8df9bf7af89fac0fc4fb5a5e88d1c945348adafcd59d280f016c89bfe32147bbc98e7
-EBUILD vscodium-1.57.0.ebuild 2353 BLAKE2B b0d5df95befc92bc17316a3948c93ae5cb0f7cc12d3cde72b92b805fbcbfde61913bac6a438d2cc1b809ae55b4cea7ee7775d5cbe87961addc7572b161b55f82 SHA512 7003ddd421cc3416d7aa26181e1da148ab152fcecda780c0fecba4b8f1d8df9bf7af89fac0fc4fb5a5e88d1c945348adafcd59d280f016c89bfe32147bbc98e7
+DIST vscodium-1.58.2-amd64.tar.gz 109733827 BLAKE2B 0ada13724f2d4255a9ce58d0fd47415f2f5b4adfed144dae884914888df1f9bb735472e378fc2d4dd74fd1168c3361ad4e945a48607aeb3e095658a7b3e0df2c SHA512 dd98dbd88e64e526f78624e2e42bd116a689174d801412f7750c895794b0658b20b9451d336d0837f4030c11ce35368fb3dd0ade078bac393ada813c912a9a8d
+DIST vscodium-1.58.2-arm.tar.gz 98395232 BLAKE2B 74bb7a07f9d6a9f107cd74a1a593e7770d67d1f0b2e4b809dab420c8b17fe3902a05a26caf59e2474afdfd01a2d65b0889f2d4298cdf512cfa44df8321a8e65a SHA512 58a08f2a5be9c42410772b97d5456d75044454ace5de92e03ac5bd7ff2dcef284e1e747869752f548bb1237e248981e06a9f9a9b6be99f8e8a50cf52fe6dd2c4
+DIST vscodium-1.58.2-arm64.tar.gz 115052512 BLAKE2B d1047b34bf6132f47b7423e35a7cb92b98cbac782db1a086c068d0bd60fcc59c16852f18451ac860c8e8940fce08e6e7671fed3db3e19f7c80e34411865c7b5b SHA512 d34b53f9679006c30f2f422a8311a336eea778995fc8dc7cb0c24ecc02c88bbb2cd442f426fa88afd78f7175c16ce6c9f912eaa900d76fa25081824f91cabe0f
 EBUILD vscodium-1.57.1.ebuild 2353 BLAKE2B b0d5df95befc92bc17316a3948c93ae5cb0f7cc12d3cde72b92b805fbcbfde61913bac6a438d2cc1b809ae55b4cea7ee7775d5cbe87961addc7572b161b55f82 SHA512 7003ddd421cc3416d7aa26181e1da148ab152fcecda780c0fecba4b8f1d8df9bf7af89fac0fc4fb5a5e88d1c945348adafcd59d280f016c89bfe32147bbc98e7
+EBUILD vscodium-1.58.2.ebuild 2353 BLAKE2B b0d5df95befc92bc17316a3948c93ae5cb0f7cc12d3cde72b92b805fbcbfde61913bac6a438d2cc1b809ae55b4cea7ee7775d5cbe87961addc7572b161b55f82 SHA512 7003ddd421cc3416d7aa26181e1da148ab152fcecda780c0fecba4b8f1d8df9bf7af89fac0fc4fb5a5e88d1c945348adafcd59d280f016c89bfe32147bbc98e7
 MISC metadata.xml 1190 BLAKE2B d2a237155cf015fd18d0bf562747788584142e136c3ffd98ebe1a07c796562a65c27818c0ba0db9e5b64a3a8d1f5c9465e48de285f38042890160eedcdcf017f SHA512 f8e6986a85092e68c016aa34bd4948f0eea6f83b26935e07697ff1c536616c6829495467b2e09d4cda01699bae5c7825fcc711adc2f90e81e60592c168220d4e
diff --git a/app-editors/vscodium/vscodium-1.57.0.ebuild b/app-editors/vscodium/vscodium-1.57.0.ebuild
deleted file mode 100644
index e25a3967ed49..000000000000
--- a/app-editors/vscodium/vscodium-1.57.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils xdg
-
-DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
-HOMEPAGE="https://vscodium.com/"
-SRC_URI="
-	amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
-	arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
-	arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
-"
-
-RESTRICT="mirror strip bindist"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE=""
-
-RDEPEND="
-	app-accessibility/at-spi2-atk
-	app-crypt/libsecret[crypt]
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libpng:0/16
-	net-print/cups
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libnotify
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	/opt/vscodium/codium
-	/opt/vscodium/libEGL.so
-	/opt/vscodium/libffmpeg.so
-	/opt/vscodium/libGLESv2.so
-	/opt/vscodium/libvulkan.so*
-	/opt/vscodium/chrome-sandbox
-	/opt/vscodium/libvk_swiftshader.so
-	/opt/vscodium/swiftshader/libEGL.so
-	/opt/vscodium/swiftshader/libGLESv2.so
-	/opt/vscodium/resources/app/extensions/*
-	/opt/vscodium/resources/app/node_modules.asar.unpacked/*
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	# Cleanup
-	rm "${S}/resources/app/LICENSE.txt" || die
-
-	# Install
-	pax-mark m codium
-	insinto "/opt/${PN}"
-	doins -r *
-	fperms +x /opt/${PN}/{,bin/}codium
-	fperms +x /opt/${PN}/chrome-sandbox
-	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
-	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
-	dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
-	domenu "${FILESDIR}/vscodium.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscodium.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "When compared to the regular VSCode, VSCodium has a few quirks"
-	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
-}
diff --git a/app-editors/vscodium/vscodium-1.56.2.ebuild b/app-editors/vscodium/vscodium-1.58.2.ebuild
index e25a3967ed49..e25a3967ed49 100644
--- a/app-editors/vscodium/vscodium-1.56.2.ebuild
+++ b/app-editors/vscodium/vscodium-1.58.2.ebuild
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 334916d432d7..ff283ee93966 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -16,6 +16,6 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-EBUILD xemacs-21.4.24-r2.ebuild 7125 BLAKE2B 929ec8036ea1a05852199eca6b717ab8c0d390d7f33063cfb220f055aa45e6ea51324edccd73d65a4b9bebf6072f07e65d40d1471d10abefd57f6c915bb27921 SHA512 f0a76a418850c782730766d3fed0e04ec7c9350b7d2c5150348e6e44d0548c4f6ba8837fb8f97c6448deb866f7384b09038a93bfe9a7579f7f41b918b8d02d5f
-EBUILD xemacs-21.5.34-r5.ebuild 7366 BLAKE2B 1d57025f6063c61d68bd585611f4aa999ce8148d1c949c09d2d932742ad55dd838481ef85a5d8f6dc81312111c8d61d0249c912c4f3719d68bac9595caecba8b SHA512 e021ee82f0d451edce59867aaa62ec15ec7952b720b17679792966eabde1731030a2fe13aa41f5b88b96eb5a1f44896c2d214d2e5a8cf9a44907f7ed5d9f5fee
+EBUILD xemacs-21.4.24-r3.ebuild 7093 BLAKE2B b110be14467c17919c72baeff5339dcc1d135f883047cf699e781b4302a0b37a6f6dfa0175de4a66e64fc0d457531ad85a20d83ca8e01d6660dcb0a5a83565ba SHA512 5f01488f2bc7155de34d0c8e7fde30f51584abbe45ad3f2d482b442df26305f8765c0940255e607bc09f9b914facaeb554e0d969bb72e2891fae944cb08c5f9c
+EBUILD xemacs-21.5.34-r6.ebuild 7313 BLAKE2B 11dd52a16988b977ed372d0369e7b958248e2ead1926393170b9a4f58ca9062abe9d9e55963942cf53731dceb3c685b6936d46ed2d87e450614b9bcb050fdd9e SHA512 e9ef30136edec568b2c20067c1f6d5f991fea673f01f0dd04b9a7d69cf240c5a8535e7a5a7688716240ce5d4fe2472e44697a62ef4b230feff4011416bf0879c
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
index 557ca34677b6..9b7467a98c25 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
+IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -41,7 +41,6 @@ RDEPEND="
 	tiff? ( media-libs/tiff:0 )
 	png? ( >=media-libs/libpng-1.2:0 )
 	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
 	!amd64? ( freewnn? ( app-i18n/freewnn ) )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
@@ -147,7 +146,7 @@ src_configure() {
 			myconf="${myconf} --with-xim=no"
 		fi
 
-		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
+		myconf="${myconf} $(use_with freewnn wnn )"
 	fi
 
 	# This determines the type of sounds we are playing
@@ -187,6 +186,7 @@ src_configure() {
 		$(use_with pop ) \
 		--compiler=$(tc-getCC) \
 		--prefix=/usr \
+		--without-canna \
 		--with-ncurses \
 		--with-system-malloc \
 		--with-msw=no \
diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
index bcf39ec31bbd..7e8c4188da85 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -42,7 +42,6 @@ RDEPEND="
 	tiff? ( media-libs/tiff:0 )
 	png? ( >=media-libs/libpng-1.2:0 )
 	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
 	freewnn? ( app-i18n/freewnn )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
@@ -144,7 +143,6 @@ src_configure() {
 			myconf="${myconf} --with-xim=no"
 		fi
 
-		myconf="${myconf} $(use_with canna )"
 		myconf="${myconf} $(use_with freewnn wnn )"
 	fi
 
@@ -177,6 +175,7 @@ src_configure() {
 		$(use_with eolconv file-coding ) \
 		$(use_with pop ) \
 		--prefix=/usr \
+		--without-canna \
 		--with-ncurses \
 		--with-msw=no \
 		--with-mail-locking=flock \