Adding metadata

365 files changed, 2198 insertions, 4779 deletions

diff --git a/app-alternatives/bzip2/bzip2-1.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
index 01751e93d3f2..57852459ae49 100644
--- a/app-alternatives/bzip2/bzip2-1.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="bzip2 symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-arch/upx/upx-4.0.1.ebuild b/app-arch/upx/upx-4.0.1.ebuild
index 1a9d20a8f767..cdb9993a3627 100644
--- a/app-arch/upx/upx-4.0.1.ebuild
+++ b/app-arch/upx/upx-4.0.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="!app-arch/upx-bin"
 BDEPEND="app-arch/xz-utils[extra-filters]"
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 92e31a62642b..1f4bef629452 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,2 +1 @@
-DIST xarchiver-0.5.4.19.tar.gz 1120885 BLAKE2B 4b8b9e188b16b799f33a1816a5f19a0f67720369282239e3a22af8588b9776ee37dbc63cb1b42a426c515a360aeb1abda84b22e783bd8e4e3578eb2f2fb66ab6 SHA512 f35846bcb1236957d4201980eb1c9e49e16472ab2316935c9f8c94a9b4c3c2da879cd2730c3413041098042251607432f6af1cbacadd97b81efb81180fa5ee6a
 DIST xarchiver-0.5.4.20.tar.gz 1120317 BLAKE2B dbeb21492a4045d504aac92c28847a91c23e0feedeb82074fe89736f64b2b7d09b41bbefe321441c51736a8273267ac13dd616d4f61ba1b9e72cc805e749aa79 SHA512 c05be6f69a576988ca1a67c1664e4e4e3c53588ef4c85ce943e204ae72b08e705eb20be1018274c5420e30c5ed71d773bdacccc538ab458d658fba494c097777
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.19.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.19.ebuild
deleted file mode 100644
index 24dc0123a4de..000000000000
--- a/app-arch/xarchiver/xarchiver-0.5.4.19.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
-HOMEPAGE="https://github.com/ib/xarchiver/"
-SRC_URI="
-	https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="
-	>=dev-libs/glib-2:=
-	x11-libs/gtk+:3=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable doc)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	elog "You need external programs for some formats, including:"
-	elog "7zip - app-arch/p7zip"
-	elog "arj - app-arch/arj"
-	elog "lha - app-arch/lha"
-	elog "lzop - app-arch/lzop"
-	elog "rar - app-arch/unrar app-arch/rar"
-	elog "zip - app-arch/unzip app-arch/zip"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.20.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.20.ebuild
index dcee25235f64..24dc0123a4de 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.20.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/app-crypt/jacksum/jacksum-3.4.0-r1.ebuild b/app-crypt/jacksum/jacksum-3.4.0-r1.ebuild
index 120bd478a691..7b61dd1a5a01 100644
--- a/app-crypt/jacksum/jacksum-3.4.0-r1.ebuild
+++ b/app-crypt/jacksum/jacksum-3.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jonelo/jacksum/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-11:*"
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 90bc2f99f10f..1e7725d54ad7 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,2 +1 @@
-DIST eselect-repository-12.tar.gz 8543 BLAKE2B 14866156ddfefebaea368c4a13413d79e7858520861ee2b699cb09b339f3bb4b8393af7201b4cb7d6a60d2a48d168a053cc4707e2f56a7a2a11cfb5156cfa83f SHA512 3b98b9bd87fe61c7fb4d314e72c8433b11dd80501cfd226d4a4de25ca6d08e7a14a2497a1700ac64d704368bb8e5ea2ec337d0712097e9e10182a3122a59e388
 DIST eselect-repository-13.tar.gz 8914 BLAKE2B 57d11585f3ac1b279c99e6664fbb088e6eb09f8ef67496edf4c7aa82dcb154ad8d89f9b3337b87d15a7a19e59cd5c2359aa555266fbbb19478c0414ecae0ccd0 SHA512 76eb3f7c6e907d2355613548dfd9c55640d257bf4c89acf634e313228365f909f461b38acbdda21bc3ba1bd47ebb8be4d10ba93c4082e72c52896ddec0b25568
diff --git a/app-eselect/eselect-repository/eselect-repository-12.ebuild b/app-eselect/eselect-repository/eselect-repository-12.ebuild
deleted file mode 100644
index a1713565c0b6..000000000000
--- a/app-eselect/eselect-repository/eselect-repository-12.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit python-single-r1
-
-DESCRIPTION="Manage repos.conf via eselect"
-HOMEPAGE="https://github.com/mgorny/eselect-repository/"
-SRC_URI="
-	https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-admin/eselect
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-	')
-	net-misc/wget
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-src_compile() {
-	MAKEARGS=(
-		PREFIX="${EPREFIX}/usr"
-		SYSCONFDIR="${EPREFIX}/etc"
-		SHAREDSTATEDIR="${EPREFIX}/var"
-		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
-	)
-
-	emake "${MAKEARGS[@]}"
-	python_fix_shebang eselect-repo-helper
-}
-
-src_test() {
-	epytest
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/app-eselect/eselect-repository/eselect-repository-13.ebuild b/app-eselect/eselect-repository/eselect-repository-13.ebuild
index 382346c8f8e9..45fd135cb575 100644
--- a/app-eselect/eselect-repository/eselect-repository-13.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index d40ed57105de..c1578f29c3a3 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1 +1 @@
-DIST fastfetch-1.8.1.tar.gz 495658 BLAKE2B 2d9ebcae2bd129df3592e8ae32bee3369689cc0ac5047e0e716b7a998f6124452296f27c914e22cadc9cccc678196330ee95b562521f7ef5f6369a0ba1459f5d SHA512 079b27c6bd0d1653fce0b62844791e5af3900137463dbc7a09c2d3f9848cf38ed9df3d9797dc00f253a835a274567cc9e96643295b170aae49241791fcde42d8
+DIST fastfetch-1.8.2.tar.gz 495971 BLAKE2B e490323b2a18c2cc6a17569955fde820584a4b1e547ad18162b1cbb6f72c61cf8e891c4d1ed56c89f78ac0bc3d5769603e1dfc61c32bad07985c0df27cdf5e10 SHA512 cad6e1f69fd9192e63a55478ee6abe1f0a72c1d4af645d2b8fc1e56fc90eda80f62b5da7a87744ba1a668e5f0b785aac0e49be90867d3b61c674cf455cf984c0
diff --git a/app-misc/fastfetch/fastfetch-1.8.1.ebuild b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
index cfc24057bed9..37a92f2e89ae 100644
--- a/app-misc/fastfetch/fastfetch-1.8.1.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
@@ -7,11 +7,11 @@ inherit cmake
 
 DESCRIPTION="Fast system information tool"
 HOMEPAGE="https://github.com/LinusDierheimer/fastfetch"
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git"
-	[[ ${PV} == *9999 ]] && EGIT_BRANCH=master
-	[[ ${PV} == *d ]] && EGIT_BRANCH=dev
+	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
+	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-misc/fastfetch/fastfetch-9999.ebuild b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
index cfc24057bed9..37a92f2e89ae 100644
--- a/app-misc/fastfetch/fastfetch-9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
@@ -7,11 +7,11 @@ inherit cmake
 
 DESCRIPTION="Fast system information tool"
 HOMEPAGE="https://github.com/LinusDierheimer/fastfetch"
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git"
-	[[ ${PV} == *9999 ]] && EGIT_BRANCH=master
-	[[ ${PV} == *d ]] && EGIT_BRANCH=dev
+	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
+	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-misc/fastfetch/fastfetch-1.8.2.ebuild b/app-misc/fastfetch/fastfetch-1.8.2.ebuild
new file mode 100644
index 000000000000..37a92f2e89ae
--- /dev/null
+++ b/app-misc/fastfetch/fastfetch-1.8.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Fast system information tool"
+HOMEPAGE="https://github.com/LinusDierheimer/fastfetch"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git"
+	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
+	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
+	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
+else
+	SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="X chafa dbus gnome imagemagick opencl opengl osmesa pci sqlite vulkan wayland xcb xfce xrandr"
+
+# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
+RDEPEND="
+	sys-libs/zlib
+	X? ( x11-libs/libX11 )
+	chafa? ( media-gfx/chafa )
+	dbus? ( sys-apps/dbus )
+	gnome? (
+		dev-libs/glib
+		gnome-base/dconf
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	opencl? ( virtual/opencl )
+	opengl? ( media-libs/libglvnd[X] )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pci? ( sys-apps/pciutils )
+	sqlite? ( dev-db/sqlite:3 )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+	xcb? ( x11-libs/libxcb )
+	xfce? ( xfce-base/xfconf )
+	xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	xrandr? ( X )
+	chafa? ( imagemagick )
+"
+
+src_configure() {
+	local fastfetch_enable_imagemagick7=no
+	local fastfetch_enable_imagemagick6=no
+	if use imagemagick; then
+		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_RPM=no
+		-DENABLE_LIBPCI=$(usex pci)
+		-DENABLE_VULKAN=$(usex vulkan)
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_XCB_RANDR=$(usex xcb)
+		-DENABLE_XCB=$(usex xcb)
+		-DENABLE_XRANDR=$(usex xrandr)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_GIO=$(usex gnome)
+		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_XFCONF=$(usex xfce)
+		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
+		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
+		-DENABLE_ZLIB=yes
+		-DENABLE_CHAFA=$(usex chafa)
+		-DENABLE_SQLITE3=$(usex sqlite)
+		-DENABLE_EGL=$(usex opengl)
+		-DENABLE_GLX=$(usex opengl)
+		-DENABLE_OSMESA=$(usex osmesa)
+		-DENABLE_OPENCL=$(usex opencl)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_LIBCJSON=no
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm -r "${ED}"/usr/share/licenses || die
+}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 9f254952cea3..f4607328ef6b 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,2 +1 @@
-DIST pax-utils-1.3.4.tar.xz 753448 BLAKE2B c105ff568a8e4378cfef5f8b9acb415a850b1e209ea8413cdf518de82e5e925fdba60288557f042bf02d2e075ed5e538175b2078e4dafbe5c54117ed580fd87e SHA512 44a475860823e8b70b1d09d69e5fba3ed8298511d07e1e7b09ce62237cb8b1ecee8fc2fc550d6853d0b9f8db3c350bf78ced49d5f210997b294dc10e36627fcd
 DIST pax-utils-1.3.5.tar.xz 119764 BLAKE2B 13bd4dbdadefb382133bf42a2b1e740e84ac11661595b082346c80ff05fc7423f5d75cc01ff8a651d921310ae66c2b39a862d0b9db5d7f18e11d393360627fcf SHA512 f2b1753e15907461cc395abffe033d7f7ab8eb15e296b874e2c9d00507458672347b32d7f2f05d3a8625fc3afbdbf0721543f84e062afce7181a726d967e4836
diff --git a/app-misc/pax-utils/pax-utils-1.3.4.ebuild b/app-misc/pax-utils/pax-utils-1.3.4.ebuild
deleted file mode 100644
index 77754932fb16..000000000000
--- a/app-misc/pax-utils/pax-utils-1.3.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-# Note: if bumping pax-utils because of syscall changes in glibc, please
-# revbump glibc and update the dependency in its ebuild for the affected
-# versions.
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="ELF utils that can check files for security relevant properties"
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~xen0n/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps debug python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pyelftools[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	caps? ( virtual/pkgconfig )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux; then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-
-	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
-}
diff --git a/app-misc/pup/Manifest b/app-misc/pup/Manifest
index 499fbe8a67c7..ccdd4eb6b6c5 100644
--- a/app-misc/pup/Manifest
+++ b/app-misc/pup/Manifest
@@ -1 +1,13 @@
-DIST pup-0.4.0.tar.gz 2762349 BLAKE2B f324c1d19f3d072d4679beeaf715990447db92215a1806f26e2eb5470c6434902631434dc8601cc0e29fa4a5184d2d27753889e8e884129b4caaadbbfcdeec27 SHA512 5228a283cdbc6425888b08154873e059f5808efd68eb86880d15572398e50b0a431922e6ef5e6acf04bc18c95bfd793590d5df2eccb9a041a64dc03731ec1874
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.0.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.0.0.zip 9085 BLAKE2B 473d6d43654ad58c2a0d678e3d21b3a9cfb4c99020e80ac1dc747f14a9b298439e9ce3dc1b19b7e23dd7a423e51fdd5eec313e38723f958bcce35c2fcdb851ca SHA512 687ac62c96307c003e0feea0ba2f1d469548ccac9b4d0aacb71cc034c014e0adf2e0a28a7bf205ce83cc2b26ed74cf5bb33ae0758c7be52f583ff1d2ce82754b
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.5.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.5.zip 7302 BLAKE2B 2722f5249f5d879861a664c202ab50c4f3df021f581acc9eb907b266f6d485848314f8ee158b64fa39495a84f1488a9de420debf0f4e620a621542b30de55da5 SHA512 99bcbef68f31a7b3cddb4bcdf9798156e425693ce5162eb94a9dde907734c32b3b22306015800543cfe90f85091b38d3c27d9ea4bb3fad062d0e61ac2a7a0500
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.0-20151211000621-56b76bdf51f7.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.0-20151211000621-56b76bdf51f7.zip 4529 BLAKE2B 1ae58005cb5045b50c34d312340a3b5910ec1c92159bbdc36faa45c91b6039f91f5f1dd1bbe13978b0da38be1372328a191ea264685eb3a689b8b3588b9c2bae SHA512 5ea50e219f9f6135ddd5c602eb0bde954fae805aa0c43f0f40f04cd047a3067e92984678cc1a399a3cb404eca3329982eb9bde26ce76d6ee9d8ce5bc24ad8e59
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20160720084139-4d38db76854b.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20160720084139-4d38db76854b.zip 997252 BLAKE2B a31cecb3478f7909e927d7b92fac55544c2c608002b0ba3496a559634fb93364465e2c291253238045349a0e63bd64ab91f1b296aa3a9bf710c360ce783a47cb SHA512 3e99dca6e76b8432e142cf81defb806c98d0c6f29eba7798d00a2c004b241b311a1e224cb394b2a951337a40c91e4293b9259d11cf4690b185254f72e9a59cc1
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20160717071931-a646d33e2ee3.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20160717071931-a646d33e2ee3.zip 856605 BLAKE2B 7f9f783bae3f98715536855bfe6d5e889150ac796915599f4eb10bc100919cdbcb03034f816d55ed9ffdd8cc209bfcca1b901b8b15ca592520ffd0e20aa7879c SHA512 746c0254932cf8b4d0ed4b1950e9f82133409c600d6e550e6af92493eb67fb92bd742bd38ca81c6d74bd2b7202811a3b81d31ea464cafc0f37e11f0261b451f4
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160719205907-0a5a09ee4409.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160719205907-0a5a09ee4409.zip 4266299 BLAKE2B d6f4fb7b7d8c1bcdede7b5671044c5f032a3e66c4c4a55825b86714dc2143526b67d1bec1cca7d8b196cc4e819eda8ac199b0e794ccd900f36cf79d4ac2e541d SHA512 3244eee54399d4f659823df0b3258bacda2e26bbb6fa90b54b2d36d3dbb7aaaa3d331f7821d4efa2539185e999db28dc5a702b4ba8ea2839186a7812e969d426
+DIST pup-0.4.0_p1.tar.gz 1517147 BLAKE2B c3449382027988288aa30c8d4e26286658bdcf4042a23432ec481fde3d02d0225fc38786c085909d2fbde62467c0cf3b004edbcac78ac939de401f7ede8c5b26 SHA512 227431f0b0a2ef6d289f7807e1949d478553aa05a3d84566a73fd54ada47ad73d000036e0041ffdd8c197d814afce117e38c783f72e92a5406cbc267638ae4f7
diff --git a/app-misc/pup/metadata.xml b/app-misc/pup/metadata.xml
index 7cf1ac1fff23..87a309f6766c 100644
--- a/app-misc/pup/metadata.xml
+++ b/app-misc/pup/metadata.xml
@@ -2,10 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>toffanin.mauro@gmail.com</email>
-  <name>Mauro Toffanin</name>
-  <description>Maintainer. Assign bugs to him</description>
+  <email>cyber+gentoo@sysrq.in</email>
+  <name>Anna</name>
  </maintainer>
- 
- <origin>go-overlay</origin>
+ <upstream>
+  <maintainer>
+   <email>eric.chiang.m@gmail.com</email>
+   <name>Eric Chiang</name>
+  </maintainer>
+  <bugs-to>https://github.com/ericchiang/pup/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/app-misc/pup/pup-0.4.0.ebuild b/app-misc/pup/pup-0.4.0.ebuild
deleted file mode 100644
index 91892198f9e1..000000000000
--- a/app-misc/pup/pup-0.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Go Overlay Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GOLANG_PKG_IMPORTPATH="github.com/ericchiang"
-GOLANG_PKG_ARCHIVEPREFIX="v"
-#GOLANG_PKG_IS_MULTIPLE=1
-GOLANG_PKG_HAVE_TEST=1
-
-inherit golang-single
-
-DESCRIPTION="Parsing HTML at the command line"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 arm"
-
-src_test() {
-	GOLANG_PKG_IS_MULTIPLE=1
-	golang-single_src_test
-}
diff --git a/app-misc/pup/pup-0.4.0_p1.ebuild b/app-misc/pup/pup-0.4.0_p1.ebuild
new file mode 100644
index 000000000000..fd132deeb644
--- /dev/null
+++ b/app-misc/pup/pup-0.4.0_p1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"github.com/fatih/color v1.0.0"
+	"github.com/fatih/color v1.0.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.5"
+	"github.com/mattn/go-colorable v0.0.5/go.mod"
+	"github.com/mattn/go-isatty v0.0.0-20151211000621-56b76bdf51f7"
+	"github.com/mattn/go-isatty v0.0.0-20151211000621-56b76bdf51f7/go.mod"
+	"golang.org/x/net v0.0.0-20160720084139-4d38db76854b"
+	"golang.org/x/net v0.0.0-20160720084139-4d38db76854b/go.mod"
+	"golang.org/x/sys v0.0.0-20160717071931-a646d33e2ee3"
+	"golang.org/x/sys v0.0.0-20160717071931-a646d33e2ee3/go.mod"
+	"golang.org/x/text v0.0.0-20160719205907-0a5a09ee4409"
+	"golang.org/x/text v0.0.0-20160719205907-0a5a09ee4409/go.mod"
+)
+
+go-module_set_globals
+
+COMMIT="681d7bb639334bf485476f5872c5bdab10931f9a"
+DESCRIPTION="Parsing HTML at the command line"
+HOMEPAGE="https://github.com/ericchiang/pup"
+SRC_URI="https://github.com/ericchiang/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+src_compile() {
+	go build -o ${PN} . || die
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-misc/wego/Manifest b/app-misc/wego/Manifest
index 41ff991c4f28..c4ec9399eac6 100644
--- a/app-misc/wego/Manifest
+++ b/app-misc/wego/Manifest
@@ -1,4 +1,14 @@
-DIST github.com-mattn-go-colorable-9fdad7c.tar.gz 5586 BLAKE2B 4f41090d5b803e62b3cf5ab2bab05bf726006c2ccf5fe3e1c5c9a5042375ec652d6bddd09465b1748f969b5c78615e030e72a43d299a953d4fecaf2e8eb993cc SHA512 f3f1893c535cd050bdf83e8d13d5fa5f12b58272a1a373dc17c68a0021a0bd9e72817b5784dd1276cd963bbef07424d47c877d809df787058d8c87194f70b582
-DIST github.com-mattn-go-runewidth-d037b52.tar.gz 5895 BLAKE2B 32e5b025abe0ac98eea8e35278b76f2f447f80f5110fd5f66628510fa0488095f94beab0a010c4f511df04c8a8f503315910acc22f0ba9438a324da3faeeea08 SHA512 0795a78dbf805bcf3fb9887a0bb5875c6b8579302d9207a536d5d00dc8a97a732ae95d274d3b26215d9f900299b01a5b0869561e215def6c8d35d9603b9da551
-DIST github.com-schachmat-ingo-fab41e4.tar.gz 3170 BLAKE2B e37843954694c9cf5ae0a7faf953a5483f06d85bc7521ac199a0db9e6ca052f38ffac74b9f4256a2692f3f3055f49274cb0d7e1ac96c3a892da3553963d6e2da SHA512 8aedc3e85666c228f44f563fbc0264a3cd17fc4dc25f243d92995aeeb493533439600d147eeb9e23d00f108e8002a8b9e0fb4be309353ddd08f1efdd9582b849
-DIST wego-2.0.tar.gz 11185 BLAKE2B 1bf8030a0801a80d5bd367be9a53f01c232ece40fb6f66e4dd06a72ed44e2cc1d6da27888b148c24264ed4eec460b4b9d8e4ff6e91d55e134f275b3978048ace SHA512 92073393f420f72367955b08ef64a90eadc5a72f79f9c42ee1886918923e5953da15dd9ffaefc14aa444cfe5db5f903d88ec080f9ca3490da29efe5734a200f8
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.mod 160 BLAKE2B 63be9d239ea8c5ad48c5bdefaf634f1ef2e3913f9c1f1eb0c48ccf9185a2c14c1030d1542048acd9c7c42399ebb752a8c943e70ed7b11d199ed9067b6e906480 SHA512 f2fa86449f7da9a73f3f8781e6b3dc6ad6e7d491cb37854be0dfb5c3ee086c36f509646e6fa383b4f00c3cb96c535e581016b2a43aedbfd9fe5861bada2f7ce0
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.zip 13979 BLAKE2B ab26453c09251ffa89639f5fa0579a853b7b2ee8ca9f48eb8e8b2343acb5d6dbbb67479f21341e37b9cfd28bc4d1fd7facadb8a7ee20f02d0046e8df46baa4b9 SHA512 202a6349397e9f7b4a8252867f4928c694bbba813544b9bb8b8bc4851d18c074f688e3a1f01d7b65e899f492325048705d5250394613924b98bdaece8a2373c9
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.mod 104 BLAKE2B e859512911c1621e5ba3e46249c5b9b5e4b0bae854bb3a18d7e39d6da27c93e133d43851d5e6bf2ede44fdee31801b19fe274b55a1f37b1291bf27262e2f2385 SHA512 23b01eb4023ff5018437ff98b55ada053eba49feab2777eed36d033f426c5456b143f3defbc3131dad1251205f3ffb3553e3c10bd98de80f0a462e8450d6d56c
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.zip 8919 BLAKE2B fc84f4f16176d14f177f029cae5ecf0221a8f0ce716c499e8b5d49c8e1523673a2fbb600a769ac26be98b591b3cbc3730d447c412b2acd3eff7f878526c271a4 SHA512 c6401cf5af80ea2495cb63800ff39fb9490f212f3aae0ac1d86b3d37ce6734eb35aea00b35bd26532feab77ef80322e765925f302d77f664dd57163f67a8374e
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.mod 84 BLAKE2B d78cb89b5321a10aed4ad5abd88952a190c5051dedea0c9f43f06881be807892152edb9be4ecc9eddfc3cd7b75a441ab85559e25c60feeaf560baf829af373ff SHA512 b96cca212a7024f0039ddd3a744fe818ab2e028b8ac2fd4472ce76ee9b496de3abb0960718c1106a98cf7e6df652dcf2884fe5ed95979bd9016399ea4abd324d
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.zip 20978 BLAKE2B 1114ba9e7289e1a1423e81c4e0ff52860d9232f7e55a626e32282dfbf7a45ef53c21b843f4b6870be92e710db9c619d96f9c197eda0d8c28dac3764160e92105 SHA512 e86a3b69601be1a0a15d7bfd5d93fce8d8c06b52c55c941a9ed62b44f05d3062e436d817661af14bb42838efc45875a63eb6042b196e1684db36e0fe6ed42a7f
+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%2Fschachmat%2Fingo%2F@v%2Fv0.0.0-20170403011506-a4bdc0729a3f.mod 33 BLAKE2B 9dc686e79d167d4ef985e11a7cafb978ae6726126da040967a73bbdb99a83d37e23f765f389d3b3b47f607f73fe036ce1dddb855b3346234e8a7f5967f84c65d SHA512 bd411ee9ca744c079193dd742b191a1df13fbbf144dfda14f6a39f3246710e67c17a47d751940e1441ab40bf04caa0635ae0fb46ae47055f2206f879a527e6b9
+DIST github.com%2Fschachmat%2Fingo%2F@v%2Fv0.0.0-20170403011506-a4bdc0729a3f.zip 7295 BLAKE2B 9e00c2a437ed2fead4fcd6d192cf9bc173eeae505b1e8257a4193997a06eb4f8eae3ef80b80403c80a6abbf9f5eeb3efe51d4bf5b431abdd3b73ac2c8ba611c9 SHA512 50db8c540ac425e1f24c500cfef2699ba33711c828b1a89f94ff6122895e6c357f74fbe5247418ecfa2c94474c0140db9ecd198c571ec0152ad2b606fa2d9611
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.zip 1655907 BLAKE2B 317486eaf6a714d7d74f563e20bbe3f0581c7331e3c8e492cb075476bdd57f9ae4a75c49834cc6912f7d9ed6a54c540a78f6e2556245afc05f6480019c7abc17 SHA512 dcd3d13b504c351483c49f93884b3e8635cb0377a51cd14fbd3efe8b55f3983e401ee746bbdb7e6904e472beb09343d9d1d1d9667f2cc515e991c8f5c3bf14cf
+DIST wego-2.1.tar.gz 16499 BLAKE2B 9308d7bc3899d136bf98c8862fffd62f1984445598cda7de98a9d9bc9b6d3e3f2723bc1438a3483f3e4753ea6abb84832a6f3539a7336569f711253043ecb425 SHA512 80cc19ea34bdb536ab48ef6e074f86b58dab59f76270688ca2d4c562c5eb34f177597108f2159e6ef33ee2485c068a7904ddf7bf8d0b79cb825ca7b73b0fefa2
diff --git a/app-misc/wego/metadata.xml b/app-misc/wego/metadata.xml
index 7cf1ac1fff23..ae4bfcd9c9ec 100644
--- a/app-misc/wego/metadata.xml
+++ b/app-misc/wego/metadata.xml
@@ -2,10 +2,27 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>toffanin.mauro@gmail.com</email>
-  <name>Mauro Toffanin</name>
-  <description>Maintainer. Assign bugs to him</description>
+  <email>lssndrbarbieri@gmail.com</email>
+  <name>Alessandro Barbieri</name>
+  <description>co-maintainers welcome</description>
  </maintainer>
- 
- <origin>go-overlay</origin>
+ <longdescription lang="en">
+Features
+
+show forecast for 1 to 7 days
+nice ASCII art icons
+displayed info (metric or imperial units):
+temperature range (felt and measured)
+windspeed and direction
+viewing distance
+precipitation amount and probability
+ssl, so the NSA has a harder time learning where you live or plan to go
+multi language support
+config file for default location which can be overridden by commandline
+Automatic config management with ingo
+	</longdescription>
+ <upstream>
+  <bugs-to>https://github.com/schachmat/wego/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/app-misc/wego/wego-2.0.ebuild b/app-misc/wego/wego-2.0.ebuild
deleted file mode 100644
index 553fb4de98c2..000000000000
--- a/app-misc/wego/wego-2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Go Overlay Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GOLANG_PKG_IMPORTPATH="github.com/schachmat"
-GOLANG_PKG_HAVE_TEST=1
-GOLANG_PKG_USE_CGO=1
-
-GOLANG_PKG_DEPENDENCIES=(
-	"github.com/mattn/go-colorable:9fdad7c"
-	"github.com/mattn/go-runewidth:d037b52"
-	"github.com/schachmat/ingo:fab41e4"
-)
-
-inherit golang-single
-
-DESCRIPTION="Wego is a weather client for the terminal"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 arm"
diff --git a/app-misc/wego/wego-2.1.ebuild b/app-misc/wego/wego-2.1.ebuild
new file mode 100644
index 000000000000..9b3bdb344535
--- /dev/null
+++ b/app-misc/wego/wego-2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+EGO_PN="github.com/schachmat/wego"
+EGO_SUM=(
+	"github.com/mattn/go-colorable v0.1.12"
+	"github.com/mattn/go-colorable v0.1.12/go.mod"
+	"github.com/mattn/go-isatty v0.0.14"
+	"github.com/mattn/go-isatty v0.0.14/go.mod"
+	"github.com/mattn/go-runewidth v0.0.13"
+	"github.com/mattn/go-runewidth v0.0.13/go.mod"
+	"github.com/rivo/uniseg v0.2.0"
+	"github.com/rivo/uniseg v0.2.0/go.mod"
+	"github.com/schachmat/ingo v0.0.0-20170403011506-a4bdc0729a3f"
+	"github.com/schachmat/ingo v0.0.0-20170403011506-a4bdc0729a3f/go.mod"
+	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+	"golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6"
+	"golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod"
+	)
+go-module_set_globals
+
+DESCRIPTION="Wego is a weather client for the terminal"
+SRC_URI="
+	https://github.com/schachmat/wego/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
+HOMEPAGE="https://github.com/schachmat/wego"
+LICENSE="BSD ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	go build -v -x -o wego || die
+}
+
+src_install() {
+	dobin wego
+	dodoc README.md
+}
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index a53cf3add977..1ae0ae6f35b2 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,2 +1 @@
-DIST gemato-16.2.tar.gz 80178 BLAKE2B c973c36bb1277d07618ba8d90f7d6820508d78aedae200f0678c8b2e1dde38e3b7f4d7dc24791dedb9c88791d3b71711c9bdeb749b5fc091a20aa87f71ad70d3 SHA512 9d59ba360afaf237e47c5ded0e5bc29ec44d5b1d73eadadc19ff834a1966e1e620da258eb7a1b6afbff5c66cbd7e39454fd5920f2f82fc510c2f8836c0b80462
 DIST gemato-17.0.tar.gz 83991 BLAKE2B 7a01b8ecb9e3540c698b7d57e5b6ba0961d42e7edd51e7b422d0e3d89088230633f3402b19168b3ccb772f028a3f669b324e76fa84f1918afa1c92c728942f14 SHA512 22066939ccab081c5d2bd52eab587aed0893b11cac40256a2e08a9a2f14e20320acaffd3414c4111bf27db15aca6d76a3856b6a3d8d5019fd649a2f7e07e3265
diff --git a/app-portage/gemato/gemato-16.2.ebuild b/app-portage/gemato/gemato-16.2.ebuild
deleted file mode 100644
index a4dda5934b10..000000000000
--- a/app-portage/gemato/gemato-16.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/projg2/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+gpg tools"
-
-RDEPEND="
-	gpg? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		>=app-crypt/gnupg-2.2.20-r1
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-17.0.ebuild b/app-portage/gemato/gemato-17.0.ebuild
index ca354eac8934..87126aeac91f 100644
--- a/app-portage/gemato/gemato-17.0.ebuild
+++ b/app-portage/gemato/gemato-17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="+gpg pretty-log tools"
 
 RDEPEND="
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 97755c29fe47..148ed67a48a3 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,4 +1 @@
-DIST mgorny-dev-scripts-28.tar.gz 11748 BLAKE2B 53111a6779cfafb560fb895fcdad4c5bbf1c3cfa1a8e4afcd4bf4ea7af51a4a165a898c5f3f55e5cf35e2145d77f0f291f3c3ed7a002db01021274266ec0f91f SHA512 0f6d1c9abd54d978a69fb0c9b2e794e9cafd9d0d62f957086b24d8f989a040c0c1e03f23b0315195657f1fd338e1f216dbb305082a4852cb603737b983e6bd98
-DIST mgorny-dev-scripts-29.tar.gz 11752 BLAKE2B 93105d0cabb8acd418dc416211a5a6e621d1e96152be00c19cfb8f559f0afc029d83c7203fb1c533b74f2f0c90316e6ff705bf199efd2e0322728a27de80c8ee SHA512 c140a20d2190c92edb900ccdb20cd13170912be30050f7c248b5b4897e24f586552747cfb4aa3df6b9dce9ee74686958dfdbea572349dcdccae3a10cef5a6173
-DIST mgorny-dev-scripts-30.tar.gz 11526 BLAKE2B 169a6390469b902c7d93418d549dde1d2eacaceef31c88bd5ca7b01ed0ee8eab8e51b2030676a0b080f854806d8fa81a5aada5a9d6faddce1e073d263d7084ea SHA512 19c988335a5a1252105c45e91bdabd7a47794c1e0903b963f4ab71db32d7cd32111c72b03bbbaa616369184f1a013b8d3b201429b6efc83dd2848ec9446cee32
 DIST mgorny-dev-scripts-31.tar.gz 11903 BLAKE2B bbe7dc4ab1978485d9c954e5ac0752e3babb3162a20b3c582d92a14cfd20d82f3710f65d34bd15a3b101547f587cf3c8859b066be555ac5b3d55c10ee7f68568 SHA512 a164bb1b75911a4575813720c2dd10b81ca806dafa6eebf71f2f609eee24cd4bbc645eb3f1c8d40eb6031d25b5ea6575fa761f53b5f03d52e0438d6dfd2dc173
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-28.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-28.ebuild
deleted file mode 100644
index 4cd466d472db..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-28.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	app-portage/portage-utils
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-29.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-29.ebuild
deleted file mode 100644
index 2838be105fd2..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-29.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	app-portage/portage-utils
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-30.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-30.ebuild
deleted file mode 100644
index 2838be105fd2..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-30.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	app-portage/portage-utils
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-31.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-31.ebuild
index 2838be105fd2..4cd466d472db 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-31.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-31.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 160fcb3e8caa..65e3c7ecf90c 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,3 +1,2 @@
-DIST nattka-0.3.1.tar.gz 95368 BLAKE2B cefe8236694ceffe9adf3c5af9c8c3521613fbc09b6e27804ee855a376f940baa5e7bf3d6d5d62371d37cea090748ec7053963dd675e88b9cedb48d595425ff4 SHA512 14b04b2f6fff41cc9705afe5cfc522a3009b14afa4ff5759c1913387afd04c97231fe2ad5661cef43c5ebfe764012cec251fd78463bbca924fbf33068a31aaee
 DIST nattka-0.4.1.gh.tar.gz 95941 BLAKE2B 4037c2b364c091e10f4684e8c1e59c26c7af943c6cf230058b115d4518f9b7589ca845a5174f6f99280b2cb1655544afe3ba727ef6276570a00fcd3e6117c382 SHA512 d490999b6a4b4938f85081750c9b67f3876b666c99f6b36eada32a66c0111fc2f1be231b49b08754b1213b616b854d5bb4865ea8e3540e2d48b504fdb7047d2f
 DIST nattka-0.4.gh.tar.gz 95937 BLAKE2B 31b629e43abfa445bc466b7541914709b07423b059fdf887a0a5713124f7813dc6f39c6f10d65c020dab4dedf9aefb49dd7384d6fba08da8b4e14d11c1326c33 SHA512 70819a623a79feb570141c5e0452273f514b28e1746540393b3dc4aa671c27dd08e50160e722b9e8c4af6ccd500c4a4dd0e70e5146c9b062a43945cd5fe758d5
