gentoo auto-resync : 10:06:2023 - 15:51:39

8 files changed, 44 insertions, 676 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index d725bdac6921..89964d5d3679 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index d833dfc23b01..0af0605d7fa2 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -6,7 +6,6 @@ DIST emacs-26.3-patches-5.tar.xz 5484 BLAKE2B dc2011b35d948d6106cfa4fd7f2ca5d459
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-6.tar.xz 11600 BLAKE2B ed8bfb8b2c086423e7bf9f8de5ffb929aa63d8b2781361a8a9d274124a9df52ececdb38c3d4d7d0f0d0fa3a8eaea337c0078929967b073a70209ecdb2bb4cb58 SHA512 11f8af976148c957aebaa5fd2edd46b12ffe24036c09c20a61c47e65d8a2febe6480636be2a7f8f3f7c70a8da7091c2a7c254fd853bde56ec45d7db6a9ca94f5
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
-DIST emacs-28.2-patches-2.tar.xz 3760 BLAKE2B 73a78b4fa05aec86ed29315acdad8219957f3acae4ebca130ec17a578522443e8fe911a3165c3918eee12d6a0b8173c0d22166888ae392d8a83689494bdfe689 SHA512 841fcde4f8a0428e017b1f6fb70a2e4f9f7c5ee2ead410f48381f66815b9c2c23990b23ec06988a78aef01fbc4e624ceef05bd2eafd071d2174e998ba09a79a6
 DIST emacs-28.2-patches-3.tar.xz 5416 BLAKE2B c361fdebf375427cf25c4ac206161b5b55d8d6de88752de35491c778ba90eedf277159a8c317ccda7aaf5e000035d6e33d8e70282436d6e03fa311c4576abe03 SHA512 acae15b577af831bc94e102323836f3fa5b0d51ec1096b84063c81c58f1087b67487507c05d93ba5ddacfce0fea4f3e755906a9ec582b061b65095ee7d693eac
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
 DIST emacs-28.3-patches-1.tar.xz 2280 BLAKE2B 1c6279801b15ddbc79aeaf997cf1f2d437dc5579bc76165d723333ac7f70a0570c4e4dcf166e479e897b006385cc4402d44ea55276abc778cdb71b982e60bfdc SHA512 1ffc28790ec05b1c6549a552d070e48890d8a3e3be9aa7582ad7761bf7ed867d0f1fd5261bc4954028917b6918e9f7b1e45b4086ee410c284c1212d6d129ea35
@@ -18,7 +17,6 @@ EBUILD emacs-25.3-r18.ebuild 11103 BLAKE2B 64be034cea7fbe62eabf0765e137d8ec28c2d
 EBUILD emacs-26.3-r15.ebuild 11832 BLAKE2B d180b093feefc98486bca2c449b9544248b0913a84ae4b6f635992011b93e68010809266c40c953a0c72670d40931ff86b3ef4f841dadf02cb9e2b197cbc54b2 SHA512 2163c3f58f6f3abe594665c1f21deb9d26485d5eac65b590e03a2294810eb4b0a1aec2244baefcdd3e321c019abd9d2290676af092b672c19ea46b0f24f69395
 EBUILD emacs-27.2-r13.ebuild 14352 BLAKE2B 9a45e3c66078375a9bbfc5fa57a3da7b592ff0f00f292fa3c2fe787ec6f3faa964763072a86d871887a2610b74652cfa7ffbe769d9e782c3da8f7d8cc10eac4a SHA512 f599f73e1587df13aaf7a7e203a909213bbf67e2302cb27b342398e18e400fdb439c95a4e12a2bc68a2c141315a46cc7436496e56d4eda54deabb548b75f0565
 EBUILD emacs-28.2-r8.ebuild 16861 BLAKE2B 7d327e82604c0cc682b38824741e222d71250226f2d82dd4d99d23fbee4809a84d6ef457252d00ef9beed5ad3083d65d3482ee00c5161dbea1485e510a9b03a6 SHA512 3b21dabbb13ee8f316bafa47702980af83ea1e008340d930f3d5bd0ea98a789f34af049760cca90b02b7da3363253c99f6f6c037a107815a8bb450cf234f2a3b
