Merge remote-tracking branch 'cos/master' into cos-sdk

BUG=b/277779682
TEST=./update_chroot
RELEASE_NOTE=None

Change-Id: I3bb0e419ae0c8463a1b1756e91510b07316d8622
diff --git a/OWNERS b/OWNERS
index 5f0a65b..e4fd148 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,2 @@
-# By default everyone may approve.
-*
-
 # Set of domain experts available for consultation as a fallback.
 include OWNERS.general
diff --git a/OWNERS.general b/OWNERS.general
index 232172f..6cc38c9 100644
--- a/OWNERS.general
+++ b/OWNERS.general
@@ -10,9 +10,14 @@
 # Individual reviewers if needed.
 # When adding/removing people here, remember to update the gwsq group:
 # http://g/ebuild-reviews
-allenwebb@google.com
-bmgordon@chromium.org
-jrosenth@chromium.org
-manojgupta@chromium.org
+allenwebb@google.com #{LAST_RESORT_SUGGESTION}
+bmgordon@chromium.org #{LAST_RESORT_SUGGESTION}
+jrosenth@chromium.org #{LAST_RESORT_SUGGESTION}
+manojgupta@chromium.org #{LAST_RESORT_SUGGESTION}
 
-include chromiumos/owners:v1:/infra/OWNERS.build
+include chromiumos/owners:v1:/infra/OWNERS.build #{LAST_RESORT_SUGGESTION}
+
+# b/240953811: This OWNERship is intended only for stamping changes related to
+# the dev-rust/third-party-crates-src migration (which extend outside of
+# chromiumos-overlay/dev-rust/). Remove after the migration is complete.
+gbiv@chromium.org #{LAST_RESORT_SUGGESTION}
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
deleted file mode 100644
index 8bda21a..0000000
--- a/app-accessibility/at-spi2-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST at-spi2-core-2.24.1.tar.xz 452440 BLAKE2B 2e3e262d507dadbdb8fc5bb1bd60d3dbe8a9c2946228b6dc551d0a9564684d96b1b6cbe29849c1d846b3106b5444a2c6880a10825ba20cca87893f6a52815023 SHA512 e7f354a90204f12d4e464a6b4e4cb27141af3715d7c5ec253bdd2ebe65bc7d191ae7b775c45470a1bd1fe2c0accdd4e84feeb5e1eb1a6c05f3e5e734371027be
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
deleted file mode 100644
index 38267bb..0000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib-minimal
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="X +introspection"
-KEYWORDS="*"
-
-# x11-libs/libSM is needed until upstream #719808 is solved either
-# making the dep unneeded or fixing their configure
-# Only libX11 is optional right now
-RDEPEND="
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
-	x11-libs/libSM[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-)
-
-multilib_src_configure() {
-	# xevie is deprecated/broken since xorg-1.6/1.7
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-xevie \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable X x11)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
-	fi
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch
deleted file mode 100644
index 269236d..0000000
--- a/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dbind/dbtest.c b/dbind/dbtest.c
-index e8bbb63..9843c3d 100644
---- a/dbind/dbtest.c
-+++ b/dbind/dbtest.c
-@@ -417,7 +417,7 @@ int main (int argc, char **argv)
- 
-     test_helpers ();
-     test_marshalling ();
--    test_teamspaces (bus);
-+    /* test_teamspaces (bus); */
- 
-     return 0;
- }
diff --git a/app-accessibility/at-spi2-core/metadata.xml b/app-accessibility/at-spi2-core/metadata.xml
deleted file mode 100644
index 3998080..0000000
--- a/app-accessibility/at-spi2-core/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-admin/OWNERS b/app-admin/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-admin/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
deleted file mode 100644
index c17fa69..0000000
--- a/app-admin/apache-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST httpd-2.4.33.tar.bz2 6934765 SHA256 de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269 WHIRLPOOL 85d63f20f14874e571305faf5aaa3198e83ecf528235b93c187dc19c0215a5120fb6e63d653d41732abddadf6e3a6fdcc9ce2fab844d20a7227149073c484f40
diff --git a/app-admin/apache-tools/apache-tools-2.4.33.ebuild b/app-admin/apache-tools/apache-tools-2.4.33.ebuild
deleted file mode 100644
index bd278c9..0000000
--- a/app-admin/apache-tools/apache-tools-2.4.33.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic eutils multilib toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="*"
-IUSE="libressl ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-	dev-libs/apr-util:1=
-	dev-libs/expat
-	dev-libs/libpcre
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-	default
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF >"${T}"/pcre-config
-	#!/bin/bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre-config
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-perl="${EPREFIX}"/usr/bin/perl
-		--with-expat="${EPREFIX}"/usr
-		--with-z="${EPREFIX}"/usr
-		--with-apr="${SYSROOT}${EPREFIX}"/usr
-		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
-		--with-pcre="${T}"/pcre-config
-		$(use_enable ssl)
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	)
-	# econf overwrites the stuff from config.layout.
-	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
-	econf "${myeconfargs[@]}"
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED%/}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl ; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
diff --git a/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
deleted file mode 100644
index b7d3c27..0000000
--- a/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/459446
-
-https://raw.github.com/archlinuxcn/repo/master/apache-tools/apache-tools-Makefile.patch
-
---- a/support/Makefile.in
-+++ b/support/Makefile.in
-@@ -1,9 +1,9 @@
- DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
--	logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
-+	logresolve.pl phf_abuse_log.cgi split-logfile
- 
- CLEAN_TARGETS = suexec
- 
--bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
-+bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm dbmmanage
- sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
- TARGETS  = $(bin_PROGRAMS) $(sbin_PROGRAMS)
- 
-@@ -15,26 +15,18 @@
- install:
- 	@test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
- 	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
--	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
--	@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
--	@for i in apxs dbmmanage; do \
-+	@for i in $(bin_PROGRAMS); do \
- 	    if test -f "$(builddir)/$$i"; then \
- 	        cp -p $$i $(DESTDIR)$(bindir); \
- 	        chmod 755 $(DESTDIR)$(bindir)/$$i; \
- 	    fi ; \
- 	done
--	@for i in apachectl; do \
-+	@for i in $(sbin_PROGRAMS); do \
- 	    if test -f "$(builddir)/$$i"; then \
- 	        cp -p $$i $(DESTDIR)$(sbindir); \
- 	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \
- 	    fi ; \
- 	done
--	@if test -f "$(builddir)/envvars-std"; then \
--	    cp -p envvars-std $(DESTDIR)$(sbindir); \
--	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
--	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
--	    fi ; \
--	fi
- 
- htpasswd.lo: passwd_common.h
- passwd_common.lo: passwd_common.h
diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml
deleted file mode 100644
index b9cdf53..0000000
--- a/app-admin/apache-tools/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<longdescription lang="en">
-		app-admin/apache-tools contains tools that might be useful without
-		having apache itself installed (like htdigest/htpasswd, but also ab -
-		the apache benchmark).
-	</longdescription>
-</pkgmetadata>
diff --git a/app-admin/eselect-lib-bin-symlink/Manifest b/app-admin/eselect-lib-bin-symlink/Manifest
deleted file mode 100644
index ecfb6ab..0000000
--- a/app-admin/eselect-lib-bin-symlink/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST eselect-lib-bin-symlink-0.1.1.tar.bz2 45376 SHA256 397ac213f606d3d0534539a9b34f755389294cb1d584b1b656e105a441286b15 SHA512 16b56153aa61534997f42641656c3feaf27243fece8cdd42e93ed0be5dabedafc316af8111cd7ff0e321666de8deb1a35e86032cd9590060f677ac7e68fd48bd WHIRLPOOL e1490e3dc35a8eb96416469fb0f4b310867d1a245abd96fafc2ed0b96561f3cfbcfaff651df79e387338801177898a4b116f2c15242d1a74cb8a3e0375072b87
diff --git a/app-admin/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild b/app-admin/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild
deleted file mode 100644
index 5ea5882..0000000
--- a/app-admin/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild,v 1.16 2014/07/06 13:16:39 mgorny Exp $
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="An eselect library to manage executable symlinks"
-HOMEPAGE="https://bitbucket.org/mgorny/eselect-lib-bin-symlink/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
diff --git a/app-admin/eselect-lib-bin-symlink/metadata.xml b/app-admin/eselect-lib-bin-symlink/metadata.xml
deleted file mode 100644
index 02a1ca7..0000000
--- a/app-admin/eselect-lib-bin-symlink/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://bitbucket.org/mgorny/eselect-lib-bin-symlink/issues/</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/eselect-mpg123/eselect-mpg123-0.1.ebuild b/app-admin/eselect-mpg123/eselect-mpg123-0.1.ebuild
deleted file mode 100644
index 03ce781..0000000
--- a/app-admin/eselect-mpg123/eselect-mpg123-0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mpg123/eselect-mpg123-0.1.ebuild,v 1.12 2013/08/07 13:24:32 ago Exp $
-
-EAPI=5
-
-DESCRIPTION="Manage /usr/bin/mpg123 symlink"
-HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-lib-bin-symlink-0.1.1
-	!<media-sound/mpg123-1.14.4-r1"
-DEPEND=${RDEPEND}
-
-S=${FILESDIR}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins mpg123.eselect-${PV} mpg123.eselect
-}
diff --git a/app-admin/eselect-mpg123/files/mpg123.eselect-0.1 b/app-admin/eselect-mpg123/files/mpg123.eselect-0.1
deleted file mode 100644
index b81b268..0000000
--- a/app-admin/eselect-mpg123/files/mpg123.eselect-0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: mpg123.eselect-0.1,v 1.1 2013/01/15 21:42:33 ssuominen Exp $
-
-DESCRIPTION="Manage /usr/bin/mpg123 implementation"
-MAINTAINER="ssuominen@gentoo.org"
-VERSION="0.1"
-
-SYMLINK_PATH=/usr/bin/mpg123
-SYMLINK_TARGETS=( mpg123-mpg123 mpg321-mpg123 )
-SYMLINK_DESCRIPTION='mpg123 binary'
-
-inherit bin-symlink
diff --git a/app-admin/eselect-mpg123/metadata.xml b/app-admin/eselect-mpg123/metadata.xml
deleted file mode 100644
index e1774e3..0000000
--- a/app-admin/eselect-mpg123/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sound</herd>
-</pkgmetadata>
diff --git a/app-admin/eselect/metadata.xml b/app-admin/eselect/metadata.xml
index 1935b31..30d66ca 100644
--- a/app-admin/eselect/metadata.xml
+++ b/app-admin/eselect/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>eselect@gentoo.org</email>
 	<name>eselect configuration and management tool</name>
 </maintainer>
+<upstream>
+	<remote-id type="gentoo">proj/eselect</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index a30da4c..7e20adf 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -1 +1 @@
-DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
+DIST haskell-updater-1.3.2.tar.gz 26133 BLAKE2B ea72850e5ca35ec18fa00136c654435a852b072aea0402003c962abbb0e0f09e8a84568f78c9186324b0b0ee9658de1b413670e268cfe1c0056810b8c61b479c SHA512 a4d80ecb65efa9ae21008e04b1363ff2196df4ba431fc5ec899bb9904c598c7a109a38f7dd86dd2dc86faca8ed5083d036d700e7f7796840ee5470401c24f3d9
diff --git a/app-admin/haskell-updater/OWNERS b/app-admin/haskell-updater/OWNERS
new file mode 100644
index 0000000..72ddcda
--- /dev/null
+++ b/app-admin/haskell-updater/OWNERS
@@ -0,0 +1 @@
+include /dev-haskell/OWNERS
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
deleted file mode 100644
index e33f9db..0000000
--- a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore )"
-
-src_prepare() {
-	default
-
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
new file mode 100644
index 0000000..3d64c03
--- /dev/null
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CABAL_FEATURES="nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
+HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+
+DEPEND=">=dev-lang/ghc-6.12.1:="
+
+# Need a lower version for portage to get --keep-going
+RDEPEND="|| ( >=sys-apps/portage-2.1.6
+		sys-apps/pkgcore )"
+
+src_prepare() {
+	default
+
+	if use prefix; then
+		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
+			"${S}/Distribution/Gentoo/Packages.hs" || die
+
+		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
+			"${S}/Distribution/Gentoo/GHC.hs" || die
+	fi
+}
+
+src_configure() {
+	cabal_src_configure \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--constraint="Cabal == $(cabal-version)"
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc TODO
+}
diff --git a/app-admin/haskell-updater/metadata.xml b/app-admin/haskell-updater/metadata.xml
index b787881..9373815 100644
--- a/app-admin/haskell-updater/metadata.xml
+++ b/app-admin/haskell-updater/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
deleted file mode 100644
index 47640e8..0000000
--- a/app-admin/hddtemp/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hddtemp-0.3-beta15.tar.bz2 256372 SHA256 618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d WHIRLPOOL 2ce6a2336737e8cbb409443b874c6767c753fbe4bb700540f9a545e69cd951d3de5743d5b26bcd3a3f8e007b1364273ec85d15da8a00968895def063aaac7705
-DIST hddtemp-20080531.db.bz2 5627 SHA256 6a12bb68283c3224bef2ab086ae810b3f6b17b38f8203350acb3a73e21a6dfbd SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059 WHIRLPOOL 7443366204127c0831ce78a5dfd3506ff82a6c79a7daf75cc79e6bba6aad0357f7092c03e792e2e4ee31c2b47a8d8a15456e7b2c176d3a1c6b4633486f450666
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
deleted file mode 100644
index 2158f4e..0000000
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ /dev/null
@@ -1,253 +0,0 @@
-#############################################
-############# Misc drives, added by Gentoo
-#############################################
-
-"ST9160821AS"							194 C "Seagate ST9160821AS"
-"ST3400620A"							194 C "Seagate Barracuda 7200.10 ST3400620A"
-"MAXTOR STM3160212A"						194 C "Maxtor STM3160212A"
-"WDC WD2500JS-23MHB0"						194 C "Western Digital 250GB, 8MB cache"
-"WDC WD740ADFD-00NLR1"						194 C "Western Digital SATA Raptor 74GB 16MB"
-"ST3320620AS"							194 C "Seagate ST3320620AS"
-"WDC WD3200AAKS-00SBA0"						194 C "Western Digital WD3200AAKS-00SBA0"
-"ST3120813AS"							194 C "Seagate ST3120813AS"
-"ST3250620AS"							194 C "Seagate ST3250620AS"
-"ST3808110AS"							194 C "Seagate Barracuda 7200.9 SATA2 80GB 8MB"
-"ST3250824AS"							194 C "Seagate Barracuda 7200.9 SATA2 250GB 8MB"
-"ST3250310AS"							194 C "Seagate Barracuda 7200.10 SATA 250GB 8MB"
-"ST3500320AS"							194 C "Seagate Barracuda 7200.11 SATA 500GB 32MB"
-"ST3320613AS"							194 C "Seagate Barracuda 7200.11 SATA 320GB 16MB"
-"ST3500320AS"							194 C "Seagate Barracuda 7200.11 SATA 500GB 32MB"
-"ST3500620AS"							194 C "Seagate Barracuda 7200.11 SATA 500GB 16MB"
-"ST3640323AS"							194 C "Seagate Barracuda 7200.11 SATA 64GB 32MB"
-"ST3750330AS"							194 C "Seagate Barracuda 7200.11 SATA 750GB 32MB"
-"ST3750630AS"							194 C "Seagate Barracuda 7200.11 SATA 750GB 16MB"
-"ST31000340AS"							194 C "Seagate Barracuda 7200.11 SATA 1000GB 32MB"
-"SAMSUNG HD403LJ"						194 C "Samsung HD403LJ"
-"SAMSUNG HD250HJ"						194 C "Samsung SpinPoint SpinPoint S250"
-"ST3320620NS"							194 C "Seagate 320GB 7200rpm 16MB SATAII"
-"FUJITSU MHZ2250BJ FFS G2"					194 C "FUJITSU MHZ2250BJ FFS G2"
-"ST3500630A"							194 C "Seagate Barracuda 7200.10 PATA 500GB 16MB"
-"WDC WD740ADFD-00NLR5"						194 C "Western Digital SATA Raptor 74GB 16MB"
-"Hitachi HDP725032GLA360"					194 C "Hitachi Deskstar P7K500   - 320GB 7200RPM 16MB SATA II"
-"Hitachi HDT721050SLA360"					194 C "Hitachi Deskstar 7K1000.B - 500GB 7200RPM 16MB SATA II"
-"Hitachi HDT725025VLAT80"					194 C "Hitachi Deskstar T7K500   - 250GB 7200RPM 8MB PATA"
-"SAMSUNG HD322HJ"						194 C "Samsung HD322HJ 320GB 7200RPM 16MB SATA"
-"WDC WD2500BEVS-75UST0"						194 C "Western Digital WD2500BEVS-75UST0 - 250GB 5400RPM SATA"
-"SAMSUNG HD103UJ"						194 C "Samsung Spinpoint F1 1000GB 32MB"
-"SAMSUNG HD103SJ"						194 C "Samsung Spinpoint F3 1000GB 32MB"
-"ST9250421ASG"							194 C "Seagate Momentus 7200.3 SATA 250GB 16MB"
-"SAMSUNG HD401LJ"						194 C "SAMSUNG SpinPoint T133 series, 400GB"
-"SAMSUNG HD753LJ"						194 C "SAMSUNG F1 series, 750 GB"
-"SAMSUNG HD103SI"						194 C "Samsung Spinpoint F2 EcoGreen 1TB 5400RPM"
-"WDC WD7500AACS-00ZJB0"						194 C "Western Digital Caviar Green 750 GB"
-"WDC WD1002FAEX-00Z3A0"						194 C "Western Digital Caviar Black 1 TB"
-"ST31500341AS"							194 C "Seagate Barracuda 7200.11 1500GB SATA2 7200RPM 32MB"
-"ST31500541AS"							194 C "Seagate Barracuda Green 1500GB SATA2 5900RPM 32MB"
-"SAMSUNG HD502IJ"						194 C "Samsung HD502IJ"
-"Hitachi HTS545050B9SA00"					194 C "Hitachi Travelstar 500GB, SATA150, 2.5, 5400RPM, NCQ, 7MB Cache"
-"ST3500418AS"							194 C "Seagate Barracuda 7200.12 SATA 500GB 16MB"
-"ST9500420AS"							194 C "Seagate Momentus 7200.4 SATA 500GB 16MB"
-"WDC WD5000AAKS-00A7B0"						194 C "Western Digital WD5000AAKS-00A7B0"
-"ST9320325AS"							194 C "Seagate Momentus 5400.6 SATA 320GB 8MB"
-"MAXTOR STM3250310AS"						194 C "Seagate DiamondMax 21 SATA 250GB"
-"FUJITSU MHT2080AT PL"						194 C "Fujitsu MHT2080AT PL IDE/ATA 80GB"
-"FUJITSU MHV2120AH"						194 C "FUJITSU MHV2120AH"
-"WDC WD2001FASS-00W2B0"						194 C "Western Digital Caviar Black WD2001FASS"
-"WDC WD1000BB-00CAA1"						0 C "Western Digital Caviar WD1000BB"
-"WDC WD5000AADS-00S9B0"						194 C "Western Digital Caviar GP 500GB 32MB"
-"WDC WD5000AVDS-63U7B0"						194 C "Western Digital Caviar AV GP 500GB 32MB"
-"WDC WD5000AVJB-63YUA0"						194 C "Western Digital Caviar AV 500GB 8MB"
-"WDC WD20EVDS-63T3B0"						194 C "Western Digital Caviar AV GP 2TB 32MB"
-"WDC WD20EURS-63S48Y0"						194 C "Western Digital Caviar AV GP 2TB 64MB"
-"WDC WD3202ABYS-02B7A0"						194 C "Western Digital Caviar WD3202ABYS"
-"FUJITSU MHY2200BH"						194 C "FUJITSU MHY2200BH"
-"ST3320418AS"							194 C "Seagate Barracuda 7200.12 SATA 320GB"
-"TOSHIBA MK7559GSXP"						194 C "Toshiba MK7559GSXP"
-"TOSHIBA MK1637GSX"						194 C "Toshiba MK1637GSX 160GB SATA2 5200RPM"
-"TOSHIBA MG03ACA300"						194 C "Toshiba MG03ACA300 3TB SATA3 7200RPM"
-"TOSHIBA MD04ACA400"						194 C "Toshiba MD04ACA400 4TB SATA3 7200RPM Enterprise HDD"
-"OCZ-VERTEX2"							194 C "OCZ Vertex 2"
-"SAMSUNG HD204UI"						194 C "Samsung Spinpoint F4EG 2TB SATA2 5400RPM 32MB"
-"SAMSUNG HD154UI"						194 C "Samsung Spinpoint F2EG 1.5TB SATA2 5400RPM 32MB"
-"WDC WD10EADS-00M2B0"						194 C "Western Digital Caviar Green 1TB SATA2 5400RPM 32MB"
-"WDC WD20EARS-00S8B1"						194 C "Western Digital Caviar Green 2TB SATA2 IntelliPower 64MB"
-"WDC WD3200BEKT-00F3T0"						194 C "Western Digital Scorpio Black 320GB SATA2 7200RPM 16MB"
-"WDC WD3200BEKT-75A25T0"					194 C "Western Digital Scorpio Black 320GB SATA2 7200RPM 16MB"
-"WDC WD6400AACS-00M3B0"						194 C "Western Digital Caviar Green 640GB SATA2 7200RPM 16MB"
-"WDC WD5000AADS"						194 C "Western Digital Caviar Green 500GB SATA2 IntelliPower 32MB"
-"WDC WD7500AARX"						194 C "Western Digital Caviar Green 750GB SATA3 IntelliPower 64MB"
-"WDC WD3200AZDX"						194 C "Western Digital Caviar Green 320GB SATA3 IntelliPower 32MB"
-"WDC WD5000AZDX"						194 C "Western Digital Caviar Green 500GB SATA3 IntelliPower 32MB"
-"WDC WD5000AZRX-00A8LB0"                                        194 C "Western Digital Caviar Green 500GB SATA3 IntelliPower 64MB"
-"WDC WD7500AZRX"						194 C "Western Digital Caviar Green 750GB SATA3 IntelliPower 64MB"
-"WDC WD10EARS"							194 C "Western Digital Caviar Green 1TB SATA2 IntelliPower 64MB"
-"WDC WD15EARS"							194 C "Western Digital Caviar Green 1.5TB SATA2 IntelliPower 64MB"
-"WDC WD20EARS"							194 C "Western Digital Caviar Green 2TB SATA2 IntelliPower 64MB"
-"WDC WD10EZRX"							194 C "Western Digital Caviar Green 1TB SATA3 IntelliPower 64MB"
-"WDC WD25EZRX"							194 C "Western Digital Caviar Green 2.5TB SATA3 IntelliPower 64MB"
-"WDC WD30EZRX"							194 C "Western Digital Caviar Green 3TB SATA3 IntelliPower 64MB"
-"WDC WD10EARX"							194 C "Western Digital Caviar Green 1TB SATA3 IntelliPower 64MB"
-"WDC WD15EARX"							194 C "Western Digital Caviar Green 1.5TB SATA3 IntelliPower 64MB"
-"WDC WD20EARX"							194 C "Western Digital Caviar Green 2TB SATA3 IntelliPower 64MB"
-"WDC WD7500AADS-11M2B1"						194 C "Western Digital Caviar Green 750GB SATA2 IntelliPower 32MB"
-"WDC WD3200AABB"						194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 2MB"
-"WDC WD3200BB"							194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 2MB"
-"WDC WD3000BB"							194 C "Western Digital Caviar Blue 300GB PATA 7200RPM 2MB"
-"WDC WD2500AABB"						194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 2MB"
-"WDC WD2500BB"							194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 2MB"
-"WDC WD2500LB"							194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 2MB"
-"WDC WD2000BB"							194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 2MB"
-"WDC WD2000LB"							194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 2MB"
-"WDC WD1800BB"							194 C "Western Digital Caviar Blue 180GB PATA 7200RPM 2MB"
-"WDC WD1750BB"							194 C "Western Digital Caviar Blue 180GB PATA 7200RPM 2MB"
-"WDC WD1600AABB"						194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 2MB"
-"WDC WD1600BB"							194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 2MB"
-"WDC WD1200BB"							194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 2MB"
-"WDC WD1200LB"							194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 2MB"
-"WDC WD1000BB"							194 C "Western Digital Caviar Blue 100GB PATA 7200RPM 2MB"
-"WDC WD800BB"							194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
-"WDC WD800BB-00JHC0"						194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
-"WDC WD800LB"							194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
-"WDC WD800PB"							194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
-"WDC WD600BB"							194 C "Western Digital Caviar Blue 60GB PATA 7200RPM 2MB"
-"WDC WD400BB"							194 C "Western Digital Caviar Blue 40GB PATA 7200RPM 2MB"
-"WDC WD400LB"							194 C "Western Digital Caviar Blue 40GB PATA 7200RPM 2MB"
-"WDC WD300BB"							194 C "Western Digital Caviar Blue 30GB PATA 7200RPM 2MB"
-"WDC WD200BB"							194 C "Western Digital Caviar Blue 20GB PATA 7200RPM 2MB"
-"WDC WD100BB"							194 C "Western Digital Caviar Blue 10GB PATA 7200RPM 2MB"
-"WDC WD5000AAKB"						194 C "Western Digital Caviar Blue 500GB PATA 7200RPM 16MB"
-"WDC WD5000AAJB"						194 C "Western Digital Caviar Blue 500GB PATA 7200RPM 8MB"
-"WDC WD5000JB" 							194 C "Western Digital Caviar Blue 500GB PATA 7200RPM 8MB"
-"WDC WD4000AAKB"						194 C "Western Digital Caviar Blue 400GB PATA 7200RPM 16MB"
-"WDC WD4000AAJB"						194 C "Western Digital Caviar Blue 400GB PATA 7200RPM 8MB"
-"WDC WD4000JB"							194 C "Western Digital Caviar Blue 400GB PATA 7200RPM 8MB"
-"WDC WD3200AAKB"						194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 16MB"
-"WDC WD3200AAJB"						194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 8MB"
-"WDC WD3200JB"							194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 8MB"
-"WDC WD3000JB"							194 C "Western Digital Caviar Blue 300GB PATA 7200RPM 8MB"
-"WDC WD2500AAKB"						194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 16MB"
-"WDC WD2500AAJB"						194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 8MB"
-"WDC WD2500JB"							194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 8MB"
-"WDC WD2500PB"							194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 8MB"
-"WDC WD2000JB"							194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 8MB"
-"WDC WD2000PB"							194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 8MB"
-"WDC WD1800JB"							194 C "Western Digital Caviar Blue 180GB PATA 7200RPM 8MB"
-"WDC WD1600AAJB"						194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 8MB"
-"WDC WD1600JB"							194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 8MB"
-"WDC WD1200JB"							194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 8MB"
-"WDC WD1200PB"							194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 8MB"
-"WDC WD1000JB"							194 C "Western Digital Caviar Blue 100GB PATA 7200RPM 8MB"
-"WDC WD800JB"							194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 8MB"
-"WDC WD600JB"							194 C "Western Digital Caviar Blue 60GB PATA 7200RPM 8MB"
-"WDC WD400JB"							194 C "Western Digital Caviar Blue 40GB PATA 7200RPM 8MB"
-"WDC WD2002FAEX"						194 C "Western Digital Caviar Black 2TB SATA3 7200RPM 64MB"
-"WDC WD1502FAEX"						194 C "Western Digital Caviar Black 1.5TB SATA3 7200RPM 64MB"
-"WDC WD1002FAEX"						194 C "Western Digital Caviar Black 1TB SATA3 7200RPM 64MB"
-"WDC WD7502AAEX"						194 C "Western Digital Caviar Black 750GB SATA3 7200RPM 64MB"
-"WDC WD6402AAEX"						194 C "Western Digital Caviar Black 640GB SATA3 7200RPM 64MB"
-"WDC WD5002AALX"						194 C "Western Digital Caviar Black 500GB SATA3 7200RPM 32MB"
-"WDC WD2001FASS"						194 C "Western Digital Caviar Black 2TB SATA2 7200RPM 64MB"
-"WDC WD1001FALS"						194 C "Western Digital Caviar Black 1TB SATA2 7200RPM 32MB"
-"WDC WD7501AALS"						194 C "Western Digital Caviar Black 750GB SATA2 7200RPM 32MB"
-"WDC WD6401AALS"						194 C "Western Digital Caviar Black 640GB SATA2 7200RPM 32MB"
-"WDC WD5001AALS"						194 C "Western Digital Caviar Black 500GB SATA2 7200RPM 32MB"
-"WDC WD10EALX"							194 C "Western Digital Caviar Blue 1TB SATA3 7200RPM 32MB"
-"WDC WD7500AALX"						194 C "Western Digital Caviar Blue 750GB SATA3 7200RPM 32MB"
-"WDC WD5000AAKX"						194 C "Western Digital Caviar Blue 500GB SATA3 7200RPM 16MB"
-"WDC WD3200AAKX"						194 C "Western Digital Caviar Blue 320GB SATA3 7200RPM 16MB"
-"WDC WD2500AAKX"						194 C "Western Digital Caviar Blue 250GB SATA3 7200RPM 16MB"
-"WDC WD10EALS"							194 C "Western Digital Caviar Blue 1TB SATA2 7200RPM 32MB"
-"WDC WD6400AAKS"						194 C "Western Digital Caviar Blue 640GB SATA2 7200RPM 16MB"
-"WDC WD5000AAKS"						194 C "Western Digital Caviar Blue 500GB SATA2 7200RPM 16MB"
-"WDC WD3200AAKS"						194 C "Western Digital Caviar Blue 320GB SATA2 7200RPM 16MB"
-"WDC WD2500AAKS"						194 C "Western Digital Caviar Blue 250GB SATA2 7200RPM 16MB"
-"WDC WD2500AAKS-00VSA0"						194 C "Western Digital Caviar Blue 250GB SATA2 7200RPM 16MB"
-"WDC WD3200AAJS"						194 C "Western Digital Caviar Blue 320GB SATA2 7200RPM 8MB"
-"WDC WD2500AAJS"						194 C "Western Digital Caviar Blue 250GB SATA2 7200RPM 8MB"
-"WDC WD1600AAJS"						194 C "Western Digital Caviar Blue 160GB SATA2 7200RPM 8MB"
-"WDC WD800AAJS"							194 C "Western Digital Caviar Blue 80GB SATA2 7200RPM 8MB"
-"WDC WD10JPVT"							194 C "1TB SATA2 5400RPM 8MB"
-"WDC WD10TPVT"							194 C "1TB SATA2 5200RPM 8MB"
-"WDC WD7500BPVT"						194 C "750GB SATA2 5400RPM 8MB"
-"WDC WD6400BPVT"						194 C "640GB SATA2 5400RPM 8MB"
-"WDC WD5000BPVT"						194 C "500GB SATA2 5400RPM 8MB"
-"WDC WD3200BPVT"						194 C "320GB SATA2 5400RPM 8MB"
-"WDC WD2500BPVT"						194 C "250GB SATA2 5400RPM 8MB"
-"WDC WD3200BEVE"						194 C "320GB PATA6 5400RPM 8MB"
-"WDC WD2500BEVE"						194 C "250GB PATA6 5400RPM 8MB"
-"WDC WD1600BEVE"						194 C "160GB PATA6 5400RPM 8MB"
-"WDC WD1200BEVE"						194 C "120GB PATA6 5400RPM 8MB"
-"WDC WD800BEVE"							194 C "80GB PATA6 5400RPM 8MB"
-"WDC WD5000LPVT"						194 C "500GB SATA2 5400RPM 8MB"
-"WDC WD3200LPVT"						194 C "320GB SATA2 5400RPM 8MB"
-"WDC WD2500LPVT"						194 C "250GB SATA2 5400RPM 8MB"
-"ST320LT007-9ZV142"						194 C "Seagate 320GB SATA2 7200RPM 16MB"
-"ST250DM000"							194 C "Seagate Barracuda 7200.14 250GB SATA3 7200RPM 16MB"
-"ST320DM000"							194 C "Seagate Barracuda 7200.14 320GB SATA3 7200RPM 16MB"
-"ST500DM002"							194 C "Seagate Barracuda 7200.14 500GB SATA3 7200RPM 16MB"
-"ST750DM003"							194 C "Seagate Barracuda 7200.14 750GB SATA3 7200RPM 64MB"
-"ST1000DM003"							194 C "Seagate Barracuda 7200.14 1TB SATA3 7200RPM 64MB"
-"ST1500DM003"							194 C "Seagate Barracuda 7200.14 1.5TB SATA3 7200RPM 64MB"
-"ST2000DM001"							194 C "Seagate Barracuda 7200.14 2TB SATA3 7200RPM 64MB"
-"ST3000DM001"							194 C "Seagate Barracuda 7200.14 3TB SATA3 7200RPM 64MB"
-"ST32000641AS"							194 C "Seagate Barracuda XT ST32000641AS 2TB SATA3 7200RPM 64MB"
-"ST500LM000-1EJ16"						194 C "Seagate 500GB SSHD"
-"Hitachi HTS725050A9A364"					190 C "Hitachi Travelstar 7K500 500GB SATA2 7200RPM 16MB"
-"HTE721080G9AT00"						194 C "Hitachi Travelstar E7K100 80GB PATA6 7200RPM 8MB"
-"ST9250315AS"							194 C "Seagate Momentus 5400.6 250GB SATA2 5400RPM 8MB"
-"ST9750420AS"							194 C "Seagate Momentus 7200.4 750GB SATA2 7200RPM 16MB"
-"ST9500423AS"							194 C "Seagate Momentus 7200.4 500GB SATA2 7200RPM 16MB"
-"TOSHIBA MK3252GSX"						194 C "Toshiba MK3252GSX"
-"SAMSUNG HM160HC"						194 C "Samsung HM160HC"
-"WDC WD1003FBYX-01Y7B1"						194 C "Western Digital RE4 1TB SATA2 7200RPM 64MB"
-"WDC WD3003FZEX-00Z4SA0"					194 C "Western Digital Caviar Black 3TB SATA3 7200RPM 64MB"
-"WDC WD3000FYYZ-01UL1B2"					194 C "Western Digital WD3000FYYZ 3TB SATA3 7200RPM"
-"TOSHIBA DT01ACA050"						194 C "Toshiba 500GB SATA3 7200RPM 32MB"
-"WDC WD10JFCX-68N6GN0"						194 C "Western Digital Red 1TB SATA3 IntelliPower 64MB"
-"WDC WD40EFRX"			 				194 C "Western Digital Red 4TB SATA3 IntelliPower 64MB"
-"WDC WD40EZRX"                   				194 C "Western Digital Green 4TB SATA3 IntelliPower 64MB"
-"WDC WD20EARS"                   				194 C "Western Digital Green 2TB SATA2 IntelliPower 64MB"
-"WDC WD5000BEVT"                 				194 C "Western Digital Scorpio Blue 500GB SATA2 5400RPM 8MB"
-"WDC WD5000BPKT-00PK4T0"					194 C "Western Digital Scorpio Black 500GB SATA2 7200RPM 16MB"
-"SanDisk SD6SB1M256G1022I"       				194 C "Sandisk SSD X110 256GB"
-"Hitachi HTS542512K9SA00"					194 C "Hitachi Travelstar 5K250 120GB SATA2 5400RPM 8MB"
-"Hitachi HTS542516K9SA00"					194 C "Hitachi Travelstar 5K250 160GB SATA2 5400RPM 8MB"
-"Hitachi HDS721680PLA380"					194 C "Hitachi Deskstar 7K160 80GB SATA2 7200RPM 8MB"
-"Hitachi HDS721010CLA332"					194 C "Hitachi Deskstar 7K1000.C 1TB SATA2 7200RPM"
-"HGST HDS724040ALE640"						194 C "HGST Deskstar 7K4000 4TB SATA3 7200RPM"
-"ST9120822AS"							194 C "Seagate Momentus 5400.3 120GB SATA 5400RPM 8MB"
-"ST32000542AS"							194 C "Seagate Barracuda LP 2000GB SATA2 5900RPM 32MB"
-"ST2000DL003-9VT166"						194 C "Seagate Barracuda LP 2000GB SATA3 5900RPM 64MB"
-"ST4000VN000-1H4168"						194 C "Seagate NAS HDD 4TB SATA3 64MB"
-"Hitachi HTS545050B9A300"					194 C "Hitachi Travelstar 500GB SATA2 2.5 5400RPM 8MB"
-"ST9500325AS"							194 C "Seagate Momentus 5400.6 500GB SATA2 5400RPM 8MB"
-"WDC WD30EFRX-68AX9N0"						194 C "Western Digital Red 3TB SATA3 64MB"
-"Toshiba DT01ACA300"						194 C "Toshiba DT01ACA300 3TB SATA3 7200RPM 64MB"
-"TOSHIBA DT01ACA300"						194 C "Toshiba DT01ACA300 3TB SATA3 7200RPM 64MB"
-"TOSHIBA HDWD130"						194 C "Toshiba P300 3TB SATA3 7200RPM 64MB"
-"Samsung SSD 850 EVO"						190 C "Samsung SSD 850 EVO Series"
-"Samsung SSD 840 Series"					190 C "Samsung SSD 840 Series"
-"Samsung SSD 840 PRO Serise"					190 C "Samsung SSD 840 Pro Series"
-"Samsung SSD 840 EVO"						190 C "Samsung SSD 840 EVO Series"
-"SAMSUNG HD203WI"						194 C "Samsung SpinPoint F3 EcoGreen 2TB SATA2 5400RPM 32MB"
-"SAMSUNG SSD 830 Series"					190 C "Samsung SSD 830 Series"
-"SanDisk SDSSDH2128G"						194 C "Sandisk SSD Ultra Plus 128GB"
-"SanDisk SDSSDH2256G"                                           194 C "Sandisk SSD Ultra Plus 256GB"
-"OCZ-VERTEX3"                                                   194 C "OCZ Vertex 3 120GB SATA3"
-"Crucial_CT240M500SSD3"						194 C "Crucial M500 240GB SATA3 256MB"
-"WDC WD5003ABYX-01WERA2"					194 C "Western Digital RE4 500GB"
-"WDC WD5002ABYS-02B1B0"						194 C "Western Digital RE3 500GB"
-"WDC WD20EZRX"							194 C "Western Digital Green 2TB"
-"ST4000DM000"							194 C "Seagate Desktop 4TB"
-"STM3160815AS"							194 C "Maxtor DiamondMax 21 - 160GB - 8MB Cache SATA"
-"6G160E0"							194 C "Maxtor DiamondMax 17 - 160GB - 8MB Cache SATA"
-"WDC WD7500BFCX-68N6GN0"					194 C "Western Digital Red 750GB SATA"
-"Hitachi HTS547575A9E384"					190 C "Hitachi Travelstar 5K750 750GB SATA2 5400RPM 8MB"
-"WDC WD30PURX-64P6ZY0"						194 C "Western Digital Purple 3TB 64MB Cache"
-"WDC WD10EZEX-00BN5A0"						194 C "Western Digital Blue 1TB SATA3 7200RPM 64MB"
-"WDC WD1003FZEX-00MK2A0"					194 C "Western Digital Black 1TB SATA3 7200RPM 64MB"
-"SAMSUNG MZHPV128HDGM-00000"					194 C "Samsung SSD 128 GB PCIe Gen3 8Gb/s x4 M.2"
-"CT960BX200SSD1"						194 C "Crucial BX200 960GB SSD"
-"CT480BX200SSD1"						194 C "Crucial BX200 480GB SSD"
-"CT240BX200SSD1"						194 C "Crucial BX200 240GB SSD"
-"Crucial_CT256M550SSD1"						194 C "Crucial M550 256GB SSD"
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch
deleted file mode 100644
index 7b0dddc..0000000
--- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nuar --exclude '*~' hddtemp-0.3-beta15.orig/src/sata.c hddtemp-0.3-beta15/src/sata.c
---- hddtemp-0.3-beta15.orig/src/sata.c	2006-05-14 02:09:55.579437498 -0700
-+++ hddtemp-0.3-beta15/src/sata.c	2006-05-14 02:06:08.495948437 -0700
-@@ -88,7 +88,9 @@
-     return strdup(_("unknown"));
-   else
-   {
-+		//fprintf(stderr,"sata_model1=%s\n",identify + 54);
-     sata_fixstring(identify + 54, 24);
-+		//fprintf(stderr,"sata_model2=%s\n",identify + 54);
-     return strdup(identify + 54);
-   }
- }
-diff -Nuar --exclude '*~' hddtemp-0.3-beta15.orig/src/satacmds.c hddtemp-0.3-beta15/src/satacmds.c
---- hddtemp-0.3-beta15.orig/src/satacmds.c	2006-05-14 02:09:40.983470339 -0700
-+++ hddtemp-0.3-beta15/src/satacmds.c	2006-05-14 02:09:02.319557333 -0700
-@@ -98,7 +98,10 @@
-   /* convert from big-endian to host byte order */
-   for (p = end ; p != s;) {
-     unsigned short *pp = (unsigned short *) (p -= 2);
--    *pp = ntohs(*pp);
-+		char tmp = p[0];
-+		p[0] = p[1];
-+		p[1] = tmp;
-+    //*pp = ntohs(*pp);
-   }
- 
-   /* strip leading blanks */
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch
deleted file mode 100644
index 969da7a..0000000
--- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- hddtemp-0.3-beta15/src/sata.c	2012-07-01 16:35:01.681708074 +0200
-+++ hddtemp-0.3-beta15/src/sata.c	2012-07-01 16:33:58.172109699 +0200
-@@ -125,6 +125,17 @@
-     dsk->fd = -1;
-     return GETTEMP_NOSENSOR;
-   }
-+
-+  switch(ata_get_powermode(dsk->fd)) {
-+  case PWM_STANDBY:
-+  case PWM_SLEEPING:
-+    if (!wakeup)
-+      return GETTEMP_DRIVE_SLEEP;
-+  case PWM_UNKNOWN:
-+  case PWM_ACTIVE: /* active or idle */
-+  default:
-+    break;
-+  }
-   
-   /* get SMART values */
-   if(sata_enable_smart(dsk->fd) != 0) {
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch
deleted file mode 100644
index 1e72395..0000000
--- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- hddtemp-0.3-beta15/configure.in~	2005-10-17 19:14:19 +0000
-+++ hddtemp-0.3-beta15/configure.in	2006-12-11 18:23:22 +0000
-@@ -18,6 +18,7 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS(fcntl.h)
- AC_CHECK_HEADERS(netinet/in.h)
-+AC_CHECK_HEADERS(execinfo.h)
- AC_CHECK_TYPE(in_addr_t, ,[AC_DEFINE_UNQUOTED([in_addr_t], [uint32_t], [Define to 'uint32_t' if <netinet/in.h> does not define.])], [#include <netinet/in.h>])
- 
- # Checks for typedefs, structures, and compiler characteristics.
---- hddtemp-0.3-beta15/src/backtrace.c-orig	2006-12-11 18:20:41 +0000
-+++ hddtemp-0.3-beta15/src/backtrace.c	2006-12-11 18:23:28 +0000
-@@ -18,7 +18,7 @@
- 
- #include <features.h>
- 
--#if defined(__i386__) && defined(__GLIBC__)
-+#ifdef HAS_EXECINFO_H
- 
- #include <execinfo.h>
- 
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-iconv.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-iconv.patch
deleted file mode 100644
index 621e754..0000000
--- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-iconv.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- hddtemp-0.3-beta15/src/utf8.c~	2007-03-27 09:09:59.000000000 +0200
-+++ hddtemp-0.3-beta15/src/utf8.c	2007-03-27 09:10:06.000000000 +0200
-@@ -23,7 +23,9 @@
- 
- // Standard includes
- #include <stdlib.h>
-+#ifdef HAVE_ICONV
- #include <iconv.h>
-+#endif
- #include <langinfo.h>
- #include <locale.h>
- #include <string.h>
-@@ -34,6 +36,7 @@
- 
- static char *iconv_from_utf8_to_locale(const char *string, const char* fallback_string)
- {
-+#ifdef HAVE_ICONV
-   const size_t buffer_inc = 80;	// Increment buffer size in 80 bytes step
-   const char *charset;
-   iconv_t cd;
-@@ -93,6 +96,7 @@
-   if (dest_buffer != NULL)
-     free(dest_buffer);  		// free buffer
-   free(src_buffer);			// free string
-+#endif // HAVE_ICONV
-   return strdup(fallback_string); 	// and return fallback string
- }
- 
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-nls.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-nls.patch
deleted file mode 100644
index 86567ae..0000000
--- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-nls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- hddtemp-0.3-beta15/src/hddtemp.c~	2006-04-19 02:37:35 +0000
-+++ hddtemp-0.3-beta15/src/hddtemp.c	2007-03-26 08:14:17 +0000
-@@ -275,9 +275,11 @@
-   backtrace_sigill();
-   backtrace_sigbus();
- 
-+#if ENABLE_NLS
-   setlocale (LC_ALL, "");
-   bindtextdomain (PACKAGE, LOCALEDIR);
-   textdomain (PACKAGE);
-+#endif
-   
-   show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = 0;
-   unit = DEFAULT;
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch
deleted file mode 100644
index d67e068..0000000
--- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naurp hddtemp-0.3-beta15-orig/src/satacmds.c hddtemp-0.3-beta15/src/satacmds.c
---- hddtemp-0.3-beta15-orig/src/satacmds.c	2007-02-10 14:25:15.000000000 +0100
-+++ hddtemp-0.3-beta15/src/satacmds.c	2007-02-10 14:26:53.000000000 +0100
-@@ -54,7 +54,6 @@ int sata_pass_thru(int device, unsigned 
-   unsigned char cdb[16];
-   unsigned char sense[32];
-   int dxfer_direction;
--  int ret;
-   
-   memset(cdb, 0, sizeof(cdb));
-   cdb[0] = ATA_16;
-@@ -78,13 +77,7 @@ int sata_pass_thru(int device, unsigned 
-     cdb[6] = cmd[1];
-   cdb[14] = cmd[0];
- 
--  ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction);
-- 
--  /* Verify SATA magics */
--  if (sense[0] != 0x72 || sense[7] != 0x0e || sense[9] != 0x0e || sense[10] != 0x00)
--    return 1;		  
--  else 
--    return ret;
-+  return scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction);
- }
- 
- void sata_fixstring(unsigned char *s, int bytecount)
diff --git a/app-admin/hddtemp/files/hddtemp-conf.d b/app-admin/hddtemp/files/hddtemp-conf.d
deleted file mode 100644
index f2f34d9..0000000
--- a/app-admin/hddtemp/files/hddtemp-conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# the hddtemp executable
-HDDTEMP_EXEC=/usr/sbin/hddtemp
-
-# various options to pass to the daemon
-HDDTEMP_OPTS="--listen=127.0.0.1"
-
-# a list of drives to check
-HDDTEMP_DRIVES="/dev/sda /dev/sdb"
-
diff --git a/app-admin/hddtemp/files/hddtemp-init b/app-admin/hddtemp/files/hddtemp-init
deleted file mode 100644
index 39a6409..0000000
--- a/app-admin/hddtemp/files/hddtemp-init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting hddtemp daemon"
-	/sbin/start-stop-daemon --start --quiet --exec ${HDDTEMP_EXEC} \
-	-- -d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping hddtemp daemon"
-	start-stop-daemon --stop --quiet --exec ${HDDTEMP_EXEC}
-	eend $?
-}
-
-
diff --git a/app-admin/hddtemp/files/hddtemp.service-r1 b/app-admin/hddtemp/files/hddtemp.service-r1
deleted file mode 100644
index 8105bfc..0000000
--- a/app-admin/hddtemp/files/hddtemp.service-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Hard drive temperature monitor daemon
-Documentation=man:hddtemp(8)
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/hddtemp -d --listen=127.0.0.1 $HDDTEMP_DRIVES
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/hddtemp/files/hddtemp.service.conf b/app-admin/hddtemp/files/hddtemp.service.conf
deleted file mode 100644
index a2a6c7f..0000000
--- a/app-admin/hddtemp/files/hddtemp.service.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Set a list of drives to check
-[Service]
-Environment="HDDTEMP_DRIVES=/dev/sda /dev/sdb"
\ No newline at end of file
diff --git a/app-admin/hddtemp/files/update-hddtemp.db b/app-admin/hddtemp/files/update-hddtemp.db
deleted file mode 100644
index bc29b3e..0000000
--- a/app-admin/hddtemp/files/update-hddtemp.db
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-update_db() {
-	local src=$1
-	local dst=$2
-
-	while read line ; do
-		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
-			echo "${line}" >> "${dst}"
-		fi
-
-		id=$(echo "${line}" | grep -o '"[^"]*"')
-
-		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
-	done < "${src}"
-}
-
-die() {
-	echo "$*"
-	exit 1
-}
-
-cd /usr/share/hddtemp
-wget http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db -O hddtemp.db -q || die "Failed to download new hddtemp.db file"
-
-# Try to get the Gentoo HDD DB from WebCVS.  If that fails, just use the Gentoo HDD database
-# that was installed by the ebuild.
-if wget https://gitweb.gentoo.org/repo/gentoo.git/plain/app-admin/hddtemp/files/hddgentoo.db -O hddtmp.db -q; then
-	mv -f hddtmp.db hddgentoo.db
-fi
-
-update_db "hddgentoo.db" "hddtemp.db"
-
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
deleted file mode 100644
index 948ac2a..0000000
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools readme.gentoo-r1 systemd
-
-MY_P=${P/_beta/-beta}
-DBV=20080531
-
-DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
-HOMEPAGE="https://savannah.nongnu.org/projects/hddtemp/"
-SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirror://gentoo/hddtemp-${DBV}.db.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="network-cron nls selinux"
-
-DEPEND=""
-RDEPEND="selinux? ( sec-policy/selinux-hddtemp )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(README TODO ChangeLog)
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="In order to update your hddtemp database, run:
-emerge --config =${CATEGORY}/${PF} or update-hddtemp.db (if USE
-network-cron is enabled)
-
-If your hard drive is not recognized by hddtemp, please consider
-submitting your HDD info for inclusion into the Gentoo hddtemp
-database by filing a bug at https://bugs.gentoo.org/
-
-If hddtemp complains but finds your HDD temperature sensor, use the
---quiet option to suppress the warning.
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-satacmds.patch
-	"${FILESDIR}"/${P}-byteswap.patch
-	"${FILESDIR}"/${P}-execinfo.patch
-	"${FILESDIR}"/${P}-nls.patch
-	"${FILESDIR}"/${P}-iconv.patch
-	"${FILESDIR}"/${P}-dontwake.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	mv "${S}"/configure.{in,ac} || die
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
-	# disabling nls breaks compiling
-	use nls || myconf="--disable-nls ${myconf}"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/hddtemp
-	newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db
-	doins "${FILESDIR}"/hddgentoo.db
-
-	update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db"
-	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
-	newinitd "${FILESDIR}"/hddtemp-init hddtemp
-	systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
-	systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf
-
-	readme.gentoo_create_doc
-
-	if use network-cron; then
-		dosbin "${FILESDIR}"/update-hddtemp.db
-		exeinto /etc/cron.monthly
-		echo -e "#!/bin/sh\n/usr/sbin/update-hddtemp.db" > "${T}"/hddtemp.cron
-		newexe "${T}"/hddtemp.cron update-hddtemp.db
-	fi
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
-update_db() {
-	local src=$1
-	local dst=$2
-
-	while read line ; do
-		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
-			echo "${line}" >> "${dst}"
-		fi
-
-		id=$(echo "${line}" | grep -o '"[^"]*"')
-
-		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
-	done < "${src}"
-}
-
-pkg_config() {
-	cd "${ROOT}"/usr/share/hddtemp || die
-
-	einfo "Trying to download the latest hddtemp.db file"
-	wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db \
-		|| die "failed to download hddtemp.db"
-
-	update_db "hddgentoo.db" "hddtemp.db"
-}
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
deleted file mode 100644
index fa25fee..0000000
--- a/app-admin/hddtemp/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="network-cron">
-		Monthly cronjob to update hddtemp.db.
-	</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-admin/killproc/Manifest b/app-admin/killproc/Manifest
deleted file mode 100644
index 24cf342..0000000
--- a/app-admin/killproc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST killproc-2.13.tar.gz 37953 SHA256 090590f5ab24559889bd134f38258d5ea567590098580c2345ca8183fb9c3e78 SHA512 2ba8daa10d78c7e6df80f6fc5bff24807571bd8bcecf4674c1dac180da5c462b326c1fd45e31b4974937d47871b48c9e5b215a7b323e65d98fe0a66b171e9d2d WHIRLPOOL 06bcba6d88ec598c5ae31f18a24cc14ae710d4e94f0185c29017b75a475c9e84be6fb01470af24d945f22a169a0c77060741f8228cd8066d5be53dc5d6395b49
diff --git a/app-admin/killproc/files/killproc-2.13-argz.patch b/app-admin/killproc/files/killproc-2.13-argz.patch
deleted file mode 100644
index 6ea0cc5..0000000
--- a/app-admin/killproc/files/killproc-2.13-argz.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/startproc.c
-+++ b/startproc.c
-@@ -25,7 +25,6 @@
- #include <sys/time.h>
- #include <sys/resource.h>
- #include <sys/ioctl.h>
--#include <argz.h>
- #include <grp.h>
- 
- #define USAGE		"Usage:\n"\
diff --git a/app-admin/killproc/files/killproc-2.13-makefile.patch b/app-admin/killproc/files/killproc-2.13-makefile.patch
deleted file mode 100644
index 4eb8131..0000000
--- a/app-admin/killproc/files/killproc-2.13-makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -27,9 +27,7 @@
- #
- # egcs used with -O2 includes -fno-force-mem which is/was buggy (1998/10/08)
- #
--	 CFLAGS = $(RPM_OPT_FLAGS) $(COPTS) $(DEBUG) $(INC) -D_GNU_SOURCE -Wall -pipe
--	  CLOOP = -funroll-loops
--	     CC = gcc
-+	 CFLAGS = $(RPM_OPT_FLAGS) $(COPTS) $(DEBUG) $(INC) -D_GNU_SOURCE -Wall
- 	     RM = rm -f
- 	  MKDIR = mkdir -p
- 	  RMDIR = rm -rf
-@@ -59,22 +57,22 @@
- all: $(SBINPRG) $(UBINPRG)
- 
- libinit.o:	libinit.c libinit.h
--	$(CC) $(CFLAGS) $(CLOOP) -DINITDIR=\"$(INITDIR)\" -c $<
-+	$(CC) $(CFLAGS) -DINITDIR=\"$(INITDIR)\" -c $<
- 
- killproc:	killproc.c libinit.o
--	$(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- startproc:	startproc.c libinit.o
--	$(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- checkproc:	checkproc.c libinit.o
--	$(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- usleep:		usleep.c
--	$(CC) $(CFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- fsync:		fsync.c
--	$(CC) $(CFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- clean:
- 	$(RM) *.o *~ killproc startproc checkproc pidofproc start_daemon usleep fsync
diff --git a/app-admin/killproc/killproc-2.13-r1.ebuild b/app-admin/killproc/killproc-2.13-r1.ebuild
deleted file mode 100644
index ac05c0c..0000000
--- a/app-admin/killproc/killproc-2.13-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="killproc and assorted tools for boot scripts"
-HOMEPAGE="http://ftp.suse.com/pub/projects/init/"
-SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-makefile.patch" \
-		"${FILESDIR}/${P}-argz.patch"
-
-	tc-export CC
-	export COPTS=${CFLAGS}
-}
-
-src_install() {
-	into /
-	dosbin checkproc fsync killproc startproc usleep
-	into /usr
-	doman *.8 *.1
-	dodoc README *.lsm
-}
diff --git a/app-admin/killproc/metadata.xml b/app-admin/killproc/metadata.xml
deleted file mode 100644
index 1f15fbb..0000000
--- a/app-admin/killproc/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">                         
-  <email>jer@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index 5fc3fca..0368a77 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -9,7 +9,7 @@
 		Logrotate allows for the automatic rotation compression, removal
 		and mailing of log files. Logrotate can be set to handle a log
 		file daily, weekly, monthly or when the log file gets to a certain
-		size. 
+		size.
 	</longdescription>
 	<longdescription lang="es">
 		Logrotate permite la rotación, compresión, eliminación y
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
deleted file mode 100644
index fa95c2a..0000000
--- a/app-admin/mcelog/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mcelog-162.tar.gz 308347 BLAKE2B bd438e85ea793c6c5ce4d561f0400e91b101a010cce7f937751a11a0a974fec49db7e9d768fc50db68a91c973c90c8ab1b4ffa80964cb6fde860b9f2ac217435 SHA512 d61a0b7ad3974098963edde1e9e9acdf4dbd1a025577b7044bafc17302abd19080c8145a2700c691400af0768ff4b6833d47697e1478c5bef8831f7f8b61ae48
diff --git a/app-admin/mcelog/files/mcelog-0.8_pre1-timestamp-mcelog.patch b/app-admin/mcelog/files/mcelog-0.8_pre1-timestamp-mcelog.patch
deleted file mode 100644
index d24afdb..0000000
--- a/app-admin/mcelog/files/mcelog-0.8_pre1-timestamp-mcelog.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -Nuar mcelog-0.8pre.orig/mcelog.cron mcelog-0.8pre/mcelog.cron
---- mcelog-0.8pre.orig/mcelog.cron	2006-02-08 05:09:03.000000000 -0800
-+++ mcelog-0.8pre/mcelog.cron	2008-02-22 11:32:06.717012502 -0800
-@@ -1,2 +1,3 @@
- #!/bin/bash
--/usr/sbin/mcelog --ignorenodev --filter >> /var/log/mcelog
-+header="$(date +"%b %d %H:%M:%S") $(hostname) "
-+/usr/sbin/mcelog --ignorenodev --filter | sed "s,^,$header,g" >> /var/log/mcelog
diff --git a/app-admin/mcelog/files/mcelog-129-debugflags.patch b/app-admin/mcelog/files/mcelog-129-debugflags.patch
deleted file mode 100644
index eb46439..0000000
--- a/app-admin/mcelog/files/mcelog-129-debugflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Wed Oct 24 15:41:33 UTC 2012
-Subject: build system
-
-don't overwrite system CFLAGS, only append "-g -Os" if DEBUG=1 is passed
-as argument
-
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,11 @@
--CFLAGS := -g -Os
-+CC ?= gcc
-+
-+# set to 1 to enable debug flags
-+DEBUG = 0
-+ifeq ($(DEBUG),1)
-+CFLAGS += -g -Os
-+endif
-+
- prefix := /usr
- etcprefix :=
- MANDIR := ${prefix}/share/man
diff --git a/app-admin/mcelog/files/mcelog.init-r1 b/app-admin/mcelog/files/mcelog.init-r1
deleted file mode 100644
index bddafa1..0000000
--- a/app-admin/mcelog/files/mcelog.init-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description='Start/stop mcelog in daemon mode'
-
-pidfile="/var/run/mcelog.pid"
-command="/usr/sbin/mcelog"
-command_args="--daemon --pidfile ${pidfile} ${MCELOG_OPTS}"
-
-depend() {
-	after udev 
-	need localmount
-	use logging
-}
diff --git a/app-admin/mcelog/files/mcelog.service b/app-admin/mcelog/files/mcelog.service
deleted file mode 100644
index 4bd5530..0000000
--- a/app-admin/mcelog/files/mcelog.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Machine Check Exception Logging Daemon
-After=syslog.target
-
-[Service]
-ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground 
-StandardOutput=syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/mcelog/mcelog-162.ebuild b/app-admin/mcelog/mcelog-162.ebuild
deleted file mode 100644
index 7e40743..0000000
--- a/app-admin/mcelog/mcelog-162.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/cron.daily
-	newins ${PN}.cron ${PN}
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodoc *.pdf
-}
-
-pkg_postinst() {
-	einfo "The default configuration set is now installed in /etc/${PN}"
-	einfo "you might want to edit those files."
-	einfo
-	einfo "A sample cronjob is installed into /etc/cron.daily"
-	einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/metadata.xml b/app-admin/mcelog/metadata.xml
deleted file mode 100644
index 12e16a2..0000000
--- a/app-admin/mcelog/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mattst88@gentoo.org</email>
-		<name>Matt Turner</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>bkohler@gentoo.org</email>
-		<name>Ben Kohler</name>
-	</maintainer>
-	<longdescription lang="en">
-		Starting with version 2.6.4, the Linux kernel for x86-64 no longer
-		decodes and logs recoverable Machine Check Exception events to the
-		kernel log on its own.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">andikleen/mcelog</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/metadata.xml b/app-admin/metadata.xml
deleted file mode 100644
index b15417f..0000000
--- a/app-admin/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-admin category contains non-core applications which relate to
-		system administration.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-admin contiene aplicaciones para la administración
-		del sistema.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-admin enthält Applikationen zur Systemadministration,
-		die nicht Bestandteil des Basissystems sind.
-	</longdescription>
-	<longdescription lang="ja">
-		app-adminカテゴリにはnon-corシステム管理に関連したアプリケーションが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De app-admin categorie bevat applicaties met betrekking tot systeem
-		administratie.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-admin category chứa các ứng dụng liên quan
-		đến quản trị hệ thống (không tính các ứng dụng lõi).
-	</longdescription>
-	<longdescription lang="it">
-		La categoria app-admin contiene applicazioni per l'amministrazione del sistema.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-admin contém aplicações para a administração
-		do sistema.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-admin zawiera aplikacje dla administratorów systemu.
-	</longdescription>
-</catmetadata>
-
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index 7fa6fe3..4d0f6ff 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1 +1 @@
-DIST perl-cleaner-2.20.tar.bz2 6704 SHA256 ecc3b160d01466a5c9a070e12f3e11719bedb45a92a2ea0227d745be6b77cf64 SHA512 29888b4ee19a186ddaa1209d893ac57bed683b551546f63aeb874f8cc1fcab4ea0b0401247968aed0fb3b9a7d7196a803d6713e85b44cb94bc6642a44fbc4cf1 WHIRLPOOL 2ea9ca19738e8dd3bed076051efbccd1cced25b768ee8e95843c885b9057e1c6960247dd8f867b8ef7ab11ffffaddbedbcc01f20023203f4d3cbe7f09fd01e51
+DIST perl-cleaner-2.30.tar.bz2 6963 BLAKE2B 8983060c7a904266ac82a67eba7b5d2184803b59c077f947a35d07e9af3046953705d31840b9508116578b8f3e8a8b97d77cf21eeac3b70f1c3fb5c1d71ae64e SHA512 436d26727bbb598bcd3c4f31e6b81e415a797cdba82dccfd55e54ee179bd2d6c1dc443e865f6f0a05b59f47ffd231dd10e55d5ea97a9a6875235ea1b49b68898
diff --git a/app-admin/perl-cleaner/OWNERS b/app-admin/perl-cleaner/OWNERS
new file mode 100644
index 0000000..4553b36
--- /dev/null
+++ b/app-admin/perl-cleaner/OWNERS
@@ -0,0 +1 @@
+include /dev-lang/perl/OWNERS
diff --git a/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch b/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch
deleted file mode 100644
index 27d5b1d..0000000
--- a/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-add Prefix and Darwin support
-
---- perl-cleaner
-+++ perl-cleaner
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # vim: set et sw=4 sts=4 tw=80:
- # Copyright 2005-2014 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
-@@ -22,13 +22,13 @@
- PKGS_EXCEPTIONS="dev-lang/perl sys-devel/libperl app-emulation/emul-linux-x86-baselibs"
- PKGS_MANUAL=""
- 
--PKG_DBDIR=/var/db/pkg
-+PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg"
- 
- # See bug 504116 for details
--if [ -e /lib/gentoo/functions.sh ]; then
--    . /lib/gentoo/functions.sh
--elif [ -e /etc/init.d/functions.sh ]; then
--    . /etc/init.d/functions.sh
-+if [ -e "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh" ]; then
-+    . "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh"
-+elif [ -e "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh" ]; then
-+    . "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh"
- else
-     echo "$0: Unable to find functions.sh"
-     exit 1
-@@ -157,7 +157,7 @@
- 
-     veinfo 1 "Locating ph files for removal"
-     eindent ""
--    for i in /usr/lib{,64,x32}/perl5 ; do
-+    for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/lib{,64,x32}/perl5 ; do
-         [[ ! -d ${i} ]] && continue
-         veinfo 4 "...in ${i}"
-         while IFS= read -r -d $'\0' file ; do
-@@ -183,13 +183,13 @@
-         veinfo 1 "Pretend. Nothing to do."
-         return
-     fi
--    pushd /usr/include > /dev/null
-+    pushd "@GENTOO_PORTAGE_EPREFIX@"/usr/include > /dev/null
-     if [[ ${version} =~ ^5.(8|10) ]] ; then
-         eindent
--        veinfo 2 "...in /usr/include"
-+        veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include"
-         h2ph ${option} * 2>/dev/null
-         for dir in sys arpa netinet bits security asm gnu linux ; do
--            veinfo 2 "...in /usr/include/$dir/"
-+            veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include/$dir/"
-             h2ph ${option} -r $dir/*
-         done
-         eoutdent
-@@ -220,13 +220,16 @@
-         veinfo 1 "Locating ebuilds linked against libperl"
-     fi
- 
-+    local scanelf=scanelf
-+    [[ -e "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.dylib ]] \
-+        && scanelf=scanmacho
-     if ${LIBPERL} ; then
--        if ! type -P scanelf >/dev/null 2>&1; then
--            ewarn "scanelf not found! Install app-misc/pax-utils."
-+        if ! type -P ${scanelf} >/dev/null 2>&1; then
-+            ewarn "${scanelf} not found! Install app-misc/pax-utils."
-             ewarn "--libperl is disbled."
-             LIBPERL=false
-         else
--            SONAME="$(scanelf -qBS "$(realpath /usr/lib/libperl.so 2>/dev/null )" | awk '{ print $1 }')"
-+            SONAME="$(${scanelf} -qBS "$(realpath "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.{so,dylib} 2>/dev/null )" | awk '{ print $1 }')"
-             veinfo 4 SONAME="${SONAME}"
-         fi
-     fi
-@@ -268,7 +271,7 @@
-             while read -r type file ; do
-                 shopt -s extglob
-                 [[ ${type} == obj ]] || [[ ${type} == sym ]] || continue
--                [[ ${file} =~ ^/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue
-+                [[ ${file} =~ ^"@GENTOO_PORTAGE_EPREFIX@"/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue
-                 file=${file% +(!([[:space:]])) +([[:digit:]])}
-                 shopt -u extglob
-                 if ${FORCE} || outdated_path "${file}" ; then
-@@ -302,7 +305,7 @@
- 
-         if ${LIBPERL} ; then
-             # We assume the broken libs have all bin or lib in their path
--            broken_libs="$(scanelf -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.so\.[0-9.]*' | sort -u )"
-+            broken_libs="$(${scanelf} -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.\(so\|dylib\)\.[0-9.]*' | sort -u )"
-             if [[ -n "${broken_libs}" ]] ; then
-                 if ${FORCE} || [[ ${broken_libs} != ${SONAME} ]] ; then
-                     PKGS_TO_REMERGE+=" ${CATPKGVER}"
-@@ -327,7 +330,7 @@
-         exit $?
-     fi
- 
--    if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x /usr/bin/portageq ]] ; then
-+    if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq ]] ; then
-         # Filter out --getbinpkg, --getbinpkgonly, --usepkg and --usepkgonly options in EMERGE_DEFAULT_OPTS
-         emerge_default_opts=""
-         for option in $(portageq envvar EMERGE_DEFAULT_OPTS ) ; do
-@@ -383,7 +386,7 @@
-     veinfo 1 "or edited. This script cannot deal with them."
-     vecho 1
- 
--    for i in /usr/{share,lib{,32,64,x32}}/perl5 ; do
-+    for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/{share,lib{,32,64,x32}}/perl5 ; do
-         [[ -d $i ]] && perlpath[${#perlpath[*]}]="$(realpath $i 2>/dev/null )"
-     done
-     [[ ${#perlpath[*]} == 0 ]] && return
diff --git a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml
index 1d2f125..97ce6f3 100644
--- a/app-admin/perl-cleaner/metadata.xml
+++ b/app-admin/perl-cleaner/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>perl@gentoo.org</email>
-	<name>Gentoo Perl Project</name>
-</maintainer>
-<maintainer type="person">
-	<email>fuzzyray@gentoo.org</email>
-	<description>Please CC me in the bugs and assign to project</description>
-</maintainer>
+	<maintainer type="project">
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<use>
+		<flag name="pkgcore">
+			Use <pkg>sys-apps/pkgcore</pkg> instead of <pkg>sys-apps/portage</pkg>
+			and <pkg>app-portage/portage-utils</pkg>.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
deleted file mode 100644
index 83c65ec..0000000
--- a/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils prefix
-
-DESCRIPTION="User land tool for cleaning up old perl installs"
-HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="*"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
-
-RDEPEND="app-shells/bash
-	dev-lang/perl
-	|| (
-		( sys-apps/portage app-portage/portage-utils )
-		sys-apps/pkgcore
-		sys-apps/paludis
-	)
-"
-
-src_prepare() {
-	if use prefix ; then
-		# I don't dare to throw non Prefix users for the bus, but this
-		# patch should be safe for them
-		epatch "${FILESDIR}"/${P}-prefix.patch
-		eprefixify ${PN}
-	fi
-}
-
-src_install() {
-	dosbin perl-cleaner
-	doman perl-cleaner.1
-}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild
new file mode 100644
index 0000000..36434b2
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+	KEYWORDS="*"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# TODO: Detect at runtime what's available and fallback if needed, possibly
+# integrate with eselect-package-manager, bug #779007.
+IUSE="pkgcore"
+
+[[ "${PV}" == "9999" ]] && BDEPEND="sys-apps/help2man"
+
+RDEPEND="
+	app-shells/bash
+	dev-lang/perl
+	pkgcore? ( sys-apps/pkgcore )
+	!pkgcore? (
+		app-portage/portage-utils
+		sys-apps/portage
+	)
+"
+
+src_prepare() {
+	default
+	eprefixify ${PN}
+}
+
+src_install() {
+	dosbin perl-cleaner
+	doman perl-cleaner.1
+}
diff --git a/app-admin/python-updater/Manifest b/app-admin/python-updater/Manifest
deleted file mode 100644
index faf271b..0000000
--- a/app-admin/python-updater/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-updater-0.11.tar.bz2 9355 SHA256 5c88b2a56febe67e783855a1c51c4c89637e948704834ad1f5d1b6e46cc4a7b8 SHA512 613d0b772faed65690b3999fb557f4414926f72f2f6084cf2e91c225a036df8c1a3c73e4fa6feac191cb7ac89035d3bcae9a6b23f479e2cf63d69bb8c57217fe WHIRLPOOL 9eab112192a3515e71d4971b89282d3f9725629af5b4db6a090d74f4c3dc9421dbfbc9c6c0393b3d6387d4926b1eb1bbc6291ac18ae31e86ecfeb37cfba68b14
diff --git a/app-admin/python-updater/files/python-updater-0.10-expand-aliases.patch b/app-admin/python-updater/files/python-updater-0.10-expand-aliases.patch
deleted file mode 100644
index d48e221..0000000
--- a/app-admin/python-updater/files/python-updater-0.10-expand-aliases.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- python-updater
-+++ python-updater
-@@ -67,6 +67,8 @@
- # Portage variables.
- PKG_DBDIR="/var/db/pkg"
- 
-+shopt -s expand_aliases
-+
- # usage()
- # display usage
- usage() {
diff --git a/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch b/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch
deleted file mode 100644
index 20051f5..0000000
--- a/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Only alias sed to /usr/lib/portage/bin/ebuild-helpers/sed if the
-latter exists (which should be the case on prefix portages, but not on
-normal ones). Fixes fallout from bug #370935 on non-prefix portages.
-
---- python-updater
-+++ python-updater
-@@ -488,8 +488,15 @@
- 	shift
- done
- 
-+# On a prefix portage we need to use sed from ebuild-helpers/ instead
-+# of $PATH. On non-prefix portages ebuild-helpers/sed does not exist.
-+# Prepending ebuild-helpers/ to $PATH uses too many tools from there.
-+# So alias sed to ebuild-helpers/sed if it exists:
- if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
--	alias sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed"
-+	sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed"
-+	if [[ -x "${sed}" ]]; then
-+		alias sed="${sed}"
-+	fi
- fi
- 
- if has_version "=dev-lang/python-2*"; then
diff --git a/app-admin/python-updater/metadata.xml b/app-admin/python-updater/metadata.xml
deleted file mode 100644
index de483c5..0000000
--- a/app-admin/python-updater/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>python</herd>
-</pkgmetadata>
diff --git a/app-admin/python-updater/python-updater-0.11.ebuild b/app-admin/python-updater/python-updater-0.11.ebuild
deleted file mode 100644
index 2bc8432..0000000
--- a/app-admin/python-updater/python-updater-0.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.11.ebuild,v 1.14 2014/01/20 02:49:18 floppym Exp $
-
-EAPI=5
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-2
-fi
-
-DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
-HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/python-updater.git"
-else
-	SRC_URI="http://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
-	KEYWORDS="*"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
-RDEPEND="|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
-
-src_compile() {
-	if [[ "${PV}" == "9999" ]]; then
-		emake ${PN}.1 || die "Generation of man page failed"
-	fi
-}
-
-src_install() {
-	dosbin ${PN}
-	doman ${PN}.1
-	dodoc AUTHORS
-}
diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml
index 8b667b0..9e77647 100644
--- a/app-admin/setools/metadata.xml
+++ b/app-admin/setools/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>selinux@gentoo.org</email>
 		<name>SELinux Team</name>
 	</maintainer>
+	<use>
+		<flag name="infoflow">Depend on <pkg>dev-python/networkx</pkg> to use seinfoflow</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">SELinuxProject/setools</remote-id>
 	</upstream>
diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
index b62be50..fb441b9 100644
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
-<use>
-	<flag name="isag">Install isag, the Interactive System Activity Graph tool</flag>
-</use>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<use>
+		<flag name="dcron">Adjust cronjobs to work properly under <pkg>sys-process/dcron</pkg></flag>
+		<flag name="lto">Build using Link Time Optimizations (LTO)</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml
index 67d2bc4..580c8fc 100644
--- a/app-admin/webapp-config/metadata.xml
+++ b/app-admin/webapp-config/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
 	<use>
-		<flag name="portage">Propagete python_targets dependencies to sys-apps/portage</flag>
+		<flag name="portage">Propagate python_targets dependencies to <pkg>sys-apps/portage</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">webapp-config</remote-id>
diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
index d5d06bd..1fc35f9 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 prefix
 
diff --git a/app-alternatives/metadata.xml b/app-alternatives/metadata.xml
new file mode 100644
index 0000000..68304dc
--- /dev/null
+++ b/app-alternatives/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-alternatives category contains packages providing
+		symlinks linking different available implementations for various
+		executables.
+	</longdescription>
+</catmetadata>
diff --git a/app-alternatives/tar/OWNERS b/app-alternatives/tar/OWNERS
new file mode 100644
index 0000000..5ed5db8
--- /dev/null
+++ b/app-alternatives/tar/OWNERS
@@ -0,0 +1 @@
+include /app-arch/tar/OWNERS
diff --git a/app-alternatives/tar/metadata.xml b/app-alternatives/tar/metadata.xml
new file mode 100644
index 0000000..3bf8c90
--- /dev/null
+++ b/app-alternatives/tar/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="gnu">
+			Symlink to GNU tar (<pkg>app-arch/tar</pkg>)
+		</flag>
+		<flag name="libarchive">
+			Symlink to bsdtar from <pkg>app-arch/libarchive</pkg>
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-alternatives/tar/tar-0.ebuild b/app-alternatives/tar/tar-0.ebuild
new file mode 100644
index 0000000..cfda6cb
--- /dev/null
+++ b/app-alternatives/tar/tar-0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ALTERNATIVES=(
+	"gnu:>=app-arch/tar-1.34-r2"
+	libarchive:app-arch/libarchive
+)
+
+inherit app-alternatives
+
+DESCRIPTION="Tar symlink"
+KEYWORDS="*"
+IUSE="split-usr"
+
+RDEPEND="
+	!<app-arch/tar-1.34-r2
+"
+
+src_install() {
+	local usr_prefix=
+	use split-usr && usr_prefix=../usr/bin/
+
+	case $(get_alternative) in
+		gnu)
+			dosym gtar /bin/tar
+			newman - tar.1 <<<".so gtar.1"
+			;;
+		libarchive)
+			dosym "${usr_prefix}bsdtar" /bin/tar
+			newman - tar.1 <<<".so bsdtar.1"
+			;;
+	esac
+}
diff --git a/app-alternatives/yacc/OWNERS b/app-alternatives/yacc/OWNERS
new file mode 100644
index 0000000..3a8c03a
--- /dev/null
+++ b/app-alternatives/yacc/OWNERS
@@ -0,0 +1 @@
+include /sys-devel/bison/OWNERS
diff --git a/app-alternatives/yacc/metadata.xml b/app-alternatives/yacc/metadata.xml
new file mode 100644
index 0000000..0672d9f
--- /dev/null
+++ b/app-alternatives/yacc/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="bison">
+			Symlink to <pkg>sys-devel/bison</pkg>.
+		</flag>
+		<flag name="byacc">
+			Symlink to <pkg>dev-util/byacc</pkg>.
+		</flag>
+		<flag name="reference">
+			Symlink to <pkg>dev-util/yacc</pkg>.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-alternatives/yacc/yacc-1-r2.ebuild b/app-alternatives/yacc/yacc-1-r2.ebuild
new file mode 100644
index 0000000..44ff5ad
--- /dev/null
+++ b/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ALTERNATIVES=(
+	"bison:>=sys-devel/bison-3.8.2-r1"
+	byacc:dev-util/byacc
+	"reference:>=dev-util/yacc-1.9.1-r7"
+)
+
+inherit app-alternatives
+
+DESCRIPTION="yacc symlinks"
+KEYWORDS="*"
+
+RDEPEND="
+	!<dev-util/yacc-1.9.1-r7
+	!<sys-devel/bison-3.8.2-r1
+"
+
+src_install() {
+	local alt=$(get_alternative)
+
+	case ${alt} in
+		# bison installs its own small wrapper script 'yacc-bison'
+		# around bison(1).
+		bison) alt=yacc.bison;;
+		reference) alt=yacc-reference;;
+	esac
+
+	dosym "${alt}" /usr/bin/yacc
+	newman - yacc.1 <<<".so ${alt}.1"
+
+	# Leaving this for now to be safe, as it's closer to pre-alternatives
+	# status quo to leave it unset and let autoconf probe for Bison by itself
+	# as it prefers it anyway, and might be a CPP-like situation wrt
+	# calling bison or bison -y if YACC is set.
+	if [[ ${alt} != yacc.bison ]]; then
+		newenvd - 90yacc <<-EOF
+			YACC=${alt}
+		EOF
+	fi
+}
diff --git a/app-arch/brotli/OWNERS b/app-arch/brotli/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-arch/brotli/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-arch/brotli/metadata.xml b/app-arch/brotli/metadata.xml
index 5ee74e6..2b14295 100644
--- a/app-arch/brotli/metadata.xml
+++ b/app-arch/brotli/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
   <longdescription>
     Brotli is a generic-purpose lossless compression algorithm that
     compresses data using a combination of a modern variant of the
diff --git a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml
index 83d6d32..e3880e6 100644
--- a/app-arch/bzip2/metadata.xml
+++ b/app-arch/bzip2/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
   <email>base-system@gentoo.org</email>
@@ -7,5 +7,6 @@
 </maintainer>
 <upstream>
   <remote-id type="cpe">cpe:/a:bzip:bzip2</remote-id>
+  <remote-id type="gitlab">bzip2/bzip2</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-arch/cabextract/OWNERS b/app-arch/cabextract/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-arch/cabextract/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-arch/cabextract/metadata.xml b/app-arch/cabextract/metadata.xml
index 181a78d..0789fd6 100644
--- a/app-arch/cabextract/metadata.xml
+++ b/app-arch/cabextract/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
-  <use>
-    <flag name="extras">Install experimental extra tools: wince_info and
-      wince_rename for examining and processing Windows CE installation cabinet
-      header files; cabinfo for examining the structure of a cab file.
-    </flag>
-  </use>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<use>
+		<flag name="extras">Install experimental extra tools: wince_info and
+		wince_rename for examining and processing Windows CE installation cabinet
+		header files; cabinfo for examining the structure of a cab file.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">kyz/libmspack</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 7f50fff..c9fcf3f 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1 +1,3 @@
-DIST cpio-2.12.tar.bz2 1258605 SHA256 70998c5816ace8407c8b101c9ba1ffd3ebbecba1f5031046893307580ec1296e SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120 WHIRLPOOL 2990d54b0832e36239737fbd71f197b28703ec22de8dbbab57c7b97dab88a6107cf5464e4dd0bbf208f2c3d49839c7c2abe8ef68c1f2318ff7018d0b07f179fc
+DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
+DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c75af8f0c3497b43680be4ee347e628db7cfac616b437a848094bf82cfc2c7f29d59b388bf0f6368b3b99770022e3f9533be11 SHA512 4d2cafefcd1ae9d86cb5171de2896799713490dfd9ed27d3dce0886fa4588c8df2b16ad8508a5dbb9155c9de6e40b6d1083bdb4774d967193a270a1dcbe37a33
+DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
deleted file mode 100644
index e79948c..0000000
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A file archival tool which can also read and write tar files"
-HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
-SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="nls"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
-	epatch "${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--bindir="${EPREFIX}"/bin \
-		--with-rmt="${EPREFIX}"/usr/sbin/rmt
-}
diff --git a/app-arch/cpio/cpio-2.13-r2.ebuild b/app-arch/cpio/cpio-2.13-r2.ebuild
new file mode 100644
index 0000000..dfa991e
--- /dev/null
+++ b/app-arch/cpio/cpio-2.13-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A file archival tool which can also read and write tar files"
+HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
+SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021-38185.patch.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="*"
+IUSE="nls"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
+	"${WORKDIR}"/${P}-CVE-2021-38185.patch
+	"${FILESDIR}"/${PN}-2.13-sysmacros-glibc-2.26.patch
+	"${FILESDIR}"/${PN}-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch
+)
+
+src_prepare() {
+	default
+
+	# Drop after 2.13 (only here for CVE patch)
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		--bindir="${EPREFIX}"/bin
+		--with-rmt="${EPREFIX}"/usr/sbin/rmt
+	)
+
+	econf "${myeconfargs[@]}"
+}
\ No newline at end of file
diff --git a/app-arch/cpio/files/cpio-2.12-gcc-10.patch b/app-arch/cpio/files/cpio-2.12-gcc-10.patch
new file mode 100644
index 0000000..0b1ceaf
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.12-gcc-10.patch
@@ -0,0 +1,26 @@
+From 641d3f489cf6238bb916368d4ba0d9325a235afb Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Mon, 20 Jan 2020 07:45:39 +0200
+Subject: Minor fix * src/global.c: Remove superfluous declaration of
+ program_name
+
+---
+ src/global.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/global.c b/src/global.c
+index fb3abe9..acf92bc 100644
+--- a/src/global.c
++++ b/src/global.c
+@@ -184,9 +184,6 @@ unsigned int warn_option = 0;
+ /* Extract to standard output? */
+ bool to_stdout_option = false;
+ 
+-/* The name this program was run with.  */
+-char *program_name;
+-
+ /* A pointer to either lstat or stat, depending on whether
+    dereferencing of symlinks is done for input files.  */
+ int (*xstat) ();
+-- 
+cgit v1.2.1
diff --git a/app-arch/cpio/files/cpio-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch b/app-arch/cpio/files/cpio-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch
new file mode 100644
index 0000000..326489a
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch
@@ -0,0 +1,47 @@
+https://sources.debian.org/patches/cpio/2.13%2Bdfsg-7.1/revert-CVE-2015-1197-handling.patch/
+https://bugs.gentoo.org/700020
+
+From: Chris Lamb <lamby@debian.org>
+Date: Sat, 1 Feb 2020 13:36:37 +0100
+Subject: Fix a regression in handling of CVE-2015-1197 &
+ --no-absolute-filenames.
+
+See:
+
+  * https://bugs.debian.org/946267
+  * https://bugs.debian.org/946469
+
+This reverts (most of): https://git.savannah.gnu.org/cgit/cpio.git/diff/?id=45b0ee2b407913c533f7ded8d6f8cbeec16ff6ca&id2=3177d660a4c62a6acb538b0f7c54ba423698889a
+--- a/src/copyin.c
++++ b/src/copyin.c
+@@ -646,8 +646,6 @@ copyin_link (struct cpio_file_stat *file_hdr, int in_file_des)
+       link_name = xstrdup (file_hdr->c_tar_linkname);
+     }
+ 
+-  cpio_safer_name_suffix (link_name, true, !no_abs_paths_flag, false);
+-  
+   res = UMASKED_SYMLINK (link_name, file_hdr->c_name,
+ 			 file_hdr->c_mode);
+   if (res < 0 && create_dir_flag)
+--- a/tests/testsuite
++++ b/tests/testsuite
+@@ -2787,7 +2787,7 @@ read at_status <"$at_status_file"
+ #AT_START_14
+ at_fn_group_banner 14 'CVE-2015-1197.at:17' \
+   "CVE-2015-1197 (--no-absolute-filenames for symlinks)" ""
+-at_xfail=no
++at_xfail=yes
+ (
+   $as_echo "14. $at_setup_line: testing $at_desc ..."
+   $at_traceon
+
+--- a/tests/CVE-2015-1197.at
++++ b/tests/CVE-2015-1197.at
+@@ -15,6 +15,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ AT_SETUP([CVE-2015-1197 (--no-absolute-filenames for symlinks)])
++AT_XFAIL_IF([true])
+ AT_CHECK([
+ tempdir=$(pwd)/tmp
+ mkdir $tempdir
diff --git a/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch b/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch
new file mode 100644
index 0000000..90e7bc7
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch
@@ -0,0 +1,42 @@
+--- a/am/ax_compile_check_rettype.m4
++++ b/am/ax_compile_check_rettype.m4
+@@ -70,6 +70,9 @@ AC_CACHE_VAL(AC_CV_NAME,
+ [for ac_type in char short int long "long long" $4
+  do 
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ #include <sys/types.h>
+ $3
+ ]], [[switch (0) case 0: case (sizeof ($1($2)) == sizeof ($ac_type)):;]])], [AC_CV_NAME=$ac_type])
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,14 +39,11 @@ AC_C_PROTOTYPES
+ AC_SYS_LARGEFILE
+ 
+ AC_TYPE_SIGNAL
+-AC_HEADER_MAJOR
+ AC_C_CONST
+ AC_TYPE_UID_T
+ AC_CHECK_TYPE(gid_t, int)
+ AC_HEADER_STDC
+ AC_HEADER_DIRENT
+-AC_COMPILE_CHECK_RETTYPE([major], [0])
+-AC_COMPILE_CHECK_RETTYPE([minor], [0])
+ 
+ AC_CHECK_FUNCS([fchmod fchown])
+ # This is needed for mingw build
+@@ -67,7 +64,11 @@ AC_ARG_ENABLE(mt,
+ 
+ AM_CONDITIONAL([CPIO_MT_COND], [test "$enable_mt" = yes])
+ 
+-AC_CHECK_HEADERS([unistd.h stdlib.h string.h fcntl.h pwd.h grp.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h])
++AC_CHECK_HEADERS([unistd.h stdlib.h string.h fcntl.h pwd.h grp.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h sys/sysmacros.h])
++
++AC_HEADER_MAJOR
++AC_COMPILE_CHECK_RETTYPE([major], [0])
++AC_COMPILE_CHECK_RETTYPE([minor], [0])
+ 
+ AC_CHECK_DECLS([errno, getpwnam, getgrnam, getgrgid, strdup, strerror, getenv, atoi, exit], , , [
+ #include <stdio.h>
diff --git a/app-arch/cpio/metadata.xml b/app-arch/cpio/metadata.xml
index 56c1244..3f89d2d 100644
--- a/app-arch/cpio/metadata.xml
+++ b/app-arch/cpio/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:cpio</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-arch/gcab/OWNERS b/app-arch/gcab/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-arch/gcab/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-arch/gcab/metadata.xml b/app-arch/gcab/metadata.xml
index 3998080..ca769f6 100644
--- a/app-arch/gcab/metadata.xml
+++ b/app-arch/gcab/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/gcab</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-arch/lbzip2/metadata.xml b/app-arch/lbzip2/metadata.xml
index f6621e0..de430ef 100644
--- a/app-arch/lbzip2/metadata.xml
+++ b/app-arch/lbzip2/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mattst88@gentoo.org</email>
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index e3d9a2c..53eb2e7 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,2 +1,4 @@
 DIST libarchive-3.6.1.tar.xz 5241148 BLAKE2B e7b79e97545dabeac164069e87adbd2081d3bd75c22f80b3797c6e487a477b3f6347b6fc14c76668eb69f2f2e5dcdd5a33a694e0a292ce426b8d0d93435218cf SHA512 2e5a72edc468080c0e8f29e07d9c33826ffb246fa040ec42399bedeecf698b7555f69ffd15057ad79c0f50cd4926d43174599d99632b1b99ec6cd159c43a70b8
 DIST libarchive-3.6.1.tar.xz.asc 833 BLAKE2B 8a1ca13491f3b29b322ab281a80eaef9ca2cca680e18a0ed5ff626e8808b6c9a5eb4cdd6eaf00fb771f361d84d7785c103a9a0665d812f1f27ac66f5d1a2e1da SHA512 0411a9bdc9bb058b289b5cc102a220216420bf01ea213e771a16246ed48e670f3426e8555bac27262b686b40b7b2239907c4eef2bf43d812d73a69ccb2a5b00c
+DIST libarchive-3.6.2.tar.xz 5213196 BLAKE2B 355b5d402e352dee802513485ce7e047af58d6de5b9bf6a49f3fd8d7b94117007598820ac979585c0da79747e8b63b70ab151131182368a11f97a047cf9029d4 SHA512 a12bb6839e13a0be1099f42c650fc90fbfe62d32ce38bcbb4794206d29b2c782ae1115124d0e5f6b9716514213af32b05e4a42eb196447674a5f9a2a32bee043
+DIST libarchive-3.6.2.tar.xz.asc 659 BLAKE2B a4b0035ab2bda4129cdf0c99266cd1e5f4772d90de6e348c75958bc803f369d6abea85d9730c6c9a216466b35697faad8d265fb2c285545887eafde27d828887 SHA512 403e5f7dec14d8b1cc01fad5a249e7b7618a7b45bcb3361ea80d67d76b591b12ce97f2c88b23d5486505dd3b34c1f1643e02235a3e5fc5150ee5735946092efe
diff --git a/app-arch/libarchive/libarchive-3.6.1-r1.ebuild b/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
index 92def17..267abe4 100644
--- a/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
+++ b/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
@@ -42,12 +42,13 @@
 	)
 "
 BDEPEND="
-	verify-sig? ( sec-keys/openpgp-keys-libarchive )
+	verify-sig? ( <sec-keys/openpgp-keys-libarchive-20221209 )
 "
 
 PATCHES=(
 	"${FILESDIR}"/${P}-glibc-2.36.patch
-	"${FILESDIR}"/${P}-CVE-2022-36227.patch # drop after 3.6.2 version upgrade
+	# https://github.com/libarchive/libarchive/pull/1759
+	"${FILESDIR}"/${P}-CVE-2022-36227.patch
 )
 
 multilib_src_configure() {
diff --git a/app-arch/lz4/OWNERS b/app-arch/lz4/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-arch/lz4/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
index 26e7c6e..f27607c 100644
--- a/app-arch/lz4/metadata.xml
+++ b/app-arch/lz4/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
diff --git a/app-arch/lzop/OWNERS b/app-arch/lzop/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-arch/lzop/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-arch/lzop/metadata.xml b/app-arch/lzop/metadata.xml
index 0319eec..076793e 100644
--- a/app-arch/lzop/metadata.xml
+++ b/app-arch/lzop/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
diff --git a/app-arch/makeself/OWNERS b/app-arch/makeself/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-arch/makeself/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-arch/makeself/metadata.xml b/app-arch/makeself/metadata.xml
index e3be9c7..8e783c7 100644
--- a/app-arch/makeself/metadata.xml
+++ b/app-arch/makeself/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>matt@offtopica.uk</email>
-    <name>Matt Smith</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>matthew@gentoo.org</email>
+    <name>Matthew Smith</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
diff --git a/app-arch/metadata.xml b/app-arch/metadata.xml
deleted file mode 100644
index 72ecbb9..0000000
--- a/app-arch/metadata.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-arch category contains tools for archiving, compressing and
-		uncompressing files or groups of files.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-arch enthält Werkzeuge für das Archivieren, Packen und
-		Entpacken von Dateien oder Gruppen von Dateien.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-arch contiene herramientas para archivar, comprimir
-		y descomprimir archivos ó grupos de archivos.
-	</longdescription>
-	<longdescription lang="ja">
-		app-archカテゴリにはファイルをアーカイブする、圧縮する、解凍する
-		ツールが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		The app-arch categorie bevat applicaties met betrekking tot het
-		archiveren en comprimeren van bestanden.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-arch chứa những công cụ để lưu trữ, nén và
-		giải nén các tập tin hoặc nhóm các tập tin.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria app-arch contiene strumenti di archiviazione, compressione e decompressione di file o gruppi di files.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-arch contém ferramentas para arquivar, comprimir
-		e descomprimir arquivos ou grupos de arquivos.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-arch zawiera narzędzia służące do archiwizowania,
-		kompresji i dekompresji zarówno pojedynczych plików jak i ich grup.
-	</longdescription>
-</catmetadata>
-
diff --git a/app-arch/p7zip/OWNERS b/app-arch/p7zip/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-arch/p7zip/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-arch/p7zip/metadata.xml b/app-arch/p7zip/metadata.xml
index 17c1bda..762c5a1 100644
--- a/app-arch/p7zip/metadata.xml
+++ b/app-arch/p7zip/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>prometheanfire@gentoo.org</email>
diff --git a/app-arch/pbzip2/metadata.xml b/app-arch/pbzip2/metadata.xml
index 98d33df..9b70264 100644
--- a/app-arch/pbzip2/metadata.xml
+++ b/app-arch/pbzip2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="symlink">Install symlinks which override <pkg>app-arch/bzip2</pkg> implementation</flag>
 	</use>
diff --git a/app-arch/pixz/metadata.xml b/app-arch/pixz/metadata.xml
index 4256054..4f7e313 100644
--- a/app-arch/pixz/metadata.xml
+++ b/app-arch/pixz/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>zerochaos@gentoo.org</email>
diff --git a/app-arch/rpm2targz/metadata.xml b/app-arch/rpm2targz/metadata.xml
index 56c1244..73dda14 100644
--- a/app-arch/rpm2targz/metadata.xml
+++ b/app-arch/rpm2targz/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
diff --git a/app-arch/sharutils/metadata.xml b/app-arch/sharutils/metadata.xml
index 92fa546..a974c2f 100644
--- a/app-arch/sharutils/metadata.xml
+++ b/app-arch/sharutils/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
   <email>base-system@gentoo.org</email>
diff --git a/app-arch/snappy/OWNERS b/app-arch/snappy/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-arch/snappy/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml
index c149214..733bf82 100644
--- a/app-arch/snappy/metadata.xml
+++ b/app-arch/snappy/metadata.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Snappy is a compression/decompression library. It does not aim for
-		maximum compression, or compatibility with any other compression
-		library; instead, it aims for very high speeds and reasonable
-		compression.</longdescription>
+	<maintainer type="person" proxied="yes">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">Snappy is a compression/decompression library.
+		It does not aim for maximum compression, or compatibility with any
+		other compression library; instead, it aims for very high speeds and
+		reasonable compression.</longdescription>
 	<upstream>
 		<remote-id type="github">google/snappy</remote-id>
 	</upstream>
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 6166b3a..1a295ed 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,3 +1,2 @@
-DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
-DIST tar-1.33.tar.xz 2224824 BLAKE2B 500bcf4b919881da13f7336c617b4d618b5f898e4d8606867c8917be165d4a3718783a2959896226df451d7acdd78ba2fd1d9fc774d7905fe0dbe2375e3329fb SHA512 d7c31147fafcd815bb54e3862c078dccc3f192a9fa149c2275bd89a21fcd54a4bdaa8343cacf4f76cadc2f57fd4ed955682c1b6f23d438add5a13cc35bd25260
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
+DIST tar-1.34.tar.xz.sig 181 BLAKE2B 2fae91293a9dacda0374706e1f83498042a9d5224f80f6f0e14abdb914cb5a8e980f720eb4a453485844c7fe26e0525f230c0eab11c7fa89159a1a929370795c SHA512 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7
diff --git a/app-arch/tar/files/tar-1.34-fix-cve-2022-48303.patch b/app-arch/tar/files/tar-1.34-fix-cve-2022-48303.patch
index 5a4122a..5f00946 100644
--- a/app-arch/tar/files/tar-1.34-fix-cve-2022-48303.patch
+++ b/app-arch/tar/files/tar-1.34-fix-cve-2022-48303.patch
@@ -1,7 +1,16 @@
+Context:
+https://git.savannah.gnu.org/cgit/tar.git/commit/?id=3da78400eafcccb97e2f2fd4b227ea40d794ede8
+https://bugs.gentoo.org/898176
+https://github.com/gentoo/gentoo/pull/29776
+
+An alternative patch for the same bug, that mentions CVE-2022-48303:
+https://savannah.gnu.org/patch/?10307
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-48303
+
 From 3da78400eafcccb97e2f2fd4b227ea40d794ede8 Mon Sep 17 00:00:00 2001
 From: Sergey Poznyakoff <gray@gnu.org>
 Date: Sat, 11 Feb 2023 11:57:39 +0200
-Subject: [PATCH] Fix boundary checking in base-256 decoder
+Subject: Fix boundary checking in base-256 decoder
 
 * src/list.c (from_header): Base-256 encoding is at least 2 bytes
 long.
@@ -10,7 +19,7 @@
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/list.c b/src/list.c
-index 9fafc425..86bcfdd1 100644
+index 9fafc42..86bcfdd 100644
 --- a/src/list.c
 +++ b/src/list.c
 @@ -881,8 +881,9 @@ from_header (char const *where0, size_t digs, char const *type,
@@ -26,5 +35,4 @@
        /* Parse base-256 output.  A nonnegative number N is
  	 represented as (256**DIGS)/2 + N; a negative number -N is
 -- 
-2.39.2.637.g21b0678d19-goog
-
+cgit v1.1
diff --git a/app-arch/tar/metadata.xml b/app-arch/tar/metadata.xml
index c7c9593..8cbd50a 100644
--- a/app-arch/tar/metadata.xml
+++ b/app-arch/tar/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
diff --git a/app-arch/tar/tar-1.34-r1.ebuild b/app-arch/tar/tar-1.34-r1.ebuild
deleted file mode 100644
index bd6ac09..0000000
--- a/app-arch/tar/tar-1.34-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="https://www.gnu.org/software/tar/"
-SRC_URI="mirror://gnu/tar/${P}.tar.xz
-	https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-[[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="*"
-IUSE="acl elibc_glibc minimal nls selinux userland_GNU xattr"
-
-RDEPEND="
-	acl? ( virtual/acl )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${RDEPEND}
-	xattr? ( elibc_glibc? ( sys-apps/attr ) )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-cve-2022-48303.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use userland_GNU ; then
-		sed -i \
-			-e 's:/backup\.sh:/gbackup.sh:' \
-			scripts/{backup,dump-remind,restore}.in \
-			|| die "sed non-GNU"
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-backup-scripts
-		--libexecdir="${EPREFIX}"/usr/sbin
-		$(usex userland_GNU "" "--program-prefix=g")
-		$(use_with acl posix-acls)
-		$(use_enable nls)
-		$(use_with selinux)
-		$(use_with xattr xattrs)
-	)
-	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local p=$(usex userland_GNU "" "g")
-	if [[ -z ${p} ]] ; then
-		# a nasty yet required piece of baggage
-		exeinto /etc
-		doexe "${FILESDIR}"/rmt
-	fi
-
-	# autoconf looks for gtar before tar (in configure scripts), hence
-	# in Prefix it is important that it is there, otherwise, a gtar from
-	# the host system (FreeBSD, Solaris, Darwin) will be found instead
-	# of the Prefix provided (GNU) tar
-	if use prefix ; then
-		dosym tar /bin/gtar
-	fi
-
-	mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
-	mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
-
-	if use minimal ; then
-		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
-			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
-			-delete || die
-	fi
-}
diff --git a/app-arch/tar/tar-1.34-r3.ebuild b/app-arch/tar/tar-1.34-r3.ebuild
new file mode 100644
index 0000000..10f66b5
--- /dev/null
+++ b/app-arch/tar/tar-1.34-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/tar.asc
+inherit verify-sig
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.xz
+	https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
+SRC_URI+=" verify-sig? (
+		mirror://gnu/tar/${P}.tar.xz.sig
+		https://alpha.gnu.org/gnu/tar/${P}.tar.xz.sig
+	)"
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
+	KEYWORDS="*"
+fi
+IUSE="acl minimal nls selinux xattr"
+
+RDEPEND="
+	acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-tar )
+"
+PDEPEND="
+	app-alternatives/tar
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-cve-2022-48303.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-backup-scripts
+		--libexecdir="${EPREFIX}"/usr/sbin
+		$(use_with acl posix-acls)
+		$(use_enable nls)
+		$(use_with selinux)
+		$(use_with xattr xattrs)
+
+		# autoconf looks for gtar before tar (in configure scripts), hence
+		# in Prefix it is important that it is there, otherwise, a gtar from
+		# the host system (FreeBSD, Solaris, Darwin) will be found instead
+		# of the Prefix provided (GNU) tar
+		--program-prefix=g
+	)
+
+	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# a nasty yet required piece of baggage
+	exeinto /etc
+	doexe "${FILESDIR}"/rmt
+
+	mv "${ED}"/usr/sbin/{gbackup,backup-tar} || die
+	mv "${ED}"/usr/sbin/{grestore,restore-tar} || die
+	mv "${ED}"/usr/sbin/{g,}backup.sh || die
+	mv "${ED}"/usr/sbin/{g,}dump-remind || die
+
+	if use minimal ; then
+		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+			-type f -a '!' -name gtar \
+			-delete || die
+	fi
+
+	if ! use minimal; then
+		dosym grmt /usr/sbin/rmt
+	fi
+	dosym grmt.8 /usr/share/man/man8/rmt.8
+}
+
+pkg_postinst() {
+	# ensure to preserve the symlink before app-alternatives/tar
+	# is installed
+	if [[ ! -h ${EROOT}/bin/tar ]]; then
+		ln -s gtar "${EROOT}/bin/tar" || die
+	fi
+}
diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml
index dab6b92..29bcd14 100644
--- a/app-arch/unrar/metadata.xml
+++ b/app-arch/unrar/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
index a151503..80e20aa 100644
--- a/app-arch/unzip/metadata.xml
+++ b/app-arch/unzip/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
diff --git a/app-arch/zip/metadata.xml b/app-arch/zip/metadata.xml
index 564fd76..a703875 100644
--- a/app-arch/zip/metadata.xml
+++ b/app-arch/zip/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
diff --git a/app-arch/zip/zip-3.0-r4.ebuild b/app-arch/zip/zip-3.0-r4.ebuild
deleted file mode 100644
index 9f1c833..0000000
--- a/app-arch/zip/zip-3.0-r4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs flag-o-matic
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="*"
-IUSE="bzip2 crypt natspec unicode"
-
-DEPEND="${RDEPEND}"
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-no-crypt.patch #238398
-	"${FILESDIR}/${P}"-pic.patch
-	"${FILESDIR}/${P}"-exec-stack.patch #122849
-	"${FILESDIR}/${P}"-build.patch #200995
-	"${FILESDIR}/${P}"-zipnote-freeze.patch #322047
-	"${FILESDIR}/${P}"-format-security.patch #512414
-)
-
-src_prepare() {
-	default
-	use natspec && eapply "${FILESDIR}/${PN}"-3.0-natspec.patch #275244
-}
-
-src_configure() {
-	append-cppflags \
-		-DLARGE_FILE_SUPPORT \
-		-DUIDGID_NOT_16BIT \
-		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
-		-D$(usex crypt '' NO)CRYPT \
-		-D$(usex unicode '' NO)UNICODE_SUPPORT
-	# Third arg disables bzip2 logic as we handle it ourselves above.
-	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
-	if use bzip2 ; then
-		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
-	fi
-}
-
-src_compile() {
-	emake \
-		CPP="$(tc-getCPP)" \
-		-f unix/Makefile generic
-}
-
-src_install() {
-	dobin zip zipnote zipsplit
-	doman man/zip{,note,split}.1
-	if use crypt ; then
-		dobin zipcloak
-		doman man/zipcloak.1
-	fi
-	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
-}
diff --git a/app-arch/zip/zip-3.0-r5.ebuild b/app-arch/zip/zip-3.0-r5.ebuild
new file mode 100644
index 0000000..53ee740
--- /dev/null
+++ b/app-arch/zip/zip-3.0-r5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs flag-o-matic
+
+MY_P="${PN}${PV//.}"
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="*"
+IUSE="bzip2 crypt natspec unicode"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-no-crypt.patch #238398
+	"${FILESDIR}/${P}"-pic.patch
+	"${FILESDIR}/${P}"-exec-stack.patch #122849
+	"${FILESDIR}/${P}"-build.patch #200995
+	"${FILESDIR}/${P}"-zipnote-freeze.patch #322047
+	"${FILESDIR}/${P}"-format-security.patch #512414
+)
+
+src_prepare() {
+	default
+	use natspec && eapply "${FILESDIR}/${PN}"-3.0-natspec.patch #275244
+}
+
+src_configure() {
+	append-cppflags \
+		-DLARGE_FILE_SUPPORT \
+		-DUIDGID_NOT_16BIT \
+		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
+		-D$(usex crypt '' NO)CRYPT \
+		-D$(usex unicode '' NO)UNICODE_SUPPORT
+	# Third arg disables bzip2 logic as we handle it ourselves above.
+	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
+	if use bzip2 ; then
+		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
+	fi
+}
+
+src_compile() {
+	emake \
+		CPP="$(tc-getCPP)" \
+		-f unix/Makefile generic
+}
+
+src_install() {
+	dobin zip zipnote zipsplit
+	doman man/zip{,note,split}.1
+	if use crypt ; then
+		dobin zipcloak
+		doman man/zipcloak.1
+	fi
+	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
+}
diff --git a/app-arch/zstd/metadata.xml b/app-arch/zstd/metadata.xml
index 847490d..6eaf61e 100644
--- a/app-arch/zstd/metadata.xml
+++ b/app-arch/zstd/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 	</maintainer>
diff --git a/app-arch/zstd/zstd-1.5.2-r3.ebuild b/app-arch/zstd/zstd-1.5.2-r3.ebuild
new file mode 100644
index 0000000..c8bf14d
--- /dev/null
+++ b/app-arch/zstd/zstd-1.5.2-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs usr-ldscript
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="*"
+IUSE="lz4 static-libs"
+
+RDEPEND="
+	app-arch/xz-utils
+	sys-libs/zlib
+	lz4? ( app-arch/lz4 )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		V=1 \
+		"${@}"
+}
+
+multilib_src_compile() {
+	local libzstd_targets=( libzstd{,.a}-mt )
+
+	mymake -C lib ${libzstd_targets[@]} libzstd.pc
+
+	if multilib_is_native_abi ; then
+		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
+
+		mymake -C contrib/pzstd
+	fi
+}
+
+multilib_src_install() {
+	mymake -C lib DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		mymake -C programs DESTDIR="${D}" install
+		gen_usr_ldscript -a zstd
+
+		mymake -C contrib/pzstd DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/app-arch/zstd/zstd-1.5.2.ebuild b/app-arch/zstd/zstd-1.5.2.ebuild
deleted file mode 100644
index f035b40..0000000
--- a/app-arch/zstd/zstd-1.5.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/1"
-KEYWORDS="*"
-IUSE="lz4 static-libs +threads"
-
-RDEPEND="app-arch/xz-utils
-	lz4? ( app-arch/lz4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-mymake() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		V=1 \
-		"${@}"
-}
-
-multilib_src_compile() {
-	local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
-
-	mymake -C lib ${libzstd_targets[@]} libzstd.pc
-
-	if multilib_is_native_abi ; then
-		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
-
-		mymake -C contrib/pzstd
-	fi
-}
-
-multilib_src_install() {
-	mymake -C lib DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		mymake -C programs DESTDIR="${D}" install
-
-		mymake -C contrib/pzstd DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use static-libs; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/app-benchmarks/OWNERS b/app-benchmarks/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-benchmarks/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-benchmarks/bootchart2/metadata.xml b/app-benchmarks/bootchart2/metadata.xml
index 59b22ae..bfa8fcd 100644
--- a/app-benchmarks/bootchart2/metadata.xml
+++ b/app-benchmarks/bootchart2/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jlec@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">mmeeks/bootchart</remote-id>
   </upstream>
diff --git a/app-benchmarks/i7z/metadata.xml b/app-benchmarks/i7z/metadata.xml
index 78dfd9b..831fb6b 100644
--- a/app-benchmarks/i7z/metadata.xml
+++ b/app-benchmarks/i7z/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
diff --git a/app-benchmarks/libc-bench/metadata.xml b/app-benchmarks/libc-bench/metadata.xml
index d920e3b..489e730 100644
--- a/app-benchmarks/libc-bench/metadata.xml
+++ b/app-benchmarks/libc-bench/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
diff --git a/app-benchmarks/metadata.xml b/app-benchmarks/metadata.xml
deleted file mode 100644
index c7ff909..0000000
--- a/app-benchmarks/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-benchmarks category contains benchmarking software.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-benchmarks contiene programas para pruebas.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-benchmarks enthält Benchmark-Software.
-	</longdescription>
-	<longdescription lang="ja">
-		app-benchmarksカテゴリにはベンチマークソフトウェアが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De app-benchmarks categorie bevat benchmarking applicaties.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-benchmarks chứa các ứng dụng benchmark.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria app-benchmarks contiene programmi per l'analisi delle prestazioni.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-benchmarks contém programas para benchmarking.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-benchmarks zawiera oprogramowanie służące do testowania
-		wydajności.
-	</longdescription>
-</catmetadata>
-
diff --git a/app-benchmarks/stress-ng/metadata.xml b/app-benchmarks/stress-ng/metadata.xml
index c2c4763..cf330e3 100644
--- a/app-benchmarks/stress-ng/metadata.xml
+++ b/app-benchmarks/stress-ng/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>conikost@gentoo.org</email>
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
deleted file mode 100644
index 0460740..0000000
--- a/app-cdr/cdrtools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cdrtools-3.02a06.tar.bz2 2117648 SHA256 ed79ab99414352ea9305163660b52b6a82394466bae03aebdbe2150997835eb1 SHA512 31a0743e39513841e77dcaaa52d746cafc0867ba01d46d43310f89e4ef2a0759fcac2e812aa323854daaa9a5ce8627c0612b8e461072a6066c20883ebe639c0c WHIRLPOOL 6358a39ee1fd51be417d3bb21ba7b43b8ee9b6dd71c925b7a1a8bc6f402380804f761749b3c912fc9f4a3e4d49bb4988441c3348ccfcc794847be8f0444628c9
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild
deleted file mode 100644
index 49ea44d..0000000
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit fcaps multilib eutils toolchain-funcs flag-o-matic gnuconfig
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
-SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="*"
-IUSE="acl caps nls unicode"
-
-RDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	nls? ( virtual/libintl )
-	!app-cdr/cdrkit"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	nls? ( >=sys-devel/gettext-0.18.1.1 )"
-
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
-
-FILECAPS=(
-	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
-	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
-	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
-)
-
-cdrtools_os() {
-	local os="linux"
-	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
-	echo "${os}"
-}
-
-src_prepare() {
-	gnuconfig_update
-
-	# This fixes a clash with clone() on uclibc.  Upstream isn't
-	# going to include this so let's try to carry it forward.
-	# Contact me if it needs updating.  Bug #486782.
-	# Anthony G. Basile <blueness@gentoo.org>.
-	use elibc_uclibc && epatch "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
-
-	# Remove profiled make files.
-	find -name '*_p.mk' -delete
-
-	# Adjusting hardcoded paths.
-	sed -i -e "s|opt/schily|usr|" \
-		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
-		|| die "sed opt/schily"
-
-	sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
-		|| die "sed doc"
-
-	# Respect libdir.
-	sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
-		|| die "sed multilib"
-
-	# Do not install static libraries.
-	sed -i -e "s|include\t\t.*rules.lib||" \
-		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
-		|| die "sed rules"
-
-	# Enable verbose build.
-	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
-		RULES/*.rul RULES/rules.prg RULES/rules.inc \
-		|| die "sed verbose rules"
-
-	# Respect CC/CXX variables.
-	cd "${S}"/RULES
-	local tcCC=$(tc-getCC)
-	local tcCXX=$(tc-getCXX)
-	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
-		rules1.top || die "sed rules1.top"
-	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
-		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
-		-e "/COPTOPT=/s|-O||" \
-		-e 's|$(GCCOPTOPT)||' \
-		cc-gcc.rul || die "sed cc-gcc.rul"
-	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
-		rules.cnf || die "sed rules.cnf"
-
-	# Schily make setup.
-	cd "${S}"/DEFAULTS
-	local os=$(cdrtools_os)
-
-	sed -i \
-		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
-		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
-		-e "s|^\(LDPATH=\).*|\1|" \
-		-e "s|^\(RUNPATH=\).*|\1|" \
-		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
-		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
-		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
-		-e '/^DEFUMASK/s,002,022,g' \
-		Defaults.${os} || die "sed Schily make setup"
-	# re DEFUMASK above:
-	# bug 486680: grsec TPE will block the exec if the directory is
-	# group-writable. This is painful with cdrtools, because it makes a bunch of
-	# group-writable directories during build. Change the umask on their
-	# creation to prevent this.
-}
-
-ac_cv_sizeof() {
-	cat <<-EOF >"${T}"/test.c
-	#include <inttypes.h>
-	#include <stddef.h>
-	#include <stdint.h>
-	#include <sys/types.h>
-	int main () {
-		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
-		test_array [0] = 0;
-		return test_array [0];
-	}
-	EOF
-
-	local i=1
-	while [[ ${i} -lt 20 ]] ; do
-		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
-			echo ${i}
-			return 0
-		fi
-		: $(( i += 1 ))
-	done
-	return 1
-}
-
-src_configure() {
-	use acl || export ac_cv_header_sys_acl_h="no"
-	use caps || export ac_cv_lib_cap_cap_get_proc="no"
-
-	# skip obsolete configure script
-	if tc-is-cross-compiler ; then
-		# Cache known values for targets. #486680
-
-		tc-export CC
-		local var val t types=(
-			char "short int" int "long int" "long long"
-			"unsigned char" "unsigned short int" "unsigned int"
-			"unsigned long int" "unsigned long long"
-			float double "long double" size_t ssize_t ptrdiff_t
-			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
-			"char *" "unsigned char *"
-		)
-		for t in "${types[@]}" ; do
-			var="ac_cv_sizeof_${t// /_}"
-			var=${var//[*]/p}
-			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
-			export "${var}=${val}"
-			einfo "Computing sizeof(${t}) as ${val}"
-		done
-		# We don't have these types.
-		export ac_cv_sizeof___int64=0
-		export ac_cv_sizeof_unsigned___int64=0
-		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
-
-		export ac_cv_type_prototypes="yes"
-		export ac_cv_func_mlock{,all}="yes"
-		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
-		export ac_cv_func_dtoa_r="no"
-		export ac_cv_func_sys_siglist{,_def}="no"
-		export ac_cv_func_printf_{j,ll}="yes"
-		export ac_cv_realloc_null="yes"
-		export ac_cv_no_user_malloc="no"
-		export ac_cv_var_timezone="yes"
-		export ac_cv_var___progname{,_full}="yes"
-		export ac_cv_fnmatch_igncase="yes"
-		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
-		export ac_cv_file__usr_src_linux_include="no"
-
-		case $(cdrtools_os) in
-		linux)
-			export ac_cv_func_bsd_{g,s}etpgrp="no"
-			export ac_cv_hard_symlinks="yes"
-			export ac_cv_link_nofollow="yes"
-			export ac_cv_access_e_ok="no"
-
-			export ac_cv_dev_minor_noncontig="yes"
-			case ${ac_cv_sizeof_long_int} in
-			4) export ac_cv_dev_minor_bits="32";;
-			8) export ac_cv_dev_minor_bits="44";;
-			esac
-
-			cat <<-EOF >"${T}"/test.c
-			struct {
-				char start[6];
-				unsigned char x1:4;
-				unsigned char x2:4;
-				char end[5];
-			} a = {
-				.start = {'S', 't', 'A', 'r', 'T', '_'},
-				.x1 = 5,
-				.x2 = 4,
-				.end = {'_', 'e', 'N', 'd', 'X'},
-			};
-			EOF
-			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
-			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="no"
-			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="yes"
-			fi
-			;;
-		esac
-	fi
-}
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
-		fi
-	fi
-
-	# If not built with -j1, "sometimes" cdda2wav will not be built.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
-}
-
-src_install() {
-	# If not built with -j1, "sometimes" manpages are not installed.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
-
-	# These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
-
-	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
-
-	cd "${S}"/cdda2wav
-	docinto cdda2wav
-	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
-
-	cd "${S}"/mkisofs
-	docinto mkisofs
-	dodoc ChangeLog* TODO
-
-	# Remove man pages related to the build system
-	rm -rvf "${ED}"/usr/share/man/man5
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		einfo
-		einfo "Darwin/OS X use the following device names:"
-		einfo
-		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
-		einfo
-		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
-		einfo
-	fi
-}
diff --git a/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch b/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch
deleted file mode 100644
index 9ffd28a..0000000
--- a/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur cdrtools-3.02.orig/readcd/readcd.c cdrtools-3.02/readcd/readcd.c
---- cdrtools-3.02.orig/readcd/readcd.c	2016-01-24 11:15:19.000000000 -0500
-+++ cdrtools-3.02/readcd/readcd.c	2016-04-09 12:29:54.727635502 -0400
-@@ -257,7 +257,7 @@
- BOOL	pifscan;
- BOOL	plot;
- BOOL	fulltoc;
--BOOL	clone;
-+BOOL	clonetoc;
- BOOL	edc_corr;
- BOOL	noerror;
- BOOL	nocorr;
-@@ -294,7 +294,7 @@
- 	error(_("\t-plot		Print data suitable for gnuplot\n"));
- #ifdef	CLONE_WRITE
- 	error(_("\t-fulltoc	Retrieve the full TOC\n"));
--	error(_("\t-clone		Retrieve the full TOC and all data\n"));
-+	error(_("\t-clonetoc		Retrieve the full TOC and all data\n"));
- 	error(_("\t-edc-corr	Try to do user level Reed Solomon repair (experimental)\n"));
- #endif
- 	error(_("\ttimeout=#	set the default SCSI command timeout to #.\n"));
-@@ -320,7 +320,7 @@
- }
- 
- /* CSTYLED */
--char	opts[]   = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clone,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
-+char	opts[]   = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clonetoc,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
- 
- EXPORT int
- main(ac, av)
-@@ -397,7 +397,7 @@
- 			&scanbus, &dev, &scgopts, &sectors, &do_write,
- 			&c2scan, &cxscan, &pi8scan, &pifscan,
- 			&plot,
--			&fulltoc, &clone,
-+			&fulltoc, &clonetoc,
- 			&edc_corr,
- 			&noerror, &nocorr,
- 			&notrunc, &retries, &do_factor, &filename,
-@@ -679,7 +679,7 @@
- 
- 	if (filename || sectors || c2scan || cxscan || pi8scan || pifscan ||
- 	    meshpoints || fulltoc ||
--	    clone || edc_corr) {
-+	    clonetoc || edc_corr) {
- 		dorw(scgp, filename, sectors);
- 	} else {
- 		doit(scgp);
-@@ -894,9 +894,9 @@
- 		if (params.name == NULL)
- 			params.name = "/dev/null";
- 		read_ftoc(scgp, &params, FALSE);
--	} else if (clone || edc_corr) {
-+	} else if (clonetoc || edc_corr) {
- 		if (!is_mmc(scgp, NULL, NULL))
--			comerrno(EX_BAD, _("Unsupported device for clone mode.\n"));
-+			comerrno(EX_BAD, _("Unsupported device for clonetoc mode.\n"));
- 		if (!edc_corr)
- 			noerror = TRUE;
- 		if (retries == MAX_RETRY)
-@@ -904,7 +904,7 @@
- 		if (params.name == NULL)
- 			params.name = "/dev/null";
- 
--		if (clone)
-+		if (clonetoc)
- 		if (read_ftoc(scgp, &params, TRUE) < 0)
- 			comerrno(EX_BAD, _("Read fulltoc problems.\n"));
- 		readcd_disk(scgp, &params);
diff --git a/app-cdr/cdrtools/metadata.xml b/app-cdr/cdrtools/metadata.xml
deleted file mode 100644
index f049ae2..0000000
--- a/app-cdr/cdrtools/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>billie@gentoo.org</email>
-		<name>Daniel Pielmeier</name>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<email>joerg.schilling@fokus.fraunhofer.de</email>
-			<name>Jörg Schilling</name>
-		</maintainer>
-		<remote-id type="sourceforge">cdrtools</remote-id>
-	</upstream>
-	<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
-</pkgmetadata>
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
new file mode 100644
index 0000000..3b6f0a5
--- /dev/null
+++ b/app-containers/containerd/Manifest
@@ -0,0 +1,2 @@
+DIST containerd-1.6.19.tar.gz 8706434 BLAKE2B cd6a85721f0752b6c7c5c098153d581375db6f877e261097a7d74a78dc0957e6beeea38c1aa7c53227ed84e727744811fa38863097cb137b8ba775e1f04fb9b2 SHA512 dca78d472dfbc6fc4d9b0b3a0d0a131d3575163c52e4fe18ea2c6147868b8822c54046c0709974e9b90472b882ba3890ada7f0fcbf31549efffba0d91531886c
+DIST containerd-1.6.20.tar.gz 8749093 BLAKE2B b2168f68ba45f5e0c589946fdfcded8c57801340e10f4fe6374ab9caaa740888246df49322b880a06bd665ad98bbafc8c39d44059a00f446c7cc24bbdb357eb8 SHA512 dd9708c99d95773a78b0fcd77b388cb8a971d0d65502c8b86cbb3b29c48bac31366ae0603d7710a13c21c33adcd341cdec69dcb3c3a06a2d753c4c59f2549d75
diff --git a/app-containers/containerd/OWNERS b/app-containers/containerd/OWNERS
new file mode 100644
index 0000000..a380c98
--- /dev/null
+++ b/app-containers/containerd/OWNERS
@@ -0,0 +1,2 @@
+jparkerh@google.com
+bbrotherton@google.com
diff --git a/app-containers/containerd/containerd-1.6.20.ebuild b/app-containers/containerd/containerd-1.6.20.ebuild
new file mode 100644
index 0000000..2ae5939
--- /dev/null
+++ b/app-containers/containerd/containerd-1.6.20.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_REVISION=2806fc1057397dbaeefbea0e4e17bddfbd388f38
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="*"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+	${DEPEND}
+	~app-containers/runc-1.1.5[apparmor?,seccomp?]
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+# tests require root or docker
+RESTRICT+="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s/-s -w//" \
+		-e "s/-mod=readonly//" \
+		Makefile || die
+	sed -i \
+		-e "s:/usr/local:/usr:" \
+		containerd.service || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+		REVISION="${GIT_REVISION}"
+		VERSION=v${PV}
+	)
+
+	# race condition in man target https://bugs.gentoo.org/765100
+	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	systemd_dounit containerd.service
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -r docs/man || die
+
+	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
+	einstalldocs
+}
diff --git a/app-containers/containerd/files/containerd.confd b/app-containers/containerd/files/containerd.confd
new file mode 100644
index 0000000..22ef832
--- /dev/null
+++ b/app-containers/containerd/files/containerd.confd
@@ -0,0 +1,3 @@
+# This is the delay to be used in the start_post function to wait for
+# the socket to be active.
+#containerd_socket_delay=5
diff --git a/app-containers/containerd/files/containerd.initd b/app-containers/containerd/files/containerd.initd
new file mode 100644
index 0000000..143305c
--- /dev/null
+++ b/app-containers/containerd/files/containerd.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Containerd container runtime"
+command="/usr/bin/containerd"
+command_args="${command_args:-}"
+command_background="true"
+pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
+start_stop_daemon_args="--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+start_pre() {
+	checkpath -m 0750 -d "/var/log/${RC_SVCNAME}"
+
+	ulimit -n 1048576
+
+	# Having non-zero limits causes performance problems due to accounting overhead
+	# in the kernel. We recommend using cgroups to do container-local accounting.
+	ulimit -u unlimited
+
+	return 0
+}
+
+start_post() {
+	ewaitfile ${containerd_socket_delay:-5} /run/containerd/containerd.sock
+}
diff --git a/app-containers/containerd/metadata.xml b/app-containers/containerd/metadata.xml
new file mode 100644
index 0000000..5d63e86
--- /dev/null
+++ b/app-containers/containerd/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		Containerd is a daemon with an API and a command line client, to manage
+		containers on one machine. It uses runC to run containers according to
+		the OCI specification. Containerd has advanced features such as seccomp
+		and user namespace support as well as checkpoint and restore for cloning
+		and live migration of containers.
+	</longdescription>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<use>
+	<flag name="btrfs">Support for BTRFS snapshot driver</flag>
+	<flag name="cri">Support for Kubernetes CRI</flag>
+	<flag name="device-mapper">Support for device mapper snapshot driver</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">containerd/containerd</remote-id>
+		<remote-id type="cpe">cpe:/a:linuxfoundation:containerd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-containers/docker-proxy/Manifest b/app-containers/docker-proxy/Manifest
new file mode 100644
index 0000000..23d1fcb
--- /dev/null
+++ b/app-containers/docker-proxy/Manifest
@@ -0,0 +1,2 @@
+DIST docker-proxy-0.8.0_p20220601.tar.gz 3154283 BLAKE2B 7651e1862acf60988f6a8bdf3c0befc9b01a388aebda2b86610109bb6affe0d9c64d2750a911f0d1856be0dba970e9e92de2a0d393cc5c3a581d4253c574a623 SHA512 d3d9888f39a9247b6e773b0bfe63e6d248c5c155e7032cdbdd5cfacf995cb6b4cf2f0fb51e09c4554a4b994e3c3d7fc9cd2fde6cf8dda34fba6aa07218ac959c
+DIST docker-proxy-0.8.0_p20230118.tar.gz 3154267 BLAKE2B 307799d9dab73ed3ed3e537a247d70a65d9b4a51db69ae09518eb9daee949f78478ec104751d088717ca17171f604ff5c450198cc24e79cca266a1c7f61800ad SHA512 079eee720a4e755639e39fd8764f380549e715cbd6be0b46a102771a09f6cce5f085f7e568429c8c35a46f09948aea3e60de5ba2e32e22f0ee1fd9559c2d58f6
diff --git a/app-containers/docker-proxy/OWNERS b/app-containers/docker-proxy/OWNERS
new file mode 100644
index 0000000..a380c98
--- /dev/null
+++ b/app-containers/docker-proxy/OWNERS
@@ -0,0 +1,2 @@
+jparkerh@google.com
+bbrotherton@google.com
diff --git a/app-containers/docker-proxy/docker-proxy-0.8.0_p20220601.ebuild b/app-containers/docker-proxy/docker-proxy-0.8.0_p20220601.ebuild
new file mode 100644
index 0000000..79616b5
--- /dev/null
+++ b/app-containers/docker-proxy/docker-proxy-0.8.0_p20220601.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/moby/libnetwork
+GIT_COMMIT=f6ccccb1c082a432c2a5814aaedaca56af33d9ea
+inherit golang-vcs-snapshot
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+SRC_URI="https://github.com/moby/libnetwork/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="*"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+# needs dockerd
+RESTRICT="strip test"
+
+src_compile() {
+	GO111MODULE=auto GOPATH="${WORKDIR}/${P}" \
+		go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+	dobin bin/docker-proxy
+	dodoc README.md CHANGELOG.md
+}
diff --git a/app-containers/docker-proxy/metadata.xml b/app-containers/docker-proxy/metadata.xml
new file mode 100644
index 0000000..c7055f4
--- /dev/null
+++ b/app-containers/docker-proxy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">docker/libnetwork</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
new file mode 100644
index 0000000..919aead
--- /dev/null
+++ b/app-containers/runc/Manifest
@@ -0,0 +1,2 @@
+DIST runc-1.1.4.tar.gz 2334639 BLAKE2B bc7eb7de29e8ebb9ce146bc77bf6cfc116f4af3e28c0344059183cf0c8082c629ccb235531c368cce99915991b25df0b50b7cbb98b9c6a7d141ba6cc15958651 SHA512 c8e79ad839964680d29ab56a4de255f91192741951673025da6889c544a232d4d392db2da8005d8e22999a37bfbc9c9fe7f6043b165bc4edc2f2a29261d8a3d6
+DIST runc-1.1.5.tar.gz 2336539 BLAKE2B 3fcc4c2160f33fcec2efd6bcd755279c535128af870d4ea71dc07c501c0f401f394f2f66219739ca24cc5ec37b5944b0323f8e7ee49c619513ce826159e3a395 SHA512 f3cc9b93b0fe8a4341d410010fe584febb8e975ec9e0fd569d7dff33ab74c5821a2e0c40b7aeafd6b90991a50eae9c352342437f09cf6884dc850ceccdc68944
diff --git a/app-containers/runc/OWNERS b/app-containers/runc/OWNERS
new file mode 100644
index 0000000..a380c98
--- /dev/null
+++ b/app-containers/runc/OWNERS
@@ -0,0 +1,2 @@
+jparkerh@google.com
+bbrotherton@google.com
diff --git a/app-containers/runc/metadata.xml b/app-containers/runc/metadata.xml
new file mode 100644
index 0000000..76423a9
--- /dev/null
+++ b/app-containers/runc/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		runc is a CLI tool for spawning and running containers according
+		to the OCF (Open Container Format) specification.
+	</longdescription>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<use>
+		<flag name="kmem">
+			Enable Kernel Memory Accounting.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">opencontainers/runc</remote-id>
+		<remote-id type="cpe">cpe:/a:linuxfoundation:runc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-containers/runc/runc-1.1.5.ebuild b/app-containers/runc/runc-1.1.5.ebuild
new file mode 100644
index 0000000..5215c36
--- /dev/null
+++ b/app-containers/runc/runc-1.1.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
+RUNC_COMMIT=f19387a6bec4944c770f7668ab51c4348d9c2f38
+CONFIG_CHECK="~USER_NS"
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://github.com/opencontainers/runc/"
+MY_PV="${PV/_/-}"
+SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="*"
+IUSE="apparmor hardened +kmem +seccomp selinux test"
+
+DEPEND="seccomp? ( sys-libs/libseccomp )"
+
+RDEPEND="
+	${DEPEND}
+	!app-emulation/docker-runc
+	apparmor? ( sys-libs/libapparmor )
+	selinux? ( sec-policy/selinux-container )
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	test? ( "${RDEPEND}" )
+"
+
+# tests need busybox binary, and portage namespace
+# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
+# majority of tests pass
+RESTRICT+=" test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+	# Taken from app-containers/docker-1.7.0-r1
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+		-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usev apparmor)
+		$(usev seccomp)
+		$(usex kmem '' 'nokmem')
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		COMMIT="${RUNC_COMMIT}"
+	)
+
+	emake "${myemakeargs[@]}" runc man
+}
+
+src_install() {
+	myemakeargs+=(
+		PREFIX="${ED}/usr"
+		BINDIR="${ED}/usr/bin"
+		MANDIR="${ED}/usr/share/man"
+	)
+	emake "${myemakeargs[@]}" install install-man install-bash
+
+	local DOCS=( README.md PRINCIPLES.md docs/. )
+	einstalldocs
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" localunittest
+}
diff --git a/app-crypt/OWNERS b/app-crypt/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-crypt/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
deleted file mode 100644
index cc1597d..0000000
--- a/app-crypt/argon2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f
diff --git a/app-crypt/argon2/argon2-20190702.ebuild b/app-crypt/argon2/argon2-20190702.ebuild
deleted file mode 100644
index 316f7d0..0000000
--- a/app-crypt/argon2/argon2-20190702.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
-SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0/1"
-KEYWORDS="*"
-IUSE="static-libs"
-
-S="${WORKDIR}/phc-winner-${P}"
-
-DOCS=( argon2-specs.pdf CHANGELOG.md README.md )
-
-src_prepare() {
-	default
-	if ! use static-libs; then
-		sed -i -e '/LIBRARIES =/s/\$(LIB_ST)//' Makefile || die
-	fi
-	sed -i \
-		-e 's/-O3//' \
-		-e 's/-g//' \
-		-e 's/-march=\$(OPTTARGET)//' \
-		Makefile || die
-
-	tc-export CC
-
-	OPTTEST=1
-	if use amd64 || use x86; then
-		$(tc-getCPP) ${CFLAGS} ${CPPFLAGS} -P - <<-EOF &>/dev/null && OPTTEST=0
-			#if defined(__SSE2__)
-			true
-			#else
-			#error false
-			#endif
-		EOF
-	fi
-}
-
-src_compile() {
-	emake OPTTEST="${OPTTEST}" LIBRARY_REL="$(get_libdir)" \
-		ARGON2_VERSION="0~${PV}"
-}
-
-src_test() {
-	emake OPTTEST="${OPTTEST}" test
-}
-
-src_install() {
-	emake OPTTEST="${OPTTEST}" DESTDIR="${ED}" LIBRARY_REL="$(get_libdir)" install
-	einstalldocs
-	doman man/argon2.1
-}
diff --git a/app-crypt/argon2/metadata.xml b/app-crypt/argon2/metadata.xml
deleted file mode 100644
index 8e07db2..0000000
--- a/app-crypt/argon2/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>simon-bgo@slevermann.de</email>
-		<name>Simon Levermann</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<longdescription>Argon2 is a password hashing tool and library that won the Password Hashing Competition (PHC)</longdescription>
-	<slots>
-		<subslots>Reflect ABI of libargon2.so.</subslots>
-	</slots>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:argon2_project:argon2</remote-id>
-		<remote-id type="github">P-H-C/phc-winner-argon2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-crypt/dieharder/metadata.xml b/app-crypt/dieharder/metadata.xml
index f1c3d59..115e9d6 100644
--- a/app-crypt/dieharder/metadata.xml
+++ b/app-crypt/dieharder/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/efitools/OWNERS b/app-crypt/efitools/OWNERS
new file mode 100644
index 0000000..0a11bc7
--- /dev/null
+++ b/app-crypt/efitools/OWNERS
@@ -0,0 +1 @@
+include chromiumos/owners:v1:/device/OWNERS.reven_boot
diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml
index c1f7c0b..ba25ee6 100644
--- a/app-crypt/efitools/metadata.xml
+++ b/app-crypt/efitools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index edb9198..9704490 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>k_f@gentoo.org</email>
-		<name>Kristian Fiskerstrand</name>
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
 	</maintainer>
-	<longdescription>
-	GnuPG is a complete and free implementation of the OpenPGP standard as
-	defined by RFC4880.
-	</longdescription>
 	<use>
 		<flag name="smartcard">
 		Build scdaemon software. Enables usage of OpenPGP cards. For
@@ -22,8 +18,8 @@
 		<flag name="usb">
 		Build direct CCID access for scdaemon; requires <pkg>dev-libs/libusb</pkg>.
 		</flag>
-		<flag name="mta">
-		Build mta support using <pkg>virtual/mta</pkg>.
+		<flag name="user-socket">
+		try a socket directory which is not removed by init manager at session end
 		</flag>
 		<flag name="tofu">
 		Enable support for Trust on First use trust model; requires <pkg>dev-db/sqlite</pkg>.
@@ -31,6 +27,9 @@
 		<flag name="tools">
 		Install extra tools (including gpgsplit and gpg-zip).
 		</flag>
+		<flag name="tpm">
+		Enable TPM support via <pkg>app-crypt/tpm2-tss</pkg> and build tpm2d.
+		</flag>
 		<flag name="wks-server">
 		Install the wks-server
 		</flag>
diff --git a/app-crypt/metadata.xml b/app-crypt/metadata.xml
deleted file mode 100644
index d508e60..0000000
--- a/app-crypt/metadata.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-crypt category contains cryptographic (encryption, decryption,
-		steganography and signing) software.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-crypt enhält kryptographische (Ver- und Entschlüsselung,
-		Steganographie, Signierung) Software.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-crypt contiene programas para criptografía
-		(cifrado, des-cifrado, estenografía y firmas). 
-	</longdescription>
-	<longdescription lang="ja">
-		app-cryptカテゴリには暗号手法ソフトウェア
-		(暗証化と復号化と電子透かしと電子署名)が含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De app-crypt categorie bevat cryptografische applicaties (encryptie,
-		decryptie, steganografie,...).
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-crypto chứa các ứng dụng về mật mã (mã hóa,
-		giải mã, kỷ tên và steganography).
-	</longdescription>
-	<longdescription lang="it">
-		La categoria app-crypt contiene programmi di crittografia (cifratura, decifratura, steganografia e firma).
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-crypt contém programas criptográficos (cifradores,
-		descifradores, esteganografia e assinaturas).
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-crypt zawiera programy kryptograficzne związane z
-		szyfrowaniem, deszyfrowaniem, stenografią oraz podpisywaniem danych.
-	</longdescription>
-</catmetadata>
-
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 10c3e37..fcb575f 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1 +1 @@
-DIST krb5-1.19.3.tar.gz 8741343 BLAKE2B 79e68237ee82affa85299060c509e303453c0fab965adc6b9ed305ab64a1f73bd51e65df1b3faadc60815cd506ffefaeed535765ca060d393a9141812f85b48a SHA512 18235440d6f7d8a72c5d7ca5cd8c6465e8adf091d85c483225c7b00d64b4688c1c7924cb800c2fc17e590b2709f1a9de48e6ec79f6debd11dcb7d6fa16c6f351
+DIST krb5-1.20.1.tar.gz 8661660 BLAKE2B ead16f8b1aec8bba3776628b74257c9aec891770c1fa6d5c5e66275db5f078ca59c9944cd2b017453b777ce080f8e5a322f735fab77691479cfad7b881b92830 SHA512 6f57479f13f107cd84f30de5c758eb6b9fc59171329c13e5da6073b806755f8d163eb7bd84767ea861ad6458ea0c9eeb00ee044d3bcad01ef136e9888564b6a2
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.20-missing-time-include.patch b/app-crypt/mit-krb5/files/mit-krb5-1.20-missing-time-include.patch
new file mode 100644
index 0000000..a8a4956
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.20-missing-time-include.patch
@@ -0,0 +1,20 @@
+https://github.com/krb5/krb5/commit/c3958cec43b598b25484b9805224c56f25f7a755
+https://bugs.gentoo.org/854561
+
+From: Greg Hudson <ghudson@mit.edu>
+Date: Tue, 29 Mar 2022 16:27:55 -0400
+Subject: [PATCH] Include time.h in kdb.h
+
+kdb.h uses time_t, and therefore must include <time.h> to ensure its
+definition.  Noticed when building t_sort_key_data.c on macOS.
+--- a/include/kdb.h
++++ b/include/kdb.h
+@@ -65,6 +65,7 @@
+ #ifndef KRB5_KDB5__
+ #define KRB5_KDB5__
+ 
++#include <time.h>
+ #include <krb5.h>
+ 
+ /* This version will be incremented when incompatible changes are made to the
+
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.20.1-autoconf-2.72.patch b/app-crypt/mit-krb5/files/mit-krb5-1.20.1-autoconf-2.72.patch
new file mode 100644
index 0000000..b55193b
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.20.1-autoconf-2.72.patch
@@ -0,0 +1,31 @@
+https://github.com/krb5/krb5/commit/d864d740d019fdf2c640460f2aa2760c7fa4d5e9
+
+From d864d740d019fdf2c640460f2aa2760c7fa4d5e9 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Thu, 17 Nov 2022 15:01:24 +0100
+Subject: [PATCH] Fix aclocal.m4 syntax error for autoconf 2.72
+
+An incorrect closure inside KRB5_AC_INET6 is innocuous with autoconf
+versions up to 2.71, but will cause an error at configure time with
+the forthcoming autoconf 2.72.
+
+[ghudson@mit.edu: added more context to commit message]
+
+ticket: 9077 (new)
+tags: pullup
+target_version: 1.20-next
+target_version: 1.19-next
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -409,8 +409,8 @@ else
+       [[struct sockaddr_in6 in;
+         AF_INET6;
+         IN6_IS_ADDR_LINKLOCAL(&in.sin6_addr);]])],
+-    [krb5_cv_inet6=yes], [krb5_cv_inet6=no])])
+-fi
++    [krb5_cv_inet6=yes], [krb5_cv_inet6=no])
++fi])
+ AC_MSG_RESULT($krb5_cv_inet6)
+ if test "$krb5_cv_inet6" = no && test "$ac_cv_func_inet_ntop" = yes; then
+ AC_MSG_CHECKING(for IPv6 compile-time support with -DINET6)
+
diff --git a/app-crypt/mit-krb5/metadata.xml b/app-crypt/mit-krb5/metadata.xml
index af3905a..53f75a3 100644
--- a/app-crypt/mit-krb5/metadata.xml
+++ b/app-crypt/mit-krb5/metadata.xml
@@ -12,11 +12,12 @@
     which depends on kerberos
   </flag>
   <flag name="keyutils">Enable for the keyring ccache using keyutils</flag>
-  <flag name="lmdb">Add support for using dev-db/lmdb for lookup tables</flag>
+  <flag name="lmdb">Add support for using <pkg>dev-db/lmdb</pkg> for lookup tables</flag>
   <flag name="pkinit">Enable pkinit support for the initial ticket</flag>
   <flag name="openldap">Enable support for ldap as a database backend</flag>
 </use>
 <upstream>
   <remote-id type="cpe">cpe:/a:mit:kerberos</remote-id>
+  <remote-id type="github">krb5/krb5</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.3-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.3-r2.ebuild
deleted file mode 100644
index 3e212d6..0000000
--- a/app-crypt/mit-krb5/mit-krb5-1.19.3-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="*"
-IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
-
-# some tests requires network access
-RESTRICT="test"
-
-DEPEND="
-	!!app-crypt/heimdal
-	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb:= )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
-	pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/yacc
-	cpu_flags_x86_aes? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-		dev-util/cmocka
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
-	"${FILESDIR}/${PN}_dont_create_rundir.patch"
-	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	default
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	AR="$(tc-getAR)" \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		$(use_with lmdb) \
-		$(use_with keyutils) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.20.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.20.1.ebuild
new file mode 100644
index 0000000..6fee9ac
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.20.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit autotools flag-o-matic python-any-r1 systemd toolchain-funcs multilib-minimal
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="*"
+IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb:= )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
+	pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? ( dev-util/cmocka )
+	"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_rundir.patch"
+	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
+	"${FILESDIR}/${PN}-1.20-missing-time-include.patch"
+	"${FILESDIR}/${PN}-1.20.1-autoconf-2.72.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# ChromeOS; Upstream PR: https://github.com/krb5/krb5/pull/1282
+	append-lfs-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	AR="$(tc-getAR)" \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/p11-kit/metadata.xml b/app-crypt/p11-kit/metadata.xml
index 21a9f71..ff17590 100644
--- a/app-crypt/p11-kit/metadata.xml
+++ b/app-crypt/p11-kit/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>zlogene@gentoo.org</email>
diff --git a/app-crypt/rhash/metadata.xml b/app-crypt/rhash/metadata.xml
index 90dd65a..95929f1 100644
--- a/app-crypt/rhash/metadata.xml
+++ b/app-crypt/rhash/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chewi@gentoo.org</email>
diff --git a/app-crypt/sbsigntools/OWNERS b/app-crypt/sbsigntools/OWNERS
new file mode 100644
index 0000000..0a11bc7
--- /dev/null
+++ b/app-crypt/sbsigntools/OWNERS
@@ -0,0 +1 @@
+include chromiumos/owners:v1:/device/OWNERS.reven_boot
diff --git a/app-crypt/sbsigntools/metadata.xml b/app-crypt/sbsigntools/metadata.xml
index 20001d6..ef5313d 100644
--- a/app-crypt/sbsigntools/metadata.xml
+++ b/app-crypt/sbsigntools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
diff --git a/app-doc/doxygen/OWNERS b/app-doc/doxygen/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-doc/doxygen/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild
index a59cc69..c531075 100644
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
diff --git a/app-doc/doxygen/metadata.xml b/app-doc/doxygen/metadata.xml
index bb9c3fb..bfe1416 100644
--- a/app-doc/doxygen/metadata.xml
+++ b/app-doc/doxygen/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
@@ -12,6 +12,9 @@
 		IDL (Corba and Microsoft flavors) and to some extent PHP, C#, and D,
 		as well as other languages (using additional helper tools).
 	</longdescription>
+	<upstream>
+		<remote-id type="github">doxygen/doxygen</remote-id>
+	</upstream>
 	<use>
 		<flag name="clang">support for <pkg>sys-devel/clang</pkg> assisted parsing</flag>
 		<flag name="dot">allow to create dot graphs using <pkg>media-gfx/graphviz</pkg></flag>
diff --git a/app-doc/xmltoman/Manifest b/app-doc/xmltoman/Manifest
index 609d5dc..cc8d650 100644
--- a/app-doc/xmltoman/Manifest
+++ b/app-doc/xmltoman/Manifest
@@ -1 +1,2 @@
-DIST xmltoman-0.4.tar.gz 15250 SHA256 948794a316aaecd13add60e17e476beae86644d066cb60171fc6b779f2df14b0 SHA512 347722731e2101ecd0619f88f4efdbca534810c96977a1281af685e8a61f4c1a826a71a9f0e3af43cc899936640787366a78077f36d23a9efcfeb789dbcfae22 WHIRLPOOL d55ac95434d0aa54bdb5f45dee7c4a6a7ce1467fb7a2165d08ddf2fc6a0bb6001c15b1db4edc21d8eb4791cac2a2fc32a5c83ad4b3c851216117d1d21f441838
+DIST xmltoman-0.4.tar.gz 15250 BLAKE2B d8641a19742d845fdab0e11703a60c16656c63529a4d86931a8038cbdb87e0fbf241b7ff38ed05ddab62daab608407bd5d7778c060fe3cbef1750976fa588dee SHA512 347722731e2101ecd0619f88f4efdbca534810c96977a1281af685e8a61f4c1a826a71a9f0e3af43cc899936640787366a78077f36d23a9efcfeb789dbcfae22
+DIST xmltoman-0.6.tar.gz 15862 BLAKE2B f33ebfb1dfdd0f055f18e68f923e96c07495740e361cec2ba7a10a63889b6b6c4c851f3df6b74947b24811403d2745dbdc7e5d2d67d3566ec65b7be6fae616c8 SHA512 f2b0689ca37212253eaa127c3a2c299facac7c3909991b8872da0adf0fbb34aa02c32144c485135c06c17b1ac5e5753d627969e97ae4938e6dcee9ddbd79582d
diff --git a/app-doc/xmltoman/OWNERS b/app-doc/xmltoman/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-doc/xmltoman/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-doc/xmltoman/files/xmltoman-0.6-generate-man-pages.patch b/app-doc/xmltoman/files/xmltoman-0.6-generate-man-pages.patch
new file mode 100644
index 0000000..a902ddd
--- /dev/null
+++ b/app-doc/xmltoman/files/xmltoman-0.6-generate-man-pages.patch
@@ -0,0 +1,55 @@
+From 39553c816cb8a18d798a6f947d2901f7a3228439 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 29 Oct 2022 18:02:25 +0100
+Subject: [PATCH] Generate man pages
+
+Generate the man pages so that the tool doesn't have to run itself
+during installation. It's a hack to workaround Perl upgrade problems.
+--- /dev/null
++++ b/xmlmantohtml.1
+@@ -0,0 +1,18 @@
++.TH xmlmantohtml 1 User Manuals
++.SH NAME
++xmlmantohtml \- xml to html converter
++.SH SYNOPSIS
++\fBxmlmantohtml \fIfile.1.xml\fB > file.1.html
++\f1
++.SH DESCRIPTION
++xmlmantohtml is a small script to convert XML/MAN(GROFF) to HTML.
++
++You will find the DTD in \fI/usr/share/xmltoman/\f1 on a Debian GNU/Linux system. There is also an XSL file to generate HTML using \fBxsltproc(1)\f1.
++.SH AUTHOR
++xmltoman was written by Oliver Kurth <oku@masqmail.cx>
++.SH MAINTAINER
++xmltoman is currently maintained by Adam Bilbrough
++.SH SEE ALSO
++\fBxmlmantohtml(1)\f1
++.SH COMMENTS
++This man page was written using \fBxmltoman(1)\f1 by the same author and / or maintainer.
+--- /dev/null
++++ b/xmltoman.1
+@@ -0,0 +1,24 @@
++.TH xmltoman 1 User Manuals
++.SH NAME
++xmltoman \- xml to man converter
++.SH SYNOPSIS
++\fBxmltoman \fIfile.1.xml\fB > file.1
++\f1
++.SH DESCRIPTION
++xmltoman is a small script to convert XML to a MAN page in GROFF format. It features the usual man page items such a description, options, see also etc. The XML format also supports converting to HTML pages.
++
++You will find the DTD in \fI/usr/share/xmltoman/\f1 on a Debian GNU/Linux system. There is also an XSL file to generate html using \fBxsltproc(1)\f1.
++.SH FILES
++\fI/usr/share/xmltoman/xmltoman.dtd\f1 the DTD file.
++
++\fI/usr/share/xmltoman/xmltoman.xsl\f1 XSLT stylesheet to generate HTML.
++
++\fI/usr/share/xmltoman/xmltoman.css\f1 stylesheet to be used for HTML.
++.SH AUTHOR
++xmltoman was written by Oliver Kurth <oku@masqmail.cx>
++.SH MAINTAINER
++xmltoman is currently maintained by Adam Bilbrough
++.SH SEE ALSO
++\fBxmlmantohtml(1)\f1
++.SH COMMENTS
++This man page was written using \fBxmltoman(1)\f1 by the same author and / or maintainer.
diff --git a/app-doc/xmltoman/metadata.xml b/app-doc/xmltoman/metadata.xml
index cb1280a..cdc9d05 100644
--- a/app-doc/xmltoman/metadata.xml
+++ b/app-doc/xmltoman/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">xmltoman</remote-id>
+		<remote-id type="github">atsb/xmltoman</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-doc/xmltoman/xmltoman-0.4.ebuild b/app-doc/xmltoman/xmltoman-0.4.ebuild
deleted file mode 100644
index b43aacf..0000000
--- a/app-doc/xmltoman/xmltoman-0.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Simple scripts for converting xml to groff or html"
-HOMEPAGE="http://sourceforge.net/projects/xmltoman/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/XML-Parser"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-	dodoc README
-	doman xmltoman.1 xmlmantohtml.1
-}
diff --git a/app-doc/xmltoman/xmltoman-0.6.ebuild b/app-doc/xmltoman/xmltoman-0.6.ebuild
new file mode 100644
index 0000000..b0950c0
--- /dev/null
+++ b/app-doc/xmltoman/xmltoman-0.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple scripts for converting xml to groff or html"
+HOMEPAGE="https://sourceforge.net/projects/xmltoman/"
+SRC_URI="https://github.com/atsb/xmltoman/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-generate-man-pages.patch
+)
+
+src_install() {
+	# 'make install' requires GNU install, upstream is dead and carrying
+	# a patch is more space than redoing it here
+	dobin xmltoman xmlmantohtml
+
+	insinto /usr/share/xmltoman
+	doins xmltoman.{css,dtd,xsl}
+
+	dodoc README
+	doman xmltoman.1 xmlmantohtml.1
+}
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
deleted file mode 100644
index 6cd67f1..0000000
--- a/app-editors/emacs/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST emacs-25.3-patches-1.tar.xz 1252 SHA256 a3edea3fa7f56bcf4dab3a86ac5af410639ab042ae7d7b8d19b2a6ae50d85d7c SHA512 09371a789a7c742b4e18f45a4c4e063a5392d0684899eb8be8c7415af9fe3c306083c62f18abc6a15c4fe76dd6ae3ac5c9b002c962971e59379cc187926a0c15 WHIRLPOOL 691593749e6df7c8d6a9bca0a792705e0b4ddba70f708b8a4a4b07c3c0f9dd7e2837cee345b99beee95fef6d3e096536e88feabf5168ae2a61c70a6c858128b8
-DIST emacs-25.3.tar.xz 42854740 SHA256 253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f WHIRLPOOL 603ec6b203523a22556e48616b4a5ab227c32d3653ac4b713e6cb0357e3556964bc92a1818b417bbf9037cca7dac55935da9458dc3d29b3bb24d66157e74c8df
-DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 BLAKE2B 0106fe8053b4f65f384d451ca85138991a57afaca16b32035585055bb877c039af826859fa58c4660ec80664d3bfb0ee7a757ad76381c150ebcb22cb333a98d6 SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6
-DIST emacs-18.59-patches-11.tar.xz 22032 BLAKE2B cfdb85aeefa7a71dfd0719de893e9ea3f7118baa0b8c5aa97b3800c1a5743e77d63c35ab1e4afb13c284f5c6dda522d1e2e37f8bfd9bbba052e543af7401565b SHA512 cac3f2efc8b3f18cdf43474453acc406c5b469ecc11955f8216083a4deced887aea4a73221aa36f0bc6b7480788606f969ee1df15a8932ee771fdf790e98c00c
-DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
-DIST emacs-23.4-patches-21.tar.xz 19604 BLAKE2B 97327f2079c496c28122203d233a12199a3c11a8c4efb2107247a4ca4483b898467d73d19d4f0570ec7be2a49dc5f6bd1bc9ee0811f932e7deb6b1c4ca96e362 SHA512 135eda432de64200797456d594f7de811275a7adf792d10a1c3a51ca4bbbbaa3a2c682b9fd577c4d93fbce967ca08d4ac47eb45f031477c3e44c69c14d5d5b48
-DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
-DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5
-DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66 SHA512 fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae
-DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
-DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf SHA512 f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
-DIST emacs-26.1-patches-1.tar.xz 1296 BLAKE2B 5e3cef3130b35a362d67f853686625d207e9af29ffb27753b6aa00327e30cc06b3cd7ed339b214b12fb00137654521c21e2252ecd83a79258bb9636406ab032c SHA512 6e4b0bdbf98d5130a6cd41fb0a8c3d641bf0b8d46f150d1f10f2d659e0418c14198d8990df13f3266437bb128f5fc7db8456458f5f547f2c12cc59da4fea3c8e
-DIST emacs-26.1-patches-2.tar.xz 2740 BLAKE2B 43a58137d6096fd6b49688192b65e97446cd31691b18c2e69c8980ff1d93caa66ff670f06456df91411fd74396deaa1899c7afb6c0a4bbc98d4c2d9bd7ed7d40 SHA512 31c1714d130a02692c65dd1371662100f9fbf33a8df30b8bad8fa688ab993e0a596101a4765a7859801d1f66e729c9fca748e70b9919e5b2a777d39fcbe92c21
-DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25d13ec5e0bee9ec6a65e80c52c870162b4671e80a82f8310784c802924609f2f87d504b1a97617c44d859566f SHA512 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2
diff --git a/app-editors/emacs/emacs-26.1-r3.ebuild b/app-editors/emacs/emacs-26.1-r3.ebuild
deleted file mode 100644
index ef00f90..0000000
--- a/app-editors/emacs/emacs-26.1-r3.ebuild
+++ /dev/null
@@ -1,391 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-KEYWORDS="*"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	X? (
-		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 )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-BDEPEND="virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-#	pax_kernel? ( sys-apps/attr )
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# 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%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	# Don't trigger a floating point exception for NaNs on alpha
-	use alpha && append-flags -mieee
-
-	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 X; then
-		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 m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	econf \
-		--program-suffix="-${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) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gpm) \
-		$(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() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}/usr/$(get_libdir)"
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use 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
-	;;; ${PN}-${SLOT} 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/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	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 aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	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 Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && 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\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
deleted file mode 100644
index c03b6b3..0000000
--- a/app-editors/emacs/metadata.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<longdescription>
-  GNU Emacs is an extensible, customizable text editor - and more. At its core
-  is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
-  with extensions to support text editing. The features of GNU Emacs include:
-   * Content-sensitive editing modes, including syntax coloring, for a variety
-     of file types including plain text, source code, and HTML.
-   * Complete built-in documentation, including a tutorial for new users.
-   * Full Unicode support for nearly all human languages and their scripts.
-   * Highly customizable, using Emacs Lisp code or a graphical interface.
-   * A large number of extensions that add other functionality, including a
-     project planner, mail and news reader, debugger interface, calendar, and
-     more. Many of these extensions are distributed with GNU Emacs; others are
-     available separately.
-</longdescription>
-<use>
-  <flag name="athena">Enable the MIT Athena widget set
-    (<pkg>x11-libs/libXaw</pkg>)</flag>
-  <flag name="dynamic-loading">Enable loading of dynamic libraries at
-    runtime</flag>
-  <flag name="games">Support shared score files for games</flag>
-  <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system
-    font name</flag>
-  <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file
-    notification</flag>
-  <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
-    system font name</flag>
-  <flag name="gtk2">Prefer version 2 of the GIMP Toolkit to version 3
-    (<pkg>x11-libs/gtk+</pkg>)</flag>
-  <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2
-    (<pkg>x11-libs/gtk+</pkg>)</flag>
-  <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
-  <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
-    processing</flag>
-  <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
-    of the internal Lisp implementations</flag>
-  <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
-    instead of the internal movemail substitute</flag>
-  <flag name="source">Install C source files and make them available for
-    find-function</flag>
-  <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
-    preference to Emacs' own scrollbars</flag>
-  <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
-    This option has an effect only on architectures where "long" and
-    "long long" types have different size.</flag>
-  <flag name="xwidgets">Enable use of GTK widgets in Emacs buffers
-    (requires GTK3)</flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
deleted file mode 100644
index 8bb2678..0000000
--- a/app-editors/joe/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST joe-4.6.tar.gz 1895046 BLAKE2B fbf53d3b5b066cb32bb26b08d7d314a3bb89ac5ae22db498cdf3597bf8cb322bd9aa05543debd47ac7380a33982c388e13f38c60747503494c582393ae8eb13d SHA512 3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82
diff --git a/app-editors/joe/files/joe-4.3-tinfo.patch b/app-editors/joe/files/joe-4.3-tinfo.patch
deleted file mode 100644
index fd259e1..0000000
--- a/app-editors/joe/files/joe-4.3-tinfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Lars Wendler <polynomial-c@gentoo.org>
-# Date 1473084371 -7200
-#      Mon Sep 05 16:06:11 2016 +0200
-# Node ID ae8afbceeed4e446a63ad3111291a98d1390ade2
-# Parent  57c0a14aedcb8eef82d5828721b55aac02847ee7
-configure.ac: search for ncurses' tinfo library if available
-
-ncurses can be built to split out the lowlevel terminfo library
-from ncurses library. In this case there's a libtinfo.so file
-alongside the usual libncurses*.so files.
-This patch adds tinfo to AC_SEARCH_LIBS when ncurses support
-is enabled. Without this patch configure silently fails to find
-tgetflag and thus does not link to ncurses at all.
-I've tested this change on both, ncurses with separate tinfo lib
-and ncurses without separate tinfo lib and in both cases joe
-successfully links against ncurses.
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -39,7 +39,7 @@
- 	curses=$enableval, curses=yes)
- 
- if test "$curses" = "yes"; then
--	search_libs="ncurses curses"
-+	search_libs="tinfo ncurses curses"
- fi
- 
- AC_ARG_ENABLE(termcap,
diff --git a/app-editors/joe/files/joe-4.6-db.patch b/app-editors/joe/files/joe-4.6-db.patch
deleted file mode 100644
index 6270e90..0000000
--- a/app-editors/joe/files/joe-4.6-db.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/desktop/Makefile.am	2018-01-15 12:01:12.624449958 +0100
-+++ b/desktop/Makefile.am	2018-01-15 12:01:38.964448343 +0100
-@@ -1,8 +1,2 @@
- desktopdir = $(datarootdir)/applications
- dist_desktop_DATA = joe.desktop jmacs.desktop jstar.desktop jpico.desktop
--
--update-databases:
--	-update-desktop-database $(desktopdir)
--
--install-data-hook: update-databases
--uninstall-hook: update-databases
diff --git a/app-editors/joe/joe-4.6.ebuild b/app-editors/joe/joe-4.6.ebuild
deleted file mode 100644
index 78c6d65..0000000
--- a/app-editors/joe/joe-4.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils
-
-DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
-HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
-SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
-
-LICENSE="GPL-1+ CC-BY-3.0"
-SLOT="0"
-KEYWORDS="*"
-IUSE="xterm"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0="
-RDEPEND="${DEPEND}
-	xterm? ( >=x11-terms/xterm-239 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3-tinfo.patch"
-	"${FILESDIR}/${P}-db.patch"
-)
-
-DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
-
-src_prepare() {
-	default
-	# Enable xterm mouse support in the rc files
-	if use xterm; then
-		pushd "${S}"/rc &>/dev/null || die
-		local i
-		for i in *rc*.in; do
-			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die
-		done
-		popd &>/dev/null
-	fi
-	eautoreconf
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-	if use xterm; then
-		elog "To enable full xterm clipboard you need to set the allowWindowOps"
-		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
-		elog "This is false by default due to potential security problems on some"
-		elog "architectures (see bug #91453)."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-editors/joe/metadata.xml b/app-editors/joe/metadata.xml
deleted file mode 100644
index 9fd1399..0000000
--- a/app-editors/joe/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-            <email>amynka@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>emacs@gentoo.org</email>
-  <name>Gentoo Emacs project</name>
-</maintainer>
-<longdescription>
-  JOE (Joe's own editor) has the feel of most IBM PC text editors: The
-  key-sequences are reminiscent of WordStar and Turbo-C. JOE is much more
-  powerful than those editors, however. JOE has all of the features a UNIX
-  user should expect: full use of termcap/terminfo, excellent screen update
-  optimizations, simple installation, and all of the UNIX-integration features
-  of VI.
-</longdescription> 
-<use>
-  <flag name="xterm">Enable full xterm clipboard support</flag>
-</use>
-<upstream>
-  <remote-id type="sourceforge">joe-editor</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/app-editors/metadata.xml b/app-editors/metadata.xml
index 195f875..f6c1510 100644
--- a/app-editors/metadata.xml
+++ b/app-editors/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <catmetadata>
 	<longdescription lang="en">
 		The app-editors category contains text editors.
@@ -29,4 +29,3 @@
 		Kategoria app-editors zawiera edytory tekstu.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 59d6aa4..c5b73d5 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,3 +1,3 @@
-DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4662d5b9fc585bd0e2dfe78f8e8c71354e1a5bbf043ca99e0a69742df7846656d1f0706af79bcbfc53b6d1a6 SHA512 e27ca4411472409bd6ff8d812405e4d8aa869c1348c0a6adbb1c538fb5bdd112b322ef6d8a13df0b43c472d925b94111ac676d03f360d79181dee335a4fd09cf
-DIST nano-5.7.tar.gz 2989413 BLAKE2B 604f3140bd963661bb7d13933b5bac867bcfd90635287dc8f160e4bda094641c20f2fe2157fe1b5eda28842f78c4e651a354ed6edcafe67b4f2bf6c9eda0051c SHA512 f6d580918c488b15a5f8f77b4b52ea3e86535c251fe32dd978bae014bcadd543a5696f7741018ffd05b6271c1defe6a67687577f3cfe059ed2b4d3e422b2a694
-DIST nano-5.8.tar.gz 3038948 BLAKE2B 126976539e8ab3a7be986edc7422bc58d31e0c81dffbf34c9b701d09d268233ed0de4f07ac8d2dd0963b768cce4e2afe89a4f8ed9fd216a71ebac98c7f403deb SHA512 dd3a7e328f256052707c4d28f2ca32f9e44de123e3dee3c0747fbab222d215b2a895c403b9274fd286e19477b8be3314fc83167eec32194370105b1e70c05a3f
+DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4
+DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3
+DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b
diff --git a/app-editors/nano/files/gentoo.nanorc b/app-editors/nano/files/gentoo.nanorc
new file mode 100644
index 0000000..edf4ae1
--- /dev/null
+++ b/app-editors/nano/files/gentoo.nanorc
@@ -0,0 +1,74 @@
+## Syntax highlighting for Gentoo ebuilds/eclasses,
+## and (further down) for Portage control files.
+
+syntax ebuild "\.e(build|class)$"
+comment "#"
+
+## All the standard portage functions:
+color brightgreen "(^|\<default_)src_(unpack|prepare|configure|compile|install|test)\>"
+color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>"
+color brightgreen "\<default(_pkg_nofetch|_src_(unpack|prepare|configure|compile|test))?\>"
+## Bash-related syntax:
+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
+color green "\<(declare|eval|exec|export|let|local)\>"
+color green "[][{}():;|`$<>!=&\]"
+color green "-[defhnrsuwxzL]\>"
+color green "-(eq|ne|gt|lt|ge|le)\>"
+## Variables... official portage ones in red, all others in bright red:
+color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
+color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
+color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BIPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
+color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|(B|E|E?SYS)?ROOT|WORKDIR)\>"
+color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>"
+color red "\<EBUILD_PHASE(_FUNC)?\>"
+color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>"
+color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AT_M4DIR\>"
+## Portage commands:
+color magenta "\<(use(_(with|enable|if_iuse)|x)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*"
+color brightblue "\<e(apply(_user)?|begin|end|conf|install|make|ninja|qmake5|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
+color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
+color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<get_libdir\>" "\<ver_(cut|rs|test)\>" "\<version_is_at_least\>"
+color brightblue "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
+color brightblue "\<(die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\>" "\<(has|best)_version\>"
+color brightblue "\<(do|new)(ins|s?bin|doc|header|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
+color brightblue "\<do(compress|dir|html|mo|strip|sym)\>" "\<keepdir\>"
+color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a)|man|strip)\>"
+color brightblue "\<(doc|ins|exe)?into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|LD|NM|OBJCOPY|PKG_CONFIG|RANLIB)\>"
+color brightblue "\<tc-(arch(-kernel)?|export|has-(tls|openmp)|is-cross-compiler)\>"
+## Common commands used in ebuilds:
+color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
+## Comments (doesn't work that well):
+color yellow "(^|[[:space:]])#.*"
+## Strings (doesn't work that well):
+color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
+## Mixed whitespace is also bad.
+color ,green " 	"
+
+
+syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
+comment "#"
+
+## Base text:
+color green ".+"
+## Likely version and slot numbers:
+color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)"
+color magenta ":[^[:space:]]+([[:space:]]|$)"
+## Use flags (must come after version/slot):
+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 "[[:space:]][*~-]?\*"
+## Categories:
+color cyan "^[[:space:]]*[^/]*/"
+## Masking regulators:
+color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)"
+## Comments:
+color yellow "#.*"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
+## Mixed whitespace is also bad.
+color ,green " 	"
diff --git a/app-editors/nano/files/gentoo.nanorc-r1 b/app-editors/nano/files/gentoo.nanorc-r1
new file mode 100644
index 0000000..2676777
--- /dev/null
+++ b/app-editors/nano/files/gentoo.nanorc-r1
@@ -0,0 +1,98 @@
+## Syntax highlighting for Gentoo ebuilds/eclasses,
+## and (further down) for Portage control files.
+
+syntax ebuild "\.e(build|class)$"
+comment "#"
+
+linter bash -n
+
+## All the standard portage functions:
+color brightgreen "(^|\<default_)src_(unpack|prepare|configure|compile|install|test)\>"
+color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>"
+color brightgreen "\<default(_pkg_nofetch|_src_(unpack|prepare|configure|compile|test))?\>"
+## Bash-related syntax:
+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
+color green "\<(declare|eval|exec|export|let|local)\>"
+color green "[][{}():;|`$<>!=&\]"
+color green "-[defhnrsuwxzL]\>"
+color green "-(eq|ne|gt|lt|ge|le|ef|ot|nt)\>"
+
+## Variables... official portage ones in red, all others in bright red:
+color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
+color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
+color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BIPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
+color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|(B|E|E?SYS)?ROOT|WORKDIR)\>"
+color red "\<(T|TMPDIR|HOME)\>"
+color red "\<(AS|C(PP|XX)?|FF|GO|LD|RUST)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>"
+color red "\<EBUILD_PHASE(_FUNC)?\>"
+color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>"
+color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AUTOTOOLS_(AUTO_)?DEPEND\>" "\<AM_OPTS\>" "\<AT_(NOEAUTOHEADER|NOEAUTOMAKE|NOELIBTOOLIZE|M4DIR)\>"
+color red "\<ECONF_SOURCE\>"
+
+## Portage commands:
+color magenta "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*"
+color brightblue "\<e(apply(_user)?|begin|end|conf|install(docs)?|make|ninja|qmake5|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
+color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
+color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<get_libdir\>" "\<ver_(cut|rs|test)\>" "\<version_is_at_least\>"
+color brightblue "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
+color brightblue "\<(assert|die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse)\>" "\<(has|best)_version\>"
+color brightblue "\<(do|new)(ins|s?bin|doc|header|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
+color brightblue "\<do(compress|dir|html|mo|strip|sym)\>" "\<keepdir\>"
+color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a)|man|strip)\>"
+color brightblue "\<(doc|ins|exe)?into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+color brightblue "\<add(read|write|predict|deny)\>"
+### common eclasses
+color brightblue "\<edo(b)?\>"
+### flag-o-matic.eclass, toolchain-funcs.eclass
+color brightblue "\<(all-flag-vars)\>"
+color brightblue "\<(filter-(flags|lfs-flags|lto|mfpmath))\>"
+color brightblue "\<strip-flags\>"
+color brightblue "\<append-(cpp|c|cxx|f|lfs|ld)flags\>"
+color brightblue "\<replace-flags\>" "\<replace-cpu-flags\>"
+color brightblue "\<is-(ld?)flagq?\>"
+color brightblue "\<(append-atomic-flags|no-as-needed|raw-ldflags|append-libs|replace-sparc64-flags|get-flag|strip-unsupported-flags)\>"
+color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|DLLWRAP|F77|FC|GCJ|GO|LD|STRINGS|STRIP|NM|OBJCOPY|OBJDUMP|PKG_CONFIG|RANLIB|RC|READELF)\>"
+color brightblue "\<test-flag(s)?-(CC|CXX|F77|FC|CCLD)\>"
+color brightblue "\<tc-ld-(is-(gold|lld)|disable-gold|force-bfd)\>"
+color brightblue "\<tc-(arch(-kernel)?|check-openmp|export|has-(tls|openmp)|is-cross-compiler)\>"
+color brightblue "\<tc-is-(clang|gcc)\>"
+color brightblue "\<(clang|gcc)-(fullversion|(major-|minor|micro-)version)\>"
+### debugging
+color brightblue "\<debug-print(-function|-section)\>"
+
+## Common commands used in ebuilds:
+color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
+## Comments (doesn't work that well):
+color yellow "(^|[[:space:]])#.*"
+## Strings (doesn't work that well):
+color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
+## Mixed whitespace is also bad.
+color ,green " 	"
+
+
+syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
+comment "#"
+
+## Base text:
+color green ".+"
+## Likely version and slot numbers:
+color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)"
+color magenta ":[^[:space:]]+([[:space:]]|$)"
+## Use flags (must come after version/slot):
+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 "[[:space:]][*~-]?\*"
+## Categories:
+color cyan "^[[:space:]]*[^/]*/"
+## Masking regulators:
+color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)"
+## Comments:
+color yellow "#.*"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
+## Mixed whitespace is also bad.
+color ,green " 	"
diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml
index add7f71..f0ba3c2 100644
--- a/app-editors/nano/metadata.xml
+++ b/app-editors/nano/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-</maintainer>
-<longdescription>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription>
 GNU nano - an enhanced clone of the Pico text editor.
 
 The nano project was started because of a few "problems" with the
@@ -21,22 +21,22 @@
 nano aims to solve these problems by emulating the functionality of
 Pico as closely as possible while addressing the problems above and
 perhaps providing other extra functionality.
-</longdescription>
-<use>
- <flag name="justify">Enable justify/unjustify functions for text formatting.</flag>
- <flag name="debug">
-  Enable debug messages and assert warnings.  Note that these will all be sent
-  straight to stderr rather than some logging facility.
- </flag>
- <flag name="magic">
-  Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting
- </flag>
- <flag name="minimal">
-  Disable all fancy features, including ones that otherwise have a dedicated
-  USE flag (such as spelling).
- </flag>
- <flag name="split-usr">
-  Enable this if /bin and /usr/bin are separate directories
- </flag>
-</use>
+	</longdescription>
+	<use>
+		<flag name="justify">Enable justify/unjustify functions for text formatting.</flag>
+		<flag name="debug">
+			Enable debug messages and assert warnings.  Note that these will all be sent
+			straight to stderr rather than some logging facility.
+		</flag>
+		<flag name="magic">
+			Add magic file support (<pkg>sys-apps/file</pkg>) to automatically detect appropriate syntax highlighting
+		</flag>
+		<flag name="minimal">
+			Disable all fancy features, including ones that otherwise have a dedicated
+			USE flag (such as spelling).
+		</flag>
+		<flag name="split-usr">
+			Enable this if /bin and /usr/bin are separate directories
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-editors/nano/nano-5.6.1.ebuild b/app-editors/nano/nano-5.6.1.ebuild
deleted file mode 100644
index 46f555e..0000000
--- a/app-editors/nano/nano-5.6.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="*"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-6.4.ebuild b/app-editors/nano/nano-6.4.ebuild
new file mode 100644
index 0000000..dc81580
--- /dev/null
+++ b/app-editors/nano/nano-6.4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
+	inherit autotools git-r3
+else
+	MY_P="${PN}-${PV/_}"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
+	KEYWORDS="*"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
+
+LIB_DEPEND="
+	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
+	sys-libs/ncurses:=[static-libs(+)]
+	magic? ( sys-apps/file[static-libs(+)] )
+	nls? ( virtual/libintl )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	magic? ( !minimal )
+"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local myconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir=/trash
+		$(use_enable !minimal color)
+		$(use_enable !minimal multibuffer)
+		$(use_enable !minimal nanorc)
+		$(use_enable magic libmagic)
+		$(use_enable spell speller)
+		$(use_enable justify)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable unicode utf8)
+		$(use_enable minimal tiny)
+	)
+
+	econf "${myconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Don't use "${ED}" here or things break (#654534)
+	rm -r "${D}"/trash || die
+
+	dodoc doc/sample.nanorc
+	docinto html
+	dodoc doc/faq.html
+	insinto /etc
+	newins doc/sample.nanorc nanorc
+
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+
+		# Since nano-5.0 these are no longer being "enabled" by default
+		# (bug #736848)
+		local rcdir="/usr/share/nano"
+		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+		rmdir "${ED}"${rcdir}/extra || die
+
+		insinto "${rcdir}"
+		newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc
+	fi
+
+	use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
+
+pkg_postrm() {
+	[[ -n ${REPLACED_BY_VERSION} ]] && return
+
+	local e
+	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
+	if [[ ${e##*/} == nano ]]; then
+		ewarn "The EDITOR variable is still set to ${e}."
+		ewarn "You can update it with \"eselect editor\"."
+	fi
+}
diff --git a/app-editors/qemacs/OWNERS b/app-editors/qemacs/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-editors/qemacs/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-editors/qemacs/metadata.xml b/app-editors/qemacs/metadata.xml
index a725e27..579725d 100644
--- a/app-editors/qemacs/metadata.xml
+++ b/app-editors/qemacs/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
   <email>emacs@gentoo.org</email>
@@ -35,4 +35,7 @@
    * Small! Full version is about 150KB. Smaller custom versions can be built
      by removing modules.
 </longdescription>
+<upstream>
+  <remote-id type="savannah-nongnu">qemacs</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
deleted file mode 100644
index ca19f69..0000000
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST emacs-common-gentoo-1.5.tar.xz 40844 SHA256 fbec52de8552c6b22f56382a28d469d9346c02c7569c05cdb0db6a54b39995a1 SHA512 61ac2a1bb8bc449480137789f4d93228d81d2a7ea87a255a7fd82072ce98eecf5f585d102db95f0deda06102e27efbd5d9fce8cd21d6b58239f7a2b6d4ee4d55 WHIRLPOOL bb6d58d8afb55c9d6204f82553962190cd50f64d25ea5fb50308827f88ea3b1c42dc0e072155567391ffc7745b8871c733c9aee5042b57bfcbef5e5419d0b6cf
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild
deleted file mode 100644
index 9e91265..0000000
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.10 2015/04/17 10:40:33 zlogene Exp $
-
-EAPI=5
-
-inherit elisp-common eutils fdo-mime gnome2-utils readme.gentoo user
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="http://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="*"
-IUSE="games X"
-
-PDEPEND="virtual/emacs"
-
-pkg_setup() {
-	use games && enewgroup gamestat 36
-}
-
-src_install() {
-	insinto "${SITELISP}"
-	doins subdirs.el
-	newins site-gentoo.el{,.orig}
-
-	keepdir /etc/emacs
-	insinto /etc/emacs
-	doins site-start.el
-
-	if use games; then
-		keepdir /var/games/emacs
-		fowners 0:gamestat /var/games/emacs
-		fperms g+w /var/games/emacs
-	fi
-
-	if use X; then
-		local i
-		domenu emacs.desktop emacsclient.desktop || die
-
-		pushd icons || die
-		newicon sink.png emacs-sink.png
-		newicon emacs_48.png emacs.png
-		newicon emacs22_48.png emacs22.png
-		for i in 16 24 32 48 128; do
-			newicon -s ${i} emacs_${i}.png emacs.png
-		done
-		for i in 16 24 32 48; do
-			newicon -s ${i} emacs22_${i}.png emacs22.png
-		done
-		doicon -s scalable emacs.svg
-		popd
-
-		gnome2_icon_savelist
-	fi
-
-	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
-		added to ${SITELISP}/site-gentoo.el. In order for this site
-		initialisation to be loaded for all users automatically, a default
-		site startup file /etc/emacs/site-start.el is installed. You are
-		responsible for maintenance of this file.
-		\n\nAlternatively, individual users can add the following command:
-		\n\n(require 'site-gentoo)
-		\n\nto their ~/.emacs initialisation files, or, for greater
-		flexibility, users may load single package-specific initialisation
-		files from the ${SITELISP}/site-gentoo.d/ directory."
-	readme.gentoo_create_doc
-}
-
-site-start-modified-p() {
-	case $(cksum <"${EROOT}${SITELISP}/site-start.el") in
-		# checksums of auto-generated site-start.el files
-		"2098727038 349") return 1 ;;	# elisp-common.eclass
-		"3626264063 355") return 1 ;;	# emacs-common-gentoo-1.0 (cvs rev 1.1)
-		"3738455534 394") return 1 ;;	# emacs-common-gentoo-1.0 (cvs rev 1.6)
-		"4199862847 394") return 1 ;;	# emacs-common-gentoo-1.1
-		"2547348044 394") return 1 ;;	# emacs-common-gentoo-1.2
-		"2214952934 397") return 1 ;;	# emacs-common-gentoo-1.2-r1
-		"3917799317 397") return 1 ;;	# emacs-common-gentoo-1.2-r2
-		*) return 0 ;;
-	esac
-}
-
-pkg_preinst() {
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	if [[ ! -d ${EROOT}${SITELISP} ]]; then
-		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
-	else
-		elisp-site-regen
-		rm "${ED}${SITELISP}/site-gentoo.el.orig" || die
-		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
-	fi
-
-	if use games; then
-		local f
-		for f in /var/games/emacs/{snake,tetris}-scores; do
-			if [[ -e ${EROOT}${f} ]]; then
-				cp "${EROOT}${f}" "${ED}${f}" || die
-			elif [[ -e ${EROOT}/var/lib${f#/var} ]]; then
-				# backwards compatibility
-				cp "${EROOT}/var/lib${f#/var}" "${ED}${f}" || die
-			fi
-			touch "${ED}${f}" || die
-			chgrp gamestat "${ED}${f}" || die
-			chmod g+w "${ED}${f}" || die
-		done
-
-		if [[ -d ${EROOT}/var/games && -z $(find "${EROOT}"/var/games \
-				-maxdepth 0 -uid 0 -gid 0 -perm 755 -print) ]]; then
-			chown 0:0 "${EROOT}"/var/games || die
-			chmod 755 "${EROOT}"/var/games || die
-		fi
-		if has 1.4-r1 ${REPLACING_VERSIONS} \
-				&& [[ -d ${EROOT}/var/games/emacs ]]; then
-			elog "Updating owner and permissions of score file directory."
-			chown 0:gamestat "${EROOT}"/var/games/emacs || die
-			chmod 775 "${EROOT}"/var/games/emacs || die
-		fi
-	fi
-
-	if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then
-		ewarn "The location of the site startup file for Emacs has changed to"
-		ewarn "/etc/emacs/site-start.el."
-		if site-start-modified-p; then
-			eerror "Locally modified ${SITELISP}/site-start.el file found."
-			eerror "If this file contains your own customisation, you should"
-			eerror "move it to /etc/emacs/. In any case, you must remove the"
-			eerror "file from the old location."
-			die "Cannot continue unless ${SITELISP}/site-start.el is removed."
-		else
-			ewarn "Removing the old ${SITELISP}/site-start.el file."
-			rm -f "${EROOT}${SITELISP}/site-start.el"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	if use X; then
-		fdo-mime_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common-gentoo/metadata.xml
deleted file mode 100644
index dce5920..0000000
--- a/app-emacs/emacs-common-gentoo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-<use>
-  <flag name='games'>Support shared score files for games</flag>
-</use>
-</pkgmetadata>
diff --git a/app-emacs/metadata.xml b/app-emacs/metadata.xml
deleted file mode 100644
index f19199d..0000000
--- a/app-emacs/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-emacs category contains extension packages for the Emacs text
-		editor.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-emacs enthält Pakete für den Texteditor Emacs.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-emacs contiene paquetes de extensión para el editor
-		de texto Emacs.
-	</longdescription>
-	<longdescription lang="ja">
-		app-emacsカテゴリにはEmacsテキストエディタに関連した
-		拡張パッケージが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De app-emacs categorie bevat extensies voor Emacs.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-emacs chứa các gói mở rộng cho trình soạn
-		thảo văn bản Emacs.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria app-emacs contiene pacchetti di estensioni per l'editor di testo Emacs.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-emacs contém pacotes de extensão para o editor de
-		texto Emacs.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-emacs zawiera pakiety związane z edytorem tekstu Emacs.
-	</longdescription>
-</catmetadata>
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 2157b27..1ac39b0 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1 +1 @@
-DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
+DIST qemu-6.2.0.tar.xz 115667324 BLAKE2B 3f2f02e5c36113df6231a9474c6d5db774e541312173813c28f578d669a51f391695d364dc806f5906d9e3c2796bb20b2606fcd46a247eb751ea517de9d7ce15 SHA512 e9f8231c9e1cfcc41cb47f10a55d63f6b8aee307af00cf6acf64acb7aa4f49fa7e9d6330703a2abea15d8b7bbaba7d3cb08c83edd98d82642367b527df730817
diff --git a/app-emulation/qemu/files/65-kvm.rules-r1 b/app-emulation/qemu/files/65-kvm.rules-r1
deleted file mode 100644
index ab3776a..0000000
--- a/app-emulation/qemu/files/65-kvm.rules-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
-KERNEL=="vhost-net", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-net"
diff --git a/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch b/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch
deleted file mode 100644
index 33115f1..0000000
--- a/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch
+++ /dev/null
@@ -1,40 +0,0 @@
--Wall -Wextra compains about unused arguments,
-causes safe-stack to be mis-detected.
---- a/configure
-+++ b/configure
-@@ -2293,7 +2293,7 @@ fi
- cat > $TMPC << EOF
- #include <stdint.h>
- #include <stdio.h>
--int main(int argc, char *argv[]) {
-+int main(void) {
-     return printf("%zu", SIZE_MAX);
- }
- EOF
-@@ -4911,7 +4911,7 @@ fi
- 
- if test "$safe_stack" = "yes"; then
- cat > $TMPC << EOF
--int main(int argc, char *argv[])
-+int main(void)
- {
- #if ! __has_feature(safe_stack)
- #error SafeStack Disabled
-@@ -4933,7 +4933,7 @@ EOF
-   fi
- else
- cat > $TMPC << EOF
--int main(int argc, char *argv[])
-+int main(void)
- {
- #if defined(__has_feature)
- #if __has_feature(safe_stack)
-@@ -5283,7 +5283,7 @@ static const int Z = 1;
- #define TAUT(X) ((X) == Z)
- #define PAREN(X, Y) (X == Y)
- #define ID(X) (X)
--int main(int argc, char *argv[])
-+int main(void)
- {
-     int x = 0, y = 0;
-     x = ID(x);
diff --git a/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch b/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch
deleted file mode 100644
index 679a9f3..0000000
--- a/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix CFLAGS=-Og build break. -Og fails because gcc does not enable dead
-code elimination (but does set __OPTIMIZE__ define).
-
-The fix avoids DCE reliance downstream entirely.
-
-Reported-by: Luke-Jr
-Bug: https://bugs.gentoo.org/782364
---- a/include/qemu/lockable.h
-+++ b/include/qemu/lockable.h
-@@ -28,7 +28,7 @@ struct QemuLockable {
-  * to QEMU_MAKE_LOCKABLE.  For optimized builds, we can rely on dead-code elimination
-  * from the compiler, and give the errors already at link time.
-  */
--#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__)
-+#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__) && defined(VALIDATE_LOCKS_VIA_DCE)
- void unknown_lock_type(void *);
- #else
- static inline void unknown_lock_type(void *unused)
diff --git a/app-emulation/qemu/files/qemu-5.2.0-fix-firmware-path.patch b/app-emulation/qemu/files/qemu-5.2.0-fix-firmware-path.patch
deleted file mode 100644
index 5396983..0000000
--- a/app-emulation/qemu/files/qemu-5.2.0-fix-firmware-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Se absolute filename in files like
-    /usr/share/qemu/firmware/50-edk2-x86_64-secure.json
-
-Bug: https://bugs.gentoo.org/766743
-Patch-by: Jannik Glückert
---- a/pc-bios/descriptors/meson.build
-+++ b/pc-bios/descriptors/meson.build
-@@ -8,7 +8,7 @@ foreach f: [
- ]
-   configure_file(input: files(f),
-                  output: f,
--                 configuration: {'DATADIR': qemu_datadir},
-+                 configuration: {'DATADIR': get_option('prefix') / qemu_datadir},
-                  install: get_option('install_blobs'),
-                  install_dir: qemu_datadir / 'firmware')
- endforeach
diff --git a/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch b/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch
deleted file mode 100644
index f47a587..0000000
--- a/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From bbd2d5a8120771ec59b86a80a1f51884e0a26e53 Mon Sep 17 00:00:00 2001
-From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Date: Mon, 14 Dec 2020 16:09:38 +0100
-Subject: [PATCH] build: -no-pie is no functional linker flag
-
-Recent binutils changes dropping unsupported options [1] caused a build
-issue in regard to the optionroms.
-
-  ld -m elf_i386 -T /<<PKGBUILDDIR>>/pc-bios/optionrom//flat.lds -no-pie \
-    -s -o multiboot.img multiboot.o
-  ld.bfd: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?)
-
-This isn't really a regression in ld.bfd, filing the bug upstream
-revealed that this never worked as a ld flag [2] - in fact it seems we
-were by accident setting --nmagic).
-
-Since it never had the wanted effect this usage of LDFLAGS_NOPIE, should be
-droppable without any effect. This also is the only use-case of LDFLAGS_NOPIE
-in .mak, therefore we can also remove it from being added there.
-
-[1]: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=983d925d
-[2]: https://sourceware.org/bugzilla/show_bug.cgi?id=27050#c5
-
-Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Message-Id: <20201214150938.1297512-1-christian.ehrhardt@canonical.com>
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
----
- configure                  | 3 ---
- pc-bios/optionrom/Makefile | 1 -
- 2 files changed, 4 deletions(-)
-
---- a/configure
-+++ b/configure
-@@ -2137,7 +2137,6 @@ EOF
- # Check we support --no-pie first; we will need this for building ROMs.
- if compile_prog "-Werror -fno-pie" "-no-pie"; then
-   CFLAGS_NOPIE="-fno-pie"
--  LDFLAGS_NOPIE="-no-pie"
- fi
- 
- if test "$static" = "yes"; then
-@@ -2153,7 +2152,6 @@ if test "$static" = "yes"; then
-   fi
- elif test "$pie" = "no"; then
-   CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS"
--  CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS"
- elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
-   CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS"
-   CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS"
-@@ -6714,7 +6712,6 @@ echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak
- echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
- echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
- echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
--echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
- echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
- echo "EXESUF=$EXESUF" >> $config_host_mak
- echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak
-diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
-index 084fc10f05..30771f8d17 100644
---- a/pc-bios/optionrom/Makefile
-+++ b/pc-bios/optionrom/Makefile
-@@ -41,7 +41,6 @@ override CFLAGS += $(call cc-option, $(Wa)-32)
- 
- LD_I386_EMULATION ?= elf_i386
- override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds
--override LDFLAGS += $(LDFLAGS_NOPIE)
- 
- all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin
- 
--- 
-2.30.0
-
diff --git a/app-emulation/qemu/files/qemu-5.2.0-strings.patch b/app-emulation/qemu/files/qemu-5.2.0-strings.patch
deleted file mode 100644
index 0b3dcdc..0000000
--- a/app-emulation/qemu/files/qemu-5.2.0-strings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/759310
---- a/configure
-+++ b/configure
-@@ -521,6 +521,7 @@ ld="${LD-${cross_prefix}ld}"
- ranlib="${RANLIB-${cross_prefix}ranlib}"
- nm="${NM-${cross_prefix}nm}"
- strip="${STRIP-${cross_prefix}strip}"
-+strings="${STRINGS-${cross_prefix}strings}"
- windres="${WINDRES-${cross_prefix}windres}"
- pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
- query_pkg_config() {
-@@ -2265,9 +2266,9 @@ int main(int argc, char *argv[]) {
- EOF
- 
- if compile_object ; then
--    if strings -a $TMPO | grep -q BiGeNdIaN ; then
-+    if $strings -a $TMPO | grep -q BiGeNdIaN ; then
-         bigendian="yes"
--    elif strings -a $TMPO | grep -q LiTtLeEnDiAn ; then
-+    elif $strings -a $TMPO | grep -q LiTtLeEnDiAn ; then
-         bigendian="no"
-     else
-         echo big/little test failed
diff --git a/app-emulation/qemu/files/qemu-6.0.0-make.patch b/app-emulation/qemu/files/qemu-6.0.0-make.patch
new file mode 100644
index 0000000..2dac1ca
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-6.0.0-make.patch
@@ -0,0 +1,14 @@
+Allow MAKE='make V=1' and similar.
+
+https://bugs.gentoo.org/795678
+--- a/configure
++++ b/configure
+@@ -1953,7 +1953,7 @@ if test -z "$python"
+ then
+     error_exit "Python not found. Use --python=/path/to/python"
+ fi
+-if ! has "$make"
++if ! has $make
+ then
+     error_exit "GNU make ($make) not found"
+ fi
diff --git a/app-emulation/qemu/files/qemu-6.1.0-strings.patch b/app-emulation/qemu/files/qemu-6.1.0-strings.patch
new file mode 100644
index 0000000..2efe7b2
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-6.1.0-strings.patch
@@ -0,0 +1,26 @@
+Forward-ported from original patch for 5.2.0.
+
+diff --git a/configure b/configure
+index da2501489f..4660ee3ee5 100755
+--- a/configure
++++ b/configure
+@@ -516,6 +516,7 @@ ld="${LD-${cross_prefix}ld}"
+ ranlib="${RANLIB-${cross_prefix}ranlib}"
+ nm="${NM-${cross_prefix}nm}"
+ strip="${STRIP-${cross_prefix}strip}"
++strings="${STRINGS-${cross_prefix}strings}"
+ windres="${WINDRES-${cross_prefix}windres}"
+ pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
+ query_pkg_config() {
+@@ -2380,9 +2381,9 @@ int main(int argc, char *argv[])
+ EOF
+ 
+ if compile_prog ; then
+-    if strings -a $TMPE | grep -q BiGeNdIaN ; then
++    if $strings -a $TMPE | grep -q BiGeNdIaN ; then
+         bigendian="yes"
+-    elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then
++    elif $strings -a $TMPE | grep -q LiTtLeEnDiAn ; then
+         bigendian="no"
+     else
+         echo big/little test failed
diff --git a/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch b/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch
new file mode 100644
index 0000000..af22080
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch
@@ -0,0 +1,34 @@
+From 42e53a0aadb76dfa7c11cd3b14eb4a41efba9bbe Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Tue, 11 Jan 2022 07:20:31 -0600
+Subject: [PATCH] also build virtfs-proxy-helper
+
+The Gentoo ebuild splits the qemu build into a softmmu, user and tool
+phase in order to be able to build and link some of the qemu emulators
+statically. This unfortunately has the consequence that we never
+configure with "have_virtfs" and "have_tools" at the same time.
+
+As a workaround, simply build the virtfs userland unconditionally. After
+all, it is a tiny executable
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index fbe856700..d6918b04c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1390,7 +1390,7 @@ have_virtfs = (targetos == 'linux' and
+     libattr.found() and
+     libcap_ng.found())
+ 
+-have_virtfs_proxy_helper = have_virtfs and have_tools
++have_virtfs_proxy_helper = have_tools and libcap_ng.found()
+
+
+ 
+ if get_option('virtfs').enabled()
+   if not have_virtfs
+-- 
+2.34.1
+
diff --git a/app-emulation/qemu/files/qemu-6.2.0-user-SLIC-crash.patch b/app-emulation/qemu/files/qemu-6.2.0-user-SLIC-crash.patch
new file mode 100644
index 0000000..7680978
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-6.2.0-user-SLIC-crash.patch
@@ -0,0 +1,173 @@
+Gentoo bug: https://bugs.gentoo.org/830170
+Upstream bug: https://gitlab.com/qemu-project/qemu/-/issues/786
+Patches taken from
+https://lore.kernel.org/qemu-devel/20211227193120.1084176-1-imammedo@redhat.com/
+
+commit dce6c86f54eab61028e110497c222e73381379df
+Author: Igor Mammedov <imammedo@redhat.com>
+Date:   Mon Dec 27 14:31:17 2021 -0500
+
+    acpi: fix QEMU crash when started with SLIC table
+    
+    if QEMU is started with used provided SLIC table blob,
+    
+      -acpitable sig=SLIC,oem_id='CRASH ',oem_table_id="ME",oem_rev=00002210,asl_compiler_id="",asl_compiler_rev=00000000,data=/dev/null
+    it will assert with:
+    
+      hw/acpi/aml-build.c:61:build_append_padded_str: assertion failed: (len <= maxlen)
+    
+    and following backtrace:
+    
+      ...
+      build_append_padded_str (array=0x555556afe320, str=0x555556afdb2e "CRASH ME", maxlen=0x6, pad=0x20) at hw/acpi/aml-build.c:61
+      acpi_table_begin (desc=0x7fffffffd1b0, array=0x555556afe320) at hw/acpi/aml-build.c:1727
+      build_fadt (tbl=0x555556afe320, linker=0x555557ca3830, f=0x7fffffffd318, oem_id=0x555556afdb2e "CRASH ME", oem_table_id=0x555556afdb34 "ME") at hw/acpi/aml-build.c:2064
+      ...
+    
+    which happens due to acpi_table_begin() expecting NULL terminated
+    oem_id and oem_table_id strings, which is normally the case, but
+    in case of user provided SLIC table, oem_id points to table's blob
+    directly and as result oem_id became longer than expected.
+    
+    Fix issue by handling oem_id consistently and make acpi_get_slic_oem()
+    return NULL terminated strings.
+    
+    PS:
+    After [1] refactoring, oem_id semantics became inconsistent, where
+    NULL terminated string was coming from machine and old way pointer
+    into byte array coming from -acpitable option. That used to work
+    since build_header() wasn't expecting NULL terminated string and
+    blindly copied the 1st 6 bytes only.
+    
+    However commit [2] broke that by replacing build_header() with
+    acpi_table_begin(), which was expecting NULL terminated string
+    and was checking oem_id size.
+    
+    1) 602b45820 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
+    2)
+    Fixes: 4b56e1e4eb08 ("acpi: build_fadt: use acpi_table_begin()/acpi_table_end() instead of build_header()")
+    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/786
+    Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+
+diff --git a/hw/acpi/core.c b/hw/acpi/core.c
+index 1e004d0078..3e811bf03c 100644
+--- a/hw/acpi/core.c
++++ b/hw/acpi/core.c
+@@ -345,8 +345,8 @@ int acpi_get_slic_oem(AcpiSlicOem *oem)
+         struct acpi_table_header *hdr = (void *)(u - sizeof(hdr->_length));
+ 
+         if (memcmp(hdr->sig, "SLIC", 4) == 0) {
+-            oem->id = hdr->oem_id;
+-            oem->table_id = hdr->oem_table_id;
++            oem->id = g_strndup(hdr->oem_id, 6);
++            oem->table_id = g_strndup(hdr->oem_table_id, 8);
+             return 0;
+         }
+     }
+diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
+index a99c6e4fe3..570f82997b 100644
+--- a/hw/i386/acpi-build.c
++++ b/hw/i386/acpi-build.c
+@@ -2721,6 +2721,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
+ 
+     /* Cleanup memory that's no longer used. */
+     g_array_free(table_offsets, true);
++    g_free(slic_oem.id);
++    g_free(slic_oem.table_id);
+ }
+ 
+ static void acpi_ram_update(MemoryRegion *mr, GArray *data)
+
+commit a22de122ad03ea40953ad0328b2c3e31002d8052
+Author: Igor Mammedov <imammedo@redhat.com>
+Date:   Mon Dec 27 14:31:18 2021 -0500
+
+    tests: acpi: whitelist expected blobs before changing them
+    
+    Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+
+diff --git a/tests/data/acpi/q35/FACP.slic b/tests/data/acpi/q35/FACP.slic
+new file mode 100644
+index 0000000000..f6a864cc86
+Binary files /dev/null and b/tests/data/acpi/q35/FACP.slic differ
+diff --git a/tests/data/acpi/q35/SLIC.slic b/tests/data/acpi/q35/SLIC.slic
+new file mode 100644
+index 0000000000..e69de29bb2
+diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
+index dfb8523c8b..49dbf8fa3e 100644
+--- a/tests/qtest/bios-tables-test-allowed-diff.h
++++ b/tests/qtest/bios-tables-test-allowed-diff.h
+@@ -1 +1,3 @@
+ /* List of comma-separated changed AML files to ignore */
++"tests/data/acpi/q35/FACP.slic",
++"tests/data/acpi/q35/SLIC.slic",
+
+commit cb913395d76f8fdfd7f1d0c8ea77d4710821bbd3
+Author: Igor Mammedov <imammedo@redhat.com>
+Date:   Mon Dec 27 14:31:19 2021 -0500
+
+    tests: acpi: add SLIC table test
+    
+    When user uses '-acpitable' to add SLIC table, some ACPI
+    tables (FADT) will change its 'Oem ID'/'Oem Table ID' fields to
+    match that of SLIC. Test makes sure thati QEMU handles
+    those fields correctly when SLIC table is added with
+    '-acpitable' option.
+    
+    Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+
+diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
+index 258874167e..ae7ef13ec7 100644
+--- a/tests/qtest/bios-tables-test.c
++++ b/tests/qtest/bios-tables-test.c
+@@ -1567,6 +1567,19 @@ static void test_acpi_oem_fields_virt(void)
+     g_free(args);
+ }
+
++static void test_acpi_q35_slic(void)
++{
++    test_data data = {
++        .machine = MACHINE_Q35,
++        .variant = ".slic",
++    };
++
++    test_acpi_one("-acpitable sig=SLIC,oem_id='CRASH ',oem_table_id='ME',"
++                  "oem_rev=00002210,asl_compiler_id='qemu',"
++                  "asl_compiler_rev=00000000,data=/dev/null",
++                  &data);
++    free_test_data(&data);
++}
+
+ int main(int argc, char *argv[])
+ {
+@@ -1639,6 +1652,7 @@ int main(int argc, char *argv[])
+             qtest_add_func("acpi/q35/kvm/xapic", test_acpi_q35_kvm_xapic);
+             qtest_add_func("acpi/q35/kvm/dmar", test_acpi_q35_kvm_dmar);
+         }
++        qtest_add_func("acpi/q35/slic", test_acpi_q35_slic);
+     } else if (strcmp(arch, "aarch64") == 0) {
+         if (has_tcg) {
+             qtest_add_func("acpi/virt", test_acpi_virt_tcg);
+
+commit ffba261306370e0ad8506401b104be5fa4749ade
+Author: Igor Mammedov <imammedo@redhat.com>
+Date:   Mon Dec 27 14:31:20 2021 -0500
+
+    tests: acpi: SLIC: update expected blobs
+    
+    Signed-off-by: Igor Mammedov <imammedo@redhat.com>
+
+diff --git a/tests/data/acpi/q35/FACP.slic b/tests/data/acpi/q35/FACP.slic
+index f6a864cc86..891fd4b784 100644
+Binary files a/tests/data/acpi/q35/FACP.slic and b/tests/data/acpi/q35/FACP.slic differ
+diff --git a/tests/data/acpi/q35/SLIC.slic b/tests/data/acpi/q35/SLIC.slic
+index e69de29bb2..fd26592e24 100644
+Binary files a/tests/data/acpi/q35/SLIC.slic and b/tests/data/acpi/q35/SLIC.slic differ
+diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
+index 49dbf8fa3e..dfb8523c8b 100644
+--- a/tests/qtest/bios-tables-test-allowed-diff.h
++++ b/tests/qtest/bios-tables-test-allowed-diff.h
+@@ -1,3 +1 @@
+ /* List of comma-separated changed AML files to ignore */
+-"tests/data/acpi/q35/FACP.slic",
+-"tests/data/acpi/q35/SLIC.slic",
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index ec3f45a..56d6820 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -1,13 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>ajak@gentoo.org</email>
+		<name>John Helmert III</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Hüttel</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>virtualization@gentoo.org</email>
@@ -17,9 +29,11 @@
 		<flag name="accessibility">Adds support for braille displays using brltty</flag>
 		<flag name="aio">Enables support for Linux's Async IO</flag>
 		<flag name="alsa">Enable alsa output for sound emulation</flag>
+		<flag name="bpf">Enable eBPF support for RSS implementation.</flag>
 		<flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag>
 		<flag name="curl">Support ISOs / -cdrom directives via HTTP or HTTPS.</flag>
 		<flag name="fdt">Enables firmware device tree support</flag>
+		<flag name="fuse">Enables FUSE block device export</flag>
 		<flag name="glusterfs">Enables GlusterFS cluster fileystem via
 			<pkg>sys-cluster/glusterfs</pkg></flag>
 		<flag name="gnutls">Enable TLS support for the VNC console server.
@@ -39,7 +53,7 @@
 		When the blobs are different, random corruption/bugs/crashes/etc... may be observed.</flag>
 		<flag name="plugins">Enable qemu plugin API via shared library loading.</flag>
 		<flag name="pulseaudio">Enable pulseaudio output for sound emulation</flag>
-		<flag name="rbd">Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
+		<flag name="rbd">Enable rados block device backend support, see https://docs.ceph.com/en/mimic/rbd/qemu-rbd/</flag>
 		<flag name="sdl">Enable the SDL-based console</flag>
 		<flag name="sdl-image">SDL Image support for icons</flag>
 		<flag name="slirp">Enable TCP/IP in hypervisor via <pkg>net-libs/libslirp</pkg></flag>
@@ -54,15 +68,16 @@
 		<flag name="usb">Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag>
 		<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB devices to another machine over TCP</flag>
 		<flag name="vde">Enable VDE-based networking</flag>
-		<flag name="vhost-net">Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
+		<flag name="vhost-net">Enable accelerated networking using vhost-net, see https://www.linux-kvm.org/page/VhostNet</flag>
 		<flag name="vhost-user-fs">Enable shared file system access using the FUSE protocol carried over virtio.</flag>
 		<flag name="virgl">Enable experimental Virgil 3d (virtual software GPU)</flag>
-		<flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag>
+		<flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See https://wiki.qemu.org/Documentation/9psetup</flag>
 		<flag name="vte">Enable terminal support (<pkg>x11-libs/vte</pkg>) in the GTK+ interface</flag>
 		<flag name="xattr">Add support for getting and setting POSIX extended attributes, through
 		<pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.</flag>
 		<flag name="xen">Enables support for Xen backends</flag>
-		<flag name="xfs">Support xfsctl() notification and syncing for XFS backed
-		virtual disks.</flag>
 	</use>
+	<upstream>
+		<remote-id type="gitlab">qemu-project/qemu</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/qemu/qemu-5.2.0-r51.ebuild b/app-emulation/qemu/qemu-5.2.0-r51.ebuild
deleted file mode 100644
index fc8fb2c..0000000
--- a/app-emulation/qemu/qemu-5.2.0-r51.ebuild
+++ /dev/null
@@ -1,873 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="5.2.0-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1
-inherit udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
-inherit flag-o-matic
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
-	EGIT_SUBMODULES=(
-		meson
-		tests/fp/berkeley-softfloat-3
-		tests/fp/berkeley-testfloat-3
-		ui/keycodemapdb
-	)
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="*"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
-	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
-	jack jemalloc +jpeg kernel_linux
-	kernel_FreeBSD lzo multipath
-	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	+slirp
-	smartcard snappy spice ssh static static-user systemtap test udev usb
-	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-	xfs zstd"
-
-COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
-	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
-	sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
-	avr lm32 moxie rx tricore unicore32"
-IUSE_USER_TARGETS="${COMMON_TARGETS}
-	aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
-	tilegx"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_riscv32? ( fdt )
-	qemu_softmmu_targets_riscv64? ( fdt )
-	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
-	static-user? ( !plugins )
-	vhost-user-fs? ( caps seccomp )
-	virtfs? ( caps xattr )
-	vte? ( gtk )
-	multipath? ( udev )
-	plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	dev-libs/libxml2[static-libs(+)]
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? (
-		sys-fabric/libibumad:=[static-libs(+)]
-		sys-fabric/libibverbs:=[static-libs(+)]
-		sys-fabric/librdmacm:=[static-libs(+)]
-	)
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	multipath? ( sys-fs/multipath-tools )
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		sys-libs/ncurses:0=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl,gbm]
-	)
-	pam? ( sys-libs/pam )
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	slirp? ( net-libs/libslirp[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev[static-libs(+)] )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-SEABIOS_VERSION="1.14.0"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-202008[binary]
-		~sys-firmware/ipxe-1.21.1[binary,qemu]
-		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre10[binary]
-	)
-	!pin-upstream-blobs? (
-		sys-firmware/edk2-ovmf
-		sys-firmware/ipxe[qemu]
-		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-	)
-"
-
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	sys-apps/texinfo
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)
-"
-CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
-	static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-	acct-group/kvm
-	selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
-	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-5.2.0-strings.patch
-	"${FILESDIR}"/${PN}-5.2.0-fix-firmware-path.patch
-	"${FILESDIR}"/${PN}-5.2.0-no-pie-ld.patch
-	"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/default-configs/targets/ >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-src_prepare() {
-	# workaround -fcommon breakage: bug #726560
-	[[ ${PV} == 5.2.0 ]] || die "Check if -fcommon hack is needed"
-	filter-flags -fcommon
-
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Remove bundled copy of libfdt
-	rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}"
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-containers # bug #732972
-		--disable-guest-agent
-		--disable-strip
-
-		# bug #746752: TCG interpreter has a few limitations:
-		# - it does not support FPU
-		# - it's generally slower on non-self-modifying code
-		# It's advantage is support for host architectures
-		# where native codegeneration is not implemented.
-		# Gentoo has qemu keyworded only on targets with
-		# native code generation available. Avoid the interpreter.
-		--disable-tcg-interpreter
-
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable doc docs)
-		$(use_enable nls gettext)
-		$(use_enable pam auth-pam)
-		$(use_enable plugins)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	# Enable option only for softmmu build, but not 'user' or 'tools'
-	conf_softmmu() {
-		if [[ ${buildtype} == "softmmu" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Enable option only for tools build, but not 'user' or 'softmmu'
-	conf_tools() {
-		if [[ ${buildtype} == "tools" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
-		$(conf_notuser curl)
-		$(conf_notuser fdt)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_notuser jemalloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser lzo)
-		$(conf_notuser multipath mpath)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser png vnc-png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser slirp slirp system)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser udev libudev)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser vhost-user-fs)
-		$(conf_tools vhost-user-fs virtiofsd)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_notuser virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		$(conf_notuser xfs xfsctl)
-		# use prebuilt keymaps, bug #759604
-		--disable-xkbcommon
-		$(conf_notuser zstd)
-	)
-
-	if [[ ${buildtype} == "user" ]] ; then
-		conf_opts+=( --disable-libxml2 )
-	else
-		conf_opts+=( --enable-libxml2 )
-	fi
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev jack)
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-		)
-		local static_flag="static"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-			--enable-tools
-		)
-		local static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	# Meson will not use a cross-file unless cross_prefix is set.
-	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-	# Plumb through equivalent of EXTRA_ECONF to allow experiments
-	# like bug #747928.
-	conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-
-	# FreeBSD's kernel does not support QEMU assigning/grabbing
-	# host USB devices yet
-	use kernel_FreeBSD && \
-		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-
-	cd "${S}/tools-build"
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build"
-	emake DESTDIR="${ED}" install
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}"
-	dodoc MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		rm "${ED}/usr/share/qemu/bios-256k.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		# PPC/PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/seabios)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/edk2-ovmf)"
-	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/qemu/qemu-6.2.0-r1.ebuild b/app-emulation/qemu/qemu-6.2.0-r1.ebuild
new file mode 120000
index 0000000..59376e5
--- /dev/null
+++ b/app-emulation/qemu/qemu-6.2.0-r1.ebuild
@@ -0,0 +1 @@
+qemu-6.2.0.ebuild
\ No newline at end of file
diff --git a/app-emulation/qemu/qemu-6.2.0.ebuild b/app-emulation/qemu/qemu-6.2.0.ebuild
new file mode 100644
index 0000000..7d1be67
--- /dev/null
+++ b/app-emulation/qemu/qemu-6.2.0.ebuild
@@ -0,0 +1,924 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="6.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+		pax-utils xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
+	EGIT_SUBMODULES=(
+		meson
+		tests/fp/berkeley-softfloat-3
+		tests/fp/berkeley-testfloat-3
+		ui/keycodemapdb
+	)
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://download.qemu.org/${P}.tar.xz"
+	KEYWORDS="*"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc
+	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+	jack jemalloc +jpeg
+	lzo multipath
+	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
+	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	+slirp
+	smartcard snappy spice ssh static static-user systemtap test udev usb
+	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
+	xfs zstd"
+
+COMMON_TARGETS="
+	aarch64
+	alpha
+	arm
+	cris
+	hppa
+	i386
+	m68k
+	microblaze
+	microblazeel
+	mips
+	mips64
+	mips64el
+	mipsel
+	nios2
+	or1k
+	ppc
+	ppc64
+	riscv32
+	riscv64
+	s390x
+	sh4
+	sh4eb
+	sparc
+	sparc64
+	x86_64
+	xtensa
+	xtensaeb
+"
+IUSE_SOFTMMU_TARGETS="
+	${COMMON_TARGETS}
+	avr
+	rx
+	tricore
+"
+IUSE_USER_TARGETS="
+	${COMMON_TARGETS}
+	aarch64_be
+	armeb
+	hexagon
+	mipsn32
+	mipsn32el
+	ppc64abi32
+	ppc64le
+	sparc32plus
+"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_riscv32? ( fdt )
+	qemu_softmmu_targets_riscv64? ( fdt )
+	qemu_softmmu_targets_x86_64? ( fdt )
+	sdl-image? ( sdl )
+	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev )
+	static-user? ( !plugins )
+	vhost-user-fs? ( caps seccomp )
+	virgl? ( opengl )
+	virtfs? ( caps xattr )
+	vnc? ( gnutls )
+	vte? ( gtk )
+	multipath? ( udev )
+	plugins? ( !static !static-user )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	dev-libs/libxml2[static-libs(+)]
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bpf? ( dev-libs/libbpf:= )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:= )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? (
+		sys-cluster/rdma-core[static-libs(+)]
+	)
+	iscsi? ( net-libs/libiscsi )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	multipath? ( sys-fs/multipath-tools )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)]
+		sys-libs/ncurses:=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl(+),gbm(+)]
+	)
+	pam? ( sys-libs/pam )
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	slirp? ( net-libs/libslirp[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+	udev? ( virtual/libudev:= )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
+	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+EDK2_OVMF_VERSION="202105"
+SEABIOS_VERSION="1.14.0"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary]
+		~sys-firmware/ipxe-1.21.1[binary,qemu]
+		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
+		~sys-firmware/sgabios-0.1_pre10[binary]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
+		sys-firmware/ipxe[qemu]
+		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+		sys-firmware/sgabios
+	)"
+PPC_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+	)
+"
+
+BDEPEND="
+	$(python_gen_impl_dep)
+	dev-lang/perl
+	sys-apps/texinfo
+	virtual/pkgconfig
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)
+"
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+	acct-group/kvm
+	selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
+	"${FILESDIR}"/${PN}-6.0.0-make.patch
+	"${FILESDIR}"/${PN}-6.1.0-strings.patch
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+# Check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/configs/targets/ >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	default
+
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
+	export WINDRES=${CHOST}-windres
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Remove bundled copy of libfdt
+	rm -r dtc || die
+
+	# ChromeOS: Fix unprefixed call to pkg-config. Upstream bugs:
+	# https://bugs.gentoo.org/867766
+	# https://gitlab.com/qemu-project/qemu/-/issues/1185
+	sed -i -e 's/pkg-config --modversion/${pkg-config} --modversion/g' configure
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--bindir=/usr/bin
+		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
+		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--localstatedir=/var
+		--disable-bsd-user
+		--disable-containers # bug #732972
+		--disable-guest-agent
+		--disable-strip
+
+		# bug #746752: TCG interpreter has a few limitations:
+		# - it does not support FPU
+		# - it's generally slower on non-self-modifying code
+		# It's advantage is support for host architectures
+		# where native codegeneration is not implemented.
+		# Gentoo has qemu keyworded only on targets with
+		# native code generation available. Avoid the interpreter.
+		--disable-tcg-interpreter
+
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		# ChromeOS: Fix unprefixed call to clang. Upstream bugs:
+		# https://bugs.gentoo.org/867766
+		# https://gitlab.com/qemu-project/qemu/-/issues/1185
+		--objcc="$(tc-getCC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		$(use_enable doc docs)
+		$(use_enable nls gettext)
+		$(use_enable pam auth-pam)
+		$(use_enable plugins)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	# Enable option only for softmmu build, but not 'user' or 'tools'
+	conf_softmmu() {
+		if [[ ${buildtype} == "softmmu" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Enable option only for tools build, but not 'user' or 'softmmu'
+	conf_tools() {
+		if [[ ${buildtype} == "tools" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Special case for the malloc flag, because the --disable flag does
+	# not exist and trying like above will break configuring.
+	conf_malloc() {
+		if [[ ! ${buildtype} == "user" ]] ; then
+			usex "${1}" "--enable-malloc=${1}" ""
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_softmmu bpf)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_notuser fdt)
+		$(conf_notuser fuse)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser io-uring linux-io-uring)
+		$(conf_malloc jemalloc)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser multipath mpath)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser png vnc-png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_softmmu sdl-image)
+		$(conf_notuser seccomp)
+		$(conf_notuser slirp slirp system)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh)
+		$(conf_notuser udev libudev)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser vhost-user-fs)
+		$(conf_tools vhost-user-fs virtiofsd)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_softmmu virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		$(conf_notuser xfs xfsctl)
+		# use prebuilt keymaps, bug #759604
+		--disable-xkbcommon
+		$(conf_notuser zstd)
+	)
+
+	if [[ ${buildtype} == "user" ]] ; then
+		conf_opts+=( --disable-libxml2 )
+	else
+		conf_opts+=( --enable-libxml2 )
+	fi
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts=(
+			# Note: backend order matters here: #716202
+			# We iterate from higher-level to lower level.
+			$(usex pulseaudio pa "")
+			$(usev jack)
+			$(usev sdl)
+			$(usev alsa)
+			$(usev oss)
+		)
+		conf_opts+=(
+			--audio-drv-list="${audio_opts// /,}"
+		)
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+		)
+		local static_flag="static"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	# Meson will not use a cross-file unless cross_prefix is set.
+	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
+	# Plumb through equivalent of EXTRA_ECONF to allow experiments
+	# like bug #747928.
+	conf_opts+=( ${EXTRA_CONF_QEMU} )
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	cd "${S}/tools-build"
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake check
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/python/qemu"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dodoc check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build"
+	emake DESTDIR="${ED}" install
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}"
+	dodoc MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	# Disallow stripping of prebuilt firmware files.
+	dostrip -x ${QA_PREBUILT}
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		# PPC/PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	xdg_icon_cache_update
+
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/seabios)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/edk2-ovmf)"
+	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest
deleted file mode 100644
index ad82277..0000000
--- a/app-emulation/virt-what/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST virt-what-1.18.tar.gz 173703 SHA256 bc42dd8214a6f30a1e6f2478faf12c41ecf0a0c8b9e493241f02416ae28162f4 SHA512 8085a38111d5664f411f5bb9d2ee221bc22e5b0f2d993e8d518718b3f63b16ba73e052b1623c090493cf8fef52fd237ba823377503a32b4b7d03cc5380d5c613 WHIRLPOOL e5b496a0cabc65ec9553a6fd55d4a30e8f7501683af384107a40999c4c393ebc21dae37a67a1f377bb224f5e369af281a44adc468ba68072f2b137cb9d66c6f1
diff --git a/app-emulation/virt-what/metadata.xml b/app-emulation/virt-what/metadata.xml
deleted file mode 100644
index 7e3c0f2..0000000
--- a/app-emulation/virt-what/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>eva@gentoo.org</email>
-		<name>Gilles Dartiguelongue</name>
-	</maintainer>
-	<use>
-		<flag name="dmi">Use <pkg>sys-apps/dmidecode</pkg> to read firmware data</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-emulation/virt-what/virt-what-1.18.ebuild b/app-emulation/virt-what/virt-what-1.18.ebuild
deleted file mode 100644
index 4596a44..0000000
--- a/app-emulation/virt-what/virt-what-1.18.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Detects if the current machine is running in a virtual machine"
-HOMEPAGE="https://people.redhat.com/~rjones/virt-what/"
-SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="dmi"
-
-DEPEND="dev-lang/perl"
-RDEPEND="app-shells/bash
-	dmi? ( sys-apps/dmidecode )"
-
-src_prepare() {
-	default
-
-	# Pretends to be POSIX sh while it is not
-	sed -e 's:/bin/sh:/bin/bash:' -i virt-what.in || die
-}
diff --git a/app-eselect/OWNERS b/app-eselect/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-eselect/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-eselect/eselect-ctags/Manifest b/app-eselect/eselect-ctags/Manifest
deleted file mode 100644
index c922b77..0000000
--- a/app-eselect/eselect-ctags/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST eselect-emacs-1.18.tar.xz 8964 SHA256 72e59fc780bfe18aa782862609e2651a0fd14bf381a4529bf5a1d6ab1c1b90df SHA512 9e346dc2331e577716945360de199848606d6b67776c1e7875d1437ff7e03796ac64cd0a3656109be87c0578b45bee1175f0ba4af2be96d0e27442d51bf182aa WHIRLPOOL 6812d8a4e79fc2286715219f5f443ed0aa662249bea3d381e293dd21324b1887bc674f3f7fa7bc94643f555bbd341969b1198f305a60043183e9fdcab31759f9
diff --git a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild b/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
deleted file mode 100644
index 2271c87..0000000
--- a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild,v 1.1 2015/03/31 16:47:46 ulm Exp $
-
-EAPI=5
-
-MY_P="eselect-emacs-${PV}"
-DESCRIPTION="Manages ctags implementations"
-HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="http://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="*"
-
-RDEPEND="!<app-eselect/eselect-emacs-1.18
-	>=app-admin/eselect-1.2.3
-	!app-admin/eselect-ctags"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins {ctags,etags}.eselect
-	doman {ctags,etags}.eselect.5
-}
diff --git a/app-eselect/eselect-ctags/metadata.xml b/app-eselect/eselect-ctags/metadata.xml
deleted file mode 100644
index bc306fe..0000000
--- a/app-eselect/eselect-ctags/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-</pkgmetadata>
diff --git a/app-eselect/eselect-emacs/Manifest b/app-eselect/eselect-emacs/Manifest
deleted file mode 100644
index c922b77..0000000
--- a/app-eselect/eselect-emacs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST eselect-emacs-1.18.tar.xz 8964 SHA256 72e59fc780bfe18aa782862609e2651a0fd14bf381a4529bf5a1d6ab1c1b90df SHA512 9e346dc2331e577716945360de199848606d6b67776c1e7875d1437ff7e03796ac64cd0a3656109be87c0578b45bee1175f0ba4af2be96d0e27442d51bf182aa WHIRLPOOL 6812d8a4e79fc2286715219f5f443ed0aa662249bea3d381e293dd21324b1887bc674f3f7fa7bc94643f555bbd341969b1198f305a60043183e9fdcab31759f9
diff --git a/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild b/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild
deleted file mode 100644
index dc799d2..0000000
--- a/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild,v 1.1 2015/03/31 16:48:14 ulm Exp $
-
-EAPI=5
-
-DESCRIPTION="Manage multiple Emacs versions on one system"
-HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="http://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="*"
-
-RDEPEND=">=app-admin/eselect-1.2.6
-	~app-eselect/eselect-ctags-${PV}
-	!app-admin/eselect-emacs"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins {emacs,gnuclient}.eselect
-	doman {emacs,gnuclient}.eselect.5
-	dodoc ChangeLog
-}
diff --git a/app-eselect/eselect-emacs/metadata.xml b/app-eselect/eselect-emacs/metadata.xml
deleted file mode 100644
index bc306fe..0000000
--- a/app-eselect/eselect-emacs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-</pkgmetadata>
diff --git a/app-eselect/eselect-iptables/metadata.xml b/app-eselect/eselect-iptables/metadata.xml
index 4eb20a0..de9d784 100644
--- a/app-eselect/eselect-iptables/metadata.xml
+++ b/app-eselect/eselect-iptables/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-eselect/eselect-java/metadata.xml b/app-eselect/eselect-java/metadata.xml
index a234468..08c223f 100644
--- a/app-eselect/eselect-java/metadata.xml
+++ b/app-eselect/eselect-java/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
-<longdescription lang="en">
-</longdescription>
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-eselect/eselect-lib-bin-symlink/Manifest b/app-eselect/eselect-lib-bin-symlink/Manifest
deleted file mode 100644
index f83bcef..0000000
--- a/app-eselect/eselect-lib-bin-symlink/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST eselect-lib-bin-symlink-0.1.1.tar.bz2 45376 BLAKE2B 59ffe0897a57115debf185344eb7fef5177394337c02dde6f67e79114e53f411edd5e5854c86beb4884eca6a51282a0dc09ee94e82cb0d0d0fd7e54a99e660ed SHA512 16b56153aa61534997f42641656c3feaf27243fece8cdd42e93ed0be5dabedafc316af8111cd7ff0e321666de8deb1a35e86032cd9590060f677ac7e68fd48bd
diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
deleted file mode 100644
index 5f80001..0000000
--- a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="An eselect library to manage executable symlinks"
-HOMEPAGE="https://github.com/mgorny/eselect-lib-bin-symlink/"
-SRC_URI="https://github.com/mgorny/eselect-lib-bin-symlink/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-lib-bin-symlink/metadata.xml b/app-eselect/eselect-lib-bin-symlink/metadata.xml
deleted file mode 100644
index 630f477..0000000
--- a/app-eselect/eselect-lib-bin-symlink/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mgorny@gentoo.org</email>
-      <name>Michał Górny</name>
-    </maintainer>
-    <bugs-to>https://github.com/mgorny/eselect-lib-bin-symlink/issues/</bugs-to>
-    <remote-id type="github">mgorny/eselect-lib-bin-symlink</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-eselect/eselect-opencl/Manifest b/app-eselect/eselect-opencl/Manifest
deleted file mode 100644
index 4eb11c7..0000000
--- a/app-eselect/eselect-opencl/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST cl.h.1.1.xz 6940 SHA256 11b0249ec6c35000686cfe775b1789fa010b6d058e123b00c720e8408881f13f SHA512 905d4707bba968f97fe6871ca85a04c1272a22753bc68334e0990c1f968796930aae69af1d5d601d2bd90c323d50224fa230402e0fa0d7f74c859c481ed969b2 WHIRLPOOL 47c1e5812e3ef69fa3b75feb2f89ec910dc5078ee449b7f211b12f995244357ea4963d8ac578b2dc809d0613f915868e5c438f654217815f8f346cd16083ccc2
-DIST cl.hpp.1.1.xz 14764 SHA256 5d90ef4d964a6365d8e9305913c85dd0ffe6916df0a151a116b1b58b0e6c7ef4 SHA512 13e2ef779daaeaa6748f34c533d621c896fbcd375947c6774fd18aefbb9b4d88bf5e012c678c0808bb2956599fa222f69d15f3cf0df707984408a969737ad687 WHIRLPOOL 1bcea4788850d258644bccf10aa0d1dbe29c0048914e68f4ecaf1d9033ebe326f566a6fe82a48efb022b22c857013a0eac126653ac0a0bbf8dad4ae72dc0febe
-DIST cl_ext.h.1.1.xz 2740 SHA256 aeb729345004bf67d2564e1dc55feb326ff017f3b291ffb8e1391de353e09620 SHA512 3571f44b167ad1f8faf634bb57c541b01345f335fd4756727a625f1288fad2f41e4826d745c8b8a570f4367881a272626f72b5155d0660d4f668a7cb65de9063 WHIRLPOOL f606b0fe58fa3ac317dbfda239484570f539fced0bf71c1fdb6779d40e5ec34607b8ddffc69a2dd7bcb8d4d85dcc19e453be57ff78e9079c17621f5b407b6371
-DIST cl_gl.h.1.1.xz 1856 SHA256 eeddf3403c13776b3d13a25c9e47a01eee750c0120f74d402fad5d78b29f925a SHA512 6821e0779d225aaadf5eb35de722be7d4c0a5ebff15e512510d565faf82daa53ef41cf32b0a62f966f7bfc32e95f6c5f21cfc4812ee1f792d5b57a14b70dcee4 WHIRLPOOL 11f9dc0bf37b58685d7d87f91ecc0f3da27e4d30c90669c542b53c985861e3f04eaaac89f287598a60d1f7b2aae6c802d7574e93d28b9cec86f6c0e161a154bb
-DIST cl_gl_ext.h.1.1.xz 1356 SHA256 594e463e3a24e62870c5c1914b05e796aeda8892bf6830ee8db3f722993fdf02 SHA512 23fbc933e0beb2748152fa058d8ed413351fcfce167b9788c8a3529323b89e57eb1bf84d998fc262081410985f476bbf56fdd0bffe73f08135f5c90b7d09bb8d WHIRLPOOL 94301285dd567d8c7c9145d49801ea5c7e0ae4f5c01a9f93bcea667df925ea9d55a5ec978c3c05337306bdd0d53b829a9c03cbe8131982b2eddae23fc2eb1e5c
-DIST cl_platform.h.1.1.xz 5584 SHA256 2f70eb47285fd46f75d48476e90ee3b7e9ba62166bc573bbb35cb0f9d7a2ea53 SHA512 8265cd3b3630d367fe494a60911564e57169d03948827a0e2ca0669678b4a5b595b22ae2786a7c42c0b96fd6fbfb7d326c63759cfd1b7888b8cd35588b5f7544 WHIRLPOOL aa5e12ec2eb49323f9812ae51d5b45db2919488bd36fd58bb40eb6538020e8de732aa60a4fc1b8bf913cdfbdf35c0ebe63fd8cd0b8f415d34cbdce4d54207ff7
-DIST eselect-opencl-1.1.0-r1.tar.xz 3276 SHA256 86a2f5f152e543046899989b3a12a065dfc357a2276ce06d69d19bdbf175fdea SHA512 b2be1e2035fda4e119f03e9ef84fbf1f09fc0bd5475d3fe30d2330dac76180930451d78dbb9e158c34dee9ce524076434254757b594e84dea96341e52ef13c14 WHIRLPOOL 4df96b5f97b6071c27c613addd0b579deb800012ba2640814dcb107ec6ab9f3fac6384c4c3313bd245d62eb2a376e378e0820ef891bed6b41b778721b325f667
-DIST opencl.h.1.1.xz 944 SHA256 c076e410eaffd9fbb056528f31a59fe1908481f0fd38981c13970727a0c4d096 SHA512 62b5ae61f2d9a44e9f8b6a7e3421cacfe5291bc9b5430845d469ea5a6404d71d3ab49d78c6da2588eab2bcd5f9b0d86c53f3aa74bd7c43c960ad86f0eab9595c WHIRLPOOL bd3d946b6c361187d9d7c4337287c24161fc0f291cfc810c0bcf05d9fe120192a853fe7b69500783b7ec1994e9b265d84eb82b8fc681df060c16aa3d038c8374
diff --git a/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r1.ebuild b/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r1.ebuild
deleted file mode 100644
index 088508c..0000000
--- a/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-CL_ABI=1.1
-
-inherit multilib
-
-DESCRIPTION="Utility to change the OpenCL implementation being used"
-HOMEPAGE="https://www.gentoo.org/"
-
-# Source:
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_platform.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_ext.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl_ext.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.hpp
-
-MIRROR="https://dev.gentoo.org/~xarthisius/distfiles/"
-SRC_URI="${MIRROR}/opencl.h.${CL_ABI}.xz
-	${MIRROR}/cl_platform.h.${CL_ABI}.xz
-	${MIRROR}/cl.h.${CL_ABI}.xz
-	${MIRROR}/cl_ext.h.${CL_ABI}.xz
-	${MIRROR}/cl_gl.h.${CL_ABI}.xz
-	${MIRROR}/cl_gl_ext.h.${CL_ABI}.xz
-	${MIRROR}/cl.hpp.${CL_ABI}.xz
-	${MIRROR}/${P}-r1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=">=app-admin/eselect-1.2.4"
-
-pkg_postinst() {
-	local impl="$(eselect opencl show)"
-	if [[ -n "${impl}"  && "${impl}" != '(none)' ]] ; then
-		eselect opencl set "${impl}"
-	fi
-}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins opencl.eselect
-	#doman opencl.eselect.5
-
-	local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl.hpp )
-	insinto /usr/$(get_libdir)/OpenCL/global/include/CL
-	cd "${WORKDIR}"
-	for f in ${headers[@]}; do
-		newins ${f}.${CL_ABI} ${f}
-	done
-}
diff --git a/app-eselect/eselect-opencl/metadata.xml b/app-eselect/eselect-opencl/metadata.xml
deleted file mode 100644
index c52f3dd..0000000
--- a/app-eselect/eselect-opencl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		Utility to switch OpenCL implementations between various providers.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">anyc/opencl-headers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-eselect/eselect-opengl/metadata.xml b/app-eselect/eselect-opengl/metadata.xml
index dfe0fc0..f8412eb 100644
--- a/app-eselect/eselect-opengl/metadata.xml
+++ b/app-eselect/eselect-opengl/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
deleted file mode 100644
index f76a0ab..0000000
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Manage /usr/bin/pinentry symlink"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
-
-S="${FILESDIR}"
-
-src_install() {
-	default
-	insinto /usr/share/eselect/modules
-	newins pinentry.eselect-${PV} pinentry.eselect
-}
diff --git a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7 b/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7
deleted file mode 100644
index ec49ca1..0000000
--- a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage /usr/bin/pinentry implementation"
-MAINTAINER="ssuominen@gentoo.org"
-VERSION="0.7"
-
-SYMLINK_PATH=/usr/bin/pinentry
-SYMLINK_TARGETS=( pinentry-gnome3 pinentry-qt pinentry-gtk-2 pinentry-qt4 pinentry-curses pinentry-tty )
-SYMLINK_DESCRIPTION='pinentry binary'
-
-inherit bin-symlink
diff --git a/app-eselect/eselect-pinentry/metadata.xml b/app-eselect/eselect-pinentry/metadata.xml
deleted file mode 100644
index 91439c5..0000000
--- a/app-eselect/eselect-pinentry/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>k_f@gentoo.org</email>
-		<name>Kristian Fiskerstrand</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
deleted file mode 100644
index 38a0b2d..0000000
--- a/app-eselect/eselect-python/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST eselect-python-20200719.tar.bz2 47313 BLAKE2B 37270b1f5ad3dfcd4e19c71ae74da585e803afe89c43f8b912bccf0fbdb936916cf58fc780b654692bb9e6ab44310514bae5f10d19dcde6a0e63042f76abe81d SHA512 4b205a099ad079e5e28d3fdbe774c22f54b7c16bff2d28b54d0e20ee36be2339e928d4050eed74ef969d5815bf4bb691bf5ed6e98023b28972da6d5c7d8a2545
diff --git a/app-eselect/eselect-python/eselect-python-20200719.ebuild b/app-eselect/eselect-python/eselect-python-20200719.ebuild
deleted file mode 100644
index f8cb555..0000000
--- a/app-eselect/eselect-python/eselect-python-20200719.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-else
-	SRC_URI="https://dev.gentoo.org/~chutzpah/dist/misc/${P}.tar.bz2"
-	KEYWORDS="*"
-fi
-
-DESCRIPTION="Eselect module for management of multiple Python versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# python-exec-2.4.2 for working -l option
-RDEPEND="
-	>=app-admin/eselect-1.2.3
-	>=dev-lang/python-exec-2.4.2
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == "99999999" ]] && eautoreconf
-}
-
-pkg_postinst() {
-	local py
-
-	if has_version 'dev-lang/python'; then
-		eselect python update --if-unset
-	fi
-
-	if has_version "=dev-lang/python-3*"; then
-		eselect python update "--python3" --if-unset
-	fi
-}
diff --git a/app-eselect/eselect-python/metadata.xml b/app-eselect/eselect-python/metadata.xml
deleted file mode 100644
index 4c43a15..0000000
--- a/app-eselect/eselect-python/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-i18n/metadata.xml b/app-i18n/metadata.xml
deleted file mode 100644
index 44756a0..0000000
--- a/app-i18n/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-i18n category contains internationalisation-related packages.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-i18n enthält Programme im Zusammenhang mit Internationalisierung.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-i18n contiene paquetes para Internacionalización.
-	</longdescription>
-	<longdescription lang="ja">
-		app-i18nカテゴリには国際化関連パッケージが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De app-i18n categorie bevat applicaties om te internationaliseren (vertalen).
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-i18n chứa các gói liên quan đến
-		quốc tế hoá (i18n).
-	</longdescription>
-	<longdescription lang="it">
-		La categoria app-i18n contiene pacchetti per l'internazionalizzazione.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-i18n contém pacotes para internacionalização.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-i18n zawiera pakiety zawierające tłumaczenia różnych
-		składników systemu na różne języki.
-	</longdescription>
-</catmetadata>
-
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
new file mode 100644
index 0000000..b5b086e
--- /dev/null
+++ b/app-metrics/node_exporter/Manifest
@@ -0,0 +1,4 @@
+DIST node_exporter-1.3.1-deps.tar.xz 110247608 BLAKE2B 0c3cbea40927a2f780aea4113846a95fb24e79a03f53d880ec0cb4ad805e94dd2cd48402ad08673835e4bce2f06548a452dfb3a9f6f53b5d2d7b0a24048de5be SHA512 d7f7976f8ca3825876f8d246c58dccb6973edcb2e7a572c690b9ca8c8d7935bc0f225ab0285eacbaa93767b6f4181324b168338765a35a7e3112c32f926a3c8a
+DIST node_exporter-1.3.1.tar.gz 299038 BLAKE2B 8c4b562fab36632f6a4bcfc0c7bc65484bd9d44b16691a3d531c3e163ab17bf0fe81712d5ea3115460144be246599fc3430a80dd2244981333f0e1e5b2384c80 SHA512 cd73ca3551b0b52307d8b76aff29bf497609a1729203da9898270d1441d3358e8d9ba907bb8a75b5934ed64a8cf6b360385b1b2d0a3de55e0e149e0f819e0a1f
+DIST node_exporter-1.4.0-deps.tar.xz 24623388 BLAKE2B 76ea5392f3f4ee2d76706d77625a0b1708f0a09d11dde1fc7511f62625cf7d2e26117eb8ed77c495d4e1d7aa98c62dfbaffc7310c415d831a670360705789975 SHA512 9e64c1d51bd47cb6a8caa5fd6f22846c266ebb86c79e5f8ab363e847c614fca4044e7c388691870e61a8f017f08c2b5bcada56c8390bdf9877e71ccdbd646ad9
+DIST node_exporter-1.4.0.tar.gz 325743 BLAKE2B df6af555035c70930a610790e8d5eee87ca12cd27308ed95edf875da8615b61dde805d960d6262587322abecb721695bd42b1c078a7bcc40b24053cfce86015d SHA512 ebb4f9662ba995130b96e108050571119da368a8195e50896a19aab04d7cb40d60f9ae81052a0de08f571886cfb4150bf006a7b67a3d3683f2d04b5f43d61e7a
diff --git a/app-metrics/node_exporter/OWNERS b/app-metrics/node_exporter/OWNERS
new file mode 100644
index 0000000..9fb51a3
--- /dev/null
+++ b/app-metrics/node_exporter/OWNERS
@@ -0,0 +1 @@
+include chromiumos/owners:v1:/infra/OWNERS.fleetservices
diff --git a/app-metrics/node_exporter/files/node_exporter.confd b/app-metrics/node_exporter/files/node_exporter.confd
new file mode 100644
index 0000000..b656520
--- /dev/null
+++ b/app-metrics/node_exporter/files/node_exporter.confd
@@ -0,0 +1,2 @@
+# arguments for prometheus node exporter
+command_args="--collector.textfile.directory=/var/lib/node_exporter/"
diff --git a/app-metrics/node_exporter/files/node_exporter.initd b/app-metrics/node_exporter/files/node_exporter.initd
new file mode 100644
index 0000000..3ccddf7
--- /dev/null
+++ b/app-metrics/node_exporter/files/node_exporter.initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus machine metrics exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/sbin/node_exporter"
+command_args="${command_args:---collector.textfile.directory=/var/lib/node_exporter/}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/node_exporter/${RC_SVCNAME}.log \
+	--stderr /var/log/node_exporter/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
+
+start_pre() {
+	checkpath -q -d -m 0755 -o ${user}:${group} /var/log/node_exporter
+}
diff --git a/app-metrics/node_exporter/files/node_exporter.initd-1 b/app-metrics/node_exporter/files/node_exporter.initd-1
new file mode 100644
index 0000000..6e9de80
--- /dev/null
+++ b/app-metrics/node_exporter/files/node_exporter.initd-1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus machine metrics exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/sbin/node_exporter"
+command_args="${command_args:---collector.textfile.directory=/var/lib/node_exporter/}"
+command_background="true"
+command_user="${user}:${group}"
+output_log="/var/log/node_exporter/${RC_SVCNAME}.log"
+error_log="/var/log/node_exporter/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
+
+start_pre() {
+	checkpath -q -d -m 0755 -o ${user}:${group} /var/log/node_exporter
+}
diff --git a/app-metrics/node_exporter/files/node_exporter.service b/app-metrics/node_exporter/files/node_exporter.service
new file mode 100644
index 0000000..20eac48
--- /dev/null
+++ b/app-metrics/node_exporter/files/node_exporter.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Node Exporter
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+User=node_exporter
+Group=node_exporter
+Type=simple
+ExecStart=/usr/sbin/node_exporter
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/node_exporter/files/node_exporter.service-1 b/app-metrics/node_exporter/files/node_exporter.service-1
new file mode 100644
index 0000000..81909b9
--- /dev/null
+++ b/app-metrics/node_exporter/files/node_exporter.service-1
@@ -0,0 +1,13 @@
+[Unit]
+Description=Node Exporter
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+User=node_exporter
+Group=node_exporter
+Type=simple
+ExecStart=/usr/sbin/node_exporter --collector.textfile.directory=/var/lib/node_exporter/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/node_exporter/metadata.xml b/app-metrics/node_exporter/metadata.xml
new file mode 100644
index 0000000..df81661
--- /dev/null
+++ b/app-metrics/node_exporter/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">prometheus/node_exporter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-metrics/node_exporter/node_exporter-1.4.0-r1.ebuild b/app-metrics/node_exporter/node_exporter-1.4.0-r1.ebuild
new file mode 100644
index 0000000..9dc805c
--- /dev/null
+++ b/app-metrics/node_exporter/node_exporter-1.4.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+MY_PV="v${PV/_rc/-rc.}"
+NODE_EXPORTER_COMMIT=7da1321761b3b8dfc9e496e1a60e6a476fec6018
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="*"
+
+COMMON_DEPEND="acct-group/node_exporter
+	acct-user/node_exporter"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+BDEPEND=">=dev-util/promu-0.3.0"
+
+S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu.yml || die
+	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu-cgo.yml || die
+}
+
+src_compile() {
+	mkdir -p bin || die
+	promu build -v --prefix node_exporter || die
+}
+
+src_install() {
+	dosbin node_exporter/node_exporter
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	systemd_newunit "${FILESDIR}"/node_exporter.service-1 node_exporter.service
+	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-misc/OWNERS b/app-misc/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-misc/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-misc/c_rehash/metadata.xml b/app-misc/c_rehash/metadata.xml
index 34f212d..c475d14 100644
--- a/app-misc/c_rehash/metadata.xml
+++ b/app-misc/c_rehash/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hasufell@gentoo.org</email>
-		<name>Julian Ospald</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">pld-linux/openssl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/ckermit/metadata.xml b/app-misc/ckermit/metadata.xml
index e248196..cee3b0c 100644
--- a/app-misc/ckermit/metadata.xml
+++ b/app-misc/ckermit/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>embedded@gentoo.org</email>
diff --git a/app-misc/fdupes/metadata.xml b/app-misc/fdupes/metadata.xml
index 4a5652d..c045e6f 100644
--- a/app-misc/fdupes/metadata.xml
+++ b/app-misc/fdupes/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>shell-tools@gentoo.org</email>
diff --git a/app-misc/figlet/metadata.xml b/app-misc/figlet/metadata.xml
index 2c7916a..85e4ed8 100644
--- a/app-misc/figlet/metadata.xml
+++ b/app-misc/figlet/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>mr_bones_@gentoo.org</email>
-<name>Michael Sterrett</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/lockfile-progs/Manifest b/app-misc/lockfile-progs/Manifest
deleted file mode 100644
index 2a6d06d..0000000
--- a/app-misc/lockfile-progs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lockfile-progs_0.1.17.tar.gz 14833 SHA256 03fb05d25499532f497775b1747b61fa6beebf12d3bcc951e125349ae166c511 SHA512 9d912e1a518fe9c02054beb25c4591df6db55cc2fe9b7049fb85368465bd9ced9660bb0a809ee60a7effbdc6524613c40fa69d9d27fc2cfc964f41b7486c3596 WHIRLPOOL 7fc3febe9c495ba9aaefc8924f17c955c506169d00ea372ceae71e7e594478c1d15283b80dd6f8f9b27e82a86d9984b4a4aa96586316a4fb8dff5169072ed64f
diff --git a/app-misc/lockfile-progs/files/Makefile b/app-misc/lockfile-progs/files/Makefile
deleted file mode 100644
index 27276b3..0000000
--- a/app-misc/lockfile-progs/files/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-all: lockfile-create
-
-lockfile-create: lockfile-progs.o
-	${CC} -o $@ ${CFLAGS} ${LDFLAGS} $^ -llockfile
-
-install: all
-	install -d $(DESTDIR)/usr/bin
-
-	install --mode=755 lockfile-create $(DESTDIR)/usr/bin/lockfile-create
-	ln -s lockfile-create $(DESTDIR)/usr/bin/lockfile-remove
-	ln -s lockfile-create $(DESTDIR)/usr/bin/lockfile-touch
-	ln -s lockfile-create $(DESTDIR)/usr/bin/lockfile-check
-
-	install --mode=755 lockfile-create $(DESTDIR)/usr/bin/mail-lock
-	ln -s mail-lock $(DESTDIR)/usr/bin/mail-unlock
-	ln -s mail-unlock $(DESTDIR)/usr/bin/mail-touchlock
-
-	install -d $(DESTDIR)/usr/share/man/man1
-
-	install --mode=644 lockfile-progs.1 $(DESTDIR)/usr/share/man/man1
-	ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/lockfile-create.1
-	ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/lockfile-remove.1
-	ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/lockfile-touch.1
-	ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/lockfile-check.1
-
-	ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/mail-lock.1
-	ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/mail-unlock.1
-	ln -s lockfile-progs.1 $(DESTDIR)/usr/share/man/man1/mail-touchlock.1
-
-test: all
-	ln -s lockfile-create ./lockfile-remove
-	ln -s lockfile-create ./lockfile-touch
-	ln -s lockfile-create ./lockfile-check
-
-	./lockfile-create testfile
-	./lockfile-check testfile
-	./lockfile-touch --oneshot testfile
-	./lockfile-check testfile
-	./lockfile-remove testfile
-	! test -e testfile
-	! ./lockfile-check testfile
-
-	./lockfile-create --lock-name test.lock
-	./lockfile-check --lock-name test.lock
-	! ./lockfile-check test.lock
-	! test -e test.lock.lock
-	./lockfile-touch --oneshot --lock-name test.lock
-	./lockfile-check --lock-name test.lock
-	! ./lockfile-check test.lock
-	./lockfile-remove --lock-name test.lock
-	! test -e test.lock
-	! ./lockfile-check --lock-name test.lock
-	! ./lockfile-check test.lock
-
-.PHONY: install test
diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
deleted file mode 100644
index 3c33bcc..0000000
--- a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Programs to safely lock/unlock files and mailboxes"
-HOMEPAGE="http://packages.debian.org/sid/lockfile-progs"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="net-libs/liblockfile"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Provide better Makefile, with clear separation between compilation
-	# and installation.
-	cp "${FILESDIR}/Makefile" . || die
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	# Makefile has no notion of PREFIX, bindir, and the like
-	emake DESTDIR="${ED}" install || die
-}
diff --git a/app-misc/lockfile-progs/metadata.xml b/app-misc/lockfile-progs/metadata.xml
deleted file mode 100644
index cc8cd37..0000000
--- a/app-misc/lockfile-progs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>phajdan.jr@gentoo.org</email>
-		<name>Pawel Hajdan jr</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-misc/mc/mc-4.8.24-r1.ebuild b/app-misc/mc/mc-4.8.24-r1.ebuild
new file mode 120000
index 0000000..afa70c3
--- /dev/null
+++ b/app-misc/mc/mc-4.8.24-r1.ebuild
@@ -0,0 +1 @@
+mc-4.8.24.ebuild
\ No newline at end of file
diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild
index 27367b8..7e12d50 100644
--- a/app-misc/mc/mc-4.8.24.ebuild
+++ b/app-misc/mc/mc-4.8.24.ebuild
@@ -24,7 +24,7 @@
 	samba? ( net-fs/samba )
 	sftp? ( net-libs/libssh2 )
 	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
+	!slang? ( sys-libs/ncurses:0=[unicode(+)?] )
 	spell? ( app-text/aspell )
 	X? ( x11-libs/libX11
 		x11-libs/libICE
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index 5c99ff6..d682e57 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
+    <email>marecki@gentoo.org</email>
+    <name>Marek Szuba</name>
   </maintainer>
   <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
+    <email>slashbeast@gentoo.org</email>
+    <name>Piotr Karbowski</name>
   </maintainer>
   <use>
     <flag name="edit">Compile and install the mcedit application</flag>
     <flag name="sftp">Add support for sftp (uses <pkg>net-libs/libssh2</pkg> for it).</flag>
     <flag name="slang">Use <pkg>sys-libs/slang</pkg> instead of <pkg>sys-libs/ncurses</pkg>.</flag>
-    <flag name="xdg">Toggles mc's config dir location. Enable for $XDG_CONFIG_HOME/mc, disable for $HOME/.mc</flag>
   </use>
+  <upstream>
+    <remote-id type="github">MidnightCommander/mc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/metadata.xml b/app-misc/metadata.xml
deleted file mode 100644
index 98bcf3d..0000000
--- a/app-misc/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-misc category contains various miscellaneous application
-		packages which don't belong anywhere else.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-misc enthält verschiedenste Applikationen welche
-		keiner anderen Kategorie zugeordnet werden konnten.
-	</longdescription>
-	<longdescription lang="nl">
-		De app-misc categorie bevat applicaties die niet in een specifieke
-		categorie geplaatst konden worden.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-misc chứa các ứng dụng linh tinh, không thuộc
-		về nhóm nào cả.
-	</longdescription>
-	<longdescription lang="it">
-		La cateogria app-misc contiene varie applicazioni che non ricadono nelle altre categorie.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-misc contém vários pacotes de aplicações mistas
-		que não pertencem a outros lugares.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-misc zawiera wiele rozmaitych programów, które nie
-		pasowały do żadnej innej kategorii.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-misc contiene varios paquetes de aplicaciones
-		misceláneas que no pertenecen a ninguna otra categoría.
-	</longdescription>
-</catmetadata>
-
diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml
index e6af8d1..943545f 100644
--- a/app-misc/screen/metadata.xml
+++ b/app-misc/screen/metadata.xml
@@ -9,25 +9,28 @@
     <name>Gentoo Shell Tools Project</name>
   </maintainer>
   <longdescription>
-Screen is a full-screen window manager that multiplexes a physical terminal
-between several processes, typically interactive shells. Each virtual terminal
-provides the functions of the DEC VT100 terminal and, in addition, several
-control functions from the ANSI X3.64 (ISO 6429) and ISO 2022 standards (e.g.,
-insert/delete line and support for multiple character sets). There is a
-scrollback history buffer for each virtual terminal and a copy-and-paste
-mechanism that allows the user to move text regions between windows. When screen
-is called, it creates a single window with a shell in it (or the specified
-command) and then gets out of your way so that you can use the program as you
-normally would. Then, at any time, you can create new (full-screen) windows with
-other programs in them (including more shells), kill the current window, view a
-list of the active windows, turn output logging on and off, copy text between
-windows, view the scrollback history, switch between windows, etc. All windows
-run their programs completely independent of each other. Programs continue to
-run when their window is currently not visible and even when the whole screen
-session is detached from the users terminal.
-</longdescription>
+  Screen is a full-screen window manager that multiplexes a physical terminal
+  between several processes, typically interactive shells. Each virtual terminal
+  provides the functions of the DEC VT100 terminal and, in addition, several
+  control functions from the ANSI X3.64 (ISO 6429) and ISO 2022 standards (e.g.,
+  insert/delete line and support for multiple character sets). There is a
+  scrollback history buffer for each virtual terminal and a copy-and-paste
+  mechanism that allows the user to move text regions between windows. When screen
+  is called, it creates a single window with a shell in it (or the specified
+  command) and then gets out of your way so that you can use the program as you
+  normally would. Then, at any time, you can create new (full-screen) windows with
+  other programs in them (including more shells), kill the current window, view a
+  list of the active windows, turn output logging on and off, copy text between
+  windows, view the scrollback history, switch between windows, etc. All windows
+  run their programs completely independent of each other. Programs continue to
+  run when their window is currently not visible and even when the whole screen
+  session is detached from the users terminal.
+  </longdescription>
   <use>
     <flag name="multiuser">Enable multiuser support (by setting correct permissions)</flag>
     <flag name="nethack">Express error messages in nethack style</flag>
   </use>
+  <upstream>
+    <remote-id type="savannah">screen</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 0a5f407..14ac703 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1 +1,2 @@
-DIST tmux-3.2a.tar.gz 648394 BLAKE2B 94527d4d1016caddab170b5bbfd181514768474898314241fb65a53a1f5ae94863bacedf90a7543690c115d15295960dfab4d5ba2ce31cd105585a73fb9b82d1 SHA512 6e52c7f5d03b2c8b8c4c8caac092a166956ba97334b426f2823d74dc5849a1d31a80145924f641f69dd2c244809e9350d9bd7070897fa2e3e1f9f086f9b2f365
+DIST tmux-3.3a.tar.gz 677448 BLAKE2B e835ce0f136175521035a684419f221864edb0a9506d7d68cbc0239b1349e78949ebd96573a9d8651a2df6d99acb433075d6e0c20d7394a53fe6b44bd9e56069 SHA512 29a846df7d93601c42a22f84f606931dc65da1f70b67d351d0425f77ea3affe3e8218b2940d42cd3dadf3cd1aa95032daad3ecb14fbff0f69939d1beae0498c7
+DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
diff --git a/app-misc/tmux/files/tmux-3.2a-Fix-crosscompiling-Marco-A-L-Barbosa.patch b/app-misc/tmux/files/tmux-3.2a-Fix-crosscompiling-Marco-A-L-Barbosa.patch
deleted file mode 100644
index 331ffd7..0000000
--- a/app-misc/tmux/files/tmux-3.2a-Fix-crosscompiling-Marco-A-L-Barbosa.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b1a8c0fe022e99cffb0fb4f321740464f35bc6b9 Mon Sep 17 00:00:00 2001
-From: Nicholas Marriott <nicholas.marriott@gmail.com>
-Date: Tue, 22 Jun 2021 12:16:48 +0100
-Subject: [PATCH] Fix crosscompiling, Marco A L Barbosa.
-
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index f6bdd3c7..30b4d370 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -160,6 +160,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM(
-          [return (strtonum("0", 0, 1, NULL) == 0 ? 0 : 1);]
- 	 )],
- 	 [AC_DEFINE(HAVE_STRTONUM) AC_MSG_RESULT(yes)],
-+	 [AC_LIBOBJ(strtonum) AC_MSG_RESULT(no)],
- 	 [AC_LIBOBJ(strtonum) AC_MSG_RESULT(no)]
- )
- 
--- 
-2.34.1
-
diff --git a/app-misc/tmux/tmux-3.2a.ebuild b/app-misc/tmux/tmux-3.2a.ebuild
deleted file mode 100644
index 380bbc7..0000000
--- a/app-misc/tmux/tmux-3.2a.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="https://tmux.github.io/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
-	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
-else
-	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="*"
-	S="${WORKDIR}/${P/_/-}"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="debug selinux utempter vim-syntax"
-
-DEPEND="
-	dev-libs/libevent:0=
-	sys-libs/ncurses:0=
-	utempter? ( sys-libs/libutempter )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	virtual/yacc
-"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( app-vim/vim-tmux )"
-
-DOCS=( CHANGES README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4-flags.patch"
-
-	# upstream fixes (can be removed with next version bump)
-	"${FILESDIR}"/${P}-Fix-crosscompiling-Marco-A-L-Barbosa.patch
-)
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-		$(use_enable utempter)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-}
diff --git a/app-misc/tmux/tmux-3.3a.ebuild b/app-misc/tmux/tmux-3.3a.ebuild
new file mode 100644
index 0000000..df6670d
--- /dev/null
+++ b/app-misc/tmux/tmux-3.3a.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
+	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+else
+	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="*"
+	fi
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="debug selinux systemd utempter vim-syntax"
+
+DEPEND="
+	dev-libs/libevent:=
+	sys-libs/ncurses:=
+	systemd? ( sys-apps/systemd:= )
+	utempter? ( sys-libs/libutempter )
+	kernel_Darwin? ( dev-libs/libutf8proc:= )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( app-vim/vim-tmux )
+"
+
+DOCS=( CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-flags.patch
+)
+
+src_prepare() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+		$(use_enable systemd)
+		$(use_enable utempter)
+
+		# For now, we only expose this for macOS, because
+		# upstream strongly encourage it. I'm not sure it's
+		# needed on Linux right now.
+		$(use_enable kernel_Darwin utf8proc)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+}
diff --git a/app-mobilephone/dfu-util/Manifest b/app-mobilephone/dfu-util/Manifest
index 885786c..9f29244 100644
--- a/app-mobilephone/dfu-util/Manifest
+++ b/app-mobilephone/dfu-util/Manifest
@@ -1 +1 @@
-DIST dfu-util-0.9.tar.gz 138397 SHA256 36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833 SHA512 caa7148b7a9004e2b1f7bc4f1a26b48abfe311743bc0eeed1ab57459910371affc39b6fe7e74b7cac6ca9de41a9901b7a970253ca92d7d66d5008f8a11d2c952 WHIRLPOOL 5eff75635854bb77ffde458b7c6c3dbe7d366207eaf340a5a6a8db132d34ca86d545c87a38c97c1c9bf109c2218b2499aa4c3dce374da5def952a39c7d893391
+DIST dfu-util-0.11.tar.gz 152462 BLAKE2B 3734698dd62de8a1c781f7631ae17ee9755241ce4d614b028fe6d6c3a117f3a301c174dcadf52252d55b08cfd75298c27a588e880837317ff73c32ab8863ccdd SHA512 fc5304a483ac10e35bf1b9304becdeb407b2e44d8ac51474d2fa17877e6cf71b0126f7e12ebb331d75e7adeb9c173ff5cf083a06ded5847dbe477534cf26a553
diff --git a/app-mobilephone/dfu-util/OWNERS b/app-mobilephone/dfu-util/OWNERS
new file mode 100644
index 0000000..92bfe2b
--- /dev/null
+++ b/app-mobilephone/dfu-util/OWNERS
@@ -0,0 +1 @@
+include chromiumos/owners:v1:/platform/OWNERS.hwtools
diff --git a/app-mobilephone/dfu-util/dfu-util-0.11.ebuild b/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
new file mode 100644
index 0000000..b577c8e
--- /dev/null
+++ b/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/dfu-util/dfu-util"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="*"
+fi
+
+DESCRIPTION="implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol"
+HOMEPAGE="http://dfu-util.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="virtual/libusb:1"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
diff --git a/app-mobilephone/dfu-util/dfu-util-0.9.ebuild b/app-mobilephone/dfu-util/dfu-util-0.9.ebuild
deleted file mode 100644
index 612f857..0000000
--- a/app-mobilephone/dfu-util/dfu-util-0.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/dfu-util/dfu-util"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="*"
-fi
-
-DESCRIPTION="implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol"
-HOMEPAGE="http://dfu-util.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
diff --git a/app-mobilephone/dfu-util/metadata.xml b/app-mobilephone/dfu-util/metadata.xml
index e7237c8..0d3d7a8 100644
--- a/app-mobilephone/dfu-util/metadata.xml
+++ b/app-mobilephone/dfu-util/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>embedded@gentoo.org</email>
diff --git a/app-office/metadata.xml b/app-office/metadata.xml
deleted file mode 100644
index 93999ec..0000000
--- a/app-office/metadata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-office category contains 'office' (word processing,
-		spreadsheets, presentation) software packages.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-office enthält Bürosoftware (Textverarbeitung,
-		Tabellenkalkulation, Präsentation).
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-office contiene paquetes de oficina 
-		(procesadores de palabras, hojas de balance, presentación).
-	</longdescription>
-	<longdescription lang="ja">
-		app-officeカテゴリには「オフィス」(ワープロや表計算やプレゼンテーション)
-		と言うソフトウェアパッケージが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De app-office categorie bevat applicaties voor kantoorwerk, zoals text-
-		verwerkers, spreadsheets, presentatiehulpmiddelen enz.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-office chứa các ứng dụng 'văn phòng' (soạn
-		thảo văn bản, bảng tính, trình diễn).
-	</longdescription>
-	<longdescription lang="it">
-		La categoria app-office contiene pacchetti per ufficio
-		(videoscrittura, fogli elettronici, presentazioni).
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-office contém pacotes de software para
-		escritório (processadores de textos, planilhas, apresentações).
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-office zawiera programy biurowe takie jak edytory tekstu,
-		arkuszy kalkulacyjnych i prezentacji.
-	</longdescription>
-</catmetadata>
-
diff --git a/app-eselect/eselect-python/OWNERS b/app-portage/OWNERS
similarity index 100%
rename from app-eselect/eselect-python/OWNERS
rename to app-portage/OWNERS
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 38a3946..a40241e 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1 +1 @@
-DIST eix-0.36.1.tar.xz 640084 BLAKE2B 10014bb847d71b803967354f3a415dc1c74ad37385b7b440f0c162c573453042d06bbc575582831ffc0aad6b0f7abeedbcb4e23b869505d4f85d6bd6b7cfbba4 SHA512 915a364b0f63124c53e43eb35165ce553f6eadaf8708f0c075dc2f4871fe83378cd0c8650d5605c1f87c512563fdd62f28efdc586b358fc7cd63ae42a404981d
+DIST eix-0.36.4.tar.xz 640776 BLAKE2B 32486b6ce5e5d2a32bb6fc8581bbc37da6cef9cac0cecbd3d0cc6db8bf5b6bcb3c0a31e28df462edcf06056d279a88e64b4c526b430ce40a0614c0367710243c SHA512 5b716cbd688bb5d8efadc7d47de9fb3238776ff10b11165abe02623421be82d17f2d51596d3f263219461188aa08974af1b559b4e43c31d9ee0682f21febb049
diff --git a/app-portage/eix/eix-0.36.1.ebuild b/app-portage/eix/eix-0.36.1.ebuild
deleted file mode 100644
index 8c78c9a..0000000
--- a/app-portage/eix/eix-0.36.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="debug doc nls sqlite"
-
-DEPEND="
-	nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${DEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-BDEPEND="
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.36.4.ebuild b/app-portage/eix/eix-0.36.4.ebuild
new file mode 100644
index 0000000..feba1fa
--- /dev/null
+++ b/app-portage/eix/eix-0.36.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="debug doc nls sqlite"
+
+DEPEND="
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${DEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
deleted file mode 100644
index 7025615..0000000
--- a/app-portage/esearch/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST esearch-1.3.tar.gz 19383 BLAKE2B 308cb075eff0a592135e883913bab3709b64a785602250ae06bfcb50eca6f8dacfb047bb4326b4b9476553bc8bd993b69295373cced7a18786a7834378e860e9 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4
diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild
deleted file mode 100644
index c11bb55..0000000
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-PYTHON_REQ_USE="readline(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Replacement for 'emerge --search' with search-index"
-HOMEPAGE="https://github.com/fuzzyray/esearch"
-SRC_URI="https://github.com/downloads/fuzzyray/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="l10n_fr l10n_it"
-
-KEYWORDS="*"
-
-DEPEND="sys-apps/portage"
-RDEPEND="${DEPEND}"
-
-# Populate the patches array for any patches for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch
-PATCHES=(
-	"${FILESDIR}"/${PV}-Fix-setup.py.patch
-	"${FILESDIR}"/${PV}-Fix-python-3-compatability.patch
-)
-
-python_prepare_all() {
-	python_export_best
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version \
-		|| die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc eupdatedb.cron || die "dodoc failed"
-
-	# Remove unused man pages according to the l10n flags
-	if ! use l10n_fr ; then
-		rm -rf "${ED}"/usr/share/man/fr \
-			|| die "rm failed to remove ${ED}/usr/share/man/fr"
-	fi
-
-	if ! use l10n_it ; then
-		rm -rf "${ED}"/usr/share/man/it \
-			|| die "rm failed to remove ${ED}/usr/share/man/it"
-	fi
-}
diff --git a/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch b/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch
deleted file mode 100644
index 36c9d22..0000000
--- a/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3978f923ac814aef014cf412b63d11fd94f60692 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Wed, 8 May 2013 14:26:48 -0500
-Subject: [PATCH 1/2] Fix python 3 compatability with 'esearch -e' (Bug 469076)
-
-Thanks to zmedico for the patch.
----
- esearch/search.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/esearch/search.py b/esearch/search.py
-index f91f5b1..696a0f0 100755
---- a/esearch/search.py
-+++ b/esearch/search.py
-@@ -22,6 +22,7 @@ import re
- try:
-     from portage.output import bold, red, green, darkgreen, turquoise, blue, nocolor
-     from portage import settings, pkgcmp, pkgsplit, portdb, best
-+    from portage.util import cmp_sort_key
- except ImportError:
-     print("Critical: portage imports failed!")
-     sys.exit(1)
-@@ -107,7 +108,7 @@ def searchEbuilds(path, portdir=True, searchdef="", repo_num="",
-                     data['defebuild'] = (searchdef, pkgs[-1][3])
-         if not portdir:
-             config['found_in_overlay'] = True
--        pkgs.sort(mypkgcmp)
-+        pkgs.sort(key=cmp_sort_key(mypkgcmp))
-         for pkg in pkgs:
-             rev = ""
-             if pkg[2] != "r0":
--- 
-1.8.5.4
-
diff --git a/app-portage/esearch/files/1.3-Fix-setup.py.patch b/app-portage/esearch/files/1.3-Fix-setup.py.patch
deleted file mode 100644
index aad5d49..0000000
--- a/app-portage/esearch/files/1.3-Fix-setup.py.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 94e77b115f5b14b7dfea50e4a7b77047e4b47263 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Tue, 18 Dec 2012 04:33:27 -0600
-Subject: [PATCH 1/3] Fix setup.py so that either VERSION or PVR will set the
- version.
-
-This fixes the issue with egg-info always having a version number of
-9999.  Fix is from Brian Dolbec courtesy of mirrorselect.
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 9d2addd..45a4c06 100755
---- a/setup.py
-+++ b/setup.py
-@@ -14,7 +14,7 @@ import io
- 
- sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pym'))
- 
--__version__ = os.getenv('VERSION', default='9999')
-+__version__ = os.getenv('VERSION', default=os.getenv('PVR', default='9999'))
- 
- cwd = os.getcwd()
- 
--- 
-1.8.5.4
-
diff --git a/app-portage/esearch/metadata.xml b/app-portage/esearch/metadata.xml
deleted file mode 100644
index 540aa01..0000000
--- a/app-portage/esearch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>tools-portage@gentoo.org</email>
-    <name>Gentoo Portage tools team</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">fuzzyray/esearch</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/gentoolkit/metadata.xml b/app-portage/gentoolkit/metadata.xml
index 38eac3c..f2cdb15 100644
--- a/app-portage/gentoolkit/metadata.xml
+++ b/app-portage/gentoolkit/metadata.xml
@@ -6,9 +6,9 @@
     <name>Gentoo Portage tools team</name>
   </maintainer>
   <longdescription>
-Gentoolkit is a collection of useful adminstration scripts particular to
-the Gentoo Linux distribution. It contains rough drafts and
-implementations of features that may in time make it into Portage, or
-into full-fledged tools in their own right.
-</longdescription>
+  Gentoolkit is a collection of useful adminstration scripts particular to
+  the Gentoo Linux distribution. It contains rough drafts and
+  implementations of features that may in time make it into Portage, or
+  into full-fledged tools in their own right.
+  </longdescription>
 </pkgmetadata>
diff --git a/app-portage/metadata.xml b/app-portage/metadata.xml
deleted file mode 100644
index 3872164..0000000
--- a/app-portage/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-portage category contains software which works with portage or
-		ebuilds.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-portage enthält Programme für das Arbeiten mit Portage
-		oder Ebuilds.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-portage contiene programas para trabajar con portage
-		o con ebuilds.
-	</longdescription>
-	<longdescription lang="ja">
-		app-portageカテゴリにはportageかebuildと使うソフトウェアが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De app-portage categorie bevat applicaties die samenwerken met portage of
-		direct met ebuilds te maken hebben.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-portage chứa các ứng dụng liên quan đến
-		portage.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria app-portage contiene programmi per portage o per le ebuilds.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-portage contém programas que funcionam com o portage
-		ou ebuilds.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-portage zawiera dodatkowe programy do pracy z systemem
-		Portage oraz ebuildami.
-	</longdescription>
-</catmetadata>
-
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 234c259..3f5f568 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1 +1 @@
-DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b9565866674303152b55248b05130a02 SHA512 2b0bceee63b894e7f517f3c938a1873aa90c41b668abbf6a39125a1bb9ce1059731e34216cc357787b5cbf83a0cf0748530147262673ea0bc26404d6274714eb WHIRLPOOL fdaec19af639c744394063dd57f7e64fb02ff10c4ee5b1ef2f49928df6d47fb5bf732e547264390787e20ca6e3251be3935e9f348f2510aa0fc6779778ca44ba
+DIST portage-utils-0.95.tar.xz 1806140 BLAKE2B 5a468a7b4006073203ba634a5d70398e254ef5db7e9b71fbcf20bce68942f74acce1d42b5d315931f93e8698c8dd2f38f328fcc6fdaa86addba7dbcc21fce5fa SHA512 2d1f4b986a377249043259d8ada1a35a7dd55179f0ef5c2c18a4180c8f1f7064133ab2677426098e61b1355fa26cb0f8aa3c6ea06d46af4c4ba2df4eb53489a4
diff --git a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml
index dc0ec12..45af655 100644
--- a/app-portage/portage-utils/metadata.xml
+++ b/app-portage/portage-utils/metadata.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-</maintainer>
-<upstream>
-  <remote-id type="cpe">cpe:/a:gentoo:portage</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<use>
+		<flag name="qmanifest">Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing</flag>
+		<flag name="qtegrity">Build qtegrity applet, this adds additional dependencies for OpenSSL</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gentoo:portage-utils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-portage/portage-utils/portage-utils-0.63.ebuild b/app-portage/portage-utils/portage-utils-0.63.ebuild
deleted file mode 100644
index f4f140d..0000000
--- a/app-portage/portage-utils/portage-utils-0.63.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="small and fast portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="nls static"
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf --with-eprefix="${EPREFIX}"
-	else
-		tc-export CC
-	fi
-}
-
-src_compile() {
-	emake NLS=$(usex nls)
-}
diff --git a/app-portage/portage-utils/portage-utils-0.95.ebuild b/app-portage/portage-utils/portage-utils-0.95.ebuild
new file mode 100644
index 0000000..8192654
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.95.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+	KEYWORDS="~*"
+else
+	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	KEYWORDS="*"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="openmp +qmanifest +qtegrity static"
+
+RDEPEND="
+	qmanifest? (
+		!static? (
+			app-crypt/gpgme:=
+			app-crypt/libb2:=
+			dev-libs/openssl:=
+			sys-libs/zlib:=
+		)
+	)
+	qtegrity? (
+		!static? (
+			dev-libs/openssl:=
+		)
+	)"
+DEPEND="${RDEPEND}
+	qmanifest? (
+		static? (
+			app-crypt/gpgme[static-libs]
+			app-crypt/libb2[static-libs]
+			dev-libs/openssl[static-libs]
+			sys-libs/zlib[static-libs]
+		)
+	)
+	qtegrity? (
+		static? (
+			dev-libs/openssl[static-libs]
+		)
+	)"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
+		$(use_enable openmp)
+}
diff --git a/app-shells/OWNERS b/app-shells/OWNERS
new file mode 100644
index 0000000..db7e695
--- /dev/null
+++ b/app-shells/OWNERS
@@ -0,0 +1,2 @@
+# TODO: Add per-package OWNERS and delete this when done.
+*
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
deleted file mode 100644
index 02b5487..0000000
--- a/app-shells/autojump/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST autojump-22.5.3.tar.gz 55429 BLAKE2B 3a2773669f81d1a54c01cce9fe75bc01609265998b035b4ba1aa064f1132acf852b59eb04ebfa744e628152f0ab478cbef24e5aff326bf84cec6e2c9348e8360 SHA512 d1dd3cbb67fda4e0a17ec5028b947faf46be8a95a6cd8418127b927f42bc95b71538a06658b38b479c77d147a6cd5e8cef77639ef538c7d449414c469c13f140
diff --git a/app-shells/autojump/OWNERS b/app-shells/autojump/OWNERS
deleted file mode 100644
index 28f18c1..0000000
--- a/app-shells/autojump/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-msturner@google.com
diff --git a/app-shells/autojump/autojump-22.5.3.ebuild b/app-shells/autojump/autojump-22.5.3.ebuild
deleted file mode 100644
index 6f491c3..0000000
--- a/app-shells/autojump/autojump-22.5.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit bash-completion-r1 python-r1 vcs-snapshot prefix
-
-DESCRIPTION="change directory command that learns"
-HOMEPAGE="https://github.com/wting/autojump"
-SRC_URI="https://github.com/wting/${PN}/archive/release-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="ipython test"
-REQUIRED_USE="ipython? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not all tests pass. Need investigation.
-RESTRICT="test"
-RDEPEND="ipython? ( ${PYTHON_DEPS} )"
-DEPEND="${PYTHON_DEPS}"
-
-src_prepare() {
-	eapply_user
-	sed -e "s:/usr/local/share:/usr/share:" \
-		-i bin/autojump.sh || die
-
-	# autojump_argparse is only there for Python 2.6 compatibility
-	sed -e "s:autojump_argparse:argparse:" \
-		-i bin/autojump || die
-
-	hprefixify -q '"' -w '/usr\/share/' bin/autojump.sh
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin bin/"${PN}"
-	python_replicate_script "${ED}"/usr/bin/"${PN}"
-
-	insinto /etc/profile.d
-	doins bin/"${PN}".sh
-
-	insinto /usr/share/"${PN}"/
-	doins bin/"${PN}.bash"
-	doins bin/"${PN}.zsh"
-	doins bin/"${PN}.fish"
-	insinto /usr/share/zsh/site-functions
-	doins bin/_j
-
-	python_foreach_impl python_domodule bin/autojump_argparse.py bin/autojump_data.py \
-		bin/autojump_match.py bin/autojump_utils.py
-	if use ipython; then
-		python_foreach_impl python_domodule tools/autojump_ipython.py
-	fi
-
-	doman docs/"${PN}.1"
-	einstalldocs
-}
-
-pkg_postinst() {
-	if use ipython; then
-		elog 'This tool provides "j" for ipython, please add'
-		elog '"import autojump_ipython" to your ipy_user_conf.py.'
-		elog
-	fi
-
-	elog 'If you use app-shells/fish, add the following code to your'
-	elog 'config.fish to get autojump support:'
-	elog 'if test -f /usr/share/autojump/autojump.fish'
-	elog '    source /usr/share/autojump/autojump.fish'
-	elog 'end'
-}
diff --git a/app-shells/autojump/metadata.xml b/app-shells/autojump/metadata.xml
deleted file mode 100644
index 2e49411..0000000
--- a/app-shells/autojump/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mattst88@gentoo.org</email>
-		<name>Matt Turner</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/joelthelion/autojump/issues</bugs-to>
-		<remote-id type="github">joelthelion/autojump</remote-id>
-	</upstream>
-	<use>
-		<flag name="ipython">Add support for <pkg>dev-python/ipython</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/app-shells/bash-completion/metadata.xml b/app-shells/bash-completion/metadata.xml
index 5ceec3a..b8af55c 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
@@ -9,20 +9,26 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<use>
+		<flag name="eselect">
+			Support blacklisting of completions via 'eselect bash-completion'.
+			This enables custom Gentoo patching of upstream completion loader.
+		</flag>
+	</use>
 	<longdescription>
-  Since v2.04, bash has allowed you to intelligently program and extend its
-  standard completion behavior to achieve complex command lines with just a
-  few keystrokes. Imagine typing ssh [Tab] and being able to complete on hosts
-  from your ~/.ssh/known_hosts files. Or typing man 3 str [Tab] and getting a
-  list of all string handling functions in the UNIX manual. mount system:
-  [Tab] would complete on all exported file-systems from the host called
-  system, while make [Tab] would complete on all targets in Makefile. This
-  project was conceived to produce programmable completion routines for the
-  most common Linux/UNIX commands, reducing the amount of typing sysadmins and
-  programmers need to do on a daily basis.
+		Since v2.04, bash has allowed you to intelligently program and extend its
+		standard completion behavior to achieve complex command lines with just a
+		few keystrokes. Imagine typing ssh [Tab] and being able to complete on hosts
+		from your ~/.ssh/known_hosts files. Or typing man 3 str [Tab] and getting a
+		list of all string handling functions in the UNIX manual. mount system:
+		[Tab] would complete on all exported file-systems from the host called
+		system, while make [Tab] would complete on all targets in Makefile. This
+		project was conceived to produce programmable completion routines for the
+		most common Linux/UNIX commands, reducing the amount of typing sysadmins and
+		programmers need to do on a daily basis.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="bitbucket">mgorny/bashcomp2</remote-id>
 		<remote-id type="github">scop/bash-completion</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-shells/bash/METADATA b/app-shells/bash/METADATA
new file mode 100644
index 0000000..e7679ed
--- /dev/null
+++ b/app-shells/bash/METADATA
@@ -0,0 +1,8 @@
+# Metadata for CVEs that have been fixed with patches.
+
+third_party {
+  security {
+    # Below security patches are already patched in via PATCHES.
+    mitigated_security_patch: "CVE-2022-3715"
+  }
+}
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index ac6e2c5..b6a9dd5 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,5 +1,346 @@
+DIST bash-2.05b.tar.gz 1956216 BLAKE2B 15962417d13c6eec0db0861b601c33a6b13dc38d41672258f8f9fb8968a000ca1df7d5d3c99bbcb023e0b6b3e703d6c250291ac68ab3f24159eec7c2f0105b43 SHA512 595f84cfd38b239ff37f2c6fc22c669f8e1d4fea34400e30c4079ab657d05f735ee6b0e6af0db6c1b17dbf9cecec81805b467b4dbd45cc97044bfefac731aad6
+DIST bash-2.05b_p13-patches.tar.xz 4152 BLAKE2B 0f3d25f9b3a5df36a2da32b9cfc16d23901fd3b63578863903ff01530b9c524338d5cadd0ebe7d4fb79f7ac57945d77a3432578d7c2702a49f650d5774772453 SHA512 ef040ed2f53bae49cd84615adb513031a4dcbccef1af0669c2464ee7e3bd87615cd250d12342483fc895b0e8e6120bbc3b5c28b0d9b94cd3c6fe48d6c510d1f1
+DIST bash-3.0.tar.gz 2418293 BLAKE2B 7013cf7020e61987610933df55b1cf34036a2912c1844e87895535e7e77b28e2526b2a336365bd15cd2d528d9769783ff34c120c2d6932d8708e0b029ff68715 SHA512 2b56dc0531e908811e1cced23067d82505d57a3cf4651125a6e424649bc98f476366579306e03242388f0f5b17d2a09badc15b8358f70cde6f64c60b94015c9b
+DIST bash-3.0_p22-patches.tar.xz 13564 BLAKE2B b7107ffb3f9c592950f10369ea6c00f40e67eacbd42a23821a3db71f7326fba016a6b3e868cbe6f61fc00204a5ea02be27fa699aa3776afaa4b0aff5ba1f2f00 SHA512 146ab52e716cdb5c0896cf95b423662ed39acab5a0c34530cc1f9b3084dd68af8df52e9c69a7b206aa57b67911bdf138f2d46441b9cc1e533b028dfeceaa233c
+DIST bash-3.1.tar.gz 2533934 BLAKE2B 5cef5bb8a1b36688d578967e97bf19452f79f68012e4c720baceaf31cf1cd03d1dac0962d2b663a3b83bbea71b131ea54e15769fd22575ef1e610fd97efed615 SHA512 3b5d5f0de83d71c972e75267ab8f6b05a7e144acb39a7c6e14be7b4bcb9b67faeaf9a123fceebd957befa1222db05b9b539f524032d89eb1fb5936d9846c1c7e
+DIST bash-3.1_p23-patches.tar.xz 5792 BLAKE2B 239cd54b576101745f1d054b0de9bb7f8071329a99c46a04d35f1022cd0a8bfc86b871bb31637d924d8822f23de63922572966af548b6f76191490180592dd9e SHA512 26ac839cd00b19ccf4e170faf0ac044d31158d77c6cc00654cd92a6a4312eb5ded652fd2f3347d997dd1dc13916b1d5471ce2bcc6d1af5af21ccab25498febc4
+DIST bash-3.2.tar.gz 2529838 BLAKE2B 1e145f31231b0e5b0a2bbf2046e14df9718552856c01dc9699d75596b353ac0c8ac1d3bcfe4e0bd1a38aade6e775499f967925f74efe39f84611ac2b562ab47e SHA512 cc88b1a4dab9f752cf6a22153e40b8590f6d3408217730bb28f5eb431cbb5577c4d3befe8bd44669b8fa64433f299e0dd23511fd1ed8a820020e2f7f4a461758
+DIST bash-3.2_p57-patches.tar.xz 6060 BLAKE2B b6ed8271c8bd8dc765b1ca431ab524734f3a8486cacc54f7d1402a568f4dfe2569dad226bdecfad4aabdacb77491a9679070afaf9c80fa40bc44fd1e4d5c2f17 SHA512 aaec0d98cea6fbe8a34ea430d289314fa4db98c284eefa6dbb787da6061d13ed0b89ce982c0147fa7bd2e8935fd955f106a86c2ddb38476a9b8379404394e42b
+DIST bash-4.0.tar.gz 6230779 BLAKE2B 747614b0e7aa5aafec25850863e228837ac941a3285ec01e8adafde63ebb98c9211d1a8ae0782bc700340559a9884014c84c5ed2867cf40027886dd91de001bc SHA512 dccd099d11d649b26d5b5c2ab5fb8f33915631e1d86fba519a0464f2bd3a3289655e956cf161a0dc3671b8be193b6b065bede8a407d98af3012dd4b824711255
+DIST bash-4.0_p44-patches.tar.xz 3036 BLAKE2B 2dbff6f391b0b6a239b693578812541004de81c841d32eb6e4d7dbb2ab436a9d4052de4e44ec753fa669090fc1c4420bc2607839c533b7a7477c91cc7c5ace35 SHA512 d81a8d625e1522195c80ffa010b8862fe304f470187e1a12be673fd04cfd22d3605a30fb53b718817c07404e793c1738a5dcb94902566304c28a5f8eb679c395
+DIST bash-4.1.tar.gz 6598300 BLAKE2B 8ed70736071f7d946b939247dd43214059c7d545d99e4c7ec3388da263eb4f3faeeef939884ac8a489ded71fbfbaee15bb1cc6e29f3397f6e2c0d1e1d7097cda SHA512 2f2a053d98be9a31cd089e1293e3369ad05406f6543d1d1662d8b5807fdcfebc1dda79db9bf2c596a6351ea463fb9bd9c8943c1d45da9b82f2fd3bab0b8a581a
+DIST bash-4.1_p17-patches.tar.xz 1604 BLAKE2B 95dee794fd9890a47f5571a5921bb7abf0708da522a21bc7ee14a75461c0a618cfd54d86f3e210580395aa10c53e9435728a6bda97c58970108ba5414d93ba38 SHA512 1a31b8a0423fafd6449fbfd8d4eb11877e8016f0fb8eb53c48a821791bfe1f7755d9a9999b08cdced39afdfcd3b2058b91a555a31ff4aeae472fc076bd93120f
+DIST bash-4.2.tar.gz 7009201 BLAKE2B 52a4432ae401121ff187487a75a6541ce001c24d7d2251c3f0e33a58e93ff0c11b4c988003c6c740c13a51df0d752565023b8c39e79c96de52c73b49cc180523 SHA512 fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c
+DIST bash-4.2_p53-patches.tar.xz 4112 BLAKE2B bff4d8db9af567c0e5966f45941dee99562674c462670ee8339e8de4a68f5a2e4c4ace9dd7929c39df8dd24382cf99a750745612dac3b11e7dde8e4e321b9f32 SHA512 83f0fbf4943aa285c1c241854e6952669d078b17015c02c37e43e3f1b92b6f2bd9aa20c72ff6f4322089051035e81943885c22a059f2db63edb5c60970a65d12
+DIST bash-4.3.tar.gz 7955839 BLAKE2B 398461e90a1ab6fd726b1a9db41c4c2a1e184034e3b96029bd17097338f1f9869d1c2216bde0b5b3c8e561629824348a0da3045cc425914e8e024180a175efe4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651
+DIST bash-4.3_p48-r2-patches.tar.xz 1080 BLAKE2B 2dfea3d3b24f6e03a2ba4643000599f7afda45bf07c78fcd748626304a6e31e3b55ca62043a41c9081d54cbe652e326d2ae90d1a07ae1f96ae99393e30dd6680 SHA512 a90886833c4b9962795fb3bf4b0b345e493fa90f0676ef6b618e8838cbb89ab8b298b0df0706bf1c11d817f56273222e1b44b1f4921e6d23f5b570bafdd0949c
+DIST bash-4.4.tar.gz 9377313 BLAKE2B ac0e481dd4f2d5b91eea4f0156f1fc398ef8bd1ccd941366aa9b041be576114c51e1ff1431ec871e96fb72257c2a05a0ebcbd88c43c221610fef7dfdb2502fc0 SHA512 73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29
+DIST bash-4.4_p23-r2-patches.tar.xz 664 BLAKE2B 4a5b71b95744be6b22807671ae3348aeb236b0c50d86d2dcaf142d847f3616d2b40858dae99fadbddfe1b206a86ad7730a7ef43a1864c18840b0ce97add52568 SHA512 0cddd5a251e0de52a8717cb7bfdc46745d9b3b5192d6cc81125afc5ac7d65748641af3d8e2241d3bbf642a485a23960fe02177901a6184135bc79b68bbdb04cc
+DIST bash-5.0.tar.gz 10135110 BLAKE2B a6c4d79144aa0c0f4a9433d618085c0d46b792b1de429b161f9f0266b55c099e13e44416c0886758a6f29411f5ceb79bfb0ec4eda47473f2713ae0b8081d6d3e SHA512 bb4519f06e278f271d08722b531e49d2e842cc3e0b02a6b3eee422e2efcb5b6226111af43f5e5eae56beb85ac8bfebcd6a4aacbabb8f609e529aa4d571890864
+DIST bash-5.0_p18-patches.tar.xz 804 BLAKE2B 89e615a08920a4cfc90f72d125a8256275b0677fb2d7abf208ca90ac80471d5fbf7efb86c814b6ccbbc65772370ed8fe82b7cee9b247ec881c0b664dee152f72 SHA512 538f817867ff3613f2177f2e6d9fecc69057152ac9cf35a5a7448ddc83960b94bc8e8f2987226ba68d14de376127ee5cf6c83f5374b74feb14fa1c5aab6105c7
 DIST bash-5.1.tar.gz 10458638 BLAKE2B 42059556694b604911b5b7936f94d42d8923f2931f3ebacefd95454274c7baadb1ec97629a524c1542e2e282dae66f1389334f8edc572ca8ee841cc3ac449ba7 SHA512 c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c
 DIST bash-5.1.tar.gz.sig 95 BLAKE2B ac9209d6a4ab4436c511a7a195594e9036d7d1aef7887972f61a0e97378a9685b882621d7f95f5326b155dc155c41635417ce2ca41ac6d0dda78bd293ea4249f SHA512 3966404c0f683c7ef214fcf283b551e5441af3897009f778308c2e34067d98d57c95561453416a54ca5b1daf9a1288dbf950fe3f13353703cead12f5eec5fad8
+DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015 SHA512 c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7
+DIST bash-5.2-rc2.tar.gz 10925605 BLAKE2B 839be13e89b679bbcfca19f2e331e471639ceab0187f1b5127fbf647199f565047ed309b9e30ec5efe6c6095acf08959e732d620f260d4c96ad2bc161754535b SHA512 431e13c93f846c16b87d75d63f2b3f7514528e36ae30a2e75866d93a988b87ca1ea05415bc672390fcdb2f94cab9555a0ae5390fa3b908764b906a3c5d58f644
+DIST bash-5.2-rc2.tar.gz.sig 95 BLAKE2B 446d310659eda48ee27f2982609073904e36e64dc439ef79d172b7326199c71d87e13daad8c069e3f9c20a4db4986a76793a5f7bba0ce1827531fa351eb7b47f SHA512 c9c3e218681ec367562b7c55785a18843d40f1c0cbdd27a5f4c07d94d5e797f7d735ed7652f56f6fcb065e9305508b578d64dde3d83f314c86447fc8d537126f
+DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
+DIST bash205b-002 755 BLAKE2B 6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883
+DIST bash205b-003 2356 BLAKE2B b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399
+DIST bash205b-004 1110 BLAKE2B 086f2e29dd585b36c34d56f7f13d616d95ad2885786b849a3b2a352f0dfa3a30bd39a0a17724472eb2e46d851d7eb1661aae15dd0b81e50962ef9a1ef6c7af27 SHA512 d00fbac75340aa1928628010723da44f1f4c505194a867f380ece1b92d82d0e619a6c8431c6acb39433d10743de90fd74523a397824989ec96109d0a440e8185
+DIST bash205b-005 2217 BLAKE2B f73fcb282d94d44e1315a59816d222dce153fca09e9aab3739b20891b904d4e210a0e296e084166f578144977d3a7ad7dec601315a2115775734837fcf2afb4a SHA512 76d2f2b4cc14263e0776b9425bc8e660e25bb6e8e7c55b05d3b96a0397ebe1ac8de262997e6b093e58c0f6ef1b662067f64065b086325988d5e867d545bd8bc1
+DIST bash205b-006 3155 BLAKE2B 71b1fef519f24da6db2f2f5428c4975cdcefb93733e66081e6647dc690e0443bf987a906ff0127d519fd193aa90d6ca28ac3f9f82d037acf3b8976e0787b1fc1 SHA512 95bf5b3e5a30b5b14c6896bfa774f463c3271dad5d2678495b25a11700734eb5b0881e2e24a9b758800dd4ee031a464c4c0817ee6924f69937c482456fbb038a
+DIST bash205b-007 1072 BLAKE2B 749602e9aec628b501d865a57f0fff06e944de7409ebaabb5bb52ef5de6e9c69aa8971926d84f80d3e005e1742461bbbd184153a77ecf9ea582c816ca949f407 SHA512 9849bcd97940c12c0ed4e87d11a0770a221e52daf2d6b86f39284f9a55113f3e44317f628f0ae54911373d2027109606740512eebef7043d5347d732ff453315
+DIST bash205b-008 2824 BLAKE2B f75bae0cc9bc50e70021bd1c23fb731761f32af313fb395e91097bcf2b9dfcfa40dd635c51cc582d5d6d82b17c8b74123781d36ea40ec6206454a900321c57e6 SHA512 9b1e5af8d8a458c0d4b233985de3d69f774dd1b3941e567495717eacc183d0e2bb82139088e1e22be920681978d764476092aa5235e70ed4358d5fc8f19a9aea
+DIST bash205b-009 713 BLAKE2B 4d1cbeb66b2c57cf0cee047d6f7017847d84c82102adf6812b5263462a5d3a5e24212e90e5d40090a74b9e47ad66cf2a7a6fd8f02256b34f807e13005d9b1d9d SHA512 1daf812eb2fe902d591f63f65bfc02d00556cb8a77ebde5e6820cc3d3dd4c93332b95f048378d6619861f3801f7ba6eea9bafe5c2b4db03cea530cd0c35ccc25
+DIST bash205b-010 6267 BLAKE2B be11ba79d7f074c895ff35eaf427a3662420e9c764ab249cb5193da8fe025807c85584d15258546ba9b0d01afe130e65a7e9ba377218ae1e195bf9f5970ed8ef SHA512 6272608dd5ff55a22ceb9e6f6991a53b9ea0d809e1d1d8c10166519b62fb8fb78e24c9fd274ff8962fb2ac536150afabc88dfd0d5c14dece2c389b4fecdc5993
+DIST bash205b-011 3223 BLAKE2B 676aa8307d7565035a85aba8ef90a79df0f60f148c767e3d45073c5635714cd6d4579a2c7ee716696aa2ca533de0c39a3327877311906f735a8cbf3a4de7d87f SHA512 3ee695648389d5cd59e1bdb4e940e93239c67b19082c43989bb6787da44f101bb593b7ba3514d859ce5c4e603c879610accc6862d3e5f69a6c02de359a6097e0
+DIST bash205b-012 1377 BLAKE2B c440b739a706b64f8175a3685e788d7b438e8bce6ee80e186899ce93064b9b331986d858e9e278ad51e3c97a7d09063a1e5694c5fcd4b78ae8d9234e2dc7fed3 SHA512 4e02219ea03ceffa33ab84646048e7f52d6371a25e2df422fd58f349f102372934e640200eca41038bfd6d69a8d45291a0ab88696b83d565d190015e4e457771
+DIST bash205b-013 2779 BLAKE2B aa3207faddd4598e240dcace9bb11958fab4df22cb0b23be8ea1fcb1620787f273f8740e178719e66d8a0e2096709c437e61da222ba872a1424787552c0767eb SHA512 22e487265b446595583276a1e99a222f55173528949cb4ed8c34911447bf5716152569a0a50061e1c6b73ca0d7abfdab8fd0da5dd4a424e54192d91399a1593e
+DIST bash30-001 4999 BLAKE2B 9d2442cd38f55cecbf32aa403de48a23fb53635f20fbad26b68d0be9e5266504fb2527dbab53a555e50676a58a7df38934b9df90ed94d0d22c0a23590ec0acec SHA512 70fca2ced05f63841a7be3b115f068e29edb384dc0ba61680fbe7e29212cc139864a5db8c419aa03b773e1dfb52d71b7f17f9fca8f4284c75250cab450450750
+DIST bash30-002 2119 BLAKE2B f099cc97b27eaa7d4ad05402d8b5e5f96744d67f18e64026f2d25c25bb5b58b19f4deb57d7c68615dd48bae4e4f2951f6713f96970a534333bf967a45ca1fb9d SHA512 73b2f22c91eb90487d722537c42871fe60fdf3cd95d0b2c9f7bf20aef2424267fe50cefb0837b26c49b2944e0a017d8d990e01ee8523c23d74acdf2aa10502ef
+DIST bash30-003 4669 BLAKE2B 00100efc263f7c43bf0b4cdeb6c3084d4193280d8a7cc3b89c3e8f0337b08a4adea8777997b299072ca9de4d8ea74ecca04e1edf19629eade7dffaa24a73eb80 SHA512 7ccf778e9fed7a85004825ad83b350b43859395c41a998480f1bfd589f6b936f2d3e2096e05f7811061c5efc168601b75decdc74c95363455e685465827a31a3
+DIST bash30-004 3372 BLAKE2B 2d9c58403a09329ba1a8ecfcd29b032f010577cc05e7399c5acbe22b28b64f27ef259581b43b1ae98a13f16890db45ee29a83e745f639f9a5d08bc4d3d79a30d SHA512 93cd7c7d7d84c9a15a7c0f434096aea9cfa027c76cf6b7f06a722bd47be22eee8a19c5601d7546e9e00b2ea83473be130d05ee2e4e05bc2e99cf07302b4247c0
+DIST bash30-005 1776 BLAKE2B e667fa30112dfec672fd383e3ade9db54ac5f59a16198888a16280c2a14d08a28f8dca51ba378b1034b8d15c937a4220491ea2108909902a156966a62626d92d SHA512 4682a35f301fbb1f1dd20b2f120b5c3a7a88345da15f7a859cbed193efafb06d95d5b31a038b273b996ee0237fc13f2a10cd0bfb0e994d8d2eb01b7990edee11
+DIST bash30-006 4258 BLAKE2B d82fb23be8053759ad623fecc026fe6724570fd7b278e6f0e00d3b5b1409d239aafba54b8b40f0167f7fffce5f6c326b43d03a2a6a21eea8ae23b8f94cbbc189 SHA512 49d0c847b9505677f8d7ffcac1a24b93c6946aed756b94f891110dc7751ca515c29ac79463a5d3f5b594be698a88c56ab1a2d5dec0d6141a57aee254e7e1e80c
+DIST bash30-007 1808 BLAKE2B 6b392b44d524b4fe43cc3524124a3f6b896a6d41379849fb9ff2030042d9a15eaa6f1ba36e2d6fcccb5bdce31b10f0a935f3bd5e2f034a2acec0aa036dbc76ae SHA512 a57305b0509dfe81d87db2ad377301d50f4486f1723df763318d51c2bf947ad3d6b3bf220516e9f71151818e9b959e6e811c7e2c626519c18f355f1cb2f18731
+DIST bash30-008 1220 BLAKE2B 98b1ed1f907ce71a3c5268a8fa543dab0bb24218cbc8f5608ba6b3015dafe0fd68624129451c44aea7a96ed1a0b04d3534ef07fb58de3f5a4650793aa877cd02 SHA512 aef8fc04b31abb4dccb64a305920d2e935222466a8136fc9e4fbbac5e567e9b573d3170211d576fe52e22d8afdc84db4f40d9451784010a77f821045a96c1f27
+DIST bash30-009 2828 BLAKE2B 9677b9750472f7696f39378e895469646208ac51982e7ccd0a64e6fa296253fdb565fec4c6b12b25b2fc376e4a3324cd0127eba6f5c58e3eac8d5827e230387a SHA512 d6eac26af855efa4b0d080d7c15d8a346351141725a9b405f098bb156d3ca4d5bf32affa75a75ff4bc45f4b4ec40d22c604f64e55d89503dfbee5d68ad9e83af
+DIST bash30-010 3193 BLAKE2B 5b6bd8b78374cc3cd516c66ad8da137d6b412d9b9055b8fa234a8df27db5c04f38f4dc9cc50f09867aa720faadae435dfdd77b95b337c1a4eb2f8b7815d316ca SHA512 f67e7594223d424f901c080b8c5d8f78882bb208a96a539b8a9c06c63f12f8b647e7173b814cf44800f00d6e02cd542d3e19fef4281c9c41e65d786e68f2808e
+DIST bash30-011 2635 BLAKE2B 28b685997659c5708c6a6b72dcc1aba18815460d802cc6554ab57d7c761d14754d2b4cf3aa5f295d594fbe2e835b6093ac8fac733ad7e52ccef4dc52aba8d041 SHA512 de8c33e665edf75b4ed7e5a866a49e718a8d1d052ecfb84a74e3c72e8466a7f809b9e77c548f06aac2041d9ad71550a931e504b1906995782a77826b82ce6d63
+DIST bash30-012 1395 BLAKE2B ccf2fe626fc135a2f0c3da18953abcb116ef1ee12acb3cc43805d776c405bd0fe7d5a20a079279dd22bb27e1d007545f4b3980eb26cf20a89406bbb8614affdc SHA512 7f8a51b3b30dae139bb0b048f8552ccf96494cdd8367ead2718e56cd772db2f97f375c7a62157843af5af6235625df21cddc56c366ca5363c87551b2c91763df
+DIST bash30-013 1963 BLAKE2B 131bf126c41b656ed811af62ed9883b227e8a2e2a9e42460a3d9582db9df32f0796882c7e81b89fcb80114ae2c717e082e0c01e7be80cfa47d4fab060dd30ee3 SHA512 a3e7a1fef8fa0bbefba09fd49c10f87b604b87635c16f08e61a3d4053d6a202d3a955679caf36b7e32141cadb1ffa1da73fbedec0dfb55096958a318457c7721
+DIST bash30-014 1165 BLAKE2B 110725a6485d4813c3ac2e798a0b0f7be5111cd80348ecdf52c47c7b068e7a8935b84029a811c164d5a8ae602e9fc4b67441a79e5ed02bdafd7f3ebd5aee8277 SHA512 0d1e59c8e3d2fe9ea6f4a047d18188e39ddb0448b40815148a733f73c57d48cf69082c4c9475d57532721d3560b2f5e1bef7e3903cd18fcbdc2133d0d854b7af
+DIST bash30-015 1480 BLAKE2B 13ac7aed7fec12b12b9f8bfffe3ad1d0dcc52e41e967278687f378b1714c6026c5cbdff3c2d99cb37d6a63a3898948776299ce1eb8247293920d0a4303c0fb6d SHA512 ea138da9ca63badd647a4bd56f637f144bfac715617ae3a6d04e90983672544299ec8ffad2afcd01e7aa8ec6a5532206441a7b2e283d7fcb9e87b5cfcda6129f
+DIST bash30-016 2453 BLAKE2B 9e27af1402cd6ff8bcbf67ee1e81cefa3cab43c95fc74f0d1ba3ed7e0161182e63c823535ddbe6d00a83615c72bc38965bb2abc16c23253db23fbf20d5e2300d SHA512 ec97d4311a34527545a179ac251720714ff94ee1d7c8bb01393d847eefd40c148cc4bdb22c2e2d951b9ef7315af2a914a6e5d775611af388a4b57f6c0de230da
+DIST bash30-017 3226 BLAKE2B 8b03fa2622744187ca8f8b9b6d34a9d1cf636867b3609e1cd8adee0ee7ce99e096e8c5efcf6edc749301ae82925858483b570a6aa53fdef2ad018e1a71afdb74 SHA512 c7c621f4a683b10b6e55729121786484ac075e050b82c848ffa2d79518759cb21ebd2fd7f7e529b7f2bfe95df79d6e2bd270b9fd5c91fac275a0ca3950884d56
+DIST bash30-018 1115 BLAKE2B 72efaa80bf83c0e2d97963e0e2187c2101fc4bb41e56c545e55e39907aee678cdffb20578ec24801eb539532d64dd4c759df1f73745f18c195103c76047c976e SHA512 013edd5b11c526cc0539aba875064df046a6d93f6d417d7b2ac323a21e3013d6bef3b2dbde5773d6806445db60406c92acd697719eb4b689ed96909d209384a7
+DIST bash30-019 6676 BLAKE2B 71a6fa16aee526910fdfa8e189ec75928f185ce2101bb9424148b2026eafffe097091f7e41b8eb5e41d404250e624e853250e89f01e6bc06b9f498cd97bd10dd SHA512 919a3d5a10e60899bde064b875ef593ffe9ad6265f4cb48cfb92791d7ba603db8e20ea31bb933c62ccefe345ef6fd0ec8ead7a0fde53f20262f5cd05e22f6929
+DIST bash30-020 4035 BLAKE2B 68dca567a04c8472457d53423b845dbe8245e890949a24e834440333da9b71210309fa570ea2f8839b516323c84803fc809873b72cb8209a553103741d5656dd SHA512 23696d437b8f0f56e1f6e20fbff2700f15001e6854b08269dff654046b2ca6ed0f6d040f308d486cc0e584315695c45c8f47f69196942a83f095dcb06197dfc6
+DIST bash30-021 1778 BLAKE2B b346823742ee679370f18a5f536832c32b4b56c29a65a282193b7328eb28391153197dc5640fd143cc56e9a62cde6d6cce5e96f8b4a1a33fe165123570947277 SHA512 7f7f93c3be8913a7de413032910e95811e9935754cbdb3bbbffdbd2996bc040bf314b7d8ee6446a46a0ee97e838a7b0c0c8d39ffb15b351a191de486999b8cad
+DIST bash30-022 3476 BLAKE2B 78cab0703864f273aa029d4aa2a87503b8d2e09198442ef08bcd1efd6db8e34b9710430ad28c9b088c13297870fcd047ef05c2dfd895b2f9333bc7ac0e9cbfc5 SHA512 a4f3d15031489e6c581fbcae2402a76aee78e77af57f5a60cf78b0e7deb33358648fe8de7da7e778ee217b694deed69e7cc7e7dcd4c474101ea08455eb593eaf
+DIST bash31-001 2708 BLAKE2B 03c88ce08a88a4c6cd20ea1c5b6ee2c0f30de5202455d78198c649d3224500b252ec6a3513cf71fc7a10c620a1bddbee9ff9ccd4c0efe98ca61d5a282174ce26 SHA512 ec5aa8407afd6b4db29855ff740f880d20cd029bc27d6b996a8e4cc2982a37e5eb826216436c47f09cd45e17fb8fe55b748dcaa7a361bba8c9e59f1620b40fcb
+DIST bash31-002 7169 BLAKE2B 408971f2789bd9f073c30e7eb25582f41f8e9398917c93b2f51c59a44ea8d34b75862cf8ed87217bb6015ea88f96382faf86e8d221f2f7cc5f56ca23a71894e4 SHA512 80951d9c8abbb7ed83c85e8ed069a80305eb8c119b1f5b5a4b35e213b7ac98c4fb15e07512e028139ed60928c39f914ba675db9f068619a15a076844a46b1a2b
+DIST bash31-003 1324 BLAKE2B 001b0cb18022998eff499b629f2df74293f1f407b5ec169e0045f3eb2c8fef73f682c8702e58e4f3cdb667043916aec02019e8ab203389ca6d8d15b88819411b SHA512 37d64e5f04832d404887d1a95bf3973b66b31b7c2b6184e3edd5f92ad848bf01dc0051bfee6804069beb0b1f522b8e3a0b0407c65885f539cc8e1f1ce2a296a1
+DIST bash31-004 1470 BLAKE2B a92c490f63e7aafaf1e2ff6182b8c30e77286bb7f76bbd826b9856595d3b25f801e41eb8db18b11eaec93bcd01b217df61777916e1346564db019e16d0676499 SHA512 c5913e1f11fb7887a442496b5a70f8fe938d5311be848bb19fc6898c0ed95ed045b21db994b4fc4c4860c37924c6c4ceb30909a6e143a5d7742203c51637e9ca
+DIST bash31-005 1322 BLAKE2B 5b3c9d7b8e73d8a794c074a583d7d43b6a8ffe2979a7a6b884c6ec298ee782a8b242320ed55d1c847efed11619288e7758502e96b9d7fbd33b7b3fd8517bd901 SHA512 619e5eec9d5f864dd3b94ea0bc89e2f5a80b74738444886763b1e692a424d2cc7650b7e16b7ac977f065ef4554953c1e7bf171d15837712a99b6b487876df517
+DIST bash31-006 1561 BLAKE2B 3c7d32092993e9b42c45e003053312727d19a2389c0ace0d3f67d265beda0dfd27803eecae586315c50a1e96339d8a5fc497d3ca00163832b55dde39944fb06e SHA512 4a8c24789af60096bfb63033cd801cf090cbb81122e48fe936fd47beae594f61e1f37b9f31f8a9bb5c1608d114fa3fe0555c81ec64983aa06a4b8f6512a368b4
+DIST bash31-007 3254 BLAKE2B a2970e33537e283498d35842926ba89b669f324649b8d98d60e331c4b28d8673c4d01073c84ed434d8d2e920d963e8c2fae51d3f86b2414bb0503721d234f318 SHA512 b6842a7fa0ac353f5341e351136121c94be77460c6bd990e67987e3ea85a7c92e13d59cdb5d26316fcc21edecbc8f47c5f6147b3473b1e150bb03774f28b62dd
+DIST bash31-008 1422 BLAKE2B aa3af29a256027fd2894c70e5c1d0e0a8a2c7aa8dbf8492d712a075f654c90694d43b5bf6fa5f586fbbeb8622667696350e25e732937297a4883207ff71ae354 SHA512 4d5c67738fea317e1e2eada7aadfd99b85b1a54d93801e0ea75254ff65156b219ef614ce278a9d41d4c24efe92cd54b7b4e44d84bd461f2eca0485b71717f734
+DIST bash31-009 2000 BLAKE2B fa771969b6fa68cfc3fe79042e022ac6728b010137d4d05ebeafb5762f222ded393b73c9240ba3f1977cfc4e44e6ea603056699bd49f5363c7c641651ade6206 SHA512 991bf65f32fde10305ce828e91871e122ad1601b1081bbabbd1154a7d5b05ccb0b3b9e3f8da39bc57edac053ab894061520a5211cacc2ee098eb11939e38c98d
+DIST bash31-010 5218 BLAKE2B 00b214246426a4daebedfc1870434c25403aca3ce7ae246999f9f34d5bb50607465c73caf757b290fb95c71426ee44ddfd43cacbcdbaf490a69e9a000535b900 SHA512 c5402af01238ebd33d8770992d9bae256b36c3bfebb9644dc1151b893eabc78834fc895b7a2fb452787e00ac2653185a8035400321cac9ad05a8b4a61dfd09e2
+DIST bash31-011 1462 BLAKE2B 9851dfd5a356a3a0fcf9f68c9b35acec6f9230d79066d8ad1bb98a5da5e0dfaa91a64cd82b090859f5a2a4e87f83b683d2f07182e60ddaf41ee78db7e1e2b12f SHA512 f662f455fae03ce70dc5b837e9ed549289c75a6b9fd5fdc1f14edbcf0934e85f4a46c2164a15ee7f10e606ec771a1b5ea7c081a3d227421f2dd2321c8f267e8d
+DIST bash31-012 1212 BLAKE2B 3201b38e07d8e64abeca5d94ef9baf455881fc4748ebbfc0c5f41e6f8f63be1814018410b8ded0fb31b6b6794b4eda5bd3ad7b3be0179f9ec27576b0713a2667 SHA512 e8940ebf8b0282816b04fe399ba05bcdb49a4f144c02b86fe2e5cd01556907451f99944b2e275bc0204c4368f232744321daac57ea858911c21c7d72997e0476
+DIST bash31-013 1133 BLAKE2B d89d6819e55c270d4a7979e480a9744072e5a42aec8d8d9180c8ab1fd5b42922953d819f9d53d388cb0c8f3b3c0983971773ad1a360078de142e6195a15bcb8a SHA512 4cb90f249cd92d730133792395e23521e8ccfd4bc841a42988aa20e0e19940114a3245bb28ab4b9ee48673c80f37a6d3f95e8211f0e93a2cc91c02b88d1b3948
+DIST bash31-014 2818 BLAKE2B 8fcc7502ddb2be0c1f7271bb23a7bd8cd61ea1037db186065a3bcea7d9969d837462a8a1fd28c56307a845a4d5915b3b1d5233780921d4cb1778dbf1272b7a8f SHA512 83873746b75a9892fcddc5ade512c0fcf5f4614af42b836613ff62c10f3787516d812def4200c39b60179ba7ebb86b0ca0e3d2b7780eaa63e34387ed1e145e93
+DIST bash31-015 3089 BLAKE2B 0c56f72f63c69ed80124f3c2c4e8bfe91e1d535632c5e4fcbfa34a41fd0b0db8ede4534f1a2e4ac4a9b8657b2e74f83e984ed8199336abc1357e2c1644a39d67 SHA512 5469e29f1b9bebfcf56d9c3db96115d6bcf49c68fbc3b1170623c291c181b8c887b9bddb145c2b6d2e161685408610610351a0f2c10d8db34faf484bcf4ca76c
+DIST bash31-016 1295 BLAKE2B 33ad1a871cf44eb5f44a082c1c8ae397e01375c45e5d6a59dbc499fd49f70f1d71a873e00052da6a2a18b0604c448bd2b670bf4f2f1becfeae408c05f06224cb SHA512 7f3e2edaf3523427f91739780c7336f3d63a37e9236d846763747b093c69b2df68a02eec0ea627852c6eb3d1b3d5044dfda1f9e74254d436af4a35a9e1fd0551
+DIST bash31-017 3640 BLAKE2B b890ff16a00206b3df5bfde61c5f3595be04608979ed77d8f6f1591bb48353705b0c1810ecccd5b09cc057f5b13d38aa92e21d63fe291809e9cb921b662f4b17 SHA512 5cabcf481a9a47245af383c8ef23b560674431e200b7d01918ccbe625ca9bd436b7a94d8064394a2c69c6383011b912575253c29eca6e2a8d597c4113e92cb96
+DIST bash31-018 3225 BLAKE2B 5e484521293fcd61d0f343c75fe6f0b43635ac835f06ae475ec3b8a78ca64a78ca189c18995fb4e64d7071ea4feb2024e6f91d56cac45fc4876e413ed7bdb873 SHA512 c2e7535178c670fd08b59db763fe84ba272e630353a6ff9da0ed22be4d449dc971f92919945444862b3b9ed9a73a636d1232f55a5cea082b85874ff47e5433de
+DIST bash31-019 1115 BLAKE2B 491270a97ebccff1c82ad6a559f92e0d5e18b1ba11e95a93d58777b174ba8d6870fbc60a8a292a32fc708da20571398198051d32bdf550eb0e5eb2af5c8a05b7 SHA512 302e291dad01724b030c68e42edb2ca3d49c242264ce4e89652fa18d1eb4b30ede500eb2c4f4fc7237b25eda87330ee289c7f52c19ee8d4a4c782612b2175efe
+DIST bash31-020 6617 BLAKE2B 75e55b9593c3ff94cba92266523ebf6fa5565c413737fb13102a4ef5e0167439c88e786b8e57a915818a1a1dd7b7d192749405efa908acc3b1aba35c7febbcff SHA512 eea4f5bc08f17784b460e124559ab87756f27bacadabf012b38db2e9ba754ebc14b027b86ec2cb51ae40443909779fc6ecdc91dad7baa9a08cb754969ab6fc3d
+DIST bash31-021 4034 BLAKE2B 18641acbefe4ac42268026b15b9406157224c596e0979bc7460e18d789ca8f0f2efa95b0792daddd1fada5714adc26ad2d15c655b41dd763032d54e377111607 SHA512 ab5243b941e14b7ce59df754b6f9ff757f8a607f819fce55906e7bb860a11874d46558dd949fa51492ef77d334533bc8175f3c2fce61731313d33a0b1d7af616
+DIST bash31-022 1777 BLAKE2B b03ef4eba74256074070ce7853b066d0bfb75a53f0efb3310e5246763b4a716211c6e2c9046a2d4f018c1b9dc02f3f4a887d402b18e1ebbf02636e7b6d94a07a SHA512 879d473dd9cb72d23fe438ffd678c3860c71ff664b0c971ecdad7de58334178119822fd2616b0787b58a26dafab3db0321f76194ab1b512e939a0a8abad69537
+DIST bash31-023 3475 BLAKE2B b304ce9a9569066b51d89dc816942294eff71a8e0f653262d8c51e0f251dcbbb51a63060af8ef663030b831e8cf8ab398c02392ad1ca87414ae7b190fbcd1102 SHA512 5cd7f6807e77a9d4e4c298bc06399d351f22a88e77bad802550f79685c6e54505cb617ca31771953545638bb3d08814b8a69f1fda56698ae7c9844b0652d2567
+DIST bash32-001 1539 BLAKE2B 6663e24728a6424e4d051633d0eb9f60fc2b514986e670719f7ecaaed10a0537620a48b3487f8e904bdaae793ee5f91128e92ba6b17944c2da9f156d94933edb SHA512 14d0b34dec1b285b46bfdcdf18b98aa9412afe14dcd330a6e07d4295bda04c18251ad118b3560e2db3c981e0e32be6e20bac082bfefa071ea6e680f3d2010ffa
+DIST bash32-002 1524 BLAKE2B e5180929b88c4a1c72e1f0ed37737983938007c2a90b14eb67be565c9c67eaa0996f3fa98026a5256be2249093de899ff84bb5fa6b69626814c3438cbee7c717 SHA512 9b9483615a97bf3958f1efd055ecef6ee5f5e1b104d3d42a00a62c27e912aec4d3aff0b1a39de180fc20b12d2ddfbceeb595f2c3515eded40854f97ca0bfbc25
+DIST bash32-003 4599 BLAKE2B 57b54ed58d04d341beba06e96817c1f922f08010c6388bf4ba84d0a34d5e2a6e95a53b19a85518bbf8fabbd131b3ff5d2f1355442a1ef2114eed7828bcf9ff1a SHA512 b489841a41789b93ef505b19da5f756a6ed981386f9ee57a94f13ed03892abb800e00eba012fb6a884d8e6b2ca7db9032069d04bb57916b062097c3a8d89ef23
+DIST bash32-004 2585 BLAKE2B 85aca5104add7b5b86ad8af61986ec9f966376ac0f7672e92fcff8f6ed657f541a1fab28d3c49cb9b89df633d9927ba8be3f4d8c4c62caa1f183e226b411da05 SHA512 553d1a9d3eadff28a1af8835b6ac8af17fe7a97f6a2b0332c8bcd837d49000b82b9330fc2862e691e696f7b842729eee12c8a8a3e2ebcb48bea1b1a55ecdbed9
+DIST bash32-005 5910 BLAKE2B 29d9591cc95f539a40f286a5c4f6498c166e3ce3e5bee95c01e4995724eaf61fd0e081f5e072c7338d42f16c534a4014b18b07a08485179abd29bbbca5b0ec44 SHA512 58eb1893e562c72a23e1896a50f6b1e6e976cdfcdaf0f8ac30b493de7af1f7cda5c5b801ca363b1a22b78c8995fce9cf66c18bb4be75e32ec7f7e2bb348e6b30
+DIST bash32-006 1298 BLAKE2B 1c5829a92800c42a7271fb4ab3cc6368794f06036d98f2642d2642b0609521864f1806dcc79a21f39398c8052c432472851c1531b41cc6a4986b6a27c6092037 SHA512 053dbae4942250e3146b7402e41f11a004d5da578fae0e933ec71a96304c8be697031426d28e703e89bf01413bf99d76df339b7b2ce5cfc07512478b1f627b99
+DIST bash32-007 1375 BLAKE2B 3fd7aeeb14d3ba1dc6ead9bb59d05bd76aedcaf1b010de0524c803e6cadee6cdf3a2dbf9ab65431b871c4f81e6260fde81c666258cbf3c8884278c43a1b9963c SHA512 76dcf1e7fc620f23ba33cc8a25ec78b3a76483dbf22f5af490087df95bf7def23f7cff515525bcb581e56b7f90f3770bdd6dd0d45504802f7c7111292607871c
+DIST bash32-008 1302 BLAKE2B 4d17417b0b1f33e7d272941e104a3309e2b9c6aad08c9fc9da03e16fb70b0f4d2cd2362085cea324060437a779ff3ba9d61de1f472caec196c442169caf50a79 SHA512 74a73e9f47e586b47b5cb5d91889c7d17aa4a9fcfb31112ed6349fb5574a059cfb374a2831e6e2800e143c641a7060f6d8400a47a04e05861ee4c9147d707983
+DIST bash32-009 1882 BLAKE2B 8b15ca895d74c9de6178e48a71499cadfe3e47fc1fec15b4fac78f3fac8a1feed04bb0ef65056a029fdc0346d02a39a20a1cdee0653343c5d79e9b96604a7202 SHA512 b76760a6a09d33f5d1243a500233a30c581768b317233815e390f24e81321ece695f6db7b179b3f80c621b07f1bcff13fc9ccfaf9dff90034ec729b6d15ebfb3
+DIST bash32-010 6293 BLAKE2B fb5340c3b5dfd433c2d5821e810527e88df0f04bfee9936557a7cf11fb9b64e8d5f9c068516509d7155d0e9408227bbf40230a175bb6051228bc9daa4f8a5d6f SHA512 1c576da5efb44be99516e3f57834092b7b8edf8d26d2d9a57d8a6b834d564f6ddad2a83a9f693e290a77293c873b25631fd711a06a3c058733c599ad1b2ceac7
+DIST bash32-011 4776 BLAKE2B f9d62c6d691bbcc293113d99178049f40e3f9dcba4c5687b401d205697b52b2af3eda38846bfaf583d5b76abd6a53e76b030ebc51e0bc03a0e20cf6ff0ad0f3d SHA512 1aed732d4a4828486ddfd00cc399dd04d92df60fc135521a3077043162e5387c5a1ea2aa914a55a7949674e62546bdc0a6792ac6a680dbe3ec71a63f03b72923
+DIST bash32-012 2555 BLAKE2B b5d757a13bec16cf001c32e656bcff47ed0222eed710abaa85e1e36ca75635ff7ee0a4e1cd264693901e0cc8a13a11c5e5e310c4196567dca8705a438d0deacf SHA512 ac110c5f0bafc356c3c1705786bef6c77b331d2ed5bfcbf179e588fa76a8c3cd130809c5f0ebc2d15c8b92b8b4de0acc8162de2aa2e48c609c99acf9d4a6d97e
+DIST bash32-013 1852 BLAKE2B 68409a3085e52c5bcbc4bb695c68801473689d50d1212ec6fc6de6e3425c5ab8ef2be3e883c5ca5c1ddd118a8cf227ccd702ed1559c63ef15dd30a67d10ca9b9 SHA512 046660b12924f8703442eef708587b7eed042f47ef77a93ca765a26d62419adc9a2e96303d233a2ab4fe847abd67f05874c86ea0b9b722beb89d4cd93856c9f2
+DIST bash32-014 8141 BLAKE2B 9d108399e026d49d3b9bc952fd96cab3ae7193d5650fbbe9676e78aea4b91e05d9d180d8723205fa56287658250b8bc011cd134853feb0e8ef64b8f3b40f9720 SHA512 294ebeb27fdbc2e6d1143710d991f05bb34ae576f0823a0f197f0c34ee1f1050da1d6e8b2972c4574c3630119d53ddc7d01ce483def7aa3c096cef3a2a145ff4
+DIST bash32-015 2293 BLAKE2B c4c923289d0120b32a83c3e9367d23cb590659326fcc294164b3a34a638dcb0e2edda658f8ac13197c2bce1ab4ecca29f60e2c328415861e6104dc852205dfac SHA512 b574774cd49c7640b3b7d1bff1fa2c8c3f9a1f5c8bfe83fa4d38b9d422e130f1c9b40b9679612944e128cdeff0c6c048346c99eaa3eebbcd4e0bf5d75a642d06
+DIST bash32-016 1620 BLAKE2B 397b32f348489d3b8a8f512fc4152625dbf844a2589e4aeeb6324deebd7f89f9ec9f910c00ef54619f0312101a305d37453a786311139035d71cca61cda7885e SHA512 5b8f9703af2a5779f0c887ac7131746ccbac3086dce5cdebd90710b8a72dd5cf6a4de22f8d2521a617921167dc9ab3eea4933a4d28ca08c128be67b8850138db
+DIST bash32-017 2611 BLAKE2B 11e79b83b091a922ebdf8aa01c2c61dcc5960f8690cc52926659293504caff98945dc25e54ef10e7dfeb64bfdfe78a9764f53328fad19a6cd4f074c4c0e8b80c SHA512 d336f3cdb219689b89f6b399f46af68b7ee08b8360a219fb358d79a09eb06e027ec93ff210167faea1c1e898ce9e5959ee743f5892c9bc21b35ab332da26608b
+DIST bash32-018 2433 BLAKE2B e54df4b89a949fe6f13b443bdbab41b7b2e610a79260cbbebf1a029bc7e5130cb19294ef2859dd84d6ef531f57e912ea08351a4df7f15dd0a049d9de11cdcdc6 SHA512 f2059a93758f135e0909163d45d9610950139cef048da89ec93489e983307a291041094db6707a76d10fe2a23c7ffdf4c2c6cbbfe7e6991ce14559e4a4a10b97
+DIST bash32-019 8618 BLAKE2B 72a6398cbebc9cb05d97eed6a61a962ee7fb2a1d80cd92c012a9c6de7fa45c15164ccde87aa7ecb7773e07485ddfc535a7ddbafcd3eff9b69062b0913ff8db55 SHA512 2822e39bc19fd4074889006af1489029b6a379c9d74a6669fd1dc13695d98747b1ccb3ca40a7883155e443a50f4aeb8258589b10621831296a4834df815b8397
+DIST bash32-020 5182 BLAKE2B 73a07aeb015c9b273cc84150d5f2deeb33ea41e033f261003c03e4a0aa87cb79449f091c2d304086aa103be0ed7cacb232c0f24b4f64886e018827c977294e60 SHA512 dbbfcdc30cd51f33c36ce28b1f7f35e39bfb5e7277e7ed25bb9bfffc7f958834210d36637f73d80e8e61461095c1eb712daa1b5ad833fbae0c9890ab0d0c51f7
+DIST bash32-021 1814 BLAKE2B b682eaefbb711078138d1710001742e3d161e6d2cb065810562e59d8f25eac0cf2b34183a7ee7acd8011588d8997887da0759f8009ed347999d1cf997d912b4a SHA512 a7d5b6a542b3912cfb0099f5f57b9d9050cd0a8a8ba17c48eee6c080253897171ce70ee75f290e8ea3d2f5b46c49e5b1e031f3ea0fb9e1fc7bc2d8e06139a10f
+DIST bash32-022 3034 BLAKE2B bbab719ab3f3c0dd47a5fe44106efb53a543f300025176d564ce7b5fa4029729224552a5a1ebbe7b6657eac2c961a1def769bf12a29bcb4603454d587044ece2 SHA512 82f85f5c99d72cd2611c586c9d96a3051e07545676aadd0e8530dcb042a4c4ba37fc24f743139059da1ab36f0286c9e8275beb3e5a186f10aa45194d0fee6ec3
+DIST bash32-023 1321 BLAKE2B 251184576ace1dee43eab9052d824002a8962621f5c7ed062ab1e71a9198b244f131d0dc0ebaafa864cdce2f441fde6ad4d17f4cff4e3fdda3b34e702df26c91 SHA512 b6b91217de9f34c4c0764056491fd42ec573ffddf3475405eadb79a6a5b54ef64e8b3cfe9c1502cf9649f2a49f9cc756c40b539006ff3b8f2c777690f7cd2c67
+DIST bash32-024 3228 BLAKE2B 09b629fe4a7aeca7b63ccb96a9e5a5805c4b9ac783954d510c61c3875080bd58440013e3efa72820fdc4bae6f41fb22c010192ef9137b757d1e012994f6129ea SHA512 6d0a3ca7664b9ca2b134e79e4fa26d850b6d3a276b632f6bf7c47cca5e92fbe0ef22c02bcede6edacd97722e28c319e9cd83cabfb0095a9ad2f5742544b26591
+DIST bash32-025 1935 BLAKE2B bffd189afd8551d5e923805497ca213063c8c563d3af065fd869ee8b5a55e7a758551fddec822606560d5ecc00c3ebfdad003c53ae1ae4bf01feae126ac19823 SHA512 75f3f6dde820263735eaeec0ac8662eff0178bd8f53feabfbc8cc212226ae5dd399cca7f4ddee17d9ce5873e7eb6de7a5b521077367a7bf4658c059719620ea0
+DIST bash32-026 2438 BLAKE2B cdeadc797535e465b6adf83d03f523f95369557c565112ee2f8d42f23621bcb6539606c000510a86df6bad47a7a541caa0e6d9e58d36d3b7c6da33f92ce5cf16 SHA512 ae320a3239f6183b19b3af6c72f64080984839137099746ba9c6104fed9f4fd77763bb207cc6f0c007585f02a42c3ef7e1f22b4cbe6e6e442beb13f9623368d0
+DIST bash32-027 2690 BLAKE2B e3281b7bcb3d4c7ac9944da7947bba6bf00399b96a0f10f0296ba4ac1b4958105aaecae3c29b8462dc3dd3b81ec002f7b8780575e5f1ca61a25b744f9b4577d3 SHA512 369a44e4f6555f28eef93d18d2931db6a36e67ce227b203c33a2863931969d06001f5242ab1665ed152533061de80e0bca6dc55a2c1196719788bb0d129589eb
+DIST bash32-028 1750 BLAKE2B 4c37b7eb70b23933e4bc2ec87874ae2b8f73ca56f407d5674d361c539bc70cb9abb74f83801c583f393238fe88f22a28655911ba2a79787aac93a35b450dd888 SHA512 2cf38013c6e9df96f0d49bd68df94c1e37b925ee56cdcb1a1df2b9173b27ad40a20ee4858ea51eebdf611e2d7f8320a6f62af2a4a4fd01a4842942381bc71eb3
+DIST bash32-029 1330 BLAKE2B 1ab7c2c7a6a3a6425ad5c4cd8cd39c1c9e96f84f66ed2d28d5dfaf864606a595e67e6fe581360a9e5ddf78163203bb7b498247580cad6a11047b2927ae962d14 SHA512 1babb4ec8e3b35a0f6b76798e053aff7dbf0bd4573793ea27f303ba913a2f53f4d0fe202965715ac988c655c16199d8c5ef5eac0ba2e0cec0ba355ef36768133
+DIST bash32-030 1558 BLAKE2B 7f26b305fb64258e66da6b4613f807de9f4a20b47ff8ce42b79c97ae21cba4fd53ecdc408d0774930ec7c18b76470f427c7a3f986a68d88e8cce96f569be8d84 SHA512 8f14933c8f0a0e3060c4f392a00031b8e1415459c6769220bfee4ba1e71721ede50f26a98cf0856122bccdf8b77262bf39febbde9da5199ab46e17285adca6d3
+DIST bash32-031 1961 BLAKE2B 58418fd1f87f4883a8f7a870d463ea12e29c83556a8b8f133149e9f63772b9a860adbcf70de3f08681d45210c5f9eaa3a45eb03bcb9a5f9907214a31d9a24492 SHA512 93c559324acb6366035efade5c7d70963b5ad761bf28b9dc4adf6cc81f68f077b018e466fc3da9e51b7c6890c4491419e11d6a1a16d617da780ea7b609460870
+DIST bash32-032 1304 BLAKE2B 7a256ee378f261dba94104918b112994b2b89bca803518d1e807370abfe82699f09f41caf6e9068223b4fca94cb007ab7b34f0cd1d71600fb82a32ec7d5b8b72 SHA512 7f1f2b5616c9aa148987a1ce9cbf466a2172542dabafc39aeb26b3a085f032e981c33686f5df9825d63346d11f22305fcf553a7719b12b6b85921f0d2f9cec6e
+DIST bash32-033 2181 BLAKE2B 20f64e0e14e3e317d50cca2bd97c66c78641feb1cbe2827b114e2679ef29e9aa5e5b1798fdb26507fa86b3e7cb015e1e5e3552b850544e7e08b2fa87aeb46739 SHA512 0be93faf459283142936da4c99642a0845c702c4a17fbad6b2309bb884f557ff88d06d1e724b4aa4f72dbd62d3657a9e420c65f10f6c6fe0088f19d291cd1e86
+DIST bash32-034 1866 BLAKE2B 0bc9d16d3154ecad616c66cd37922b31193d230085eb1f5d4cbcf4fcfcb02c87e65233939f93aa4d805a72bae579fd9db5338e5c6b98060227d64731817d9986 SHA512 c8cf9582d0abee1820cac7af8f72ca338e6cf6a37a10ae0b482ecf526867904c82d28827909ed466dd33f5adf971696b0b024a6fc7aff909d8eaabd1c0ffa2ba
+DIST bash32-035 4805 BLAKE2B b902f667db2ffbd685b487eb56f64b80138d4951dbdef2b2724372e79bfa91e138dcd556de164b808a7e2ce56e6a9f59b2c06b024b14f83ca1a6bc1867761c38 SHA512 3a19c3325a26281e39fc1edeac31fcadf4cb52055e220e62f582b3f7ba04350ecb876829b73c9cf00f33b826c400a95c72c9ae1c5675e224a4dc7d3305712788
+DIST bash32-036 1264 BLAKE2B af6831c0c43a450c499a8604e76b9e79844ac21da5b1ef70df1a2daa2fbd112fc0e65d1ae6f06c0cc82549c026a43a4598530f5b20ad6eefb0d18f881de852b9 SHA512 e0dfaa808f23bdd945b6f07d823484f2fd2eca25804e32c16483f18e36062079deb60f276112638c0c14f9a6a1223e3fb77bc93275f76841027352220daf728f
+DIST bash32-037 3227 BLAKE2B 8079627c80c91258a0b8eba3c1b2bd1a1f00103dc8389803046c4164b7cfcaff035005c5447639bf89fb6390aeac6d6d403eb625af988686ee6eb5228903f3d2 SHA512 237c419545a46ab1542fb5897c7cc8dd1256bf712d6f1ce46f143d0d98bd61502c07186124636d63707a62f3a811a8285a17a82164a3cc662f40898be9c18a0c
+DIST bash32-038 2412 BLAKE2B 325f99ed328ff100b553a141d566692814549abd7782414f3a6904726a41bb33695be3c463161a5ee16412302131bbdedf5467b1361e27d8ea300fbd3bb74855 SHA512 085b7c63baad97c266d388d7000c60994d7578e034c67cf9a3f8e77e1e089ce42ab3d23a702db5ba942d29848e6ef74cca43fae50058be524a66258072fa2ae9
+DIST bash32-039 5034 BLAKE2B 5c8b65fa0df6b898886546dd3dfd8277569c8cc194535fa57d7e2fa90b4bb4645c2eff754d7177ac99a46fa9fd5b7ff5aa50a7e17c833eebb3a5561ca101a18d SHA512 8b113de654eabec0e607534129b486a50b937bc7a6e334aceb8aa5cbb3d1447a762052fa082f2678114928402d794c59f3bd98f7b8c0dc1957e5c428f4090d11
+DIST bash32-040 1403 BLAKE2B 1149fbfe39e2b0ebd388ee1c3c140cb087d62a79c433e94eed06a1060e3ceb755cd7740f278b3fa04a246eb94c72c48f327a4fae1ef8ddf11e3c386297841320 SHA512 4e4def9ec1e4954ab9c28d5dca9cc78b87829e54c9edd262a2da906d17f0429c9f552b602b109922a0805837546eaf17c6e621e601a240c9d5fe6cdbf8716ee0
+DIST bash32-041 4446 BLAKE2B 1976522a2ef879b5f7fa3c294da32d733f3ee585eeb7455f3930e6c379972ac4ab92aa72723ac9758d1a4ef742ac6f192db7860c4d97099666732c63eda8739f SHA512 c5ae4008fd2e86ba92f0c0fce4f93025458c8012b55eedd137d70f6570b52ea981952853f863a3751f9a82b8c355fda5d7b85365314b643c4a9368463c4c71ee
+DIST bash32-042 1209 BLAKE2B d2e190304ea5352f25ebe64d90aa9e9a2c525e39bf3db7b6587b12cccbeb32c6d300512a64e36ad0178e8dadd7ab9ff2e2ae47db1996e35022d26b5353d272b1 SHA512 d8ad8ae3a462d59f4c34e704b10292642e03cf5c1d0320aca70f6a9fbe4e203b7d7a45a20894c82e8575f9a01a0087950990471d9d51227f102d075badbe6d35
+DIST bash32-043 1658 BLAKE2B 4b302b460b288cc7c67a8049e8093eb4ce73c4361b68dc21eed6c28aa07ea2a7269181d451c530da0940f5ef158e77da490b1bd98a656f9aaf9b1df005c6fb36 SHA512 6d13a3051fa5be41c40a12a1ab3edf717da7e9f002aaf5de105a15b11026d0cc3748ab0655e61d98390e782597b9ba212af2810e59e99211fb77e97441f0d71e
+DIST bash32-044 5565 BLAKE2B 96ab6f2cab1a5a736ebae58eefd869246e61a05415d7eb866825d382aa0d4b7759734edb241756641943838bd271063d4ae69ab9672bfee2db5d8aad91a3725e SHA512 a042c996c9d925e2e2a74296af1ae8dbd7f4afe8d83921c6a449612fb193c66c0c71943f64c95032b732b3e0e73de5f97be1ebc0eb77aefaa6b6e36d29b7a61b
+DIST bash32-045 1338 BLAKE2B 0b0fcb40e2381a504f32ea82aec946e600b1e31331ed41a8ca6219d4875cc5d81fd2c85912e4c787a8fe15406323ad1faa0482ada41ec31539975c0322c54271 SHA512 8aae43371e0c126ba8fbd6faf34eddcec8656c5161359e9b57532093694aaf1e6a2786b018156371b793d37cbeedb5040b93728f3dbda85199f7994511dee741
+DIST bash32-046 1275 BLAKE2B c89d50e24d6335c9adbbae799d0736a20492b9ca30c297a738975276478c69dba90208bd7fa9b16f4f0239ced03442628c6bcd4a2bd6f2abefd1ecab04b6998b SHA512 1fb2d29c70850a0ab2ddbfa2868f626a19ae88316c5a32da3033832e9e73d7f0768eaa147348a1f008163b0e796c38fdc1fb629ee8b71848b0047c3f773e97e9
+DIST bash32-047 1981 BLAKE2B e24cc867efd108820e21a916fa71c766699507e29c66f2873e8e6f64c2a9cc8dcdc6f113194cc68724e09d40271cc20fd100fe260c3b3a617841e29fcfbd273f SHA512 587e3fef02d3fa0e4cccb12b994a2def2a8fe2f799c31f27d60dc393b0f5d9e5f71d7996fecdb83a4386c0de2ca3fa5676f899f94e1b8ad3af82c5e2bc5a5c6c
+DIST bash32-048 1948 BLAKE2B fb52889849bf0ed28c0355ee37777bed66843622e3755edc68fc2c6a924ff02d329c1429a17148e0f23ebb1c8b90814d431cef68104971503b1f3a638ce5989b SHA512 17105999c7afec123a377d82b2218746d54b66479ddfde641a2bf928aff9851b554ca36aa6f84e0e6943b52e4e3c1befc1d1070aa700c5278196aaa7ad384580
+DIST bash32-049 1663 BLAKE2B 0acb0e6a505fb6c0e71b441992e6b892c014d674d299a4ca872282eb605f116fdd3b83a26e6019d9966e20802741765da6058fb600d7bf1a5ada3cfa71ede76e SHA512 18d6ba61c9ed2c8d710d62a006c58f8b4cc14c507743811dad3afd74ec6b017b2297b3ea1ef3c0b7ad38f834f1ba83937922ae8a87225ff2ca45ecbe6df1bb1c
+DIST bash32-050 1697 BLAKE2B f634912220108980124e00d06fa058a00ed345e9cae0b61672491d37fad7c44ca6f90e82fbb4c3943c1e7ba420199b533b5b800653428de28ca5327b7692c774 SHA512 544dfe144e51b3d81cce4d01a6627478407edbbd53184c675c73f05eb3a85f99959c021749f2643beb9ab7163dd5bc86b97b9df289bdde2d83474bab4e9c0749
+DIST bash32-051 1371 BLAKE2B 166e8e23628d20035019ee9a27ba1ba9b1214f895c1a01ab340d5b25e3864725de73a930ad63a2c6092b66ff815662be677df65da31b9ac04d0f0036eba0f722 SHA512 862000d29e5134bea3ce0fd3b8bc478cbce82cab37ab31942030e03dddf2d597cc3d469554bdd255c3ea18c359528b3ad8f7320a9763c95e578de4b30d35c2f1
+DIST bash32-052 3250 BLAKE2B c76f55a8d85e214e2700abf5d5c39dc7af1644729e6b7024914ee2ce598348f95f93e1ccf4a05d133243c50745eeac15fbfb3010d07d8b1aecb944483844d3e1 SHA512 c52fa2692f264a6c49432b22cee9aaed3584f2357687028f4b96ba67104a3929b6136bb91ec64acb94fbc10c2de842372940f4ff450b9c534bdb28c627c55e66
+DIST bash32-053 1115 BLAKE2B 94d017d524db4979ec49dc83ad0fec941f730dc01fbfb658e4a8df380c76d00104c14c0bcaddd975544a9c7cb6d007cc46065bbda49b5f9f99b3ae12c0e68c1f SHA512 46cc13432224bad89736de4543692431480505616df6240276cc37ef1ff405e99653880910b39982b2449184cd08dfbc34e17fe7e3ee506c2f2e546c4e825360
+DIST bash32-054 6617 BLAKE2B f53219306a03225f2a75105db74addb0097ab6ccc13ff7bd9c3be30b691faec93e10312296f86f1a5dadfa6f39151eca0289ee6cb9c1757e7a338ec7f9368ffb SHA512 76deccbd28e742c54b494316cf6debfa2681e9682b2cb34c9c105ee7a0a571e8e044c034f97e349b0eafdd919627c8ae2d4d26fa1100b6c9a38273d9a9e8852f
+DIST bash32-055 4034 BLAKE2B 4e893de0ddfecbb1c81966e186e59485dc45ef8bc0c5311553437ea7e4c3b168dd39a47ee1184375125cb16a219dfb5c417101c7568309ae2bfd5f8a9f1b2847 SHA512 7be87eb61d5d619b8788d2e4298d59976aee90febf59b89dae2df1b43e85b3916c16b559b5169226dd99f1a86d1f2e01da2d682fedb78b97e8fbea58541759d8
+DIST bash32-056 1777 BLAKE2B d42324d8f5277bae9594b1c88754bef89b3f35797d57090bb71b5afb712e64d529424fdfeedf0155ea13d78261f1522b5095a1047dad4701280cbe404af4b162 SHA512 bb1a5c84e5d8676061e06f9d2ece972fa4d1a8936252d2d199757a35afc81633a5737437fde099277af0c16d3318bba56cbd97ff14b832593dc2d63ed3f6e8eb
+DIST bash32-057 3475 BLAKE2B 911914358173756168225fd9ca3241b682544c1e15730f6d7f845529de07ac6bf5bf973be77d25acc5e30135ce5599ba07f24a029c9e64155d8fa1e6c2de12eb SHA512 9e0808363823d34fb054ba11441ef71e24cb226a1f2f062ba775951546b6038468ed1808067c7f1212594554b0bb5eb1137dd932b7f6fa6da06228b6364631f0
+DIST bash40-001 5156 BLAKE2B 1efdff63b023382fbf524665592d0d817386abb11565320da1c9d7aa9e32927d69826aa5ce937abf4c69a1fdeff7cde54a658c419a62a573ae1c8715b9a2147d SHA512 2898b793404656d63739e478332789a6ba51844c3a388ca4a18e42953883065c3164cb90e525cc6ad8e59d1f47e7e8058ff7ca42194569729aebbbcb5e93dab0
+DIST bash40-002 1220 BLAKE2B d4c074bf55aad6056399abbbb34471a0f919a4b29d403af67856444e9293bc449e61878dc20faed63aae4790065df0e554c9e5e9d9ad28caeedd70bbe3ad8007 SHA512 5af8cddc9ebff7433fc200780e46becca4b13a407c2b85aa08871e3a3019daab9787aeaacf4fd86ae3666119a3f35c8548ab488c72cef4fbaf991307d6bbd348
+DIST bash40-003 1749 BLAKE2B 26889b5917c17f7c4347a065d0322d8286fcdbd1d1c61c227d920e1531782d429104ea06cb081f4792630026e3b4fbbd3366cb24e380e5ca8bc1a98ac9ed95ba SHA512 700821bfd1e890118c2c051a589911fff5ae2aae7ecf6aa6eb2da019ad45136ccc5bccf8103fc923a1b4bf0b1d2aa2e2d4e3cfc9a5cb0b5179f1221255e0de47
+DIST bash40-004 1347 BLAKE2B b5ed3bd73902125a16b1282f01dc99231807e77b2edc485e3da42019f586a6f4ca7a380af6893916caaf1c501f9bd8060006ab95f530cd132e4e9086f606d4b6 SHA512 e9e88426a4f8222b32e59af4b32a781b9dff7fbfc50d6c40f97fd62fe4dabf08b8c257c685b3be01ffbcef2a918d30dd951b86e670ef283804c7ef4d923c3985
+DIST bash40-005 2021 BLAKE2B b28c3a7df77233ce60afdf2c8869ddb8b093851d10d1737805cc4cb8725083d199747d9242d974e4e0b8d6a0985b1c0c293e7af5f020374e540e2370d26225bc SHA512 1d84d131c3677db0e827040174d78aa45b4444e4164bcd392ad630a41e10cb3445dc4abcde214c2d808a4ca23cae8b7005a290df463074851c598a9df5eef2e1
+DIST bash40-006 1133 BLAKE2B 38582dbe8d71531513f426c97ea099815b86a11af9c4ef9dd06a9bf1944b5ca1f45ca4c5a3e188976aaeb9d1cf34ba0aec03e5da4fa180f35d7593d8c6f9ac2b SHA512 49e83eab424e3423e65f3793c53daecf2e809194cbf2b8edd5fefafb0478c1ce42d6e7057ca367908949698a7be20269a03dcbfee3f1c1c5c288a67ad3b01459
+DIST bash40-007 6920 BLAKE2B cdac99dfb444d7234f9d5308727e970e4837b7b242b692afe7b018854380550f7c92f337f4188e1360651cda72136eae3afdab526c1c0220bd261a3a277b1a2f SHA512 3ddbff2676fa94d88e1bb824affeb3cb067089cf1c6c48a0ff0a3323f6e64ff59da4dc1126829925b4ec86f11c55a20ef2bd1e517b4661546402061a0aab73e6
+DIST bash40-008 1196 BLAKE2B 2bc352e64b13bc0ac4494f59757497c00f718960801d1028169ec8d9f82db7483a7b3fd8900ac466618779bb7e545cc2e2f447490dda713f9a84457c5757880a SHA512 1a51acefb80e78bee86fd1ec48da376028e15570bb79c6d108cf8c89802f8dad5d89fe99d492f64662c687e3ae747a8658037579e43b143c0112ebb89697dd03
+DIST bash40-009 1821 BLAKE2B c309233ad6bd5780c742cf38438e94453179a7fc219c16a4bbfd2552e45965b2b065d6f9823c40f0d5b8fc2417065ff78afc9d855d12ccdb9d174e26e1fb98fc SHA512 a732f24b5d39a7ba0f2c9b88fea97fc50c96ee73a15bd40085184620eea1c76d07224179b9e9a47ab20401259c548519c0801a3d8260ef47e830e8176e289232
+DIST bash40-010 2152 BLAKE2B 0b3d54fb72f3f588487cc6f164112212f24eff4b6af8f8bc74e39e6172ff4764c0fe34637ab588d3617aa95949947aa70fc4fe13ce52cf16e7a16a11335e211a SHA512 bb0a48acdae924dfa482f2403802454bc3ce276b6179cedd6abe7451709c942b0e6253c18c6d75347364578604619cac9b701540c09148077f65bfae5ddc123a
+DIST bash40-011 1383 BLAKE2B ed0ee8128161fa884c1c63a45d3b14961e9bcd5d70b8b0dcbee728963a91f816a8de78a8a0813c36772a11ad1c011866294e27e47d81adf7f74b2c20bd5ba68f SHA512 2c33054e6ef2d2816b62a7b6ce0db8a207e99e7a00ce9b9fe005d2de20b4d94a2ba74cc301848b3c72b5319ec4ca76a9113092c3663ca5278810bed4045801ad
+DIST bash40-012 1459 BLAKE2B be176479c7794a47d9bd48b91c014b123c867e9d01d5d7b1639390d21ec6c16ea6b5cb68cda1ffb0e079d8d80b08d3da5aa1efd722f181b2b5c0826343733240 SHA512 d39c5a9697dec009bfe3ee3a102f2acce3723444a1e575afce152b082f4dce12c126e391ed1bad10c718a08d9d5cdb571d1e9b86bac5559f57e6c0549a0fc48c
+DIST bash40-013 4629 BLAKE2B 1fca0f3e10c24fe85ec44217a69bbfeba31db0815bb0860ebc80b8f4cbfaf55563e47f46e9c2d081f8b6fa018b44a98a606ba8e3b43069788068e9d31c278cad SHA512 1108f2231c531fddfc021db2ce17b5f1e522039a708493447af5fc8298c6268cfb6080fd38a79edb6877eb2c92ef79b77eedfab14842af91f6bf5037beab0825
+DIST bash40-014 3709 BLAKE2B be1221e2218e79065dfc927e1f77ce106a4b198b9dc0a26ae92e8f83dfb0c847258790ec76719e303454ff43ccbea15a83a8929aa0cf918080ec18149f4e69a6 SHA512 7f05486fdd76e35700d8eb690d90d4fb3e24677a648036fba2f06528f61f7cb230e64cd1f1b374a865acccab4a57841e465088fcb69727e9e8f5f999d673cc34
+DIST bash40-015 1914 BLAKE2B 12f5e71cc307d94794c8c9fbb2bb49cc937ae2485f85a34147e65ca1db8aee53f3c0d3189bad2d9478ba392939fe45b4fb8eabca4ca91880cfaf00237cb207ce SHA512 f99c9cfb03f2ce9971d866a76b48e3d045fb244d0b223e6db0a7fb3e445107de624bf0c9cdc6fbbe0664d054e5973c5b0fbf15e5d231d8030b256f8d75dce358
+DIST bash40-016 3032 BLAKE2B 648b28de77cc6ba1bc7e59e4b3f23bf23c901ca9471bfebf1153810c26ab87f94fd095c2c5f07b30ca6b6994b938f542c1e4bc4bebeadb74f428fea9c6433e3e SHA512 9ae370aa3943731c62209fc15edbcd99d66ea3f7fa8c834262dfc2fc06dc17ad3a509013f902130f5c72ac5411322b018ae8e821158d65ba00c015e23cdac779
+DIST bash40-017 1496 BLAKE2B 1f17dda736caf7145ae57c136a811a3088450d3d861987a0f59059eeeddb7273f0436819054928adbfb863a0bc722bfe795acc1d00b0d9c4109d45ed393b310d SHA512 6a78c3fee549b37850ab2e3c0049572c951e5f3717f54d6661d008b6240f7ae869f7a333a422d008025dce47ba222ec350d06d6c8764b06937431bda5b09e320
+DIST bash40-018 2614 BLAKE2B 4b89cea868a920a3e7c3d0a48fd4cbd27f3e2ec74d120031b4c64153634420e7cfdaeaf00348ff4fe099d07b7d81f610e3e00c398619c79e1cfd25c88b2aedfb SHA512 76072a06cdccd49425d77ecc47908137473bd128e3186c4149b93ec06b9809086a46af6f215a63d03c4c178f1a26c061eafffbe86c65e90028d28fd93dcd2420
+DIST bash40-019 3309 BLAKE2B 703ff82e1acc425d5e9f2f10fc775010868eb8bbbabcc71c4fd78cd177da0acc1cc6269fa910419b95f8b325fa06ba9a49bb09ad97f4c51c3cef29d66d6e2299 SHA512 56c751098f9395ee48d35c921b03a089edabf94060cff404614d0ce14aeed3ab904562c0ad6e3fec3e18da701ab4eaf31b3599b4ac94820c06fb114d95ab94df
+DIST bash40-020 2666 BLAKE2B 193a01061e118d917459f629f1690cf3cff852f441ac431d73ad212405658a37992ef3a850f52e9d7a41539bb613261e6f2f975325fd990bbe5363475fe4c047 SHA512 0176a995921e565855938f916288f3ed40cb027b2af29bac7e2fd0678f81e8dad16437cbb94428a4391d1951adf844be355deb520b11eaa8e7ae493a7a167c86
+DIST bash40-021 1547 BLAKE2B f25a6576991f7d2f6065de33c99fc46a8659da093455c101a62002f352944467b8d171cc619202104f31eb0faf279dadf161a86e70081435e4171eadeb7f72a2 SHA512 fb72106b26803aeb5afcba89ad3824943accca2c162d6ae533ee1d86b7f66d3d3d8ac8be4a682de9c8deae93c9667315d28320e5f9e2df58478c1c01cf9d43a3
+DIST bash40-022 1592 BLAKE2B a55e5f7c158334b10e92a6af168e0eb1afe0f65599b5b68545e0507578c882cc95554cca2cb1dd44c7b07015a663d1d8ea7627bf8dcede92cc9badb755ebced5 SHA512 51ba81c6fe4f03e20f4d80a6fd5aa86848adabab8cd43cbf5120ad16358917904b7ad0989115a0220e7bc4b6be6f6d5a1175c49bd93b93096e9510eb67739b10
+DIST bash40-023 2148 BLAKE2B 848aab92e405143b2edd0fbd4ea0f68f684d9848de78d5a7cb8affaf322be03dd686b5e52e51d719f4d08764dea66454b0885be0775c73f96f89153b143f056e SHA512 1ab80dda1164c1edce11c7ee31999be2ab6c6e7fa8e755c9c490164308e898d05a9d46a119e60e98c2bd6fa6715375c02d3569e7d68a0f713b80e7a7ce60c401
+DIST bash40-024 3049 BLAKE2B bf04b51a2bf22b723184ac96e71bd4c29b235cb4f940d868e98c0bedc0e2ef7bf4d4aa909cb72a8ec0f6830c5f23d3e34df70673dc1b25c0a68772e276f200c1 SHA512 6142ff4c0315397d84eb365382cfbbf2e0e14b5d180c8d59b437925ba3d683567ed2a8eb7838d41e9beb07b5500f345c60a9aa55dc5f5709aed7b8f568a1369a
+DIST bash40-025 3435 BLAKE2B 8f1901cf0e5cae64acbc9efc284eddc57d15ee98a77bfed10e8938c7e1d5339c5703c5bba93aab823f1549757019b7577ec3b368adce0b83bd3b1ebb83b3fe58 SHA512 ac84f5d5f997f2bd10d5c0cd79a2dd1c2cf510eee0ebfc291597df95fba9f5851d0449f477f82bbf860652ce618ffa2f2b0108921b8c8e6e582da0f43d4ccbd4
+DIST bash40-026 1433 BLAKE2B b4140f20475c9457966772ac4f48009d5a4de397ece64ffdcd89570182043d14d59cfd9ef0384e5d449ef8e29c9f7afcef03b2caa948248380fcb178b40db238 SHA512 92d65885d5989fdd243074ee4446e51a721bc501f39e3887530d6422c25fce1f2ede2ad567d5acc8d1e2754e2f73001b8c1db33d95032f68fa4211d5786c0d29
+DIST bash40-027 2010 BLAKE2B cf4619d3c085f21914339b0f7c16c772cd59e5350f00e5c4d4367fa727fd0cb965b7e80e660167b5b864008b46e6585fe2b98e772eac984b4038eb7988169d07 SHA512 89688509123ef15bda34528569d5e3c2bc6627bf669e8dcf979d81336875457e82b669b9ab50dccdad1ac40d5f07a4d5c6cae963d94ee2ac2b19b7677aa187fd
+DIST bash40-028 5567 BLAKE2B dad073a07005551cb6370569d3c23f14a17a44e9f4663c6cb324e18d1ea3da980d0793a8738414c4a3c7f17dfb17597866be7ec8587f21a3fa0d30602ae04532 SHA512 037ce07c6fd5872054f2d924ff81753af2a28a2e70b1da498b8278d08a5bcc49cb8f242f4960ab465f2db3b6d05f9606c7d6d362b028ef898d08a2ad08c9d682
+DIST bash40-029 3119 BLAKE2B 9ad35b483f92460e0979ce0158cc60d9f604f219f0a06d7863e3febdbceac0be81234f1e313cf674433eaf4f9edd5e5a5733a280c19523fcb12663ddb6f790ec SHA512 cdeec36c7d448c167fd3e8bdfe1234685dafb5c4010efa5ae605be228006b89f3ce68d143617ab62159f790b381067d57d0ac25dade3bdf55a2f0abb0dd852a3
+DIST bash40-030 1649 BLAKE2B ad3adf70b8058c55e102fa8ede69ec3b4c569de1b83b9ea6e4796615c0878eebaf9e7a0615078435ece689be7547a0972c2527b6885ce52c47c59e5aa72a5ae8 SHA512 1c27708eada140d99155144b622e8202591ed3680bd8d099803a4072293d6576a850a42bee67c1968fb74e30847d36b81b2d84d6eddd657e3e962095c8e7f822
+DIST bash40-031 1633 BLAKE2B 8178fff26640efdc439557542fbf2353e7205c6b8335149157afa35643f97aa264048060e8a3a3b2b24dd5cc03f61dd9f850692d58e07b05c129e690f25e709d SHA512 e6b78291d4aba78cfbb4a3ea0ca14f94a0986f0cd9f1a286996745037ac79da87b70c3936c32bf9e69d99dbab0d782c8811ae6d3d821106d135a19fd07d681d5
+DIST bash40-032 1154 BLAKE2B 204b9b61ccbb2faa8aa1f4be484abf20f03c47e80984387203db76a9eb22b0e5040c2ee7e47897b0dd357d97008286a94d0cc547072ee0a325240a811ed71331 SHA512 9e6bf2123557d8b4b908fa3afc278c8d10b8f647dd7de426ffe2a88098a9932d9f2fcd5fff922d731a7330a0a5067306b9bb626f89980c6b6d66d7e77a73d69f
+DIST bash40-033 1380 BLAKE2B a68b23e96f92027182463e4bb1af2923a4c93a45fa29fd7a67569dcc27382a9d82bda9ae38a413b267d05c4edf003e7018c7b1f7031b14b6a872b291cd3d7b3f SHA512 ff7af4d5d2da49e60741749b1e3814704bcf867480cab33108bf23dc27358d0a1c6f79d98991f245f65e5bfc67fdcc4ab05dd84f8f90c7a2c922978f8d95cf1c
+DIST bash40-034 2160 BLAKE2B 12481690f4f154a48694910b9476c2defb10a0cb5d6f4ea2685f09f454b8c1a094b91bcb98631401ff7c4f5966caee686aa73be3e84e280e6e15e90d3b75a59a SHA512 90248b7bf39fc9592a14b67d4aa0367daa50afce230e406a31c8f2e6dce091fbaa80092bc3f98ce4e9b3c20b6c66c827882dc1eea669dccc5b87ded185d60eeb
+DIST bash40-035 1884 BLAKE2B 6e75f58dec6b84564dae03ff37489cbb29a3fe0a7270d3d7dc0e22fb56ea08d9bba711a6dcf67acd2486af426ea6bdf904c469e50afe14f29d60ab6ccf93497c SHA512 17a926fefb672991331ee278e94ccaf880054379f0c6e4cc2b847937f54153b8e304ac9d54b65961f3e24fe89a32b961ac219453aeb6e182bd657e103c6ff8d3
+DIST bash40-036 2618 BLAKE2B 868cc7237fdf31968ebeeaad4a5ccf92b9caebac5842bb50b491297739910ce8f9f97049a48c9b73401c3fa2eacbbb98b3b13d0195b678d653c031af01c5bc61 SHA512 5c3f84b70420ef1ce55cd1c9fd30420754f93d7ebac6b2191e1c879b2aa2a147f25e3f881dc845d9d6f21526f0a294275725d41428fe1e214665262d20743250
+DIST bash40-037 1626 BLAKE2B e7030f5f7172c9206ccca0f6ea7ede49640e7f2d8f03316098d874adad0f4a096531cf5463874f64ee77b8461f2f85679d19edd8d56941af4b4c6f90dbc303fa SHA512 24f64f9457ef4dfb31cb81bf4e683d94a71b269c03c1189309d3bc6dfc3354594069960bfa704c76141b9dd9a1d7994bb17e803c341b94199752d44d18b57d8a
+DIST bash40-038 1620 BLAKE2B f84bb7b62d1ac2464733c5615a35335cd1e0364eab5d9d825efdaddf282fa9a9bfe6c2d41525573ef45b8fc82919c984fdd6f1ffd7d3877662ae012b929ae2d6 SHA512 8116da5e07a7aa8afbeea7f868227ab5d21f7893a43fb4754da9a4c6598de099e32cf47eb028289a257cef100a5e952ca9f87e7943674a713b63ae59b455346e
+DIST bash40-039 3272 BLAKE2B 3311ba9fb753a0afe1fd30d58c7eb63873ef77cf330ac0cdd277b504a00bc8317c91b270f822a65ba2f095aed962a4248773df02c994c63a5d1c0b49d23a8f31 SHA512 3db7ab0fd9ab1e2fc8a4b457112053a3a04fbc2857161f765937753f75eab15595f0454bcfbf895c31774a5b5d96152b95a3d9009f53f8caa4df4854bc260769
+DIST bash40-040 1173 BLAKE2B 474ea1ec7f5174d0f41dc64ce4c0146e8c1e5bd517f3481d5b71ba5b4c540a52e1532748411ac0d1a10a293cdc3c738a6a5c2628acaab09d6cb18b498bd223f7 SHA512 adcd63fd74f0d9c17cae0595bb6e8a3d678e296d5ab37b3c601af47cc64bae2c2a63367f32a9b93033423f819e0aa0fc4cbca7051003c296cf108133cef0ed92
+DIST bash40-041 6639 BLAKE2B 828836056b876ac9998d8b1a2ed8a199492f77ca041b9cc0cd29f72b593f32decde1c5dd8f7be2a18ca988b1b5ea543d4501e8d4713f40d13208eec201d5cea4 SHA512 bb71f3a26d6f0d099c69e3f4c5b25a4644f7c1217082fba65c999317ec5611edb8733057f973e84eb0ddfd3149cdedc1e1430f062a361523bc04a053e125de6e
+DIST bash40-042 4056 BLAKE2B 4ad0bef3278205a92dea434c9784054b492cc47997c0445b9b62ab42f140a5bfe21befea547bfcfda1cc76b565ae84552f7d8c710a9419f016b09982d6d9c897 SHA512 98bd4d05af90454b26831af690760544f3074854acf6fbecfab30258bd8aa8a010d05395867b7bb3c1bea80b3baeb6cde643c4ce99bfeaef65021ea7a088503c
+DIST bash40-043 1824 BLAKE2B ed0f37941470552be3b1a4e616752ec3973453bf5e2c6810997b22ec16f618062e8f1fe70e43d029f4f4d5e1910e0368806956490d3936e7de8b20b1d9734d80 SHA512 bef809c83803d2c48de2e7181699b0a49c31990fdb7ed7a056312d1d20963b07c33e97bff746715381ac9114afd3338c3256dc79813d593880418bc6099bfa6f
+DIST bash40-044 3882 BLAKE2B 6fefea2729dd045bb5932a7374450f3839422c63deed768f2c054c47222af998492f532f884c3db025462ef599691b934bbbcbf5bed01b12783bd63a45d8ef34 SHA512 89b36451b46efce43772663ee3c1cc6090f9c66fdf689b4a2cc0c56fc000df27deb304d85713d22f0d014cfb5fdbed5889b3463cee82614cfa8dd1a0effe8162
+DIST bash41-001 1445 BLAKE2B 628c1a8c7fc606929fc2f60470d99ff104030d351e736bf5ec493a5eb39e5d0554cab018185cedf72b2a89443c910a08bf08dcfa7e32036939720688615c20d7 SHA512 22ec94f2459a3bb966b16e8216a35cba0d58d532c553308191c2d9aabc2c38eedb0aa2fcf972f1f9ebd1681230a5a7d49764dd435991db69c0f025f6de9243f4
+DIST bash41-002 1799 BLAKE2B c96a14f277cc6fc6aa9d9c8288933369d0a7dcfe7362f10e8b7289da55d3f5171cdfc4c69e5ef6c5d0109d0c8ab859e4eadd408ba2642cd79c0f9cf6f2bbf9d8 SHA512 0e0aa000db8bf56cd0948579cd96c3bc0aec4e4ec0bd129bedab57e9d7a4c54450f0e4739255c3be4bf4f4ff679eadb1ca6bff07d76a2951fb11cec20257751c
+DIST bash41-003 1407 BLAKE2B 3ee6d3eacdba243fd7b64a6e5e1e86791202ccbdec3cd22fc7824a32fd53105da9386251cdc6223d6403c9916991639dbacc0f45deebe0ce78b04a0a774b95fc SHA512 3d8db77e8472c232cde67f6dd25409efc8ef3f40396d5bddd22b15622a55a664887d46b7bf9f4a7bcc573e8de9dccaa39575d0822b61bdae5c4e98553336aa65
+DIST bash41-004 1705 BLAKE2B 26e0bfe88a3e348511153b4f8e6ef9780c3ce225b143dcbc008391a652885f9d8b5d45d413fb0e46886e98d0aa22e34a30271c495172b72fb6cd8d2af615ce24 SHA512 e95f64cf4e59cf616072a46022f61e9289452bfdc625f410d7688e8a54e40ef738d8d6c78d567cc0a5aa7e5dbd4701d7dbe7a457f761ec1c9151f6b9adaae6e7
+DIST bash41-005 1626 BLAKE2B 2211a8e6b8e7d21271c2956f5b0b39c0b5b73215ed035f84ce8477ae09ae82cba0cfc1cd6c24f7e56ffd787dac08c26daf15b1ee277936bff9251a268f7ae9c6 SHA512 48023385e399ff55fa8197503147c229c33ac29f986323677cd810c305c5b58d175f1c8156664dfa70f3d466b5d5b17fd71e5f26e800946e326454c16db58824
+DIST bash41-006 2166 BLAKE2B 0b5d062f646643650453e68d085429ca4d4a0f41bc153213ae569c89f6254077c2c85cd1eeeccddab233f9b197cdc3b0c1b626c129a65c4b58ed7cac74d605ae SHA512 bd5365314d3dbf27e23697be6218b54f2d547990a979e85beb97d49ca5e42b078a5b693bbab6b778bc67a7db022b1b0e0babd898023dc61951e431676a01bfd2
+DIST bash41-007 1610 BLAKE2B 459f6b7f9e344114f44ba574963e85436014db1cdb44a3d4ba3d8cae7cbb325f96aca2857301af362bc490dcfe2a6a3f753622570ee1c0cae0e98832701d1429 SHA512 757e11b04562d016f7479ddede52d6ed7480c87c3cd6d675d2147a100cff8344015bbff55e486f2847f6500922d195a41ede14e21829554ccee549a2fd6542cb
+DIST bash41-008 1610 BLAKE2B ccd126ae84c951d7f2c5027140ab8074d8530a0cb2d2fdc3f18d2e6a5466c92894dbd3458fe0b5afba0cbd0044dc1998b45f39e771fd3d8c328ee6a6096e0950 SHA512 e7bdfa2ff43ee48ea9941f7df53794fb00673554a67b8e6334204f9b66e05b20aa052766cbf27b495977d3f0812a1117bf1eb923f407bb7f4a0f8394ce9ad6cb
+DIST bash41-009 1323 BLAKE2B a2d43deefb6f12fb9026b653553167a52226e9d7f2e983ec654e3e59ba8aab3f45ed07dd7d189faf4f3d07460012425b385b8c9c3dd3502f11e1131e8cfff2ae SHA512 7bb1b8b6c36a4704cff39c25abc48c87129981d340e51c70e53e54f222867c62327211a9fd431f176bc40ba4bd345835aa7f5d5a38cac94d4525a898e9e0702d
+DIST bash41-010 1801 BLAKE2B 2be17ecbeb8ff29e2469b0f8e315b80be40b3c66b2168596b98589051059f9d103bc717e4b717a3dec9fcf67678a917c06c3b91db9039869f1c5c1453799eb84 SHA512 bacd653d3d8adcd5bc3ea8e2da089a57158d5f5241fc1b2a94bba821a3275ec52df412202d2067015172027f9388ce6ceab6e50c22548752cfe6c9224cb98816
+DIST bash41-011 2444 BLAKE2B ba75cd218cb9c92be974090cecaacad559cf5e5ead2dae8596f20721e32c408e4b2972ebcaff8d2170215c3f6bc5b4c25f0e73bf29845e4d488762f52f434d9e SHA512 9ce8249dad5646d6620188c3d844a1d66f0e5429bffedfe3f87816e801e29c74f18f21c6d1558ccb8fb7c7fbade12a08d532e6b844b285e57529b477a93de3ec
+DIST bash41-012 3280 BLAKE2B b1b812f4d3ce4c682b8f2367d603cb2997a121a609ad82614ab145de063c805daa1e0324c3914cf08da60cfef1e7a0d38f1230a0c277c1bd06d9aba25858642d SHA512 8a269842db2bcfb37b94a15cf75f0d1c357f4a451e1d69cf3dbfd71ede9eabeedfdfbfab78e67a4fc07dfd47e52100c34f5cc1d71f7e6bd3d5b27f2b3e255c5a
+DIST bash41-013 1181 BLAKE2B 2c127ba57b1262ba6b6e41be38608bebb35ee6e975118f10b9095af2772b8bd275164aae3e2e4803fd94213e57e0278e919008ce5c586692690f981ea250cff6 SHA512 ae1a0c2a7efd1fa9858801b68f47bd4a2d3eb0f7a37d24029cabb97b980d40b6e116a8559c358d67ce7f8fa290cbc3b88e5c07743a78a8939a41aabd474044dd
+DIST bash41-014 6672 BLAKE2B 25b4573ef087070893427271aa3dcaf9ff830cfdf7bd5fb166fdc6fa0dd46b63e9dab8e145debf15419ae829027b051e7b29207056f91488932ed13c0c5c3d55 SHA512 762e7487e9ba079c18d35dcdf3a2453b7de3ddd176986c502286544e735325ae3b6d710dacb250bece0e8a1251ccb026ddcd0f881f8a95a94d02c1be241ec572
+DIST bash41-015 5085 BLAKE2B 50c9e6c921fd8fa1fd468735f5480973603cdb88c8322eea2629097d465bfeb07845bea6e58c3545b3b032760904b9e89cbd471da6293dc0033c4b15c3826bc6 SHA512 3044a1acdd380f21317da0bc3b8455f7deddf464c9a70bf35e30ea434278b9b0c04756644e6037a133442b52f673757e223157b3b3301d64bacb939b4cc721a9
+DIST bash41-016 1832 BLAKE2B eea07f8664d0dec8ddd89b2d94340e0d1afc632e7e3597fa2cf51f4b5eeff0905c780a4d79d8ef0ed551ed16105805a45138a5462f4fc47a8c34f5b9b22b931f SHA512 d2e76f9e63787d6c9ece914d75ad4292235d753f146858c9597137b148d56b1847a322a0f7e07092f3d717815b337d3eb369e4b9d661d10561a0857daac5bad8
+DIST bash41-017 3771 BLAKE2B 9f1481f31f27f743ccc421ccca8c1ec8e9eddf2de952688d9613397515e0533419d3086aedbea65f8e16b310c55261463b0a6325b84befe143f1d0245838c419 SHA512 38c90ebf7ffae6b7f93062232a467f789ff1a642f791c8270e47562ddcb6472f696a0ce9336c5f0046b724c495f90e8090bfc48a50ea556782353e00d2ef374a
+DIST bash42-001 2944 BLAKE2B eae6723d8bf66edbed048f91c30fecf56223e74a5b3217e08825761659d6991e1e4f7986a97592ab18fb448ae4f7bbcbfa38920ed047cf291737de641766cead SHA512 931f2f1d4e677925b5057558ea6f157073a9ba87bf4ed59e7d8fe20957c5fc40f3384a98fc4a2d5d7b458129ec096d9e28a860b6844ebf15f377778a6ef8aade
+DIST bash42-002 1780 BLAKE2B fba35f0f865f36504e7e1b5ae85d21c7e9cf6a6ec5913a1ce1620acfdd22cb17434f7576742ad4b97d76fde6d8ed8bd5fcd1e88317b944bf59027d71f5e98548 SHA512 b9ca62e397a05b368b74920d8d1b168367ffe840cf168e312b530c5b390cef3ca53e31db63c9fe15fe1a36e4c98369bf10573db40d20712fb1a016f10e0fc893
+DIST bash42-003 6896 BLAKE2B 79cf673977a1c87c5d401f59d2c68e831ea291ebe641004042cbb5d3c5a9bd0c65849d0b65aec8a78dd7843d46b5f651fea7fa6c8a8d73539c2c3acf1d0b15bf SHA512 6cf944ab0f554ab53831cbe114f771671c7a9420778d2caa524c09a24ec8064e7a7ef1355e66ed3a53100b72736284a5b44e2c6bda03a8234a2f2d340ed47ce4
+DIST bash42-004 1686 BLAKE2B 592f4581e02607df7329e780b9de4b99d6c6edaeaf556e5ead1a8e25de28965b1fc8f46a39d73879be088d02b8bc5b4a33879ec2f212f0b790dc126e0475288e SHA512 aef5e753e59a82df07e18269064ff1d075e3b7558ac5aff7465da997370496bd4ef9c25920d7a47f66110d2ab719742033d96646921782d9ae15a27541765067
+DIST bash42-005 3424 BLAKE2B 7939bbac8c78a0f78fb6a8f1f887832b686caa40d4f05d15ba296901a021d6c3a8e7d8810381f9c0963faded4930eca74f2de0eda7612b175965a4de4d9799c7 SHA512 ef7fbc3fcc8174e7dfb27fb5e977d3a52b1b4b989cd7f748b1b35ea0e581a59668f41ec030e80f2afdc8b43dfcf472fad2985da284632b9228a6fd30ba4d0556
+DIST bash42-006 1187 BLAKE2B 7cc6fe69c701fc4d6a55e465e43b11c98d4666b9df842344954e010c5ecabe14d256ade15d7a8618e53f7e661a543cb12bf2ebd1e6b4d93883d436c28c68d6ba SHA512 018031cc0cb2078937c81bd42459b98cfe793ff7d638ed2bd2859ec1c73da6a420d649f7dd49f2367035fd08af430ba783c68417088b1e4126095ab9467c55c9
+DIST bash42-007 1394 BLAKE2B fe83cdad6c4cfedd38c498da9a27f3c348b46413cb87dd932bb24e6be262e96a6740abc4d0a60b09b8c6f29427928a7d1f4a5c30788eec79fbac84a3b09e4976 SHA512 65cef48b77530a3b87dec1c8c3fb28f553e83f28f24d5e170022b4962472e3e0021a57051800e1ddeebdb78548a3c192c4e1fef0f6e82612321c5d1335e2f8f8
+DIST bash42-008 2164 BLAKE2B d78aa82fab90c6254fe1cddde3c28634052691dbfcf810570b3e451dd2dd589762639b2e85a86ae376f19b9b52faf88eafbc82a7132f8ea9ce7ea8861c880414 SHA512 5a782a165701967dc3c34d7723d13668b9ca0c4679de0f6150f42a183425e110281d893f30fa81eae27821a6d89e8ce9d9631268d9e02bca57cb8fece0389f3d
+DIST bash42-009 2384 BLAKE2B 797be2e9f132a8c04ee316538061d41dd340090807ca7068039ea1beac9f412dab3a39ef213c2fa25ed0dac401fad7b557ae7327b343250d8663d275a7c9e693 SHA512 ad0b58d00f37e8626a0bb664df7e24e0f19dc637aa829ae8f92fbe02a53140a3ca7de00f620c5b53001223a002ec774e5088354b342a640666810fd57cd1ff9a
+DIST bash42-010 1818 BLAKE2B ac7848bf9af64d188a16303dbea75cc1a43d7e8fda15c1b624220c95b41685a84dcd07ec0ff3abaac67833e5db5e12d8de30c847cb5343bb2394b7d2996f3b11 SHA512 66e84164be08be47b0d7c8286b7d94a4da8538316dce8f8be54702fed2a44798d5f717ae3f524ce735d071430195ce10052a264f3f458b950fe26381fe6506d0
+DIST bash42-011 1426 BLAKE2B d2bd238a7ec2f5f7d2200c35f839b68ae6856675d4edb56a292181f3c48869ed13125d8da6eae76169a282b8ea4e37b995ac3317b4ea93dd37171be57c9c983d SHA512 0664fe80f3da9e5e64f1f0fc227e3937db6999526f743e74cf8d6eb589add10449c505422e241f1dfa0cd1e02c03c029cc0b7459850a52cc17d9c3a8d9c26a71
+DIST bash42-012 4247 BLAKE2B 0e7f082fab69d3906eb8dfc0335595ec2a60fdd8ae566b298f894aed56986237a8798675cf0c97d7ef4a8c737de9ba01a3caf0510ee6fc9567cc9ee5da9705c1 SHA512 0da4822a29d26d713aa5bfae00911db2db37242ec962edc4f256c8740e345b68e23dcaa4ca8bf37eaaa9e58facde6fe87c3b20c5bad565725a178555aed49503
+DIST bash42-013 1340 BLAKE2B 4508bf8522b4254ce48789e37aa22e86b6e193f6420036cd50fe47c26f7fbd8596edd523ba403b2586c86feab54294d03c7b62c2d50874ae747002497bedb4ab SHA512 25f4caed2f4eb3f65dfb052b4b9b30a02fff8a1e6d6575e2da6bc1ce02d10aeb113870916f0b74ea2cd0722f81bcf8c05f70be1af178cff3c7091151d5791de5
+DIST bash42-014 1434 BLAKE2B 84d07610a6d5f34e3ece67cf55c5d43165fe1a6a342b33d9348eb83a0e18095f28081448845bfd3fa353730c9f1aabc01fae6adc3207e7a15bc2de66a1c257b3 SHA512 ea8dbe73d40bdc0bfc1752ad6fea9503b72bf4c204a6b0d04ee898429f2b16bf9fd21f8ce25b72e87efb82769a228ace31f1624f03491383129ce7935ead97aa
+DIST bash42-015 1991 BLAKE2B d0ec1d76210cc8f1098e5261e9eeacb6066371dfd13455c3aa6c604d3db6f9fec51261c6b6b41d33a7696c7b7b42119296b265943024faf1e9cc75a18b92a156 SHA512 dd572539a26ae5c80b1c39cce8c548b9de0ab5b5f7e711974413322cb20845690f15d985713facab71957b6988553c0a613d5fa3dee2d263bdd9a8d7a5599ea9
+DIST bash42-016 1410 BLAKE2B 915412cbda007f247bded198da966002159a3d62a41f6b7a340583cabde1e41c6c1a9339879855db9237d12d4b508bc1b68b9f8b03c8ba8ea6afe9fe75d51665 SHA512 2203fd108df4e9c8c93974ce2ac10d8d7bc9b6df1db92ff88b3b394d6fa26ca13de6e308480c192907ecd658df5b4bd3b077a946127b82167c3cac431c3defa3
+DIST bash42-017 1399 BLAKE2B b73ddb026dce9f69a86dae9d6e4449ba9a2a1e029b767c97d5a2c9dbe08c9eb274a37521c6492678326e9d61d730b63529a49b4a5357025a9931f98165de268b SHA512 e2b93fb5f904a0064addd2d2d20bf4f8d868120bad1486916ae0774e41ef4123cbf5b31ef64109361d091ff317cbadbd28882d6571d3014052229a14993ed933
+DIST bash42-018 1929 BLAKE2B 00325154113f72c593596aa7206109c30baa60c4c3f3f06a783c4c55a806d4bc09164029066ba1f7962131f0aeefe107fc0441a38d65b8f70c8078b9630feed6 SHA512 facbe3d258e0e7514bfe3a8c6516aaf2e405facd233e205794ffab815f850ba7385d2d18d7b3a9c000cfe254a771779c6d8829b2fee66a9d6071b1888155b5a1
+DIST bash42-019 1415 BLAKE2B 2b45a759492352121010613762ea6d4bee01743ff9b4ef46b85492f53dcfe590e3d8702641ac0513e10c06ac140c81d0b1200da65bdf5ddeef9a8af44de0bc4a SHA512 f8086b8358201c10e96d9533b90a58248e26bc379be96a8a9fba88e09c227acf85cddb26c04e93043b35371c12cbf156f591c9af88b1eb61ba8acca53f6d07a1
+DIST bash42-020 1825 BLAKE2B ce00b0e84844f953c4684828b38016f072e64e99c28526398e57ad369380c476997102ec389919cbea121620d91ca166655478a6edbe09d6018e96ac4e26bf97 SHA512 23549c7a56e43f9aff7ebc376657ff498d07b47ebbfe6707ba3711e095fd80ca86d077c5379ee62c86711880979debd7b60733d83e12f349ced9e93860d8fc8c
+DIST bash42-021 1532 BLAKE2B 96a5d45657b80fa4498dfcec2d5881b2223198d7ec6c2d63ec953f9920c792c387d82300cd104a56609f31757c4ab0530c0e396579bab7c34fbbac318b59e4eb SHA512 09783ce72651af6abffebdfb3d3e7446b29ac4bfd395aeec66ef1f5c8a2bdc2238957b7e6f4e896178a5e4e24987de209e6776f29330879c0d8e14e8495d8284
+DIST bash42-022 1395 BLAKE2B 4f3866df3802e48d88b00a829527b30a197012b44b69139bff856005041eec8fd9bf2bb51aec8886e71e5c9ae3d0d006c2c7764eb1ef8f792079cb0e7756aba8 SHA512 ab6f3f175581f34dc106176fbbf5c2d19e9f421e16f328cffe98f11ee01462b63e0f1e720ec467780d91eb240a4a7fd4fd1cfdf6e0cb1293a8e42e8a4805c152
+DIST bash42-023 1699 BLAKE2B f9e9455db9a8f168be1311d63fabc6202c3a5eed405914e48cc15dbe6b3929d73e449b4886ae0a29e4bba1bcb8c09de3ef9ab7376d84f624914ceea2db5375d0 SHA512 b9d7044800a988dac8c59c48bd4845d3197d6ba965d22fb8f62b51b9d48f5a55519104a16283fb638264a6f858a6d574f8547d75721b96da640721bbdf097d81
+DIST bash42-024 1363 BLAKE2B e6efdb5b3a60aa27a601077939f87e9d10aede81abadf0135ab461a259d4b3f3a1907d3bc0a0f5213f3ff63e120fb0842ddf1831642d8024bc5cd334dcc5f9cb SHA512 b4964ff258905cef806add58eadda17501e98bb3b3b5c8ce8ee0a9250e5bdf0a01329e1bfa973204b1c8e5da8fd068bcef624ec65c2f401c41d0b6b55cb2ba76
+DIST bash42-025 3969 BLAKE2B cb8ccd907a8b82078fdc86da53a87cae18ca411ceed0327280f677033a324a4162064937f583acd0b042590c7df5327e8a2f8ba466753262e612374312291b76 SHA512 b4b80ef1a7599506454a912e2ee23f422bd199a675199b926c3770ba9091fb69583ddde84e67d897c79e6a047ebecbd18a5ee72557e7526c4108476eb5cff71b
+DIST bash42-026 1577 BLAKE2B 3d226af4e950b99fcf51dae8baccc7c7d0df19c8d1bcba65f69f09ff4b81c2980a084854f9609e0c23ea02ecd8b3d09caf075b70a3499a5cbc1d4354c5c34a9c SHA512 b00200d0b9040c74117e0150c589abb9e511abb01888c485eac770ab61c234669aeae3957a6752ab99c378ffd8188154bbec713c608b92cd3185a649b71615bf
+DIST bash42-027 1461 BLAKE2B da87535e0a3a37f105e9f155b739444a9753475c7ae0aa8499147d18518d49eadbc58a318151cf3d8ba5ecfc24c068eb9acf2e5645fbd5ee19de0dae51755d6c SHA512 107e13482deb9f6355196b2be9b717090aaffd8cf1580ab347bf38600e607c31cef5173b68e426a45d1678c7c64e7e095d5b6da941a5f53218919a0629e2fcfe
+DIST bash42-028 1834 BLAKE2B 5c65b8d9998b60db9ff8f054b4bdcefe1ac17af48225ec49e5704a8db2ff9c8e1caa67aa58a522a46eaa8b96d5056c42b991c36b3fbbda76e8626320ab169938 SHA512 6e6ad04e7cff2d65045a9afb617c041b571b6c8cc728f9994825545b7d43c0c7868c68b22546784a6f604d3e0ec22b7bf0423e9d49b7109fefdc5d3db4b31399
+DIST bash42-029 16812 BLAKE2B 1f4c89668f9caa75cfeb9a61138630347dc79b0c886a005bb5af0733f16d6d5d0630e5c73d992a22f589f477441af0f75a6afe3f2a7952b63e986cb67b8f92ba SHA512 9349625892201cb46f3669c18a38c86d609c1c9521fb8caecd6880df822897c6d2541dc0cf5d3d11d27779a3be636b0c6550b7e3b010d37e83804fd1ab27d35c
+DIST bash42-030 5046 BLAKE2B fe3fc82ae559d99807fdf51bbf4be3e7c40f831ed02e2e7fc6fcb9bf1aff97531a68b50f2204a6f26c4d603c7b3759a28eb269f2b6b5f4a00c8edfc175885a43 SHA512 4643252a45b7fe84451c0bea95bd0089a1685067032c8a2e42bc78587deef5b6095de77500d1c54227f92940b201d193984852f65ef886237dd435617639a46a
+DIST bash42-031 2047 BLAKE2B 4460c67615a4d67aeeea4f7e8a02f2634fa34897fdae611a7b17c66855dc245317626db04e5e8fb9bb541e82a750587b7ee942485bce21a91e93671a836813de SHA512 de0ea5c279ac956aca48f12e2962dcd4ae2f653349bf2350ae7b53e8370aaf882109fcb29bf559cd81512362bf31a100193de6bf193ff52331e8325df2f82e91
+DIST bash42-032 2416 BLAKE2B e57d8132c87621e5800a3d3a8176da9d9ca2d8b506136798f99aaa5af93da8ece2973c5b305617af7a9f7691b453b519d6eb0a84676542a7c7b503c037281e48 SHA512 ed35285989290c10f5013770397aa14897e63a28f5ae5a61319ea5881b0abd84410686288cf0f14dd9486d8fd623c410f857b48fbdb62350121e3596527dd3bf
+DIST bash42-033 1634 BLAKE2B 4dc8540aed44299fc2bf8a6f0ca25f17cbe0c9ebca16725bdf247560332fcc9d91f5fa9e99e993cb4916ce1c35125bfe8ee150bbf7233a1190bd442ad4fc2d0e SHA512 89e277e5a2f43fe75678c0dab57cd7c8761efa38f5902ed0b311ef6a0cdf48f683d3f28fd419908db43afdaf4f81d831f0fd630795f4d20b317543cb9ab95970
+DIST bash42-034 1345 BLAKE2B 64a37973eea3a7dbd3fe40657317f87dbd23ba7d3adc5f2d3047238f59a37c8a268398f81bff8166a12a2e54324020fd6c189a27a0dcc993e801d9e7f9d9eb45 SHA512 d59a4a67a241d262de5fb27b96af0f15b0f6e7e922b2d61ea86e037dcd07ea77ec3c1ef6b289e5bbccd011b632538f264bb6426c3a07dba1946c094be56e0b16
+DIST bash42-035 1920 BLAKE2B 4beed2ed09f9a7cfb20c8d8d66ba2b74afb90a421929c53ad00af541a4ad392ded7142ff86f8d8fea96bd4d7b8f0e58df7a1daa0eaf80de27aeaab5dcdf61d95 SHA512 9f294177e91600f65cfee1b9dbf59b3ad7db449a99cc1013b7c97ef6c814b51afa7a2d2516a37fcc110ff3f0b25c4b06e42094f4665e03e41650bfa69c15eaf7
+DIST bash42-036 3123 BLAKE2B f8f210a16c60dd74a018d988abf6844c64c00ce57de5e6c2e4ade8418f1f460c93029a34a082efd99a99b4512c7184e8c7abfa1aedf6dd216c4e4a01af18983c SHA512 7e114b99d8f5b210b826715c77adfdbb115e86ace35f7ff331fc6f595a4d0f689a055ccf7adfbafc057c7549f5597e4de455ab9e18a6ffeb5b4fd1d3a2aab99c
+DIST bash42-037 3483 BLAKE2B 03479afb859db15885b5390d020554ca9671df603227fdd6a54158a74a6d3e4d04a8659bd80f6d8b16d80708c9528456e5ffd77fe5c8052b763de7b5d2ec1c5f SHA512 4466990dc3499ccde5940ddfb383052fa345d4e53fff7c8963ac7482fa280658b4516a1583486175cab2f3a5c8afbbedda8461e3cb1802031bce8db386404608
+DIST bash42-038 1290 BLAKE2B 5d7b07d6d4b34c9a742d81dbdc2c8f2d692fefa3a4b3bf4569f73c70f7c6c7d46129ce4a600bfac4c6caa146b40183aac6325900242c3ee5d39564538e3312bb SHA512 f835bb393153310fa2e4c2d95a98c0db53a97075f8989d61cccb095db223495777e413b21e9b235391a4a0f34d935a828ff5ccf337520d5dc87d380170efb351
+DIST bash42-039 1603 BLAKE2B 6347cec148aa7cb084b181bc4e13380eec89d85220e26cce97908e175b3da58b6aa90867dcdb1b6f5a1a74759dfebb8e93e2bcfc53e9cceaa4b096c5992aa5c3 SHA512 4c5e44a623840c7efe7894f313a5691307b12aea325dbc923b48deb6ee6ac0bb2ff7afb0d2ee12ab97b04d60c1b9e2a4facc51b66c93be9fe0beda317ec7318f
+DIST bash42-040 1710 BLAKE2B e3028ad9fb6adae44839b0d2c24d1070d4ce71edf78d5e43e095c312819dca021b3ed805897961733fe754e72482b4bc6770d5b4bda0b3409a61c98e56541c91 SHA512 ff5cfdd2aa846f0831a1f2f7b477e70fc6b68b6c4f4785293c417039a7f3fd4822ade4658ea17046ab9616c3fed02b463e6a3e60aeb7daf6ab667da14b9a482e
+DIST bash42-041 1463 BLAKE2B 9d6ef6f642045c41d4a05eac492511a442840953a8645f038895bf4e9a75b384e05f398d674e1512f4655d6c2acfa29e1915344b4a77b7ace1314f459eabccdf SHA512 7c9c12fc77bb764dbe8061e6df9419ab84d296a76c4a8bd96cf0f507bf70652a1c869162ac8d8c36f2d16ea0912a142fe14d6db45636bcb6e6fdf1444f0672a6
+DIST bash42-042 1571 BLAKE2B 48e199ba5b9202ffe65e732dc3a436b5ab983cd03bc10d9638f336cf3baae6c7b34be3d9648ef158be858a66f6ec30fc15a323e6648a0539bcd14f10b069f5e8 SHA512 99fd4f5f70e3d7d2e8dc1dac80e6ee6e0bb9ba1f629f41019b13f36aba2404aa4d786049bb0039e5fee138a01b813d295d4303c7c3d561a3cf565ffa19bb081e
+DIST bash42-043 2110 BLAKE2B e943776a76773e3ca98881dca2a9eb7a08b10647ac2eb4cfe2471bfed645ae158deb2cda4d46c56adb125fc6728d694313425e213bf6cea6de1fefbf580376de SHA512 70503181c392faf565ef0b23a2f6d1614836ffb9c04791cc4bfb31aff7786fd5efab4072034a4cfba0035595140cf7f9461b1565e4854ec34823cbd4f5ab419d
+DIST bash42-044 1871 BLAKE2B da9f30b1d3377f21503175b95e8d44321ccbd350ad91e1677621a21561ff0bc16e7c1e3415abce9233ac991254a1729b06255cb7e7483e02c0129cbf6969b32d SHA512 e94cf93c5760225d4ac16f9c73078c3ce9913ffe1e20ffed8fa31084a0efd3dd63762b5437221f6b570078667e3ec19d882169ffe0ba4c498e258e56f17d2511
+DIST bash42-045 1572 BLAKE2B 0576859a306c36fbd422e932643f7267c841ce45de57955d662a6a1b36c811ee2e7610771689a67f538896a9a09625c0b2104eb6c5525033b093d9d9e5452e3f SHA512 64f62b19c79eb2c581feda2b9f3c36196b3a794ee9996f6d72078fbb0b8c5878aa2d8ff3e2698cf9769e42083704dd9342bb108212d02aeb79875fad70895560
+DIST bash42-046 1988 BLAKE2B 8e934ca90d4b2aa531a13cbfcd8e497976732be115e0441031c334e95b9172c488a97b5d9c11e2aee921cf48c575c226895eb10249fbfdc93ad28d76bb792625 SHA512 7e4a9d3961cb8bf8559f82684cb75fe8600a377522f582e1a9537696ceccab32d15d1045f850ea91ea8bd2cf286d79412bb47460af26bec8486d5f3137f5d54f
+DIST bash42-047 1353 BLAKE2B 1f60ec8980bfece8e4cbc90326b6c5aaf539ffcb5f23be7bd8a6e92961235ce581d00ad8e28763810ba1c18f917c88e77b17a568812aedbaee66d892608e5bb2 SHA512 0b43eefcc0ef3a55e309dff339db31a07849ce794e645d917f1836f48c71b84bdc50aa3315b3b2e33acef2e6e81a07f2a026cb43381d0f809c8271cc0a0699a0
+DIST bash42-048 3258 BLAKE2B 73633fe952d83a121206e0b8b34b12240ea8ce561f8b9723fe343039ae276d7ae75815b303a06db6150633d4eaeac1f2f84cbd99255287af612e66b85c2e00e2 SHA512 4218377052da8900ab6d49b855ae6f7779ad94e9e76daf3424240fbbb1bab37b929989b976ecc3ccbfb66f3c278a7ba546e5d34b214382b41767991945d960b4
+DIST bash42-049 1159 BLAKE2B 24a4f49fc3b9420dd03dfa83da02972795f7177f3ce201e2d3a4d5de4f11b2a975c3efe3469466cf83a3497871773a3d40f44e6d05a7311ef5c87bfc79c4bad9 SHA512 a0472af2c3bb30fb3ebf0217b34261aa586314a05fc19c959b4931dcd064e0a6a8b4e37f8b4a9dd13d8fff38822e32e12fb28f4fcb73b0f6dcf42827fa5aba05
+DIST bash42-050 6650 BLAKE2B 4eb90ef75bb6bb8bdf62c1db947221a6b50896f1bde066b24e5a25fa1fb54c508be6eba2597f459a0a6b213cc921793f40b8f6e0833da535f6d78545c1a7cb77 SHA512 317a5f90d909a5db697025894b50f35f26f8293b3ce1ad9b8e9dc6d0661f277659c8cc0a70a113d3889b2de6e932e5af5ba89a427f32879c69d4e3db24e6a2a8
+DIST bash42-051 5063 BLAKE2B e3dc28a84ec2bfb373394150d1027dc8d41df0f7e844f3da73bf8f47aae02cf45b77f7cea9228ed763d1d5dca5518221a23293fbe0d3a9997fdd1691417c24ea SHA512 de9d35fae23b9c7782139b9812460a602252675a9db556d7e38e8c15ae914db0e4a1f2e06db909e249a36f33ca1f04aed25fc8e036d9b1fc6ab58d8148524e2a
+DIST bash42-052 1810 BLAKE2B 8ac0fa5ce88800c9d5da5736e9a4cce5cf7bf0c236ed6254fbe620f0d8e8a3269be4cfef9d2d34aaecc27a22f386e983d4d5d05f1d4c24ee83324a09fc005a87 SHA512 94654d078a58a7acdea99c955315f9537575c7965514eeb19d5af9a18973042338500a72e917094ebda60fee1016cac8328f37e1bc011f2b485f167cba2aabdf
+DIST bash42-053 3859 BLAKE2B edb129e2c3adf02de80f4862b1971fff46364a8d4fa92756026fddbdd51ccf6df6f94ef694380956ecfd33f35f2598e85e16f8eab65fdbb2ef40079a3c64e2c0 SHA512 241dcc2d3b944d0f136ca5f2564dbf3593491664c5bc18d5643d9861f273ca18dfa92da2f98e2c8d62e770b7450ffc27b82260fd50974708cddc4c26604942e3
+DIST bash43-001 1617 BLAKE2B c268cb0b2cd02e1bf5ef20eb84f317193f40e00b8f1ecf082640777b03ca070ad9b70cda746a0bad7fd94076126d4fdcc48e31c88bdb66c451eba4fd31bdf83b SHA512 a1011392652180a28f9837af4a341a80beb929c1458e2384e282f0007713c5fe8d0b315abf1340b3707748d3caed322135dee87b59eeb7612ee5130f87d79888
+DIST bash43-002 1594 BLAKE2B d1465949ab51e582498068e4e7b2988ce39ea9ca959aea7a90f5e050f119ba5cb96f1291d3ab9fae187e0b8894ffef73823139a6059a3e227bb1fd3934a28f10 SHA512 e3178c85f553522d5d1c5fd39e76f015b680a8ccc84836a5e10283b2aed6e5b7cc3d23af0e67a270b7622dce0abf35dd8a95afa9bb6f89b73a9439f7435175a4
+DIST bash43-003 1465 BLAKE2B 8fc9e83e39e0c43dc9365e3014f61d7a6643832c78c29da71dfd0f3adaf3dced5075f57ef42e183fe892e4db837214fedb1b8fd00f717e105c56b460685f5409 SHA512 dc2c5fad8d357d1301e419afd959dfaf015a63172857080c11f77ab1bb7d1d737f411eb0e70a861f98a36bed1b19edb7217a4fa9f4773e21706b62dc56ec3464
+DIST bash43-004 1534 BLAKE2B e227900b10cf9a35055c79f6a25fa1c6db13c5ef652b2733570297c7fde5001518aff2c7b3bd0e072ac2d6e950d916f6f7d4c318db048aa15c1fc8791fbc1ebf SHA512 6a5177d5f4205ca9d3824601052dc6d0cd768638cdfc125501c5643dd51d537f5d075cbd11a10356caf4205e47a0287c72636065789ecce264129fc92fbda420
+DIST bash43-005 2636 BLAKE2B 659e60ce3571571e74c116b1bc502168641eeaa6fd48131842c022bbcfd9679f4e1e7e7f593538dd51caefcc0fe3b122e5e73cb8384e4fea9212f810cbe5cd43 SHA512 e201aa8ef0ce0d74fa5ee42e8171bbb5ba633d831d863a8e8afc5d5157581bb055d16c52b316cc945979a852b0eae7921244a24b89818acfb7c96572ed04d1f8
+DIST bash43-006 1445 BLAKE2B 40c0af5e2ff2d97f30c0de260ec32ece50b43651a89bc75dd4e1fa2558a54d687c577a0f44ab4464abe4db79520a08eb1ea23d090d72012ab9bf472cbf29a2ef SHA512 d1da3c9d3781482d87cdcbfd69ab3958ed4950f2a00e9d15228ecb4ad5ca8ae253eff378010b4908d04df2ecf658e08f7c2efc97d6a0b8dd2317552c1895d7b2
+DIST bash43-007 1331 BLAKE2B 66b94d60ae4262aecb23ba1beaf09eb976c93c60e64424e0fb3dca1bde24323a09f71c523c3d32085c7888dd99e1fc5e3aa774a2e1f56e1cdbaefd93e7f688dc SHA512 c445b5cdd486d06991c78d4c88e2e44e49f74d1fc07b8e4bc9492cccfc4ff4045587bed6b24d745974c6339340e45b9756c27723fdb79e7591e7d6c5d350a86e
+DIST bash43-008 4575 BLAKE2B 32bb0cb4dc247545e72060a8ce658fa8cbde0113e38d0058d0f85bb5036d6eeeb053989aedf21f5f13d8316af6aacff8f4a9b09650f50b58481386352af8718c SHA512 53bae88cd3341a4ef8c60d6a294c09402103d1b20f485cf85775e6730a3d2eec8e6ebe15aa6dd95336e4a1f540f21db394823b9d04b416e5af071a7a6c618900
+DIST bash43-009 2413 BLAKE2B 42cf000b7f52b4f31a72387f655366f42f6241a2ea7834eeb0bda9b26008bd462637079f8abc0ebda6f80b88127a5c8f0da70a10a090ba43b44417563287939a SHA512 8d06fe612cd32cb414fdcdc34d4420b8991b268dd3ddd2dd47b3d01679954debd78e21f697a7f495d2340f0dcc8acdc3ad6809b8870bf5fd300afb1439788776
+DIST bash43-010 5357 BLAKE2B fee1bf3723344b671ed0221a0083cc1156a140b71357113277b8f71f8bad4931ff644f31a965bbe14aa9bcbce7db958017207795c6ce58ef76e127055e7934dd SHA512 e36e550d749f52bab01256ed5f8f1b48fe53190c1a0a0a15c545328261c1f50b85f574b44188855858de1f2d045945770c4940bdecadd8381ea2cf174bde2fee
+DIST bash43-011 1533 BLAKE2B 2ebc249170e4a08cc0bbb069ba57110b0884b87c0341ed90e0f8f4b029940e4d1d169013ec2a289ac237bb68d61f93a9b380103f50081c688ab6186dc1077912 SHA512 678bbcd92b927c86631cd42d6d3ab7596a3ffd20b640f471a9783a7972f05d2d4fb15970c12e7645e90d407c5a2d2aadcad698113211724b0ef8d89eccd2cd66
+DIST bash43-012 1365 BLAKE2B 27460ae8f102032cd7367da8c050e08f69fe20a0dcb25804c4fa5b0e04238b6c71732038627a7b8a9b55a95e1aafba8ed06d9f3a2b7c6945daa1b61667af8be5 SHA512 169453248edb55baf761b0c9c7b296ed2c24543b80fcf4756b8dd398054b6317da285c5e9cd68828f2620b05874f21a08773844ee32416daef76b88d0ef3ee6d
+DIST bash43-013 2151 BLAKE2B 8732cabe5634ee11869b708b34edab1e7bea13d9e2f2f34371587c532447d04185193ebff87c04e6a9cacaba5574ecda03e0c0d731ed6d4b0261141bbb925dfe SHA512 536bbf0c9b23eb824579955e7fce892cfc1e1d9fbcfc66810353ac4ff238e9e57361c0a46b3f3573ca8ca563331070ce55442ffea38e2a632840b6a318db1c88
+DIST bash43-014 3533 BLAKE2B 210d0a0af40d42342ca4e87ce866c5bb12b6f630b2921f6c187fbb289070dbc05a2bac9c7a47cf7631f7f6ddd218248ce700b3db40c33d3cc54b3069f80fbf93 SHA512 79fb50f62dbdca5e45a1359570e6d2173d442b3d4ddd4eb44809ed45ac022de4fe3f0aadd7672b4c8d9739405d51762486ee0c677b56f9c7d60e6224be84b87a
+DIST bash43-015 1894 BLAKE2B e8111717c9f2d8adb4301590a55837b087c3a30fcb697331d1b0903c9cce268b51c57930e99f879a8808763a947a563c9787dee04d74f4a5203418d49f5e05de SHA512 38a7af22f13f1f45705ceadf3abb52be75f3239959c2b1d57f333d137f25f14ed92c4d209b35417d449b1ec4291bbd984bb5fd11ad40375b22d2668b33fb8efb
+DIST bash43-016 3674 BLAKE2B 1a356023d42d94a570cf019c13f228f5a9327a92fabae762ada8b420350256aae652c46e1b9abb7cb039ee1564d3591ea64fd35f13cc699b82a8c1f48ed853b7 SHA512 52ab2966ccd42554c8bd76041e07921388220b46c93c34190197cdda38a085fd499d71e2e0a10daea130e6782ada556f35b1a37d06d023e83c4c4d665d07cd3f
+DIST bash43-017 1565 BLAKE2B fa1a2b066a58d77eb5376c47799a0c059135265a6569796761f15ec07d314d7c171902f9e077d1c86648243264cc7811d57c7eb58891cfb07fcbb1f4b9e8e970 SHA512 88b11f324a780823b459b1e8a0904348c56079b4103cb86025d34dbba02543b0b7fbc2397bf043c24c1363f30539a6fe9b9f9fc717be9798f466071d1d420bb9
+DIST bash43-018 1315 BLAKE2B 267b2a1e4c6e27ac4e496de42b2891bf97b445ce853993a46b619000fdc2c3acf8f404d10cf247b7ec72469b97d861b2bf31356ea71ff2e88d71ccf5d5973e0c SHA512 f83d8e1d6d8fa8adf1715b8d4130730a13f5cd626f75e9e4b8c63244645a45a3f1fbac03081bb9d1e46864919d1b3189a9bb6d7a5e7a8854e6270ab3269c771f
+DIST bash43-019 2610 BLAKE2B 7fec02f35c2d99fcaa2167e269fa9569ecdfdab8f88b21182f658f16206bebcb45cee9a1c65eb76079890b8159e760d90f7167d8beb8ac3480cb45fd161f07bc SHA512 77e6dac3079d9282f6f85940a762b0da2473ac0d35e9bad2ebc2862bf0f3c4376a6220c746c1c37de0b4d492251ec9531a62c8a042a1be5e485f8f5ae6fa0704
+DIST bash43-020 2777 BLAKE2B 6b8d6af840871080ad768fd899bdf559a2e2d64522f8b525e68f96f9641fc3a86729e52c72bed9a2636ba9c210f29a9697f2f35f43450e463c99c6bba3a30588 SHA512 fa06563eb46609115750ffa88098b07c608cc8b13fc31356f33e1428a4da4d2610e122e0241356afcfadfecc5ccee5db4b7cf07f74005e7f30240ada4a81b5f7
+DIST bash43-021 1623 BLAKE2B f394d58c914191c36bcf4e272c690c44e644d690793ac47e679f434c964dd052fdcd754282c3b164dbcde80941dcdb471dd52315c9fb96654419f26edd9a08ec SHA512 90dc85302d9bc60e68fa8cce472b7e022d8a6ccee361f97aad4cbe5f1585b4870ab9997a3e6fac420aaf84c3dce9757716eb08f4fa6b38e14bac4f2d5d503731
+DIST bash43-022 1782 BLAKE2B cd3e9e3ce3b7bd3902ca3253dd05fabe1fd4fd3eafcce6c21790cb6d30f8f891620cf33acda4d8496d119d5ac3ab8725fe62923c288d0ea13fe5cf9536de6e99 SHA512 721b772349f9e0cc65975e419fabe4acdb23c77796a5d8fde01f110687ea1cb7d23fb706fc0452fb3c2082958a81c95b82f277e1f8f722b1156913efd59afc30
+DIST bash43-023 3414 BLAKE2B 521df59dc795da45cbb7c1fd09cedc5bf71d5167adabfcbd1c30a0d8fa87b27cad0dee873c01cd9ebc1cd7f2bf71bc4190309dda3452adbfe563a41bdc3b55b9 SHA512 d45b5f5dc4682c7260c8b6ef6faa99c929d2159cc34534931790f71f76e7324376e4a5d4a2a3bc21c16c25a8206554580943e7a3f672ec5a4af16cbccd216819
+DIST bash43-024 1909 BLAKE2B bd9f5997e9509f70eaafa4fc4a1b508e013fb50a48d872b08c98219ea8444fbf1de8cf6ae86b97885f382231d8b6f04f9e1debc381078b4e306e341c585ca28d SHA512 eada2b4839b81f28f63a874e08c72dfee9708c0982d2447347c17770a29c8fbb3d3f8c58c8a22b0d46a9d10abbd79dec11b5815257fb39af06420ef3602f8499
+DIST bash43-025 3940 BLAKE2B 4b935b826c80a5704a38d066d213c43c0254bd68b5dbb35e353c6e3ce109aaf87e02efc179df6d4274dc991658822baf91177c1343f4dcd080124ce391711be6 SHA512 b4ea28ea0a24c8609d5c3a10114c5fec87ab978ec60700c36992d093e7afd976dbaee4a0d62c6e41e8ed6674c356fc26589f4c5168642dec8df8d727d7127822
+DIST bash43-026 1575 BLAKE2B dcd77389fe1236854210fe67cc720e33babbb1c3c54c5d994ed3a4a6073cfa4b8a8b210d9ffd1a38f16900b81cd6907bd6e2df029adac8e9b1bdc98ba0869002 SHA512 d55620c86ab4835eaf53c18033a939e00ebbef7045d1429bd6fb212be6da167c368b4c03aec6c00ba60a1363b9cf8a4828e85c8108c5476b4a342e6c57f03897
+DIST bash43-027 6889 BLAKE2B 64f0f71a15f3469f75cad1be4f09860b18847172c6c56d12b7163804f0b0790dd70a82c0d4359e8d1c6c6b6c9769c1128522f049e71992827f9c76329ae9afe7 SHA512 6941156db9a6ab35b2d6ddc63eec064e03da779e29f47e33b467711e3405c9adb58ad33be3ad3c77aea1e84a314d5404c8e1a8475408991f5f719b93c5a276b3
+DIST bash43-028 69606 BLAKE2B 467d6077ff4f377cb0f996b0eb96dbcb4a81a476fa460e0507eeddf33ded5b4d167316eed49305cf304b60f3628f4745dadc93b4692fb5f79b60ac3d7b4203a2 SHA512 4317380539e3a93167f195eddd0acf0c75a5d86d5ef243cb7f7dca43e745badc3ebbc081b099678ac17dc03d9a3ed4a3ff3c6636bb1887e73e94b8ff9ced7c88
+DIST bash43-029 1824 BLAKE2B 44d601556420815c3c128c46b6a50f1f82e24edee0f99654af2ba9f343576fd60fdfd985baaa5d83c00ff225aea33e8c13b4d4c679eafefd6e0c9d0c2fc88fe9 SHA512 e25783c7557c1cda8344ba779d59f83e26b90b0aca393b5f7ee389e0583ccf81eba394589e992b33eb6c969083a8a4ff7fc8ce52059cab3b71289d085d381f07
+DIST bash43-030 63206 BLAKE2B c551721c4f6e245dd59b61ed5185767baf5d6840123c4a0b0c4d676c540247952b0a7ad764672be7d778954f8403013e5deb19abf044933ed0efac3fbe5a7d25 SHA512 ae41a9a5326ceb8e7105e359be097e14876160f6357bfa7c5cd3c4a495a629be762c3db671754c2cffc6abb34998aad91dde4a449ba16a0c6da844bac53feca4
+DIST bash43-031 3689 BLAKE2B 8598e2e35e5c4dc6e358267a84b4720396d55fa2bd723d2192f0a172e3d1ec087bbc8e4b48321d26655d4f84b7fc425b1d9ae352dc4b0faf4fdd02513ecd582b SHA512 3178b4ab48860ed284bb64ac9b36b6d4d1681c0d4bc37ceeb93e73c9dd140bd0a71e86a86ae595aab43babedae79d75a4b11c57e6ad6800f43ab5f7647f6c4c9
+DIST bash43-032 1734 BLAKE2B 4f6d37a0758d2cbd84e3a4a5bc380abac226ca70c2567dae07f4fc297e49c14664a1c11b4a482acce695831ebd642e2bd3463047b251db9e5c138ab5c359cc1c SHA512 47afc6308bd4bed20661a87761330854508a745a1c2a7f2d661fbe0d95b00d2d5707cc04f510fcd027b3fdb065d9414697715bff33c707a56955e27341d1bfd0
+DIST bash43-033 7038 BLAKE2B 53791ea4aaa3b65d0b0da0227de8e694e24d8f83050bccf51011dea5334cf1028752444df8224ed0cdcb4341035a76063e752c433a8fadda6259eb329c3b1334 SHA512 3eed328960d77317e1742a9b53ccf40b304657cd535d7f283bdc24219c65ebdcb7aca3019fc8fd9e7152f42dc411625acb1b529f80e4a6c5b750b8f7cbd2e4d0
+DIST bash43-034 2392 BLAKE2B f6779ef5a6df8ec18313a8e95ced08cd07a37b328145e38806ccfba5176676a0dd3260a4065b1fe72285faa1bf65aefe993f03b7a57a1801c950fa3a8ebdcb29 SHA512 95d09b843287dc18845b75ac6657a2bd7bd71c31a62f922e7177368678ddf13c0f20498bc17bdf4cd5c1c34d40838174791d1e464ceca168957c68e789e34d06
+DIST bash43-035 1800 BLAKE2B d99d907ffaf97916a6b68061b0a5fbebc4bd53361a3b7f3b32d0da21228eca43894692779ce7e54712ca02dac5088cb930d38a9d459e8130206c2cb84c7587f2 SHA512 1ea68e7ffb15356fdcf5eed08dd7fe0e16aea2928a4510fcfafe79e926d7ac25f013641bf547bfff0401bbb7e1476a802208e4f1ccb8b02ed20c094f99e450d2
+DIST bash43-036 1539 BLAKE2B b28fe78f05ed2742ec060df16a8fe28b6dfccd48f9c060f7b2a136475fe47424a3ff7f9d3a8e595a119564792bcac7e474257184a920fabea8ed440c5e0da41f SHA512 089a05879b8b65c9f11c55127364a3281b651e71cbedfad6221e31dc88eca15d813986f999a22921726873db9590b7b50afcd6162027fe516c2a94e8734e3ee7
+DIST bash43-037 1284 BLAKE2B aa7f11383b94da283484dd92d1caf5de9cbbcf36023624cd9498c81c12d8bfa8957163749f2dfb13b02189f6fbc53ed2643f47294d170ce548855b92876c8079 SHA512 7977c0fb9142cdea259b06322092aab3231b9773cc397519bedb6f731aea02a46441c67615b31fd19c886678eb1985687d07357d15fc7f08e946404efc564966
+DIST bash43-038 2354 BLAKE2B 991da235fecd4e9a0d28baff0af76de721eb521d5351944341a78b34e40690757100033b571f80217656938fb63e8dbb5861f829e78c01af5725ff6360e2635a SHA512 2ef2557b17867b5820a9e5619daa1cddb3fadcff7470504c148828a3007217767da4bf540dc835cf263f9c943b2c1aa909c845f8410f69e2d04c8b3d659efee3
+DIST bash43-039 1531 BLAKE2B 6d2c4630f18f7d6d90051720caca30573c5f068cc390e7e0a486530d0e2495dbfd764a9ae19c088679b8a51a21ed69684c9f0b30e922042f42ed0a6caf98e0d7 SHA512 f9745a05bfbbe39f8e5af3865de3a32391d7ff291289977e23340c79a3783b4fad15bdcf8ce62478916b43fe18501c4d7c65cd54d3c20e8bb889919df48a9a19
+DIST bash43-040 1532 BLAKE2B a41175fd9d44d622905c0344b2a255a8c268d73fe029eaffa0dc5127f471c42b683e23ec27cbacbe033717bfc369422822d3a6ba1b4dba032d5fb42692782b64 SHA512 25a0696f1f0e78cb971afa404e0b7fe634b70d49d6a5a9d6ff5506c42063968e8ede83ad80bd0b79601363676fe3abfedc3b76984f6f9ad2e7798790682e21d0
+DIST bash43-041 2362 BLAKE2B 4bef094a1da2fb2ed7d47a3a99179ab1639ad3eab292a9758ce572ae8e88268e7de49efe1f8705cd3510ad4321f8bd1da432261a68aca773e66f49dd5eaa0378 SHA512 d75cdd6a1fb8aeb1a4e88f046cfea3ec493b994b96f60f27d5577b59408422bb7c51cc4525cadab821fd8c57f44fb07f811b087d077359242caff3b54cfc6819
+DIST bash43-042 1535 BLAKE2B 627751b309954235c25c20b5535b9e2bad531445849cda46176311118b4121c4bc7e02d8325b2a711e1db2b1a172d7a3a0241189dcee7892537d659e6074a238 SHA512 01a6601029c0a55c9bf1a4ace3f387f9d094a9b9ee3511e2113c000123d85b1d5813c369e62d5a6dd329f515ef0d67d11394a6c0e4516956387556c13d13009a
+DIST bash43-043 1942 BLAKE2B 6a41f518ba89c538b22caa9fc030ee8c662addd003de991088ced9767ab7962caa7e90a69b390392ad37a860598e6a33170795280c442a4a9c1c391050aadab1 SHA512 eb05e537fac08587d0755ad59218bb5a51685aefc1476d6e3feaf72acd1e08cbda512988d8c157425e7939863b313d1e36f51b32f8a8497655c6b0710a24b738
+DIST bash43-044 1658 BLAKE2B 91579fe95617923aaa62a1d2c62b1d772dd1a3f725795b434e321ae44ccceb2f5802494175fb61c36b04890efd466687b8cf66abdee7cfd942def08521900909 SHA512 2937ef80c99e93094e4aaa6a93d077efc3e433a4712c17e30590a0abeb5488293365cb8aa19e37d25b7d5c38d3ad26cdea12b904e5ffb2cdb16f18ab12f422fd
+DIST bash43-045 1312 BLAKE2B a34b02287066e74a5afefc3ce6868a3deca0eaa475e578f683a1a22885912c0967cc1ca546f6e72ec213b4a9b78159b3007a767787be18361a94035eb0e19ca0 SHA512 7b79dacff44e5358da736334d2277a2879ca1389e22e9dac50e139f30dab623bc89a56930d89e74efc468a00d051f6747ccaffcd1a30d7c737d49780b9830e3d
+DIST bash43-046 1494 BLAKE2B ee4b87d81ac97ed53728051f154da7d4ac575c589a1194d16fe90614cc90c1e2d136d5b91978dd6c1c8357a28d5213ab14510dc8175dca1968543c309c76bddb SHA512 c036b659fa681f8129110356bec33fad00fb8e469f3b4bcefd0b7ddf5e20030977716adf5c65f58f3ff68cd7af0bdd42392ee077100bc7f45ee123749d082f7d
+DIST bash43-047 4437 BLAKE2B 449204b8b9e0937cb65ef286db2fa5cad9999dd822fd55369cfc469e6e6c086a97aea7b50625e756d349341a53907d69d8a631371846c0e373efcdbb6d3cb0e0 SHA512 9332d680ac226491cf8e5986a3261eb76b53ef4b0b2a43405564b088afc0e8658077812c9177bdab7900e05394e69f3047d82ddb59553fc01ef721acfa9d5553
+DIST bash43-048 1612 BLAKE2B 6014935977b2ae1628dc6e9221786a2fb923590ff17b9660d1c238da251f9a0152bd4ceec0c66ea42e34dd592653c244a8df2beb02f20dc7d214b64681541ad2 SHA512 7c3963bfbc730b4592668460e86c166e727e9897c1a9235a6860a01bc90d365ef0707f0fac7ed62780dcc84e80dbe8484ec59e9e948def22f44ae03e8a169780
+DIST bash44-001 1896 BLAKE2B 1ff23656f2904385f34aa94c48bec2a8cd145223c74c4138bb857a6ef79ec6e5985521661170c46c5bd603ea4fb7c1d8058770b4da0165366aab7b2bbaf4709b SHA512 fa7a1b277eb3bad6ae7d2c7a2887cbf2c0eb75b7fee8ed03ec1e9d45879a2fb4b8c7cb16d6b029987493b01a461214bd9a24454a6837e7cfe180b1bc56f61caa
+DIST bash44-002 1946 BLAKE2B 2b7798375a629ba957c139ded809e53a43ab03258557669304441c04433693069d1fc1af03fe5516140097e5c71c07870bf8cda2309a8fd7ade4b169a8256739 SHA512 526f986057810f89080e283ff95b3a8fd24d37e4ad2f18c39f36d3a2d57956a6441d16220082157735e3c5ccf770d5016e761aa5f309129898e39277d576e6b5
+DIST bash44-003 1593 BLAKE2B f47eeb4d32108d6e889436ad72920c1749e13fb17439dffb8df72f334f570fcccc7956bd616ef1beec5c07c1479d9113047f8aaa21c19af3e4db21f00783dcbd SHA512 e61db89bdd1a7ae15013fe258046a343c9ea41e5a1c6d2c810947500a617fce7536b8d51194e14bb42499fe0de6d70cc9b2c81da0afdcb5a2278459f4f76d748
+DIST bash44-004 2350 BLAKE2B 245c88f4f7f7e0a4a571956c1a6363b8ba86b883897bd8c92297605811e418748709f9ffaa148173c9669b4dc8b71482fce9eb3b177920fd8d34b260465c72fd SHA512 7570cf15518f79230cfe91b3e58c795c16c7fb6ba6418d967355b36fb7982e7919a9eaaef9177fb605c7fb7d7efb8a8335e725c1bacffff69a098433f5adc9c7
+DIST bash44-005 1439 BLAKE2B 4d563b1a0b2d858a904b98fb52b38c8c806942b6c879b3a02480774b0806468f51a91ef0a26a4a9c5bc8f2a3242cd206afe786d0754449cb11adeed4ae97a90d SHA512 7546a6c90c8e8508567dde713722291477ca87c1116905b46432514a4fc632840a855b84f102591914cd4c44d5bf2eb7400866e26366fc94525fb401ea844a8f
+DIST bash44-006 1805 BLAKE2B aa187e52bc12dc5c34e52d6b487a0f260e3c54970ebb022c54293f409903baeb239417d671d85b16d30b327c6353ffa666dc7adb5c872ec500266339d8a9de0e SHA512 5edcd76cf97bfe289f71924ba279ff48a1167eb3cc36f811cbcc23732746f5c821d1d39d4b137b7d99d57809a4b7270a54f4a41176fcfde0708bf92ddc68b77f
+DIST bash44-007 4640 BLAKE2B 3b803e553ac117129db686818835ce6deb7574b38171f4c9262448e01e097933645311de003593ef3949a7ba5925172577a758b2edd281c4446f3bca62beadb8 SHA512 386c019debee414697abc648d9a77894e842bb0b7a2a71709e8b3398582f25065e68963405fa22fb77439c6b431ee94a2ecbb16734c2436af3dfb4d1b5f06fcf
+DIST bash44-008 2223 BLAKE2B 09c01c2821404ca8a89d9644cd7d55d2994ba4cdc15b928c1156e2a91c083b528340c27909bdd312a78f677cc94ded5888ec4eaff0d0070d575fbdde3bb326a0 SHA512 d9a8924f1c9263deab89153bb688a87f211913ebd72c8077e607db6fdddc7e5af05042dd22a9a2df593e518ea74b54ca79d20afc796e47d871827a2556e233d0
+DIST bash44-009 3117 BLAKE2B 1921a30e1f7c6d37cac048772f89322e2cfe6e77f3ec48d4a6bb3d7e82452b7471bef2e1fa31094a62d9a29589a8438dc875211dbab8ba204939e16810eca13b SHA512 3b01c080cf4a54658679b36c282a69a9ac48b900b19ceb42dbaf084abd395d50e5ff14db90a7fdf0c9856dad150897dca561160686c931634765782447fc076e
+DIST bash44-010 1670 BLAKE2B 6e0cab685ae2393a9ae7eeb91767f8ce3086e3921f2d69614e729e9bc26603b363a69083c57a43aa53669491deba663bd8c9de91571833312cc23efb05c43222 SHA512 54ff556b62fd88381e7a495db50957b016474973b3a566661c65b649a40960f2d3355221b3a71fb292128aad92a45d73d9816d63833bc416b4d15acdef391b98
+DIST bash44-011 1603 BLAKE2B 6bd978408140620c2d63277757c15bfe55d6b0ff5706b7b884b234308efb6cfa771888306840ce5cfd4ece5912924dbb6a321d823fa106c99ba573f47dbbb9ae SHA512 6b5b068b74978fc691749ccff5e094c768047f702430e97114f5bf342f078696f7d7616d0642d4061b062e9112dfe00a1c2309c65de4147e0e98fb52c593d844
+DIST bash44-012 5768 BLAKE2B 63c6f5ff2cf52a35e1bd7f0028d7cce5c2c87e65ca600d8d85bf9b197ac8dee16bed5dc1dba6b354ef560309022cfd427a08180b76effe4107b9dda2ed99b20e SHA512 4661c4c132f2ea7c9a70368301041c482d5820d8389334a7e3ae44c36fc16c171b20db2f194b7663c84d6c3dcef81aa90f050a48e205218fc7bd3395d09c6a51
+DIST bash44-013 1255 BLAKE2B f19be55c986bc60c395d24044c7edc67cd180d86047af59d173c1507de32534b2eed546f16164d799283d66c0d0460ff4771da6bc327bc87ebc4f01cb284f9eb SHA512 eac0a9abf59b65a59a0028d2f3c0a7dc8a0b3c04e2d2db642b69aa7c13a2dfa190f3c63f7d8a7c9400f01701e9ef84212ce668c4c44d0ccfd02cd1f8e723d831
+DIST bash44-014 2834 BLAKE2B 3a211d9916e16a996d709034523dc0f3775520736f481bdff8c737e1969da1719602bf0379befc685822e4931586482a30bbec69be4233da4f912c5b6333886e SHA512 11e16896aa66a1eafb12cdcea00515132789690e914c8894caefd8c80ed98c8e732428348ddbfb53495164ce4044596f5cdbc03e146dce364fc497f362a1859b
+DIST bash44-015 1233 BLAKE2B 5504d4a64f938ccfbb12f43455c11c6dc6a38397e5692da874a1b5de1865d19677c6f683073dbf9843869df67f96a87a6a60d2381338294d6750f2aba1580c55 SHA512 94d6fed30d4a376c29f8986d15f1b3fd65a04ee0f3d1844d010f3e51a2f9f875cd294a68fb6f0e1ffa481fb09f02055b21f2f298ebd9d88eb2f76d6c1f15de34
+DIST bash44-016 2069 BLAKE2B 5ac613c450d018edff4f82740655ed0e460e49b57ce1a817f0b7b0a101b9f1ab095c48904fc17789203d6bdcc1beb01dde23b4a097f36441eda5e11ab638e9bd SHA512 5acc704df3fe63b5b8055ba7bc14ae70cc23d15aefee8db6991e6c11cc8b0e10fcc67d516bc2d2fde84be26ed5c88dbf266fa164756218b60eccc2bfb4eed7d9
+DIST bash44-017 1143 BLAKE2B 64da515637109cd87b95e5f55857f25c2758b4a5c2620cd21250287e00767d5ca7a14fe331603cdef1ba02f622d97ee120bc0bfba463bccb113f16ebee56159f SHA512 c1d50aee953427ba0b95e48c10d2324e7413f3354ff65b9c3c1dfd14eedec55e619fcd12353e7b99b6e280f510e04d1c971b309c1a4efb97d48ddb30d69f14ac
+DIST bash44-018 1319 BLAKE2B abfd87f2cb5e9aeb0352bb0efbfd3ad95cbb26445e09edaa762cf1ea1fa01a00ab57c96d912ae5eaf653b66169bc54bba39fdf1d62ad45301c6599d21979ff14 SHA512 008ff44dbf916414d691c29cee29e7f636bbe79170463d76ef16ca63ecdc24a84ff4476078c28fb8788d9b1fb0572612a7e8cb30fceb55ad650f293db8361ad1
+DIST bash44-019 1671 BLAKE2B 3d917b1c2618b92d7a79d64a8282cda84098d7d83b8ab3e62c49ab259d6976ef953ab1bde98b9d2cd925cfbdff94b5fd5910876e8de85d40466cf5f3ceb377c4 SHA512 59984e221a7a6dbf72bf893b1b7c4a63fea34d6af1208a19f0e9e6cd59a09e4cf51890cb2d31c1502e2a2f644f584417bb59cf02c308d3250d2a98d41b63e893
+DIST bash44-020 5156 BLAKE2B 6f2bba1fe03eb49401af3925420ff5c090d0e7d83010c34e086f5da48fc2078ef649d775b45e3368e73fc1ebdd6f1860b33bf7021898cae158d478aa1dd18bca SHA512 e200fddd717fa33d2c56eb6713031d34891e5ebcd489a65a43ccfebf9728c1609b758ca3dffb1eed4abd3c62c6d7163ce88d8a1bb73b6d07bee99e0409365978
+DIST bash44-021 1810 BLAKE2B ce3f98e31aaa7db402cf2a2e571a72b9b91fad4571b35a5e8f59678485a631acf3885a19ee09ebdc6f79b39dbdafe72cc2cd91bf3c3b31ad7d3a65b5bc4bd9b3 SHA512 43a82d06a17bc30c2579a0944cb68f60bd9e3cddb9fff4a760fbf1f2f5104a99bb69c400cf63231b242c03a4684701455e603d96c9b588f2c69da02570042fec
+DIST bash44-022 1818 BLAKE2B 66c6e5fd33f0649ff886d1fd944cb10a06de06f0724c0cb7343c3afd50034821f1a4eeccbe9bc5c6815ce9bcdfacf5e6a83098fbd3712efc15e870928b3aa80e SHA512 385a0d1bbdff0dffec2a08021a84a5ac3695e44e1a90b0080b82737fc4a9ea924ee59b47fd5e288b69a540f4c976bf9da0db08ee2d20e170c868f802f75785fb
+DIST bash44-023 1557 BLAKE2B 95a21ade7e4be68d66f3862f26b574c5897055822471c8d2801b8e1f866d1d11ddd4000e967b567c3ef7949af8a88ca918ea066d52a67fc5fd4b266135f0dbbb SHA512 442efa78d365a728555ade77cc2f8501aed09f37ae10e1ac647d35299829b63caefbc5c30436d622bfef9300e9d929d7f4fafe85a59df15089881bc987fa12fd
+DIST bash50-001 4133 BLAKE2B 3eedb63f943ba89f1147c907fcacb5e5af891a6728edb4ced972e19d586573db6fface4947490ffb9f42a2ed87c745a352e102fb727637eec8422d7323da9470 SHA512 e3bf036287d3be1f3e91755678c04c9a8e1b4a98e34e181871dfaeb13987dda18c31a44db3f3829d91a185ba4414b9c0229f2a15f6e8a951cbc6c1054252bfdd
+DIST bash50-002 4380 BLAKE2B 022340f0da0d5b7c571c2015beb87268452faf1484bedb75e2868b16904eed93749d5c0ed62b9da43badb3ee2efe3bdb4f55e212a40c3cfdc073d44623475b85 SHA512 59b1cfa1be1029ada53c63fe651d51451ead5523c50c115e0eada07e34e641c693ed728366986acb431f96fdc61818efd3f8cd168ce416001edc62602e5f28dd
+DIST bash50-003 6434 BLAKE2B ccf05f2f0da6dd0a1d25d22200326d405019acbce27a7fbcb3f16ff09027d5dec5cb9d5dc557638f72089a3444b25d5106abdb0916cac0797562b4d8b68a0ab2 SHA512 520b5cc0b7aeea6cd8b7471b553d8979996f3627a3e5c8889023562dadc82475be243aca2ec608217b78400a1dceb134b877d3ded926e581445234f1b69409e6
+DIST bash50-004 1664 BLAKE2B 88b44a5268c8ec970f0c18997cfe5211f6a2a8c07f813d48fd931e62e1b3b95fd76e5b66b7ebf1ffcd1d42e5c133675f954de0ca7dfc8c36aa69f11253480374 SHA512 cbf51bb242edf36289bd483b47c9451132c12f341f494212c0e5d969cd06a3c1c4d121295f3bacb1d7d5e56f789258ba9f54c4cfb5760ed3c70ec1f49f25c719
+DIST bash50-005 3732 BLAKE2B 3ded5d200102ad7cc547c6f7e9bf9bba468a10791fc096988c49f46ea8d6708efb0d4c383a9e2e2fccef8a49b217e6a22d9435c807233a1d0a971265bbe31761 SHA512 4d3e6f337a76b9ff1887c4c6e4e4352885779504f3c975b8d6fa587962f01e8adbd843b5341c1fc1d11152cf465f2982eebd9dc6e1384f319157d29740d510da
+DIST bash50-006 1275 BLAKE2B ae3738874ada015202a6ff21a50ea9370c6147b4c74a23112e755396fc1db743afa42abdd4df635f0c0b9f3536796064b41d0667ef8ade1543b5c70b688ae9d1 SHA512 71df829a3a3927a363ad961de8af8db898ea8b0ccf604c5f1326fe4646d0d50b3c7038ee473c225fc10d26c2dc1f711d66b74d003bb0445d36a8a70c49e056e0
+DIST bash50-007 1640 BLAKE2B 1c25af8c098322ad16353dfb32cdba2613659f5042792c725dbde7b2bc276ff09a4af44bf223fd6114dcc9beee98ccbd8081d3010fa1cfeb33bc93fc9c81e4f7 SHA512 467d377836c53d188cda39de550ce1e00b58895a6646c4da3535e74e599978558a92d8e7bf7c59c988159468fbce04f3a0dbf62cbded28472272f1b9811786e8
+DIST bash50-008 2622 BLAKE2B 9919e24840f32a44a9040fd8fa9fb482da1859223e70e75d21d5fdfc03f229ec2e98324707b10fa3aa5b3fee0e8fe5328a684cdd1b3ee5567cd1eb127a4060cb SHA512 110fef44c1a26819ad8926ce00bd5378e99275763db4b0e9cfd125ba1ab7eb9f93abf912efb9841fa2ac59c380995e477683afc8cf6bf00367a9af7ae371e7f4
+DIST bash50-009 1095 BLAKE2B 4a9b2035173dd23f9c8ac5474e573080112d9edcf918816b5dd41e880f212f66c2c80dd41793ec62449c487fec1ad2c57b353a00c0976a782098fa6be76d0f23 SHA512 6b770dbd4ca1175f9b958931b1e725d96626a24fb270bac5414d1679dde05276c87654815e9957d6932c515e8792caf8a5f0e9f2dc108bdd041d8024cf75a833
+DIST bash50-010 6407 BLAKE2B 94792141dedbb8d2c9f9355c94eec56b1fa84459291c61ac31e9ee9a67e80edb95234b67ab59c5f3f039d596275c9b154544439bc730256beaf303e6cbf99c4c SHA512 8ca2cea0264bc0401414207fd8752d4d6eda64be3bb10fdc22529fa2bcedb84e6ab257ba2badc7078ece7f2ae1e2964635926f227eea7aed58166e82871322c2
+DIST bash50-011 1870 BLAKE2B 7307aa709810ea3e9fbc0db6a558cb6a660736677edf56904721599be5c0a6e69b74cc01fb3988f1b06e7f8bcce512a3b5d773b7ebb3a7397a0e4815e84f48ce SHA512 05833d6c85f3795a9c100246335f39155c1b5d190e073bf382269c2bbceb13a2de3f85dbe1dd5d4c7824fcca481febe3bdbb4c555e1f2de86bec05fcf6f5871e
+DIST bash50-012 1571 BLAKE2B 3a107454439fa84b1416d0b17b81fd86cfd4cc046bb4c4ca820e09b4595f4bc95dd188f2957b2f2c83937a776eee3db19a7c070403014bfeb5d5778b26705aa1 SHA512 24d67358eec07cc4cd0457ec0c296567558f20bf713b917fc8a8e5095a83f1c5db880bb863d483ca0c9e003972ac5f56596a2eb10c26c82bf6326d0475784e7e
+DIST bash50-013 2328 BLAKE2B 8797fe0b8e01027222af9798ee8d57d161bfbedb617b257e91402ef60e7010dd32fc68e2477487813746842800387c5ea0cdd853e039cf7065a2786fd6d6a182 SHA512 38fff9856c2259fbba607aacee027dd61e8733c6e5f476b7491bc43755fb5a63e82372f9f18663ec81e7480f0738b296271c948e1932e851f68f53cf3a1935b5
+DIST bash50-014 1747 BLAKE2B d52f9160d74b340fd5722725b572ac1abe74caf41add5421dfa56fd44916ead691e4d698de3ba118ff0f8fc8eadade7a980551134eb0daf18b0767ff9601a4b4 SHA512 e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91
+DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46ca47ca627f1bd7df4ea188a2c0f636e42623f2ee7ca40bc98551b5bd339ed4d5bee20b24ba38d0 SHA512 3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9
+DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
+DIST bash50-017 6517 BLAKE2B d8ec55e796fa2b17774fdf846c7b24ab1428a1dd94210e0d6b3174f99afe7f9c7f33448e1116c81f43407cb8d95390dd634cb8bd543046699898f471ffd68433 SHA512 d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65
+DIST bash50-018 1242 BLAKE2B e5f811ede6938e3b09d2ca658dc2ff2b30d6debed4334369ddf7755992cd1c591188595465552f4b5d0ab7d2d62759ff0b4f14a07466650cde0d25778b26df7c SHA512 cfbad36b1805ad76cb21d9136843171d794e57383318a014522e2d35905cf262d6721615f0a79972cacc45152de636977c957cbbad08ccb52f96de40b09bba5c
 DIST bash51-001 2894 BLAKE2B 7918eb48d4afe91a167eed666f0d15ca220e002d824cfc5ebb753430144a8bf884e8895e6d050158153e08c115fb0b90659608ed98b18aec737e75b5e61098f3 SHA512 1cd86805a2639614372aec29a710bc456e330abcbbaa0867820c94f714a1fa5fb5c1b18aa2c10263ae0bce9dad7579c7af2f732282315c1c34bfd6a90777bfd2
 DIST bash51-001.sig 95 BLAKE2B 1f4cb69130029cd8ac46961898bdc15b2a6fc36ea84cccae08aa1ac374a4f4eb3a314a9c6a4a40975c42d76027e27dbf3e71e3253f50bb1561c086b66123d29a SHA512 a72af2444c327180fe91d5780b89aab69d2bd67e7437503e1565ec6618fecb4954dcaa4998186f8d10e4a02ba36a1eb50733d3fedaba60865fee75d38d20f065
 DIST bash51-002 1575 BLAKE2B 70336d2ef04c63fa29a625a2719c0b36f7e34818cadbb4b09e1434d72d6695dd882c758a00f2ea48f38d3918abc15f494780825b7d2f7cfc6c747a3be89ac497 SHA512 923e7822a9629645347d3aea0058fb5e2d52223507159a62369309f264612df44a84931c19e0ccb3852e98ce672dfbd454477090b4041b5a0de477c94eb61088
diff --git a/app-shells/bash/bash-5.1_p16-r1.ebuild b/app-shells/bash/bash-5.1_p16-r1.ebuild
new file mode 100644
index 0000000..bb66d6e
--- /dev/null
+++ b/app-shells/bash/bash-5.1_p16-r1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+is_release() {
+	case ${PV} in
+	*_alpha*|*_beta*|*_rc*) return 1 ;;
+	*) return 0 ;;
+	esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+			printf "${u}/${pn}-${pv}-patches/%s.sig " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ "${PV}" == *_rc* ]] || \
+KEYWORDS="*"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="virtual/yacc
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Patches from Chet sent to bashbug ml
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double ; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+		fi
+
+		unpack ${MY_P}.tar.gz
+
+		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/* || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading bug #7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins ; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+
+	keepdir /etc/bash/bashrc.d
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+
+	if ! use readline ; then
+		# bug #432338
+		sed_args+=(
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild b/app-shells/bash/bash-5.1_p16-r2.ebuild
index fc0373b..727ae38 120000
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -1 +1 @@
-bash-5.1_p16.ebuild
\ No newline at end of file
+bash-5.1_p16-r1.ebuild
\ No newline at end of file
diff --git a/app-shells/bash/bash-5.1_p16.ebuild b/app-shells/bash/bash-5.1_p16.ebuild
deleted file mode 100644
index 2444b18..0000000
--- a/app-shells/bash/bash-5.1_p16.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic toolchain-funcs prefix verify-sig
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-is_release() {
-	case ${PV} in
-	*_alpha*|*_beta*|*_rc*) return 1 ;;
-	*) return 0 ;;
-	esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-			printf "${u}/${pn}-${pv}-patches/%s.sig " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.1"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
-if is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-else
-	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="*"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-"
-RDEPEND="
-	${DEPEND}
-"
-# We only need yacc when the .y files get patched (bash42-005, bash51-011)
-BDEPEND="virtual/yacc
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-	"${FILESDIR}"/${PN}-5.1-CVE-2022-3715.patch
-)
-
-pkg_setup() {
-	# bug #7332
-	if is-flag -malign-double ; then
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	verify-sig_src_unpack
-
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if is_release ; then
-		rm -rf lib/{readline,termcap}/* || die
-		touch lib/{readline,termcap}/Makefile.in || die # for config.status
-		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches, bug #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/* || die
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--disable-profiling
-
-		# Force linking with system curses ... the bundled termcap lib
-		# sucks bad compared to ncurses.  For the most part, ncurses
-		# is here because readline needs it.  But bash itself calls
-		# ncurses in one or two small places :(.
-		--with-curses
-
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading bug #7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER%%_*}
-
-	if is_release ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins ; then
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-
-	# bug #444070
-	tc-export AR
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-
-	keepdir /etc/bash/bashrc.d
-
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-
-	if ! use readline ; then
-		# bug #432338
-		sed_args+=(
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			docinto ${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					dodoc ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/files/autoconf-mktime-2.53.patch b/app-shells/bash/files/autoconf-mktime-2.53.patch
deleted file mode 100644
index 7632b63..0000000
--- a/app-shells/bash/files/autoconf-mktime-2.53.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-https://bugs.gentoo.org/220040
-
---- a/configure
-+++ b/configure
-@@ -12393,22 +12393,25 @@ else
- #line $LINENO "configure"
- #include "confdefs.h"
- /* Test program from Paul Eggert and Tony Leneis.  */
--#if TIME_WITH_SYS_TIME
-+#ifdef TIME_WITH_SYS_TIME
- # include <sys/time.h>
- # include <time.h>
- #else
--# if HAVE_SYS_TIME_H
-+# ifdef HAVE_SYS_TIME_H
- #  include <sys/time.h>
- # else
- #  include <time.h>
- # endif
- #endif
- 
--#if HAVE_UNISTD_H
-+#include <limits.h>
-+#include <stdlib.h>
-+
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- 
--#if !HAVE_ALARM
-+#ifndef HAVE_ALARM
- # define alarm(X) /* empty */
- #endif
- 
-@@ -12416,6 +12419,7 @@ else
- #undef putenv
- 
- static time_t time_t_max;
-+static time_t time_t_min;
- 
- /* Values we'll use to set the TZ environment variable.  */
- static const char *const tz_strings[] = {
-@@ -12424,9 +12428,9 @@ static const char *const tz_strings[] = {
- };
- #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
- 
--/* Fail if mktime fails to convert a date in the spring-forward gap.
-+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
-    Based on a problem report from Andreas Jaeger.  */
--static void
-+static int
- spring_forward_gap ()
- {
-   /* glibc (up to about 1998-10-07) failed this test. */
-@@ -12445,23 +12449,27 @@ spring_forward_gap ()
-   tm.tm_min = 0;
-   tm.tm_sec = 0;
-   tm.tm_isdst = -1;
--  if (mktime (&tm) == (time_t)-1)
--    exit (1);
-+  return mktime (&tm) != (time_t) -1;
- }
- 
--static void
--mktime_test (now)
-+static int
-+mktime_test1 (now)
-      time_t now;
- {
-   struct tm *lt;
--  if ((lt = localtime (&now)) && mktime (lt) != now)
--    exit (1);
--  now = time_t_max - now;
--  if ((lt = localtime (&now)) && mktime (lt) != now)
--    exit (1);
-+  return ! (lt = localtime (&now)) || mktime (lt) == now;
- }
- 
--static void
-+static int
-+mktime_test (now)
-+     time_t now;
-+{
-+  return (mktime_test1 (now)
-+	  && mktime_test1 ((time_t) (time_t_max - now))
-+	  && mktime_test1 ((time_t) (time_t_min + now)));
-+}
-+
-+static int
- irix_6_4_bug ()
- {
-   /* Based on code from Ariel Faigon.  */
-@@ -12474,11 +12482,10 @@ irix_6_4_bug ()
-   tm.tm_sec = 0;
-   tm.tm_isdst = -1;
-   mktime (&tm);
--  if (tm.tm_mon != 2 || tm.tm_mday != 31)
--    exit (1);
-+  return tm.tm_mon == 2 && tm.tm_mday == 31;
- }
- 
--static void
-+static int
- bigtime_test (j)
-      int j;
- {
-@@ -12500,8 +12507,39 @@ bigtime_test (j)
- 	     && lt->tm_wday == tm.tm_wday
- 	     && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
- 		  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
--	exit (1);
-+	return 0;
-     }
-+  return 1;
-+}
-+
-+static int
-+year_2050_test ()
-+{
-+  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
-+     ignoring leap seconds.  */
-+  unsigned long int answer = 2527315200UL;
-+
-+  struct tm tm;
-+  time_t t;
-+  tm.tm_year = 2050 - 1900;
-+  tm.tm_mon = 2 - 1;
-+  tm.tm_mday = 1;
-+  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-+  tm.tm_isdst = -1;
-+
-+  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
-+     instead of "TZ=America/Vancouver" in order to detect the bug even
-+     on systems that don't support the Olson extension, or don't have the
-+     full zoneinfo tables installed.  */
-+  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
-+
-+  t = mktime (&tm);
-+
-+  /* Check that the result is either a failure, or close enough
-+     to the correct answer that we can assume the discrepancy is
-+     due to leap seconds.  */
-+  return (t == (time_t) -1
-+	  || (0 < t && answer - 120 <= t && t <= answer + 120));
- }
- 
- int
-@@ -12515,9 +12553,15 @@ main ()
-      isn't worth using anyway.  */
-   alarm (60);
- 
--  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
--    continue;
--  time_t_max--;
-+  for (;;)
-+    {
-+      t = (time_t_max << 1) + 1;
-+      if (t <= time_t_max)
-+	break;
-+      time_t_max = t;
-+    }
-+  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
-+
-   delta = time_t_max / 997; /* a suitable prime number */
-   for (i = 0; i < N_STRINGS; i++)
-     {
-@@ -12525,17 +12569,22 @@ main ()
- 	putenv (tz_strings[i]);
- 
-       for (t = 0; t <= time_t_max - delta; t += delta)
--	mktime_test (t);
--      mktime_test ((time_t) 60 * 60);
--      mktime_test ((time_t) 60 * 60 * 24);
--
--      for (j = 1; 0 < j; j *= 2)
--        bigtime_test (j);
--      bigtime_test (j - 1);
-+	if (! mktime_test (t))
-+	  return 1;
-+      if (! (mktime_test ((time_t) 1)
-+	     && mktime_test ((time_t) (60 * 60))
-+	     && mktime_test ((time_t) (60 * 60 * 24))))
-+	return 1;
-+
-+      for (j = 1; ; j <<= 1)
-+	if (! bigtime_test (j))
-+	  return 1;
-+	else if (INT_MAX / 2 < j)
-+	  break;
-+      if (! bigtime_test (INT_MAX))
-+	return 1;
-     }
--  irix_6_4_bug ();
--  spring_forward_gap ();
--  exit (0);
-+  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
- }
- _ACEOF
- rm -f conftest$ac_exeext
diff --git a/app-shells/bash/files/autoconf-mktime-2.59.patch b/app-shells/bash/files/autoconf-mktime-2.59.patch
deleted file mode 100644
index 33055a7..0000000
--- a/app-shells/bash/files/autoconf-mktime-2.59.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-http://bugs.gentoo.org/220040
---- a/configure
-+++ b/configure
-@@ -5299,26 +6059,25 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- /* Test program from Paul Eggert and Tony Leneis.  */
--#if TIME_WITH_SYS_TIME
-+#ifdef TIME_WITH_SYS_TIME
- # include <sys/time.h>
- # include <time.h>
- #else
--# if HAVE_SYS_TIME_H
-+# ifdef HAVE_SYS_TIME_H
- #  include <sys/time.h>
- # else
- #  include <time.h>
- # endif
- #endif
- 
--#if HAVE_STDLIB_H
--# include <stdlib.h>
--#endif
-+#include <limits.h>
-+#include <stdlib.h>
- 
--#if HAVE_UNISTD_H
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- 
--#if !HAVE_ALARM
-+#ifndef HAVE_ALARM
- # define alarm(X) /* empty */
- #endif
- 
-@@ -5335,9 +6094,9 @@
- };
- #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
- 
--/* Fail if mktime fails to convert a date in the spring-forward gap.
-+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
-    Based on a problem report from Andreas Jaeger.  */
--static void
-+static int
- spring_forward_gap ()
- {
-   /* glibc (up to about 1998-10-07) failed this test. */
-@@ -5356,29 +6115,27 @@
-   tm.tm_min = 0;
-   tm.tm_sec = 0;
-   tm.tm_isdst = -1;
--  if (mktime (&tm) == (time_t)-1)
--    exit (1);
-+  return mktime (&tm) != (time_t) -1;
- }
- 
--static void
-+static int
- mktime_test1 (now)
-      time_t now;
- {
-   struct tm *lt;
--  if ((lt = localtime (&now)) && mktime (lt) != now)
--    exit (1);
-+  return ! (lt = localtime (&now)) || mktime (lt) == now;
- }
- 
--static void
-+static int
- mktime_test (now)
-      time_t now;
- {
--  mktime_test1 (now);
--  mktime_test1 ((time_t) (time_t_max - now));
--  mktime_test1 ((time_t) (time_t_min + now));
-+  return (mktime_test1 (now)
-+	  && mktime_test1 ((time_t) (time_t_max - now))
-+	  && mktime_test1 ((time_t) (time_t_min + now)));
- }
- 
--static void
-+static int
- irix_6_4_bug ()
- {
-   /* Based on code from Ariel Faigon.  */
-@@ -5391,11 +6148,10 @@
-   tm.tm_sec = 0;
-   tm.tm_isdst = -1;
-   mktime (&tm);
--  if (tm.tm_mon != 2 || tm.tm_mday != 31)
--    exit (1);
-+  return tm.tm_mon == 2 && tm.tm_mday == 31;
- }
- 
--static void
-+static int
- bigtime_test (j)
-      int j;
- {
-@@ -5417,8 +6173,39 @@
- 	     && lt->tm_wday == tm.tm_wday
- 	     && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
- 		  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
--	exit (1);
-+	return 0;
-     }
-+  return 1;
-+}
-+
-+static int
-+year_2050_test ()
-+{
-+  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
-+     ignoring leap seconds.  */
-+  unsigned long int answer = 2527315200UL;
-+
-+  struct tm tm;
-+  time_t t;
-+  tm.tm_year = 2050 - 1900;
-+  tm.tm_mon = 2 - 1;
-+  tm.tm_mday = 1;
-+  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-+  tm.tm_isdst = -1;
-+
-+  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
-+     instead of "TZ=America/Vancouver" in order to detect the bug even
-+     on systems that don't support the Olson extension, or don't have the
-+     full zoneinfo tables installed.  */
-+  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
-+
-+  t = mktime (&tm);
-+
-+  /* Check that the result is either a failure, or close enough
-+     to the correct answer that we can assume the discrepancy is
-+     due to leap seconds.  */
-+  return (t == (time_t) -1
-+	  || (0 < t && answer - 120 <= t && t <= answer + 120));
- }
- 
- int
-@@ -5432,12 +6219,15 @@
-      isn't worth using anyway.  */
-   alarm (60);
- 
--  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
--    continue;
--  time_t_max--;
--  if ((time_t) -1 < 0)
--    for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
--      continue;
-+  for (;;)
-+    {
-+      t = (time_t_max << 1) + 1;
-+      if (t <= time_t_max)
-+	break;
-+      time_t_max = t;
-+    }
-+  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
-+
-   delta = time_t_max / 997; /* a suitable prime number */
-   for (i = 0; i < N_STRINGS; i++)
-     {
-@@ -5445,18 +6235,22 @@
- 	putenv (tz_strings[i]);
- 
-       for (t = 0; t <= time_t_max - delta; t += delta)
--	mktime_test (t);
--      mktime_test ((time_t) 1);
--      mktime_test ((time_t) (60 * 60));
--      mktime_test ((time_t) (60 * 60 * 24));
--
--      for (j = 1; 0 < j; j *= 2)
--	bigtime_test (j);
--      bigtime_test (j - 1);
-+	if (! mktime_test (t))
-+	  return 1;
-+      if (! (mktime_test ((time_t) 1)
-+	     && mktime_test ((time_t) (60 * 60))
-+	     && mktime_test ((time_t) (60 * 60 * 24))))
-+	return 1;
-+
-+      for (j = 1; ; j <<= 1)
-+	if (! bigtime_test (j))
-+	  return 1;
-+	else if (INT_MAX / 2 < j)
-+	  break;
-+      if (! bigtime_test (INT_MAX))
-+	return 1;
-     }
--  irix_6_4_bug ();
--  spring_forward_gap ();
--  exit (0);
-+  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
- }
- _ACEOF
- rm -f conftest$ac_exeext
diff --git a/app-shells/bash/files/bash-5.0-history-append.patch b/app-shells/bash/files/bash-5.0-history-append.patch
deleted file mode 100644
index 20f78bf..0000000
--- a/app-shells/bash/files/bash-5.0-history-append.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-*** ../bash-5.0-patched/bashhist.c	2018-07-05 22:41:14.000000000 -0400
---- bashhist.c	2019-02-23 17:12:02.000000000 -0500
-***************
-*** 437,445 ****
-       char *filename;
-  {
-!   int fd, result;
-    struct stat buf;
-  
-    result = EXECUTION_SUCCESS;
-!   if (history_lines_this_session > 0 && (history_lines_this_session <= where_history ()))
-      {
-        /* If the filename was supplied, then create it if necessary. */
---- 437,445 ----
-       char *filename;
-  {
-!   int fd, result, histlen;
-    struct stat buf;
-  
-    result = EXECUTION_SUCCESS;
-!   if (history_lines_this_session > 0)
-      {
-        /* If the filename was supplied, then create it if necessary. */
-***************
-*** 454,457 ****
---- 454,461 ----
-  	  close (fd);
-  	}
-+       /* cap the number of lines we write at the length of the history list */
-+       histlen = where_history ();
-+       if (histlen > 0 && history_lines_this_session > histlen)
-+ 	history_lines_this_session = histlen;	/* reset below anyway */
-        result = append_history (history_lines_this_session, filename);
-        /* Pretend we already read these lines from the file because we just
diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index 77e4f89..9459ebc 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/metadata.xml
@@ -1,19 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>base-system@gentoo.org</email>
-  <name>Gentoo Base System</name>
-</maintainer>
-<use>
-  <flag name="bashlogger">Log ALL commands typed into bash; should ONLY be
-    used in restricted environments such as honeypots</flag>
-  <flag name="mem-scramble">Build with custom malloc/free overwriting allocated/freed memory</flag>
-  <flag name="net">Enable /dev/tcp/host/port redirection</flag>
-  <flag name="plugins">Add support for loading builtins at runtime via
-    'enable'</flag>
-</use>
-<upstream>
-  <remote-id type="cpe">cpe:/a:gnu:bash</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="bashlogger">
+		Log ALL commands typed into bash; should ONLY be
+		used in restricted environments such as honeypots
+		</flag>
+		<flag name="mem-scramble">
+		Build with custom malloc/free overwriting allocated/freed memory
+		</flag>
+		<flag name="net">
+		Enable /dev/tcp/host/port redirection
+		</flag>
+		<flag name="plugins">
+		Add support for loading builtins at runtime via 'enable'
+		</flag>
+		<flag name="pgo">
+		Optimize the build using Profile Guided Optimization (PGO)
+		</flag>
+	</use>
+	<upstream>
+		<bugs-to>mailto:bug-bash@gnu.org</bugs-to>
+		<changelog>https://tiswww.case.edu/php/chet/bash/NEWS</changelog>
+		<remote-id type="cpe">cpe:/a:gnu:bash</remote-id>
+		<remote-id type="savannah">bash</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
deleted file mode 100644
index 1b3168c..0000000
--- a/app-shells/fzf/Manifest
+++ /dev/null
@@ -1,34 +0,0 @@
-DIST fzf-0.27.2.tar.gz 191941 BLAKE2B cad609a4171e4f3766b173b098a674b3469686265a6e30ff58b42b6ab5f29c539d860a78337d2985ebcfc8f4c249c979ab9e791db786b04dcdca0c55e5b81472 SHA512 8ca27b61b6b2a66bdfd06dc8ad9e5163f3b69d64a44e1a99df5a2af35a63ccf7a9a77f9faed27fead373f5c212396327a3c0300b31f22583a35a1ae2aeac9865
-DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
-DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
-DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.mod 250 BLAKE2B 46093e9211011e814962ba2eafec4392948f185d27a202a8b626e16299e3a3fa4554a604933ceab584b27cca2b7a6b1f51d4e5fe10d673e875e38eca08de64ec SHA512 412dee57c525bd5a3c0ce9c482e7933814758e36ebb226a16392e648f57e280485f86e30f17be2339eed427b52e4b0b601401503d0bd324c7fa874e2fcba2b60
-DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.zip 226363 BLAKE2B e690c6673285d12ffbf0d3ee6ff39f0bb1d072c872767c709150ef34b8ea40f0c8adc8196388a704126596051c3e1b722aae96fa54ee2baccdbca4f7683316ba SHA512 5fdd7b7b3b2826de6142d2dc0e6b19372636c4442c8878925f8c2af8bdfd2eef3c0cdbe331d0889345eb1e5a1d8c04ac80b3e46be7203d2475df86e04819af80
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.zip 958042 BLAKE2B 62ba67a66c0b5e159d7b12c8e32aec36f6f442411951024fe0b95fddce22c0e00d1f855f987aa39eddcb59165da582d0ee17fbf410630b6bad8424c17b85c431 SHA512 89b52255dd45791100b58a693036c772d27b26011754caa15df2badc4a93038b70060c7358aa12e01494e2f24e94533cd4ea7f7cb78686e61540383d1680ba2f
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.mod 84 BLAKE2B 9eb09ef8bbaf550ee520bdc9e35c7c221f85842959082d661425c15073001853e3b9bcf1ca1b552626f418de752f0a5542bbd76dd7f1d23ef131f4a169606e30 SHA512 939623ea34e482faf1cb055cd861471367cd69257abb28bd348efb4572ac95428330947ca0a1cac2820cc2cf7bbc6cada12623ff873d9ebc8c4af490d8237fbe
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.zip 20977 BLAKE2B e9a9da9c1383fd4011c9d934467ce94b00b04cdfb58faa0a531fa4b71d956b45cc1e6b9afc9011a2dad60fadd3a0c1fce7eda5de1e6eeabd53cc9f541ed48029 SHA512 05a554dc62146f8251376ec07e521594941e6f7c0173fb0c0ca48e6d9e512a92a29e059acdce83a5a0af503c0391fee4bbab57d2e256efb44b1ac137bfae59c2
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
-DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.zip 8916 BLAKE2B 2d3735c7229348b12148a77ab7057473bb37db5667024f481d7ba309b90e92046416e17cc4ca8db0b903eac6311716c01052c9959ca2f884ce4f9bead6a21575 SHA512 54ac2b14cc0b8cd161d6514f9ee877aaa0035edf09c883680595e49e4b572f5cf5db1f88ef5a192a32c6f14cd8e049ebd73097e7866e199a289ce4ffe2934f54
-DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
-DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
-DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip 45731 BLAKE2B f4a1442027b29625c694298e10ec9c107edd8437d8749110cd56440dae791c0e6d88a68187240cbc521f79fa7bdc4307e4b3b4edad38d57d5834644342a066e0 SHA512 88f37961ebe3a1701265a2f5cb606e97fe4ddd09e36ff13ca8c026e98640af5d35cb930e4d12b6690a97e5d934705102554c6d2912ebbb5ee08976c698cce2db
-DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.2.mod 104 BLAKE2B dd83516b0472a51d68d638c72db945b5640bae9fb4a81687b7c406f7bb67eb086161b99fd7f69ff13476b352c90ced4906b7a30db52a6adfbb3c862a1185a37d SHA512 21f6fea86dafb4b32ef61014700a7563e6c273fa8c23c6ce0a8776408511a8b4ab2d3391e21628054be2a94062f72aa7e9cc2f133b7ba1b2b10a758dce783d43
-DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.2.zip 17973 BLAKE2B 841f2a011bcda5fe793802c7caf80b8811cc871060259b126707647220ad12b13fb2548e2a094255fac635b4ac42dd67141fd5606a59c957e716a7c41d25c975 SHA512 805094a1745b2c20d9c6265e84f92ee9fa05a46fd93408d10e62c855985a7f2838ff9fffed61e705875eb0c49530fe9b21c7586ccba01a4b53c8f4dffba3b228
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-2021022003