diff --git a/app-portage/nattka/nattka-0.3.1.ebuild b/app-portage/nattka/nattka-0.3.1.ebuild
deleted file mode 100644
index 28a28774ed2c..000000000000
--- a/app-portage/nattka/nattka-0.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/projg2/nattka/"
-SRC_URI="https://github.com/projg2/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="depgraph-order"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	depgraph-order? (
-		dev-python/networkx[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/flit_core-3.7.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/app-portage/nattka/nattka-0.4.ebuild b/app-portage/nattka/nattka-0.4.ebuild
index e266c62c69b4..7f45f0f76164 100644
--- a/app-portage/nattka/nattka-0.4.ebuild
+++ b/app-portage/nattka/nattka-0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="depgraph-order"
 
 RDEPEND="
diff --git a/app-shells/antibody/Manifest b/app-shells/antibody/Manifest
index fd72acf7aa75..7672f9b67c75 100644
--- a/app-shells/antibody/Manifest
+++ b/app-shells/antibody/Manifest
@@ -1,8 +1,35 @@
-DIST antibody-2.2.2.tar.gz 19263 BLAKE2B 26db0457fff3798654d6bbe2422ca5dbf33acb39637e8eee7f67d5ae002eda7ef04a06ca528e2aeb9c094fefd46b4f55f7e946a55de3b7b7136bd320aacc5f35 SHA512 705f8c64d215f0a70891020895c5777970391461e6e8d2f357378d39191416c75205ce46b775c7f962e2a69760d882a729160c3efc3fc35452335a629a60b7b4
-DIST github.com-caarlos0-gohome-321f486.tar.gz 2559 BLAKE2B 5a367a540bb356d6ac5f65e0d0e8b4c560b0a2fe542dd3cebf282c0610bb7a7ef7f624a8bf0148a2ef0eef061ad845b04c725d1be8be93051d9d2c42b6101210 SHA512 39a9db975647ba3e9e5d017a4dfb390511e54fd7c272ab90a7fa6adba5c760806e0fb4cef19121f387d22c864155c651783e728d8556b377f6909d1d6be870b0
-DIST github.com-getantibody-folder-479aa91.tar.gz 1726 BLAKE2B ce416be0de75fcef726ee0060dfb6eb809980fb75da835fd9fb06c62c49aeb25346ab509a69c2d0ed8d65a2a2be9d2a7f0ec42f77e72308b044401b0f4eb5270 SHA512 f0b5096f8cfa0586a35e0f38ce83ffdf0546b6ecace8fd1441ddede0b17e0b24b94357c998c66ee54eaed269dccd6f86804d001abda64b0df397acbda7bb57d1
-DIST github.com-golang-crypto-f6b343c.tar.gz 1303799 BLAKE2B a2b96d283268455206f02113b31846ab636f93b49a73def2155bfaeb16ae61383a5e66a357703cc8c21d816ae15f07875aa203298a1cf33743cd0c18ace4ae89 SHA512 9a6294dc94623225d76117aa0c776dfa70a167a39702eb8c46689ed6c14f66ea8d80920dfc66c555694ed8c440607c2e38ee51b8444d760d3da5db85bff81ed0
-DIST github.com-golang-net-69d4b8a.tar.gz 766102 BLAKE2B c859316f0b65381f00b986bc42dd0b0b371d0f8a48dabd8a1f00ef4a4468a06fd59d618a17855ebc12c93f0d3b35f11af8fe7293d4afd913c4e64777864228ca SHA512 793758e4b85eb7a626c6c686f8c1b147df555b8a32fb3ec3b71c286a0d1fbaa5c08d1c34aa7e75cd880554136cf6b9ca5fb54c7efb4eac5de7fd42bda7b21536
-DIST github.com-golang-sync-450f422.tar.gz 7039 BLAKE2B 392f65a9b7bd850fc525b2c7e1ffd873fabb04658c8a00b1ab060b77e6b22bd4ad70c10e914a0981d5c2c3397357abdecd27aec84dd74b621c8f0fe0ef9c5083 SHA512 9b65928addd495115ff83fc2cbf13b19bb952d0e1a77c48f8e1c1116c8a0f435de222c0e086b8766c9eeb1650ccdf1e02a45b46c6ce025b1f44144fa55a8eb7b
-DIST github.com-kardianos-osext-c2c54e5.tar.gz 4725 BLAKE2B 6987a7b1fa546260189b272f6650fa738499230e08c9140ece62f1d9c4d65db7be10b37784b742ce15764aab51c43df99e9f2b61ef038ba4048482bf442d1c37 SHA512 178531aa30f0d67c452ffa247845a66f92a9831a5a96e67a2ad7102bd38edbdffba5277c3338e84960ced5cc2923534210bbf8787422fdd3035a6c6dd8d8dc93
-DIST github.com-urfave-cli-0bdedde.tar.gz 55656 BLAKE2B 7eeebdc63880ab4e89eddb1e4bdebc5cccdb5418d41f7eafc4f3ad2daf98b45af14adb1f134292bb2ea19bea6a08a2ac7cb3710f72628216cc1c4976ce8e3170 SHA512 5e99a82d56ef3516f49900b2cfa9c8da4f06d17b786e3cc4adff89f1541def111ccf13782843e3381b9122eb46de4f9aa8d406f2aaf94dd0bd76a736558c84ea
+DIST antibody-6.1.0.tar.gz 53689 BLAKE2B c6288d52624a9305486717cd162668eb07029ae5e0a6915c502f0ff91dedee93568ef1fb626160b489ae3f3591cff91979bde6ab8a12dbf9cd9b73eeb66526ec SHA512 83f826a9a6cc789f74cf8ed996ae8dc2f953729fa47510db815988a43ad174913042769b20a120c58f5173108e32e2aa64dbb03ffac97ca2f1fff0c05ad2ae45
+DIST antibody-6.1.1.tar.gz 53625 BLAKE2B a348c022d0942b00d5e5dc2aeb257b7dbb589be592d340ec69e0a4539e1f5b4abf7c2585fd072fa82f9219b0bf3f41858095f13a475ac93d5ebacf20e429400b SHA512 0a436227d195b1e68be03d62d0f7fab0f10c4434df10e047468809a6dcf330623c54ddf4e52c459d7b816a3be977e62c6aba58408881f9a45583456e37614b04
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip 66303 BLAKE2B 4b02e631a3537d577b78b1372f8496113c582bfaafc48f5ce6981ed72da6a611d6c692a85c6e7cc8aeb47c89d0fec9f491d59607ead55d5e4be256525d3173bb SHA512 d29dc8a3c82c34af07b0c393349eda79b30c988d439771e02106bf2f386ef5fc3feaebf00da3953a40bff2c5ed93880ecbf45e1607303c11a417bfffb96e2e65
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod 79 BLAKE2B 51cb1c2c33300626f74f843ce56c333b194b9a46230d3befe94343fe9daa62314a59b74a6d78c97415f839997fb42700c762fe02ef76240924ba52d18f723ad6 SHA512 df2dd357e057bb1fc65ef4869f64149f6446257406886e89a39f7dbc7e6c9da25a8c17567b14c8d3adefaf21fba98e0f2663924c7d32a4f82d30377ab4032162
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip 7096 BLAKE2B dd3436eacdcf42567210b68830f6a9663ed91531d73aa6c2548f50e387d7081a0908478135816a599014a82e23fd6ca9c2685ce8518c6ca73bce24a9f0ff5f6d SHA512 6111f8ea08657e90dce1ae450736cbc3a6e10cd61ee5211ef4cbb1abe1862d0fa658ef2922b6778084d10af3f3c55744962162bf9fbdf48d2c42f6a15b297ea2
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fgetantibody%2Ffolder%2F@v%2Fv1.0.0.mod 37 BLAKE2B 49ba5a24d557eaea97dbcab5215c9397751d67803ade4e0cf7944c4df9fa901237d0b2dcda6e84ac2107709029ced4a923dac5d0cf0956d3a9f0a9a434707804 SHA512 6e3974583d84e44e60071ef1b448ec76b04d70b5499d409289cbfc443d64573562931d92603f31c7bbea527e74b7b2812c4612b9c0b41800f29443529329c837
+DIST github.com%2Fgetantibody%2Ffolder%2F@v%2Fv1.0.0.zip 2547 BLAKE2B 971f3ed0e75d5526ae1aa5814291e02f9f2b6b22d901c0236f10f56451e5b79cf44aeca06d7cbf2604801672ecfdbbc790d4651c8dc0b3c7a865f0d08a0f54c6 SHA512 b94675f7d794357b6dc9cb346985bf5a09e8a772453a0fbb9bcb2338ff2d21eba0d549b7ec94405b828039d7d36858a9b29daa2447e549d67c33bcff04f07757
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.zip 1876217 BLAKE2B 6ccbf46dcc9a97f60214af41470bc123c8b48a46737792d063ed6db50e937fdb87223032ff8f3c4d3f5ad0542a63e230ef70fa79ce681ab1ce71431b8a40caad SHA512 4795794202014a02396ae6e774ac5d9882d50c928660424f90798d806b1b5fd69f59e2bb23c5bf12a5841787cbc2f38142104b4427358dd527e539201415b35c
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip 27028 BLAKE2B 1148f5197f3701698ea33c6185b918fdada2b3f55d401dfb90d33731dfe80b53bfdd891df3c4fa572606cd88963de20d9b44f5296946d80aa0daedbdf6b658a7 SHA512 a93111e63671ef38bdf0ae2bd9209d6b3d7dc9ad138077d3bc22dad12f0657982667b7e88fc9a4162b0f6765184172957b05797a29a2d614c975df00b12c4aba
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip 1479123 BLAKE2B 45f0af63ffb886cbd78269a103067057346ab756631f228fc27b68459bdde97c84c100f99045e1a4a8d336513c4192b377048db8e09cefa703e94ca814d6eb07 SHA512 57783ce5463ce2a6a2d76d8ed3df08a23de896ca82e7456597a0fa55fe80bec64f899085fc727f0bf369495d1bca70a10e0f7071e7e66f6a5ecba1b4f42ffe54
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
diff --git a/app-shells/antibody/antibody-2.2.2.ebuild b/app-shells/antibody/antibody-2.2.2.ebuild
deleted file mode 100644
index 5a3687c2f61a..000000000000
--- a/app-shells/antibody/antibody-2.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Go Overlay Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GOLANG_PKG_IMPORTPATH="github.com/getantibody"
-GOLANG_PKG_ARCHIVEPREFIX="v"
-GOLANG_PKG_IS_MULTIPLE=1
-GOLANG_PKG_LDFLAGS="-X main.version=${PV}"
-
-GOLANG_PKG_DEPENDENCIES=(
-	"github.com/getantibody/folder:479aa91" #v1.0.0
-	"github.com/caarlos0/gohome:321f486"
-	"github.com/kardianos/osext:c2c54e5"
-	"github.com/urfave/cli:0bdedde" #v1.19.1
-	"github.com/golang/crypto:f6b343c -> golang.org/x"
-	"github.com/golang/sync:450f422 -> golang.org/x"
-	"github.com/golang/net:69d4b8a -> golang.org/x"
-)
-
-inherit golang-single
-
-DESCRIPTION="A faster and simpler antigen written in Golang"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="app-shells/zsh[unicode]
-	dev-vcs/git"
-
-RESTRICT+=" test"
diff --git a/app-shells/antibody/antibody-6.1.0.ebuild b/app-shells/antibody/antibody-6.1.0.ebuild
new file mode 100644
index 000000000000..a4a7906dc50d
--- /dev/null
+++ b/app-shells/antibody/antibody-6.1.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+# NOTE: Keep EGO_SUM in sync with go.sum (with dev-go/get-ego-vendor).
+EGO_SUM=(
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/getantibody/folder v1.0.0"
+	"github.com/getantibody/folder v1.0.0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899"
+	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+)
+go-module_set_globals
+
+DESCRIPTION="Fast Zsh plugin manager"
+HOMEPAGE="https://getantibody.github.io/"
+SRC_URI="
+	https://github.com/getantibody/antibody/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	app-shells/zsh[unicode]
+	dev-vcs/git
+"
+
+PATCHES=( "${FILESDIR}/6.0.1-remove-failing-tests.patch" )
+
+src_compile() {
+	local -a mygoargs=(
+		-ldflags "-X main.version=${PV}"
+	)
+	go build "${mygoargs[@]}" || die
+}
+
+src_install() {
+	dobin antibody
+	einstalldocs
+}
diff --git a/app-shells/antibody/antibody-6.1.1.ebuild b/app-shells/antibody/antibody-6.1.1.ebuild
new file mode 100644
index 000000000000..b31fae17d4d1
--- /dev/null
+++ b/app-shells/antibody/antibody-6.1.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+# NOTE: Keep EGO_SUM in sync with go.sum (with dev-go/get-ego-vendor).
+EGO_SUM=(
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/getantibody/folder v1.0.0"
+	"github.com/getantibody/folder v1.0.0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899"
+	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+)
+go-module_set_globals
+
+DESCRIPTION="Fast Zsh plugin manager"
+HOMEPAGE="https://getantibody.github.io/"
+SRC_URI="
+	https://github.com/getantibody/antibody/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	app-shells/zsh[unicode]
+	dev-vcs/git
+"
+
+PATCHES=( "${FILESDIR}/${PN}-6.1.1_remove-failing-tests.patch" )
+
+src_compile() {
+	local -a mygoargs=(
+		-ldflags "-X main.version=${PV}"
+	)
+	go build "${mygoargs[@]}" || die
+}
+
+src_install() {
+	dobin antibody
+	einstalldocs
+}
diff --git a/app-shells/antibody/files/6.0.1-remove-failing-tests.patch b/app-shells/antibody/files/6.0.1-remove-failing-tests.patch
new file mode 100644
index 000000000000..9886121cd673
--- /dev/null
+++ b/app-shells/antibody/files/6.0.1-remove-failing-tests.patch
@@ -0,0 +1,419 @@
+From e01c41417a171bb63b985742e93b3f0fc501d25f Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Mon, 18 May 2020 22:04:28 +0200
+Subject: [PATCH] Remove failing tests.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Something in project/ emitted the helpful error message “build failed”,
+so I took the sledgehammer approach in git_test.go and
+project_test.go. It is likely I deleted a bit too much. Feel free to
+replace this with a better patch.
+---
+ antibodylib/antibody_test.go | 105 -------------------------------
+ bundle/bundle_test.go        |  51 ---------------
+ project/git_test.go          | 117 -----------------------------------
+ project/project_test.go      |  46 --------------
+ 4 files changed, 319 deletions(-)
+
+diff --git a/antibodylib/antibody_test.go b/antibodylib/antibody_test.go
+index 752ca07..608f3dc 100644
+--- a/antibodylib/antibody_test.go
++++ b/antibodylib/antibody_test.go
+@@ -5,40 +5,11 @@ import (
+ 	"io/ioutil"
+ 	"os"
+ 	"runtime"
+-	"strings"
+ 	"testing"
+ 
+ 	"github.com/stretchr/testify/require"
+ )
+ 
+-func TestAntibody(t *testing.T) {
+-	home := home()
+-	bundles := []string{
+-		"# comments also are allowed",
+-		"caarlos0/ports kind:path # comment at the end of the line",
+-		"caarlos0/jvm kind:path branch:gh-pages",
+-		"caarlos0/zsh-open-pr     kind:zsh",
+-		"",
+-		"        ",
+-		"  # trick play",
+-		"/tmp kind:path",
+-	}
+-	sh, err := New(
+-		home,
+-		bytes.NewBufferString(strings.Join(bundles, "\n")),
+-		runtime.NumCPU(),
+-	).Bundle()
+-	require.NoError(t, err)
+-	files, err := ioutil.ReadDir(home)
+-	require.NoError(t, err)
+-	require.Len(t, files, 3)
+-	require.Contains(t, sh, `export PATH="/tmp:$PATH"`)
+-	require.Contains(t, sh, `export PATH="`+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports:$PATH"`)
+-	require.Contains(t, sh, `export PATH="`+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-jvm:$PATH"`)
+-	// nolint: lll
+-	require.Contains(t, sh, `source `+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-zsh-open-pr/git-open-pr.plugin.zsh`)
+-}
+-
+ func TestAntibodyError(t *testing.T) {
+ 	home := home()
+ 	bundles := bytes.NewBufferString("invalid-repo")
+@@ -46,82 +17,6 @@ func TestAntibodyError(t *testing.T) {
+ 	require.Error(t, err)
+ 	require.Empty(t, sh)
+ }
+-
+-func TestMultipleRepositories(t *testing.T) {
+-	home := home()
+-	bundles := []string{
+-		"# this block is in alphabetic order",
+-		"caarlos0/git-add-remote kind:path",
+-		"caarlos0/jvm",
+-		"caarlos0/ports kind:path",
+-		"caarlos0/zsh-git-fetch-merge kind:path",
+-		"caarlos0/zsh-git-sync kind:path",
+-		"caarlos0/zsh-mkc",
+-		"caarlos0/zsh-open-pr kind:path",
+-		"mafredri/zsh-async",
+-		"rupa/z",
+-		"Tarrasch/zsh-bd",
+-		"wbinglee/zsh-wakatime",
+-		"zsh-users/zsh-completions",
+-		"zsh-users/zsh-autosuggestions",
+-		"",
+-		"robbyrussell/oh-my-zsh path:plugins/asdf",
+-		"robbyrussell/oh-my-zsh path:plugins/autoenv",
+-		"# these should be at last!",
+-		"sindresorhus/pure",
+-		"zsh-users/zsh-syntax-highlighting",
+-		"zsh-users/zsh-history-substring-search",
+-	}
+-	sh, err := New(
+-		home,
+-		bytes.NewBufferString(strings.Join(bundles, "\n")),
+-		runtime.NumCPU(),
+-	).Bundle()
+-	require.NoError(t, err)
+-	require.Len(t, strings.Split(sh, "\n"), 31)
+-}
+-
+-// BenchmarkDownload-8   	       1	2907868713 ns/op	  480296 B/op	    2996 allocs/op v1
+-// BenchmarkDownload-8   	       1	2708120385 ns/op	  475904 B/op	    3052 allocs/op v2
+-func BenchmarkDownload(b *testing.B) {
+-	var bundles = strings.Join([]string{
+-		"robbyrussell/oh-my-zsh path:plugins/aws",
+-		"caarlos0/git-add-remote kind:path",
+-		"caarlos0/jvm",
+-		"caarlos0/ports kind:path",
+-		"",
+-		"# comment whatever",
+-		"caarlos0/zsh-git-fetch-merge kind:path",
+-		"robbyrussell/oh-my-zsh path:plugins/battery",
+-		"caarlos0/zsh-git-sync kind:path",
+-		"caarlos0/zsh-mkc",
+-		"caarlos0/zsh-open-pr kind:path",
+-		"robbyrussell/oh-my-zsh path:plugins/asdf",
+-		"mafredri/zsh-async",
+-		"rupa/z",
+-		"Tarrasch/zsh-bd",
+-		"",
+-		"Linuxbrew/brew path:completions/zsh kind:fpath",
+-		"wbinglee/zsh-wakatime",
+-		"zsh-users/zsh-completions",
+-		"zsh-users/zsh-autosuggestions",
+-		"robbyrussell/oh-my-zsh path:plugins/autoenv",
+-		"# these should be at last!",
+-		"sindresorhus/pure",
+-		"zsh-users/zsh-syntax-highlighting",
+-		"zsh-users/zsh-history-substring-search",
+-	}, "\n")
+-	for i := 0; i < b.N; i++ {
+-		home := home()
+-		_, err := New(
+-			home,
+-			bytes.NewBufferString(bundles),
+-			runtime.NumCPU(),
+-		).Bundle()
+-		require.NoError(b, err)
+-	}
+-}
+-
+ func TestHome(t *testing.T) {
+ 	h, err := Home()
+ 	require.NoError(t, err)
+diff --git a/bundle/bundle_test.go b/bundle/bundle_test.go
+index 9613197..83a9bda 100644
+--- a/bundle/bundle_test.go
++++ b/bundle/bundle_test.go
+@@ -9,49 +9,6 @@ import (
+ 	"github.com/stretchr/testify/require"
+ )
+ 
+-func TestSuccessfullGitBundles(t *testing.T) {
+-	table := []struct {
+-		line, result string
+-	}{
+-		{
+-			"caarlos0/jvm",
+-			"jvm.plugin.zsh\nfpath+=( ",
+-		},
+-		{
+-			"caarlos0/jvm kind:path",
+-			"export PATH=\"",
+-		},
+-		{
+-			"caarlos0/jvm kind:path branch:gh-pages",
+-			"export PATH=\"",
+-		},
+-		{
+-			"caarlos0/jvm kind:dummy",
+-			"",
+-		},
+-		{
+-			"caarlos0/jvm kind:fpath",
+-			"fpath+=( ",
+-		},
+-		{
+-			"docker/cli path:contrib/completion/zsh/_docker",
+-			"contrib/completion/zsh/_docker",
+-		},
+-	}
+-	for _, row := range table {
+-		row := row
+-		t.Run(row.line, func(t *testing.T) {
+-			t.Parallel()
+-			home := home(t)
+-			bundle, err := New(home, row.line)
+-			require.NoError(t, err)
+-			result, err := bundle.Get()
+-			require.Contains(t, result, row.result)
+-			require.NoError(t, err)
+-		})
+-	}
+-}
+-
+ func TestZshInvalidGitBundle(t *testing.T) {
+ 	home := home(t)
+ 	bundle, err := New(home, "does not exist")
+@@ -78,14 +35,6 @@ func TestZshInvalidLocalBundle(t *testing.T) {
+ 	require.Error(t, err)
+ }
+ 
+-func TestZshBundleWithNoShFiles(t *testing.T) {
+-	home := home(t)
+-	bundle, err := New(home, "getantibody/antibody")
+-	require.NoError(t, err)
+-	_, err = bundle.Get()
+-	require.NoError(t, err)
+-}
+-
+ func TestPathInvalidLocalBundle(t *testing.T) {
+ 	home := home(t)
+ 	bundle, err := New(home, "/asduhasd/asdasda kind:path")
+diff --git a/project/git_test.go b/project/git_test.go
+index b9983f8..c014be0 100644
+--- a/project/git_test.go
++++ b/project/git_test.go
+@@ -3,125 +3,8 @@ package project
+ import (
+ 	"io/ioutil"
+ 	"os"
+-	"path/filepath"
+-	"strings"
+-	"testing"
+-
+-	"github.com/stretchr/testify/require"
+ )
+ 
+-func TestDownloadAllKinds(t *testing.T) {
+-	urls := []string{
+-		"caarlos0/ports",
+-		"http://github.com/caarlos0/ports",
+-		"http://github.com/caarlos0/ports.git",
+-		"https://github.com/caarlos0/ports",
+-		"https://github.com/caarlos0/ports.git",
+-		"git://github.com/caarlos0/ports.git",
+-		"https://gitlab.com/caarlos0/test.git",
+-		// FIXME: those fail on travis:
+-		// "git@gitlab.com:caarlos0/test.git",
+-		// "ssh://git@github.com/caarlos0/ports.git",
+-		// "git@github.com:caarlos0/ports.git",
+-	}
+-	for _, url := range urls {
+-		home := home()
+-		require.NoError(
+-			t,
+-			NewGit(home, url).Download(),
+-			"Repo "+url+" failed to download",
+-		)
+-	}
+-}
+-
+-func TestDownloadSubmodules(t *testing.T) {
+-	var home = home()
+-	var proj = NewGit(home, "fribmendes/geometry")
+-	var module = filepath.Join(proj.Path(), "lib/zsh-async")
+-	require.NoError(t, proj.Download())
+-	require.NoError(t, proj.Update())
+-	files, err := ioutil.ReadDir(module)
+-	require.NoError(t, err)
+-	require.True(t, len(files) > 1)
+-}
+-
+-func TestDownloadAnotherBranch(t *testing.T) {
+-	home := home()
+-	require.NoError(t, NewGit(home, "caarlos0/jvm branch:gh-pages").Download())
+-}
+-
+-func TestUpdateAnotherBranch(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/jvm branch:gh-pages")
+-	require.NoError(t, repo.Download())
+-	alreadyClonedRepo := NewClonedGit(home, "https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-jvm")
+-	require.NoError(t, alreadyClonedRepo.Update())
+-}
+-
+-func TestUpdateExistentLocalRepo(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/ports")
+-	require.NoError(t, repo.Download())
+-	alreadyClonedRepo := NewClonedGit(home, "https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports")
+-	require.NoError(t, alreadyClonedRepo.Update())
+-}
+-
+-func TestUpdateNonExistentLocalRepo(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/ports")
+-	require.Error(t, repo.Update())
+-}
+-
+-func TestDownloadNonExistentRepo(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/not-a-real-repo")
+-	require.Error(t, repo.Download())
+-}
+-
+-func TestDownloadMalformedRepo(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "doesn-not-exist-really branch:also-nope")
+-	require.Error(t, repo.Download())
+-}
+-
+-func TestDownloadMultipleTimes(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/ports")
+-	require.NoError(t, repo.Download())
+-	require.NoError(t, repo.Download())
+-	require.NoError(t, repo.Update())
+-}
+-
+-func TestDownloadFolderNaming(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/ports")
+-	require.Equal(
+-		t,
+-		home+"/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports",
+-		repo.Path(),
+-	)
+-}
+-
+-func TestSubFolder(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "robbyrussell/oh-my-zsh path:plugins/aws")
+-	require.True(t, strings.HasSuffix(repo.Path(), "plugins/aws"))
+-}
+-
+-func TestPath(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "docker/cli path:contrib/completion/zsh/_docker")
+-	require.True(t, strings.HasSuffix(repo.Path(), "contrib/completion/zsh/_docker"))
+-}
+-
+-func TestMultipleSubFolders(t *testing.T) {
+-	home := home()
+-	require.NoError(t, NewGit(home, strings.Join([]string{
+-		"robbyrussell/oh-my-zsh path:plugins/aws",
+-		"robbyrussell/oh-my-zsh path:plugins/battery",
+-	}, "\n")).Download())
+-}
+-
+ func home() string {
+ 	home, err := ioutil.TempDir(os.TempDir(), "antibody")
+ 	if err != nil {
+diff --git a/project/project_test.go b/project/project_test.go
+index 88c82e3..2fd8a25 100644
+--- a/project/project_test.go
++++ b/project/project_test.go
+@@ -1,24 +1,12 @@
+ package project
+ 
+ import (
+-	"os"
+-	"path/filepath"
+ 	"runtime"
+ 	"testing"
+ 
+ 	"github.com/stretchr/testify/require"
+ )
+ 
+-func TestList(t *testing.T) {
+-	home := home()
+-	proj, err := New(home, "caarlos0/jvm branch:gh-pages")
+-	require.NoError(t, err)
+-	require.NoError(t, proj.Download())
+-	list, err := List(home)
+-	require.NoError(t, err)
+-	require.Len(t, list, 1)
+-}
+-
+ func TestListEmptyFolder(t *testing.T) {
+ 	home := home()
+ 	list, err := List(home)
+@@ -32,40 +20,6 @@ func TestListNonExistentFolder(t *testing.T) {
+ 	require.Len(t, list, 0)
+ }
+ 
+-func TestUpdate(t *testing.T) {
+-	home := home()
+-	repo, err := New(home, "caarlos0/ports")
+-	require.NoError(t, err)
+-	require.NoError(t, repo.Download())
+-	require.NoError(t, repo.Update())
+-}
+-
+-func TestUpdateHome(t *testing.T) {
+-	home := home()
+-	for _, tt := range []string{
+-		"caarlos0/jvm",
+-		"caarlos0/ports",
+-		"/tmp",
+-	} {
+-		tt := tt
+-		t.Run(tt, func(t *testing.T) {
+-			proj, err := New(home, tt)
+-			require.NoError(t, err)
+-			require.NoError(t, proj.Download())
+-			require.NoError(t, Update(home, runtime.NumCPU()))
+-		})
+-	}
+-}
+-
+ func TestUpdateNonExistentHome(t *testing.T) {
+ 	require.Error(t, Update("/tmp/asdasdasdasksksksksnopeeeee", runtime.NumCPU()))
+ }
+-
+-func TestUpdateHomeWithNoGitProjects(t *testing.T) {
+-	home := home()
+-	repo, err := New(home, "caarlos0/jvm")
+-	require.NoError(t, err)
+-	require.NoError(t, repo.Download())
+-	require.NoError(t, os.RemoveAll(filepath.Join(repo.Path(), ".git")))
+-	require.Error(t, Update(home, runtime.NumCPU()))
+-}
+-- 
+2.26.2
+
diff --git a/app-shells/antibody/files/antibody-6.1.1_remove-failing-tests.patch b/app-shells/antibody/files/antibody-6.1.1_remove-failing-tests.patch
new file mode 100644
index 000000000000..9c7f92b64de3
--- /dev/null
+++ b/app-shells/antibody/files/antibody-6.1.1_remove-failing-tests.patch
@@ -0,0 +1,422 @@
+From 0030445c7fef2c1fcf6701d77ee1e3400c044dea Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Mon, 19 Apr 2021 09:24:31 +0200
+Subject: [PATCH] Remove failing tests.
+
+Remove all tests which require network access. Unused imports  make the
+tests fail.
+---
+ antibodylib/antibody_test.go | 105 +------------------------------
+ bundle/bundle_test.go        |  59 ------------------
+ project/git_test.go          | 117 -----------------------------------
+ project/project_test.go      |  46 --------------
+ 4 files changed, 2 insertions(+), 325 deletions(-)
+
+diff --git a/antibodylib/antibody_test.go b/antibodylib/antibody_test.go
+index 752ca07..ea2d7ee 100644
+--- a/antibodylib/antibody_test.go
++++ b/antibodylib/antibody_test.go
+@@ -5,40 +5,11 @@ import (
+ 	"io/ioutil"
+ 	"os"
+ 	"runtime"
+-	"strings"
+ 	"testing"
+ 
+ 	"github.com/stretchr/testify/require"
+ )
+ 
+-func TestAntibody(t *testing.T) {
+-	home := home()
+-	bundles := []string{
+-		"# comments also are allowed",
+-		"caarlos0/ports kind:path # comment at the end of the line",
+-		"caarlos0/jvm kind:path branch:gh-pages",
+-		"caarlos0/zsh-open-pr     kind:zsh",
+-		"",
+-		"        ",
+-		"  # trick play",
+-		"/tmp kind:path",
+-	}
+-	sh, err := New(
+-		home,
+-		bytes.NewBufferString(strings.Join(bundles, "\n")),
+-		runtime.NumCPU(),
+-	).Bundle()
+-	require.NoError(t, err)
+-	files, err := ioutil.ReadDir(home)
+-	require.NoError(t, err)
+-	require.Len(t, files, 3)
+-	require.Contains(t, sh, `export PATH="/tmp:$PATH"`)
+-	require.Contains(t, sh, `export PATH="`+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports:$PATH"`)
+-	require.Contains(t, sh, `export PATH="`+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-jvm:$PATH"`)
+-	// nolint: lll
+-	require.Contains(t, sh, `source `+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-zsh-open-pr/git-open-pr.plugin.zsh`)
+-}
+-
+ func TestAntibodyError(t *testing.T) {
+ 	home := home()
+ 	bundles := bytes.NewBufferString("invalid-repo")
+@@ -47,80 +18,8 @@ func TestAntibodyError(t *testing.T) {
+ 	require.Empty(t, sh)
+ }
+ 
+-func TestMultipleRepositories(t *testing.T) {
+-	home := home()
+-	bundles := []string{
+-		"# this block is in alphabetic order",
+-		"caarlos0/git-add-remote kind:path",
+-		"caarlos0/jvm",
+-		"caarlos0/ports kind:path",
+-		"caarlos0/zsh-git-fetch-merge kind:path",
+-		"caarlos0/zsh-git-sync kind:path",
+-		"caarlos0/zsh-mkc",
+-		"caarlos0/zsh-open-pr kind:path",
+-		"mafredri/zsh-async",
+-		"rupa/z",
+-		"Tarrasch/zsh-bd",
+-		"wbinglee/zsh-wakatime",
+-		"zsh-users/zsh-completions",
+-		"zsh-users/zsh-autosuggestions",
+-		"",
+-		"robbyrussell/oh-my-zsh path:plugins/asdf",
+-		"robbyrussell/oh-my-zsh path:plugins/autoenv",
+-		"# these should be at last!",
+-		"sindresorhus/pure",
+-		"zsh-users/zsh-syntax-highlighting",
+-		"zsh-users/zsh-history-substring-search",
+-	}
+-	sh, err := New(
+-		home,
+-		bytes.NewBufferString(strings.Join(bundles, "\n")),
+-		runtime.NumCPU(),
+-	).Bundle()
+-	require.NoError(t, err)
+-	require.Len(t, strings.Split(sh, "\n"), 31)
+-}
+-
+-// BenchmarkDownload-8   	       1	2907868713 ns/op	  480296 B/op	    2996 allocs/op v1
+-// BenchmarkDownload-8   	       1	2708120385 ns/op	  475904 B/op	    3052 allocs/op v2
+-func BenchmarkDownload(b *testing.B) {
+-	var bundles = strings.Join([]string{
+-		"robbyrussell/oh-my-zsh path:plugins/aws",
+-		"caarlos0/git-add-remote kind:path",
+-		"caarlos0/jvm",
+-		"caarlos0/ports kind:path",
+-		"",
+-		"# comment whatever",
+-		"caarlos0/zsh-git-fetch-merge kind:path",
+-		"robbyrussell/oh-my-zsh path:plugins/battery",
+-		"caarlos0/zsh-git-sync kind:path",
+-		"caarlos0/zsh-mkc",
+-		"caarlos0/zsh-open-pr kind:path",
+-		"robbyrussell/oh-my-zsh path:plugins/asdf",
+-		"mafredri/zsh-async",
+-		"rupa/z",
+-		"Tarrasch/zsh-bd",
+-		"",
+-		"Linuxbrew/brew path:completions/zsh kind:fpath",
+-		"wbinglee/zsh-wakatime",
+-		"zsh-users/zsh-completions",
+-		"zsh-users/zsh-autosuggestions",
+-		"robbyrussell/oh-my-zsh path:plugins/autoenv",
+-		"# these should be at last!",
+-		"sindresorhus/pure",
+-		"zsh-users/zsh-syntax-highlighting",
+-		"zsh-users/zsh-history-substring-search",
+-	}, "\n")
+-	for i := 0; i < b.N; i++ {
+-		home := home()
+-		_, err := New(
+-			home,
+-			bytes.NewBufferString(bundles),
+-			runtime.NumCPU(),
+-		).Bundle()
+-		require.NoError(b, err)
+-	}
+-}
++// BenchmarkDownload-8			   1	2907868713 ns/op	  480296 B/op		2996 allocs/op v1
++// BenchmarkDownload-8			   1	2708120385 ns/op	  475904 B/op		3052 allocs/op v2
+ 
+ func TestHome(t *testing.T) {
+ 	h, err := Home()
+diff --git a/bundle/bundle_test.go b/bundle/bundle_test.go
+index 78c4b70..4c72d34 100644
+--- a/bundle/bundle_test.go
++++ b/bundle/bundle_test.go
+@@ -9,57 +9,6 @@ import (
+ 	"github.com/stretchr/testify/require"
+ )
+ 
+-func TestSuccessfullGitBundles(t *testing.T) {
+-	table := []struct {
+-		line, result string
+-	}{
+-		{
+-			"caarlos0/jvm",
+-			"jvm.plugin.zsh\nfpath+=( ",
+-		},
+-		{
+-			"caarlos0/jvm kind:path",
+-			"export PATH=\"",
+-		},
+-		{
+-			"caarlos0/jvm kind:path branch:gh-pages",
+-			"export PATH=\"",
+-		},
+-		{
+-			"caarlos0/jvm kind:dummy",
+-			"",
+-		},
+-		{
+-			"caarlos0/jvm kind:fpath",
+-			"fpath+=( ",
+-		},
+-		{
+-			"docker/cli path:contrib/completion/zsh/_docker",
+-			"contrib/completion/zsh/_docker",
+-		},
+-	}
+-	for _, row := range table {
+-		row := row
+-		t.Run(row.line, func(t *testing.T) {
+-			t.Parallel()
+-			home := home(t)
+-			bundle, err := New(home, row.line)
+-			require.NoError(t, err)
+-			result, err := bundle.Get()
+-			require.Contains(t, result, row.result)
+-			require.NoError(t, err)
+-		})
+-	}
+-}
+-
+-func TestZshInvalidGitBundle(t *testing.T) {
+-	home := home(t)
+-	bundle, err := New(home, "does not exist")
+-	require.NoError(t, err)
+-	_, err = bundle.Get()
+-	require.Error(t, err)
+-}
+-
+ func TestZshLocalBundle(t *testing.T) {
+ 	home := home(t)
+ 	// nolint: gosec
+@@ -79,14 +28,6 @@ func TestZshInvalidLocalBundle(t *testing.T) {
+ 	require.Error(t, err)
+ }
+ 
+-func TestZshBundleWithNoShFiles(t *testing.T) {
+-	home := home(t)
+-	bundle, err := New(home, "getantibody/antibody")
+-	require.NoError(t, err)
+-	_, err = bundle.Get()
+-	require.NoError(t, err)
+-}
+-
+ func TestPathInvalidLocalBundle(t *testing.T) {
+ 	home := home(t)
+ 	bundle, err := New(home, "/asduhasd/asdasda kind:path")
+diff --git a/project/git_test.go b/project/git_test.go
+index f238317..c014be0 100644
+--- a/project/git_test.go
++++ b/project/git_test.go
+@@ -3,125 +3,8 @@ package project
+ import (
+ 	"io/ioutil"
+ 	"os"
+-	"path/filepath"
+-	"strings"
+-	"testing"
+-
+-	"github.com/stretchr/testify/require"
+ )
+ 
+-func TestDownloadAllKinds(t *testing.T) {
+-	urls := []string{
+-		"caarlos0/ports",
+-		"http://github.com/caarlos0/ports",
+-		"http://github.com/caarlos0/ports.git",
+-		"https://github.com/caarlos0/ports",
+-		"https://github.com/caarlos0/ports.git",
+-		"git://github.com/caarlos0/ports.git",
+-		"https://gitlab.com/caarlos0/test.git",
+-		// FIXME: those fail on travis:
+-		// "git@gitlab.com:caarlos0/test.git",
+-		// "ssh://git@github.com/caarlos0/ports.git",
+-		// "git@github.com:caarlos0/ports.git",
+-	}
+-	for _, url := range urls {
+-		home := home()
+-		require.NoError(
+-			t,
+-			NewGit(home, url).Download(),
+-			"Repo "+url+" failed to download",
+-		)
+-	}
+-}
+-
+-func TestDownloadSubmodules(t *testing.T) {
+-	var home = home()
+-	var proj = NewGit(home, "fribmendes/geometry branch:master")
+-	var module = filepath.Join(proj.Path(), "lib/zsh-async")
+-	require.NoError(t, proj.Download())
+-	require.NoError(t, proj.Update())
+-	files, err := ioutil.ReadDir(module)
+-	require.NoError(t, err)
+-	require.True(t, len(files) > 1)
+-}
+-
+-func TestDownloadAnotherBranch(t *testing.T) {
+-	home := home()
+-	require.NoError(t, NewGit(home, "caarlos0/jvm branch:gh-pages").Download())
+-}
+-
+-func TestUpdateAnotherBranch(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/jvm branch:gh-pages")
+-	require.NoError(t, repo.Download())
+-	alreadyClonedRepo := NewClonedGit(home, "https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-jvm")
+-	require.NoError(t, alreadyClonedRepo.Update())
+-}
+-
+-func TestUpdateExistentLocalRepo(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/ports")
+-	require.NoError(t, repo.Download())
+-	alreadyClonedRepo := NewClonedGit(home, "https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports")
+-	require.NoError(t, alreadyClonedRepo.Update())
+-}
+-
+-func TestUpdateNonExistentLocalRepo(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/ports")
+-	require.Error(t, repo.Update())
+-}
+-
+-func TestDownloadNonExistentRepo(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/not-a-real-repo")
+-	require.Error(t, repo.Download())
+-}
+-
+-func TestDownloadMalformedRepo(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "doesn-not-exist-really branch:also-nope")
+-	require.Error(t, repo.Download())
+-}
+-
+-func TestDownloadMultipleTimes(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/ports")
+-	require.NoError(t, repo.Download())
+-	require.NoError(t, repo.Download())
+-	require.NoError(t, repo.Update())
+-}
+-
+-func TestDownloadFolderNaming(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "caarlos0/ports")
+-	require.Equal(
+-		t,
+-		home+"/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports",
+-		repo.Path(),
+-	)
+-}
+-
+-func TestSubFolder(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "robbyrussell/oh-my-zsh path:plugins/aws")
+-	require.True(t, strings.HasSuffix(repo.Path(), "plugins/aws"))
+-}
+-
+-func TestPath(t *testing.T) {
+-	home := home()
+-	repo := NewGit(home, "docker/cli path:contrib/completion/zsh/_docker")
+-	require.True(t, strings.HasSuffix(repo.Path(), "contrib/completion/zsh/_docker"))
+-}
+-
+-func TestMultipleSubFolders(t *testing.T) {
+-	home := home()
+-	require.NoError(t, NewGit(home, strings.Join([]string{
+-		"robbyrussell/oh-my-zsh path:plugins/aws",
+-		"robbyrussell/oh-my-zsh path:plugins/battery",
+-	}, "\n")).Download())
+-}
+-
+ func home() string {
+ 	home, err := ioutil.TempDir(os.TempDir(), "antibody")
+ 	if err != nil {
+diff --git a/project/project_test.go b/project/project_test.go
+index 88c82e3..2fd8a25 100644
+--- a/project/project_test.go
++++ b/project/project_test.go
+@@ -1,24 +1,12 @@
+ package project
+ 
+ import (
+-	"os"
+-	"path/filepath"
+ 	"runtime"
+ 	"testing"
+ 
+ 	"github.com/stretchr/testify/require"
+ )
+ 
+-func TestList(t *testing.T) {
+-	home := home()
+-	proj, err := New(home, "caarlos0/jvm branch:gh-pages")
+-	require.NoError(t, err)
+-	require.NoError(t, proj.Download())
+-	list, err := List(home)
+-	require.NoError(t, err)
+-	require.Len(t, list, 1)
+-}
+-
+ func TestListEmptyFolder(t *testing.T) {
+ 	home := home()
+ 	list, err := List(home)
+@@ -32,40 +20,6 @@ func TestListNonExistentFolder(t *testing.T) {
+ 	require.Len(t, list, 0)
+ }
+ 
+-func TestUpdate(t *testing.T) {
+-	home := home()
+-	repo, err := New(home, "caarlos0/ports")
+-	require.NoError(t, err)
+-	require.NoError(t, repo.Download())
+-	require.NoError(t, repo.Update())
+-}
+-
+-func TestUpdateHome(t *testing.T) {
+-	home := home()
+-	for _, tt := range []string{
+-		"caarlos0/jvm",
+-		"caarlos0/ports",
+-		"/tmp",
+-	} {
+-		tt := tt
+-		t.Run(tt, func(t *testing.T) {
+-			proj, err := New(home, tt)
+-			require.NoError(t, err)
+-			require.NoError(t, proj.Download())
+-			require.NoError(t, Update(home, runtime.NumCPU()))
+-		})
+-	}
+-}
+-
+ func TestUpdateNonExistentHome(t *testing.T) {
+ 	require.Error(t, Update("/tmp/asdasdasdasksksksksnopeeeee", runtime.NumCPU()))
+ }
+-
+-func TestUpdateHomeWithNoGitProjects(t *testing.T) {
+-	home := home()
+-	repo, err := New(home, "caarlos0/jvm")
+-	require.NoError(t, err)
+-	require.NoError(t, repo.Download())
+-	require.NoError(t, os.RemoveAll(filepath.Join(repo.Path(), ".git")))
+-	require.Error(t, Update(home, runtime.NumCPU()))
+-}
+-- 
+2.26.3
+
diff --git a/app-shells/antibody/metadata.xml b/app-shells/antibody/metadata.xml
index 7cf1ac1fff23..7dfacfef7de2 100644
--- a/app-shells/antibody/metadata.xml
+++ b/app-shells/antibody/metadata.xml
@@ -2,10 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>toffanin.mauro@gmail.com</email>
-  <name>Mauro Toffanin</name>
-  <description>Maintainer. Assign bugs to him</description>
+  <email>gentoo@tastytea.de</email>
+  <name>Ronny (tastytea) Gutbrod</name>
  </maintainer>
+ <longdescription lang="en">
+		Antibody is fast because it can do things concurrently, while Antigen
+		does it sequentially. It also has the advantage of using a compiled
+		language instead of a scripting one.
+	</longdescription>
  
- <origin>go-overlay</origin>
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/app-shells/powerline-go/Manifest b/app-shells/powerline-go/Manifest
index eaab47262ff6..52b43b61015d 100644
--- a/app-shells/powerline-go/Manifest
+++ b/app-shells/powerline-go/Manifest
@@ -1,6 +1,68 @@
-DIST github.com-go-yaml-yaml-d670f94.tar.gz 64859 BLAKE2B 211e51960673e78e9c802357dffb550c6d59692203040b2f3d0bc9ab15f8bf5ee479918a782931238e230f36f4c77228a44632883486370f0fb9266d8b2c7c14 SHA512 daa9d622d4b717ce54af884e1f5548d7ead93486d322f808bc6cf291011a5c418d33b464fd66161bef8c18da759aa1c6182b36fb2210c5f026110776e2195ac5
-DIST github.com-golang-crypto-1875d0a.tar.gz 1446908 BLAKE2B 98e01a121a279b938cbf36eab57f19eecf0dc3627b42aafe634d32508e12ff8c919a517d26041144253f112d1bbd821686c3826808273ea48750e2ca3e36b743 SHA512 3e19787b0a7b235d337feac63971563d65b9dba75960c3f816237cb81316b550621230766ec4c8a538252593c8ea6c493a15fce62ff9d69b936c23501ccaa329
-DIST github.com-golang-sys-37707fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6
-DIST github.com-golang-text-c4d099d.tar.gz 6032701 BLAKE2B 0b719bf379a8af44ff82ce146549d6781c5f772b9704ef0a0fc623866ba15aca2e11ba54873e37c01b8e65d589e1ba5e79e0bb23e6d24c1b3c30a9975d55c262 SHA512 c67ce44326ce64ecd6a401cbb63e5d469ab351999e46eac4c963ce285693b0163d9cd37d0ac5e9fec708df151133e69cd6cc6189e8debcd172b80ee62c12694a
-DIST github.com-mattn-go-runewidth-9e777a8.tar.gz 22390 BLAKE2B 20b6793a424d2620e5ce57fad619e86e7bf251ad612322132939c3c53eeaa17c1a100aa75888209975c05e4c7f1ec099ac4c51b61f4fdd62a42d2e506c4f5b75 SHA512 85430512b8c199e7e2ae4bfa77aef58958211bf85148ea439cf26ffc30704d3bbbe21e1525df579a65e0262c7f8780ff0ec345fb76907f4c66bf715f10ff6e12
-DIST powerline-go-1.8.2.tar.gz 123629 BLAKE2B 58c3d4c13b4ca99ff7b4a6ccb84810727fd1932920c03e65fc9eaa17f3de2e874d6a339d84a6b1295d667da2d5f046432cb58a83c53d661f6009333719d1febe SHA512 3fe91a1b28b4c2a49ce05e38b47506137c373e7faf19f416515b2208f7442a9a3c804c6c5ecb12610d619342242723d990470fadb855e46ff4827537c712c172
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip 14905 BLAKE2B 9aa626472e6bebbcb1d454f892ebf3c5f953ccf952e6ca7e60715211d418ab9c8d54832f9949824702278cd753758425dda72867e61ece209da688196d13d2ef SHA512 82818b2eb7e8f7265b814f202c420e5a187fd5e9a43536a062715e1a3d1d5717acc8d2daeb1f678dd13bf5703545309ad9d4b4e78fbb6e9befd9bb7370ddaa3b
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip 60546 BLAKE2B e775860f49c6ee09a6c48902d38fdf5d2d77af4cd405d8d303902170e46493301d4aa873a48b4d12a16d92dafaa65290de1fd3a42545025fbfc82f15a3881e8d SHA512 53dc5484f488ae1f8d0eb672c3431bbf9fce33dfcee83dda7929103e3650559cf703f601716984a640422f01cc640860dba0b47e16aef04d0d2452a266fefbf9
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod 41 BLAKE2B 62bb3af3f58b23321cc389ceca36d28e4f32cb1470b6c54c4af55ef927ba84284858765b5b333c3bbdb042826550fe4f0d22022078e2b34e340098465e21f3e8 SHA512 1e8d650a965637bd0974b8f42e207155dd1bac307e9ecf4d294cb4ee0f1c694276062d46318d113326b9c1bfdc379a7d8b8fa2c18e4a08ed9baefcae67db88d2
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip 79799 BLAKE2B 1677e3977fcf1499a1d6d3b0dda2f990b12a9f5464ff8a7aca6752951b395038ea2e3a38224d24eff0e6df6a2cc92f5da47daef9ceb237433bd2370d70eb7737 SHA512 9a67b0101fc1afba75179246e1498c41254d8379f78ef65877166bf9a5b7f7ac9e29f270e9186f13a26891389ab4e9ef309c4e90b2e79bffc3ade49e39fe2af1
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6.mod 102 BLAKE2B c096713531ccc3c357cf951e296fa6d4cb5619a408f24097f6d61db1610a7940704e913387b051f0d7cea97b950f87d1d659b2de94942d4b6b7eeb90fba8e7e6 SHA512 8ecc75e46e529812efc2e20f6bbc044929aaeba393c291fbde9b3c9365db5c4e7c06b07dc2b4484326609521eb09cb55ab6f9d8976fe1450bf4f52a962a35429
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6.zip 82876 BLAKE2B ce104d907f878a396daa33fb5ce93ccd7e12b40ae38780eb281a3160823d3393af6ac0f54bd22bcb6bf87b6a3ad4278444333ae8fbe9099ce614d3613006847f SHA512 dfed3d9e05657f05a59bddb005ce040364f0a7aa49cadb8b0179ccc59bcc11df920d7795ed3524d3fa6d5c26fb577b0be66cb96c7387fc006bcc82f7797b272b
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip 132988 BLAKE2B 48845d9df9bc0766f93a141ddc1989fcf850d76273824d62ee11297774703bed33b1dcbe77817b6eb417769ed11249d8089d248631a8c6669a75a6d34e048653 SHA512 22df4fc49c44a1e73eb72295195633bc04b67fda27df452893ae77932879b62b344455b880972e78022a61dafb30eba8b5b6a872f6c66e093323fd5d1c086466
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.7.mod 106 BLAKE2B 24d2d7974198d1bb1f72d7048091d63ed28addbdc9a128b8a20e7b66f2a437f452c3d7621fcb015218932a2e10c29d0f4d3db0339e97ec2eeebcdd7a8cec7220 SHA512 731d289da30616cc638958da98fbaed6eba9cd7b325c845bafa8f8a316c5fbfdf2eada196a0e25a50512c18d2a6aaa771d63cec0d42a25e9c8a2c7bc3d3f1cb3
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.7.zip 132348 BLAKE2B 14bcdcadac7af94432cb33dbef2b4a33d46d98d9653fd43eef36ccd73c1617fd9fca910bf2ec03bd17e27182a831c52d6a0baa0821b3be5af8499f4a2b39ea21 SHA512 60e409c8210c4accc315004a674a397c4aa1d0fa150627756047ca3e87cbed4dd78509e76a490f7cd6989760ac0ad71fe8c712dfbf9009070a110290c2cb3126
+DIST github.com%2Flufia%2Fplan9stats%2F@v%2Fv0.0.0-20211012122336-39d0f177ccd0.mod 85 BLAKE2B a658955e102a81023bffa2ccd9e839359df45a6dc6b0c4717996b4d37a34142581ba2ad1fb64f1598a3996cd51272627903d17bc1699531b31bf70a3dd789332 SHA512 62129426bd2ab5adf804deaba8fa493c7907315b2111cf6ef4b531b5b118108fafa4b167f516faf636564172a0c0742d4d02579a477e6024547235d244decd67
+DIST github.com%2Flufia%2Fplan9stats%2F@v%2Fv0.0.0-20211012122336-39d0f177ccd0.zip 22715 BLAKE2B b6546d08d79f8104cd5f387d66d3f0d3b423f9cf0bc961c8908682a180824d415f0e038b7169049b022ae6fd7056bf59f61fd7d2d8b42ce6bf651b50df84396c SHA512 a401a89d2fb3ac61a3ee111c08d56d13ae119ec1339fcaca118e783c355dbbdbcb62b4af5e844ec710d53091f293899fcf08c167f73d78307ec6e3bc865e80fa
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fpower-devops%2Fperfstat%2F@v%2Fv0.0.0-20210106213030-5aafc221ea8c.mod 110 BLAKE2B 9de4d008cc21431aab57c25c65969fa5f0617caf8970e19731bb420c4485514f4d6061447102631adcf871e4c107c6918d9010fc4cbecb27ca6c345918f24d4c SHA512 35009ce4df916ef8ed7d32fe2fc4059623021ce512140546e731facdd2cce7ea26e33e3a0b65b9c087f8201cdd3bb185a38ebeb690cecd9b32ffb01f72a2f43d
+DIST github.com%2Fpower-devops%2Fperfstat%2F@v%2Fv0.0.0-20210106213030-5aafc221ea8c.zip 50352 BLAKE2B 456023e50555739ef4ac4e57aefffe033e51bfa7490b14533d949a4919af4911c1683834b445b1fb6de3a49f736cde6b7d875945dbddb4adba04dbcde7c19594 SHA512 b092a2231d4671b0352ce9a2abb49b6b5edcba4cbd9a7374bfe45606acb1ec723bd8d4a972b47b144a4d032321f4e459b9f00eb145d2ccc873b206fe44ac7745
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.zip 246866 BLAKE2B 7a04d3133b83fc5d014c0237b055b87726c109490e1afd0b9fd3000d1a318f80f4431c13fb9b5eca049bf640cb0fa404c2537cee2b4bcd7b45a0f6544ffb0f0c SHA512 6f726977ccd96c339a401e5a690f81a63e9049373d275b773e0a1cb9d8a2b53644eb204981fc3a81454000f9a7e152672ebc88a516c8cd193bed8844615ebc1e
+DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.22.3.mod 390 BLAKE2B dd565a424ec4447d887340f2f0e9b1d661ada978fe2ecfc9c29dbf9e46427190e248b39104b5673602aca120dbbb5aaba1eebea25566a4cbf2b6a1ad06e3416a SHA512 2d48f39947ef813e93401abfd43dda526df80710cc70d751bdc2ad2dc353b1e274e182ecf0f7a610b9ab53f89e408a08a1113bfdccf286f5889dc934601b30f2
+DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.22.3.zip 282201 BLAKE2B 496b585bc98c40429b6b944e017b0f3a96372606165b862074452445366994bce613b70d73a17acbfd380b7d446ac092cb8327174f8de404ddf752a50de7a2f5 SHA512 fe3b3357006fdc6f8a6970a739fa40a886b2517d44e3d3694fbe87f366966eb704e49c91a832014623fb677104474e325a5973036a0d5319d7eef22587308013
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 34637 BLAKE2B 9e26766ed5717903173455e60ee1b690779e286b6be3cc22f633ccf26592839d149f813a1b92775ab2a447f0c1a20960f956fe5aa4a7c56abc6642b58b7973e3 SHA512 968b76a138261cfee0d1f58ede483741328968e24d073b24affdc7ab9cbf9bb76dd9fa1785423c49471c02ea4804810ebe673bc623c4f72389b2654a64a565e1
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.1.zip 110051 BLAKE2B c6e41ff9819d6c9b2fe1ffe6f949a7c913f70f2859ea9af413d62cea8ce448b118af78d79cd984186551b7164d389050a058afcc8d8e80a830d215eab5a09e34 SHA512 acd43e873a2be812e1c5eb38ce418c1aeed1fcce2bd227524e1d9f6c95b036e69468c06b413db042bae0a31b2f2d35e194461fabd0ca4c58f04fa2d17f1128c4
+DIST github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.10.mod 149 BLAKE2B 83882249786146dcc2d8515210b0ec85074f636ad17ad156c39a06942f5b4254ea79db18b3ff4c7c7bcb338d338fcae8a871de8204723cd24952d6991a7ab89e SHA512 5a2f57d25108b6287bd8c567002955a8ee9ddd096e14b15255173c9484e1504a2d55148e1c6fc036bd803d451337eb73a5e142e70296ec2e5595f9c0edb21608
+DIST github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.10.zip 94228 BLAKE2B e9788e9f7308dc67d118b87627e297e13bba3a113dbccc9497db909d3bac7406c41a1838a6c093955f12c8690fd3c1019773b0e1091280d7d4b3c759e319dc07 SHA512 f7d3e460f174070d995ba223ff645af4afbc8a787749abdd657fb960b5ab6911e842e0a16465bb2c696de35e6ca6679759b9add2d979bef8cea822412722ed97
+DIST github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.4.0.mod 105 BLAKE2B c0aa71e5ce8ee0bcdc742866e0bcc4999c58d6f752900efe2dfbf6481e4e4a9b4cdc967cde305201a696fdfb72b6be4bc3ae2e9f1b481412841651a51a2c9e47 SHA512 68847f8779d1ce66a597a15ce9fb888d475df7b5d60b3e555a709264705e6dc9eaef793b61c058c86e3baaede07e4025b4e28889fa556920149cf949413b359c
+DIST github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.4.0.zip 16524 BLAKE2B 7302a26c6de5099d145c99d7a2575783e29d9dc5db3408fae6a141f97f6fa478c641a3b2905ddcd243ad99c42429f86462f91697d0acd1f5c15a86ddac963f22 SHA512 d2cc437615ff4e8e906f7d953bd0761962a55e46d5f80d29a931a5199b0d31957989bb40e6db6ed12b57fc02b24360090242ced8f0f9ba7d04c14f8976031c63
+DIST github.com%2Fyusufpapurcu%2Fwmi%2F@v%2Fv1.2.2.mod 85 BLAKE2B 5d78d97039585047c65e37810372e11b47da9c5ebfc366f8cd3d57a6a7255f7e74cf2893a495e8da27232b95b7088d525ded4440bad0d2f48f6a40c3036e73e8 SHA512 beb9936bc36ed6f2b3378fa4d688879040af43957a998af83cc26e37e57d5d8f905c1fc92f2ebc6889cc0dfd4dd0784dbf1071ae417e37f0af359014f888655e
+DIST github.com%2Fyusufpapurcu%2Fwmi%2F@v%2Fv1.2.2.zip 16087 BLAKE2B 90a51af7109347248d41ee15b74fa6b494695a6fba1dfd99e33c172705ea78413c4ffc907e6ebc1815318f1de46eebf2bd2d8a7303301359002c0342f5445d51 SHA512 cbf40294e295714e3af6ccbd4090254e3078635e4c8d13615646e6d7e905f9315c1a2151aab0f4f0beff53ef81ee9a61934790ecd63bb9e4705d1c000fbde486
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip 1864231 BLAKE2B a7261951977aa8143153915d72e608ef263a760de7b4977a11d0d2ead32f88ad370b993ada6344556616343a700a93edce3294df354f93d51214cfe888b97836 SHA512 1b7237562a92560aedb2527d8242b46c5a421488f638c0049812ceed87144828ca682bc4eeb87869db947479ac9e1350e5abbd31e1ff3e53734d4ea25bf5c27d
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.zip 1837462 BLAKE2B ae87037c165e15d3a17fb2c37b59faec2af12dc9653ab4bc504f8a283679d7599704980971e8d0d43235b723f67fa8ae3d5f6005dba6073930f4731859f17416 SHA512 a5fd196d6476e16cc864616cfeb62d29a96e1132e181a261940639918fb4a8452cd473878bd8fad8ce5b269d3466657b5aa2e7771e02591f999e98eb81b55957
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip 1867927 BLAKE2B bd890b16f2adb601f5655ca3f4815bbb335fe48c961b06f316ec579ff6efa2fc8f360d7c0bf272dc2d35e9a0470235c36cee331399ed01d8c455172f39921194 SHA512 59a4db96e438a1f03af9b00070f4d3772f1eeeff72334e6bc8ad1774bf202d39f7129572cd75fb9e1ecdfc7a532c5cd91bfdbfab3ebd10228bc6733e9556f70c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201204225414-ed752295db88.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201204225414-ed752295db88.zip 1526726 BLAKE2B 925407c90e9596006054cf2682153a06e41aa3ee21f64e2fcdbea4fea8c68785c4d7997398ee5bd3b369d3e76e60f2d971bda2f669af05cb9569e0661d239775 SHA512 c7ef93c2577c0423e952982d0cca1e2266cb0c4689d136f5d887df088ee56d73eee08ae2244a131b15deb17c2036d169de74111263a7dda7bfe92c6507d8f6b5
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210105210732-16f7687f5001.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210105210732-16f7687f5001.zip 1533792 BLAKE2B a583d3313ec93610839250754492a58cb5c719b48ef39d9770c4d595fed0ac44741aaac2290c6f9c78a9cf56ba744e18c911c8a896797b35c483bce32cf2ef30 SHA512 eb3e1a92a15e8063ddf5609d69db8624a445bbda6480672bd3595e4e62bc1744de67eb7afa86b9fdf5d331ba1066942821aa3cffab749ac669b8c4df4de9ddbe
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220128215802-99c3d69c2c27.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220128215802-99c3d69c2c27.zip 1702819 BLAKE2B 91e64d4d0a0954811f723849190a36b785932fc128b8f654e27b948b4422fad527b10ece4e198f76c1968f4dad55e96200161833cf4042a331f79b89c2bdcd03 SHA512 73e4190109fc29a23394a00849d96f97fd11b4857e7dbf35a9cc0faf612288c47a36d60e4d403c6774bcef218117b446563afd3b4f5acb9cf360f7a2c2209526
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip 23282 BLAKE2B 9bfaf8ea78b49038403d7a49abdfa9ab6cfc4fc2d71e693a15368da8cbdcd99437898f72f8a240ec7484a7f2a11405258e4cd17bab00aaaed291e2a1d1566e3f SHA512 fa88149897dd4470a7e36683de33db945e219819ce74f39f384cad03db8fd6829d47e2711dec895fafa7aa24d576dffc7cb8594a499cb1e66abeada196d502be
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip 8605233 BLAKE2B 3e9c66a40249df3915ab9de2a8de2ae0b92e4f7d645f9753e66e585ebaf86992484fcb933510b3400595182e9bc667434894697953d7078bf43f617f5ea1905d SHA512 26d09376646c1e7d99581f0fe03ea109b00879dc351996f77e6442b0fd72817d056f630a56cc167014acb55532baa4be5437bf40b4a933cfe450854c618b3508
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.zip 2687668 BLAKE2B 1ffe42e6dc739c35e8c1098ced3058ba57a8bc584325010c21080bcfd29c3dd7f15e156bef3f2aeb10cfbb38aa432c757682e2260b129fba4e3478fe96d8e850 SHA512 4312878e308561593166cefcae3119e6c4ef9460edbb0a799cac0bd2f992528ffb26fb6d25f05f2ba5e39c47b4ce65f174258db36ef966c6bf5dad2e01d2578a
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.66.4.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.66.4.zip 71583 BLAKE2B 3f86181e263d5d7c421a1f51b45bb68182cd61bca0365942ddc3a42df92425bbfa0763089323c2b57cda0398c160364eba0fbe999021b9594cf630206001103b SHA512 7f6efb9fb3804a84295ca653677e9a05b89456300922e66c81d89c863c69b89f6ae1e1954120da7eee79c06cb3c2f8885644cd70c51f38a501fccacbb0a5e73d
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
+DIST powerline-go-1.21.0.tar.gz 145144 BLAKE2B f9194f8eb68d26f481c4a333b99dc4ba7b296fd5ab943d46da684f17c9765e08bb2cb67c3e97d2979da07af0a57291a33db97167be72a7fdee7b69f294c22112 SHA512 dbb816abcc26c1fef154a3cf408164641a3c7c3e2ef7f457a0b5c1832f20f5e2a1a1e845b7bf0f24016a93e48f61e2dc4f668fb22423aec6c79c1e99799bef79
+DIST powerline-go-1.22.1.tar.gz 140398 BLAKE2B 63f94539c366aafc0f0ce00bf37c5019957d93fa1c759bd2b49758d5fef67fc13c3d1d2a5a741f434220f5843c7393c368876e564bd8c367047a36e6eaf89104 SHA512 f1404ac73f16cfc6f71ed1e7d3a630d04480d80d5602df92a58d6a925c9047c1e738ece1734b19fabe89ba6e99f338aaf85b70b23607bc19027eed1c9a1975e0
diff --git a/app-shells/powerline-go/metadata.xml b/app-shells/powerline-go/metadata.xml
index 7cf1ac1fff23..2f5f27ceb7ae 100644
--- a/app-shells/powerline-go/metadata.xml
+++ b/app-shells/powerline-go/metadata.xml
@@ -2,10 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>toffanin.mauro@gmail.com</email>
-  <name>Mauro Toffanin</name>
-  <description>Maintainer. Assign bugs to him</description>
+  <email>egorr.berd@gmail.com</email>
+  <name>Yahor Berdnikau</name>
  </maintainer>
  
- <origin>go-overlay</origin>
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/app-shells/powerline-go/powerline-go-1.21.0.ebuild b/app-shells/powerline-go/powerline-go-1.21.0.ebuild
new file mode 100644
index 000000000000..e64811f9251b
--- /dev/null
+++ b/app-shells/powerline-go/powerline-go-1.21.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+	"github.com/go-ole/go-ole v1.2.4"
+	"github.com/go-ole/go-ole v1.2.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/shirou/gopsutil v3.20.12+incompatible"
+	"github.com/shirou/gopsutil v3.20.12+incompatible/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad"
+	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20210105210732-16f7687f5001"
+	"golang.org/x/sys v0.0.0-20210105210732-16f7687f5001/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.4"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="A powerline like prompt for Bash, Zsh, Fish written in Go lang. "
+HOMEPAGE="https://github.com/justjanne/powerline-go"
+SRC_URI="https://github.com/justjanne/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		${EGO_SUM_SRC_URI}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DOCS=(README.md)
+
+src_compile() {
+	go build -o release/powerline-go . || die
+}
+
+src_install() {
+	dobin release/powerline-go
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog 'Check installed documentation to how-to add this to the shell prompt'
+}
diff --git a/app-shells/powerline-go/powerline-go-1.22.1.ebuild b/app-shells/powerline-go/powerline-go-1.22.1.ebuild
new file mode 100644
index 000000000000..f1463116738a
--- /dev/null
+++ b/app-shells/powerline-go/powerline-go-1.22.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+EGO_SUM=(
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/shirou/gopsutil/v3 v3.22.3"
+	"github.com/shirou/gopsutil/v3 v3.22.3/go.mod"
+	"github.com/davecgh/go-spew v1.1.0"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/stretchr/objx v0.1.0"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"github.com/tklauser/numcpus v0.4.0"
+	"github.com/tklauser/numcpus v0.4.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.6"
+	"github.com/go-ole/go-ole v1.2.6/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"github.com/google/go-cmp v0.5.7"
+	"github.com/google/go-cmp v0.5.7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0"
+	"github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod"
+	"github.com/google/go-cmp v0.5.6"
+	"github.com/google/go-cmp v0.5.6/go.mod"
+	"github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c"
+	"github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod"
+	"golang.org/x/sys v0.0.0-20201204225414-ed752295db88"
+	"golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod"
+	"github.com/stretchr/testify v1.7.1"
+	"github.com/stretchr/testify v1.7.1/go.mod"
+	"github.com/tklauser/go-sysconf v0.3.10"
+	"github.com/tklauser/go-sysconf v0.3.10/go.mod"
+	"github.com/yusufpapurcu/wmi v1.2.2"
+	"github.com/yusufpapurcu/wmi v1.2.2/go.mod"
+	"golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27"
+	"golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/text v0.3.4"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"gopkg.in/ini.v1 v1.66.4"
+	"gopkg.in/ini.v1 v1.66.4/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="A powerline like prompt for Bash, Zsh, Fish written in Go lang. "
+HOMEPAGE="https://github.com/justjanne/powerline-go"
+SRC_URI="https://github.com/justjanne/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		${EGO_SUM_SRC_URI}"
+
+LICENSE="GPL-3 MIT Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DOCS=(README.md)
+
+src_compile() {
+	go build -o release/powerline-go . || die
+}
+
+src_install() {
+	dobin release/powerline-go
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog 'Check installed documentation to how-to add this to the shell prompt'
+}
diff --git a/app-shells/powerline-go/powerline-go-1.8.2.ebuild b/app-shells/powerline-go/powerline-go-1.8.2.ebuild
deleted file mode 100644
index ddc8fc8ce943..000000000000
--- a/app-shells/powerline-go/powerline-go-1.8.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Go Overlay Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GOLANG_PKG_IMPORTPATH="github.com/justjanne"
-GOLANG_PKG_ARCHIVEPREFIX="v"
-
-GOLANG_PKG_DEPENDENCIES=(
-	"github.com/mattn/go-runewidth:9e777a8" #v0.0.2
-	"github.com/golang/crypto:1875d0a -> golang.org/x"
-	"github.com/golang/sys:37707fd -> golang.org/x"
-	"github.com/golang/text:c4d099d -> golang.org/x" #v0.2.0
-	"github.com/go-yaml/yaml:d670f94 -> gopkg.in/yaml.v2"
-)
-
-inherit golang-single
-
-DESCRIPTION="A beautiful and useful low-latency prompt for your shell"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 arm"
diff --git a/app-text/docx2txt/docx2txt-1.4.ebuild b/app-text/docx2txt/docx2txt-1.4.ebuild
index 79c4b4945a1b..5b437b5ef590 100644
--- a/app-text/docx2txt/docx2txt-1.4.ebuild
+++ b/app-text/docx2txt/docx2txt-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 
 RDEPEND="app-arch/unzip
 	dev-lang/perl"
diff --git a/dev-db/mongodb/files/mongodb-5.0.5-boost-1.81-extra.patch b/dev-db/mongodb/files/mongodb-5.0.5-boost-1.81-extra.patch
new file mode 100644
index 000000000000..af83692d16d2
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-5.0.5-boost-1.81-extra.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/889020
+--- a/src/mongo/util/boost_assert_shim.cpp
++++ b/src/mongo/util/boost_assert_shim.cpp
+@@ -31,6 +31,7 @@
+ 
+ #if defined(BOOST_ENABLE_ASSERT_DEBUG_HANDLER) && !defined(NDEBUG)
+ 
++#include <exception>
+ #include <boost/assert.hpp>
+ 
+ namespace mongo {
diff --git a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
index cdc6a28e3c99..e0205121ab5a 100644
--- a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.0.2-boost-1.79.patch"
 	"${FILESDIR}/${PN}-5.0.5-no-force-lld.patch"
 	"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
+	"${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/aml/aml-0.2.2.ebuild b/dev-libs/aml/aml-0.2.2.ebuild
index 38bd786dd4e5..5065891a44b1 100644
--- a/dev-libs/aml/aml-0.2.2.ebuild
+++ b/dev-libs/aml/aml-0.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/any1/aml.git"
 else
 	SRC_URI="https://github.com/any1/aml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86"
 fi
 
 LICENSE="ISC"
diff --git a/dev-libs/libedit/libedit-20221030.3.1.ebuild b/dev-libs/libedit/libedit-20221030.3.1.ebuild
index c7a6330960c0..07148012caf5 100644
--- a/dev-libs/libedit/libedit-20221030.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20221030.3.1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/dev-libs/tlsh/tlsh-4.8.2.ebuild b/dev-libs/tlsh/tlsh-4.8.2.ebuild
index 6b964ea89a55..dc63ec1c565a 100644
--- a/dev-libs/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-libs/tlsh/tlsh-4.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/trendmicro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gnuinstalldirs.patch
diff --git a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild
index 82c00e44902c..d4ea18983836 100644
--- a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild
+++ b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Wrap OP check callbacks"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild b/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
index fb625dc1b940..ca4a3d8f17e6 100644
--- a/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
+++ b/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="|| ( AFL-3.0 AGPL-3 APL-1.0 Apache-2.0 BSD-2 Boost-1.0 CDDL CPAL-1.0
 	QPL-1.0 OFL-1.1 Sleepycat Watcom-1.0 W3C wxWinLL-3 ZLIB libpng
 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-Abstract/Email-Abstract-3.9.0.ebuild b/dev-perl/Email-Abstract/Email-Abstract-3.9.0.ebuild
index 0ca36e0ce3d3..e16b705dd54a 100644
--- a/dev-perl/Email-Abstract/Email-Abstract-3.9.0.ebuild
+++ b/dev-perl/Email-Abstract/Email-Abstract-3.9.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="unified interface to mail representations"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild b/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
index 00f26e9e689b..bf9b2ad47177 100644
--- a/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
+++ b/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and format RFC 2822 email addresses and groups"
 
 LICENSE="|| ( Artistic GPL-1+ ) MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild b/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild
index 374ecc817fe6..488e7ef55ddc 100644
--- a/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild
+++ b/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="RFC 2822 Address Parsing and Creation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Email-Date-Format/Email-Date-Format-1.5.0-r1.ebuild b/dev-perl/Email-Date-Format/Email-Date-Format-1.5.0-r1.ebuild
index 32cf5040686f..34365ef3c72e 100644
--- a/dev-perl/Email-Date-Format/Email-Date-Format-1.5.0-r1.ebuild
+++ b/dev-perl/Email-Date-Format/Email-Date-Format-1.5.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Produce RFC 822 date strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
index b8122d5e7932..5346bfa0c073 100644
--- a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
+++ b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse a MIME Content-Type Header or Content-Disposition Header"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 ~riscv x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0-r2.ebuild b/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0-r2.ebuild
index ee9eaa24f564..24c26e6ba1a3 100644
--- a/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0-r2.ebuild
+++ b/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A unified interface to MIME encoding and decoding"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-MIME/Email-MIME-1.952.0.ebuild b/dev-perl/Email-MIME/Email-MIME-1.952.0.ebuild
index 4263fb39f1ce..2c54a604301b 100644
--- a/dev-perl/Email-MIME/Email-MIME-1.952.0.ebuild
+++ b/dev-perl/Email-MIME/Email-MIME-1.952.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easy MIME message parsing"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-MessageID/Email-MessageID-1.406.0-r1.ebuild b/dev-perl/Email-MessageID/Email-MessageID-1.406.0-r1.ebuild
index dfd63b65da06..c743566bdae2 100644
--- a/dev-perl/Email-MessageID/Email-MessageID-1.406.0-r1.ebuild
+++ b/dev-perl/Email-MessageID/Email-MessageID-1.406.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generate world unique message-ids"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Email-Sender/Email-Sender-2.500.0.ebuild b/dev-perl/Email-Sender/Email-Sender-2.500.0.ebuild
index b44544f85e66..fa541cc9ea30 100644
--- a/dev-perl/Email-Sender/Email-Sender-2.500.0.ebuild
+++ b/dev-perl/Email-Sender/Email-Sender-2.500.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A library for sending email"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-Simple/Email-Simple-2.216.0.ebuild b/dev-perl/Email-Simple/Email-Simple-2.216.0.ebuild
index 8532955898e1..31882b451ff9 100644
--- a/dev-perl/Email-Simple/Email-Simple-2.216.0.ebuild
+++ b/dev-perl/Email-Simple/Email-Simple-2.216.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple parsing of RFC2822 message format and headers"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 ~riscv x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r2.ebuild b/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r2.ebuild
index 53f6c08912cc..35aaf0cc37a3 100644
--- a/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r2.ebuild
+++ b/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Manage IO on many file handles"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-IO
diff --git a/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild b/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild
index 91c5594509af..0b603bd6581e 100644
--- a/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild
+++ b/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Definition of MIME types"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild b/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
index 0b5c36b2984b..73ccbcd1f3c7 100644
--- a/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
+++ b/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl implementation of DMARC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="minimal"
 
 PERL_RM_FILES=(
diff --git a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0-r1.ebuild b/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0-r1.ebuild
index 7c895f076671..36b7b45fd6eb 100644
--- a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0-r1.ebuild
+++ b/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Some Moosish types and a type builder"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/strictures-2
diff --git a/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
index b6600680d51d..769dba7e12f0 100644
--- a/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
+++ b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for simple IMAP account handling"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	virtual/perl-IO
diff --git a/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild b/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
index 4cbef504808f..c78f811fbf25 100644
--- a/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
+++ b/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="SSL/STARTTLS support for Net::SMTP"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-perl/Authen-SASL-2.0.0
diff --git a/dev-perl/Net-Server/Net-Server-2.10.0.ebuild b/dev-perl/Net-Server/Net-Server-2.10.0.ebuild
index f7331b277ef8..3743640c1e22 100644
--- a/dev-perl/Net-Server/Net-Server-2.10.0.ebuild
+++ b/dev-perl/Net-Server/Net-Server-2.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extensible, general Perl server engine"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0-r1.ebuild b/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0-r1.ebuild
index 57496939a08d..6a38863e71de 100644
--- a/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0-r1.ebuild
+++ b/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ DESCRIPTION="Provide commonly requested regular expressions"
 
 LICENSE="|| ( Artistic Artistic-2 MIT BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Sub-Override/Sub-Override-0.90.0-r1.ebuild b/dev-perl/Sub-Override/Sub-Override-0.90.0-r1.ebuild
index e6d6c55b64dc..076938544c17 100644
--- a/dev-perl/Sub-Override/Sub-Override-0.90.0-r1.ebuild
+++ b/dev-perl/Sub-Override/Sub-Override-0.90.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for easily overriding subroutines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-perl/Test-MockObject/Test-MockObject-1.202.1.220.ebuild b/dev-perl/Test-MockObject/Test-MockObject-1.202.1.220.ebuild
index a9e592edadeb..fb173af6b30d 100644
--- a/dev-perl/Test-MockObject/Test-MockObject-1.202.1.220.ebuild
+++ b/dev-perl/Test-MockObject/Test-MockObject-1.202.1.220.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for emulating troublesome interfaces"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
index 5abb44e698cd..649be47c5453 100644
--- a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
+++ b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ DESCRIPTION="Provide commonly requested regular expressions"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	virtual/perl-Test-Simple
diff --git a/dev-perl/Throwable/Throwable-1.0.0.ebuild b/dev-perl/Throwable/Throwable-1.0.0.ebuild
index 502f21ac9ec4..1c379a2ae3fe 100644
--- a/dev-perl/Throwable/Throwable-1.0.0.ebuild
+++ b/dev-perl/Throwable/Throwable-1.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A role for classes that can be thrown"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280-r1.ebuild b/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280-r1.ebuild
index 80ccab793097..9a65c2bc0f48 100644
--- a/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280-r1.ebuild
+++ b/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Hack around people calling UNIVERSAL::can() as a function"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Scalar-List-Utils
diff --git a/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120-r1.ebuild b/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120-r1.ebuild
index 00647607257d..16f0c6250df7 100644
--- a/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120-r1.ebuild
+++ b/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Attempt to recover from people calling UNIVERSAL::isa as a function"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Scalar-List-Utils
diff --git a/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild
index 54e835c43f0b..6bc1f50d91fa 100644
--- a/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild
+++ b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Disables bareword filehandles"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/indirect/indirect-0.390.0.ebuild b/dev-perl/indirect/indirect-0.390.0.ebuild
index ecba4b9ec577..e2ea28134551 100644
--- a/dev-perl/indirect/indirect-0.390.0.ebuild
+++ b/dev-perl/indirect/indirect-0.390.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lexically warn about using the indirect method call syntax"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/multidimensional/multidimensional-0.14.0.ebuild b/dev-perl/multidimensional/multidimensional-0.14.0.ebuild
index f0701d644415..ecfd4c255126 100644
--- a/dev-perl/multidimensional/multidimensional-0.14.0.ebuild
+++ b/dev-perl/multidimensional/multidimensional-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="disables multidimensional array emulation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/B-Hooks-OP-Check-0.190.0
diff --git a/dev-perl/strictures/strictures-2.0.6.ebuild b/dev-perl/strictures/strictures-2.0.6.ebuild
index e8d7190ec7db..21a781f8f9e5 100644
--- a/dev-perl/strictures/strictures-2.0.6.ebuild
+++ b/dev-perl/strictures/strictures-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Turn on strict and make most warnings fatal"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 970fe2783a27..abac62b7dc19 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,3 +1 @@
-DIST ansible-compat-2.2.5.tar.gz 39794 BLAKE2B 25a5c858eb3e120b7f51b8800b01eff2482a03d0e5f5c049d4ff2bc96ab2c01e856284f3328d5c9e3621b2d769df4450c9427997b48a7ddd337b01aa777e0c28 SHA512 8029d6dbd093414fb5eccba1789c881601a3a1f45bf7779f9e2af886d457e9c57a4e6432eed73a1d387b4d82617e1677a857cf0d2dfdcebcefa0dc790b2ec2d4
-DIST ansible-compat-2.2.6.tar.gz 38890 BLAKE2B 5022676dca1c2cb24e8f3e3387de8ef214979124b6d4a819f6328b2ffa0b19bddc5ef60131eb0133d809a214ecdf39fb5c01b197a44111e05a23740d4955c00c SHA512 b02faeb0202839c01a777277cd077264b44fbadbef679e93cb4ac0be3b81df921bc8f000e27372446326976acd1b42f1f1f42896ff0af9ba0677e7a93d06b195
 DIST ansible-compat-2.2.7.tar.gz 47378 BLAKE2B 58f3b19400fb7646d37c585df07435e65a60f3e57d445c98e8089c6a2ed853cb5dbab682d85cee1a604e1b4de6dd137faa12bf78fe7913752839f95bd651435f SHA512 9a3863be3d755eb5a1a61ba0c526786ea3df14bc6fcabd9196559eb625ab6dfc8de7a17fdb2cdd8ad71d7d61b5e2f0543b8b5908f39d5e7d9ea45e387aa625b1
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.5.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.5.ebuild
deleted file mode 100644
index 5e29f11cc6c4..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.2.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-7.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild
deleted file mode 100644
index fe3835bdf820..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-7.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
index fe3835bdf820..5e29f11cc6c4 100644
--- a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index afc0fe10da09..0827dd0e64bf 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,4 +1 @@
-DIST cbor2-5.4.3.tar.gz 86499 BLAKE2B 0303ed49a1c468a3aa13e12a4bebef17479f106bc3f0a92e35c6029ff1bd86aea6a77f557ac0c8acb5e055ec0b56c82e5c95e9417d00715a1fb244bd94d0f60d SHA512 9527bec5a36464bb7dc9a8c0ece3ad72f1c6182272a7edf0526668b264c957b72bc031d2398dc6af38af09bb298219c316da194084fab410bae5f9100b22328b
-DIST cbor2-5.4.4.tar.gz 86755 BLAKE2B 616a5e3d10f979f7f5923b0226d6ca52392e79bf1c4dcdef6d44143af75b02a91846e1a8f0c571f096f2168908137a5f31995199c13383b4d81cb1f17062b1fd SHA512 f8754423490b8a9643ca3309c99254f6be5e9eeab2163b57631fd2e6fd3f5f5dbd8495e24bbfcf96720f07467797eb3f4e3603822a7d6999f1ee4fa66651f2d7
-DIST cbor2-5.4.5.tar.gz 86800 BLAKE2B 2911cf15d31ec77aab79129719f9fc869392da8383b8a1afbff7e7d9c0d90ad341f66b5b76ae5142eae7036b7446dd54d545a48695de43aaf54e0824e9d8052c SHA512 ee360318c24ab6cdd93162ef78b0ab099990630ebd14c581012b0d86b1a30c9aa1e4b45d285d33da5684f5385db976189e89d32589d68272f79fcd8f7130bf7b
 DIST cbor2-5.4.6.tar.gz 86909 BLAKE2B df24c786f32819f9a93a2db28536b78349db6185108188d0a20e7298ff8c083d1feb59110865b4e21190e0363b113201ccddaa0d36b49bd7bbacf9d5ee7695f4 SHA512 44fb3e2e2249c79b1454487670d53eb672ffae4c22374d2a2bb9e314ac15470e4e7913e4eb1981a8bd4d722e6827328dde7e57c5f0556843e951c4723ae5bd8e
diff --git a/dev-python/cbor2/cbor2-5.4.3.ebuild b/dev-python/cbor2/cbor2-5.4.3.ebuild
deleted file mode 100644
index ea335e93230f..000000000000
--- a/dev-python/cbor2/cbor2-5.4.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.4.ebuild b/dev-python/cbor2/cbor2-5.4.4.ebuild
deleted file mode 100644
index eb0ac3d389f9..000000000000
--- a/dev-python/cbor2/cbor2-5.4.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.5.ebuild b/dev-python/cbor2/cbor2-5.4.5.ebuild
deleted file mode 100644
index eb0ac3d389f9..000000000000
--- a/dev-python/cbor2/cbor2-5.4.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.6.ebuild b/dev-python/cbor2/cbor2-5.4.6.ebuild
index 82280288dd3a..ea335e93230f 100644
--- a/dev-python/cbor2/cbor2-5.4.6.ebuild
+++ b/dev-python/cbor2/cbor2-5.4.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 BDEPEND="
 	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
diff --git a/dev-python/libarchive-c/libarchive-c-4.0.ebuild b/dev-python/libarchive-c/libarchive-c-4.0.ebuild
index 13d0a5bde05b..bd103550413d 100644
--- a/dev-python/libarchive-c/libarchive-c-4.0.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-4.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/python-${P}
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 
 RDEPEND="app-arch/libarchive"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 3ef07f3a5b5c..41b5595b1451 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-material-8.5.10.gh.tar.gz 10384269 BLAKE2B 3f7837b17724e93fa28a906811a8695aacba9c479a13d4568775945aee3943b9f58e017ab71fb81da8c72073a471b736ca75bf721a786309fe822f5898e4d3aa SHA512 ed186b206ffe0b17c96a33270d83ffc3c98262eb608d6889101b6949057e7059642eb83b584f4a309afff64a359ee79625c5a95be62fc37ece069e2404faa0bd
 DIST mkdocs-material-8.5.11.gh.tar.gz 10423819 BLAKE2B 8af9b10fde57a6543d86dc8d6004cb100359e274072486094e7db4f8eeb7d44d83505d00b3f202f02e695a613ae8e2fdf08ac1b39584e7d9aeae430bb560d60a SHA512 7fdc06cf7f64a2831fe2acb05a735bc9519fdf109fbccd5ee1667d07175916fffb295ccfa88a4352a7a0688f0eaf535c26ab49463f672d964d4a87ad8de6ddf1
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.5.10.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.5.10.ebuild
deleted file mode 100644
index 74cd490f5db4..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.5.10.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
-"
-
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'"> gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild
index 88937f70d568..5dd20ccf961a 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index 9a39b8ba3932..974c5f805c2e 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-minify-plugin-0.6.1.gh.tar.gz 8346 BLAKE2B 130495cc2dcc2b71c6dd715c1ed277df0d8fac5aef8fc49094bf05b324d692e41e3db85175df5455eed21f2cf413d57225a1baafe14770a77ffd3c2bb77ff3d8 SHA512 f1611b1a8f946e27450c9825f65e77e798200b22d08b5957417ae060cc2d6cb40c6edd2a6ace08eff2b32b59c9aca3020e26da35917aaddae293047d9cc8f86b
 DIST mkdocs-minify-plugin-0.6.2.gh.tar.gz 8480 BLAKE2B 91091702c0f5953b8cef4e081004cf44abbc2a7b21a0ea1996a337c96764a636fa79054c5d05ffc2814acb4b7fda0e833e61b02c6b97466586875e9da21c937b SHA512 563e150eb380aab105b18492eb0f725ec96fe12768c666b093e40d375e66cccf42f859aeb4d2788ae8c7a5b01e6e103c9f9aa1153802ad104955a98d90036144
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild
deleted file mode 100644
index 1e84dd9610b5..000000000000
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
-HOMEPAGE="
-	https://github.com/byrnereese/mkdocs-minify-plugin
-	https://pypi.org/project/mkdocs-minify-plugin/
-"
-SRC_URI="
-	https://github.com/byrnereese/mkdocs-minify-plugin/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.4.1[${PYTHON_USEDEP}]
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/jsmin-3.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		~dev-python/mkdocs-minify-plugin-${PV}[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild
index 5e736f0e8ba2..0800e997a9e7 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.0.12.ebuild b/dev-python/moto/moto-4.0.12.ebuild
index 1045d1bcb690..7dfdb8c72a78 100644
--- a/dev-python/moto/moto-4.0.12.ebuild
+++ b/dev-python/moto/moto-4.0.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/piexif/piexif-1.1.3-r1.ebuild b/dev-python/piexif/piexif-1.1.3-r1.ebuild
deleted file mode 100644
index c7460c9832b3..000000000000
--- a/dev-python/piexif/piexif-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit edos2unix distutils-r1
-
-DESCRIPTION="Exif manipulation with pure Python"
-HOMEPAGE="https://github.com/hMatoba/Piexif
-	https://pypi.org/project/piexif/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-	test? ( dev-python/pillow[jpeg,${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-PATCHES=(
-	# From https://github.com/hMatoba/Piexif/pull/109
-	"${FILESDIR}"/${P}-tests-pillow-7.2.0.patch
-)
-
-src_prepare() {
-	edos2unix tests/s_test.py  # to be able to patch it
-	default
-}
-
-python_test() {
-	"${PYTHON}" setup.py test || die
-}
diff --git a/dev-python/piexif/piexif-1.1.3-r2.ebuild b/dev-python/piexif/piexif-1.1.3-r2.ebuild
index 2a2eecbc3668..d2f5eead3bcb 100644
--- a/dev-python/piexif/piexif-1.1.3-r2.ebuild
+++ b/dev-python/piexif/piexif-1.1.3-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycdio/pycdio-2.1.1-r1.ebuild b/dev-python/pycdio/pycdio-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..b2c45c76a42d
--- /dev/null
+++ b/dev-python/pycdio/pycdio-2.1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
+HOMEPAGE="
+	https://savannah.gnu.org/projects/libcdio/
+	https://pypi.org/project/pycdio/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	>=dev-libs/libcdio-2.0.0
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/swig
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove obsolete sys.path and adjust 'data' paths in examples.
+	sed -i \
+		-e "s:^sys.path.insert.*::" \
+		-e "s:\.\./data:./data:g" \
+		example/*.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -opython_files='test-*.py'
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild
index 369b100819a8..1286f41faf38 100644
--- a/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index b2a1ef174f08..6703866a80ea 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,2 +1 @@
-DIST pycxx-7.1.5.tar.gz 156343 BLAKE2B 099de7f88c19ec86aea67b503e6fbdc0df66bbdd3bdc0ff7f8ce77425be9486e6abebed8548f9ac764688a85e62cda77d3832f460e5678b4c07b1c6d2123b257 SHA512 0f980298739886d0c05ddd5ee23ebb234014b8276d811e62dc5b0a738666c6a011ad3f4aeeb7b1b404d8bff87dddfc30f68eec9c6bd13d5f262a2f7c53e273be
 DIST pycxx-7.1.7.tar.gz 156383 BLAKE2B 69a454615c9a7cdc57f4c357b9e3805821711bc48efb82e684da6066069ff0ee6af3b76911a705adb6f984969659441d331a8470061b514180ddf53f6494a33d SHA512 5439b2f72a7f04a628e7e93d093566654f3b4eafe78a7834005f86fb08e614f22f4d1fffb8d626e46cd56880ff7792e494ee3282b313ce668a7497d2bc1fbea9
diff --git a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild b/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
deleted file mode 100644
index 5a25766e4530..000000000000
--- a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Set of facilities to extend Python with C++"
-HOMEPAGE="http://cxx.sourceforge.net"
-SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="doc examples"
-
-python_prepare_all() {
-	# Without this, pysvn fails.
-	# Src/Python3/cxxextensions.c: No such file or directory
-	sed -e "/^#include/s:Src/::" -i Src/*.{c,cxx} || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Doc/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r Demo/Python{2,3}/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycxx/pycxx-7.1.7.ebuild b/dev-python/pycxx/pycxx-7.1.7.ebuild
index 8f8a46d1b90c..d56824896caf 100644
--- a/dev-python/pycxx/pycxx-7.1.7.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="doc examples"
 
 python_prepare_all() {
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index f2f81ebb4b0f..d10ac1a454c8 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,2 +1 @@
-DIST pymediainfo-5.1.0.tar.gz 445630 BLAKE2B debef8de004232c4e39bd17018c447474a4f71bc386b01710bea8084febb5353cb70512ee77c33ea8b3e6c7b67baded99aecb77b60c52da58be35ef91919f34a SHA512 d3c48e37f6d59b0f5bc1d66d4fad9fea26724863dc2ae75a30c80d972f68f3be650298d25105d330c20b83083f94d2ff5e2690c29573897e09afa44931f3228e
 DIST pymediainfo-6.0.1.tar.gz 446487 BLAKE2B 402c71157e43fd03efe37934932c61e1e22d469c13f5b5e85d7e0f1d52d6e54289860777c1677efeb4710a5c55086a1c7db03da8ad2f88f49d144bd5484f8638 SHA512 7b373b133911eb320248f72627f6aeb6fa04705b55500639d18094ed8227296fd744c2c4b76d765e8b2d98d78f443114e9ca7ef8e2e0eb498d48d2b46956f952
diff --git a/dev-python/pymediainfo/pymediainfo-5.1.0-r1.ebuild b/dev-python/pymediainfo/pymediainfo-5.1.0-r1.ebuild
deleted file mode 100644
index 852cdbc655ed..000000000000
--- a/dev-python/pymediainfo/pymediainfo-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	media-libs/libmediainfo
-"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs dev-python/alabaster
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable tests which requires network access
-	sed -i 's/@pytest.mark.internet/@pytest.mark.skip/' \
-		tests/test_pymediainfo.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
index 2348f6c2eabd..76d089482501 100644
--- a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-libs/libmediainfo
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index 242b0c338cd9..1f2bdeba3f41 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,2 +1 @@
-DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
 DIST pysvn-1.9.18.tar.gz 667827 BLAKE2B cd32b4ec55118becd496a9aab6f4dd2b9d57c82e12d5a08b18d36d0caffbafe7066ff45c9493a36499979e759d38dd6b15a68e7bb5819464362c2691e7599160 SHA512 0ca2924223cdc5f29e961e879db6b0f88e82b5c4c40df50169468dd5a72cbccddea9f0d1680ef4a54d45e89b4b2b2c3c22f5e76c66196783a89cac8b583b6623
diff --git a/dev-python/pysvn/pysvn-1.9.15-r1.ebuild b/dev-python/pysvn/pysvn-1.9.15-r1.ebuild
deleted file mode 100644
index 9db03ede2005..000000000000
--- a/dev-python/pysvn/pysvn-1.9.15-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_IN_SOURCE_BUILD=true
-DISTUTILS_USE_SETUPTOOLS=bdepend  # see setup.py
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Object-oriented python bindings for subversion"
-HOMEPAGE="https://pysvn.sourceforge.io/"
-SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND="
-	>=dev-python/pycxx-7.0.2[${PYTHON_USEDEP}]
-	>=dev-vcs/subversion-1.9"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	# Don't use internal copy of dev-python/pycxx.
-	rm -r Import || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	cd Source || die
-	CC="$(tc-getCC)" CCC="$(tc-getCXX)" \
-		esetup.py configure
-}
-
-python_compile() {
-	cd Source || die
-	emake
-}
-
-python_test() {
-	cd Tests || die
-	emake
-}
-
-python_install() {
-	cd Source || die
-	python_domodule pysvn
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Docs/. )
-	if use examples; then
-		docinto examples
-		dodoc -r Examples/Client/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pysvn/pysvn-1.9.18.ebuild b/dev-python/pysvn/pysvn-1.9.18.ebuild
index aef643b124fc..201a68232a0c 100644
--- a/dev-python/pysvn/pysvn-1.9.18.ebuild
+++ b/dev-python/pysvn/pysvn-1.9.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 39759f903c90..2a42cde9567d 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,3 +1,2 @@
-DIST python-xlib-0.31.tar.bz2 211425 BLAKE2B c0a15b11c264942479c86088d8d5bdc0c759ae71df8939feee200ff58ec30d3b2c0a99a119cc56e5c32279b26517e7925cf9124a367dc7d32fcaf0be4f7cd41e SHA512 f98978cd0058ae18f08f9da71b4ff31cd7811040ec1eb03ce065c187f312259d674dd76aad447752c8f508e585838948c90182eef5d5240e6c06b0a5dd1fbd33
 DIST python-xlib-0.32.tar.bz2 213554 BLAKE2B cf24645529c6ca67a4825419837f312fa4ae0902bd2fb8f2eade7cc1645a3f79201b43c7ddca0cdcf8b21f623583acee1252cbe83d3700ab08979b8f0723b0a4 SHA512 9fecb77fa5d7ffba4c8031c0738147b7581dee9aed1a812254d22d78b6021cfc08743edb76829a3e5ba31f9a42648ea501b50ddcf5652ec3114a367c5e83d465
 DIST python-xlib-0.33.tar.bz2 213763 BLAKE2B 53486ec938bc00306658f3151556f1353fe5881ab942d06493f6f78d33b4cff8aab6e6aa5ad7e9124824d61549545719375c84f7b9376518e2328fa2e65df553 SHA512 3b7b4fea5cd69544d2227806853bdfdd04447089e182ca0f199e18e8bd43375d9bf03c819fd6a055ad4ad274594651e05db82585ab40d0fcf225ce36b553c991
diff --git a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
deleted file mode 100644
index 1a77790a8a7c..000000000000
--- a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.32-r1.ebuild b/dev-python/python-xlib/python-xlib-0.32-r1.ebuild
index 5a32bbc31aa2..e05bcecb90d7 100644
--- a/dev-python/python-xlib/python-xlib-0.32-r1.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.32-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index f85951b6cd7f..45edde1fdb44 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,3 +1 @@
-DIST rope-1.4.0.tar.gz 287417 BLAKE2B d161e571649be2df7e6012336e7bded844f98f67764740814bfccebc926ff4c5f734cdf26701c9b7cec35bf3178be1f1ebe0d86f3b60259a161d3e87125fc7d5 SHA512 586f6f22fdf4743f71bf7f7505ec49aaced28aff48b5eae4f731eb690edec1ff8c736e3f9f21d7732bf5ea60ced5253e8f0d224a51a6a9bfdf7dd50ab56733ea
-DIST rope-1.5.1.tar.gz 288965 BLAKE2B bc912932dec03317a3ea24d2e15f751037d308d58a941305b6155e2f85d2ee81fc82f9d4183a1a416ebda6e791ab8c5408835e7eb36a7fb5a8b71116d5edb24c SHA512 5b7c76f0bfd481978d0e6c23d37f17f9db49fe6affc0f670868deed9a23a95c53f31a578bc7b8cd1c59318b38789a6e264f8fa9d3c7e13e5ce3db80dbadf177f
 DIST rope-1.6.0.tar.gz 289325 BLAKE2B fc7fc37a93f6d011f7e5eab5d2a28e3eab1767839cba4bce2b665c7972d6485eb3693e5977abfd36025415bc898fb4985affb7ac757c8457840a5de3946df77d SHA512 f610eb71c20533907aeea86c3ec5101401cf8136aba4221b2d64db3b0db16d4d7d1ec081c6d4929d6534ed51d4c01761af8d2ffddb6b69b4a9cc4921d240d745
diff --git a/dev-python/rope/rope-1.4.0.ebuild b/dev-python/rope/rope-1.4.0.ebuild
deleted file mode 100644
index 17c2d83d48ac..000000000000
--- a/dev-python/rope/rope-1.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="
-	https://pypi.org/project/rope/
-	https://github.com/python-rope/rope/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/pytoolconfig-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# our venv style confuses this comparison
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_source_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_compiled
-)
diff --git a/dev-python/rope/rope-1.5.1.ebuild b/dev-python/rope/rope-1.5.1.ebuild
deleted file mode 100644
index e7718cf5b757..000000000000
--- a/dev-python/rope/rope-1.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="
-	https://pypi.org/project/rope/
-	https://github.com/python-rope/rope/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/pytoolconfig-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# our venv style confuses this comparison
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_source_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_compiled
-)
diff --git a/dev-python/rope/rope-1.6.0.ebuild b/dev-python/rope/rope-1.6.0.ebuild
index e7718cf5b757..17c2d83d48ac 100644
--- a/dev-python/rope/rope-1.6.0.ebuild
+++ b/dev-python/rope/rope-1.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/scikit-build/scikit-build-0.16.4.ebuild b/dev-python/scikit-build/scikit-build-0.16.4.ebuild
index 84f29b0d8841..3e18ec82a864 100644
--- a/dev-python/scikit-build/scikit-build-0.16.4.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.16.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/tlsh/tlsh-4.8.2.ebuild b/dev-python/tlsh/tlsh-4.8.2.ebuild
index ef4f3a2d64b9..f6c32016b45e 100644
--- a/dev-python/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-python/tlsh/tlsh-4.8.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P}/py_ext
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 
 DEPEND="dev-libs/tlsh"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/uncertainties/uncertainties-3.1.7.ebuild b/dev-python/uncertainties/uncertainties-3.1.7-r1.ebuild
index 0b40000ca86b..e05774b68879 100644
--- a/dev-python/uncertainties/uncertainties-3.1.7.ebuild
+++ b/dev-python/uncertainties/uncertainties-3.1.7-r1.ebuild
@@ -5,24 +5,36 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Python module for calculations with uncertainties"
-HOMEPAGE="https://pythonhosted.org/uncertainties/"
+HOMEPAGE="
+	https://pythonhosted.org/uncertainties/
+	https://github.com/lebigot/uncertainties/
+	https://pypi.org/project/uncertainties/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (	dev-python/numpy[${PYTHON_USEDEP}] )
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 "
 
 distutils_enable_tests pytest
 distutils_enable_sphinx doc --no-autodoc
 
+src_prepare() {
+	# not used in py3, see https://github.com/lebigot/uncertainties/pull/168
+	sed -i -e '/future/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
 pkg_postinst() {
 	optfeature "numpy support" dev-python/numpy
 }
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index 88f41c531d80..760cdc1a7bef 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,4 +1 @@
-DIST buildbot-badges-3.4.0.tar.gz 3966 BLAKE2B cb94a63dec1e16bb52f5f84174d204137e7da582d3a62effa2d298fbc5f1c25541a8a96d8366efac650488b3810b37eadf9e650db277d6d04c33c1ff9cab32b1 SHA512 3b440b9d36f4e5d310886fd4b0e11607574d312093ce8c9654f07650c2ccf90b27c078c950fb7008f9d834d1cf4f15813c113b85c2d0d1181fac370f7a3472f6
-DIST buildbot-badges-3.5.0.tar.gz 3962 BLAKE2B 48f4865136845300e447835c348736ee15a3d520db03b4e6e70b45366e723f10eeff3d7e37a1f166682374dc6c1dabb051ad6f15c9730da969a846b606bc5730 SHA512 7817e0c2127892ee32a8c14e1f4204d724ce1c584f15c55b77902cdadfe9c2ff0e0df92d282fd8157aebcab067605c56ac776c7f8e37dae0a53672c14e002e19
-DIST buildbot-badges-3.6.0.tar.gz 3964 BLAKE2B e11db574b7245396c6532a3427b7494fbfcb68762b7a76b3f63ec49a2f460a2e1d8023ea1d54d7a27714990b9c8d2a0895442c41d8b65584e178f2af02b4ade3 SHA512 d133efad8d7171d122279f4e32fd7b0fa7d84bdeb66660d40b175d94d64f4344044dda186d2f1f6d5d2f2f6654461f7333339c90450a51843ce6314b457edc75
 DIST buildbot-badges-3.6.1.tar.gz 3967 BLAKE2B 07763a458c0eb32db13fd7b39a20186c2772ff53ea30e3b199f0dd64008346c218d550b10b238b63deb2ee64064b3f1fb19c95013f6647ec4992b8fee12ca2e5 SHA512 4326f49c2d69d86e9c49250c261c59d67553d6cb63098f19c391f3bfb83c4f99ea783d2351930fcfed40fe83dbfc8466294d77609e39e79e76c6c7b42e557c0f
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
deleted file mode 100644
index 3e2f57249e21..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-grid-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild
deleted file mode 100644
index 3e2f57249e21..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-grid-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild
deleted file mode 100644
index 3e2f57249e21..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-grid-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index d69bbcae4ab3..377105e12b38 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,4 +1 @@
-DIST buildbot-console-view-3.4.0.tar.gz 18732 BLAKE2B caeb78d4d3cc616edafccc5f78c1104469f77ead6ec31e7b9a741e43cb8d7140f8c44b57449bd6d97e35912787cbbeee5617bdf90ce7a15ebd023721160edc06 SHA512 072a4ca8d5677e68d2893684d68d4742d7a5546e128ae99bbec0385772a5df6c885bb62b855484543a42c95471aa828f8f3375770fc079997e5183cf3eda9db8
-DIST buildbot-console-view-3.5.0.tar.gz 18741 BLAKE2B a2c4043bdc9eef6189cc15617212aefd7cbdf6db6d4c547c191e0a07bacc9d0cb3e9898867af207d969b294ab15664132636dec4a3c16e620fea9872ae4d0f57 SHA512 4a86a2e803dd4547b3cc3018e1284e4fa9eaf1b29ccb78035a1823fd44fd873acb0a746882e8b961f10e8dc533043383c4a6e60622027a248c10766dab7ac266
-DIST buildbot-console-view-3.6.0.tar.gz 18728 BLAKE2B 0a206e80a311deed2666a297394b7d4e31e47c703fed2040d2d6340be0cb81a6977ac54e2d215dcad02b14ec21db58dd6e677a9d2155e84110cdf37d99ae1401 SHA512 8d03b0c640b72d986e48bc5cfd1decf91f4b7bd46889d16a76ea71972e17f9504b377762e1c589448431d7c26446c01208b5f8e1b63c86bdbfb6dbc063b94472
 DIST buildbot-console-view-3.6.1.tar.gz 18731 BLAKE2B b572b0c2bedfb1149056237a5b7417c933cdd75b8a723edcb5b37cbf33c8d6d1c1fa5d490955a119eb6ca6df7317b89182c45462ceebb310d3b78f44712f4d33 SHA512 3489579c02db7f2b02aaeab8d9cc2eb60d72e5a12eca51c63cf10491c683ba7b99069de6ca2348fcf44dd6ce81d58d437a7d03749815a3fad55162e50df912e0
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
deleted file mode 100644
index c91bbb6e21f5..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-console-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild
deleted file mode 100644
index c91bbb6e21f5..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-console-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild
deleted file mode 100644
index c91bbb6e21f5..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-console-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index e3acccf5f678..02943aadf61e 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,4 +1 @@
-DIST buildbot-grid-view-3.4.0.tar.gz 13698 BLAKE2B bc819f87db76ec217dd91cf1f43d2ad18e1aa27c661f37db893946b22e87a3de752f67fe04df8a10499e0659b618e24c3a15de18dd3f3e93523cdf4234d6907f SHA512 69369694e993365644416ea8223b546e147930dac41c74d000e8b1419e6b889158999cdf5cfb7079c3456a9135071f2d1983472faaed82ad410e7cd873c8c77f
-DIST buildbot-grid-view-3.5.0.tar.gz 13704 BLAKE2B 3b577c4108abb65677015a29f9af1410588f962a572e31518ac981e937e6a9bb9c7ce7f4435d573d82c5b337331eed2e9dee5c3e0722ebda6591d19e2b30b76f SHA512 a97c5df81b7ff670b26f170895a5a59b9324b7bc1c3714d58c9294848067b0387c93c295db91fd735a3aaa68bd70875aae45b8d6c1549592ad2b066c40ddc2f1
-DIST buildbot-grid-view-3.6.0.tar.gz 13701 BLAKE2B c877439926a6862aba51d4ef7d4326f66967bbd9c43dff44554c9346d0beb4b890c5e9cdd20998ca9796ab86030445776ff67f85ce27e87b1fdefaeaf0895d98 SHA512 6810b5be3649e38648b1205742bb24f1d63eded41f5fb420dd3f65734fba74a1ad350d68cf750f6be752f178e6d09dba56d5b42f46c20808212f72c8c4d7326d
 DIST buildbot-grid-view-3.6.1.tar.gz 13706 BLAKE2B 808d663b397459c7dd2d537a1a6eab2a0cc839ef0ba42bf56722ee53628bc9e6d41d03f549f0adb0fa92b0b8f416ca8c0a4bc310d67b4b06823eefe33b1ed02b SHA512 7605a5af1428ff08c96751f9c93fddd7b54f57a8879b85c270338e94eeb4ed55ddcfb7066519a2a3ff6d07b537a6ac28bb388b48eecb81c477aa1b6fbaa361dd
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
deleted file mode 100644
index 7ecd3abf542f..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-grid-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild
deleted file mode 100644
index 7ecd3abf542f..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-grid-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild
deleted file mode 100644
index 7ecd3abf542f..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-grid-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index a8516f134d5f..8b4dab297664 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,4 +1 @@
-DIST buildbot-pkg-3.4.0.tar.gz 4809 BLAKE2B 6d3e549e7b44b5ad95bb7520ef8765828da587e3940a9f352ede63346b3303127313fe4b71338ff65ef9ab2c0ac6258793bd9ef664153a0b45b0b6d7d2d92943 SHA512 ca1ef22fb6113bfe0106360ba1eacb167a8335ba15f94a0635bc4d00f999818704f8cfebd7889b6b3df5e1ca7ab79b96f4656e481d6b1f25f5fb7404af0d7ff6
-DIST buildbot-pkg-3.5.0.tar.gz 4806 BLAKE2B 41e217bc029bb8dbdb0f95218640d57d9f9ecabfbc0310118898042bbb543d9d4e5ba88075e934a9be9b1653e2a3d3d1e159547b832f9cde08c262713a817968 SHA512 08b3ec93dfbef87d90cfd4b7b1402003df785ceff8c43bf0320de79ff0efcb74f4cb4f0ec736e0d7231b54a82761d40df66e21540f1756fe74f68bb550850b1c
-DIST buildbot-pkg-3.6.0.tar.gz 4807 BLAKE2B 3b632ef4c0c1f2dc9c39fbe37ba6165a01162e41e77e28c08b9c820425cceac08d20193e0cc74d83c35cb6ff89e9576194cf35b8cac803e9b1f04076c9f96532 SHA512 0145a7ff7dddfb139f502193e0b04ab10a39b325ae65ca01c0f0d88c251c18798ebe4713a3ff1aa376c72aa8d3155a5edb58055a50f5f9ccd1bb43de0ff8e63e
 DIST buildbot-pkg-3.6.1.tar.gz 4807 BLAKE2B d492d0ca36fa8634e877bbc56ffd06ff6a7bb477c98bde2e3586dfc64f4b9d394ec1e5bb1a113aad9d2905277805b9f8737babcad669e2b73abb67d156d3126c SHA512 5833581b4551dc204a52a8356bdb110d57a9de022c33b09b7efdc14f5f4a7c0b0e26f9f9a6a076945aec3a5b7089c040ddaaad8d94c6e0217c2cb6b7742c1ac2
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
deleted file mode 100644
index 9950e1197ace..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-RESTRICT="test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild
deleted file mode 100644
index 9950e1197ace..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-RESTRICT="test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild
deleted file mode 100644
index 9950e1197ace..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-RESTRICT="test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 5b654f46230f..8aabe766b347 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,4 +1 @@
-DIST buildbot-waterfall-view-3.4.0.tar.gz 192456 BLAKE2B 7375e22b86b4dfe2cde88d4190accea50bf49c9615358ec55b341e6720551b4605015938ed15bfac6bf80805a32457081389bd150d762e90132af4f18295cfe5 SHA512 a9a381e8b520919f71011083face8760f864f5bbe5080446c64c0a63c38d787e486cddd20c3548b01d78534a206221ed2bec85bb78681fe3dceaef2bc1f172d9
-DIST buildbot-waterfall-view-3.5.0.tar.gz 192440 BLAKE2B 46ef4e839dabb5006c740c6f04235b123be420b4d0108cf59bab075fde3dbf6bbe0b4fdfc37fd8606da3696d15f45ee4363f8c35434f944af70f884e2de1edff SHA512 381ce3bb976aa0e1cadd541af44ab0bf1450a3e47351a55b32bda24ad824dbba0f075ee8204a3f26c3ab62a5a615c6ca5027b1894852f8d5308fb27b64e9c177
-DIST buildbot-waterfall-view-3.6.0.tar.gz 193903 BLAKE2B 3029015580dedd9003ae7b723ce79b335d58fd198c4d294483377c34bb88eaade53cd704652c240670c1bab488ab60056e03aba698dcb294f09fe62def59d5f8 SHA512 520e5e1653ceb92a4eb144530fa3cc6d893c4baae15f5ffcc29f2bc66ef02f1a41d287b3d85864a5ddf0a127c0fcf2d19a0ae136e39e394228713112487af8c2
 DIST buildbot-waterfall-view-3.6.1.tar.gz 193914 BLAKE2B 401dd8b1c042fe2dc5bc1c696607d3c0ab3188975757feb8a242049fb73c28f1f5f4dc1dc027ccf37f7a942e1a7d3093b917c1c3a4f81d5181bf8f8dffff6196 SHA512 f1bf080fa7b8e1dc17d52367e1e3dc3e4224c2de6db128bc2f061c338ef69c88732b39d487dcf92d06e2855902d6f078d76e97ddd0d38e348d4e83d0728ad634
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
deleted file mode 100644
index a264f9014db0..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-waterfall-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild
deleted file mode 100644
index a264f9014db0..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-waterfall-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild
deleted file mode 100644
index a264f9014db0..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-waterfall-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 79bd8d18300c..aec8d3312aff 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,4 +1 @@
-DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
-DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774 SHA512 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
-DIST buildbot-worker-3.6.0.tar.gz 120158 BLAKE2B c762237d802f6eff1c6b74f0ed364ecf085d762c80f6cc90edc1fed0084c7bf6a0b74b6fcaf8611b9c21b6249bde547d5a10bc7ff5b4588d138b2ebf76e823a3 SHA512 6b5f50694fe1559dacba599f8641c6b370cad4b68c8182e8a6e31528ffbeeed81c405fd764e3718003913fe5fe8d9faa920a2ad81373fbd028cbf046ed0d3136
 DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89 SHA512 f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
deleted file mode 100644
index 9c5bf0ba3baf..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit readme.gentoo-r1 distutils-r1
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-worker/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-to support starting buildbot_worker through Gentoo's init system. To use this,
-execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-Set up your build worker following the documentation, make sure the
-resulting directories are owned by the \"buildbot\" user and point
-\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-The scripts can	run as a different user if desired."
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
deleted file mode 100644
index b83880bf3933..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit readme.gentoo-r1 distutils-r1
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-worker/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-to support starting buildbot_worker through Gentoo's init system. To use this,
-execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-Set up your build worker following the documentation, make sure the
-resulting directories are owned by the \"buildbot\" user and point
-\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-The scripts can	run as a different user if desired."
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild
deleted file mode 100644
index 5c762a09b5c2..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit readme.gentoo-r1 distutils-r1
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-worker/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-to support starting buildbot_worker through Gentoo's init system. To use this,
-execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-Set up your build worker following the documentation, make sure the
-resulting directories are owned by the \"buildbot\" user and point
-\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-The scripts can	run as a different user if desired."
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.1-r1.ebuild
index dd19c14ee292..6ad480980d4a 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.6.1-r1.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
 	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
 	!<dev-util/buildbot-1.0.0
 "
 BDEPEND="
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index c3d9d98c3b81..ccf73e0ec6f2 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -23,7 +23,6 @@ RDEPEND="
 	acct-user/buildbot
 	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
 	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
 	!<dev-util/buildbot-1.0.0
 "
 BDEPEND="
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index ff13d27b3231..96fb064880e3 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,4 +1 @@
-DIST buildbot-wsgi-dashboards-3.4.0.tar.gz 5583 BLAKE2B 0eed4a375330d58bd6caf95f8cdc2ebfaebc9c123450461d4e0f938745bb1b6afe0e9786bd886c6e6cb6a522da2b645bf1ad3237b2049f86bc1bca83829b15a1 SHA512 56411bb34a1f40d02a814e8d33dcd3c6de65627728c3bb9cad776c43c48707e648ccdbb4a58cbfb8ed080c219fc37252304c88ab363eb6deb6057b2debde1071
-DIST buildbot-wsgi-dashboards-3.5.0.tar.gz 5585 BLAKE2B 94c365d4140de539a0ea85b78e24acd5d789fe022eb5ff2474ebc07554d139d964c9625b684b312b2134c3fd4bf3a6628178ac72d52283bb6fcfd7b7820d51f1 SHA512 d233273c05f9c2f6d81091dd620469dd19377848d5958c26cc746b6340ea9451c49aff8f8a36986741b3775fcc60065e0fbc402183f60f43d4afce238b907fd0
-DIST buildbot-wsgi-dashboards-3.6.0.tar.gz 5585 BLAKE2B 91de620cdb911b75ad745549e6fa7d1589206d8b17878b1779b40b84633dc9788d3dca46a34866c40d2403ed1a16c20d6159d0f0ce69d3e10f35d132cba06f35 SHA512 8377ef27f46b65ebb5e5dc638cab0e251070b940386b4681ea410562e6eaef04d4a76bfd3be229c081edb2f9df01c1385aad34a7763dcd5ce607fb0061b741e4
 DIST buildbot-wsgi-dashboards-3.6.1.tar.gz 5584 BLAKE2B f0b82de52022c3a8a0d0747aa4ade67345af177be70a8767d66163fe98ceff63e0b297ba547619de874a66e381b721c48d864361fdb82a818f2450c339d687cc SHA512 7ecd4fd71786258deab1fb1d96b4999ef929df4486d09404cb1bc3d1a7f831c90f8253f5bf0474258ba472ac9e8f960f4c4eb1f7993a0a8070eaa68e3bbbb4e9
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
deleted file mode 100644
index 72c24ef25f6a..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-wsgi-dashboards/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
deleted file mode 100644
index 72c24ef25f6a..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-wsgi-dashboards/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild
deleted file mode 100644
index 72c24ef25f6a..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-wsgi-dashboards/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index ed19ccd2e562..37443f8b4330 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,4 +1 @@
-DIST buildbot-www-3.4.0.tar.gz 3182445 BLAKE2B 350606158ae68aba1b82c43d202e6140f433905e9913c7f4fcd3f4ebd328f7b70940f0a4e76a4a1f89731f6364dd285f08052bd1d96badac4e69cd1e16643d4e SHA512 7be83f35b6042accae77db1133d54282d0d27ce15a9b34220cc015255935d7463c1a327ee289740325bbb73d6a6a162f384da2b3cc731719e7f99a911faf86cd
-DIST buildbot-www-3.5.0.tar.gz 3182531 BLAKE2B dcdd6487eff9d9a0429554d79f9ee83a9086dee3524b49fa8362085dddb969e088373a843a9d872e16d18350e1623ba65258799b9b93327e218f760540ece4fa SHA512 f40101624cf14f88f2796855845d13ee81471d7a1b4911461747aa073735352f21294c17f3a011229c5e1c99867013ff4b306bf32c2c37b3c57d530a6fccc01e
-DIST buildbot-www-3.6.0.tar.gz 3210526 BLAKE2B ab54213c457a9f5777075d00adb96863b4327cbbbc489c97609f29182fb8630cc77479ffa7e324d0d20e453bbcdc70f8ad0537a8bf55fd23d8410b8003e1399f SHA512 77a0671caa5c8a240301c7f3a2c2a26ecc69924546b7b7e641577e0f46c84380a80de43271dced0fa24a24b58b32d485d70d9af1d41a31af78af22a380653910
 DIST buildbot-www-3.6.1.tar.gz 3210526 BLAKE2B 6db8be32ee85cab63ad3f92d0e24042ed1ebece3b7be1b67e6f72240f61f3af2c31f1b3b31315db0d7ca18dddab1351eacffb92e762d1f1d68ce414349e52eee SHA512 d2fb3f97412e4a1b21fe7637458dffa8e8e005693ad2275222e908d35551ec64f89a88e696859a09f64b2b5be5fbdb386fbd71324356dbe8c2adc92b1c6b9f01
diff --git a/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
deleted file mode 100644
index 1fb9d44714fe..000000000000
--- a/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-www/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild
deleted file mode 100644
index 1fb9d44714fe..000000000000
--- a/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-www/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild
deleted file mode 100644
index 1fb9d44714fe..000000000000
--- a/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot-www/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index ad7526384cac..c2083c50a18d 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,4 +1 @@
-DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
-DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
-DIST buildbot-3.6.0.tar.gz 2458029 BLAKE2B 5f41702d4d61fbcbfa878c6febbb89a38da2648403c4fdcab24bde246adc225e9ac3f72eb7dc893e03763f00c2d3548c31b2d6597904032e4b75e660bb1faf72 SHA512 c0bec931d08adb1eec51114619d2a085fbef224944a4c0acf3ab396f84d846fd620b84379affee238d02dd90ca1294fdb2b7fb8ea6e82d95c4cfeae93a0b5e73
 DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea SHA512 62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206
diff --git a/dev-util/buildbot/buildbot-3.4.0-r1.ebuild b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
deleted file mode 100644
index b90f7c21f87b..000000000000
--- a/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-IUSE="crypt docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)]
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)]
-		)
-		dev-python/idna[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/ldap3[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	)"
-
-DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-to support starting buildbot through Gentoo's init system. To use this,
-execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-The scripts can	run as a different user if desired."
-
-src_prepare() {
-	# disable all warnings as errors
-	sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use examples; then
-		dodoc -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
deleted file mode 100644
index 531392e2d097..000000000000
--- a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-IUSE="crypt docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)]
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)]
-		)
-		dev-python/idna[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/ldap3[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	)"
-
-DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-to support starting buildbot through Gentoo's init system. To use this,
-execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-The scripts can	run as a different user if desired."
-
-src_prepare() {
-	# disable all warnings as errors
-	sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use examples; then
-		dodoc -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-3.6.0.ebuild b/dev-util/buildbot/buildbot-3.6.0.ebuild
deleted file mode 100644
index 7fc944fc28a4..000000000000
--- a/dev-util/buildbot/buildbot-3.6.0.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/
-	https://github.com/buildbot/buildbot
-	https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
-
-IUSE="crypt docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},ssl(-)]
-			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},crypt(-)]
-		)
-		dev-python/idna[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/ldap3[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	)"
-
-DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-to support starting buildbot through Gentoo's init system. To use this,
-execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-The scripts can	run as a different user if desired."
-
-src_prepare() {
-	# disable all warnings as errors
-	sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use examples; then
-		dodoc -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/diffoscope/diffoscope-229.ebuild b/dev-util/diffoscope/diffoscope-229.ebuild
index 4d663ab41dbc..ebe23e4ad3e2 100644
--- a/dev-util/diffoscope/diffoscope-229.ebuild
+++ b/dev-util/diffoscope/diffoscope-229.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/gui-libs/neatvnc/neatvnc-0.5.4.ebuild b/gui-libs/neatvnc/neatvnc-0.5.4.ebuild
index 3680f4e5f080..85057b0d1297 100644
--- a/gui-libs/neatvnc/neatvnc-0.5.4.ebuild
+++ b/gui-libs/neatvnc/neatvnc-0.5.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/any1/neatvnc.git"
 else
 	SRC_URI="https://github.com/any1/neatvnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86"
 fi
 
 LICENSE="ISC"
diff --git a/metadata/md5-cache/app-alternatives/bzip2-1 b/metadata/md5-cache/app-alternatives/bzip2-1
index 863da3fe0e6a..e343984a53e2 100644
--- a/metadata/md5-cache/app-alternatives/bzip2-1
+++ b/metadata/md5-cache/app-alternatives/bzip2-1
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
 INHERIT=app-alternatives
 IUSE=split-usr +reference lbzip2 pbzip2
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
 RDEPEND=!<app-arch/bzip2-1.0.8-r4 !app-arch/lbzip2[symlink(-)] !app-arch/pbzip2[symlink(-)] reference? ( >=app-arch/bzip2-1.0.8-r4 ) lbzip2? ( app-arch/lbzip2[-symlink(-)] ) pbzip2? ( app-arch/pbzip2[-symlink(-)] )
 REQUIRED_USE=^^ ( reference lbzip2 pbzip2 )
 SLOT=0
 _eclasses_=app-alternatives	7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=ff58ef8f22e4dbf39448570f69f7012f
+_md5_=eaec66454b4ef6ca98fd06faf97ff385
diff --git a/metadata/md5-cache/app-arch/upx-4.0.1 b/metadata/md5-cache/app-arch/upx-4.0.1
index 1fac05e6fcf7..b0b785ac4f49 100644
--- a/metadata/md5-cache/app-arch/upx-4.0.1
+++ b/metadata/md5-cache/app-arch/upx-4.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Ultimate Packer for eXecutables (free version using UCL compression
 EAPI=8
 HOMEPAGE=https://upx.github.io/
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ UPX-exception
 RDEPEND=!app-arch/upx-bin
 SLOT=0
 SRC_URI=https://github.com/upx/upx/releases/download/v4.0.1/upx-4.0.1-src.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a005c7c15e47d1e9dd5ebd0ebaa3e02a
+_md5_=28bfac279e4d600ae48d93db392e6780
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.19 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.19
deleted file mode 100644
index 6c4ed1a0399c..000000000000
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.4.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxml2 dev-libs/libxslt )
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3=
-DESCRIPTION=A GTK+ archive manager that can be used with Thunar
-EAPI=8
-HOMEPAGE=https://github.com/ib/xarchiver/
-INHERIT=xdg-utils
-IUSE=doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3=
-SLOT=0
-SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.19.tar.gz -> xarchiver-0.5.4.19.tar.gz
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=65249a4a5843e640161a07a72aab7d2c
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.20 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.20
index eba229989336..71f1574a38ef 100644
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.4.20
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.4.20
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ib/xarchiver/
 INHERIT=xdg-utils
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3=
 SLOT=0
 SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.20.tar.gz -> xarchiver-0.5.4.20.tar.gz
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cc1bec1a9aa8f135ec1d4e8cc8cbcd6d
+_md5_=65249a4a5843e640161a07a72aab7d2c
diff --git a/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1 b/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
index 4a2c69aec0a5..fb11a0a24da8 100644
--- a/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
+++ b/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Java utility for working with checksums, CRCs, and message digests (
 EAPI=8
 HOMEPAGE=https://jacksum.net
 INHERIT=java-pkg-2 java-pkg-simple
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/jonelo/jacksum/archive/v3.4.0.tar.gz -> jacksum-3.4.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=040a5ecf82622314ff76cf9e08ec5b00
+_md5_=e019ae46076724dc6101a41bd8218343
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-12 b/metadata/md5-cache/app-eselect/eselect-repository-12
deleted file mode 100644
index cac9004bd3ad..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-repository-12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_7? ( dev-python/pytest[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pytest[python_targets_python3_11(-)] ) )
-DEFINED_PHASES=compile install setup test
-DESCRIPTION=Manage repos.conf via eselect
-EAPI=8
-HOMEPAGE=https://github.com/mgorny/eselect-repository/
-INHERIT=python-single-r1
-IUSE=test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) app-admin/eselect python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) net-misc/wget
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mgorny/eselect-repository/archive/v12.tar.gz -> eselect-repository-12.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=e261430459fb672245ba3c452e542ecd
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-13 b/metadata/md5-cache/app-eselect/eselect-repository-13
index 07ada3610d90..9eda71f2b781 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-13
+++ b/metadata/md5-cache/app-eselect/eselect-repository-13
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/eselect-repository/
 INHERIT=python-single-r1
 IUSE=test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) app-admin/eselect python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) net-misc/wget
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/eselect-repository/archive/v13.tar.gz -> eselect-repository-13.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3eae99c845abf98cba208b0ce4293a6b
+_md5_=4e9cd6fcbc55874a6c18da7f428d6ae6
diff --git a/metadata/md5-cache/app-misc/fastfetch-9999 b/metadata/md5-cache/app-misc/fastfetch-0.1.9999
index 19aca35cb760..2f4fec919bc0 100644
--- a/metadata/md5-cache/app-misc/fastfetch-9999
+++ b/metadata/md5-cache/app-misc/fastfetch-0.1.9999
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? (
 REQUIRED_USE=xrandr? ( X ) chafa? ( imagemagick )
 SLOT=0
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=de7d29c41d079ee29338256e74282a06
+_md5_=7a34af41d7099535571e096ca60b9266
diff --git a/metadata/md5-cache/app-misc/fastfetch-0.2.9999 b/metadata/md5-cache/app-misc/fastfetch-0.2.9999
new file mode 100644
index 000000000000..2f4fec919bc0
--- /dev/null
+++ b/metadata/md5-cache/app-misc/fastfetch-0.2.9999
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) gnome? ( dev-libs/glib gnome-base/dconf ) imagemagick? ( media-gfx/imagemagick:= ) opencl? ( virtual/opencl ) opengl? ( media-libs/libglvnd[X] ) osmesa? ( media-libs/mesa[osmesa] ) pci? ( sys-apps/pciutils ) sqlite? ( dev-db/sqlite:3 ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) xcb? ( x11-libs/libxcb ) xfce? ( xfce-base/xfconf ) xrandr? ( x11-libs/libXrandr )
+DESCRIPTION=Fast system information tool
+EAPI=8
+HOMEPAGE=https://github.com/LinusDierheimer/fastfetch
+INHERIT=cmake git-r3
+IUSE=X chafa dbus gnome imagemagick opencl opengl osmesa pci sqlite vulkan wayland xcb xfce xrandr
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) gnome? ( dev-libs/glib gnome-base/dconf ) imagemagick? ( media-gfx/imagemagick:= ) opencl? ( virtual/opencl ) opengl? ( media-libs/libglvnd[X] ) osmesa? ( media-libs/mesa[osmesa] ) pci? ( sys-apps/pciutils ) sqlite? ( dev-db/sqlite:3 ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) xcb? ( x11-libs/libxcb ) xfce? ( xfce-base/xfconf ) xrandr? ( x11-libs/libXrandr )
+REQUIRED_USE=xrandr? ( X ) chafa? ( imagemagick )
+SLOT=0
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7a34af41d7099535571e096ca60b9266
diff --git a/metadata/md5-cache/app-misc/fastfetch-1.8.1 b/metadata/md5-cache/app-misc/fastfetch-1.8.2
index 3e39c09de2df..b4936889aa83 100644
--- a/metadata/md5-cache/app-misc/fastfetch-1.8.1
+++ b/metadata/md5-cache/app-misc/fastfetch-1.8.2
@@ -11,6 +11,6 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) gnome? ( dev-libs/glib gnome-base/dconf ) imagemagick? ( media-gfx/imagemagick:= ) opencl? ( virtual/opencl ) opengl? ( media-libs/libglvnd[X] ) osmesa? ( media-libs/mesa[osmesa] ) pci? ( sys-apps/pciutils ) sqlite? ( dev-db/sqlite:3 ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) xcb? ( x11-libs/libxcb ) xfce? ( xfce-base/xfconf ) xrandr? ( x11-libs/libXrandr )
 REQUIRED_USE=xrandr? ( X ) chafa? ( imagemagick )
 SLOT=0
-SRC_URI=https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/1.8.1.tar.gz -> fastfetch-1.8.1.tar.gz
+SRC_URI=https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/1.8.2.tar.gz -> fastfetch-1.8.2.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=de7d29c41d079ee29338256e74282a06
+_md5_=7a34af41d7099535571e096ca60b9266
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.3.4 b/metadata/md5-cache/app-misc/pax-utils-1.3.4
deleted file mode 100644
index a9fa9a9ad8d2..000000000000
--- a/metadata/md5-cache/app-misc/pax-utils-1.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=caps? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyelftools[python_targets_python3_11(-)] ) )
-DESCRIPTION=ELF utils that can check files for security relevant properties
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
-INHERIT=python-single-r1 toolchain-funcs
-IUSE=caps debug python seccomp python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyelftools[python_targets_python3_11(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=mirror://gentoo/pax-utils-1.3.4.tar.xz https://dev.gentoo.org/~xen0n/distfiles/pax-utils-1.3.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=6a34b89d9d82c1aba43887315f6b085e
diff --git a/metadata/md5-cache/app-misc/pup-0.4.0 b/metadata/md5-cache/app-misc/pup-0.4.0
deleted file mode 100644
index acc483633e9f..000000000000
--- a/metadata/md5-cache/app-misc/pup-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/go:0=
-DESCRIPTION=Parsing HTML at the command line
-EAPI=7
-HOMEPAGE=https://github.com/ericchiang/pup
-INHERIT=golang-single
-IUSE=debug pie test
-KEYWORDS=amd64 x86 arm
-LICENSE=MIT
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=https://github.com/ericchiang/pup/archive/v0.4.0.tar.gz -> pup-0.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	golang-common	0e35c9d692b2180a238dc9abf795c514	golang-single	5d5a376ad018d27d64cc6aa51bb211a5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6e590b4c89e7e8bf420f9470d53389b7
diff --git a/metadata/md5-cache/app-misc/pup-0.4.0_p1 b/metadata/md5-cache/app-misc/pup-0.4.0_p1
new file mode 100644
index 000000000000..acf1d6b4d874
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pup-0.4.0_p1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Parsing HTML at the command line
+EAPI=7
+HOMEPAGE=https://github.com/ericchiang/pup
+INHERIT=go-module
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/ericchiang/pup/archive/681d7bb639334bf485476f5872c5bdab10931f9a.tar.gz -> pup-0.4.0_p1.tar.gz mirror://goproxy//github.com/fatih/color/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.5.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.0-20151211000621-56b76bdf51f7.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.0-20151211000621-56b76bdf51f7.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.0-20151211000621-56b76bdf51f7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.0-20151211000621-56b76bdf51f7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20160720084139-4d38db76854b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20160720084139-4d38db76854b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20160720084139-4d38db76854b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20160720084139-4d38db76854b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20160717071931-a646d33e2ee3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20160717071931-a646d33e2ee3.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20160717071931-a646d33e2ee3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20160717071931-a646d33e2ee3.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160719205907-0a5a09ee4409.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160719205907-0a5a09ee4409.zip mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160719205907-0a5a09ee4409.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160719205907-0a5a09ee4409.mod
+_eclasses_=go-module	4c4b34f361efda91762ffeda8f632c02
+_md5_=1e0a646af4a5eb2d48bc777abc6fd238
diff --git a/metadata/md5-cache/app-misc/wego-2.0 b/metadata/md5-cache/app-misc/wego-2.0
deleted file mode 100644
index be74da72e2bd..000000000000
--- a/metadata/md5-cache/app-misc/wego-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/go:0=
-DESCRIPTION=Wego is a weather client for the terminal
-EAPI=7
-HOMEPAGE=https://github.com/schachmat/wego
-INHERIT=golang-single
-IUSE=debug pie test
-KEYWORDS=amd64 x86 arm
-LICENSE=BSD
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=https://github.com/schachmat/wego/archive/2.0.tar.gz -> wego-2.0.tar.gz https://github.com/mattn/go-colorable/archive/9fdad7c.tar.gz -> github.com-mattn-go-colorable-9fdad7c.tar.gz https://github.com/mattn/go-runewidth/archive/d037b52.tar.gz -> github.com-mattn-go-runewidth-d037b52.tar.gz https://github.com/schachmat/ingo/archive/fab41e4.tar.gz -> github.com-schachmat-ingo-fab41e4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	golang-common	0e35c9d692b2180a238dc9abf795c514	golang-single	5d5a376ad018d27d64cc6aa51bb211a5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=299a091de65f85cd2596472600822d24
diff --git a/metadata/md5-cache/app-misc/wego-2.1 b/metadata/md5-cache/app-misc/wego-2.1
new file mode 100644
index 000000000000..f82c917d7f01
--- /dev/null
+++ b/metadata/md5-cache/app-misc/wego-2.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Wego is a weather client for the terminal
+EAPI=8
+HOMEPAGE=https://github.com/schachmat/wego
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=BSD ISC MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/schachmat/wego/archive/refs/tags/2.1.tar.gz -> wego-2.1.tar.gz mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.12.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.12.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.14.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.14.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/schachmat/ingo/@v/v0.0.0-20170403011506-a4bdc0729a3f.zip -> github.com%2Fschachmat%2Fingo%2F@v%2Fv0.0.0-20170403011506-a4bdc0729a3f.zip mirror://goproxy//github.com/schachmat/ingo/@v/v0.0.0-20170403011506-a4bdc0729a3f.mod -> github.com%2Fschachmat%2Fingo%2F@v%2Fv0.0.0-20170403011506-a4bdc0729a3f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210927094055-39ccf1dd6fa6.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210927094055-39ccf1dd6fa6.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.mod
+_eclasses_=go-module	4c4b34f361efda91762ffeda8f632c02
+_md5_=162e41b80d914c85844a07734a6278f4
diff --git a/metadata/md5-cache/app-portage/gemato-16.2 b/metadata/md5-cache/app-portage/gemato-16.2
deleted file mode 100644
index 59ca97bb6a0d..000000000000
--- a/metadata/md5-cache/app-portage/gemato-16.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-crypt/gnupg-2.2.20-r1 >=dev-python/pytest-5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[threads(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[threads(+)] ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=7
-HOMEPAGE=https://github.com/projg2/gemato
-INHERIT=distutils-r1
-IUSE=+gpg tools test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[threads(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/gemato/gemato-16.2.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=dc7d96d6a2690f6cd7162ebd8e1fdad2
diff --git a/metadata/md5-cache/app-portage/gemato-17.0 b/metadata/md5-cache/app-portage/gemato-17.0
index bd9966c8d48f..a41e8f6512e5 100644
--- a/metadata/md5-cache/app-portage/gemato-17.0
+++ b/metadata/md5-cache/app-portage/gemato-17.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/gemato
 INHERIT=distutils-r1
 IUSE=+gpg pretty-log tools test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pretty-log? ( dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[threads(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-17.0.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9179068bd998779ad659d4cbffb428c9
+_md5_=c53f26ba6bb9d989bbf5e01fe0c52167
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-28 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-28
deleted file mode 100644
index 4a8a8de34286..000000000000
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-28
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handy scripts for ebuild development and more
-EAPI=8
-HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
-SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v28.tar.gz -> mgorny-dev-scripts-28.tar.gz
-_md5_=a04b75632e172746fe4fd620e60c098d
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-29 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-29
deleted file mode 100644
index 4eab3532832a..000000000000
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-29
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handy scripts for ebuild development and more
-EAPI=8
-HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
-SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v29.tar.gz -> mgorny-dev-scripts-29.tar.gz
-_md5_=2616dfe4bb55e89baa6bd50a276c10f2
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-30 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-30
deleted file mode 100644
index 401216777982..000000000000
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-30
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handy scripts for ebuild development and more
-EAPI=8
-HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
-SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v30.tar.gz -> mgorny-dev-scripts-30.tar.gz
-_md5_=2616dfe4bb55e89baa6bd50a276c10f2
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-31 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-31
index fd8381198d27..97594ae1c071 100644
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-31
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-31
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Handy scripts for ebuild development and more
 EAPI=8
 HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
 SLOT=0
 SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v31.tar.gz -> mgorny-dev-scripts-31.tar.gz
-_md5_=2616dfe4bb55e89baa6bd50a276c10f2
+_md5_=a04b75632e172746fe4fd620e60c098d
diff --git a/metadata/md5-cache/app-portage/nattka-0.3.1 b/metadata/md5-cache/app-portage/nattka-0.3.1
deleted file mode 100644
index 33fd71e74fad..000000000000
--- a/metadata/md5-cache/app-portage/nattka-0.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/flit_core-3.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/vcrpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/sphinx-5.3.0 ) test? ( dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/pkgcheck[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git sys-apps/pkgcore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] depgraph-order? ( dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A New Arch Tester Toolkit -- open-source stable-bot replacement
-EAPI=8
-HOMEPAGE=https://github.com/projg2/nattka/
-INHERIT=distutils-r1
-IUSE=depgraph-order doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/pkgcheck[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git sys-apps/pkgcore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] depgraph-order? ( dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/nattka/archive/v0.3.1.tar.gz -> nattka-0.3.1.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a5f4578f943cb3a7b9359e87a10d3db0
diff --git a/metadata/md5-cache/app-portage/nattka-0.4 b/metadata/md5-cache/app-portage/nattka-0.4
index 50718b670185..9f2c1bbe1126 100644
--- a/metadata/md5-cache/app-portage/nattka-0.4
+++ b/metadata/md5-cache/app-portage/nattka-0.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/nattka/
 INHERIT=distutils-r1
 IUSE=depgraph-order doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/pkgcheck[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git sys-apps/pkgcore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] depgraph-order? ( dev-python/networkx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/nattka/archive/v0.4.tar.gz -> nattka-0.4.gh.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=761235aad3634b9d43e5e823f95c746d
+_md5_=95465bc04a45239ce4a1955afa2bb3c5
diff --git a/metadata/md5-cache/app-shells/antibody-2.2.2 b/metadata/md5-cache/app-shells/antibody-2.2.2
deleted file mode 100644
index df078319057a..000000000000
--- a/metadata/md5-cache/app-shells/antibody-2.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/go:0=
-DESCRIPTION=A faster and simpler antigen written in Golang
-EAPI=7
-HOMEPAGE=https://github.com/getantibody/antibody
-INHERIT=golang-single
-IUSE=debug pie
-KEYWORDS=amd64 arm x86
-LICENSE=MIT
-RDEPEND=app-shells/zsh[unicode] dev-vcs/git
-RESTRICT=mirror strip test
-SLOT=0
-SRC_URI=https://github.com/getantibody/antibody/archive/v2.2.2.tar.gz -> antibody-2.2.2.tar.gz https://github.com/getantibody/folder/archive/479aa91.tar.gz -> github.com-getantibody-folder-479aa91.tar.gz https://github.com/caarlos0/gohome/archive/321f486.tar.gz -> github.com-caarlos0-gohome-321f486.tar.gz https://github.com/kardianos/osext/archive/c2c54e5.tar.gz -> github.com-kardianos-osext-c2c54e5.tar.gz https://github.com/urfave/cli/archive/0bdedde.tar.gz -> github.com-urfave-cli-0bdedde.tar.gz https://github.com/golang/crypto/archive/f6b343c.tar.gz -> github.com-golang-crypto-f6b343c.tar.gz https://github.com/golang/sync/archive/450f422.tar.gz -> github.com-golang-sync-450f422.tar.gz https://github.com/golang/net/archive/69d4b8a.tar.gz -> github.com-golang-net-69d4b8a.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	golang-common	0e35c9d692b2180a238dc9abf795c514	golang-single	5d5a376ad018d27d64cc6aa51bb211a5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=89c1d8fd5433b40074275d327879b40e
diff --git a/metadata/md5-cache/app-shells/antibody-6.1.0 b/metadata/md5-cache/app-shells/antibody-6.1.0
new file mode 100644
index 000000000000..33bd961ee89a
--- /dev/null
+++ b/metadata/md5-cache/app-shells/antibody-6.1.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Fast Zsh plugin manager
+EAPI=7
+HOMEPAGE=https://getantibody.github.io/
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-shells/zsh[unicode] dev-vcs/git
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/getantibody/antibody/archive/v6.1.0.tar.gz -> antibody-6.1.0.tar.gz mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/getantibody/folder/@v/v1.0.0.zip -> github.com%2Fgetantibody%2Ffolder%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/getantibody/folder/@v/v1.0.0.mod -> github.com%2Fgetantibody%2Ffolder%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
+_eclasses_=go-module	4c4b34f361efda91762ffeda8f632c02
+_md5_=555b645327cd21b7e838800406ce6524
diff --git a/metadata/md5-cache/app-shells/antibody-6.1.1 b/metadata/md5-cache/app-shells/antibody-6.1.1
new file mode 100644
index 000000000000..6ac2f1b31c3f
--- /dev/null
+++ b/metadata/md5-cache/app-shells/antibody-6.1.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Fast Zsh plugin manager
+EAPI=7
+HOMEPAGE=https://getantibody.github.io/
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-shells/zsh[unicode] dev-vcs/git
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/getantibody/antibody/archive/v6.1.1.tar.gz -> antibody-6.1.1.tar.gz mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/getantibody/folder/@v/v1.0.0.zip -> github.com%2Fgetantibody%2Ffolder%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/getantibody/folder/@v/v1.0.0.mod -> github.com%2Fgetantibody%2Ffolder%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
+_eclasses_=go-module	4c4b34f361efda91762ffeda8f632c02
+_md5_=a87f75571f7ed89efc06b9c5701320bf
diff --git a/metadata/md5-cache/app-shells/powerline-go-1.21.0 b/metadata/md5-cache/app-shells/powerline-go-1.21.0
new file mode 100644
index 000000000000..a2d1532af44b
--- /dev/null
+++ b/metadata/md5-cache/app-shells/powerline-go-1.21.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A powerline like prompt for Bash, Zsh, Fish written in Go lang.
+EAPI=7
+HOMEPAGE=https://github.com/justjanne/powerline-go
+INHERIT=go-module
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=GPL-3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/justjanne/powerline-go/archive/v1.21.0.tar.gz -> powerline-go-1.21.0.tar.gz mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v3.20.12+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v3.20.12+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210105210732-16f7687f5001.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210105210732-16f7687f5001.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210105210732-16f7687f5001.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210105210732-16f7687f5001.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod
+_eclasses_=go-module	4c4b34f361efda91762ffeda8f632c02
+_md5_=9cab9e87efbe50f1dd1c22f92f8e2014
diff --git a/metadata/md5-cache/app-shells/powerline-go-1.22.1 b/metadata/md5-cache/app-shells/powerline-go-1.22.1
new file mode 100644
index 000000000000..af378f850fc7
--- /dev/null
+++ b/metadata/md5-cache/app-shells/powerline-go-1.22.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A powerline like prompt for Bash, Zsh, Fish written in Go lang.
+EAPI=8
+HOMEPAGE=https://github.com/justjanne/powerline-go
+INHERIT=go-module
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=GPL-3 MIT Apache-2.0 BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/justjanne/powerline-go/archive/v1.22.1.tar.gz -> powerline-go-1.22.1.tar.gz mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.22.3.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.22.3.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.22.3.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.22.3.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//github.com/tklauser/numcpus/@v/v0.4.0.zip -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/tklauser/numcpus/@v/v0.4.0.mod -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.6.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.6.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.7.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.7.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//github.com/lufia/plan9stats/@v/v0.0.0-20211012122336-39d0f177ccd0.zip -> github.com%2Flufia%2Fplan9stats%2F@v%2Fv0.0.0-20211012122336-39d0f177ccd0.zip mirror://goproxy//github.com/lufia/plan9stats/@v/v0.0.0-20211012122336-39d0f177ccd0.mod -> github.com%2Flufia%2Fplan9stats%2F@v%2Fv0.0.0-20211012122336-39d0f177ccd0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/power-devops/perfstat/@v/v0.0.0-20210106213030-5aafc221ea8c.zip -> github.com%2Fpower-devops%2Fperfstat%2F@v%2Fv0.0.0-20210106213030-5aafc221ea8c.zip mirror://goproxy//github.com/power-devops/perfstat/@v/v0.0.0-20210106213030-5aafc221ea8c.mod -> github.com%2Fpower-devops%2Fperfstat%2F@v%2Fv0.0.0-20210106213030-5aafc221ea8c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201204225414-ed752295db88.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201204225414-ed752295db88.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201204225414-ed752295db88.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201204225414-ed752295db88.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.10.zip -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.10.zip mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.10.mod -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/yusufpapurcu/wmi/@v/v1.2.2.zip -> github.com%2Fyusufpapurcu%2Fwmi%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/yusufpapurcu/wmi/@v/v1.2.2.mod -> github.com%2Fyusufpapurcu%2Fwmi%2F@v%2Fv1.2.2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20220128215802-99c3d69c2c27.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220128215802-99c3d69c2c27.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20220128215802-99c3d69c2c27.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220128215802-99c3d69c2c27.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.66.4.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.66.4.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.66.4.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.66.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod
+_eclasses_=go-module	4c4b34f361efda91762ffeda8f632c02
+_md5_=8deff88f9299785a0ad8c11de87e7219
diff --git a/metadata/md5-cache/app-shells/powerline-go-1.8.2 b/metadata/md5-cache/app-shells/powerline-go-1.8.2
deleted file mode 100644
index b6f5c3d81d55..000000000000
--- a/metadata/md5-cache/app-shells/powerline-go-1.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/go:0=
-DESCRIPTION=A beautiful and useful low-latency prompt for your shell
-EAPI=7
-HOMEPAGE=https://github.com/justjanne/powerline-go
-INHERIT=golang-single
-IUSE=debug pie
-KEYWORDS=amd64 x86 arm
-LICENSE=GPL-3
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=https://github.com/justjanne/powerline-go/archive/v1.8.2.tar.gz -> powerline-go-1.8.2.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8.tar.gz -> github.com-mattn-go-runewidth-9e777a8.tar.gz https://github.com/golang/crypto/archive/1875d0a.tar.gz -> github.com-golang-crypto-1875d0a.tar.gz https://github.com/golang/sys/archive/37707fd.tar.gz -> github.com-golang-sys-37707fd.tar.gz https://github.com/golang/text/archive/c4d099d.tar.gz -> github.com-golang-text-c4d099d.tar.gz https://github.com/go-yaml/yaml/archive/d670f94.tar.gz -> github.com-go-yaml-yaml-d670f94.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	golang-common	0e35c9d692b2180a238dc9abf795c514	golang-single	5d5a376ad018d27d64cc6aa51bb211a5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bb73af0706fbb63c371365f46b5e44f3
diff --git a/metadata/md5-cache/app-text/docx2txt-1.4 b/metadata/md5-cache/app-text/docx2txt-1.4
index 3a2ff7c66567..669bd05f985d 100644
--- a/metadata/md5-cache/app-text/docx2txt-1.4
+++ b/metadata/md5-cache/app-text/docx2txt-1.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Convert MS Office docx files to plain text
 EAPI=7
 HOMEPAGE=http://docx2txt.sourceforge.net/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=app-arch/unzip dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/docx2txt/docx2txt-1.4.tgz
-_md5_=f0a19153c16b414232ad33ec883f3f9d
+_md5_=a5a933019d53e8db79f50468695209cc
diff --git a/metadata/md5-cache/dev-db/mongodb-5.0.5-r2 b/metadata/md5-cache/dev-db/mongodb-5.0.5-r2
index b3a2c75219a5..41caa4e546e6 100644
--- a/metadata/md5-cache/dev-db/mongodb-5.0.5-r2
+++ b/metadata/md5-cache/dev-db/mongodb-5.0.5-r2
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r5.0.5.tar.gz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=df1eb04e5919fceb73b2dc3737b1c440
+_md5_=b1881782accb056fc308a281157d83cd
diff --git a/metadata/md5-cache/dev-libs/aml-0.2.2 b/metadata/md5-cache/dev-libs/aml-0.2.2
index 67ff64563a70..50759873eeb0 100644
--- a/metadata/md5-cache/dev-libs/aml-0.2.2
+++ b/metadata/md5-cache/dev-libs/aml-0.2.2
@@ -6,9 +6,9 @@ EAPI=8
 HOMEPAGE=https://github.com/any1/aml/
 INHERIT=meson
 IUSE=examples
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://github.com/any1/aml/archive/v0.2.2.tar.gz -> aml-0.2.2.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f43eeeef3993d93fb5017f228ac1593f
+_md5_=17d8db45226bee7d6c72b6376e7fd4ad
diff --git a/metadata/md5-cache/dev-libs/libedit-20221030.3.1 b/metadata/md5-cache/dev-libs/libedit-20221030.3.1
index ac6a131f77ed..973a0b2696ba 100644
--- a/metadata/md5-cache/dev-libs/libedit-20221030.3.1
+++ b/metadata/md5-cache/dev-libs/libedit-20221030.3.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://thrysoee.dk/editline/
 INHERIT=multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://thrysoee.dk/editline/libedit-20221030-3.1.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=cff800dcf58e34023b46f019075435b9
+_md5_=4f7726c5e3a008b3b0e49f0bad30220f
diff --git a/metadata/md5-cache/dev-libs/tlsh-4.8.2 b/metadata/md5-cache/dev-libs/tlsh-4.8.2
index 7ab6104688a4..ef6eb78c32f1 100644
--- a/metadata/md5-cache/dev-libs/tlsh-4.8.2
+++ b/metadata/md5-cache/dev-libs/tlsh-4.8.2
@@ -4,9 +4,9 @@ DESCRIPTION=Fuzzy matching library
 EAPI=8
 HOMEPAGE=https://github.com/trendmicro/tlsh
 INHERIT=cmake
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc64 x86
 LICENSE=|| ( Apache-2.0 BSD )
 SLOT=0
 SRC_URI=https://github.com/trendmicro/tlsh/archive/4.8.2.tar.gz -> tlsh-4.8.2.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f102852bc6cec845ceb80c13967b06bc
+_md5_=8b03713a99f583ae93d1f8d89e4551a1
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0-r1 b/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0-r1
index f7fd85b1f4db..34d3a52efd5f 100644
--- a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0-r1
+++ b/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/B-Hooks-OP-Check
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=fcbaf01e9ccf0a19a417099379f632c0
+_md5_=23eb207ecfd6d96a51c6b2d497ad6ab0
diff --git a/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0 b/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
index a89789a4a916..aea2fe25ff14 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBIx-Simple
 INHERIT=perl-module
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( AFL-3.0 AGPL-3 APL-1.0 Apache-2.0 BSD-2 Boost-1.0 CDDL CPAL-1.0 EPL-1.0 ECL-2.0 EUPL-1.1 GPL-2 GPL-3 LGPL-2.1 LGPL-3 HPND IBM IPAfont ISC LPPL-1.3c 9base MIT MPL-2.0 NOSA nethack PHP-3 POSTGRESQL PYTHON CNRI QPL-1.0 OFL-1.1 Sleepycat Watcom-1.0 W3C wxWinLL-3 ZLIB libpng )
 RDEPEND=>=dev-perl/DBI-1.210.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.37.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=03243ca8cc3c963e0b1be0631e93caf8
+_md5_=5e31058eaa113b8773b6411d344eccb7
diff --git a/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0 b/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0
index ba4a141013c4..cfcf2b40af07 100644
--- a/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0
+++ b/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Abstract
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~mips ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Simple-1.998 dev-perl/MRO-Compat >=dev-perl/Module-Pluggable-1.500.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.009.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=8f903c9bb151d920ba220bdba9f73d79
+_md5_=9e6143dcf306c9e7a9af3096ea46404e
diff --git a/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1 b/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1
index 0ccb94ed846a..77ae06e0878e 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Address
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=138da1d9ca9ff4bcc9a3933da6955771
+_md5_=cf310f22cab186dc90ed0638eb3b6b13
diff --git a/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0 b/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0
index ddaae11692e7..0ed6f6221942 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Address-XS
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) MIT
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.05.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=0f5aaf3d1c39ee47b57ab6ed65e95fef
+_md5_=2bfd6462e9c757718001ad7ce42c04ce
diff --git a/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0-r1 b/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0-r1
index 027318ed480e..81dd527a59c3 100644
--- a/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Date-Format
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Time-Local dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.005.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=3d78627442680793fb525845c177eeab
+_md5_=23f6569437cea7e177c29dcead9f3bc5
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-1.952.0 b/metadata/md5-cache/dev-perl/Email-MIME-1.952.0
index e13373eb8db1..a1a3de0532e2 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-1.952.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-1.952.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-MIME
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ppc ppc64 ~riscv x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Email-Address-XS >=dev-perl/Email-MIME-ContentType-1.23.0 >=dev-perl/Email-MIME-Encodings-1.314.0 dev-perl/Email-MessageID >=dev-perl/Email-Simple-2.212.0 >=virtual/perl-Encode-1.980.100 virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.130.0 dev-perl/Module-Runtime virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.952.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=4b2470e5ab5ebd8236428737ca5df756
+_md5_=d733ff05a5c647e6ca9022bc9eeea3b1
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0 b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
index 337c78c7530c..ede984320c6e 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-MIME-ContentType
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ppc ppc64 ~riscv x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.870.0 >=virtual/perl-Exporter-5.570.0 dev-perl/Text-Unidecode dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.026.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=cabbc95b26a726c3e6521bb042b953e3
+_md5_=40a3c292b4db0913c2db8516c9ca7ac8
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2 b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2
index 4b4be4e13cbb..65606f97b7b8 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-MIME-Encodings
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-MIME-Base64-3.50.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=d07850e0869e5fa17be9df9cbdc7a5df
+_md5_=412fd6c9249afe6253f628f4ea5459ce
diff --git a/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1 b/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1
index f3a6043f29cd..3abfa3b74ae2 100644
--- a/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-MessageID
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ppc ppc64 ~riscv x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=b060010f8f60285b9ee601dee8a4c081
+_md5_=455e31e7ccb89c7f5d3800dba677f412
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-2.500.0 b/metadata/md5-cache/dev-perl/Email-Sender-2.500.0
index 8249367091d2..7699842ff01d 100644
--- a/metadata/md5-cache/dev-perl/Email-Sender-2.500.0
+++ b/metadata/md5-cache/dev-perl/Email-Sender-2.500.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Sender
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~ppc ~riscv x86
+KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Abstract-3.6.0 dev-perl/Email-Address >=dev-perl/Email-Simple-1.998.0 >=virtual/perl-File-Path-2.60.0 virtual/perl-File-Spec >=virtual/perl-IO-1.110.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Module-Runtime >=dev-perl/Moo-2.0.0 >=dev-perl/MooX-Types-MooseLike-0.150.0 >=virtual/perl-libnet-3.70.0 dev-perl/Sub-Exporter >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-2.500.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=0d0cfb4c1dbc372e6a8543ca7f7cd618
+_md5_=5d151cc72e8d98e34ecbcff0537672dc
diff --git a/metadata/md5-cache/dev-perl/Email-Simple-2.216.0 b/metadata/md5-cache/dev-perl/Email-Simple-2.216.0
index 6379285f2deb..7e796ba043d8 100644
--- a/metadata/md5-cache/dev-perl/Email-Simple-2.216.0
+++ b/metadata/md5-cache/dev-perl/Email-Simple-2.216.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-Simple
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~mips ppc ppc64 ~riscv x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Email-Date-Format dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.216.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=a3b5be4d5e500fdf4670697962bb5ec2
+_md5_=060b10c44157c839e6b38b3180491ca2
diff --git a/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r2 b/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r2
index bc58c4a198d1..046ac988796f 100644
--- a/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r2
+++ b/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Multiplex
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=e0f5cd7afe047ed721f14147fb3e0c4a
+_md5_=288d2ecc7a808ea8d69747b617e533b6
diff --git a/metadata/md5-cache/dev-perl/MIME-Types-2.240.0 b/metadata/md5-cache/dev-perl/MIME-Types-2.240.0
index 4a0c793cae38..f5546ca1a536 100644
--- a/metadata/md5-cache/dev-perl/MIME-Types-2.240.0
+++ b/metadata/md5-cache/dev-perl/MIME-Types-2.240.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/MIME-Types
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.24.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=1f8c4e941175c4bb1150524544a93591
+_md5_=cc48c812ce415b334c628ac85d6078d5
diff --git a/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1 b/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
index 610e69074ef1..14cee529e40f 100644
--- a/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
+++ b/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-DMARC
 INHERIT=perl-module
 IUSE=minimal test
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Mail-DKIM dev-perl/Net-IMAP-Simple dev-perl/Net-SMTPS ) virtual/perl-Carp dev-perl/Config-Tiny >=dev-perl/DBD-SQLite-1.310.0 >=dev-perl/DBIx-Simple-1.350.0 virtual/perl-Data-Dumper dev-perl/Email-MIME >=dev-perl/Email-Sender-1.300.32 dev-perl/Email-Simple virtual/perl-Encode dev-perl/File-ShareDir virtual/perl-Getopt-Long virtual/perl-HTTP-Tiny virtual/perl-IO virtual/perl-IO-Compress dev-perl/IO-Socket-SSL dev-perl/libwww-perl dev-perl/Mail-DKIM dev-perl/Net-DNS dev-perl/Net-HTTP dev-perl/Net-IDN-Encode dev-perl/Net-IP dev-perl/Net-SMTPS dev-perl/Net-SSLeay >=dev-perl/Net-Server-2 virtual/perl-Socket >=dev-perl/Socket6-0.230.0 virtual/perl-Sys-Syslog dev-perl/Test-File-ShareDir dev-perl/URI dev-perl/XML-LibXML virtual/perl-parent >=dev-perl/Regexp-Common-2013031301 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DMARC-1.20210927.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=e7086411e44d2cb3741c4eae29139f72
+_md5_=1521ea814e7a6e5db853b0e586d90b9e
diff --git a/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0-r1 b/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0-r1
index 54c4cb87608a..970134a97a09 100644
--- a/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0-r1
+++ b/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/MooX-Types-MooseLike
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/strictures-2 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Moo-1.4.2 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-0.29.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=4eb2e95f653cdb36ae9bcacc1c9b8881
+_md5_=b2a666a18f546307280be46d1a486a2d
diff --git a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200 b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
index 24176d2e4c78..4fe7af3c6a8f 100644
--- a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
+++ b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-IMAP-Simple
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-perl/Parse-RecDescent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JETTERO/Net-IMAP-Simple-1.2212.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=fc4a5e4a36a1fc3e0237e717442f64ec
+_md5_=3ea7bae9394511de5088f3745e6b38ed
diff --git a/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0 b/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
index 107ab2573133..86f3da109f4b 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
+++ b/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-SMTPS
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Authen-SASL-2.0.0 >=dev-perl/IO-Socket-SSL-1.0.0 >=virtual/perl-libnet-2.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOMO/src/Net-SMTPS-0.10.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=bc5c8d97771d32c97daa3fe0656dcbe9
+_md5_=4ac0f67ce76a604d48cfbb01ba21a9d5
diff --git a/metadata/md5-cache/dev-perl/Net-Server-2.10.0 b/metadata/md5-cache/dev-perl/Net-Server-2.10.0
index 86fec6fdb9f5..2cab0dcab44a 100644
--- a/metadata/md5-cache/dev-perl/Net-Server-2.10.0
+++ b/metadata/md5-cache/dev-perl/Net-Server-2.10.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-Server
 INHERIT=perl-module
 IUSE=ipv6 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-HiRes dev-perl/IO-Multiplex ipv6? ( dev-perl/IO-Socket-INET6 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.010.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=3703c3fc02d70574b7f3c61056a8ca31
+_md5_=f6970c17dbb52b095b8c0a0e7556c2f8
diff --git a/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0-r1 b/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0-r1
index 9c2e547a27e4..a715e9140666 100644
--- a/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Regexp-Common
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic Artistic-2 MIT BSD )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=e5c053894d9362dc2dcd90a36c876447
+_md5_=8963163a77b361703d392de649491bf5
diff --git a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1 b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1
index f9b6f4d480eb..9bc4a640b8e2 100644
--- a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Sub-Override
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=41a28457825edeb5a77ca2f2d2f1b6be
+_md5_=7199a77a5acf9c5661499d78c7e52338
diff --git a/metadata/md5-cache/dev-perl/Test-MockObject-1.202.1.220 b/metadata/md5-cache/dev-perl/Test-MockObject-1.202.1.220
index 85edaf5c3a58..55b73802c044 100644
--- a/metadata/md5-cache/dev-perl/Test-MockObject-1.202.1.220
+++ b/metadata/md5-cache/dev-perl/Test-MockObject-1.202.1.220
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-MockObject
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils >=dev-perl/UNIVERSAL-can-1.201.106.170 >=dev-perl/UNIVERSAL-isa-1.201.106.140 virtual/perl-Test-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20200122.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=54d870f3ec73a0629be76225ae467cdd
+_md5_=6b64d114b7eb8a3495e99d0f0ec287e8
diff --git a/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0-r1 b/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0-r1
index b9f8a4f252e8..ed2e8b370b65 100644
--- a/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Regexp
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=virtual/perl-Test-Simple virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Test-Regexp-2017040101.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=e822b0ca7d927655f2c267bbd57ff3b1
+_md5_=777b5fb6ed1f58da8e16d6ff90dad585
diff --git a/metadata/md5-cache/dev-perl/Throwable-1.0.0 b/metadata/md5-cache/dev-perl/Throwable-1.0.0
index e6c46280bc73..7b2367152220 100644
--- a/metadata/md5-cache/dev-perl/Throwable-1.0.0
+++ b/metadata/md5-cache/dev-perl/Throwable-1.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Throwable
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~ppc ~riscv x86
+KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Devel-StackTrace-1.320.0 >=dev-perl/Module-Runtime-0.2.0 >=dev-perl/Moo-1.0.1 virtual/perl-Scalar-List-Utils dev-perl/Sub-Quote dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Throwable-1.000.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=4cefffb8f383d7ace6f8ef19deeedba6
+_md5_=6ed8cd432c432bbfef9f9ee62ef49907
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280-r1 b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280-r1
index c4d1ea052eaa..4571d06ee012 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280-r1
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/UNIVERSAL-can
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=93de47081f1f60e360a55b866d801fb5
+_md5_=1373bf3dc6f137af8943a3c4be706590
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120-r1 b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120-r1
index 205366f581e0..41d4a5c360d9 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120-r1
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/UNIVERSAL-isa
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20171012.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=c926769ee099d9917deadfa78ebc9c9b
+_md5_=e20e8e5de4d6e5fb48446a8c48c0a78e
diff --git a/metadata/md5-cache/dev-perl/bareword-filehandles-0.7.0-r1 b/metadata/md5-cache/dev-perl/bareword-filehandles-0.7.0-r1
index b5efaaaf48ac..2cbca5f8e714 100644
--- a/metadata/md5-cache/dev-perl/bareword-filehandles-0.7.0-r1
+++ b/metadata/md5-cache/dev-perl/bareword-filehandles-0.7.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/bareword-filehandles
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/B-Hooks-OP-Check virtual/perl-if virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/bareword-filehandles-0.007.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=34149dd4ac294488e5d571f6d00a5b83
+_md5_=726ccbe7237e3112349400533ed51b2f
diff --git a/metadata/md5-cache/dev-perl/indirect-0.390.0 b/metadata/md5-cache/dev-perl/indirect-0.390.0
index b8e44d463850..53715def16f6 100644
--- a/metadata/md5-cache/dev-perl/indirect-0.390.0
+++ b/metadata/md5-cache/dev-perl/indirect-0.390.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/indirect
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/indirect-0.39.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=0be91e0238ffca5c3403178c66ee53d7
+_md5_=fc6e751daafdff3172aad81e7852424a
diff --git a/metadata/md5-cache/dev-perl/multidimensional-0.14.0 b/metadata/md5-cache/dev-perl/multidimensional-0.14.0
index 6393f8099334..76980134ce2c 100644
--- a/metadata/md5-cache/dev-perl/multidimensional-0.14.0
+++ b/metadata/md5-cache/dev-perl/multidimensional-0.14.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/multidimensional
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-OP-Check-0.190.0 virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/multidimensional-0.014.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=7062f0e9f3def720df4cb21680a73673
+_md5_=7a90229c2353b5b0a8861704ea8cf0b6
diff --git a/metadata/md5-cache/dev-perl/strictures-2.0.6 b/metadata/md5-cache/dev-perl/strictures-2.0.6
index 1c15dce23d64..6323952d7f92 100644
--- a/metadata/md5-cache/dev-perl/strictures-2.0.6
+++ b/metadata/md5-cache/dev-perl/strictures-2.0.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/strictures
 INHERIT=perl-module
 IUSE=minimal test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/bareword-filehandles dev-perl/indirect dev-perl/multidimensional ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000006.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=10b6c558ce88cef94094e2569a254e4d
+_md5_=23667ade90f27d330c59e7235830b1fe
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.2.5 b/metadata/md5-cache/dev-python/ansible-compat-2.2.5
deleted file mode 100644
index d37396583905..000000000000
--- a/metadata/md5-cache/dev-python/ansible-compat-2.2.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-7.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-plus[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/ansible-pygments[python_targets_python3_11(-)] dev-python/myst_parser[python_targets_python3_11(-)] dev-python/sphinx_ansible_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 >=dev-python/sphinx-5.3.0[python_targets_python3_7(-)] dev-python/ansible-pygments[python_targets_python3_7(-)] dev-python/myst_parser[python_targets_python3_7(-)] dev-python/sphinx_ansible_theme[python_targets_python3_7(-)] ) ) ) test? ( >=app-admin/ansible-core-2.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Contains functions that facilitate working with various versions of Ansible
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv
-LICENSE=MIT
-RDEPEND=>=app-admin/ansible-core-2.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.2.5.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9f58e9180e6bee24fb923b6678441006
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.2.6 b/metadata/md5-cache/dev-python/ansible-compat-2.2.6
deleted file mode 100644
index bb978fc0e383..000000000000
--- a/metadata/md5-cache/dev-python/ansible-compat-2.2.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-7.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-plus[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/ansible-pygments[python_targets_python3_11(-)] dev-python/myst_parser[python_targets_python3_11(-)] dev-python/sphinx_ansible_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 >=dev-python/sphinx-5.3.0[python_targets_python3_7(-)] dev-python/ansible-pygments[python_targets_python3_7(-)] dev-python/myst_parser[python_targets_python3_7(-)] dev-python/sphinx_ansible_theme[python_targets_python3_7(-)] ) ) ) test? ( >=app-admin/ansible-core-2.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Contains functions that facilitate working with various versions of Ansible
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=>=app-admin/ansible-core-2.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.2.6.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c337271cb4c375ba7c2183f4f37f0061
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.2.7 b/metadata/md5-cache/dev-python/ansible-compat-2.2.7
index 84b7ceeb63cb..338a235dbb03 100644
--- a/metadata/md5-cache/dev-python/ansible-compat-2.2.7
+++ b/metadata/md5-cache/dev-python/ansible-compat-2.2.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=MIT
 RDEPEND=>=app-admin/ansible-core-2.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.2.7.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c337271cb4c375ba7c2183f4f37f0061
+_md5_=9f58e9180e6bee24fb923b6678441006
diff --git a/metadata/md5-cache/dev-python/cbor2-5.4.3 b/metadata/md5-cache/dev-python/cbor2-5.4.3
deleted file mode 100644
index ed96d4432bc0..000000000000
--- a/metadata/md5-cache/dev-python/cbor2-5.4.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-61[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-6.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python CBOR (de)serializer with extensive tag support
-EAPI=8
-HOMEPAGE=https://github.com/agronholm/cbor2/ https://pypi.org/project/cbor2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cbor2/cbor2-5.4.3.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=039741a0204aed0319dba15f8e78a7e6
diff --git a/metadata/md5-cache/dev-python/cbor2-5.4.4 b/metadata/md5-cache/dev-python/cbor2-5.4.4
deleted file mode 100644
index f5cd7c5d8e1d..000000000000
--- a/metadata/md5-cache/dev-python/cbor2-5.4.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-61[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-6.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python CBOR (de)serializer with extensive tag support
-EAPI=8
-HOMEPAGE=https://github.com/agronholm/cbor2/ https://pypi.org/project/cbor2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cbor2/cbor2-5.4.4.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d69152e93fb1ab784f45bc9392fc717f
diff --git a/metadata/md5-cache/dev-python/cbor2-5.4.5 b/metadata/md5-cache/dev-python/cbor2-5.4.5
deleted file mode 100644
index 422889455a6d..000000000000
--- a/metadata/md5-cache/dev-python/cbor2-5.4.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-61[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-6.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python CBOR (de)serializer with extensive tag support
-EAPI=8
-HOMEPAGE=https://github.com/agronholm/cbor2/ https://pypi.org/project/cbor2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cbor2/cbor2-5.4.5.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d69152e93fb1ab784f45bc9392fc717f
diff --git a/metadata/md5-cache/dev-python/cbor2-5.4.6 b/metadata/md5-cache/dev-python/cbor2-5.4.6
index 6621617ed855..25b2d7cc08b2 100644
--- a/metadata/md5-cache/dev-python/cbor2-5.4.6
+++ b/metadata/md5-cache/dev-python/cbor2-5.4.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/agronholm/cbor2/ https://pypi.org/project/cbor2/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cbor2/cbor2-5.4.6.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=dbc04ebaad19a5d1eaf19698210c0011
+_md5_=039741a0204aed0319dba15f8e78a7e6
diff --git a/metadata/md5-cache/dev-python/libarchive-c-4.0 b/metadata/md5-cache/dev-python/libarchive-c-4.0
index 424f50c44e9e..e2d8a3aa67c8 100644
--- a/metadata/md5-cache/dev-python/libarchive-c-4.0
+++ b/metadata/md5-cache/dev-python/libarchive-c-4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc64 x86
 LICENSE=CC0-1.0
 RDEPEND=app-arch/libarchive python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Changaco/python-libarchive-c/archive/refs/tags/4.0.tar.gz -> libarchive-c-4.0.gh.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ecdd257f602104cf07799f4538a6a7c0
+_md5_=f7b927a601642b2f06fc4d9a1953e22a
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-8.5.10 b/metadata/md5-cache/dev-python/mkdocs-material-8.5.10
deleted file mode 100644
index c3bd81dff01d..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-material-8.5.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material-extensions[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-redirects[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material-extensions[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material-extensions[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-material-extensions[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/mkdocs[python_targets_python3_7(-)] dev-python/mkdocs-material-extensions[python_targets_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-)] dev-python/mkdocs-redirects[python_targets_python3_7(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Material Design theme for MkDocs
-EAPI=8
-HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
-INHERIT=distutils-r1 docs
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-PDEPEND=>=dev-python/mkdocs-material-extensions-1.0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/jinja-3.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.12[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/8.5.10.tar.gz -> mkdocs-material-8.5.10.gh.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	docs	314e509c51630fb75f120d62a77d008c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=731aa9d063a6092315e6f36a56934bd3
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-8.5.11 b/metadata/md5-cache/dev-python/mkdocs-material-8.5.11
index 8cd7235e5b87..9b0bfcc29335 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-8.5.11
+++ b/metadata/md5-cache/dev-python/mkdocs-material-8.5.11
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
 INHERIT=distutils-r1 docs
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 PDEPEND=>=dev-python/mkdocs-material-extensions-1.0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 RDEPEND=>=dev-python/jinja-3.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.12[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 SLOT=0
 SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/8.5.11.tar.gz -> mkdocs-material-8.5.11.gh.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	docs	314e509c51630fb75f120d62a77d008c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=45e009b540b5825c7fd4640187eb97ef
+_md5_=bda76c06b410a7f7fcd84cbdf20f0014
diff --git a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.1 b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.1
deleted file mode 100644
index 4f976e5ebc65..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ~dev-python/mkdocs-minify-plugin-0.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/csscompressor-0.9.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/htmlmin-0.1.12[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsmin-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An MkDocs plugin to minify HTML and/or JS files prior to being written to disk
-EAPI=8
-HOMEPAGE=https://github.com/byrnereese/mkdocs-minify-plugin https://pypi.org/project/mkdocs-minify-plugin/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/csscompressor-0.9.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/htmlmin-0.1.12[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsmin-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/byrnereese/mkdocs-minify-plugin/archive/0.6.1.tar.gz -> mkdocs-minify-plugin-0.6.1.gh.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=40163edd3ebebdc9c95c603423e2802e
diff --git a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.2 b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.2
index 7deb7d160b9f..39288ec1a231 100644
--- a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.2
+++ b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/byrnereese/mkdocs-minify-plugin https://pypi.org/project/mkdocs-minify-plugin/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/csscompressor-0.9.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/htmlmin-0.1.12[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsmin-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/byrnereese/mkdocs-minify-plugin/archive/0.6.2.tar.gz -> mkdocs-minify-plugin-0.6.2.gh.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=0d8d7f88fe9a7b0ad81d404995076166
+_md5_=344957b08c17ff0b1da1812b612312c5
diff --git a/metadata/md5-cache/dev-python/moto-4.0.12 b/metadata/md5-cache/dev-python/moto-4.0.12
index c6ff84920dfa..14a2ff5c8b07 100644
--- a/metadata/md5-cache/dev-python/moto-4.0.12
+++ b/metadata/md5-cache/dev-python/moto-4.0.12
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/spulec/moto/ https://pypi.org/project/moto/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cfn-lint-0.40.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cookies[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/boto3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/botocore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask-cors[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretty-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-jose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-sshpubkeys[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/responses-0.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zipp[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-4.0.12.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=10bb7b5fa3cf29202b0e556af3bdefbe
+_md5_=34f9bbf08e83d6107463992897a52f3a
diff --git a/metadata/md5-cache/dev-python/piexif-1.1.3-r1 b/metadata/md5-cache/dev-python/piexif-1.1.3-r1
deleted file mode 100644
index 8fc7807e71e0..000000000000
--- a/metadata/md5-cache/dev-python/piexif-1.1.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-arch/unzip test? ( dev-python/pillow[jpeg,python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Exif manipulation with pure Python
-EAPI=7
-HOMEPAGE=https://github.com/hMatoba/Piexif https://pypi.org/project/piexif/
-INHERIT=edos2unix distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/piexif/piexif-1.1.3.zip
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f011568b636a7a037903d92ce4949657
diff --git a/metadata/md5-cache/dev-python/piexif-1.1.3-r2 b/metadata/md5-cache/dev-python/piexif-1.1.3-r2
index b338c134a990..428ad31e1796 100644
--- a/metadata/md5-cache/dev-python/piexif-1.1.3-r2
+++ b/metadata/md5-cache/dev-python/piexif-1.1.3-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/hMatoba/Piexif https://pypi.org/project/piexif/
 INHERIT=edos2unix distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/piexif/piexif-1.1.3.zip
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	edos2unix	33e347e171066657f91f8b0c72ec8773	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=2958f63f029927d31c2e62dbb18783c8
+_md5_=d8dbd4ae13edfa95df66b261f51e3e51
diff --git a/metadata/md5-cache/dev-python/pycdio-2.1.1-r1 b/metadata/md5-cache/dev-python/pycdio-2.1.1-r1
new file mode 100644
index 000000000000..0ab926e6718e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycdio-2.1.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/swig test? ( >=dev-libs/libcdio-2.0.0 >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libcdio-2.0.0
+DESCRIPTION=Python OO interface to libcdio (CD Input and Control library)
+EAPI=8
+HOMEPAGE=https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio/
+INHERIT=distutils-r1
+IUSE=examples test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/libcdio-2.0.0 python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pycdio/pycdio-2.1.1.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=4e2f701519d8d36707996624904c7ee4
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.16.0 b/metadata/md5-cache/dev-python/pycryptodome-3.16.0
index b89be904b3bc..dbecc10ae570 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.16.0
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.16.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.pycryptodome.org/ https://github.com/Legrandin/pycryptodome/ https://pypi.org/project/pycryptodome/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 Unlicense
 RDEPEND=dev-libs/gmp:0= >=dev-libs/libtomcrypt-1.18.2-r1:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/pycrypto python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[threads(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Legrandin/pycryptodome/archive/v3.16.0.tar.gz -> pycryptodome-3.16.0.gh.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f36e204edf02c928772b22c74efaea48
+_md5_=f1e7d0245314fe0f3d5b3b337414617e
diff --git a/metadata/md5-cache/dev-python/pycxx-7.1.5-r1 b/metadata/md5-cache/dev-python/pycxx-7.1.5-r1
deleted file mode 100644
index e619af64c0a8..000000000000
--- a/metadata/md5-cache/dev-python/pycxx-7.1.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Set of facilities to extend Python with C++
-EAPI=8
-HOMEPAGE=http://cxx.sourceforge.net
-INHERIT=distutils-r1
-IUSE=doc examples python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://sourceforge/cxx/pycxx-7.1.5.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8022fb9c355e9529bf7d249d44586c6a
diff --git a/metadata/md5-cache/dev-python/pycxx-7.1.7 b/metadata/md5-cache/dev-python/pycxx-7.1.7
index 916ef314c28c..2a292c040829 100644
--- a/metadata/md5-cache/dev-python/pycxx-7.1.7
+++ b/metadata/md5-cache/dev-python/pycxx-7.1.7
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://cxx.sourceforge.net
 INHERIT=distutils-r1
 IUSE=doc examples python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cxx/pycxx-7.1.7.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d697f74b4a7a4065370ce7429a40e48e
+_md5_=617a52e5e3f654e201c6be52416f74e4
diff --git a/metadata/md5-cache/dev-python/pymediainfo-5.1.0-r1 b/metadata/md5-cache/dev-python/pymediainfo-5.1.0-r1
deleted file mode 100644
index 7fe950a874e9..000000000000
--- a/metadata/md5-cache/dev-python/pymediainfo-5.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.0:3.11[xml(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10[xml(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9[xml(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8[xml(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7[xml(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_7(-)] dev-python/alabaster[python_targets_python3_7(-)] ) ( >=dev-python/pypy3-7.3.7:0[xml(+)] >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) test? ( media-libs/libmediainfo >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[xml(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[xml(+)] ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A wrapper around the mediainfo library
-EAPI=7
-HOMEPAGE=https://github.com/sbraz/pymediainfo
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=media-libs/libmediainfo python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[xml(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-5.1.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=167c8b4c374986b3f73b67b8430f10f8
diff --git a/metadata/md5-cache/dev-python/pymediainfo-6.0.1 b/metadata/md5-cache/dev-python/pymediainfo-6.0.1
index a1e408ad8313..1ac24a442215 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-6.0.1
+++ b/metadata/md5-cache/dev-python/pymediainfo-6.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sbraz/pymediainfo
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=media-libs/libmediainfo python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[xml(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[xml(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-6.0.1.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=0df856d6e40b40f28f95b107cbb4bf8e
+_md5_=60aea4256deed0b421776b4ff78d4d53
diff --git a/metadata/md5-cache/dev-python/pysvn-1.9.15-r1 b/metadata/md5-cache/dev-python/pysvn-1.9.15-r1
deleted file mode 100644
index 7883180629ec..000000000000
--- a/metadata/md5-cache/dev-python/pysvn-1.9.15-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/subversion-1.9
-DESCRIPTION=Object-oriented python bindings for subversion
-EAPI=8
-HOMEPAGE=https://pysvn.sourceforge.io/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=doc examples python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/subversion-1.9 python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/pysvn/pysvn/V1.9.15/pysvn-1.9.15.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d8e9114f2ec16de9f543806c19cc79e3
diff --git a/metadata/md5-cache/dev-python/pysvn-1.9.18 b/metadata/md5-cache/dev-python/pysvn-1.9.18
index 7e98956b4be8..a324de337b01 100644
--- a/metadata/md5-cache/dev-python/pysvn-1.9.18
+++ b/metadata/md5-cache/dev-python/pysvn-1.9.18
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pysvn.sourceforge.io/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=doc examples python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=Apache-1.1
 RDEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/subversion-1.9 python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/pysvn/pysvn/V1.9.18/pysvn-1.9.18.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=bae1b4636c544cc46736ecaf4ca8969a
+_md5_=3ae80b12d30409ca31be80dbe559681e
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.31-r1 b/metadata/md5-cache/dev-python/python-xlib-0.31-r1
deleted file mode 100644
index e87eb0887dd8..000000000000
--- a/metadata/md5-cache/dev-python/python-xlib-0.31-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( sys-apps/texinfo ) test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A fully functional X client library for Python, written in Python
-EAPI=8
-HOMEPAGE=https://github.com/python-xlib/python-xlib
-INHERIT=distutils-r1 virtualx
-IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
-LICENSE=LGPL-2+
-RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.31/python-xlib-0.31.tar.bz2
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=fb32297c638f941dc8ecbd62b1c53782
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.32-r1 b/metadata/md5-cache/dev-python/python-xlib-0.32-r1
index 6a24a4fde2a0..03f5e0688495 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.32-r1
+++ b/metadata/md5-cache/dev-python/python-xlib-0.32-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-xlib/python-xlib/ https://pypi.org/project/python-xlib/
 INHERIT=distutils-r1 virtualx
 IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.32/python-xlib-0.32.tar.bz2
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=b8f4e8dc43a322fc73677b547fec73df
+_md5_=b2ce61e46686b74af255076231eb6ca0
diff --git a/metadata/md5-cache/dev-python/rope-1.4.0 b/metadata/md5-cache/dev-python/rope-1.4.0
deleted file mode 100644
index 31c2532a582b..000000000000
--- a/metadata/md5-cache/dev-python/rope-1.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/build[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytoolconfig-1.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python refactoring library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/rope/ https://github.com/python-rope/rope/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-python/pytoolconfig-1.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/rope/rope-1.4.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=6b6b8c5174d8ddd246ebe9d0ed7cdd22
diff --git a/metadata/md5-cache/dev-python/rope-1.5.1 b/metadata/md5-cache/dev-python/rope-1.5.1
deleted file mode 100644
index 02bd608771b6..000000000000
--- a/metadata/md5-cache/dev-python/rope-1.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/build[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytoolconfig-1.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python refactoring library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/rope/ https://github.com/python-rope/rope/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-python/pytoolconfig-1.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/rope/rope-1.5.1.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=27edf4cacce33edf2fcb97e75ec0e2a6
diff --git a/metadata/md5-cache/dev-python/rope-1.6.0 b/metadata/md5-cache/dev-python/rope-1.6.0
index d7c17a04f799..17cf2f5d105b 100644
--- a/metadata/md5-cache/dev-python/rope-1.6.0
+++ b/metadata/md5-cache/dev-python/rope-1.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/rope/ https://github.com/python-rope/rope/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/pytoolconfig-1.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rope/rope-1.6.0.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=27edf4cacce33edf2fcb97e75ec0e2a6
+_md5_=6b6b8c5174d8ddd246ebe9d0ed7cdd22
diff --git a/metadata/md5-cache/dev-python/scikit-build-0.16.4 b/metadata/md5-cache/dev-python/scikit-build-0.16.4
index dd09be8c57c3..7bc36a77d979 100644
--- a/metadata/md5-cache/dev-python/scikit-build-0.16.4
+++ b/metadata/md5-cache/dev-python/scikit-build-0.16.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/scikit-build/scikit-build/ https://pypi.org/project/scikit-build/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/distro[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-build/scikit-build-0.16.4.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=eb0a94caa6736ee76bf9e9c474ecc2bd
+_md5_=cff77893b55b63bb3464bf38f7a241f9
diff --git a/metadata/md5-cache/dev-python/tlsh-4.8.2 b/metadata/md5-cache/dev-python/tlsh-4.8.2
index 669346a3cce3..29b8fc5555aa 100644
--- a/metadata/md5-cache/dev-python/tlsh-4.8.2
+++ b/metadata/md5-cache/dev-python/tlsh-4.8.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/python-tlsh/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc64 x86
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=dev-libs/tlsh python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/trendmicro/tlsh/archive/4.8.2.tar.gz -> tlsh-4.8.2.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9bc490808a2d72c655c00fc94430c5c5
+_md5_=9b730fb549a81e04b15c48837efd2d47
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.1.7 b/metadata/md5-cache/dev-python/uncertainties-3.1.7
deleted file mode 100644
index 05d8ac4d3ac1..000000000000
--- a/metadata/md5-cache/dev-python/uncertainties-3.1.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/sphinx-5.3.0 ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python module for calculations with uncertainties
-EAPI=8
-HOMEPAGE=https://pythonhosted.org/uncertainties/
-INHERIT=distutils-r1 optfeature
-IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/uncertainties/uncertainties-3.1.7.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=672494a0732ecd61e60d54351402bffd
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.1.7-r1 b/metadata/md5-cache/dev-python/uncertainties-3.1.7-r1
new file mode 100644
index 000000000000..a9752e3ec32e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uncertainties-3.1.7-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/sphinx-5.3.0 ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python module for calculations with uncertainties
+EAPI=8
+HOMEPAGE=https://pythonhosted.org/uncertainties/ https://github.com/lebigot/uncertainties/ https://pypi.org/project/uncertainties/
+INHERIT=distutils-r1 optfeature
+IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/uncertainties/uncertainties-3.1.7.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=aadf191b310a5e369a79690ce15a7d0c
diff --git a/metadata/md5-cache/dev-util/buildbot-3.4.0-r1 b/metadata/md5-cache/dev-util/buildbot-3.4.0-r1
deleted file mode 100644
index cb5bbb562718..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-3.4.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-worker-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/service_identity[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,ssl(-)] >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/treq[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/txrequests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pypugjs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/moto[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mock-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lz4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ldap3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-pkg-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-worker-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) virtual/pkgconfig python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile config configure install postinst prepare test
-DESCRIPTION=BuildBot build automation system
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
-INHERIT=readme.gentoo-r1 systemd distutils-r1
-IUSE=crypt docker examples irc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-worker-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/service_identity[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,ssl(-)] >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot/buildbot-3.4.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8bef143129a8286c2b96efd8b4211bc8
diff --git a/metadata/md5-cache/dev-util/buildbot-3.5.0-r1 b/metadata/md5-cache/dev-util/buildbot-3.5.0-r1
deleted file mode 100644
index 8d586f98a09a..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-3.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-worker-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/service_identity[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,ssl(-)] >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/treq[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/txrequests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pypugjs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/moto[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mock-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lz4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ldap3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-pkg-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-worker-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) virtual/pkgconfig python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile config configure install postinst prepare test
-DESCRIPTION=BuildBot build automation system
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
-INHERIT=readme.gentoo-r1 systemd distutils-r1
-IUSE=crypt docker examples irc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-worker-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/service_identity[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,ssl(-)] >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot/buildbot-3.5.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ae8df7ce01b852813bc29671d3bf8662
diff --git a/metadata/md5-cache/dev-util/buildbot-3.6.0 b/metadata/md5-cache/dev-util/buildbot-3.6.0
deleted file mode 100644
index 9ccac8227d6d..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-3.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-worker-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/service_identity[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,ssl(-)] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/treq[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/txrequests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pypugjs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/moto[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mock-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lz4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ldap3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-pkg-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-worker-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) virtual/pkgconfig python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile config configure install postinst prepare test
-DESCRIPTION=BuildBot build automation system
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
-INHERIT=readme.gentoo-r1 systemd distutils-r1
-IUSE=crypt docker examples irc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-worker-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/service_identity[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,ssl(-)] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot/buildbot-3.6.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=34ef1716678645853d766cd17d5e5f34
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.4.0 b/metadata/md5-cache/dev-util/buildbot-badges-3.4.0
deleted file mode 100644
index ae063bd07611..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-badges-3.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-pkg-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cairocffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/cairosvg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/klein[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot badges plugin produces an image in SVG or PNG format...
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.4.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3baa803685e56f0505f8e1224fe9202a
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.5.0 b/metadata/md5-cache/dev-util/buildbot-badges-3.5.0
deleted file mode 100644
index 0c662300d5bc..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-badges-3.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-pkg-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cairocffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/cairosvg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/klein[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot badges plugin produces an image in SVG or PNG format...
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.5.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3baa803685e56f0505f8e1224fe9202a
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.6.0 b/metadata/md5-cache/dev-util/buildbot-badges-3.6.0
deleted file mode 100644
index c71bd880f150..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-badges-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-pkg-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cairocffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/cairosvg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/klein[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot badges plugin produces an image in SVG or PNG format...
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.6.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3baa803685e56f0505f8e1224fe9202a
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.4.0 b/metadata/md5-cache/dev-util/buildbot-console-view-3.4.0
deleted file mode 100644
index 3c02fa41e0fc..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-console-view-3.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot console-view plugin
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.4.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=236fedae1a2ffc4cb8a58cb000d8a293
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.5.0 b/metadata/md5-cache/dev-util/buildbot-console-view-3.5.0
deleted file mode 100644
index a7f7a0e5f44d..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-console-view-3.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot console-view plugin
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.5.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=236fedae1a2ffc4cb8a58cb000d8a293
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.6.0 b/metadata/md5-cache/dev-util/buildbot-console-view-3.6.0
deleted file mode 100644
index 02a4c6cf8d1b..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-console-view-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot console-view plugin
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.6.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=236fedae1a2ffc4cb8a58cb000d8a293
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.4.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.4.0
deleted file mode 100644
index 9b8e9fc3530d..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-3.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BuildBot grid view web interface
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.4.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=46249bc9133fd906cf5b553aa989ac88
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.5.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.5.0
deleted file mode 100644
index 6b53d7967842..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-3.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BuildBot grid view web interface
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.5.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=46249bc9133fd906cf5b553aa989ac88
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.6.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.6.0
deleted file mode 100644
index bbd9ce2d3652..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BuildBot grid view web interface
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.6.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=46249bc9133fd906cf5b553aa989ac88
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.4.0 b/metadata/md5-cache/dev-util/buildbot-pkg-3.4.0
deleted file mode 100644
index 851d5834b266..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BuildBot common www build tools for packaging releases
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.4.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=144767169670d72fde6462f020256b63
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.5.0 b/metadata/md5-cache/dev-util/buildbot-pkg-3.5.0
deleted file mode 100644
index 81b88d62848b..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BuildBot common www build tools for packaging releases
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.5.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=144767169670d72fde6462f020256b63
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.6.0 b/metadata/md5-cache/dev-util/buildbot-pkg-3.6.0
deleted file mode 100644
index ebb78d174675..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BuildBot common www build tools for packaging releases
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.6.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=144767169670d72fde6462f020256b63
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.4.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.4.0
deleted file mode 100644
index cd2ee1b1ee60..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot waterfall-view plugin
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=5465670f8e85515bc733573e4e38184a
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.5.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.5.0
deleted file mode 100644
index 4dd33cae015c..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot waterfall-view plugin
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=5465670f8e85515bc733573e4e38184a
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.6.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.6.0
deleted file mode 100644
index ff52decc5701..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot waterfall-view plugin
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=5465670f8e85515bc733573e4e38184a
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.4.0 b/metadata/md5-cache/dev-util/buildbot-worker-3.4.0
deleted file mode 100644
index 9d7918c1e17f..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile config configure install postinst prepare test
-DESCRIPTION=BuildBot Worker (slave) Daemon
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
-INHERIT=readme.gentoo-r1 distutils-r1
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-3.4.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9c3997b109e8bf7c6cac29808462f478
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1 b/metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1
deleted file mode 100644
index 5c97dbf264c0..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile config configure install postinst prepare test
-DESCRIPTION=BuildBot Worker (slave) Daemon
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
-INHERIT=readme.gentoo-r1 distutils-r1
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-17.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-3.5.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=e9340e4bdb4be0655e75376cede7f5ce
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.6.0 b/metadata/md5-cache/dev-util/buildbot-worker-3.6.0
deleted file mode 100644
index f4f786fe1806..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile config configure install postinst prepare test
-DESCRIPTION=BuildBot Worker (slave) Daemon
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
-INHERIT=readme.gentoo-r1 distutils-r1
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-3.6.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=2fe686caf9739f83cde8404ae43e4257
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.6.1 b/metadata/md5-cache/dev-util/buildbot-worker-3.6.1-r1
index 05754a8e723e..398df62a173a 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.6.1
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.6.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) virtual/pkgconfig python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) virtual/pkgconfig python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile config configure install postinst prepare test
 DESCRIPTION=BuildBot Worker (slave) Daemon
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=readme.gentoo-r1 systemd distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-3.6.1.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c72ef137a5da34e1bad4d142225f77b5
+_md5_=3457d329681d6ef93ea5d437586407ce
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index 3d1e8c9691b1..28c18ba74fef 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/msgpack-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/msgpack-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile config configure install postinst prepare test unpack
 DESCRIPTION=BuildBot Worker (slave) Daemon
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=readme.gentoo-r1 git-r3 distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f67ea781d1cdb43360b707e7ffe1b036
+_md5_=32f23fbbb8528a4eebcd29f07ba001e2
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.4.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.4.0
deleted file mode 100644
index 6b3852a03ad2..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a1c77d4eb8903d5795b287316a3a432f
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.5.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.5.0
deleted file mode 100644
index ecaadbaaf068..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a1c77d4eb8903d5795b287316a3a432f
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.6.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.6.0
deleted file mode 100644
index b26d0ad3a223..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a1c77d4eb8903d5795b287316a3a432f
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.4.0 b/metadata/md5-cache/dev-util/buildbot-www-3.4.0
deleted file mode 100644
index d87a71941b8d..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-www-3.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-pkg-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-pkg-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.4.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d72892e3cfbd9771a9a04f1b5b9acf2a
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.5.0 b/metadata/md5-cache/dev-util/buildbot-www-3.5.0
deleted file mode 100644
index a68bda044569..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-www-3.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-pkg-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-pkg-3.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.5.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d72892e3cfbd9771a9a04f1b5b9acf2a
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.6.0 b/metadata/md5-cache/dev-util/buildbot-www-3.6.0
deleted file mode 100644
index 3bdca7e4f6f0..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-www-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=~dev-util/buildbot-pkg-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
-EAPI=8
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-pkg-3.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.6.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d72892e3cfbd9771a9a04f1b5b9acf2a
diff --git a/metadata/md5-cache/dev-util/diffoscope-229 b/metadata/md5-cache/dev-util/diffoscope-229
index 47192ce1851c..20280ff3ae94 100644
--- a/metadata/md5-cache/dev-util/diffoscope-229
+++ b/metadata/md5-cache/dev-util/diffoscope-229
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
 INHERIT=distutils-r1
 IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/python-magic[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/libarchive-c[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/distro[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tlsh[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ncurses] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-229.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=236d9a3cf795113ce3be2fa0e4615e30
+_md5_=3891696dc6ac53c537374feb84c34c7f
diff --git a/metadata/md5-cache/gui-libs/neatvnc-0.5.4 b/metadata/md5-cache/gui-libs/neatvnc-0.5.4
index f946925eb2ed..3f2963c36806 100644
--- a/metadata/md5-cache/gui-libs/neatvnc-0.5.4
+++ b/metadata/md5-cache/gui-libs/neatvnc-0.5.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/any1/neatvnc/
 INHERIT=meson
 IUSE=examples gbm h264 jpeg ssl test tracing
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86
 LICENSE=ISC
 RDEPEND=dev-libs/aml sys-libs/zlib x11-libs/pixman gbm? ( media-libs/mesa ) h264? ( media-video/ffmpeg:= x11-libs/libdrm ) jpeg? ( media-libs/libjpeg-turbo:= ) ssl? ( net-libs/gnutls:= ) tracing? ( dev-util/systemtap )
 REQUIRED_USE=h264? ( gbm )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/any1/neatvnc/archive/v0.5.4.tar.gz -> neatvnc-0.5.4.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ad3b9a07b1b2411293cc5d2e82f9fc7e
+_md5_=466ee39c591196dae0877647d1151de7
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.1 b/metadata/md5-cache/net-misc/electrum-4.3.1
deleted file mode 100644
index 64024039a3b0..000000000000
--- a/metadata/md5-cache/net-misc/electrum-4.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyaes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycryptodome[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ncurses?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bitstring[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pbkdf2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qrcode[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ncurses? ( python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ncurses] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ncurses] ) ) >=dev-python/pytest-7.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ncurses?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ncurses?] ) >=dev-python/gpep517-9[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=8
-HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
-INHERIT=distutils-r1 xdg-utils
-IUSE=cli ncurses qrcode +qt5 test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ncurses?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bitstring[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pbkdf2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qrcode[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ncurses? ( python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ncurses] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ncurses] ) ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ncurses?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ncurses?] )
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.1.tar.gz -> electrum-4.3.1.gh.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c94da1fda3f001b318994f2c0c1cfd1c
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.2 b/metadata/md5-cache/net-misc/electrum-4.3.2
index 4d3370dd4aaf..add705b1f90f 100644
--- a/metadata/md5-cache/net-misc/electrum-4.3.2
+++ b/metadata/md5-cache/net-misc/electrum-4.3.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
 INHERIT=distutils-r1 xdg-utils
 IUSE=cli ncurses qrcode +qt5 test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ncurses?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bitstring[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pbkdf2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qrcode[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ncurses? ( python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ncurses] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ncurses] ) ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ncurses?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ncurses?] )
 REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.2.tar.gz -> electrum-4.3.2.gh.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=42e7436e95cf76f28f5700b407900bb6
+_md5_=c94da1fda3f001b318994f2c0c1cfd1c
diff --git a/metadata/md5-cache/net-misc/minidlna-1.3.2-r1 b/metadata/md5-cache/net-misc/minidlna-1.3.2-r1
index 37fd857c750c..05eea2a8e6f7 100644
--- a/metadata/md5-cache/net-misc/minidlna-1.3.2-r1
+++ b/metadata/md5-cache/net-misc/minidlna-1.3.2-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/minidlna/
 INHERIT=autotools systemd tmpfiles
 IUSE=netgear readynas zeroconf
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm ~arm64 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=dev-db/sqlite:3 media-libs/flac:= media-libs/libexif media-libs/libid3tag:= media-libs/libjpeg-turbo:= media-libs/libogg media-libs/libvorbis media-video/ffmpeg:= elibc_musl? ( sys-libs/queue-standalone ) zeroconf? ( net-dns/avahi ) acct-group/minidlna acct-user/minidlna virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/minidlna/minidlna/1.3.2/minidlna-1.3.2.tar.gz mirror://gentoo/minidlna-gentoo-artwork.patch.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8fa4ff22639f13972080ffc1670ac865
+_md5_=8f1684cb7d6df5754450832d3c9217c5
diff --git a/metadata/md5-cache/net-wireless/blueman-2.3.2-r1 b/metadata/md5-cache/net-wireless/blueman-2.3.2-r1
deleted file mode 100644
index ad3b898c1754..000000000000
--- a/metadata/md5-cache/net-wireless/blueman-2.3.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:=
-DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
-EAPI=8
-HOMEPAGE=https://github.com/blueman-project/blueman/
-INHERIT=autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
-IUSE=network nls policykit pulseaudio python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=GPL-3+ GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection,X] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8[introspection] ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[bluetooth] media-video/pipewire[bluetooth] <media-sound/pulseaudio-15.99.1[bluetooth] ) ) python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.3.2/blueman-2.3.2.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=775214da1b74397a3e132849ee1b2f20
diff --git a/metadata/md5-cache/net-wireless/blueman-2.3.3 b/metadata/md5-cache/net-wireless/blueman-2.3.3
deleted file mode 100644
index 70d38ba66c76..000000000000
--- a/metadata/md5-cache/net-wireless/blueman-2.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:=
-DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
-EAPI=8
-HOMEPAGE=https://github.com/blueman-project/blueman/
-INHERIT=autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
-IUSE=network nls policykit pulseaudio python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-3+ GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection,X] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8[introspection] ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[bluetooth] media-video/pipewire[bluetooth] <media-sound/pulseaudio-15.99.1[bluetooth] ) ) python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.3.3/blueman-2.3.3.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bd8e9a1946c5c37ede95298da6dfa0ff
diff --git a/metadata/md5-cache/net-wireless/blueman-2.3.4 b/metadata/md5-cache/net-wireless/blueman-2.3.4
deleted file mode 100644
index 65db7d678b67..000000000000
--- a/metadata/md5-cache/net-wireless/blueman-2.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:=
-DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
-EAPI=8
-HOMEPAGE=https://github.com/blueman-project/blueman/
-INHERIT=autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
-IUSE=network nls policykit pulseaudio python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-3+ GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection,X] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8[introspection] ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[bluetooth] media-video/pipewire[bluetooth] <media-sound/pulseaudio-15.99.1[bluetooth] ) ) python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.3.4/blueman-2.3.4.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bd8e9a1946c5c37ede95298da6dfa0ff
diff --git a/metadata/md5-cache/net-wireless/blueman-2.3.5 b/metadata/md5-cache/net-wireless/blueman-2.3.5
index 112ab819169c..c80eece48764 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.3.5
+++ b/metadata/md5-cache/net-wireless/blueman-2.3.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/blueman-project/blueman/
 INHERIT=autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
 IUSE=network nls policykit pulseaudio python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-3+ GPL-2
 RDEPEND=python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection,X] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8[introspection] ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[bluetooth] media-video/pipewire[bluetooth] <media-sound/pulseaudio-15.99.1[bluetooth] ) ) python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.3.5/blueman-2.3.5.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c2ea6478c49b5e4ba1d6cbe7bb761565
+_md5_=d066f2357868b37d1867b234eea061b2
diff --git a/metadata/md5-cache/sci-calculators/units-2.21 b/metadata/md5-cache/sci-calculators/units-2.21
deleted file mode 100644
index fc01a28598c2..000000000000
--- a/metadata/md5-cache/sci-calculators/units-2.21
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/readline:= units-cur? ( python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_targets_python3_7? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) )
-DESCRIPTION=Unit conversion program
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/units/units.html
-INHERIT=python-r1
-IUSE=+units-cur python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=FDL-1.3 GPL-3
-RDEPEND=sys-libs/readline:= units-cur? ( python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_targets_python3_7? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) )
-REQUIRED_USE=units-cur? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-SLOT=0
-SRC_URI=mirror://gnu/units/units-2.21.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=249d1d317aba60ffa76a4ecf8ff24216
diff --git a/metadata/md5-cache/sci-calculators/units-2.21-r1 b/metadata/md5-cache/sci-calculators/units-2.21-r1
new file mode 100644
index 000000000000..060a77b64879
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/units-2.21-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install
+DEPEND=sys-libs/readline:= units-cur? ( python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_targets_python3_7? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) )
+DESCRIPTION=Unit conversion program
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/units/units.html
+INHERIT=python-r1
+IUSE=+units-cur python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=FDL-1.3 GPL-3
+RDEPEND=sys-libs/readline:= units-cur? ( python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_targets_python3_7? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) )
+REQUIRED_USE=units-cur? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+SLOT=0
+SRC_URI=mirror://gnu/units/units-2.21.tar.gz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=4c076430535fce70108a45f0ee2e8969
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.6.3 b/metadata/md5-cache/sci-libs/opencascade-7.6.3-r1
index daa243401f6b..3aed1a96390f 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.6.3
+++ b/metadata/md5-cache/sci-libs/opencascade-7.6.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( app-doc/doxygen[dot] ) examples? ( dev-qt/linguist-tools:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.2.0:=[rendering] ) eigen? ( dev-cpp/eigen ) json? ( dev-libs/rapidjson ) vtk? ( dev-libs/utfcpp )
+DEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) eigen? ( dev-cpp/eigen ) json? ( dev-libs/rapidjson ) vtk? ( dev-libs/utfcpp )
 DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
 EAPI=8
 HOMEPAGE=https://www.opencascade.com
@@ -8,10 +8,10 @@ INHERIT=cmake
 IUSE=doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk
 KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
-RDEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
+RDEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
 REQUIRED_USE=?? ( optimize tbb )
 RESTRICT=test
 SLOT=0/7.6
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=b079fb9877ef64d4a8158a60fa157f59b096debb;sf=tgz -> opencascade-7.6.3.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0f7ff7f27688ea8318e160de1b0ce6d4
+_md5_=30d8ab877337448195b057a8f6d6a06a
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.7.0 b/metadata/md5-cache/sci-libs/opencascade-7.7.0-r1
index 38174963303b..9ff4d7c715da 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.7.0
+++ b/metadata/md5-cache/sci-libs/opencascade-7.7.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( app-doc/doxygen ) examples? ( dev-qt/linguist-tools:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= media-libs/fontconfig media-libs/freetype:2 virtual/opengl x11-libs/libXmu examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) json? ( dev-libs/rapidjson ) vtk? ( dev-libs/utfcpp )
+DEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= media-libs/fontconfig media-libs/freetype:2 virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) json? ( dev-libs/rapidjson ) vtk? ( dev-libs/utfcpp )
 DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
 EAPI=8
 HOMEPAGE=https://www.opencascade.com
@@ -8,10 +8,10 @@ INHERIT=cmake
 IUSE=doc examples ffmpeg freeimage gles2 json optimize tbb vtk
 KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
-RDEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= media-libs/fontconfig media-libs/freetype:2 virtual/opengl x11-libs/libXmu examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
+RDEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= media-libs/fontconfig media-libs/freetype:2 virtual/opengl x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
 REQUIRED_USE=?? ( optimize tbb )
 RESTRICT=test
 SLOT=0/7.7
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=185d29b92f6764ffa9fc195b7dbe7bba3c4ac855;sf=tgz -> opencascade-7.7.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d6fbd90f9d1d6001f4b561242e0f025a
+_md5_=5d8fec0419ccd440826e9d065522066f
diff --git a/metadata/md5-cache/sys-apps/file-5.43-r1 b/metadata/md5-cache/sys-apps/file-5.43-r2
index d5deb7a334f7..6df60ab10493 100644
--- a/metadata/md5-cache/sys-apps/file-5.43-r1
+++ b/metadata/md5-cache/sys-apps/file-5.43-r2
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.43.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.43.tar.gz.asc )
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=8f779e0c0af200de8b0c0bf8ccd9d132
+_md5_=d73018bad8a331396269cf9d50cb9b7b
diff --git a/metadata/md5-cache/sys-apps/file-5.44 b/metadata/md5-cache/sys-apps/file-5.44-r1
index b665a9eeebc7..2f62f35186cd 100644
--- a/metadata/md5-cache/sys-apps/file-5.44
+++ b/metadata/md5-cache/sys-apps/file-5.44-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.44.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.44.tar.gz.asc )
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=b64d41583cecf3db0e9ca9f90fc5e253
+_md5_=82cfa4007aa7b6ef17c17a2003fde555
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index a131c1c35303..a639825db583 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -12,4 +12,4 @@ RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a9268c7ead9fafee6d059376e3cdbada
+_md5_=1c056a8d87db72d2aaa324bf38fdf157
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.30 b/metadata/md5-cache/sys-apps/sandbox-2.30-r1
index 61c049b10b2b..c46409d01340 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.30
+++ b/metadata/md5-cache/sys-apps/sandbox-2.30-r1
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
+DEPEND=>=app-misc/pax-utils-0.1.19
 DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Sandbox
@@ -7,7 +8,8 @@ INHERIT=flag-o-matic multilib-minimal multiprocessing
 IUSE=+nnp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
+RDEPEND=!<sys-apps/file-5.44-r1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/sandbox-2.30.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9ea469b2a2eb9a6935da3ea9c88f0ab5
+_md5_=daa3b4450e294b0e9392044805bb1d30
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.8 b/metadata/md5-cache/sys-apps/texinfo-6.8
index c2b25f0bead0..8b631b87e972 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.8
+++ b/metadata/md5-cache/sys-apps/texinfo-6.8
@@ -1,6 +1,6 @@
 BDEPEND=nls? ( >=sys-devel/gettext-0.19.6 )
 DEFINED_PHASES=configure prepare
-DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= standalone? ( dev-lang/perl ) !standalone? ( dev-lang/perl:= ) nls? ( virtual/libintl )
+DEPEND=sys-apps/help2man !=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= standalone? ( dev-lang/perl ) !standalone? ( dev-lang/perl:= ) nls? ( virtual/libintl )
 DESCRIPTION=The GNU info program and utilities
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/texinfo/
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic toolchain-funcs
 IUSE=nls +standalone static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
-RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= standalone? ( dev-lang/perl ) !standalone? ( dev-lang/perl:= ) nls? ( virtual/libintl )
+RDEPEND=sys-apps/help2man !=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= standalone? ( dev-lang/perl ) !standalone? ( dev-lang/perl:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-6.8.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=449487f86fb9812d473d8d2bb891880f
+_md5_=03b4109aac675e0040e4789422d7849e
diff --git a/metadata/md5-cache/sys-apps/texinfo-7.0.1 b/metadata/md5-cache/sys-apps/texinfo-7.0.1
index 8a7e0dccd6b7..d2d74923e527 100644
--- a/metadata/md5-cache/sys-apps/texinfo-7.0.1
+++ b/metadata/md5-cache/sys-apps/texinfo-7.0.1
@@ -1,6 +1,6 @@
 BDEPEND=nls? ( >=sys-devel/gettext-0.19.6 )
 DEFINED_PHASES=configure prepare
-DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
+DEPEND=sys-apps/help2man !=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
 DESCRIPTION=The GNU info program and utilities
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/texinfo/
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic toolchain-funcs
 IUSE=nls +standalone static
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
-RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
+RDEPEND=sys-apps/help2man !=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-7.0.1.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=dc0111a692c052217367f5de0e5357bd
+_md5_=319cb39e1b31b27c0cfdbcbcf9783e15
diff --git a/metadata/md5-cache/sys-apps/texinfo-7.0.1-r1 b/metadata/md5-cache/sys-apps/texinfo-7.0.1-r1
index 704f6b51cdb0..3e8ddf700c00 100644
--- a/metadata/md5-cache/sys-apps/texinfo-7.0.1-r1
+++ b/metadata/md5-cache/sys-apps/texinfo-7.0.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=nls? ( >=sys-devel/gettext-0.19.6 )
 DEFINED_PHASES=configure prepare
-DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
+DEPEND=sys-apps/help2man !=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
 DESCRIPTION=The GNU info program and utilities
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/texinfo/
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic toolchain-funcs
 IUSE=nls +standalone static
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
-RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
+RDEPEND=sys-apps/help2man !=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-7.0.1.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7a0d402f2dc6a0b075e7ba1d049db6db
+_md5_=05d7f3b20a487fa5625a3fc1e07622a8
diff --git a/metadata/md5-cache/sys-devel/binutils-2.39-r4 b/metadata/md5-cache/sys-devel/binutils-2.39-r4
index 4abc2be12b90..04aad4cac66d 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.39-r4
+++ b/metadata/md5-cache/sys-devel/binutils-2.39-r4
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
 INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
 IUSE=cet default-gold doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=default-gold? ( gold )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.39
 SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39-patches-5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b5614ac751561ddde678590745217137
+_md5_=13556c5d78eb72ab768e0bca516910f9
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.39-r4 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.39-r4
index 8639d15ea9dc..4a3b1fd28a4f 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.39-r4
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.39-r4
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
 INHERIT=libtool flag-o-matic gnuconfig multilib strip-linguas toolchain-funcs
 IUSE=cet default-gold doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla
-KEYWORDS=-* ~hppa
+KEYWORDS=-* hppa
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=default-gold? ( gold )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.39
 SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39-patches-5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=02eabe1b8fba77736c527805a6b77112
+_md5_=52fa2c02459b802f6377810e241693cb
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221126 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221126
new file mode 100644
index 000000000000..e8f36ae86baa
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221126
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=12
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20221126/gcc-12-20221126.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	819832f115fcf93d626ced5444c725d0	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=1b9d60ea6c1cee0279a4a8f0f25b4b1a
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.85 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.86
index efd3b123a583..3efe2a9f43dd 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.85
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.86
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.85
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.85.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.86
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.86.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	12a98c718ba8260077000c13b965ba1b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=5e76cbc485785140dfc1cbb402aa4bcc
+_md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.0.15 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.0.16
index 4203dceb5a7f..7bce5172cb43 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.0.15
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.0.16
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.0.15
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.0.15.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz
+SLOT=6.0.16
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.0.16.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	12a98c718ba8260077000c13b965ba1b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=5e76cbc485785140dfc1cbb402aa4bcc
+_md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.1 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.2
index b4a3ead658f1..96c70f39b947 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.1
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.2
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.1.1
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.1.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
+SLOT=6.1.2
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.2.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	12a98c718ba8260077000c13b965ba1b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=5e76cbc485785140dfc1cbb402aa4bcc
+_md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.39-r4 b/metadata/md5-cache/sys-libs/binutils-libs-2.39-r4
index 51442d9edec8..546f075cd4e6 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.39-r4
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.39-r4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
 INHERIT=libtool toolchain-funcs multilib-minimal
 IUSE=64-bit-bfd cet multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
 SLOT=0/2.39
 SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39-patches-5.tar.xz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=217fa07b2e3cd595f2b7ae351c5d61d8
+_md5_=38b042655236adf2937a96a3c6d6bd06
diff --git a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.1 b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.1
deleted file mode 100644
index c171edd041c4..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=install
-DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
-DESCRIPTION=A panel plug-in with date, time and embedded calendar
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.8/xfce4-datetime-plugin-0.8.1.tar.bz2
-_md5_=acd0f0927cbc0f21ec8ddbe543c6f4e2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.2 b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.2
index f50177c97fec..6d594c7ed8d0 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.2
@@ -4,9 +4,9 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
 DESCRIPTION=A panel plug-in with date, time and embedded calendar
 EAPI=8
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin https://gitlab.xfce.org/panel-plugins/xfce4-datetime-plugin/
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.8/xfce4-datetime-plugin-0.8.2.tar.bz2
-_md5_=c0c9fc092956bf77a35d75ae54eacf3a
+_md5_=c2428c7acacb9f81955e3b6f3f2202e0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.1 b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.1
deleted file mode 100644
index a114caf9b5eb..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A panel plug-in to provide quick access to files, folders and removable media
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
-IUSE=libnotify
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.8/xfce4-places-plugin-1.8.1.tar.bz2
-_md5_=9c18b01b26729d1e0ffdb90402ff6282
diff --git a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.2 b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.2
deleted file mode 100644
index bb27e96f5bda..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7:= )
-DESCRIPTION=A panel plug-in to provide quick access to files, folders and removable media
-EAPI=8
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/
-IUSE=libnotify
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.8/xfce4-places-plugin-1.8.2.tar.bz2
-_md5_=7897a9b20dd4785c790a7974e3355758
diff --git a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.3 b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.3
index 016895a68b63..ce413e52be11 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.3
@@ -5,9 +5,9 @@ DESCRIPTION=A panel plug-in to provide quick access to files, folders and remova
 EAPI=8
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/
 IUSE=libnotify
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.8/xfce4-places-plugin-1.8.3.tar.bz2
-_md5_=966c5e0638ab9d916cfd3ec42bbc1dc8
+_md5_=d9a8f2e5fb2cb96665fff9d2a2e7879e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.0 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.0
deleted file mode 100644
index 61d70468da82..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/intltool sys-apps/help2man virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.44.0 >=net-libs/libsoup-2.26:2.4 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.22.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.16.0:= >=xfce-base/libxfce4util-4.16.0:= >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/xfconf-4.16.0:=
-DESCRIPTION=Xfce4 screenshooter application and panel plugin
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/apps/xfce4-screenshooter/start https://gitlab.xfce.org/apps/xfce4-screenshooter/
-INHERIT=xdg-utils
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.44.0 >=net-libs/libsoup-2.26:2.4 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.22.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.16.0:= >=xfce-base/libxfce4util-4.16.0:= >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/xfconf-4.16.0:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.10/xfce4-screenshooter-1.10.0.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=07286e2fc59a8e1275eb2c57bd982457
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.1 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.1
index fc35808bd3a9..8a3609e42387 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.1
@@ -5,10 +5,10 @@ DESCRIPTION=Xfce4 screenshooter application and panel plugin
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/apps/xfce4-screenshooter/start https://gitlab.xfce.org/apps/xfce4-screenshooter/
 INHERIT=xdg-utils
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=net-libs/libsoup-3.0.0:3.0 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.22.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.16.0:= >=xfce-base/libxfce4util-4.16.0:= >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/xfconf-4.16.0:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.10/xfce4-screenshooter-1.10.1.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d7e76c569b892819b97f8059f2b69dce
+_md5_=78eb5a15654946bd96c4643f49c038f2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.11-r1 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.11-r1
deleted file mode 100644
index 4c1b4037db2c..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/intltool sys-apps/help2man virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.16 >=net-libs/libsoup-2.26:2.4 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.44 dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/libxfce4ui-4.14:=
-DESCRIPTION=Xfce4 screenshooter application and panel plugin
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/apps/xfce4-screenshooter/start https://gitlab.xfce.org/apps/xfce4-screenshooter/
-INHERIT=xdg-utils
-KEYWORDS=amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.16 >=net-libs/libsoup-2.26:2.4 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.44 dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/libxfce4ui-4.14:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.11.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9d5b79478727391dacde1a14282b64dd
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 2031ec8d4ea7..764d2fca0cee 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,2 +1 @@
-DIST electrum-4.3.1.gh.tar.gz 5444509 BLAKE2B 68d63b730396c229bcb09262740a7d3ef322fce7fd16265d352e3eb2039e123d043307036d906b1688cc43d33620cf1b8f7aaa03ac9f5d68e5f9a2b84e6d44a7 SHA512 038b7c643ed11fe14e368be91bc09e5f043d4ae86cdf0ad0d80861ffa47aececcc4b0bec5a8596a8d78590b859bf302ed99d2d57bab1a2a053677fc7fa190e06
 DIST electrum-4.3.2.gh.tar.gz 5460546 BLAKE2B b2367116aef2a2a76dca30a635188bcd99f0fdd46ce6e8c5a2d6608fbb8f0a58e88b8352c5db92b7c8709f7bbc420fc1860204aca1efc2f2c4be2c788bfa1909 SHA512 dfb137e01ca6e511fb5ac70c34dcb01f36bdb209d7d290bd53c8fa5f95783f346898478d6e58435b241928dfe05ff46455e2e587520d47892c66b3198ab89c82
diff --git a/net-misc/electrum/electrum-4.3.1.ebuild b/net-misc/electrum/electrum-4.3.1.ebuild
deleted file mode 100644
index b5bba69c8654..000000000000
--- a/net-misc/electrum/electrum-4.3.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="
-	https://electrum.org/
-	https://github.com/spesmilo/electrum/
-"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	# make qdarkstyle dep optional
-	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.3.2.ebuild b/net-misc/electrum/electrum-4.3.2.ebuild
index 70bd62a22480..b5bba69c8654 100644
--- a/net-misc/electrum/electrum-4.3.2.ebuild
+++ b/net-misc/electrum/electrum-4.3.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
diff --git a/net-misc/minidlna/minidlna-1.3.2-r1.ebuild b/net-misc/minidlna/minidlna-1.3.2-r1.ebuild
index 8f4526c40645..3e02635f1f99 100644
--- a/net-misc/minidlna/minidlna-1.3.2-r1.ebuild
+++ b/net-misc/minidlna/minidlna-1.3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~x86"
 IUSE="netgear readynas zeroconf"
 
 DEPEND="
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 743cd22bb937..9a944340b460 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,4 +1 @@
-DIST blueman-2.3.2.tar.xz 1575412 BLAKE2B 25fbed432e103a46840dc10d73bce4e8e7a5e7ea623dbb3a50c420d166af7eb0eff046d0fd9986869055fbb4c3f8563920fb840f8f74f37a05b6680434f13dc5 SHA512 13760def19951bcb4582dbe142259256826a0f50e6c34e56c61c6f890f4e2e08085733f2480ad4c95ee52ec616cbb7ddd3a946634f042d80692cd37b57207cc0
-DIST blueman-2.3.3.tar.xz 1575852 BLAKE2B 618f789b7e411adccb986704922cf2cbe283197878232210a933530c54caf0ca3c21f08c7b2192389451988623280b63dff23c9b56a696970ec4b7f773cb47a3 SHA512 2c2290a5b0fb78eccd35c33ac10c5ef38f01f4074796a62fb3aeded1f5db76104d60bc02968a8144c5dae3ec8fd425d7b33beaf2a81e401a09dd3b550e2d0d2d
-DIST blueman-2.3.4.tar.xz 1575488 BLAKE2B 382bf6c995477b31527c2702bb22c3657fc5b36476cd8dd32fb8e0e78359f8b427aeae781ca7022e58f644a3ca3c67a7e644e8dd16492fb7037d4619489c73fb SHA512 8bca916567a1d72fd7c539cc200177b20723e38ec55e30358141b4dff6f7b889d5eae689ef61618fdc23ebb4d8bfbbe2d0447d04a58b769c2d898ff017001f76
 DIST blueman-2.3.5.tar.xz 1544232 BLAKE2B 454a5369cecd429dcbff84108ef5440c61e3740d54de30e85cef941f9bd55ef3f032aa4774b161cd145eecc53061d2d104ea6d6ec12516beb2f2b3579c074ccb SHA512 678261dc0a795ca79b43614f4fc6ad436b44690d0ce4dbf15f55dba4834a25a5c1956bf658d568a3318828863b3bb089689d0dc4fef8963ed2b27cf0f1144580
diff --git a/net-wireless/blueman/blueman-2.3.2-r1.ebuild b/net-wireless/blueman/blueman-2.3.2-r1.ebuild
deleted file mode 100644
index 15c5cdcf555c..000000000000
--- a/net-wireless/blueman/blueman-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-else
-	SRC_URI="
-		https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz
-	"
-	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-fi
-
-# icons are GPL-2
-# source files are mixed GPL-3+ and GPL-2+
-LICENSE="GPL-3+ GPL-2"
-SLOT="0"
-IUSE="network nls policykit pulseaudio"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=net-wireless/bluez-5:=
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	')
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection,X]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	network? (
-		net-firewall/iptables
-		|| (
-			sys-apps/net-tools
-			sys-apps/iproute2
-		)
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8[introspection]
-		)
-	)
-	policykit? (
-		sys-auth/polkit
-	)
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio-daemon[bluetooth]
-			media-video/pipewire[bluetooth]
-			<media-sound/pulseaudio-15.99.1[bluetooth]
-		)
-	)
-"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="
-			~BRIDGE
-			~IP_NF_IPTABLES
-			~IP_NF_NAT
-			~IP_NF_TARGET_MASQUERADE
-		"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	else
-		# remove this when upstream switches to automake with .pyc fix
-		eautomake
-	fi
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	local myconf=(
-		--disable-runtime-deps-check
-		--disable-static
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	default
-}
-
-python_test() {
-	# import tests are not very valuable and fail if /dev/rfkill
-	# does not exist
-	"${EPYTHON}" -m unittest -v test/test_gobject.py || die
-}
-
-python_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/blueman/blueman-2.3.3.ebuild b/net-wireless/blueman/blueman-2.3.3.ebuild
deleted file mode 100644
index 2166f0316e85..000000000000
--- a/net-wireless/blueman/blueman-2.3.3.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-else
-	SRC_URI="
-		https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz
-	"
-	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-# icons are GPL-2
-# source files are mixed GPL-3+ and GPL-2+
-LICENSE="GPL-3+ GPL-2"
-SLOT="0"
-IUSE="network nls policykit pulseaudio"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=net-wireless/bluez-5:=
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	')
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection,X]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	network? (
-		net-firewall/iptables
-		|| (
-			sys-apps/net-tools
-			sys-apps/iproute2
-		)
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8[introspection]
-		)
-	)
-	policykit? (
-		sys-auth/polkit
-	)
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio-daemon[bluetooth]
-			media-video/pipewire[bluetooth]
-			<media-sound/pulseaudio-15.99.1[bluetooth]
-		)
-	)
-"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="
-			~BRIDGE
-			~IP_NF_IPTABLES
-			~IP_NF_NAT
-			~IP_NF_TARGET_MASQUERADE
-		"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	else
-		# remove this when upstream switches to automake with .pyc fix
-		eautomake
-	fi
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	local myconf=(
-		--disable-runtime-deps-check
-		--disable-static
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	default
-}
-
-python_test() {
-	# import tests are not very valuable and fail if /dev/rfkill
-	# does not exist
-	"${EPYTHON}" -m unittest -v test/test_gobject.py || die
-}
-
-python_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/blueman/blueman-2.3.4.ebuild b/net-wireless/blueman/blueman-2.3.4.ebuild
deleted file mode 100644
index 2166f0316e85..000000000000
--- a/net-wireless/blueman/blueman-2.3.4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-else
-	SRC_URI="
-		https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz
-	"
-	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-# icons are GPL-2
-# source files are mixed GPL-3+ and GPL-2+
-LICENSE="GPL-3+ GPL-2"
-SLOT="0"
-IUSE="network nls policykit pulseaudio"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=net-wireless/bluez-5:=
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	')
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection,X]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	network? (
-		net-firewall/iptables
-		|| (
-			sys-apps/net-tools
-			sys-apps/iproute2
-		)
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8[introspection]
-		)
-	)
-	policykit? (
-		sys-auth/polkit
-	)
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio-daemon[bluetooth]
-			media-video/pipewire[bluetooth]
-			<media-sound/pulseaudio-15.99.1[bluetooth]
-		)
-	)
-"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="
-			~BRIDGE
-			~IP_NF_IPTABLES
-			~IP_NF_NAT
-			~IP_NF_TARGET_MASQUERADE
-		"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	else
-		# remove this when upstream switches to automake with .pyc fix
-		eautomake
-	fi
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	local myconf=(
-		--disable-runtime-deps-check
-		--disable-static
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-python_compile() {
-	default
-}
-
-python_test() {
-	# import tests are not very valuable and fail if /dev/rfkill
-	# does not exist
-	"${EPYTHON}" -m unittest -v test/test_gobject.py || die
-}
-
-python_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/blueman/blueman-2.3.5.ebuild b/net-wireless/blueman/blueman-2.3.5.ebuild
index 1b8b69abb75f..3bbcc0cb2bf4 100644
--- a/net-wireless/blueman/blueman-2.3.5.ebuild
+++ b/net-wireless/blueman/blueman-2.3.5.ebuild
@@ -20,7 +20,7 @@ else
 		https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz
 	"
 	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 # icons are GPL-2
diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21-r1.ebuild
index cf5f6f0f505e..009de1fa5222 100644
--- a/sci-calculators/units/units-2.21.ebuild
+++ b/sci-calculators/units/units-2.21-r1.ebuild
@@ -21,7 +21,6 @@ RDEPEND="
 	units-cur? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 		')
 	)
diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch
new file mode 100644
index 000000000000..7e744189a8d2
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch
@@ -0,0 +1,36 @@
+From: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c
+
+From: Aiden Grossman <agrossman154@yahoo.com>
+Date: Mon, 10 Oct 2022 18:25:13 +0000 (-0700)
+Subject: Fix naming conflict between X11 headers and VTK 9.2.2+
+X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c
+
+Fix naming conflict between X11 headers and VTK 9.2.2+
+
+Currently, the GLX headers include the X11 headers which use a
+preprocessor define to make Status an int. However, VTK has a class
+called Status, and this define replaces this class name with int which
+results in compilation errors. This patch undefs Status and Success,
+which are both defined in the X11 headers if they exist so that there
+are no conflicts within the VTK headers for newer versions.
+---
+
+--- a/src/IVtkDraw/IVtkDraw_Interactor.cxx
++++ b/src/IVtkDraw/IVtkDraw_Interactor.cxx
+@@ -27,6 +27,16 @@
+ #undef AllValues
+ #endif
+ 
++// Prevent naming collisions between X11
++// and VTK versions 9.2.0 and above.
++// X11 is included through glx
++#ifdef Status
++#undef Status
++#endif
++#ifdef Success
++#undef Success
++#endif
++
+ #include <vtkXRenderWindowInteractor.h>
+ #include <vtkXOpenGLRenderWindow.h>
+ #endif
diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
index cd7888f8818b..2090e9b45195 100644
--- a/sci-libs/opencascade/opencascade-7.6.3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	media-libs/ftgl
 	virtual/glu
 	virtual/opengl
-	x11-libs/libXmu
+	x11-libs/libX11
 	examples? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -49,7 +49,7 @@ RDEPEND="
 	ffmpeg? ( <media-video/ffmpeg-5:= )
 	freeimage? ( media-libs/freeimage )
 	tbb? ( dev-cpp/tbb:= )
-	vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
+	vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
 "
 DEPEND="
 	${RDEPEND}
@@ -68,6 +68,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
 	"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
 	"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
+	"${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
 )
 
 src_prepare() {
@@ -131,18 +132,16 @@ src_configure() {
 	fi
 
 	if use vtk; then
-		if has_version ">=sci-libs/vtk-9.1.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
+		mycmakeargs+=(
+			-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+			-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+		)
+		if has_version ">=sci-libs/vtk-9.2.0"; then
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
+		elif has_version ">=sci-libs/vtk-9.1.0"; then
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
 		elif has_version ">=sci-libs/vtk-9.0.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 )
 		fi
 	fi
 
diff --git a/sci-libs/opencascade/opencascade-7.7.0.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
index c2f7e7dbf7a4..efd245f9b465 100644
--- a/sci-libs/opencascade/opencascade-7.7.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
 	virtual/opengl
-	x11-libs/libXmu
+	x11-libs/libX11
 	examples? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -63,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.7.0-add-missing-include-limits.patch
 	"${FILESDIR}"/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch
 	"${FILESDIR}"/${PN}-7.7.0-avoid-pre-stripping-binaries.patch
+	"${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
 )
 
 src_prepare() {
@@ -132,24 +133,16 @@ src_configure() {
 	fi
 
 	if use vtk; then
+		mycmakeargs+=(
+			-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+			-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+		)
 		if has_version ">=sci-libs/vtk-9.2.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
 		elif has_version ">=sci-libs/vtk-9.1.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
 		elif has_version ">=sci-libs/vtk-9.0.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
+			mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 )
 		fi
 	fi
 
diff --git a/sys-apps/file/file-5.43-r1.ebuild b/sys-apps/file/file-5.43-r2.ebuild
index 7c19d39a9bb8..52dc4216c940 100644
--- a/sys-apps/file/file-5.43-r1.ebuild
+++ b/sys-apps/file/file-5.43-r2.ebuild
@@ -49,8 +49,8 @@ BDEPEND+="
 	)"
 
 PATCHES=(
-	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
-	"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
+	"${FILESDIR}/file-5.43-portage-sandbox.patch" #713710 #728978
+	"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
 	"${FILESDIR}/${P}-configure-clang16.patch"
 )
 
diff --git a/sys-apps/file/file-5.44.ebuild b/sys-apps/file/file-5.44-r1.ebuild
index 176003173e24..c2ccddf05d43 100644
--- a/sys-apps/file/file-5.44.ebuild
+++ b/sys-apps/file/file-5.44-r1.ebuild
@@ -52,9 +52,10 @@ BDEPEND+="
 	)"
 
 PATCHES=(
-	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
-	"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
+	"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
+	"${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
 	"${FILESDIR}/file-5.44-limits-solaris.patch" # applied upstream
+	"${FILESDIR}/file-5.44-seccomp-utimes.patch" # upstream
 )
 
 src_prepare() {
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index a00d8815a22a..fa5ba1cfe556 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
@@ -52,8 +52,8 @@ BDEPEND+="
 	)"
 
 PATCHES=(
-	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
-	"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
+	"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
+	"${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
 )
 
 src_prepare() {
diff --git a/sys-apps/file/files/file-5.43-portage-sandbox.patch b/sys-apps/file/files/file-5.43-portage-sandbox.patch
new file mode 100644
index 000000000000..f9e715cc366f
--- /dev/null
+++ b/sys-apps/file/files/file-5.43-portage-sandbox.patch
@@ -0,0 +1,28 @@
+Allow syscalls for Gentoo's portage sandbox
+
+- Add getcwd (bug #728978)
+- Add faccessat2 (bug #889046)
+
+Bug: https://bugs.gentoo.org/728978
+Bug: https://bugs.gentoo.org/889046
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -174,6 +174,9 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(exit_group);
+ #ifdef __NR_faccessat
+ 	ALLOW_RULE(faccessat);
++#endif
++#ifdef __NR_faccessat2
++        ALLOW_RULE(faccessat2);
+ #endif
+ 	ALLOW_RULE(fcntl);
+  	ALLOW_RULE(fcntl64);
+@@ -237,6 +240,8 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(write);
+ 	ALLOW_RULE(writev);
+ 
++	// needed by Gentoo's portage sandbox
++	ALLOW_RULE(getcwd);
+ 
+ #if 0
+ 	// needed by valgrind
diff --git a/sys-apps/file/files/file-5.43-seccomp-fstatat64-musl.patch b/sys-apps/file/files/file-5.43-seccomp-fstatat64-musl.patch
new file mode 100644
index 000000000000..a039882ac8d7
--- /dev/null
+++ b/sys-apps/file/files/file-5.43-seccomp-fstatat64-musl.patch
@@ -0,0 +1,22 @@
+From 8c13923a8e17a02be0989649b2edc20124816729 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 15 Jun 2021 16:08:22 -0400
+Subject: [PATCH] seccomp: undef fstatat64 to avoid build failure on musl
+
+sys/stat.h in musl does this:
+
+  #define fstatat64 fstatat
+
+Counteract this with an #undef.
+
+Bug: https://bugs.gentoo.org/789336
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -182,6 +182,7 @@ enable_sandbox_full(void)
+ #endif
+  	ALLOW_RULE(fstat64);
+ #ifdef __NR_fstatat64
++#undef fstatat64
+ 	ALLOW_RULE(fstatat64);
+ #endif
+ 	ALLOW_RULE(futex);
diff --git a/sys-apps/file/files/file-5.44-seccomp-utimes.patch b/sys-apps/file/files/file-5.44-seccomp-utimes.patch
new file mode 100644
index 000000000000..49f1c2e4b739
--- /dev/null
+++ b/sys-apps/file/files/file-5.44-seccomp-utimes.patch
@@ -0,0 +1,18 @@
+https://github.com/file/file/commit/1590a653b520123d47070a47436abfba42d4c943
+
+From 1590a653b520123d47070a47436abfba42d4c943 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Mon, 26 Dec 2022 18:57:29 +0000
+Subject: [PATCH] PR/408: SpraxDev: Add utimes to the allow list for -p
+
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -233,6 +233,7 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(umask);	// Used in file_pipe2file()
+ 	ALLOW_RULE(getpid);	// Used by glibc in file_pipe2file()
+ 	ALLOW_RULE(unlink);
++	ALLOW_RULE(utimes);
+ 	ALLOW_RULE(write);
+ 	ALLOW_RULE(writev);
+ 
+
diff --git a/sys-apps/sandbox/sandbox-2.30.ebuild b/sys-apps/sandbox/sandbox-2.30-r1.ebuild
index faed8b2a7983..7a018dc315d1 100644
--- a/sys-apps/sandbox/sandbox-2.30.ebuild
+++ b/sys-apps/sandbox/sandbox-2.30-r1.ebuild
@@ -14,9 +14,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+nnp"
 
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
+# pax-utils lower bound for bug #265376
+DEPEND=">=app-misc/pax-utils-0.1.19"
+# Avoid folks installing with older file, bug #889046. We still need the
+# >= dep in Portage but this is a safety net if people do partial upgrades.
+RDEPEND="!<sys-apps/file-5.44-r1"
+BDEPEND="app-arch/xz-utils"
 
 has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
 
@@ -34,8 +37,7 @@ src_prepare() {
 
 	# sandbox uses `__asm__ (".symver "...` which does
 	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
-	append-flags -fno-lto
-	append-ldflags -fno-lto
+	filter-lto
 }
 
 multilib_src_configure() {
diff --git a/sys-apps/texinfo/texinfo-6.8.ebuild b/sys-apps/texinfo/texinfo-6.8.ebuild
index 3080c44b89eb..2553876b3cbf 100644
--- a/sys-apps/texinfo/texinfo-6.8.ebuild
+++ b/sys-apps/texinfo/texinfo-6.8.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 IUSE="nls +standalone static"
 
 RDEPEND="
+	sys-apps/help2man
 	!=app-text/tetex-2*
 	>=sys-libs/ncurses-5.2-r2:0=
 	standalone? ( dev-lang/perl )
diff --git a/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
index ac7dbea1ee77..08611dea23bf 100644
--- a/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
@@ -24,6 +24,7 @@ SLOT="0"
 IUSE="nls +standalone static"
 
 RDEPEND="
+	sys-apps/help2man
 	!=app-text/tetex-2*
 	>=sys-libs/ncurses-5.2-r2:=
 	virtual/perl-Data-Dumper
diff --git a/sys-apps/texinfo/texinfo-7.0.1.ebuild b/sys-apps/texinfo/texinfo-7.0.1.ebuild
index 9669d1502f2e..f37627a99b40 100644
--- a/sys-apps/texinfo/texinfo-7.0.1.ebuild
+++ b/sys-apps/texinfo/texinfo-7.0.1.ebuild
@@ -24,6 +24,7 @@ SLOT="0"
 IUSE="nls +standalone static"
 
 RDEPEND="
+	sys-apps/help2man
 	!=app-text/tetex-2*
 	>=sys-libs/ncurses-5.2-r2:=
 	virtual/perl-Data-Dumper
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.39-r4.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.39-r4.ebuild
index cd5af5b432c4..5076d24dc8fc 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.39-r4.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.39-r4.ebuild
@@ -35,7 +35,7 @@ else
 	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
 		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 	SLOT=$(ver_cut 1-2)
-	KEYWORDS="-* ~hppa"
+	KEYWORDS="-* hppa"
 fi
 
 #
diff --git a/sys-devel/binutils/binutils-2.39-r4.ebuild b/sys-devel/binutils/binutils-2.39-r4.ebuild
index 8a51b198d221..f0baee70d145 100644
--- a/sys-devel/binutils/binutils-2.39-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.39-r4.ebuild
@@ -33,7 +33,7 @@ else
 	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
 		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 	SLOT=$(ver_cut 1-2)
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 #
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 9a395eb2a2a9..5367b5e932a3 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -15,10 +15,12 @@ DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d
 DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac
 DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9
 DIST gcc-11.4.0-patches-5.tar.xz 15136 BLAKE2B 202bc321d1a75a543bcbb54ddd7aae2a6d81764b1ae752e95bbcb7b1e68cbac33e2066a1c935c705fc7cea6603e93a6dcb3041645131a5e76c986242a8613908 SHA512 96ec2dec4e663d739fa7b80e63df32aa6d72c193e124bc93580cc1c0f9b8d3578dee3faf0e765b766cc6bb46136958a4b0e7095962d73b6e2a8066b8be558a5c
+DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df
 DIST gcc-12-20221210.tar.xz 79645632 BLAKE2B 063222037d420f356d452d0419fc4621c30393beaca1f2661d7070c087bca88831f27ae96d8fb7433efaeb59cb338495fb210611a1c37931a1d00373cba9812b SHA512 00399148932b5c57dbe442dcde01e856cbb981c7cc6703760ea51b28e0784cbc6e016663f195b69714da8c7e2cdcfbc03cb1939bab3e6b507b64846e1e814fa6
 DIST gcc-12-20221224.tar.xz 79647600 BLAKE2B 9c99e6fee09457ac56f8b975650aa0b7dc82f05e990b722af16383ef75b9c02ea592fc37ba3a098e5a601c2115fe2c2414699830175e375325f99743d8ed952f SHA512 018c68d323d9fbe25295807211f750fa80efb947b77e8557860cfd9e97c90198e50c5b3f589afe7fd287a226ff5105b59c6134e4a6cd616ac3d551a5914a15e8
 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
+DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfbecec016727a50ac0f4767b37a2ab9df39e0828abb07f1e429619cc102808f81af8422fef0265415c287d303d9d97fc0 SHA512 1808a05e98094577099d115ff5f3e136e3fc8f39fbe35c5183fd7775383f94439212e5e4174ab8d0ae8c0874e227ff84a958ffdfa1c99c9a8306a9842d126ef9
 DIST gcc-12.2.0-patches-6.tar.xz 19096 BLAKE2B 9d97f4b1d4c82c00d6bac923963444198fb8144753bfb25f0068d96e4c7444f6163a7cd2e6ed2b808f608131f3208746776b2d061986b8d50311ca6cd8cbb917 SHA512 9af71c64490a289d959e95b2df34e62861c161cb161632020f66a4fbdfdbc7f08f6f2956d08e0a7995332d010c974f58a8bc8e4d595769c5632c4755a4e86b31
 DIST gcc-12.2.0-patches-7.tar.xz 14492 BLAKE2B 95347cc4a7affab3ac1ed2b89ed7dcb239e17b28c93ab45f248765d297ca37e2ab127b13fba2a38256166c2daf43156e574ac783868ac48d561909af5fe82139 SHA512 661daf478f6abeab8c3164282aef591c44e18ab99deaa1aee2102de4c8d05da4145bf3ea371ebcf7e4f2455d5ae97c6d94e321b98d373750c784c1b278efb87a
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
diff --git a/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild b/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild
new file mode 100644
index 000000000000..28a10fb471f5
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="2"
+PATCH_GCC_VER="12.2.0"
+MUSL_VER="1"
+MUSL_GCC_VER="12.2.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 2cd29b1ac120..cba9fab6c9f9 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -10,7 +10,7 @@ DIST patch-4.14.302.xz 4966856 BLAKE2B 0cab871be44e7748429d5e589da2a81464151af60
 DIST patch-4.19.269.xz 4936456 BLAKE2B 1e342716abf01afdeb7180c32f7160651919b0d3639852d9fc840802bafe4247cddabf4fb6668985b49cc374de7901c43313b11f6930ea5aa89475d6650ee66f SHA512 820e20a6973573a8320acb0d7692667595a8d147b231f3abe362435b7b272bd769680d073d8c22e8766806eb3097305dc479d02287e07b94b3ed0634e5d2164e
 DIST patch-4.9.336.xz 4507932 BLAKE2B 5fb00ab8273b0a095d1a209f909c0642da9592c98e92ac7c6db1dd591c8425386d9867910046ae48a7f357b6440d51345d675da772750e5a731a2a0a22269e5a SHA512 8beea5afee079c8fea64cab46c1c1485673f1afd702295220ca8c4ec9667a41f3ce380ed0e4e4cbed9625c402b9289ca79795e11c4d634cb6f77f758d31bfba5
 DIST patch-5.10.161.xz 3976920 BLAKE2B 66fb44942a79ceb3b4912ffc3f23723b3c1bb796facceb3509cbe50b0cf5d6210ba5a478ffc3704328c1fec5d0d0e5a9504df06dd7ff9f3056937c01ed4a2450 SHA512 79d6a70c28246a22454cd5898bd3f35789373c05a746027a22336bfdac71b53b9611016f264cc08ecbb0e71eacc21d4abb55bf52ac26cbc8f86c42d472aa876d
-DIST patch-5.15.85.xz 3188412 BLAKE2B 8daba6d60a80165db5eccb0755dedaa64f9e63f63640c40177d198fc99df25e13646504c31e23106d07465ba27cf21e4c084ae7fbd01997765e0135fb6773a68 SHA512 aa7d75ab949a266495391728a93096e30d0579ec490ee97b3a5f7cb4ef4268c17fbc3ba337a289e14c3bebc7e7be4dc7656abe86abc3cb8d691e2d5f21a480b5
+DIST patch-5.15.86.xz 3367720 BLAKE2B 669d633a4540188761e991fa680236853ac01ebece18868b4dfc5607ad281c9ecfa9d9cad3ffcc156ae858ae1961965ab4ec0c799db873a8a356b9d183ef6e9d SHA512 c1552ed1c10a44cbfd6e6d995f05adbaa62554460e4f8bae124eaf30efd49972bc1f5ece5c6bcc20c4f21fd1ff05a3d7b662b3d98cd8e2f3a3a7e186f3aba53b
 DIST patch-5.4.228.xz 4407528 BLAKE2B 65a3b84e6de38fd57ddf9c1bb42d465ee651cff56a2a4afe8d500087822a12220a7f2da8b09438185ed485cd0511e512f69701225fbaec046cfaa9bfe1d74c22 SHA512 587999f8b8c529f4b15f4524b2009ffde8c1880a9f33d8e2feb60ed89b5baf04244a380fd5f16a340e14e655bda6e8cc7dc8dc286bdb6cebbf0f703888134475
-DIST patch-6.0.15.xz 683084 BLAKE2B 60ac1c499af6ac0828577fbf46186fc8fb9458a93ef3a12d54dfb3ca373d1900aa058981e0356399221e12925765f9246b5ebacde5323456ce23372b1d2dc725 SHA512 6d79b56e034f01e82e6e45b6e4e703b7ff4631750bccf68870b229d7b70165d2735655bcb40726d0fc81080331a851c7437013bccd62907401bb1f5dc0469a1a
-DIST patch-6.1.1.xz 11060 BLAKE2B 246c3a176007ac8ad0393f962494b66293410b9989042269283af007bc90c42166c1d50a3bdef52bc1054a0e1c9b4febd6ae14390ebee368c3e9df6c8247da34 SHA512 8b78c69cb26a3d56ed761529b1dfb6feb2409851ae3963785b435288c62c5588ca2b57e75e0f5574f417535bf68f8e67d15ebd9864dcaf1c5165a6dcb6ffed68
+DIST patch-6.0.16.xz 959420 BLAKE2B 1437473fe30ab9033b875b400b8d68dd7fe8eeefd181c6cf533b0a905e2053cc3cf64c65f9fce3b107bdde5aa1d5b0354feb69d082aeb3f03b4e31075a873aa7 SHA512 e79ce21177c9db12605afecec612fc75034c8c75a3a25e3da817ef5247613bc6b4f9a87c8bf403273aa0d9454e901e3c117bb98ab4e16d761ba708dda28994dd
+DIST patch-6.1.2.xz 327508 BLAKE2B db9d3d19103e4153f957d1dadb747ac0922b4f8e33b7952ff1a00dafb89a3f08f282c470f29e0e0380982f782a395b4d66d4c1af3d5f6a197acaa8c102c84d43 SHA512 f2463224fa59022b56a30ed601c64a25c60b28f29db28fc94c66dd9d82f94a177de0d47c7a4b26822bc8541f6e230053431b1c8884996cd0ddaa7c9ea4f3a9f6
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.1.1.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.86.ebuild
index 39693afef068..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.1.1.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.15.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.85.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.0.16.ebuild
index 39693afef068..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.85.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.0.15.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.1.2.ebuild
index 39693afef068..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.0.15.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.39-r4.ebuild b/sys-libs/binutils-libs/binutils-libs-2.39-r4.ebuild
index e456c27e99b2..75e746e1bf03 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.39-r4.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.39-r4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV%_p?}"
 IUSE="64-bit-bfd cet multitarget nls static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/xfce-extra/xfce4-datetime-plugin/Manifest b/xfce-extra/xfce4-datetime-plugin/Manifest
index ebde3251fc53..cb8a9aa70e06 100644
--- a/xfce-extra/xfce4-datetime-plugin/Manifest
+++ b/xfce-extra/xfce4-datetime-plugin/Manifest
@@ -1,2 +1 @@
-DIST xfce4-datetime-plugin-0.8.1.tar.bz2 330734 BLAKE2B 606802f4bf23960f8829be7c83e2a17666bfa94f6ab7821713591542d476463c72b6832012d2a865cf408d606b7ebe54080e02246f070cf45bed6474b75c6051 SHA512 2671b3732e9bfca68543ababa69dd16d988ba0acf0f0c8d2eba539143f8764f561053c69de3f89441e32c3098d135ee0cdf630aed5a4db16316455bdfc98120a
 DIST xfce4-datetime-plugin-0.8.2.tar.bz2 328440 BLAKE2B b3314b5250edd63749fa7f4e54ae9b2c2ad1d05d56e31556950560164c0e2042f4ef2ca842c1f712bb6184a4db50cacadf766734ea16b7aac88aaecbf96c95a6 SHA512 3457b503c6fc72b2a1ffb7a26bf71776362087fcb3a33c6050d169843591855420c60399869131013653a6acac5b18f5926fc51690b49ebad01c4d078b2bca97
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.1.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.1.ebuild
deleted file mode 100644
index 3a10641c753c..000000000000
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A panel plug-in with date, time and embedded calendar"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.2.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.2.ebuild
index 96a54c2f66d7..4db6bc4e903c 100644
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.2.ebuild
+++ b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-places-plugin/Manifest b/xfce-extra/xfce4-places-plugin/Manifest
index 3cf33fd8a248..380cbdb663f3 100644
--- a/xfce-extra/xfce4-places-plugin/Manifest
+++ b/xfce-extra/xfce4-places-plugin/Manifest
@@ -1,3 +1 @@
-DIST xfce4-places-plugin-1.8.1.tar.bz2 380906 BLAKE2B 3b5c82fe3fb9fbcc0b9aa79df62da06025f5dd154d4323787d52cbf659351dcc808a4c6e8d4148332eb31a8d292b51d58dba6c81fdf49443b94928a1e82f66f0 SHA512 c0db29050df6ff2862a6ebc6f89d92e39f0c0511f9e719a979b5132935655078a5f5418b8b87bee2fbccaa37f5489d503dc1ae329eb7fd88970dc55b31db3324
-DIST xfce4-places-plugin-1.8.2.tar.bz2 388168 BLAKE2B 4ffd6fddae71c40c82dd86427c742865a237d48650480db9b817e04f35d6b142896f51f63772f9ab3ca15f1fdccee492d442ee78a1033394154e561075ee66ac SHA512 ad298407183ea499bd4a7c923e80141886c7ca809f4af4184074a1c98e73c72fbf610e06bccdffe3c1bacce39d945dc094d0ea9a82ca67ff7f8b79c8d9c5c53d
 DIST xfce4-places-plugin-1.8.3.tar.bz2 388661 BLAKE2B c824db5b7cfb1458c3562ab8dc1334d8fd7223ede49c62f52def23c16899848490907a044998e205a31837c96264415c9cfe2ef7adac5ddabd9f4440cafae562 SHA512 31ab8a47606c6406e93a753c55eb902fb25828f2c89c31814c11534dde327e656678ffcd590b41ebfab0a761bfcf0dae72e1ca3bb84eef5d0592f52114556ac9
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.1.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.1.ebuild
deleted file mode 100644
index 73c45a20f680..000000000000
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A panel plug-in to provide quick access to files, folders and removable media"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="libnotify"
-
-RDEPEND=">=dev-libs/glib-2.42:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11:=
-	>=xfce-base/exo-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.2.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.2.ebuild
deleted file mode 100644
index 6dbca3313e8d..000000000000
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A panel plug-in to provide quick access to files, folders and removable media"
-HOMEPAGE="
-	https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
-	https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/
-"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="libnotify"
-
-DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11:=
-	>=xfce-base/exo-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.3.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.3.ebuild
index 9fe133e4f4b6..7fcebd3a8689 100644
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.3.ebuild
+++ b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libnotify"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 67c52f20fe46..781eeb92ade4 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,3 +1 @@
-DIST xfce4-screenshooter-1.10.0.tar.bz2 595720 BLAKE2B a24c1487ce61bac37ba5376d990af9a26791e040c8ad47d11f29b2b5df9248dc273fa79d2ee162bdc6fa0458c29782d9d35574f126499aa5d2b34f16e19bd796 SHA512 e31e718078e5fe2881779f4caa9e8092107629c36971b513f2be5ac33622ae64bb734e6e61277af7a657cbc5cd17a2eaad9e439c210945826818c2a317456060
 DIST xfce4-screenshooter-1.10.1.tar.bz2 596568 BLAKE2B dc43dd73f2bec42cf0bfc3e579653f947feef42006c9441c6748373ecf417248566f1c02da4be95da368ca77b0b57cbbea014f47a029215031316c52ef7b8fa8 SHA512 1e39bc89c0ec35e88834568a42e20d8f48dc141e045865623d387a91a9c7f7d96457db10e34d7ba6c5d8171673bb3b41f4d91d6cc53d1a841042acaa0cec202b
-DIST xfce4-screenshooter-1.9.11.tar.bz2 585007 BLAKE2B 2ffb2f4fb9bbba393b56d253919f999790a7d7fb8679fadd2365828d76b89fb736a2d7ff78556b75665936c197bb33363bc9e5c15bd94cb265d57d11b24f69da SHA512 fec4a374047dc0dddddd5d498f6ffb55bc590f209b31fa5e3ca5871788568145ad910fd535fced2f1d2eb52c52e219981eee3aba2e63ab1c56448bb313376155
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.0.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.0.ebuild
deleted file mode 100644
index bf11a416225b..000000000000
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Xfce4 screenshooter application and panel plugin"
-HOMEPAGE="
-	https://docs.xfce.org/apps/xfce4-screenshooter/start
-	https://gitlab.xfce.org/apps/xfce4-screenshooter/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.44.0
-	>=net-libs/libsoup-2.26:2.4
-	>=x11-libs/gdk-pixbuf-2.16
-	>=x11-libs/gtk+-3.22.0:3
-	>=x11-libs/pango-1.44.0
-	dev-libs/libxml2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/libXi-1.7.8
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/xfce4-panel-4.16.0:=
-	>=xfce-base/libxfce4util-4.16.0:=
-	>=xfce-base/libxfce4ui-4.16.0:=
-	>=xfce-base/xfconf-4.16.0:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		--enable-xfixes
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.1.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.1.ebuild
index 3429a0a49d4e..7ba9a41b409f 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.1.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.11-r1.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.11-r1.ebuild
deleted file mode 100644
index 1e931d94c97f..000000000000
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.11-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Xfce4 screenshooter application and panel plugin"
-HOMEPAGE="
-	https://docs.xfce.org/apps/xfce4-screenshooter/start
-	https://gitlab.xfce.org/apps/xfce4-screenshooter/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.16
-	>=net-libs/libsoup-2.26:2.4
-	>=x11-libs/gdk-pixbuf-2.16
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/pango-1.44
-	dev-libs/libxml2:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/xfce4-panel-4.14:=
-	>=xfce-base/libxfce4util-4.14:=
-	>=xfce-base/libxfce4ui-4.14:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		--enable-xfixes
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}