-EBUILD emacs-28.3_rc1-r2.ebuild 17357 BLAKE2B 9dadd787a6fd60bcbf1b5b660cfee2165ba6c3aa38cc76264347ad30875e60be5fdbab9325c01c6467f3b13e4450ebbcb34446c4b36086f926a32aea8287b021 SHA512 6d0ab1f4a86ca3bc0d7ffc2d826b07ea49942b993f6b8b1021ba29ead210c56f1121350c4229bdaeb84cb2718931206049ef40976117c1e51579695022a03ff7
 EBUILD emacs-28.3_rc1-r3.ebuild 17169 BLAKE2B d579a9ec25cda91d826008f7ce01c01fd6255fd955e03d2f33661a8f787fd91140234d35c6a6c4818c53bdf18b64c77680c6bef0b563237291df2dcd2f98ab69 SHA512 1a12a41b1226e28559b0d82e4838ee9ddf1b021b08d333200a212c34398e9e8bb8d84536bd1ae28b4f8ca96cf5398ee515dd0c9bf201d6aceba1aef100dc885b
 EBUILD emacs-29.0.90.ebuild 18297 BLAKE2B f923f6a4e7cfc6c3ff044cc33d57c88b690af057fc232704e7c74c9dc9da23d7dc60b3e24faab751686b2c044b5c4351a6afb895ef99bede63f64c374e53abbc SHA512 4cf178150f7724d249bb2517ea61d6afc5ef34811a25b955139d0b9642128fa3fe60bd34b45007bab4d52b93955f88e11ddb81827a00eb5ef11c8ff6a7b47abe
 EBUILD emacs-29.0.91.ebuild 18297 BLAKE2B f923f6a4e7cfc6c3ff044cc33d57c88b690af057fc232704e7c74c9dc9da23d7dc60b3e24faab751686b2c044b5c4351a6afb895ef99bede63f64c374e53abbc SHA512 4cf178150f7724d249bb2517ea61d6afc5ef34811a25b955139d0b9642128fa3fe60bd34b45007bab4d52b93955f88e11ddb81827a00eb5ef11c8ff6a7b47abe
diff --git a/app-editors/emacs/emacs-28.3_rc1-r2.ebuild b/app-editors/emacs/emacs-28.3_rc1-r2.ebuild
deleted file mode 100644
index 42b641e992ba..000000000000
--- a/app-editors/emacs/emacs-28.3_rc1-r2.ebuild
+++ /dev/null
@@ -1,536 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-28"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${PN}-28.2-patches-2.tar.xz"
-	#PATCHES=("${WORKDIR}/patch")
-	PATCHES=(
-		"${WORKDIR}/patch/01_all_libseccomp.patch"
-		# 02_all_etags.patch already applied upstream
-		"${WORKDIR}/patch/03_all_webkit-4.1.patch"
-	)
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	jit? (
-		sys-devel/gcc:=[jit(-)]
-		sys-libs/zlib
-	)
-	json? ( dev-libs/jansson:= )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	valgrind? ( dev-util/valgrind )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18[X] )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			x11-libs/gtk+:3
-			xwidgets? (
-				net-libs/webkit-gtk:4.1=
-				x11-libs/libXcomposite
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	if use jit; then
-		export NATIVE_FULL_AOT=1
-		find lisp -type f -name "*.elc" -delete || die
-
-		# These files ignore LDFLAGS. We assign the variable here, because
-		# for live ebuilds FULL_VERSION doesn't exist in global scope
-		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
-
-		# gccjit doesn't play well with ccache or distcc #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
-			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Prevents e.g. tests interfering with running Emacs.
-	unset EMACS_SOCKET_NAME
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use jit; then
-		use zlib || ewarn \
-			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
-		myconf+=" --with-zlib"
-	else
-		myconf+=" $(use_with zlib)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=" --with-dumping=none"
-	elif use m68k; then
-		# Workaround for https://debbugs.gnu.org/44531
-		myconf+=" --with-dumping=unexec"
-	else
-		myconf+=" --with-dumping=pdumper"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		--with-pdumper \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with jit native-compilation) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		${myconf}
-}
-
-src_compile() {
-	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
-	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
-
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_test() {
-	# List .el test files with a comment above listing the exact
-	# subtests which caused failure. Elements should begin with a %.
-	# e.g. %lisp/gnus/mml-sec-tests.el.
-	local exclude_tests=(
-		# Reason: not yet known
-		# mml-secure-en-decrypt-{1,2,3,4}
-		# mml-secure-find-usable-keys-{1,2}
-		# mml-secure-key-checks
-		# mml-secure-select-preferred-keys-4
-		# mml-secure-sign-verify-1
-		%lisp/gnus/mml-sec-tests.el
-
-		# Reason: race condition
-		# Looks like it should be fixed in 29.x at least:
-		# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706
-		# files-tests-file-name-non-special-file-in-directory-p
-		%lisp/files-tests.el
-
-		# Reason: permission denied on /nonexistent
-		# (vc-*-bzr only fails if breezy is installed, as they
-		# try to access cache dirs under /nonexistent)
-		#
-		# rmail-undigest-test-multipart-mixed-digest
-		# rmail-undigest-test-rfc1153-less-strict-digest
-		# rmail-undigest-test-rfc1153-sloppy-digest
-		# rmail-undigest-test-rfc934-digest
-		# vc-test-bzr02-state
-		# vc-test-bzr05-rename-file
-		# vc-test-bzr06-version-diff
-		# vc-bzr-test-bug9781
-		%lisp/mail/undigest-tests.el
-		%lisp/vc/vc-tests.el
-		%lisp/vc/vc-bzr-tests.el
-
-		# Reason: fails if bubblewrap (bwrap) is installed
-		# "bwrap: setting up uid map: Permission denied"
-		#
-		# bytecomp-tests--dest-mountpoint
-		%lisp/emacs-lisp/bytecomp-tests.el
-
-		# Reason: inconsistent years in files?
-		# test-correct-notice
-		# test-end-chop
-		%lisp/emacs-lisp/copyright-tests.el
-
-		# The following tests fail with USE=jit #874681
-		# ert-test-record-backtrace
-		# loadhist-tests-file-dependents
-		# loadhist-tests-file-provides
-		%lisp/emacs-lisp/ert-tests.el
-		%lisp/loadhist-tests.el
-	)
-
-	# See test/README for possible options
-	emake \
-		EMACS_TEST_VERBOSE=1 \
-		EXCLUDE_TESTS="${exclude_tests[*]}" \
-		TEST_BACKTRACE_LINE_LENGTH=nil \
-		check
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
-
-	# dissuade Portage from removing our dir file #257260
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# verify that the PM hasn't removed our Info directory index #257260
-	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
-	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/micro/Manifest b/app-editors/micro/Manifest
index 4be301063a2b..9776cc92c064 100644
--- a/app-editors/micro/Manifest
+++ b/app-editors/micro/Manifest
@@ -23,8 +23,6 @@ DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
-DIST github.com%2Fp-e-w%2Fgo-runewidth%2F@v%2Fv0.0.10-0.20200613030200-3e1705c5c059.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fp-e-w%2Fgo-runewidth%2F@v%2Fv0.0.10-0.20200613030200-3e1705c5c059.zip 21092 BLAKE2B 579b1fdbade64918255fe8b2386bd04fb6bed839a7ab22a1a77eeb7d2152148db90b91249961198ea03478e4a649e0119b3ebbc97f6cc66d05cc8165edb158a3 SHA512 aea53f79712ba0a901f2d33899bf76df697afe02a1df8efc986bed75b3aa83d3ffa16f52397fd387ba3cc21a31d9c8c048953e67597010e3c5c5b5cdf1fd7cfa
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
@@ -34,7 +32,6 @@ DIST github.com%2Frobertkrimen%2Fotto%2F@v%2Fv0.0.0-20191219234010-c382bd3c16ff.
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod 281 BLAKE2B 15a1cb67527ae81338a77cffa1432cd83c798bd7094eadfbc88a7eb79f5236690dc2d5c93e3daefedb396516c41bf05da21b5e12966f69fd2663e7621267d015 SHA512 7af123ea69147856e23249740b882d90213ccc3f19cf698d960dd5950fa3f3f72c600854c5e0bb94977e6c5eab617736dcd20e180eebf599399215ad8c5c0051
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb70ef29156c1d31247bcab91ca7cc02f4164ed28a98769f1eede3e680b9b41dc55371a4dcbfe27b92bfce546ee2f1ca447f8623fb3fd88174888 SHA512 908f2454a0722d403aa33ea6cd1d40617ae8b84c62efc9a5de0bcf9c40413b6ba8412ac831e4b54b237190131be56e23266a9e18b0b680da5fd588e889985da3
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 34637 BLAKE2B 9e26766ed5717903173455e60ee1b690779e286b6be3cc22f633ccf26592839d149f813a1b92775ab2a447f0c1a20960f956fe5aa4a7c56abc6642b58b7973e3 SHA512 968b76a138261cfee0d1f58ede483741328968e24d073b24affdc7ab9cbf9bb76dd9fa1785423c49471c02ea4804810ebe673bc623c4f72389b2654a64a565e1
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
 DIST github.com%2Fxo%2Fterminfo%2F@v%2Fv0.0.0-20200218205459-454e5b68f9e8.mod 30 BLAKE2B f34dc4736d35b48624f793cec1a79b2a84abb314ad9563734e2768d6f175f117119c06397dcc57880e068b0f9c1d97f4353201450c3ea004eca4d76549d06acb SHA512 a79c50ffbd2e6c4bc4907c302e2811afcd5640c7e35e8d4f211e071e42b9aed218510f190d759a408509a61457259fd6a59be658eec49751910108e8e8537e8c
@@ -58,12 +55,6 @@ DIST github.com%2Fzyedidia%2Fpoller%2F@v%2Fv1.0.1.mod 34 BLAKE2B 22d6340dbabd18d
 DIST github.com%2Fzyedidia%2Fpoller%2F@v%2Fv1.0.1.zip 25272 BLAKE2B 50eee92c460dfff99f8261c1b5bd45d8ddd029396fff85acb67afe0eb25e0120a683c575d8f331daeb2c9b74e829d418700cc937655fdd8545153e947b3034e8 SHA512 0234099663b08401480685679a73e322bd506791e058423516d0cd6670c6c1ac0999d613a442fa7b1f7846086df0f92d83659e116b713c17709f804003097fd1
 DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv1.1.15.mod 40 BLAKE2B aff997dcc39cacc15c2c70f9c55b59423e04a0d674c16f69650844da8eaef71d07407db21acbc90e4ca223007572a6d0cdafa8027f3392da97b682c040302eb3 SHA512 ac31a74f5618ad145697ab02ce101f6fab35ae2518ed3ba1f160024b370f9741ebf3fa2831527fe0fcf08b54d81b9793ef096b39a33992c8412ef514bdb0ced5
 DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv1.1.15.zip 24480 BLAKE2B c12522ff9844ba6cd151074d938f2be36d19c4e5cac4906ee0373116c7b8c3241dac349282c11c3c021c9f4416e3c36a8cd91418eeff29f8406bd8b4a8cb3ba9 SHA512 cd4a9dfd077afeda2c1c501c8d010ff7b51dad6c79354db10be3e869e665ae90f60992132f91d91a8754b8124cb902d91ecfdb5a9fc1aaf7df2d036c720c6023
-DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv2.0.0+incompatible.mod 31 BLAKE2B 0d0decd07c2ebd17e899f2c4032a6dab06ea54a764b90997442d29d5b7464bb993cbeb9a842b547424e8b187717895ad811e589784a213e4d00fabf0b8e28db8 SHA512 919c519a4fb1d1f3d13f1217f59f82aaaa202a65ac201c64ef0ebde46a4e5f6c977282b5afcd11778ad38d35b4591c1190bb94be66010a346a47253d1ee32db2
-DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv2.0.0+incompatible.zip 15796 BLAKE2B d4cb2490b6b8d1914f802e7e767e0d29be06b6946012c4d84f9e7a898a4a2d20d64b9cd84eb5ab729ff8c1d1925a8f3ccab78f56f249d56a7cc5feacadd82ea7 SHA512 a51787e01adcedd20ddbba543351904bdde3c25f44f9621cfe0ffa73ed28d0b21327aadbe529a73374ffbd315b91b4d0d0d7f2c9fcc033d67f21158ce486e2f1
-DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.6.mod 348 BLAKE2B ea7eb55e01e85f76b88f072b02e36bbeb800eaec4ce39404f4acc409ac05af51e78c3e26d317cfdade2a3adb28bfddbd5233db60c300bc5f3a8e5eeb7f09eeac SHA512 b3db94f2a7c44d7350d89acb9a118c6f8d3c39530a1af23c5e1aa9f9fa842a06ec5e7f5af4e87901cb08c841e7f953b3f83a3ae6488f9f3d14d4ee063b53ffcb
-DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.6.zip 187590 BLAKE2B a3b641b2aa2af33386e1abf651265ae2193dce91b99c2736b494de20b80c7ce546882c980ca2893e96a845a93dbb11db6e79a6c50ed15388aecb7f72d4c8c4d4 SHA512 85c0d085eccf722bc9bf0b1fa077e1d639523c97ffe0445d3b2bd5025520be9a4250db2f897dfaf65b4aa8db41901bd214d0c85da51f76e9c0be6d8361d561ec
-DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.7.mod 348 BLAKE2B ea7eb55e01e85f76b88f072b02e36bbeb800eaec4ce39404f4acc409ac05af51e78c3e26d317cfdade2a3adb28bfddbd5233db60c300bc5f3a8e5eeb7f09eeac SHA512 b3db94f2a7c44d7350d89acb9a118c6f8d3c39530a1af23c5e1aa9f9fa842a06ec5e7f5af4e87901cb08c841e7f953b3f83a3ae6488f9f3d14d4ee063b53ffcb
-DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.7.zip 187662 BLAKE2B 527b4656a565d47adbfe9315d8632d4b4782811a4a05b63b1a02f19d4e33c30515cae9a7a383eb563abbd4a508e5538ca8dd922edb6304f4075a6df9eeacd485 SHA512 ccf387f4fc5218a017ff1edc5ed9ab2456472cfc8a8418a2664b587fb81ff234fee3f69ca9d4d7620e904eee274996aea05a52541c94e52eac605b61d6358a60
 DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.8.mod 348 BLAKE2B ea7eb55e01e85f76b88f072b02e36bbeb800eaec4ce39404f4acc409ac05af51e78c3e26d317cfdade2a3adb28bfddbd5233db60c300bc5f3a8e5eeb7f09eeac SHA512 b3db94f2a7c44d7350d89acb9a118c6f8d3c39530a1af23c5e1aa9f9fa842a06ec5e7f5af4e87901cb08c841e7f953b3f83a3ae6488f9f3d14d4ee063b53ffcb
 DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.8.zip 187655 BLAKE2B 9bb3b50d2124d2dc8eceb173683a9e5b9bb8c03818fe8fa2b8d468ad27a81b92468f239717de28791a49461d830ab9f0467e7eca90fc223aa57bde764277bdde SHA512 3e18af5b738b0159867cf0d16b4b2a6976c22370279681f7263ba226c66205c92f800ab76e5529776c2967dc144fdb327e94dbab83ee051ac8f2cbd1346850e0
 DIST github.com%2Fzyedidia%2Fterminal%2F@v%2Fv0.0.0-20180726154117-533c623e2415.mod 36 BLAKE2B 3cb28ee3349be36d7ce15690d16e2f0d17e60e2bf3bf6ad506e591338d3787c7a9d2d658347c3a3c5e858b091ab41f59e261647a0e2738c91c3ee8508b680493 SHA512 84a84f76d05e19cd18dc80abc820fc4209c9a85eef25444a9afcb90a7bb9cfbf15aa233d8ce9592681e78083dbd1b6311b3043884fa0260c03490a6e0318ac73
@@ -88,7 +79,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971
 DIST layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.mod 109 BLAKE2B 08629b072202d338d461af7142fd4049b4db1c2df5997c995edfa9b12b2db2df0da8160db7032bc84215c742ad67021910b2fa3ec87c33c14fec309a137cb174 SHA512 b2ec68ffa8d8e747ebfc1f6103ec980c0e02d372a50d44c1ca289688cceb41006443c02c937975bf5847460a6a071d17f1f0c8ee7549fa1cf4eccdf848020ac2
 DIST layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.zip 36857 BLAKE2B c4ff2a1bbc2dc984fc24065f71b560cbdda220b78d88cff9ed5a91654984cd56c9e85b64a416c140e4b01bfda75734f7c77f882e3fb45a0227b3f47cc02781c8 SHA512 94b70a83a31acde7232223ca82d6588716b39d6463baf5f15d921a5bc24a7d9b98307b8d44d3bbc9a5a82f6e4111b2b9ba1c15ee313a3784a30d63fe5d198bd3
 DIST micro-2.0.10.tar.gz 814030 BLAKE2B 8becaf7caa167747443e1aa3af32e96588af275d2b921fa88fe9d55b4eec22622cf7a68d85d47834159042100414855c5bb3f8b9f7c8d934f762ec63f4d40435 SHA512 06796270a6d99578ac36f3313dffb6ba56c5e8963c6b59562b4ef9e65036ae2ed21ce602b39ee08d2f3c54c501089166fdecc5719a1ca535d84960b3b4b67f72
-DIST micro-2.0.9.tar.gz 811560 BLAKE2B 2e461593e71fda69a6f75e5adfaedd7bcf052b8bda9899f03a1e25e3db3bb8071bec80716d14a0ff7a381728871f0705076ef69e4de58f40499a7501343b4063 SHA512 5dbf81deb734618ec0a8ccaffc65f972d8da1d28b761c31bf3f5433c02ad6daa2360b1ea825c0a2cfce2f8d31d6481d468bbe29b42e1c96083c7a941fe42bc3a
+DIST micro-2.0.11-deps.tar.xz 19390200 BLAKE2B 3f4e3a60395854e1dcba0ed69c7f6b95d7e1efa6897da01232e66b253a0ef2f88c29cc9628ddcc569dc5d4bc63ed21866fb5861ffdfb4de61ae5654f4b6a7ae4 SHA512 c4fcd2ce5d8e85bdaf969d7d2fec5b526ea650b7a58649dd3546f0164b10478e248eaeb1cf4fe371f44ff0a3cd70541e1c4751d01ac33a49a6bd853f78941436
+DIST micro-2.0.11.tar.gz 549261 BLAKE2B 30c21d7747870a9a85a8fb552ec9035af5c42232f4d2ee0744c24671e78ee22ff5eea803fbc19fac704b49644df0597538950b735f955eecc921e681c0ad924c SHA512 3aa3dd10baaec9fa73b5c673c3d29eb8b4d04b468e36866118bcfc70dd638c50e56d51fc6085dcc7441a2ce0d9bbf742c37fd26a7e2b92d8b20844c8a7b53487
 EBUILD micro-2.0.10.ebuild 5255 BLAKE2B da25e44da47e0e189c7fef0166a93b7f1fd81fa21bd2b4a2c5fa3cbf4d7b7f8c16214fbc8af560d3c74754630a8694af3ebb97f5fa119b3309f18f1202735105 SHA512 da2af84d80b73389a64638417fb11eb9eaaaa0b1d57a76a1053f9eb2853d71e2be750d11e29e1e777e4cfccbddb706f77943ee7da28aac009fafec44d69e317d
-EBUILD micro-2.0.9.ebuild 5086 BLAKE2B 9a7639739c02096aaad13dbf57f0a5b661e5d823ef9af9c8540c7850abfbb975f21566785bf77806e338e70852d256b25a158b1ecc7c450998b66a3e1553dd47 SHA512 85f8224d341ea91fa0a41c87856a69e555ec5685861d2d7fc75b0c57e6285d1e2e8677e6be5905f0a0f8cde43f293bff139b0ed4c3c062dc8a4eaea30ce6d3bb
+EBUILD micro-2.0.11.ebuild 1111 BLAKE2B e8bd8f2dd6e8239d5766710c0421a05076f80e0d9df53a19b77be02e2f01195438eec02b99ef77f3e865cfc1e80acaccbc06ae7ce5fb4683546fb09ba60d515b SHA512 b0f617d64e1d2046b0e3aaafa9a5402f5ee7a9df2778e7bcf963717077ab3f15137fd7dba973f3d156f0e49c3a93264c1b92f6948b1254e8cdd9390d3aa37495
 MISC metadata.xml 471 BLAKE2B f6487317798718fbf48883ece7a99354ffe1ff88a82d16545d9d27582c679a1c18b3cf9c4a2f39a84a329f3ea272250651e901f1ebea12c2522fab03d565284d SHA512 b3a71e979bdaed4948c196a53b69d9d43cf23bf266e7a03835a83bcbe942202e5c2a14de256574bc8462f94b3211523444bf7c3b5fc4fe2772afbaafaf3346b1
diff --git a/app-editors/micro/micro-2.0.11.ebuild b/app-editors/micro/micro-2.0.11.ebuild
new file mode 100644
index 000000000000..a57e060fc7af
--- /dev/null
+++ b/app-editors/micro/micro-2.0.11.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module optfeature desktop xdg
+
+DESCRIPTION="Modern and intuitive terminal-based text editor"
+HOMEPAGE="https://github.com/zyedidia/micro"
+SRC_URI="https://github.com/zyedidia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+BDEPEND="dev-vcs/git"
+
+src_compile() {
+	ego build -v -work -x -o ${PN} -ldflags \
+		"-X github.com/zyedidia/micro/v2/internal/util.Version=${PV} -X github.com/zyedidia/micro/v2/internal/util.CompileDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+		./cmd/micro
+}
+
+src_install() {
+	dobin ${PN}
+	doman ./assets/packaging/micro.1
+	domenu assets/packaging/micro.desktop
+	einstalldocs
+}
+
+pkg_postinst() {
+	# Update desktop file mime cache
+	xdg_pkg_postinst
+
+	optfeature_header "Clipboard support with display servers:"
+	optfeature "Xorg" x11-misc/xsel x11-misc/xclip
+	optfeature "Wayland" gui-apps/wl-clipboard
+}
diff --git a/app-editors/micro/micro-2.0.9.ebuild b/app-editors/micro/micro-2.0.9.ebuild
deleted file mode 100644
index eb2eaab1c676..000000000000
--- a/app-editors/micro/micro-2.0.9.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module optfeature
-
-EGO_SUM=(
-	"github.com/blang/semver v3.5.1+incompatible"
-	"github.com/blang/semver v3.5.1+incompatible/go.mod"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dustin/go-humanize v1.0.0"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/gdamore/encoding v1.0.0"
-	"github.com/gdamore/encoding v1.0.0/go.mod"
-	"github.com/go-errors/errors v1.0.1"
-	"github.com/go-errors/errors v1.0.1/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/lucasb-eyer/go-colorful v1.0.3"
-	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.11"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/p-e-w/go-runewidth v0.0.10-0.20200613030200-3e1705c5c059"
-	"github.com/p-e-w/go-runewidth v0.0.10-0.20200613030200-3e1705c5c059/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/rivo/uniseg v0.1.0"
-	"github.com/rivo/uniseg v0.1.0/go.mod"
-	"github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff"
-	"github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod"
-	"github.com/sergi/go-diff v1.1.0"
-	"github.com/sergi/go-diff v1.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.0"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8"
-	"github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8/go.mod"
-	"github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583/go.mod"
-	"github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb"
-	"github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod"
-	"github.com/zyedidia/clipboard v1.0.3"
-	"github.com/zyedidia/clipboard v1.0.3/go.mod"
-	"github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3"
-	"github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3/go.mod"
-	"github.com/zyedidia/go-runewidth v0.0.12"
-	"github.com/zyedidia/go-runewidth v0.0.12/go.mod"
-	"github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655"
-	"github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655/go.mod"
-	"github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5"
-	"github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5/go.mod"
-	"github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d"
-	"github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d/go.mod"
-	"github.com/zyedidia/poller v1.0.1"
-	"github.com/zyedidia/poller v1.0.1/go.mod"
-	"github.com/zyedidia/pty v2.0.0+incompatible"
-	"github.com/zyedidia/pty v2.0.0+incompatible/go.mod"
-	"github.com/zyedidia/tcell/v2 v2.0.6"
-	"github.com/zyedidia/tcell/v2 v2.0.6/go.mod"
-	"github.com/zyedidia/tcell/v2 v2.0.7"
-	"github.com/zyedidia/tcell/v2 v2.0.7/go.mod"
-	"github.com/zyedidia/tcell/v2 v2.0.8"
-	"github.com/zyedidia/tcell/v2 v2.0.8/go.mod"
-	"github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415"
-	"github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415/go.mod"
-	"golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod"
-	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/sourcemap.v1 v1.0.5"
-	"gopkg.in/sourcemap.v1 v1.0.5/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7"
-	"gopkg.in/yaml.v2 v2.2.7/go.mod"
-	"layeh.com/gopher-luar v1.0.7"
-	"layeh.com/gopher-luar v1.0.7/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="Modern and intuitive terminal-based text editor"
-HOMEPAGE="https://github.com/zyedidia/micro"
-SRC_URI="
-	https://github.com/zyedidia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_compile() {
-	go build -v -work -x -o ${PN} ./cmd/micro || die
-}
-
-src_install() {
-	dobin ${PN}
-	doman ./assets/packaging/micro.1
-	einstalldocs
-}
-
-pkg_postinst() {
-	optfeature_header "Clipboard support with display servers:"
-	optfeature "Xorg" x11-misc/xsel x11-misc/xclip
-	optfeature "Wayland" gui-apps/wl-clipboard
-}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 8666e894663b..0f41c80d786d 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo.nanorc-r1 5370 BLAKE2B 4e9ad42182d8ce39ae6e4f785dc2b19befc36e240da6f542714b1762d700f8260232f6bfdd0f77c103a0f1230547fe95c9e2a958f47029a0b96a83feafe37a0a SHA512 191cde1c55919061edf461ee9dcf1ff4b4773ac8c41a6282aff215882f1a246b031f040dca737680711b8d56dac5880c4e7ab183094bb602c9b94985f26335c2
+AUX gentoo.nanorc-r1 5356 BLAKE2B fe92f7cf25fb77c9538e1d88fcaa18dec155fd0e2d12a26562cb202828e204e16992ffc9fa8bc605d374c1375d3c0cff125231656be1993267e681f85334a9ca SHA512 ac2080317523a9028e018d8fef9faf78d0f5838a782a7e3815f0c774d4164bd102f49b5dfcd280e1e1c9fcb79b008683bd3015d6b418e0283605b7629f9a0f37
 DIST nano-7.2.tar.xz 1608444 BLAKE2B c7e3b18383e9f2f9db1f6059c875ddd164d730ea0e5b363e66fb8e5f30e8598ba49a5afd8eea3a55e295f1e43fb136019f60cc9154ae276c5d589002c0e5298a SHA512 a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583
 EBUILD nano-7.2.ebuild 2606 BLAKE2B c756b53a17d966295cf66b634a5dd8466f824a057807d356778571b7ace9093917250e060122d21689bb40d2bccf911411dc72cb539bdf2ab369129a26b7e550 SHA512 9dc30944b1b3b41bb00ae594f0d4b89579812e50bf9c89d7d5750f450ce5b34e0b8e12fb52773f6f13f4e4bbb6d26902e4c1b93818ccb6680987b1fe78f9cb19
 EBUILD nano-9999.ebuild 2614 BLAKE2B 00f711c2bf2ef011fe300d37084e924b3838f79c35d23ab74adcaa1d2de7ca9ad257813309da597b352f1af5049fa73d6d6cf0dcd650c0021e112548002785d5 SHA512 d1dd6f584bd44f3c0d770751da8f2f50f3988424b97338e23557978304e68212a2d01e52eb49a240fe7184a5381c4a8de7d9b9a21576a180337d64fe15d8f653
diff --git a/app-editors/nano/files/gentoo.nanorc-r1 b/app-editors/nano/files/gentoo.nanorc-r1
index 2de46b1e9211..067dee075190 100644
--- a/app-editors/nano/files/gentoo.nanorc-r1
+++ b/app-editors/nano/files/gentoo.nanorc-r1
@@ -84,7 +84,7 @@ color magenta ":[^[:space:]]+([[:space:]]|$)"
 color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+"
 color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+"
 ## Accepted arches:
-color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>"
+color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(linux|macos|solaris)?\>"
 color white "[[:space:]][*~-]?\*"
 ## Categories:
 color cyan "^[[:space:]]*[^/]*/"