gentoo auto-resync : 31:12:2022 - 20:20:25

521 files changed, 887 insertions, 8220 deletions

diff --git a/Manifest b/Manifest
index e6d63c676787..a32696d262f7 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29768 BLAKE2B adda96a1343ca92b4627804eb7c83874014923099977e2b2b71a4efb5e1f10474218d09e86e3cea23decb5e9396fccdd95f86b180782dd0d0f120dcadaf128a7 SHA512 9a60abdea3c69b2ffe38af66991b050e1302527f8503da0ee22f97991072c836717f9dcee123db586ea3474a18c3e79de1623c7c81f86a15cc3f932df8736d80
-TIMESTAMP 2022-12-31T13:39:54Z
+MANIFEST Manifest.files.gz 29767 BLAKE2B b466637834a75e6c3e56fa6a868996e275d6e38609e58dde435dfcab28c3bc2fae625d11559ae64f301048c8680a40890ac51831beff0a0616d9508286c371ae SHA512 682b54d02eb8c6b9b3a2342db3b0adff5cb2b09e8c9a0d6f30f3878204d0026a2c29dac54bba71b6212bd2b35f3014dbcc127cd4edf5ecfc3ec93299f31de18e
+TIMESTAMP 2022-12-31T19:39:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOwO6pfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOwkA1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCr7RAAioU+wUFw4dHXj0DfQ92HXplwrpNnSyUrpTYZGVU3vlqJo7SwQ6uI/ekq
-wjGQG5ZqQZ5MPL/5Z7Vh4ZotQ85FqV1JMXI08/4xeRKgz+nWs/kWYKA1mm4ItHrN
-/k0S0aVZZrWVkbWK8YatZ+QEIs1kidONwCgpimwFG8UMK2oUH40TctTmmOLBPXbc
-kx4S07l/LjHBmdUEcM1wTUnEoW4aC0CxCDAiFvz55tOYimNRjivCUFxWz0KLsTFq
-6rJQPGjIGQSc/72dtacXblYPNOwysGG5/p2k7d5VAUh1ioohwJOnfvzha8WiMdOw
-gWpFZz8yeOXNENjDpIPaPfxyO4+bn1K4RSqXKC5CIPbvcuuMVKpMnfJ1CS0VegIh
-H3AaTHpth+hwtLI9NB1pmOtLvrmYNfcREi/ErpP90f37nsePEr0AZwyMeDNZPE/o
-Z3d0hs9G1nvR3mN0pBM4gy84FHqvBzLFsEn2bXZcQq4/eObBPogvy/HF3qwLliMO
-V1pY+meCszmqSgVSVNXCUo5KNUmr2jXiXD80QXG9QPqt0d9BKtxr6lIxdMn1aJwA
-SMyVHlXSdjuIuLrEVz7E0H2qWIyUyzZOKWlgUObNmwZoYnUAeJ+StU5l37c42O1U
-Br5sNyHPNCXgnwlfHuL0QCurnPNx3V8JDjRBCE3Y28bU3jpcY6E=
-=LRrm
+klD/UA/9H4cY4fzsbvGFlblgJDT+AVlnOQtLgmXaNuYV6QiMRT1yq/dtiHuGjURh
+MCc5DB9CPcLqaeZ4cIFKNXeq1D/IG1mNhbWnTh7udqYJsGbwrBrvv+AXVIZelVoz
+f7gKEtQi/gj62juceKvutMmW1IbmhJMJ3i05Y2+3seM7nL8rr3xqwrxJG1BfR317
+1MP+5NDY34bKxoTSuti6V88QjdHmvjmj6VCPtarzlVbdzsDsJdvNS9fKMvWHprI7
+46uiXfuLYD0PrypY4OLNwxDxiOB0TrmMgn4TDtqTW0ViKLz4i0SbU0HgRVD++FhA
+Dny63ymvinAL5AWNKXFVC3wR54LdJsJTRsOn+tQt8v8InJLHrCpXpTD0dR5It6TI
+LavWkAyCABYz2O2/LYojB0+9F6bSp2GBucz23zhLhqjsG2ZrEPaW6ylGHN+hyoqP
+wQlFxH13M4fTNh+IrzRNXhjzhspTWWWUOkUME/EQ03nHGitXl3YiEgoXQ4Mdg6HV
+rDizEOXWCGbmuIU61uhY+TTIGi9eBB09bP3K3FNT+KeKrK1EiFvTt+1lIuY3rUf1
+exIxqmO9p1Ic5pOYiSm0Vf9HcG4NX1S4f45q+l18bHWAdpXXLd3BDDX9td34bSlt
+o6CAUiOkbszLJbGtcnViUa7mTB7u3g8lSXVvZNbEFYr4GCRR6FA=
+=p1tq
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3654207e7f47..772a524e2364 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-alternatives/Manifest.gz b/app-alternatives/Manifest.gz
index 638b03ac7a4d..009a352f3c24 100644
--- a/app-alternatives/Manifest.gz
+++ b/app-alternatives/Manifest.gz
diff --git a/app-alternatives/bzip2/Manifest b/app-alternatives/bzip2/Manifest
index 23aa6c92bff4..61453a381325 100644
--- a/app-alternatives/bzip2/Manifest
+++ b/app-alternatives/bzip2/Manifest
@@ -1,2 +1,2 @@
-EBUILD bzip2-1.ebuild 934 BLAKE2B 1aba6cbf4ba3d2e2e6ff3c349054b1e07df043d19878ea9b78bc54c182337951f035faa163b5638db4190c3b3b78eb63464df53d7087c487f53db77fb717ded1 SHA512 4b512cfdfde59007642d7fa60ba930237f4790323b3e023fc6591384becab042a2a0960df2d174b24adebf9af8785044f94e994eb9ff0879050c39ea8616d9ea
+EBUILD bzip2-1.ebuild 1050 BLAKE2B 22ac943a6f2afb46ca9f13d58052c4cbde49aba12e94a43ce28ddf7239af91d3dfec581e2f24ed89ef8d092e81b27e4b2be932404c03c090c358ce5fe56264fb SHA512 5ae37027a6b44ff9d87abc42c54014c9a4ec9d425da1af5c961132235fcf8d1d273925f6152b66c5d80e7cefe92821ccf67e8978c11737162056dd23ac7fd1e8
 MISC metadata.xml 608 BLAKE2B a8bd6f79e552943ee891edc7e90399c77dca3347ce407767902446d0e25720eacc137a6ed31fb851553caf8a938cf6be63c7a1451b2b8aa4a3c367995204216b SHA512 a3863d41f2b3475e64903389efa2b0f8258bf5f21df4e83ff0e28fa44519b012ab92d4a773d05089d7fcf210e4c29da63d25be8e9e098d15284e13dc75bfcf6d
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-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 3d24b1495ca3..a41c2a98bfdf 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/xbiso/Manifest b/app-cdr/xbiso/Manifest
deleted file mode 100644
index 2e30095ff9d3..000000000000
--- a/app-cdr/xbiso/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xbiso-0.6.1-libs.patch 758 BLAKE2B 730292d6bcfdd89b05f209477d7ac398f5624075f520f040e5077e98dcdc8409af56a10a697c2c10556e34b37163e51218000f0a2aa290932cd51b16cb9d138f SHA512 922e022da38f3ad2b621cdb382dfd79c1e79397967c3f818f446a42397b37eb2eaab38c0f9d0b0fd595e549adcb44b1508a7bbae1034fcc8586167d1bcf107ad
-DIST xbiso-0.6.1.tar.gz 49698 BLAKE2B ac1605df188b0ec84d0798a0c0220405ce5082160025dc7b21405f1a17f8e0439c6f8d5dbbe293db1645ac0ad195fb0791fe765ea9e1b8c199461f97a2525dce SHA512 351b558c591c3a6c633fb07e081d57cf7ac8b15272ae19878f7d33a796567177aa4eb2fad64d71e6fd86ac18e1c25d30b52013a83ce5d44854f37ec893282fcc
-EBUILD xbiso-0.6.1-r3.ebuild 797 BLAKE2B 6b2344b9070ac9bea47acb3abfaca30281b4d2a43c9fc161816753ec9ab6c34995c40fd6fb12ac7f457b887aa3731be6db2ba90cf00b2bed6810ee7ad6b56921 SHA512 5acfb0e5b5410e8a4eaac97d19be607c28f2b5c3bd2138c5e30e9d6d0be33ef0f768b3d4fda094ab0f295387ddce7b413cfe9111e35300e742f55b19085e084a
-MISC metadata.xml 248 BLAKE2B 360128197e904216f7b361ff1f0438e70632a0885064032f0a6e5cdc9695b204a83675c4eb1134fa7f89117472a259d15ec59038f7cff08e7ba6c9a853c9175d SHA512 2432a6467198a44adc0b1b64e81a227abb424dbe4b653bbab1183305cf56bed336f3650289ec53eb35ed18cfe92da60be1fd744d54a767c19d72f567374c0f97
diff --git a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
deleted file mode 100644
index 0b867751c373..000000000000
--- a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -6,13 +6,13 @@
- 
- dnl Checks for libraries.
- dnl Replace `main' with a function in -lftp:
--AC_CHECK_LIB(ftp, main,[LIBS="-DUSE_FTP -lftp"],AC_MSG_WARN([Warning libftp not found ftp features disabled]))
- AC_CHECK_LIB(m, ceil,[LIBS="$LIBS -lm"],AC_MSG_ERROR([Error mlib is required]))
--AC_ARG_ENABLE(ftp,
--[
-+AC_ARG_ENABLE([ftp],
-+    AS_HELP_STRING([--disable-ftp],[Disables all ftp features and libftp dependencies]))
- 
--  --disable-ftp			Disables all ftp features and libftp dependencies
--],[LIBS=""])
-+AS_IF([test "x$enable_ftp" != "xno"], [
-+    AC_SEARCH_LIBS([FtpInit],[ftp],[CPPFLAGS+="-DUSE_FTP"],AC_MSG_ERROR([libftp not found]))
-+])
- 
- dnl Checks for header files.
- AC_CONFIG_HEADERS([config.h:config.h.in])
diff --git a/app-cdr/xbiso/metadata.xml b/app-cdr/xbiso/metadata.xml
deleted file mode 100644
index 0e21c1af0487..000000000000
--- a/app-cdr/xbiso/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">xbiso</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
deleted file mode 100644
index 6d770560ed44..000000000000
--- a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="Xbox xdvdfs ISO extraction utility"
-HOMEPAGE="https://sourceforge.net/projects/xbiso/"
-SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_prepare() {
-	eapply_user
-	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
-	eapply "${FILESDIR}/${P}-libs.patch"
-	mv configure.in configure.ac || die #426262
-	eautoreconf
-}
-
-src_configure() {
-	# for this package, interix behaves the same as BSD
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
-
-	econf --disable-ftp
-}
-
-src_install() {
-	dobin xbiso
-	dodoc CHANGELOG README
-}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 17a76a67a847..ac8a5b8cb8fa 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 8739325c31f0..907f100dd7be 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -4,6 +4,6 @@ AUX doxygen-1.9.4-link_with_pthread.patch 1116 BLAKE2B 864adde5d9c0c852dba8fdaee
 DIST doxygen-1.9.5.src.tar.gz 5251459 BLAKE2B 46ce6c767ec60ba4b4e2d4e343f78b401b142f242e7037ce8877a5316ad5685a7c080045de793aa8fc1334cd593f9ef5f55d1b6259cb8966ce0b804c8860efbc SHA512 4ad4c1ecd4a12220442f354b90aa56f80e78fcaf288d5e36da421437d59811ed3d429ee13717692886a55b9628ae565d40ce13c51792ccc8bba15b1e018cb651
 DIST doxygen-1.9.6.src.tar.gz 5293513 BLAKE2B 35d3286b47922776814bb7941c7a1cb27a5a50be35a9f231b1f072333d966630bbf0b97813f56711f71f040a0ceb87e7e1cbee04ca2aa3f035754ba844561697 SHA512 f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2
 EBUILD doxygen-1.9.5.ebuild 3275 BLAKE2B 46b212764dbf10e6e55e819c8973287228b560d0bf319ed1d5a5e9ec693342cdce497b04696e17d26db7747192335f89327f3908e8f140154257b1b5cc76164d SHA512 e14589a078926bf645f7685683e0ea1658adf89928d01768bf412ddff51725329cacae6ee92e075aa50e8253aa8f505c021e1e9b44de7cbbc420e3388ec9015a
-EBUILD doxygen-1.9.6.ebuild 3291 BLAKE2B de6cc584dbe834ae7b22bca0a99e8d7ae082c7a751de7cd90cb1181f6200d591922359b20dfe9f2aa9ec7fd578aa00c2a4c03c560298d9979cd4e53f1db58167 SHA512 09ee6456e11c6e1823988bd64f8ad55b7d29abf319cc80bc3a073d47faa304b0b5875af61693dfcaa225eccbcb3513305cbbac957e9e13f08dec0a81a6d8a752
-EBUILD doxygen-9999.ebuild 3283 BLAKE2B a88f7a5f318a3b85baaba100e52481128c4f8f2891f95c0ccc1d32116bb4a675ab3625c86eb29d46494b202f8bd6b0b71be1dd07b114db3ba91911bfa6663398 SHA512 b18393fcaf4e95cf03dc14477fbafb7041e6b0a8d5e2699dd635fef42210b384d586aa409fb24e6e1ef5ff1203830941dd535ea89ca86760b0915b405ef61a32
-MISC metadata.xml 972 BLAKE2B 21df73118710e6eb9b1b495aef2b87b5c1457d55efb50bd3051d72505a12ee9855407f9222094fae21501f51d8ca97b70a211cd0953a68d172fc030b64144def SHA512 0d4855b1b4233da690add845a04c089c8a71634b25bc1dea8f995997b8e329e0e882eaaea15cc30994f9c063df48ff49a865c372162c4eb3dbc08bd6a44a3b67
+EBUILD doxygen-1.9.6.ebuild 3291 BLAKE2B da23eaa4ef1aa27841d2dc5be4bdc3097900fc9a156ffa1cbd9c15d63e29e7b08b920bcaf41bd50761fd7f7325d8ea23cad9c3b116793c9c1830ca48a0dece8b SHA512 d5c4df940adeb0458e2fba0c91d1a6c39bb0f3688a2faaad497a768239cb4ceccb1a11dfe0c4e3d2932c6a5f554997644f391b1a74b1d1c0ca60e6d88588c8d1
+EBUILD doxygen-9999.ebuild 3283 BLAKE2B b66d71361d5b2247b1e306fe538a79fec482ebf0df7b3dd3db7e55f3fa3020ed160e7816d19dc23a770a49188d037f1f0d5d1745b514e087ec23b5479cd413fb SHA512 299aa0e2bc25ab730b24cd2ebfecb378b2b72e5654e31509d5ac78292fd5375dd8c6a43f212481b2adfa1e8803a5ddfeb228114f03d4c956131db7e01d973533
+MISC metadata.xml 1024 BLAKE2B 884363174e8a83eecb926c962185d1f1cc3263ed216b26e149035b47b424b5baf1da222805f5ed04f25b4e97f12c79cface7bd6ce59ca9d37388c696a9a13117 SHA512 12c91be3f02f1ef99db00a48f2dd252f4bab85078f308c921a1a07062d971090f8dd39480b5b72e2bb21f8e2df69bc10c7828c1c91f2f83ce64be50a233eef15
diff --git a/app-doc/doxygen/doxygen-1.9.6.ebuild b/app-doc/doxygen/doxygen-1.9.6.ebuild
index 080521403231..22767a9277e7 100644
--- a/app-doc/doxygen/doxygen-1.9.6.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit cmake flag-o-matic llvm python-any-r1
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 34ed66144605..3aac63e32e6b 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit cmake flag-o-matic llvm python-any-r1
diff --git a/app-doc/doxygen/metadata.xml b/app-doc/doxygen/metadata.xml
index bfe141647cdd..1a7e4e52585a 100644
--- a/app-doc/doxygen/metadata.xml
+++ b/app-doc/doxygen/metadata.xml
@@ -14,6 +14,7 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">doxygen/doxygen</remote-id>
+		<remote-id type="sourceforge">doxygen</remote-id>
 	</upstream>
 	<use>
 		<flag name="clang">support for <pkg>sys-devel/clang</pkg> assisted parsing</flag>
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 47dbcd51424c..2d0208828062 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 25aad8bd06cf..8ee8cd1c0193 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,9 +1,5 @@
 DIST emacs-18.59-patches-15.tar.xz 34104 BLAKE2B 9d14004d5188ec0ffe11099ae1beb431adfe159d220fc1b6f1d0be67da19b88911b66a206386beee9498bdcaa48e40a185755734cad2d60927c79bc8ddf0fa7d SHA512 c82cd8e81acf63addd137716a60191b916ee9ac9f8176661be1e8dd0f347f63f8ca8bf9d4d225141499dcbf4c20444eb6526cc3a3912a2d4136fb2bd295e2c26
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
-DIST emacs-23.4-patches-23.tar.xz 19932 BLAKE2B 941d939d1a66af162016eb7f4a34a3a6d19736ecbd06e2499ccb0bf8806b2b3583de324308698b00d0b47a3d0b8a046e5d5dcb2d681c2bba90ec40b58b4e9855 SHA512 83e2cef7ebe07fc69806d01946c6e96fa0e92b363e9c6531992593eeb29413518217fef05bba48729356af7d1326c3667748185aad971a625daccb803b2bfe58
-DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
-DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66 SHA512 fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae
-DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3-patches-4.tar.xz 5164 BLAKE2B 30ef1e7ac6ee9a702678899cb27ea9c321eb0711d55917118ec99ea9e060e79bae179172d0a2dda5821c19902f6e0813e17ac71c198cd814c265838f96883b87 SHA512 ea487de3bb792386510c23c295441438c2fc4eae085fe9d41e5e16181fd4265c1d205b360ce977070a43343feeafac5b9392ea39414f2b170d7051f89ed58502
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3-patches-3.tar.xz 4160 BLAKE2B ae6fac12a2d2d35c31c895f1be9104b54c283cf4385d21e0ccd3825a3349d60495e441a5fa9f535d4b3d4c60da530ee036a475643cb11862f2a6e1bb44dc7deb SHA512 1edfdbbe6a97ffcdb17facc90336dd6f8d3d397bc95cf06fa170a4ca68e653226de8a5c2001d8dc3d3a0144d50421f2208c6fa3a816123ef952cb25df4aace49
@@ -13,8 +9,6 @@ DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf117
 DIST emacs-28.2-patches-1.tar.xz 3404 BLAKE2B af0ea87f8406b3fe646bc32fea5866c1c7bdeeb5bb5ef733a361cf31f96b72b0dc6a7afb9a166f6182b7835cadd7b0b25f61a79abed241788f35a74d5937513f SHA512 02f9f574d2d06750ddf5218aaf3c725f954020bde94492264a9ad1d3294b24866f89d296b126ed26390f0597afb55daad944c31dde2bfedc6ea1ab769ea11c7d
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
 EBUILD emacs-18.59-r17.ebuild 4392 BLAKE2B a2d1b7dba97a50ebeb7e70f8112aa6e9b67ea0f49e2ea03351aac0d73e57d8750f40d76dccbe37c85c47911a1c0c11d7405760df26ad49113e345f838d0e4d9f SHA512 27ae9452912e9d7f5e21b9ad3fbb79d4b40d92eaad0f952ac7500423b2ebf907eb1654218ce760b93a31f18fa17d216f5fb7757a03fb2dcc65f4b8682b6300cc
-EBUILD emacs-23.4-r23.ebuild 11040 BLAKE2B b920994e70f4f62b32f0c59c048632751f65f61b983eb91a22957b24baa91daf17318d8e6fddd3aab215ea689245c699d36828f6ac4a1a8a6918d4e14e72d799 SHA512 757bbca37fcabada6f4eb01a88af217d493aa2b93b0f819075b497548e75cb25e1e3a4bbbfabf69e897595a592697d1ef70abce6c8ad5f6a8f1a442eb6e6a5f1
-EBUILD emacs-24.5-r13.ebuild 10781 BLAKE2B a40da3bd8fc97c512b5050d7bbc58fee2f7eb8d0604fb936bcff2d4a7157dbc45029fab88722976b2225ed76e249fee6b37abfee9324445a356645376944718e SHA512 f3f8ccf6e0f3158667c5518757a51581dcc7ee5d23f7630521d8e65e76485c20640f289e4cc775759820c02b4fc76924d5bdbd77732ebba94b76a474609d22e7
 EBUILD emacs-25.3-r15.ebuild 11093 BLAKE2B 4bae8f9ddf46a9300076808f8ee365da379633950cc3b159a837dfd7bbee39731d66ddae316f79c2b94a29aa53e7612fab1761f87f6c2c38fd16fe1b415d82b8 SHA512 28a0736dcb4ba69ab19a723a978f176d907d878c35899236359aa61c9305223e28315c0500b78f9cc76115f6740dd89f52022370a5bd5741bde723dbd4026104
 EBUILD emacs-26.3-r11.ebuild 11782 BLAKE2B df6298cd44cd0b542df107d1de249a1cebe25b5c4312722bc0736818cb1f345322b0c7e01de261cd5622bdd966cb8c9204e6a7976503c35cf320ce41c4737f6f SHA512 fc19f754dcb120e6a73249622358b6b02d08679132472ddb5e59ab3556293724bc4c132e88f41de4f9a6f0a00dc37c9dbb5694085c3456de71e76187f57d6308
 EBUILD emacs-27.2-r9.ebuild 14313 BLAKE2B 9e5d108ecf03da117123995e8542d92e461d845df19eb0b0276dcfe6aedac2142d07298096c2aafeaefbfd58cc8db9ed589077129dc06f80fbc14a65589f7205 SHA512 6dfe590ca8cce4f0ed03646935875eed42376870732a46ee906971383ddf7e3fd521858d1ab08b0d104da8657f0a4c9411afd16945d0f04171bb0a8fc5a3009e
diff --git a/app-editors/emacs/emacs-23.4-r23.ebuild b/app-editors/emacs/emacs-23.4-r23.ebuild
deleted file mode 100644
index 4de62f0dab7c..000000000000
--- a/app-editors/emacs/emacs-23.4-r23.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-WANT_AUTOMAKE="none"
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-23.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="23"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm"
-
-RDEPEND="acct-group/mail
-	app-emacs/emacs-common[games?,gui(-)?]
-	net-libs/liblockfile
-	sys-libs/ncurses:0=
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		xpm? ( x11-libs/libXpm )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:2 )
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXext
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXext
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXext
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	eautoreconf
-	touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -fstrict-aliasing -pie
-	append-flags $(test-flags -fno-strict-aliasing)
-	append-ldflags $(test-flags -no-pie)	#639568
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	# Don't trigger a floating point exception for NaNs on alpha
-	use alpha && append-flags -mieee
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf+=" --with-sound"
-	else
-		myconf+=" $(use_with sound)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=gtk"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	fi
-
-	# According to configure, this option is only used for GNU/Linux
-	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
-	# out the location because $(get_libdir) does not necessarily return
-	# something that matches the host OS's libdir naming (e.g. RHEL).
-	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
-	crtdir=${crtdir%/*}
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-crt-dir="${crtdir}" \
-		--with-gameuser=":gamestat" \
-		--without-hesiod \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
-		$(use_with dbus) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake CC="$(tc-getCC)" \
-		AR="$(tc-getAR) cq" \
-		RANLIB="$(tc-getRANLIB)" \
-		RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-
-	# move man pages to the correct place
-	local m
-	mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
-		|| die "moving emacs man page failed"
-	for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
-		mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
-			|| die "moving ${m} man page failed"
-	done
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-		doins -r src/{m,s}
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c || die
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README || die
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-24.5-r13.ebuild b/app-editors/emacs/emacs-24.5-r13.ebuild
deleted file mode 100644
index 66e4123f84a5..000000000000
--- a/app-editors/emacs/emacs-24.5-r13.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena dbus games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
-
-RDEPEND="acct-group/mail
-	app-emacs/emacs-common[games?,gui(-)?]
-	net-libs/liblockfile
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:3 )
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-	touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-	append-ldflags $(test-flags -no-pie)	#639570
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	# Don't trigger a floating point exception for NaNs on alpha
-	use alpha && append-flags -mieee
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--without-hesiod \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index bccecda6768d..c275b6d9f0bc 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dlx/Manifest b/app-emulation/dlx/Manifest
deleted file mode 100644
index 6ab2b4eba46c..000000000000
--- a/app-emulation/dlx/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX dlx-1.5.20-fix-implicit-function-declarations.patch 2613 BLAKE2B d019accdd4e7092c11debe4fe3ed8676f1f2f011d35920c0af774baa2513660071c1ccffca7b755f1507fcec14f92b902c24a0b12a81d9b161fe3125fe0e13bb SHA512 30525bc8543b345da7f7ad198608ce91cb5b7a27d3f61dea5f12997e110a78dfe95b25f3ba6d227ae6352ad9acabdc1553e8ce72b6916340fd1f9b4fc70bc847
-AUX dlx-1.5.20-fix-lto-type-mismatch.patch 5227 BLAKE2B bf86878db39f9c5e04a5ad402d01f3bd42c205c8248645e65df4f0243a6114ed260e4702aa6d57b8366739b43f142111b5f2c95b1a274d6181c2b91ae09265ff SHA512 2e8a74d5e4bd68149644d8f8461e343526a0a253f700862d013f20ab137bea4b1f6bee608f6a90a742447681d64c951c6b79e482060a815aa6fdcc9e837c941b
-DIST dlx-1.5.20.zip 137039 BLAKE2B 99dbb2e5bcd89b3e9f3d8edc2fe7e7cc0a59f870f597a40a61a993b95d8b27c4f95b8d0490fdbcbc15693040d6e3abdfb8b0062e109916f5299c3da3c203d755 SHA512 5c832c2a486a82574ae03ec0cb4e30bfec74ef968658a38fbd896a1383dcdc558501baef7cbbdf99df453ba2840622d16c1619f9c5fe34b6cd058a7718bd3790
-EBUILD dlx-1.5.20-r1.ebuild 711 BLAKE2B 933afe58e3368f5a00faf1323e021cf225f9bcbf13cc48bca65464c9b9cc43a24350a09f9545e14dd334558631a987e4c4b42398af3e4ade78c71eb2902dfe96 SHA512 04efc5e6201bd2cbc16f9a964d1a16934ce6ba831fec1b455edd78927d8a6d41df916aed845bd0ac08b6991cc23a3ae31e3eccb3d5d298ce1439ea424c3ebece
-EBUILD dlx-1.5.20.ebuild 587 BLAKE2B e3a64dff410f41630750b3f79103645d908c0a0de9c53bfe6670f2e0b0e14ae8766e2e46150ba43fd9b16fd68c97fb7063087deb0a49564aad93b7feadd313de SHA512 ebec3dd0d23230c101b792e0bcc2ac20fd161a5f8195acf189778692272ff32d1853cc0be415411343a47487391f365d0e8a294e58a95a70b795f10fdbea9b06
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-emulation/dlx/dlx-1.5.20-r1.ebuild b/app-emulation/dlx/dlx-1.5.20-r1.ebuild
deleted file mode 100644
index 138eb0ed9f0d..000000000000
--- a/app-emulation/dlx/dlx-1.5.20-r1.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="DLX Simulator"
-HOMEPAGE="https://www.davidviner.com/dlx"
-SRC_URI="https://www.davidviner.com/zip/dlx/dlx.zip -> ${P}.zip"
-S="${WORKDIR}"/dlx
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-implicit-function-declarations.patch"
-	"${FILESDIR}/${P}-fix-lto-type-mismatch.patch"
-)
-
-src_compile() {
-	# CXX not used
-	emake CC="$(tc-getCC)" LINK="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LFLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin masm mon dasm
-	dodoc README.txt MANUAL.TXT
-}
diff --git a/app-emulation/dlx/dlx-1.5.20.ebuild b/app-emulation/dlx/dlx-1.5.20.ebuild
deleted file mode 100644
index e8a15ee06720..000000000000
--- a/app-emulation/dlx/dlx-1.5.20.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="DLX Simulator"
-HOMEPAGE="https://www.davidviner.com/dlx"
-SRC_URI="https://www.davidviner.com/zip/dlx/dlx.zip -> ${P}.zip"
-S="${WORKDIR}"/dlx
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-
-BDEPEND="app-arch/unzip"
-
-src_compile() {
-	# CXX not used
-	emake CC="$(tc-getCC)" LINK="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LFLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin masm mon dasm
-	dodoc README.txt MANUAL.TXT
-}
diff --git a/app-emulation/dlx/files/dlx-1.5.20-fix-implicit-function-declarations.patch b/app-emulation/dlx/files/dlx-1.5.20-fix-implicit-function-declarations.patch
deleted file mode 100644
index 6bd0b4aff69a..000000000000
--- a/app-emulation/dlx/files/dlx-1.5.20-fix-implicit-function-declarations.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Date: Sat, 10 Dec 2022 13:25:28 +0100
-Subject: [PATCH] fix implicit function declarations
-
-By default clang16 will not allow implicit function declarations.
-This patch overhauls the whole source code to fix that. 
-
-Bug: https://bugs.gentoo.org/874933
-This patch has been sent upstream via mail.
-
-Pascal Jaeger <pascal.jaeger@leimstift.de> (2022-12-10)
-
---- a/cpu.h
-+++ b/cpu.h
-@@ -573,4 +573,4 @@ extern struct DecodeTables DecodeT [128];
- 
- /////////////////////////////////////////////////////////////////////////////////////////
- 
--
-+VOID DoMcLoad (STRPTR Cmd);
---- a/dsym.c
-+++ b/dsym.c
-@@ -19,6 +19,7 @@
- 
- SymTab SymBase = (SymTab) NULL;
- 
-+extern VOID Error (STRPTR Msg, BOOL PrintLine);
- BOOL    DoTitle;
- 
- /////////////////////////////////////////////////////////////////////////////////////////
---- a/dsym.h
-+++ b/dsym.h
-@@ -38,6 +38,7 @@ extern SymTab   AddSymbol (STRPTR Sym, ULONG Val, BOOL SetUp);
- extern VOID     DeleteSymbolTable ();
- extern VOID     DisplaySymbolTable (BOOL NotFound);
- extern SymTab   FindSymbol (STRPTR Sym);
-+extern VOID     CopyMacro (SymTab S);
- 
- /////////////////////////////////////////////////////////////////////////////////////////
- 
---- a/io.c
-+++ b/io.c
-@@ -14,6 +14,8 @@
- 
- #include "cpu.h"
- 
-+extern  ULONG   ExtractNo (STRPTR Str, WORD *Pos, BOOL *Blank);
-+
- /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
- /* Extract a file name from Cmd at position Pos                           */
- /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
---- a/masm.c
-+++ b/masm.c
-@@ -51,6 +51,8 @@ extern  char    LinkDate [];
- 
- /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
- 
-+VOID Error (STRPTR Msg);
-+
- FILE    *In;                    /* Input file */
- 
- BOOL    LittleEndian = FALSE, Ok = TRUE, ESym = FALSE;
---- a/masm.h
-+++ b/masm.h
-@@ -13,5 +13,3 @@
- 
- #define LINELEN     130
- 
--
--
---- a/mon.c
-+++ b/mon.c
-@@ -88,6 +88,7 @@
- #include "mon.h"
- #include "io.h"
- 
-+extern void Error (STRPTR Msg, BOOL PrintLine);
- ULONG   LastAddr = 0;
- 
- /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
---- a/mon.h
-+++ b/mon.h
-@@ -46,6 +46,7 @@ extern  UBYTE   PauseForKey (UBYTE Msg);
- 
- extern  ULONG   DebugLevel;
- extern  FILE    *Log;
-+VOID DisMicrocode ();
- 
- #define DB_DISASSEM     0x0001
- #define DB_MICROCODE    0x0002
---- a/msym.c
-+++ b/msym.c
-@@ -15,6 +15,7 @@
- 
- SymTab SymBase = (SymTab) NULL;
- 
-+extern void     Error (STRPTR Msg, BOOL PrintLine);
- BOOL    DoTitle;
- 
- /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
--- 
-2.38.1
-
diff --git a/app-emulation/dlx/files/dlx-1.5.20-fix-lto-type-mismatch.patch b/app-emulation/dlx/files/dlx-1.5.20-fix-lto-type-mismatch.patch
deleted file mode 100644
index c9fda0f9e768..000000000000
--- a/app-emulation/dlx/files/dlx-1.5.20-fix-lto-type-mismatch.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-Date: Sat, 10 Dec 2022 14:14:35 +0100
-Subject: [PATCH] fix lto-type-mismatch
-
-This gets rid of a double definition of the function Error and renames
-one of the Error functions to Error_s
-
-Bug: https://bugs.gentoo.org/854513
-This patch has been sent upstream via mail.
-
-Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
---- a/masm.c
-+++ b/masm.c
-@@ -51,7 +51,7 @@ extern  char    LinkDate [];
- 
- /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
- 
--VOID Error (STRPTR Msg);
-+VOID Error_s (STRPTR Msg);
- 
- FILE    *In;                    /* Input file */
- 
-@@ -274,7 +274,7 @@ STRPTR Decode2Table [] =
- 
- /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
- 
--VOID Error (STRPTR Msg)
-+VOID Error_s (STRPTR Msg)
- {
-     if (strlen (Line))
-     {
-@@ -381,7 +381,7 @@ BOOL HandleSymbol (BOOL Jump)
-     if (ST->SetUp && !Jump)
-     {
-         sprintf (Txt, "Multiple definition of label <%s>\n", Sym);
--        Error (Txt);
-+        Error_s (Txt);
-     }
- 
-     if (!Jump)
-@@ -414,7 +414,7 @@ VOID WriteTables (STRPTR FName)
-     if (!o)
-     {
-         sprintf (Txt, "Cannot open output microcode file '%s'", FName);
--        Error (Txt);
-+        Error_s (Txt);
-     }
- 
-     for (i = 0; i < MICROSIZE; i++)
-@@ -493,7 +493,7 @@ VOID SetJump (SymTab ST)
-     if (!ST->SetUp)
-     {
-         sprintf (Txt, "Label <%s> never defined\n", ST->Name);
--        Error (Txt);
-+        Error_s (Txt);
-     }
- 
-     if (ST->NoRefs)
-@@ -536,7 +536,7 @@ VOID DoDecode1 ()
-     if (!Found)
-     {
-         sprintf (Txt, "Unrecognised Decode1 keyword <%s>\n", Keyword);
--        Error (Txt);
-+        Error_s (Txt);
-     }
- 
-     ptr++;
-@@ -553,13 +553,13 @@ VOID DoDecode1 ()
-     if (!ST)    /* New label */
-     {
-         sprintf (Txt, "Unrecognised label <%s>\n", Sym);
--        Error (Txt);
-+        Error_s (Txt);
-     }
- 
-     if (!ST->SetUp)
-     {
-         sprintf (Txt, "Label <%s> not declared\n", ST->Name);
--        Error (Txt);
-+        Error_s (Txt);
-     }
- 
-     Decode1 [Ind] = ST->Val;
-@@ -591,7 +591,7 @@ VOID DoDecode2 ()
-     if (!Found)
-     {
-         sprintf (Txt, "Unrecognised Decode2 keyword <%s>\n", Keyword);
--        Error (Txt);
-+        Error_s (Txt);
-     }
- 
-     ptr++;
-@@ -608,13 +608,13 @@ VOID DoDecode2 ()
-     if (!ST)    /* New label */
-     {
-         sprintf (Txt, "Unrecognised label <%s>\n", Sym);
--        Error (Txt);
-+        Error_s (Txt);
-     }
- 
-     if (!ST->SetUp)
-     {
-         sprintf (Txt, "Label <%s> not declared\n", ST->Name);
--        Error (Txt);
-+        Error_s (Txt);
-     }
- 
-     Decode2 [Ind] = ST->Val;
-@@ -649,7 +649,7 @@ VOID DoMicroCode ()
-         if (Ind == INVALID)
-         {
-             sprintf (Txt, "Unrecognised Dest keyword <%s>\n", Keyword);
--            Error (Txt);
-+            Error_s (Txt);
-         }
- 
-         Microcode [Addr] |= ((Ind + 1) << 28);    /* 0 = no dest */
-@@ -671,7 +671,7 @@ VOID DoMicroCode ()
-         if (Ind == INVALID)
-         {
-             sprintf (Txt, "Unrecognised ALU keyword <%s>\n", Keyword);
--            Error (Txt);
-+            Error_s (Txt);
-         }
- 
-         Microcode [Addr] |= (Ind << 22);
-@@ -695,7 +695,7 @@ VOID DoMicroCode ()
-         if (Ind == INVALID)
-         {
-             sprintf (Txt, "Unrecognised Source 1 keyword <%s>\n", Keyword);
--            Error (Txt);
-+            Error_s (Txt);
-         }
- 
-         Microcode [Addr] |= (Ind << 18);
-@@ -719,7 +719,7 @@ VOID DoMicroCode ()
-         if (Ind == INVALID)
-         {
-             sprintf (Txt, "Unrecognised Source 2 keyword <%s>\n", Keyword);
--            Error (Txt);
-+            Error_s (Txt);
-         }
- 
-         Microcode [Addr] |= (Ind << 14);
-@@ -755,7 +755,7 @@ VOID DoMicroCode ()
-         if (Ind == INVALID)
-         {
-             sprintf (Txt, "Unrecognised Misc keyword <%s>\n", Keyword);
--            Error (Txt);
-+            Error_s (Txt);
-         }
- 
-         Microcode [Addr] |= (Ind << 5);
-@@ -779,7 +779,7 @@ VOID DoMicroCode ()
-         if (Ind == INVALID)
-         {
-             sprintf (Txt, "Unrecognised Condition keyword <%s>\n", Keyword);
--            Error (Txt);
-+            Error_s (Txt);
-         }
- 
-         Microcode [Addr] |= (Ind + 1); /* 0 = no cond */
-@@ -933,7 +933,7 @@ int main (int argc, char **argv)
-                                 if (Addr >= MICROSIZE)
-                                 {
-                                     sprintf (Txt, "Too many microcode lines - maximum %d", MICROSIZE);
--                                    Error (Txt);
-+                                    Error_s (Txt);
-                                 }
- 
-                                 break;
---- a/msym.c
-+++ b/msym.c
-@@ -15,7 +15,7 @@
- 
- SymTab SymBase = (SymTab) NULL;
- 
--extern void     Error (STRPTR Msg, BOOL PrintLine);
-+extern VOID Error_s (STRPTR Msg);
- BOOL    DoTitle;
- 
- /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-@@ -84,7 +84,7 @@ SymTab AddSymbol (STRPTR Sym, ULONG Val, BOOL SetUp)
-     S = (SymTab) calloc (1, sizeof (struct SymTabType));
- 
-     if (!S)
--        Error ("Out of memory (AddSymbol)", FALSE);
-+        Error_s ("Out of memory (AddSymbol)");
- 
-     strcpy (S->Name, Sym);
- 
--- 
-2.38.1
-
diff --git a/app-emulation/dlx/metadata.xml b/app-emulation/dlx/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/app-emulation/dlx/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 2ab0c08b4dc6..75d6591193d7 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/prometheus-bin/Manifest b/app-metrics/prometheus-bin/Manifest
deleted file mode 100644
index e37d4c3393c6..000000000000
--- a/app-metrics/prometheus-bin/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
-AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
-AUX prometheus.service 534 BLAKE2B fcae8c118b19169e6cdf7469754307ff9037ad72991cd1b6f3f816b51ac4716b75d5623ead83cf4b4d1b8a26fcd3ce54c16bff400e454b9ba00c7149e7c4120e SHA512 84eaffba13c030dc7b2b9dcdf4c96eb12ea5ca16e569ea4f9d4647b1bf912c00826f12cabf02cd97c0e2e76646ab9f179429a92bc32d49ba33c6360ec3cfce8f
-DIST prometheus-2.26.1.linux-amd64.tar.gz 65179092 BLAKE2B 631dfbaf9d8553297bd763b2a1ce7cb97d66ec90bff126466868a59b0a0fe074fc13866e2c99f085c7257c3047ab4105f16508c1397de76a1420b4df0b203455 SHA512 53cbbef86204973a01e0d20b287cdbe2c1743dc2add0449d10da55dd3fbed95eaa5beb0a2cd08b4a33fb1825440c91633ef7680616d89838868216fafcd27c55
-DIST prometheus-2.27.1.linux-amd64.tar.gz 69491886 BLAKE2B 7739bd6d84570d4d0db987a0b027ba875728245ded5fac17f89adddfd9b14543cd9594664a8d42392a7a018477ece69ac47367f03442c0f5b11a1e76140ad7c6 SHA512 df43385e178f698806181ab67db0b75600d356c7792f2dcfe6e3390a8a7b449f180ea8fccbc58c10ad0118cea1ba8d5664676de9741e5f91a1a4ec897baeb88f
-DIST prometheus-2.28.1.linux-amd64.tar.gz 71109475 BLAKE2B fe487ec0157e4c6de5319cdacaf99bba9784156b21b29245b65c1b090951bac182b6b2f5ab98615ac0424eb0984dcbea1fffaa680a9d424addbc73c2f923c483 SHA512 a58280f9013f3013a917019ad850f9150f9636e579a87a0408a7de943b3f807a65135452b5c65b75aeca7f62dccf5958a420755088cd3955cd6a556893ed68e4
-DIST prometheus-2.31.1.linux-amd64.tar.gz 73079452 BLAKE2B 8b62141d8a7a10ec488f9a2f964fc47e3aabf6d4d26683bc7fee1517c123d74b46ac73fb2ec1b85504e624ecbd372c45eeb55e08f41c1fae9cf4585693fbc6a9 SHA512 7b356111e30bd59317967f4ebb018bea53e44b3799056bd43ee0d2c557b8d43534196cede34c2977f1f885f36a5832b72ceda15eb880b3018708e1d225fc750e
-EBUILD prometheus-bin-2.26.1.ebuild 1573 BLAKE2B 408f495ccf2b27c96a1a2c89e16697b3315fb4f8070883f33a0e07b8935507890a123b02acf90bc42ce05c6d2ac3da9e6b9edd7e19dbb884d3f0cbf2c0cd7cff SHA512 344a7a6ae9724d577a4132816c6f93895b01f43ea0f0b1b588427e11bb528b7afbeee45e5f40586bdee62a3577863563a736cf3eb0a513a44d3c742686a1b810
-EBUILD prometheus-bin-2.27.1.ebuild 1573 BLAKE2B 408f495ccf2b27c96a1a2c89e16697b3315fb4f8070883f33a0e07b8935507890a123b02acf90bc42ce05c6d2ac3da9e6b9edd7e19dbb884d3f0cbf2c0cd7cff SHA512 344a7a6ae9724d577a4132816c6f93895b01f43ea0f0b1b588427e11bb528b7afbeee45e5f40586bdee62a3577863563a736cf3eb0a513a44d3c742686a1b810
-EBUILD prometheus-bin-2.28.1.ebuild 1573 BLAKE2B 408f495ccf2b27c96a1a2c89e16697b3315fb4f8070883f33a0e07b8935507890a123b02acf90bc42ce05c6d2ac3da9e6b9edd7e19dbb884d3f0cbf2c0cd7cff SHA512 344a7a6ae9724d577a4132816c6f93895b01f43ea0f0b1b588427e11bb528b7afbeee45e5f40586bdee62a3577863563a736cf3eb0a513a44d3c742686a1b810
-EBUILD prometheus-bin-2.31.1.ebuild 1573 BLAKE2B 5372fc40b501bef66e41ee98e94df61b1b8e0edd71fb804e51ea010a40e277beadec6f9d5e0bf0d54cf5eaf3d4b157fcf92741d400314c7e11594f087b7dd600 SHA512 b2ff259edcd9b465410de9edf52fc3f0e330e2e25ef9992e609e917c52368e679b3318e4bec27772057369f400f50ccb056e4f680fb1a6285be166d4755f4e2e
-MISC metadata.xml 443 BLAKE2B e6f1b0fa6c89174aebf787bdfe37000233cb29f68aecea6b2586af76216c04fa094e6dc08793092c36e51b2f34887a968174960e55c45fcd3d2c91f93f3b1ee1 SHA512 13cdf9d1e49aeb1470223c4cfa830c3063e5816141afddfffe6eb6078b9118cab262bc520b873254e65b81663042f317b5797e35b74e25df21cf28b46fe1477d
diff --git a/app-metrics/prometheus-bin/files/prometheus.confd b/app-metrics/prometheus-bin/files/prometheus.confd
deleted file mode 100644
index 93b41b31624c..000000000000
--- a/app-metrics/prometheus-bin/files/prometheus.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for Prometheus
-command_args=""
diff --git a/app-metrics/prometheus-bin/files/prometheus.initd b/app-metrics/prometheus-bin/files/prometheus.initd
deleted file mode 100644
index f7371f8ca060..000000000000
--- a/app-metrics/prometheus-bin/files/prometheus.initd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus monitoring system and time series database"
-pidfile=/var/run/${RC_SVCNAME}.pid
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-command_user=${user}:${group}
-
-command="/usr/bin/prometheus"
-command_args="${command_args:---config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data}"
-command_background="true"
-error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
-output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
-
-extra_started_commands="reload"
-
-depend() {
-	after net
-}
-
-reload() {
-	ebegin "Reloading configuration for ${RC_SVCNAME}"
-	case "$supervisor" in
-		supervise-daemon)
-		supervise-daemon ${RC_SVCNAME} --signal HUP
-		;;
-		*)
-		start-stop-daemon --signal HUP --pidfile "${pidfile}"
-		;;
-	esac
-	eend $? "Failed to reload ${RC_SVCNAME}"
-}
diff --git a/app-metrics/prometheus-bin/files/prometheus.service b/app-metrics/prometheus-bin/files/prometheus.service
deleted file mode 100644
index ebd8a901d1fd..000000000000
--- a/app-metrics/prometheus-bin/files/prometheus.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Prometheus
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-Type=simple
-User=prometheus
-Group=prometheus
-ExecStart=/usr/bin/prometheus \
-  --web.enable-lifecycle \
-  --config.file=/etc/prometheus/prometheus.yml \
-  --storage.tsdb.path="/var/lib/prometheus/data" \
-  --web.console.templates=/etc/prometheus/consoles \
-  --web.console.libraries=/etc/prometheus/console_libraries \
-  --web.listen-address=0.0.0.0:9090 \
-  --web.enable-admin-api 
-
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-metrics/prometheus-bin/metadata.xml b/app-metrics/prometheus-bin/metadata.xml
deleted file mode 100644
index c76d474d3f87..000000000000
--- a/app-metrics/prometheus-bin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">prometheus/prometheus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.26.1.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.26.1.ebuild
deleted file mode 100644
index da63a8595d37..000000000000
--- a/app-metrics/prometheus-bin/prometheus-bin-2.26.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="prometheus monitoring system and time series database"
-HOMEPAGE="https://prometheus.io"
-MY_PN=${PN%%-bin}
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT=".*"
-RESTRICT="strip"
-
-DEPEND="acct-group/prometheus
-	acct-user/prometheus
-	!app-metrics/prometheus"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}.linux-amd64"
-
-src_install() {
-	dobin prometheus promtool
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	insinto /etc/prometheus
-	doins prometheus.yml
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-
-	systemd_dounit "${FILESDIR}"/prometheus.service
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.27.1.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.27.1.ebuild
deleted file mode 100644
index da63a8595d37..000000000000
--- a/app-metrics/prometheus-bin/prometheus-bin-2.27.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="prometheus monitoring system and time series database"
-HOMEPAGE="https://prometheus.io"
-MY_PN=${PN%%-bin}
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT=".*"
-RESTRICT="strip"
-
-DEPEND="acct-group/prometheus
-	acct-user/prometheus
-	!app-metrics/prometheus"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}.linux-amd64"
-
-src_install() {
-	dobin prometheus promtool
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	insinto /etc/prometheus
-	doins prometheus.yml
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-
-	systemd_dounit "${FILESDIR}"/prometheus.service
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.28.1.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.28.1.ebuild
deleted file mode 100644
index da63a8595d37..000000000000
--- a/app-metrics/prometheus-bin/prometheus-bin-2.28.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="prometheus monitoring system and time series database"
-HOMEPAGE="https://prometheus.io"
-MY_PN=${PN%%-bin}
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT=".*"
-RESTRICT="strip"
-
-DEPEND="acct-group/prometheus
-	acct-user/prometheus
-	!app-metrics/prometheus"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}.linux-amd64"
-
-src_install() {
-	dobin prometheus promtool
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	insinto /etc/prometheus
-	doins prometheus.yml
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-
-	systemd_dounit "${FILESDIR}"/prometheus.service
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.31.1.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.31.1.ebuild
deleted file mode 100644
index 855250a0e333..000000000000
--- a/app-metrics/prometheus-bin/prometheus-bin-2.31.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="prometheus monitoring system and time series database"
-HOMEPAGE="https://prometheus.io"
-MY_PN=${PN%%-bin}
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT=".*"
-RESTRICT="strip"
-
-DEPEND="acct-group/prometheus
-	acct-user/prometheus
-	!app-metrics/prometheus"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}.linux-amd64"
-
-src_install() {
-	dobin prometheus promtool
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	insinto /etc/prometheus
-	doins prometheus.yml
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-
-	systemd_dounit "${FILESDIR}"/prometheus.service
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 0c62006c33b0..24a29b6203ab 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 8740b3bf0ada..859f81ff9c6d 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,7 +1,5 @@
 AUX pax-utils-1.3.5-man-reorder-xmlto-arguments.patch 921 BLAKE2B c97680a374985c23602c98227ad8045f2dbeedd5c5a23374b26f7ce30fe0dedc789077229c4fed4bd8cc18ecb8e9c61f9a13a768dfcb500165e120ef7a7a7d06 SHA512 74ff3095b188c4f88608952b7619297c385dec98df16b336a3ad7fcd2c2514542c4e0053664e81400a729a8183d6a84fd04202826e143c63a4e5aff133f6a071
-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
-EBUILD pax-utils-1.3.4.ebuild 1784 BLAKE2B 5ccaa1d471f9bd9560ff5940d95944226b73262ffcb856df2d07ef22aefe9ff3767a2c97651973f20aa6a31929d121a08700f696a8939897bbbe28f6b05fc50e SHA512 25bd378072743c57a23ea0c5704d25c3a88955ccc62193c7ec641200c16e11dc2f272b1e895260948573e86164c6edae28a29b9e9272aba16d2116b40d29a0ad
 EBUILD pax-utils-1.3.5.ebuild 1970 BLAKE2B e3c67c370df7ec3c695216ed3f2879b24ca78ae2d99f0caeb5f12aee45a142f584a335cd8d2c24f148280ea3c26e8fd895a6af92be52eaa59eddf50939b97a10 SHA512 1b6cf737bb31ae270547578cb5a869a5d1903dde91156c61bb992ffcc1389c662fb3152b6734c0d9d05c77eb49201f9537938073dd1f6377afa3bb34489aa70c
 EBUILD pax-utils-9999.ebuild 1912 BLAKE2B e70d992c11df700503c62b31746251d7228b6d57b41f59b1f5f667ecebc019b3e30311268a415cf9bebfda92c94e68b31f1d41e8266f572f338a2295e5832752 SHA512 c839c87166845284074d0e53084625e72da5b24e47e6f4d567d0688298d81facc731fee26c0347d54be65198a811384b582c080486cd3b2a7dd94cf14a9da800
 MISC metadata.xml 678 BLAKE2B 347b6f8175b20bfa4f592b41b15f5fa8228fb3e657ab86b4692aef468130e7625e41ec1266a89ed1fb2a81d608eecd957e773863b440afd7bf83873a357ec7ce SHA512 e6739b52ccaf7f8e4d0c3b173c85b368c974fd62b231ce83513c342b9e3148b5b29aa7f985af929d3d07e9d5808ff6aca575b88dd23f0b25bb89d952fa45dc70
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 49d80f350b51..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_{8,9,10} )
-
-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-office/Manifest.gz b/app-office/Manifest.gz
index d55315d81ece..3254801dc67e 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/sc/Manifest b/app-office/sc/Manifest
deleted file mode 100644
index f5654a150190..000000000000
--- a/app-office/sc/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX sc-7.16-amd64.patch 344 BLAKE2B f7447d384be28e7fcd19851128b565b784b2255f29f345ceb2b22350c7fec2f1843ef37a9437277e8cab6c3892afcd105f8e6f991e8fcfe676f0223b51752592 SHA512 321843f521ee5ca0adcaf90796e293e83d8edcde786b133ae1ba2e117a7b77ee5a1cfd74c89359d72bd9fab39e2eb670b775af98badeaea5c91b5bb9d2d422e3
-AUX sc-7.16-c.patch 4345 BLAKE2B 622f8200d7bce8606ae65368fee3cfbfdeabb042c814cd903130e54d7953dea3193a047b616b8cec39b58dbafed50f7c706273c2d77dfefdc142516a26b26abc SHA512 a5423dc5eada7d7d5f3e5f514479dde920b01d1e99ee9903b2e19381e4e895881df3b744d37dd5dcbc88e78decafef57e79afae017abe1e68833f8789246aa51
-AUX sc-7.16-lex-syntax.patch 207 BLAKE2B 02ef6909652247141eddd8845c83879789133e878abc05d0b4db55536b594f0ccb8453735d66e0f927498d35ee8fd5c556f43179e1dc272c4d98539e3e2cf460 SHA512 d4f6673a51f27034deb38595cd5a7ccb3a4027f14a9697b22b0d59763c6dd9df61e81d8749013f0eb9add370d9fdef4370c26e39d67d24b8573f93b600713a2a
-AUX sc-7.16-printf.patch 3242 BLAKE2B 824673b0798f0a268cfb755ddd661d9f84673a49ef456341124669d0f4119e23b21f3ba3e0786ea5cfaafd51ce0ceb32b6a4236ca01bbf58d647d9f8adc126da SHA512 2ad30d2394256ec1c740565507c5672d37d0380a3e2b619fdddff65749e03c57bb3b1a9d08b962751120aa063b39f3042b29906a6819076c1777c726d903791b
-DIST sc-7.16.tar.gz 210809 BLAKE2B d497d935342e942662f28605be60504e71afa0a3f148275afb19a317c546eb39c849b80195a1f1eeb2dc5e5250e3907673713585459ecde5e10714864860d3cf SHA512 efa495ba21d01b578a53f09101ccc28b564437317e0860904ad59136a24df9619dfc8715339296ae1567eaa8d620cdabc9bc2784962bc1c93e3bbd086856407b
-EBUILD sc-7.16-r3.ebuild 1372 BLAKE2B a2872aef27665d82e4fe05b330511bc0fbf8923b824d559491a60e8b6939e6f8490806ba10c8e3cd06d34f14cb62359ed23e72af1c8fa166e866b2ada44f4653 SHA512 8d8bbfd31d6ebdf9c0784e3b44885cd9ff36aadcb4310360a5d68b80da31a4b6395400ba39b35a5f3311f4e489ae7f5df2b44fc126d56a85b3cb3038dd33946c
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-office/sc/files/sc-7.16-amd64.patch b/app-office/sc/files/sc-7.16-amd64.patch
deleted file mode 100644
index e381609011bb..000000000000
--- a/app-office/sc/files/sc-7.16-amd64.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/xmalloc.c
-+++ b/xmalloc.c
-@@ -3,19 +3,12 @@
-  * $Revision: 7.16 $
-  */
- 
-+#include <stdlib.h>
- #include <curses.h>
- #include "sc.h"
- 
--extern char	*malloc();
--extern char	*realloc();
--extern void	free();
- void		fatal();
- 
--#ifdef SYSV3
--extern void	free();
--extern void	exit();
--#endif
--
- #define	MAGIC	(double)1234567890.12344
- 
- char *
diff --git a/app-office/sc/files/sc-7.16-c.patch b/app-office/sc/files/sc-7.16-c.patch
deleted file mode 100644
index fd4f06f9f8c8..000000000000
--- a/app-office/sc/files/sc-7.16-c.patch
+++ /dev/null
@@ -1,147 +0,0 @@
---- a/abbrev.c
-+++ b/abbrev.c
-@@ -122,7 +122,7 @@
- del_abbr(char *abbrev)
- {
-     struct abbrev *a;
--    struct abbrev **prev;
-+    struct abbrev **prev = NULL;
- 
-     if (!(a = find_abbr(abbrev, strlen(abbrev), prev))) 
-	return;
---- a/help.c
-+++ b/help.c
-@@ -14,6 +14,10 @@
- #include "sc.h"
- #endif /* QREF */
- 
-+#ifdef TROFF
-+#include <stdlib.h>
-+#endif /* TROFF */
-+
- char *intro[] = {
- " ",
- #if defined(QREF) && defined(TROFF)
---- a/lex.c
-+++ b/lex.c
-@@ -27,6 +27,8 @@
- 
- #ifdef IEEE_MATH
- #include <ieeefp.h>
-+#else
-+#include <math.h>
- #endif /* IEEE_MATH */
- 
- #include <stdlib.h>
---- a/sc.h
-+++ b/sc.h
-@@ -14,6 +14,9 @@
- #include <stdio.h>
- #endif
- 
-+#include <unistd.h>
-+#include <curses.h>
-+
- #define	ATBL(tbl, row, col)	(*(tbl + row) + (col))
- 
- #define MINROWS 100 	/* minimum size at startup */
-@@ -390,6 +393,7 @@
- extern	char *v_name(int row, int col);
- extern	double eval(register struct enode *e);
- extern	int any_locked_cells(int r1, int c1, int r2, int c2);
-+extern	int are_abbrevs();
- extern	int are_colors();
- extern	int are_frames();
- extern	int are_ranges();
-@@ -425,6 +429,7 @@
- extern	struct crange *find_crange(int row, int col);
- extern	struct frange *find_frange(int row, int col);
- extern	void EvalAll();
-+extern	void add_abbr(char *string);
- extern	void add_crange(struct ent *r_left, struct ent *r_right, int pair);
- extern	void add_frange(struct ent *or_left, struct ent *or_right,
- 	struct ent *ir_left, struct ent *ir_right, int toprows, int bottomrows,
-@@ -434,6 +439,7 @@
- extern	void addplugin(char *ext, char *plugin, char type);
- extern	void backcol(int arg);
- extern	void backrow(int arg);
-+extern	void center(int sr, int sc, int er, int ec);
- extern	void change_color(int pair, struct enode *e);
- extern	void checkbounds(int *rowp, int *colp);
- extern	void clearent(struct ent *v);
-@@ -456,9 +462,12 @@
- extern	void diesave();
- extern	void doend(int rowinc, int colinc);
- extern	void doformat(int c1, int c2, int w, int p, int r);
-+extern	void dogetkey();
- extern	void dupcol();
- extern	void duprow();
- extern	void doquery(char *s, char *data, int fd);
-+extern	void doeval(struct enode *e, char *fmt, int row, int col, int fd);
-+extern	void doseval(struct enode *e, int row, int col, int fd);
- extern	void dostat(int fd);
- extern	void dotick(int tick);
- extern	void editexp(int row, int col);
-@@ -486,11 +495,14 @@
- extern	void free_ent(register struct ent *p, int unlock);
- extern	void getexp(int r0, int c0, int rn, int cn, int fd);
- extern	void getfmt(int r0, int c0, int rn, int cn, int fd);
-+extern	void getframe(int fd);
- extern	void getformat(int col, int fd);
- extern	void getnum(int r0, int c0, int rn, int cn, int fd);
-+extern	void getrange(char *name, int fd);
- extern	void getstring(int r0, int c0, int rn, int cn, int fd);
- extern	void go_last();
- extern	void goraw();
-+extern	void gotonote();
- extern	void help();
- extern	void hide_col(int arg);
- extern	void hide_row(int arg);
-@@ -507,6 +519,8 @@
- extern	void label(register struct ent *v, register char *s, int flushdir);
- extern	void let(struct ent *v, struct enode *e);
- extern	void list_colors(FILE *f);
-+extern	void ljustify(int sr, int sc, int er, int ec);
-+extern	void list_frames(FILE *f);
- extern	void list_ranges(FILE *f);
- extern	void lock_cells(struct ent *v1, struct ent *v2);
- extern	void markcell();
-@@ -523,6 +537,7 @@
- extern	void read_hist();
- extern	void remember(int save);
- extern	void resetkbd();
-+extern	void rjustify(int sr, int sc, int er, int ec);
- extern	void rowshow_op();
- extern	void scxfree(char *p);
- extern	void setauto(int i);
-@@ -560,6 +575,9 @@
- extern	void write_line(int c);
- extern	void write_ranges(FILE *f);
- extern	void yank_area(int sr, int sc, int er, int ec);
-+extern	void yankcol(int arg);
-+extern	void yankr(struct ent *v1, struct ent *v2);
-+extern	void yankrow(int arg);
- extern	void yyerror(char *err);
- extern	int yylex();
- extern	int yyparse();
---- a/screen.c
-+++ b/screen.c
-@@ -870,7 +870,7 @@
- 		    }
- 		} /* else */
- 	    } else
--	    if (!*pp && color && has_colors && cr && cr->r_color != 1) {
-+	    if (!*pp && color && has_colors() && cr && cr->r_color != 1) {
- 		move(r, c);
- 		color_set(cr->r_color, NULL);
- 		printw("%*s", fwidth[col], " ");
---- a/vi.c
-+++ b/vi.c
-@@ -5,6 +5,7 @@
-  */
- 
- #include <sys/types.h>
-+#include <sys/wait.h>
- #ifdef BSD42
- #include <strings.h>
- #else
diff --git a/app-office/sc/files/sc-7.16-lex-syntax.patch b/app-office/sc/files/sc-7.16-lex-syntax.patch
deleted file mode 100644
index 9dcb46f25f83..000000000000
--- a/app-office/sc/files/sc-7.16-lex-syntax.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lex.c
-+++ b/lex.c
-@@ -107,7 +107,7 @@
- yylex()
- {
-     char *p = line + linelim;
--    int ret;
-+    int ret = 0;
-     static int isfunc = 0;
-     static bool isgoto = 0;
-     static bool colstate = 0;
diff --git a/app-office/sc/files/sc-7.16-printf.patch b/app-office/sc/files/sc-7.16-printf.patch
deleted file mode 100644
index 9425105262b0..000000000000
--- a/app-office/sc/files/sc-7.16-printf.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/sc.c
-+++ b/sc.c
-@@ -520,7 +520,7 @@
- 		    break;
- 	    }
- 	}
--	if (redraw) printf(redraw);
-+	if (redraw) printf("%s", redraw);
- 	exit (0);
-     }
- 
---- a/gram.y
-+++ b/gram.y
-@@ -1010,7 +1010,7 @@
- 	|	S_PLUGOUT STRING '=' STRING
- 					{ addplugin($2, $4, 'w'); } 
- 	|       PLUGIN			{ *line = '|';
--					  sprintf(line + 1, $1);
-+					  sprintf(line + 1, "%s", $1);
- 					  readfile(line, 0);
- 					  scxfree($1); }
- 	|	/* nothing */
---- a/vmtbl.c
-+++ b/vmtbl.c
-@@ -61,10 +61,10 @@
-     oldptr = newptr /* wait incase we can't alloc */
- 
- #ifndef PSC
--static char	nolonger[] = "The table can't be any longer";
-+#define NOLONGER "The table can't be any longer"
- #endif /* !PSC */
- 
--static char	nowider[] = "The table can't be any wider";
-+#define NOWIDER "The table can't be any wider"
- 
- /*
-  * grow the main && auxiliary tables (reset maxrows/maxcols as needed)
-@@ -117,7 +117,7 @@
-     if ((rowcol == GROWCOL) || (rowcol == GROWBOTH)) {
- 	if ((rowcol == GROWCOL) && ((maxcols == ABSMAXCOLS) ||
- 		(topcol >= ABSMAXCOLS))) {
--	    error(nowider);
-+	    error(NOWIDER);
- 	    return (FALSE);
- 	}
- 
-@@ -135,14 +135,14 @@
- 	struct	ent *** lnullit;
- 	int	lcnt;
- 
--	GROWALLOC(row_hidden2, row_hidden, newrows, char, nolonger);
-+	GROWALLOC(row_hidden2, row_hidden, newrows, char, NOLONGER);
- 	memset(row_hidden+maxrows, 0, (newrows-maxrows)*sizeof(char));
- 
- 	/*
- 	 * alloc tbl row pointers, per net.lang.c, calloc does not
- 	 * necessarily fill in NULL pointers
- 	 */
--	GROWALLOC(tbl2, tbl, newrows, struct ent **, nolonger);
-+	GROWALLOC(tbl2, tbl, newrows, struct ent **, NOLONGER);
- 	for (lnullit = tbl+maxrows, lcnt = 0; lcnt < newrows-maxrows;
- 		lcnt++, lnullit++)
- 	    *lnullit = (struct ent **)NULL;
-@@ -151,16 +151,16 @@
- #endif /* !PSC */
- 
-     if ((rowcol == GROWCOL) || (rowcol == GROWBOTH) || (rowcol == GROWNEW)) {
--	GROWALLOC(fwidth2, fwidth, newcols, int, nowider);
--	GROWALLOC(precision2, precision, newcols, int, nowider);
--	GROWALLOC(realfmt2, realfmt, newcols, int, nowider);
-+	GROWALLOC(fwidth2, fwidth, newcols, int, NOWIDER);
-+	GROWALLOC(precision2, precision, newcols, int, NOWIDER);
-+	GROWALLOC(realfmt2, realfmt, newcols, int, NOWIDER);
- #ifdef PSC
- 	memset(fwidth+maxcols, 0, (newcols-maxcols)*sizeof(int));
- 	memset(precision+maxcols, 0, (newcols-maxcols)*sizeof(int));
- 	memset(realfmt+maxcols, 0, (newcols-maxcols)*sizeof(int));
-     }
- #else
--	GROWALLOC(col_hidden2, col_hidden, newcols, char, nowider);
-+	GROWALLOC(col_hidden2, col_hidden, newcols, char, NOWIDER);
- 	memset(col_hidden+maxcols, 0, (newcols-maxcols)*sizeof(char));
- 	for (i = maxcols; i < newcols; i++) {
- 	    fwidth[i] = DEFWIDTH;
-@@ -172,7 +172,7 @@
- 	for (i = 0; i < maxrows; i++) {
- 	    if ((tbl[i] = (struct ent **)scxrealloc((char *)tbl[i],
- 		(unsigned)(newcols * sizeof(struct ent **)))) == (struct ent **)0) {
--	    error(nowider);
-+	    error(NOWIDER);
- 	    return(FALSE);
- 	    }
- 	for (nullit = ATBL(tbl, i, maxcols), cnt = 0;
-@@ -190,7 +190,7 @@
-     for (; i < newrows; i++) {
- 	if ((tbl[i] = (struct ent **)scxmalloc((unsigned)(newcols *
- 		sizeof(struct ent **)))) == (struct ent **)0) {
--	    error(nowider);
-+	    error(NOWIDER);
- 	    return(FALSE);
- 	}
- 	for (nullit = tbl[i], cnt = 0; cnt < newcols; cnt++, nullit++)
diff --git a/app-office/sc/metadata.xml b/app-office/sc/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/app-office/sc/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-office/sc/sc-7.16-r3.ebuild b/app-office/sc/sc-7.16-r3.ebuild
deleted file mode 100644
index ef5d9746b4a3..000000000000
--- a/app-office/sc/sc-7.16-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Spreadsheet Calculator"
-SRC_URI="ftp://ibiblio.org/pub/Linux/apps/financial/spreadsheet/${P}.tar.gz"
-HOMEPAGE="http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="amd64 ppc sparc x86"
-
-COMMON_DEPEND="
-	>=sys-libs/ncurses-5.2:=
-"
-DEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-amd64.patch
-	"${FILESDIR}"/${P}-lex-syntax.patch
-	"${FILESDIR}"/${P}-c.patch
-	"${FILESDIR}"/${P}-printf.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^prefix=/ s:/usr:${D}/usr:" \
-		-e "/^MANDIR=/ s:${prefix}/man:${prefix}/share/man:" \
-		-e "/^LIBDIR=/ s:${prefix}/lib:${prefix}/$(get_libdir):" \
-		-e '/^LIB=/s|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses)|g' \
-		-e "/^CC=/ s:gcc:$(tc-getCC):" \
-		-e "/^CFLAGS/ s:=-DSYSV3 -O2 -pipe:+=-DSYSV3:" \
-		-e "/strip/ s:^:#:g" \
-		Makefile || die
-
-	eapply_user
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-	# no autoconf
-	emake prefix="${D}"/usr
-
-	emake ${PN}.1
-	sed -i -e "s:${D}::g" sc.1 || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/$(get_libdir)/sc
-	dodir /usr/share/man/man1
-
-	emake install
-
-	doman sc.1 psc.1
-
-	dodoc CHANGES README tutorial.sc
-	dodoc VMS_NOTES ${P}.lsm TODO SC.MACROS
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index df50711077ec..bcafe0b40f57 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index ec3c86624743..94fb82d21031 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,4 +1,4 @@
 AUX crm114-20100106-fix-makefile.patch 1796 BLAKE2B 370bc77608f77960be4c4ecb88e3729eb62fb9e46e15fcca673ae8f4e4efcaf4425f30cd6beada25d8eb9fdf741dfa449c4e2a5c3ca9d06eab9ea25524e38136 SHA512 3011a85116510fce131bd3c13b5ec1e4faeefdb1eebf114782d417fb9ce8050ce15cae05f8b651728335233641be1e870fe48702fa620b542a8f1c963853b81c
 DIST crm114-20100106-BlameMichelson.src.tar.gz 724672 BLAKE2B ce5c3078030f2c4e78833edfb107d78e134a02c339d28411f2f60d4a67c333904d2ed0cf32a087997a72d961cbc5dabef46fb6c692d99fb509abd4161bd0094b SHA512 bb95fa50d6feef1a127e39e4005c4964b0096c3c7059f63bbf2293042351cf5ceeb7590fd1bedc64291ba556dfba96856dba8554f2f52a6cbaa3ad65012809c6
-EBUILD crm114-20100106-r1.ebuild 1869 BLAKE2B 77f4c7ab196fec4eb2beae1e6ab71ff66b07ffc89d2216949f6d08b5b00146005ff81d8e490338b8152b12ece2514dc7163f6487d8a83c7a0dc53515f905a442 SHA512 2ce9d4478ba6386beaee0159765bb20af4aa75430daece44dace02ab332104e801b9d5db261aa3d09214001e0255dd2b26b647abe7f6fdd7ff923153f672acfa
-MISC metadata.xml 678 BLAKE2B 622030cb3c4336ec31f8b1c6e61960a50f7897ed9a13c8594ae4f67349fc5f13baa5eefd42fd5a0a8d191f83e9ca1d88f69dda5aa588f94507ac547c01cd7992 SHA512 7062621a9ddde642afcddcaaa5b006a491e19f8dc726961acfb112828c6471e1a9eb18e23d74391dbdf28f1aa1e2bbb8f515d026ac54c9ef654553ac61660b9d
+EBUILD crm114-20100106-r1.ebuild 1622 BLAKE2B f0590ead962e413258f25ee026422bb11f38da38f125a0df6c3be6b9702260064b90ffba67145ee3558fa69f16b948d204b14e52293cca6003253da0f8b27f92 SHA512 240852e8a29705ad4057cf3ce6566ab0736bebb8f68bb3cadfbe693d6edb39b845d99b83bb7fcb85fc76ec03a5dc9fdf85d09a4deb5d03886b33cadf14c74a1a
+MISC metadata.xml 574 BLAKE2B 9ae0b84d7b91d7b8ad87452e924538b3e1a2a90ed743bb62dd5e25795bbbce36d6e1034f5f92cac4320e6a19f07d4f98936c1c98ad705215d3f2dc40555c44f5 SHA512 e83f328a8aea7edf064290209aa35f16238cccce2ce5a27710cf4cbd24509ac8b8f11e3d0cb1d7a64ff0aa2e3b124ffa6c820386c3f63823996ae70d9e633ca1
diff --git a/app-text/crm114/crm114-20100106-r1.ebuild b/app-text/crm114/crm114-20100106-r1.ebuild
index 5a800a9ab6ee..97d0d5c39cc0 100644
--- a/app-text/crm114/crm114-20100106-r1.ebuild
+++ b/app-text/crm114/crm114-20100106-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
@@ -13,13 +13,12 @@ SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples mew mimencode nls normalizemime test"
+IUSE="examples mew nls normalizemime test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/tre
 	mew? ( app-emacs/mew )
-	mimencode? ( net-mail/metamail )
 	normalizemime? ( mail-filter/normalizemime )"
 DEPEND="${RDEPEND}
 	test? ( sys-apps/miscfiles )"
@@ -31,12 +30,7 @@ PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch )
 src_prepare() {
 	default
 
-	if use mimencode; then
-		sed \
-			-e 's%#:mime_decoder: /mimencode -u/%:mime_decoder: /mimencode -u/%' \
-			-e 's%:mime_decoder: /mewdecode/%#:mime_decoder: /mewdecode/%' \
-			-i mailfilter.cf || die
-	elif use normalizemime; then
+	if use normalizemime; then
 		sed \
 			-e 's%#:mime_decoder: /normalizemime/%:mime_decoder: /normalizemime/%' \
 			-e 's%:mime_decoder: /mewdecode/%#:mime_decoder: /mewdecode/%' \
diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
index db1d29d93254..7b416c13cddd 100644
--- a/app-text/crm114/metadata.xml
+++ b/app-text/crm114/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="mew">Add support for using the mewdecode mime decoder (<pkg>app-emacs/mew</pkg>)</flag>
-		<flag name="mimencode">Add support for using the mimencode mime (<pkg>net-mail/metamail</pkg>)</flag>
 		<flag name="normalizemime">Add support for using the normalizemime (<pkg>mail-filter/normalizemime</pkg>)</flag>
 	</use>
 	<upstream>
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 9b06489f4144..ea7a81f6267c 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 385ce6860681..d4102e4b4075 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -11,6 +11,7 @@ AUX mongodb-5.0.2-glibc-2.34.patch 829 BLAKE2B c91913873bb2191d2a77fd54bc6f1f2b5
 AUX mongodb-5.0.2-no-compass.patch 307 BLAKE2B 7386de453e7349662a1a6ae3f4735ed7519e02ff84444fd38b719d5ba5396fc9000fa83f924e385522e522de8b3330d7b4d7b1c1bcdca51d4fcce0738714b86d SHA512 07fe714a4256c13449e1e764c88d5051773aa9397228085a8d581cde91477dff2c3dc70ba801eb559af76ff19abf205d32c9510606a9bb26cebb33f68822e607
 AUX mongodb-5.0.2-skip-no-exceptions.patch 552 BLAKE2B e499cc0f0885e09b2c18ddb8ac5fb85a2bfa3c9a81d1b877b20f1fc8b1908df26faf330e386d688e6ea163e81e404170454d840539146d7d313b3dc8b7753c2e SHA512 6750b5d8427616b290d285959c0c43a28409349ae7b52153d524590a8a38c26c283acc25b82410853b5c87a4c74927cf5844580778d1ef4378cd1b035844dc97
 AUX mongodb-5.0.2-skip-reqs-check.patch 766 BLAKE2B 907dbab7e19cb159d5f7df36c725415612290889192bd1118fc445ee86d0bc58a03d4ff92d71d7c2c18e6c480fb542d8880980e3ed499ebbeae113a0b4c360d3 SHA512 29d4ff6de3a89c39ed0e3c54aa1e17fc3466ceb69dfbcfc62109ea2666ca98458b7b23ac82e4b5c9be77d5d82c69d5b213670b3a3367b13c3b8cab06cfacf4c2
+AUX mongodb-5.0.5-boost-1.81-extra.patch 279 BLAKE2B e851be4110cc65533ec35bdc80fccba53cdccd1e88608f72eeb8ac00fd110d2a1e977638ff69b7bd91e4d58b559f558c25f33488b0ed9e5a2a9c7d817ed87736 SHA512 bef7b01b7a543bc938a640e4fe28d3cabe17690b1051566a42327dfbc7a56401125a677823193fe1059a74f4aadb585b5b1eb560f2c137c80c35a9fef0ced63d
 AUX mongodb-5.0.5-no-force-lld.patch 2647 BLAKE2B 7759b2a1172e93ce92f5e528236946a2da691362864053f1fe26c61e7332bbc755daebc501d51a51a679661e29c0158277a8e984ad5500aee934e070543a9ccc SHA512 76c6e9aaf86fb62f3d9b887160971390541be5e9c99172ad281d455436f17fc7b7b74120726505d5307371964930261f5348e54e5240bd8a66296b0d210db0e2
 AUX mongodb.conf-r3 722 BLAKE2B c053bf101f5e3e38cc68f2bcbe7fb66ed9e55da9382d2412a497d68b478573390eddc5f284f76d56ca4792fe6241f6d1273a6585a98f96a1cb20530499a15904 SHA512 ef193bfed673477aa0e868114bd52be6675492c164f218c71ccd02c4a620b5c4799ea1d18df0c3f2b364027b9f25e60ac4475bb216b25e1dc10bfd00a9f5d45d
 AUX mongodb.confd-r3 473 BLAKE2B b9d812cfb424309e117cf5c43ba8ee7bd4dadac78d6ebd1b0d3c2cdd04d14b334c8f2e26ee24c5ede1a8fe6500bda1b39a5422a3bc1eb8a2c4a8dde038db7997 SHA512 8a90fb39ad16837458a2add25a9b9059e2b356794cfbf3cb35c9ecd6a584ee300c67b49b5261e062eaf7aac593588e2871e5cf76ab2287e58ea342436d0afe56
@@ -27,5 +28,5 @@ DIST mongodb-src-r5.0.5.tar.gz 54862473 BLAKE2B aafa693da904177a11067603f3835e2e
 EBUILD mongodb-4.4.10-r1.ebuild 5207 BLAKE2B da5ea9d8bfc65693a41de30ef15e5d6696b14125fba39ab434844584ddc0b1f9109a3639e92960a603ff7ab731f3d7f0d44b64181bfa43d89d7859865dd8dd8d SHA512 0fc85564401be8339cdde1b80d062cf10d34bd9b1bc70089b1dafa59f095270e3d40b152af08a83346e118caa27448a6b669a56628c8b8c8615ceddec40311bb
 EBUILD mongodb-4.4.8-r1.ebuild 4903 BLAKE2B c602d42d89270459366686525694272cd54787fd754ddc6b00701c8de5ddbdf0519bef71a0c71d59e70d9b0e3b97c62c4280cb6737600f88ef8a5b94bba4f483 SHA512 ef2172a0bd7b8d8d8c9dc5ae0300dc0ac0c314f13ae21b746fd2379491b3cd24d1af5cce7e109729f32afbf9f4bc29bfff4333ace1fb0480c92b7eed3aa1b62c
 EBUILD mongodb-4.4.8-r2.ebuild 4924 BLAKE2B 5d86b73af2fdb8acda610b78d86f7c03df78cc1e5b7402b387c7b9ae949ed80acdaad7b9ba8f46009c0297bd0bde4b254c26ce8ef093bcc0d4dfe512ccc6d716 SHA512 e93418f15093950e6818dd5bad0b5f0d6ac83cd5cfc13b50068cd6ef71ef2ac2781488652f38f00adcffbdc02e09e7edc7830380c5f4e2707bf26f7ed85d3b61
-EBUILD mongodb-5.0.5-r2.ebuild 5216 BLAKE2B 0d4adaca474756a00050a3b01998d1984ff7edd1cbfdc509b04df8b6a2a5d44af6088e05273a2acbb641192bf6b8c16f042a75bcff704e1680dd2c61ed8fdc04 SHA512 446051d44c18fe1056c571184b0e7035f4fcebdb3ab5e72555785ad4fe07d941d5a68e716db12ae911e3b41cc4ea9f68f6b286b67f1be42a606dba65e48ab9da
+EBUILD mongodb-5.0.5-r2.ebuild 5266 BLAKE2B 6acd233dd21409b3b0aa3c47571dfbad0f31b11d0edcca6857f5cbfb67d452ce55673f01968edc12864baa076a2918ce428447a5cb387a928b7e5b15c5981975 SHA512 df6042cccd4e7872e8ad0c135d3bbe96d4201dcf2e4671f84fc8dd240ce4f4c03ec725021949902aba39f40b3f2e2aeef8407f84457e9c0c3f81e6372291a566
 MISC metadata.xml 919 BLAKE2B 59d8c500d1b14701caa3feef86c2377c3a2cb870bc218f8aaf993ddcf22f0b75e3b34715446900b6aaf03404387b67c5a23df3d47a64cc7b280a6bfc93f6de45 SHA512 af222eae62fc327ac2ff9f8bf2727ab8f1199a0aabb7fa9a1bd229bd817b9260fe6357ae0ca9d7184bcbc865e2a91195c84efecb430436a0bdb207910850cdda
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 d49a2e02c20b..fe18f3873d13 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-db/percona-xtrabackup-bin/Manifest b/dev-db/percona-xtrabackup-bin/Manifest
deleted file mode 100644
index a5172053ed78..000000000000
--- a/dev-db/percona-xtrabackup-bin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST percona-xtrabackup-2.4.13-Linux-i686.libgcrypt20.tar.gz 85192746 BLAKE2B 7df4fee162587830a19499cd692d5e81ba67bb445ad0bea7bb93a9857bae5e4671740d01b817b6d04043abfd436ef88e0983dc7ab80d5d20426d9c05b470c79e SHA512 c2fa43aa4654cfcf06aa47ee20ee48e9b725aa3b0514419c5af5872d7ed37a971d5afe5aa4dc9475cf4d0738354a0ec35e6dd97a24ec00b2330465e94bafb365
-DIST percona-xtrabackup-2.4.13-Linux-x86_64.libgcrypt20.tar.gz 87985226 BLAKE2B 937518b96d948098f2026397947250fbe4952752cf6f83fee5fdda4031564916bbfa07cd77a5db5db16150d446593b52fd82d6ee919ceb9fb0fb41de2f6ca631 SHA512 824ad9e94c38d51291afa1c9f1b9114c88c2b777ac9e5eb41a523463355521233b682920940084f8771820ccad6bd2a9ca280f6397eebd99ca26995712e68007
-EBUILD percona-xtrabackup-bin-2.4.13-r1.ebuild 1620 BLAKE2B 55d4de211b3f9bc4eddd1bafeab932a3c78aafc8b38750c3b4c0175fb7ac18f30af73d78f9e0a29a42cffee821a678953d905897315b6085308dc8ad961f1162 SHA512 636110d4dffab3e0d5e8b0af5b0fceb97e1325fe7b58708de2ff82748ea1b6b4eb609f8391d5f0af5c26589260ea2486fe3f241f4bbcf846637d1fe74a793045
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-db/percona-xtrabackup-bin/metadata.xml b/dev-db/percona-xtrabackup-bin/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/dev-db/percona-xtrabackup-bin/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.13-r1.ebuild b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.13-r1.ebuild
deleted file mode 100644
index b35555d20dbf..000000000000
--- a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.13-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases"
-HOMEPAGE="https://www.percona.com/software/percona-xtrabackup"
-SRC_URI="
-	amd64? (
-		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-x86_64.libgcrypt20.tar.gz
-	)
-	x86? (
-		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-i686.libgcrypt20.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# NOTE: dev-perl/DBD-mysql still necessary, now for bin/xtrabackup?
-DEPEND=""
-RDEPEND="dev-libs/libaio
-	dev-libs/libgcrypt:0/20
-	dev-libs/libgpg-error
-	dev-perl/DBD-mysql
-	sys-libs/zlib
-	sys-process/numactl
-	|| (
-		sys-libs/libxcrypt[compat]
-		sys-libs/glibc[crypt(+)]
-	)
-	!dev-db/percona-xtrabackup"
-
-QA_PREBUILT="usr/bin/*"
-
-src_unpack() {
-	default
-
-	if use amd64; then
-		S="${WORKDIR}/${MY_P}-Linux-x86_64"
-	elif use x86; then
-		S="${WORKDIR}/${MY_P}-Linux-i686"
-	fi
-}
-
-src_install() {
-	# Two new tools with an old libcurl.so.3 dep...
-	# TODO: Wait for a new release using libcurl.so.4
-	# net-misc/curl dev-libs/libev
-	# dobin bin/xbcloud{,_osenv}
-
-	for tool in xbcrypt xbstream xtrabackup; do
-		dobin bin/${tool}
-	done
-
-	for man in innobackupex xbcrypt xbstream xtrabackup; do
-		doman man/man1/${man}.1
-	done
-
-	dosym xtrabackup /usr/bin/innobackupex
-}
-
-pkg_postinst() {
-	ewarn "innobackupex got deprecated in 2.3.x series and is just a symlink to xtrabackup"
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 54c670ad782f..3c9bea66262d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost-mpl-cartesian_product/Manifest b/dev-libs/boost-mpl-cartesian_product/Manifest
deleted file mode 100644
index cd090d622fea..000000000000
--- a/dev-libs/boost-mpl-cartesian_product/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST boost-mpl-cartesian_product-20161205.tar.gz 4391 BLAKE2B 1ed647de2cf98f78aa58fcf9fa4122c3b4a8a40c00c6379d9abb8c7f36ccf1b3360ed3fc3143effc7a7e228404c496d9b93dd3c4f9ced59be15148ae122d7316 SHA512 cbe1f10b45bbb3db84bba7aa935698d7d79a59ae8b40c786df31da2936500feffe5589755ea53f31e3fc869ca4e87a880f013967d2829ce55412900b244252e7
-EBUILD boost-mpl-cartesian_product-20161205.ebuild 1008 BLAKE2B c0229b0b3a05f72cee13083cb6f93248e2bd0f869c3a882bf4aa8b984a0bf18e51e838c93de404062b29853e1eb1c0754d6b8bb9edf9fd9053e91b6e957475c9 SHA512 d12b3161db35767c538a3dd7ce37b9e66f2813510bf637eb49887549d296222a66cdc3a86e845bc656cff029b41e4876d0a904efb9f7bc4dfc398f19354a4615
-MISC metadata.xml 473 BLAKE2B 4e7c7b34ff8cc784b64386273be768f6d6c6901f9f0aa466e5ddbc9785463a31456ed4af7f0f7788c7fb193d7857a4cab4ff29c034678890480b63d48cbd2bf5 SHA512 513d810b2fd579485be744a61714e2fa29e3f27aa34a6b871ee88fe98ad02188b52fe0ca7b9ad0d42034d4843dd213870cd2c31c2fc4e90b8104560b25fa1e7b
diff --git a/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild b/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
deleted file mode 100644
index d7206af56292..000000000000
--- a/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot toolchain-funcs
-
-COMMIT="aeb0266b3a89f32c390dff51cb73a454d5d7a745"
-DESCRIPTION="an extension to the Boost.MPL library"
-HOMEPAGE="https://github.com/quinoacomputing/BoostMPLCartesianProduct"
-SRC_URI="https://github.com/quinoacomputing/BoostMPLCartesianProduct/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/boost"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	use test || return
-	local i
-	for i in $(find libs/mpl -name "*.cpp"); do
-		echo $(tc-getCXX) ${CXXFLAGS} -I. "$i" -o "${i%.cpp}"
-		$(tc-getCXX) ${CXXFLAGS} -I. "$i" -o "${i%.cpp}" || die
-	done
-}
-
-src_test() {
-	local i
-	for i in $(find libs/mpl -name "*.cpp"); do
-		echo "${i%.cpp}"
-		"${i%.cpp}" || die
-	done
-}
-
-src_install() {
-	dodoc readme.txt
-	insinto /usr/include/boost/mpl
-	doins boost/mpl/cartesian_product.hpp
-}
diff --git a/dev-libs/boost-mpl-cartesian_product/metadata.xml b/dev-libs/boost-mpl-cartesian_product/metadata.xml
deleted file mode 100644
index 3ac9541f6026..000000000000
--- a/dev-libs/boost-mpl-cartesian_product/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">quinoacomputing/BoostMPLCartesianProduct</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
deleted file mode 100644
index 3b8f5c782f7b..000000000000
--- a/dev-libs/ocl-icd/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX ocl-icd-2.3.0-new-headers.patch 4641 BLAKE2B 0013da2cfbe61cf98f98740055b54f2a3a1afacbf7d8845f0a3f53622e4a5e848d8d5d0be279e4717f29bc8e379affb3508aa2efa1c355c073ca42e883bdeead SHA512 951f1fb715031ebd6b1146b08d34fdc98154435129f8c1fb7b7b01ca33e10fdf2b8651c231fc1f47a41d3dc66c77df29786b3535099b7bbaac2e2b62fa4edc93
-DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
-DIST ocl-icd-2.3.1.tar.gz 102616 BLAKE2B f3e41d73e8cca7b42697a81f9d353341ba40ae67bb07ccbb7f6bd4fc9c8d16cbb4a9a9826ef81a381629cf1bd2c61d6ad9d7a02dcdb2871359041cfd8e9815b7 SHA512 3fa92dbcbe8ea2acf1ee967419d1b39ca7ace96e64261e3818984bd70831d62692e953c30e3e271fe74d59c634785055320f03c4d0516e2f53f7f700d3bcc76d
-EBUILD ocl-icd-2.3.0.ebuild 1593 BLAKE2B 7dfb66e1e7bf7f086fffd3287ef99cfb8f0190f3890614b59fb214d0e766c048121d178ba5750a6c0a072574dc243eb957962f2f19421150c14a20b9f9f6292e SHA512 e822ffeb32ac80fac2774f0050d055b213af4e59fd1bbe398b9ad0b99370be5e2fac0874948af96377b9a52fdf36272da341d2e53a96cc96de4e93af962e9805
-EBUILD ocl-icd-2.3.1.ebuild 1551 BLAKE2B b8e10636ff4744bfeb50e6f9eb99b9a41c846761dfe02f86ca29c2a1d94474fd4b9ae55e03a9f95818a47abfcb84fbb9f19343b3645c93e14866216453f92053 SHA512 2447ced77634f796d6fe31e0e505dba7968164eedc32e62910d412521f2d7846f50b9b6bd9ee09216de9c84226ceb5b36680906ba6bfb424aefae2fbf3f0ec79
-MISC metadata.xml 397 BLAKE2B 385d442979cec4852b3ca02d98413415ea62683c4bbdf33c5ace01879f8a4a4f7bedf9a0f7ba4f88dcea4267765a0635cacb4a619e6d9294c6d399e01220a1f7 SHA512 730e4cd26169de827576ac7d61a07caa08c6d78cc1561417c5e017eee58a7137436003aafac620223ae1513a100c7817a3e00463ea50f0d9e3690949f2c54614
diff --git a/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch b/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch
deleted file mode 100644
index aa35c96ccda6..000000000000
--- a/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From aed1832c81c0971ea001e12d41e04df834257f94 Mon Sep 17 00:00:00 2001
-From: Brice Videau <bvideau@anl.gov>
-Date: Wed, 12 May 2021 10:24:44 -0500
-Subject: [PATCH] Updated to support latest Khronos headers.
-
----
- icd_generator.rb                              |   4 +-
- khronos-headers/CL/cl.h                       |  46 +--
- khronos-headers/CL/cl_d3d10.h                 |  12 +-
- khronos-headers/CL/cl_d3d11.h                 |  12 +-
- khronos-headers/CL/cl_dx9_media_sharing.h     |  32 +-
- khronos-headers/CL/cl_egl.h                   |   8 +-
- khronos-headers/CL/cl_ext.h                   | 228 +++++++++----
- khronos-headers/CL/cl_gl.h                    |  22 +-
- khronos-headers/CL/cl_gl_ext.h                |  26 +-
- khronos-headers/CL/cl_icd.h                   | 316 +++++++++---------
- khronos-headers/CL/cl_layer.h                 |   4 +-
- khronos-headers/CL/cl_platform.h              | 125 ++++---
- .../CL/cl_va_api_media_sharing_intel.h        |  24 +-
- khronos-headers/CL/opencl.h                   |   3 +-
- ocl_interface.yaml                            |  10 +-
- run_dummy_icd.c                               |   1 -
- 16 files changed, 484 insertions(+), 389 deletions(-)
-
-diff --git a/icd_generator.rb b/icd_generator.rb
-index bb0f2e9..ed4217f 100644
---- a/icd_generator.rb
-+++ b/icd_generator.rb
-@@ -57,7 +57,7 @@ module IcdGenerator
-                          "clGetGLContextInfoKHR", "clUnloadCompiler",
-     "clCreateContext", "clCreateContextFromType", "clWaitForEvents"]
-   $header_files = ["/usr/include/CL/cl.h", "/usr/include/CL/cl_gl.h", "/usr/include/CL/cl_egl.h",
--    "/usr/include/CL/cl_ext.h", "/usr/include/CL/cl_gl_ext.h"]
-+    "/usr/include/CL/cl_ext.h"]
-   $windows_header_files = ["/usr/include/CL/cl_dx9_media_sharing.h", "/usr/include/CL/cl_d3d11.h", "/usr/include/CL/cl_d3d10.h"]
-   $cl_data_type_error = { "cl_platform_id"   => "CL_INVALID_PLATFORM",
-                           "cl_device_id"     => "CL_INVALID_DEVICE",
-@@ -246,7 +246,7 @@ def self.generate_run_dummy_icd_source
-     run_dummy_icd += "\n\n"
-     $api_entries.each_key { |func_name|
-        next if $forbidden_funcs.include?(func_name)
--       run_dummy_icd += $api_entries[func_name]+";\n"
-+       run_dummy_icd += $api_entries[func_name]+"\n"
-     }
-     run_dummy_icd += "\n\n"
-     run_dummy_icd += "void call_all_OpenCL_functions(cl_platform_id chosen_platform) {\n"
-diff --git a/ocl_interface.yaml b/ocl_interface.yaml
-index 1e80f16..43a0e59 100644
---- a/ocl_interface.yaml
-+++ b/ocl_interface.yaml
-@@ -674,18 +674,18 @@
-                         const cl_device_partition_property_ext * /* properties */,
-                         cl_uint /*num_entries*/,
-                         cl_device_id * /*out_devices*/,
--                        cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1;
-+                        cl_uint * /*num_devices*/ ) CL_API_SUFFIX__VERSION_1_1;
- 90: |-
-   CL_API_ENTRY cl_int CL_API_CALL
--  clRetainDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
-+  clRetainDeviceEXT( cl_device_id /*device*/ ) CL_API_SUFFIX__VERSION_1_1;
- 91: |-
-   CL_API_ENTRY cl_int CL_API_CALL
--  clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
-+  clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_API_SUFFIX__VERSION_1_1;
- 92: |-
-   CL_API_ENTRY cl_event CL_API_CALL
-   clCreateEventFromGLsyncKHR(cl_context           /* context */,
-                              cl_GLsync            /* cl_GLsync */,
--                             cl_int *             /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1;
-+                             cl_int *             /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;
- 93: |-
-   CL_API_ENTRY cl_int CL_API_CALL
-   clCreateSubDevices(cl_device_id                         /* in_device */,
-@@ -1016,7 +1016,7 @@
-                              const void * /*input_value*/,
-                              size_t /*param_value_size*/,
-                              void* /*param_value*/,
--                             size_t* /*param_value_size_ret*/ ) CL_EXT_SUFFIX__VERSION_2_0;
-+                             size_t* /*param_value_size_ret*/ ) CL_API_SUFFIX__VERSION_2_0;
- 137: |-
-   CL_API_ENTRY cl_kernel CL_API_CALL
-   clCloneKernel(cl_kernel     /* source_kernel */,
-diff --git a/run_dummy_icd.c b/run_dummy_icd.c
-index 400c1b0..c064b19 100644
---- a/run_dummy_icd.c
-+++ b/run_dummy_icd.c
-@@ -39,7 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #  include <CL/cl_gl.h>
- #  include <CL/cl_egl.h>
- #  include <CL/cl_ext.h>
--#  include <CL/cl_gl_ext.h>
- #pragma GCC diagnostic pop
- #include <string.h>
- #include "ocl_icd_debug.h"
diff --git a/dev-libs/ocl-icd/metadata.xml b/dev-libs/ocl-icd/metadata.xml
deleted file mode 100644
index eba2b31b82d6..000000000000
--- a/dev-libs/ocl-icd/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-  <use>
-    <flag name="khronos-headers" restrict="&gt;dev-libs/ocl-icd-2.2.11-r1">
-      Install Khronos OpenCL headers.
-    </flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
deleted file mode 100644
index e4d106dd1969..000000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-inherit autotools flag-o-matic multilib-minimal ruby-single
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
-SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-# Does nothing now but by keeping it here we avoid having to have virtual/opencl
-# handle ebuilds both with and without this flag.
-IUSE="+khronos-headers"
-
-BDEPEND="${RUBY_DEPS}"
-DEPEND=">=dev-util/opencl-headers-2021.04.29"
-RDEPEND="${DEPEND}
-	!app-eselect/eselect-opencl
-	!dev-libs/opencl-icd-loader"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-new-headers.patch
-)
-
-src_prepare() {
-	replace-flags -Os -O2 # bug 646122
-
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# dev-util/opencl-headers ARE official Khronos Group headers, what this option
-	# does is disable the use of the bundled ones
-	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers \
-		--enable-custom-vendordir="${EPREFIX}/etc/OpenCL/vendors"
-}
-
-multilib_src_compile() {
-	local candidates=(${USE_RUBY})
-	local ruby=
-	for (( idx=${#candidates[@]}-1 ; idx>=0 ; idx-- )) ; do
-		if ${candidates[idx]} --version &> /dev/null; then
-			ruby=${candidates[idx]} && break
-		fi
-	done
-	[[ -z ${ruby} ]] && die "No ruby executable found"
-
-	emake RUBY=${ruby}
-}
-
-multilib_src_install() {
-	default
-
-	# Drop .la files
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
deleted file mode 100644
index 75f550fd07a8..000000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30 ruby31"
-inherit autotools flag-o-matic multilib-minimal ruby-single
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
-SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-# Does nothing now but by keeping it here we avoid having to have virtual/opencl
-# handle ebuilds both with and without this flag.
-IUSE="+khronos-headers"
-
-BDEPEND="${RUBY_DEPS}"
-DEPEND=">=dev-util/opencl-headers-2021.04.29"
-RDEPEND="${DEPEND}
-	!app-eselect/eselect-opencl
-	!dev-libs/opencl-icd-loader"
-
-src_prepare() {
-	replace-flags -Os -O2 # bug 646122
-
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# dev-util/opencl-headers ARE official Khronos Group headers, what this option
-	# does is disable the use of the bundled ones
-	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers \
-		--enable-custom-vendordir="${EPREFIX}/etc/OpenCL/vendors"
-}
-
-multilib_src_compile() {
-	local candidates=(${USE_RUBY})
-	local ruby=
-	for (( idx=${#candidates[@]}-1 ; idx>=0 ; idx-- )) ; do
-		if ${candidates[idx]} --version &> /dev/null; then
-			ruby=${candidates[idx]} && break
-		fi
-	done
-	[[ -z ${ruby} ]] && die "No ruby executable found"
-
-	emake RUBY=${ruby}
-}
-
-multilib_src_install() {
-	default
-
-	# Drop .la files
-	find "${ED}" -name '*.la' -delete || die
-}
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/B-Hooks-OP-Check/Manifest b/dev-perl/B-Hooks-OP-Check/Manifest
index f0973f6a2472..6c77dbc065d3 100644
--- a/dev-perl/B-Hooks-OP-Check/Manifest
+++ b/dev-perl/B-Hooks-OP-Check/Manifest
@@ -1,3 +1,3 @@
 DIST B-Hooks-OP-Check-0.22.tar.gz 76535 BLAKE2B bc0c6b7b057fab226ebc44376eecc26efd58b699ca87588dfc25d2f539f955f6e657a4e206430b80fceb5039d3203af75ace76d0e86b85bc734b8befaf0bd9aa SHA512 e68b08a34244afc73d7d3b2b0acdf8fe791b0b1f087b6b0496da0a1e655a9e51552ec8fb0f743c8626a0414fb469a2133d113ff5b4ba9f96217cc87bef877542
-EBUILD B-Hooks-OP-Check-0.220.0-r1.ebuild 743 BLAKE2B 1ee11886bc16d06e750e541d40102204fdc2f97e8d3f4e345c973b4233f6116139c01e58e880bbe1e4938385108d744088f3c5736a69d0268a15777daccf0805 SHA512 9f0b68f10db013b88d425316ece0e41f7c80fa0bee426ccf14ffb5a1bea94878b25bfb0f583096d232a4f475928b6c16811d53c1dca4d2305c6f245ad22d45e9
+EBUILD B-Hooks-OP-Check-0.220.0-r1.ebuild 749 BLAKE2B e564d60030a15f0eb4b410b1da7c37a2d6ddb8b18587ba48d3205c17a776d0c853bacffd6e8c2e15400b199661fd5267e58af33616d2382053793381e393f9b9 SHA512 c204e4438a53fe3c9ec9522e4329458dd702a56bab2cd192afaa593864fbd84f2cd28bb760aba258dd495cdc55b7533495e0fe0d921b182007ada0353b2314fe
 MISC metadata.xml 407 BLAKE2B 3f051810a12f29a1af9e5e59652d0dfa6cb52f1187b871c222cf8863be3ae5f381a8e9566f2a7695c2c7042ca57d8679504e375043de6de5304a6dc952de6cf1 SHA512 9762b6e81cc114559dfbf437b38a7ac46ce35c984005a5b0343a7af6f7f5b40ecb7530372b60365a0a0cb795e308cbe2415991072e4538fec76ba04e834fe4c1
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/DBIx-Simple/Manifest b/dev-perl/DBIx-Simple/Manifest
index 79258cd11c1a..3c1b24553226 100644
--- a/dev-perl/DBIx-Simple/Manifest
+++ b/dev-perl/DBIx-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST DBIx-Simple-1.37.tar.gz 20397 BLAKE2B 54868347dcaa13df92028b848f56ffc9ca85c49f836f78c55de3a4eeef71b825bd7089fec6b1c7df9f9ac52b1752bedca0daa35f29e09c01d22d5518e3d95fcc SHA512 f79b26bf52db33629950bc95f6c17dd13a2af135deeaf6ff5b0570ad852911fd0d27196636e605a93e9b3d740699110f2ece7abc24fcbbfd08a2f3ddce5d65b0
-EBUILD DBIx-Simple-1.370.0.ebuild 885 BLAKE2B 058445450f22c07b91e29ab5a34073b09c20dfaa9623343987ab87bd6fab695699aaa202ac708e6714850854ad16b350c9329101b0ce7c15b85d73a4b31f8fe1 SHA512 b293f3be93ee545c8410e2ab5f13e532902642ffbb90f2601db99bb160897b3299a5b5f1936e459623603b2c978b83a1d1d6a992058b3a63114916079362b7e0
+EBUILD DBIx-Simple-1.370.0.ebuild 911 BLAKE2B b40cfa9447f3c3db756ccff4ddc5503f2af752266add583b2b8c094fa2b1acb820be633a1d46108b882baa9a3bda4a88e339048afc0a4eef251437f473efecc1 SHA512 85ba1c7f11feda5faf6be585251689cda274df4ad3c510aacec706754c01b1a478c074f074011a748c9496d86bd1ab616b48f0dba97f442a782dcce00f7dbc65
 MISC metadata.xml 473 BLAKE2B 7ed35d4a2182a54050d0a91c6e23dc1b0dae14cf27bfca5c009a209c98229ae4d02dffbe3606e8a113bfb600978bf387531db7ae2da3f5e082f06052eb6d7bd5 SHA512 c67426372abc4c367016d9b7e2b8071485ad39eb104e321b8887b23d6edaa9344d52ecc7f0f5f0e361668549578e10ac3f39c63ddbf5cec98deca712df4029b9
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-Abstract/Manifest b/dev-perl/Email-Abstract/Manifest
index 6f3c00e9e379..60c6bbe78654 100644
--- a/dev-perl/Email-Abstract/Manifest
+++ b/dev-perl/Email-Abstract/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Abstract-3.009.tar.gz 27897 BLAKE2B 5c5ee204bb83368e84c89a3754552a9d299caccbe7e43681a6dabdb0613a36d687efe370d091397d067807126aad0d37051d682e7d5d9f8f995afdcc06e392c2 SHA512 e2c2a497d942ef56d723ab109f8844f840bc14a4a23ae0febea32f6ce814b943ac0599dfce0a17c24d6631826240d8692592292a1c4f1fcc599c1983b37e0705
-EBUILD Email-Abstract-3.9.0.ebuild 616 BLAKE2B 0d22ef69b40f7306b9f05cba7ccee5a758d38fad300fd2c50f947823e462f21489cb34599ff24ccab4174a6774eacd5b0b8602a31f080f53137759a58017c63f SHA512 c346263784a15d9e47b5dfe9e7d49c82c48a7227992c0e0a23ce470d2ae2e47650712c8fdec1eb71410db8174bf5dc57530753dfd1f8bf53a491763775c2f31c
+EBUILD Email-Abstract-3.9.0.ebuild 635 BLAKE2B c1ae838f52264568fb7bbd600a63e9534a5e282b236423272e847a6ea08905907a7110e75cf96f3256c302f71ae7ee7171f826827e6dbd521e6495576abd0f1e SHA512 a7dcba696945d605b91a113b43ca9c509421a94c275d04d73a3f578749200851a3372a42791cc45c8a311f16a0a10252ef52300fc64b237052db9596b14bd889
 MISC metadata.xml 905 BLAKE2B ffda450ce63d657f5ff93057018285bb388acb9bff9d72eef3348b6d059295b9cc17e631c88de9a9face39ed3879f2f7cee09ee76f07b5688dfe949b168e6c4f SHA512 a350cbdcf94c32d562717431657b53d0e3572f60d03402b0dec1178d679073af99f915a5c6416949cb86aa3db9be9eb26362a7ce942616a8bd11c256ecd8abe0
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-XS/Manifest b/dev-perl/Email-Address-XS/Manifest
index b0068c81c2b5..25647084f289 100644
--- a/dev-perl/Email-Address-XS/Manifest
+++ b/dev-perl/Email-Address-XS/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Address-XS-1.05.tar.gz 30413 BLAKE2B bd27d8af150e1f7cb2f2e836aa54b8615a12cd7988f4ae647bda529e22a0f4f4384f74cc3d936aabb0c9f4e550c4f9fa55f0df92ec8faa9455588a8ba001b175 SHA512 129841de4e945f935529e4b67a325b78c1aa9ca2f7623078450ed4d3516dffa4791a1f5ea37c8647ee15677414761475593d17073171623ea322023c9cef44eb
-EBUILD Email-Address-XS-1.50.0.ebuild 609 BLAKE2B a2e168ee3aa2bf98a61b1ccaf9d1f55b9dfce38601ae4c6d41e7c97018691a47f1b988d83489acceb31439890a0afdb8c03b3e46d7c68818c3e81ef287374ecb SHA512 b41466d564aefd8a021d0599d63755a35b0833acd0b544c9cb83bbaef5c12b5c8d72b682578a383297738783b0103fe7994639700a5e10721c57ca8290e539de
+EBUILD Email-Address-XS-1.50.0.ebuild 628 BLAKE2B ce53f1eff40805525ab5acbfee80a9330783e3dffc75e216571e25029b6521cbe5d222890beae27b345775fabb9f6a91d8f845a482023a539385743fe44cb293 SHA512 28d31f74c350db5347c6b304d70a4f3e87002534db6f2f0dbaf3653d1a7e19c3a2dc1433f1cba89c439f20016d8761248ca8333fb8a78fe8b67a2a18b19f596c
 MISC metadata.xml 469 BLAKE2B fc8833a5bf62af8e1e9166fba2810cf2b3d4213e4758ebf8d7d71d57453dc0869eb62346fadf4e20dce5d7e17b95a53b4f7107a3ebd4a671e11999132746488e SHA512 a91b20a6836940629a9e527ccc6304b510dc299d6c1d5cada671167f2ea9563ef92825b8cd0d3cdbc9852561d2082e97e12bfb5ffdc4a966f4c3789f90c4efdb
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-Address/Manifest b/dev-perl/Email-Address/Manifest
index 5016b761cb6b..b24448276520 100644
--- a/dev-perl/Email-Address/Manifest
+++ b/dev-perl/Email-Address/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Address-1.912.tar.gz 42390 BLAKE2B f6a05f967a2c98f785e1c615a83e3cca68a800eb49659b6ee6586d46e5693c71f5cb5a4824d9370085460d78774cdd0167e64a1e748169f9fc22a4869e3f110f SHA512 fd8a8c09829f725609aa84c79ad89d1e44cbfb70cc44cae6a9f31174589404f56cf60ab3a4186137f7ff9838a3fe34a95a7c584e0eec2e5d1d79c919610f6e1a
-EBUILD Email-Address-1.912.0-r1.ebuild 595 BLAKE2B a4bf0d5639ba4c8a7372834bc1fa5fde61c51fceaaf540b3a3a8bbd45ab7314432d385c48c099305765d1130bd64b8a096a82d88ebefe7420b64fc4e58f55577 SHA512 4d86118b06ba1e9b7c9066c975c7b03b7a8dca0cf3066f9f5dbf3a5b97d10f62c2cacc1452d393e9533230aa5b06da977079c46efe018fbcf5bb1817e8dc6abb
+EBUILD Email-Address-1.912.0-r1.ebuild 601 BLAKE2B 3e2ab1304217b13636c1d00bab75c79fb0c404cf8d800e1cca3bac058cdd899d79b959b5ff108ab956c97ea46ed417bfe9aeeb552054908d6a452045eda2cbc3 SHA512 76225693459d2a5aa1cdb4fd0bfc4c16c662a0a15d51254493db1af1b6a7ab307415159c75a19e734cdf55be423596af929f388af3463fb590639ade7b37243f
 MISC metadata.xml 473 BLAKE2B 133ab6451fd543d3d747542a2549f5ba61ca15ac8f83dc0eb6fdd48e8a5d2d934dbb2096e738877be0d2685bd6614010cf07603641c9a36bd13d371bd18fdd62 SHA512 6dc33e2b97cd6920c4e297def1ecf56295c037d779143eaaec600ef05440ccefb33b64b7c650e269d3aa06e1ebe0489d8435f1b5172e47ec61d8dcb8a7f1ee9e
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-Date-Format/Manifest b/dev-perl/Email-Date-Format/Manifest
index f76ccc477534..5260d863ca72 100644
--- a/dev-perl/Email-Date-Format/Manifest
+++ b/dev-perl/Email-Date-Format/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Date-Format-1.005.tar.gz 14324 BLAKE2B 92a9e2d4453f05c98715b9bca353f3789a667047a34013fcf03120345342c9579a1dab1b3493db7baeb0223e57e59fa0989ca360c8bbdeb26d4d0d55550c58e2 SHA512 23daefa45874211f053d05ac3c3f3c7c3a86d9b623fdcec3bd9f6f7b4c8e5ad1ac8038146bdc85cc950b21b43b0ad843f8a52ad2183d868d3a62ea96292e34ca
-EBUILD Email-Date-Format-1.5.0-r1.ebuild 525 BLAKE2B 9a2e72294149cfafa70574284d074eb27b2f3f2edb459dcf57109ce987634ee38caa896163260c13cc046af2562125405eba0f3727188f0d744c9f8377cbd7ab SHA512 f2e7bb7e015b4e85b1f19f4b3f2aa8212a6f18337984c0848bdbe0def4df0b40ca40204f459eb22307598db103b12de14313b276d3553c4bb1ec3d3ac3d51225
+EBUILD Email-Date-Format-1.5.0-r1.ebuild 531 BLAKE2B 61a126ba288531e82dc88581c68b49bab28b82bf560e7d47459ec80f56d84dc007e50ea67cd44a8e7a61204f55672e980c00eb92272d4fbb2cd1bb138f41deb5 SHA512 269432f353e997bb0ff4803973dd86ca015e6a264958666b00fd76fbe3e4b70a95950a1320e5c69cb7b29e5a3074ed083ae8eb4d0687156d0ed167abcdb9a54b
 MISC metadata.xml 458 BLAKE2B 11b15c5e1cb5ca5814f96bdd7d80a272334e29d114ae5da84869bf3eb0657442c1d6062bd4d1d3c51fd7fdb97abc767901eeefc601716c8a51a4348af02ce267 SHA512 8d1c9d487fada7ca134a8f804ff44dcfb97c6269dd85072b31ca52b68cb82616f03fab30cda8a6660a06fb5c67a183322552eebd38b497f3dc753c903cbf3377
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-ContentType/Manifest b/dev-perl/Email-MIME-ContentType/Manifest
index 14061348d81c..7b45d29c9b58 100644
--- a/dev-perl/Email-MIME-ContentType/Manifest
+++ b/dev-perl/Email-MIME-ContentType/Manifest
@@ -1,3 +1,3 @@
 DIST Email-MIME-ContentType-1.026.tar.gz 23063 BLAKE2B 3a07522f5dee0f4cca5f817a06c51078cd71a9ec58794d1ea9e9d939b2fe1b525fcd5fe8a01bf52f42ea514d27b3245199c4e5f14fe02ced05737ca249a3b422 SHA512 8ede8df5baba4f5e89ab3418580e0e6dbbabffbdbf25e1f5f738fceee929ba4b495cd7e6793cba030412bf7bbe2a524136afda962f6410d6ca169b68b1eeb065
-EBUILD Email-MIME-ContentType-1.26.0.ebuild 663 BLAKE2B ca3f5714572f72bfc3c0b7c827fe6064940bc7730e8e2537364df16950ec0b1d8d3a77dae3356a0ab0265e39934f56519cd8207f5c415f253db1f550e8987cb9 SHA512 fc86fd47087218a413b509eb7138f412a35d738ccbc6b3a88298c2040af385f968451aaa0c82389ab61d2072d4b8abca3de96c7300019c022f04e2d33b83520b
+EBUILD Email-MIME-ContentType-1.26.0.ebuild 682 BLAKE2B 27eccf495ea34c0b99ceb36ee9864b0217fec473375674a53b8a36eb069ba17990d5360cd6f24011b17666ef790e77c5180e0b52d5dde363c01f270107d6b02b SHA512 70cd50c512337ba1ea2468dfe04696e30a93d62405ed8aa946502f91c54cad6849ada9ac5845a31b9f4f4f343dbf7e7fc597a3d3b099d5a80bd2337fc177806e
 MISC metadata.xml 487 BLAKE2B eee2291224a7a205e2efcf25d646834cdf5b3b4141964e2f706b6d3ac260902b2ad76ea51930ab5ae243b3dbe16240b2f7b3f6a8308d7c6a0571ae4ebcb061f6 SHA512 80deffadaa32036ab562347956c25a516bc4338155b8cdd1aa817b5e850e26bedfcc949fe34ff4955a306aa6d425a5efa1150ec51fb28660c6093a11450e8db8
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-Encodings/Manifest b/dev-perl/Email-MIME-Encodings/Manifest
index ec2abb8eeebd..d100fcf0ebcc 100644
--- a/dev-perl/Email-MIME-Encodings/Manifest
+++ b/dev-perl/Email-MIME-Encodings/Manifest
@@ -1,3 +1,3 @@
 DIST Email-MIME-Encodings-1.315.tar.gz 13564 BLAKE2B 4d86350a510662e657b86527baf794bf8f701ba5b0697924cd8c8a9f7f8f4a62116215ef45d151958b87644b2a1be8f72f124250df44b6189182269003d78e9b SHA512 4cd787e099617b70963c8ef6372e2a16038c61170fdd343aad88a024ecd15c789fd2c8cc19830c3518b6648e428301eed1ae20f496fa97afbdd8bb7f3ae432aa
-EBUILD Email-MIME-Encodings-1.315.0-r2.ebuild 580 BLAKE2B b9d2e058b284eb83018e77f13618deec1ce4da9c3ac69f61ffe40c63bb5639de8cc158494d7b125f40347f933416042e0a0bbaa76ac07f3074efac6ea4ae7fe9 SHA512 3316ff8894a1e438c1f802ace756a238fa7e3d4b857926e5d05bc8d9ddbb5bded4809f03c8db6a33b8569d8caf26887fe5de5d8a3275922f18c34cf443d7a461
+EBUILD Email-MIME-Encodings-1.315.0-r2.ebuild 586 BLAKE2B 532d3de37d796e8af4b1a3bcf33783c8e2bf12c17469155d64eae36cbc231f40e8aebbc0335b9cdd166cb63d04d92f4c0b3b8d209b1ad4c1aa0ff216ecf32748 SHA512 7b5743dbeb1eacd7034b601c97ead8d4131bc8b9799ba4b53a35175def4b372205557d3f00bb3eeffb367854ae35bb7e6f8c348130b333952324e4078cfca88e
 MISC metadata.xml 481 BLAKE2B 7a2bba5705a82d4b7a7c8d882a6a3ec3659a8b6d4ce4a83c3e7c7733a1f9a4f2ee91f93e2cbe2c0208a6125d094b4adbd63afdcb080fcaa173535648061e6464 SHA512 b812d3b2c5ea5ae5e1a11677474fb4a10eb6dee4b7f8d797e4f95a86e7762951d73cf2c579d891f956529acbca7621981e8f1d2a3e3406bacf8c61337b079565
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-MIME/Manifest b/dev-perl/Email-MIME/Manifest
index 2c667deab8e6..5ada9fa9d6ed 100644
--- a/dev-perl/Email-MIME/Manifest
+++ b/dev-perl/Email-MIME/Manifest
@@ -1,3 +1,3 @@
 DIST Email-MIME-1.952.tar.gz 124514 BLAKE2B 89f294a6b8bb648b4b745fafb6c7009ba4943b070300544a535a5aa98d38275b1d1927e9bd41a7574aae73bec55191dbcb7190cc026b74cd0b189adc5c6c096d SHA512 bae81cf6e4db11848951c8a900e58de7077b30e8f16cd28fd5a7bbe44668b09419f51acb70b393d292b83c32b61f9c91af1abdc258453cb3b1590146f4bc6d70
-EBUILD Email-MIME-1.952.0.ebuild 801 BLAKE2B a62f8becd98aff5b05fce5ac0cff1bd6c4d9053b1abe13f6438c506a1e6ed5fafb1abcf967028c17ab25a49e3fa3ae7e5c771b0f347c7116b806fbd4f08a8e64 SHA512 5339d009ceb5d0c08cc815110fb248b8534afb8a5039b84a92fb82dde03e885dea17d7a70d487749414669d890e35df6de27925b651578ae04896fb40d557357
+EBUILD Email-MIME-1.952.0.ebuild 820 BLAKE2B 73d769f4e006452096f9c90b86f72b59f18835b012a4ab6de23b80f0f81e7a51e24459a17089a3054e26319a343a1a8b11fd24acac377221db8918b856ab117e SHA512 ac30ff1f29fc23f8b83556ff9eb5862346a10323b7e49c869baecd0064f5ae8d92aeca6fbd929085bdf0d68d4712006a0188e6122dca2bcd2862bd82de90f58f
 MISC metadata.xml 796 BLAKE2B eb3e31cb122eed0cc89f482f366695e00cd45e8327644adca8feacc358250fa4e4de35725e09436b4c85ae7ae956d53a3a32c9e3d16384a5cda444109727f2b4 SHA512 161826ba0ed3ec2a5e0f409323c5eeb9ca47fef4af9efba87cd00de2d77d38ed83d583a159f0e4d41a14ae03827070974e7e770bbb6238e55a14666f2ce964f4
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-MessageID/Manifest b/dev-perl/Email-MessageID/Manifest
index 293b49cdec51..633095db526e 100644
--- a/dev-perl/Email-MessageID/Manifest
+++ b/dev-perl/Email-MessageID/Manifest
@@ -1,3 +1,3 @@
 DIST Email-MessageID-1.406.tar.gz 16247 BLAKE2B a32e932629513a5a18bb3042a79ca5f9a61e84c37c769248b244fe3c96aa9bee6b05422237f8a79d7f50c1449d753ea8b51fa712de23469e99cfb166c42caf83 SHA512 c36861267a127372076391e5e6458ee19bbdc8d09c3b1ce3131d0cad1a82a6f9b2bc5a29df8bafa2450ea0e5c06993abf98928f2246e694d05875e40b7e36109
-EBUILD Email-MessageID-1.406.0-r1.ebuild 442 BLAKE2B 730f2ba00ff29324725c90dfb1e5b0511cd96081d4cf657cda44a71feb3e5c91258700ac3e8673b13bb068328ef46354b08cba9d432b490faf138e2221b7fffd SHA512 8676fbd1548ed7ea9dc53663f6680fd56ba2ea7f69829108402b835519f8c8b15c3eb45d657226954704e1e19960dd66302c76b33ffa1580e54010fb87ab30a5
+EBUILD Email-MessageID-1.406.0-r1.ebuild 461 BLAKE2B cfe8e9ef991ab5ddc722576961708f85b933112a6b590d0dabaa0be3f5172c45bdbbdcbd0a51e74c769201f841a97c55ed09fadc05c45c62756ed788948d98ba SHA512 6025eb84e1a97b343674a0714bf9a9853a1831ea10d5b005aa9151708337874bfa5db6a2177614d5a9de2e356358308c34cc0d0a1597323479a45cdfbacfb40f
 MISC metadata.xml 465 BLAKE2B 0603ac7af88cf3e962469972f0db0a7fd395d1fc6975efbdaf11e6e96cb9ea0b31cc839d3cfaa9fbb3bf55ef5154a236822f8cca8795777304ec7796691db49f SHA512 912ae1c089167c6466bc505b5f051eedc78b665a4614eb5d9ea13dab27cb7b4623adb51be45bae66d47752c9a88933591f1e6bd0ed14ac34fccd8047dc06375a
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-Sender/Manifest b/dev-perl/Email-Sender/Manifest
index 1023db1b9759..9316567d6d50 100644
--- a/dev-perl/Email-Sender/Manifest
+++ b/dev-perl/Email-Sender/Manifest
@@ -1,5 +1,5 @@
 DIST Email-Sender-1.300035.tar.gz 52327 BLAKE2B 236e0ba6f0b1429f26b72d0e9a9b3d97c3c79330c95f2160b17eb83669338cafa5c756a8587d746e9db478a51404bf86c154db372a3078e5d0420490a1b942ca SHA512 1592af000d9abd4ecb410b3cb317d5b2b0e6dd938e1b3f3d8a561527845fe27ff53837761fcc47e10246a19e1dba2521422c96831970354ec20bbbe160d35afe
 DIST Email-Sender-2.500.tar.gz 52593 BLAKE2B 16a633f064ed3d1f34dcc8fbbecc9a7be5e1bcc775458f87b0043be36c00d2ff34f9640d8abb2a24f530cee901edefb0c4f4ccee26331e9e7f0bd949f62fcb12 SHA512 d7b9848ed7e218abaa9a47ef3c3f79f5fdd728a67795904655ad4df4b536f1df40bf80e0b6838112e26e71d56341e88b6044e6867fc351d41918b117a52ebbf3
 EBUILD Email-Sender-1.300.35.ebuild 1003 BLAKE2B f6dcd9383bad700d69041068b7ce52a38ad5cdebe3ed42e911bd808eeacbb44578840f409d63106a414ff8e248547d71e6f3e1a137546323951e8a4053fd3613 SHA512 33ed116604c30f582164819b1e3c7f304682d6416924824d455fc4f63ac432173d2f0333eb9e9542c524d425e5d3f47b7a18a8bc12fed9d74b555c6b9dd38b2a
-EBUILD Email-Sender-2.500.0.ebuild 974 BLAKE2B 091b2269eb49da71d31a20303a0e0205b23d8cfb24c7897afca7bd0006cd28acd071dfdcf4257c35888364e2d676b3ec1cd9534aecfae8b6cf4e1de5efcfd619 SHA512 1cf2b238f46950f6890edef35219f773cbdd15d7ff7d3b90afd50b4e512b874b9b1e6b64d8ef84c6e371d598c48c5662a58e5364fddd3577128000fbc750fb27
+EBUILD Email-Sender-2.500.0.ebuild 1000 BLAKE2B 754f039b4df1589619a99f84ec9317797e143f9c835e46ea41b7622f226e12c8e84bf67207c8cf220099d20d4f468f34c2046aa8b76961b0f0bda0319bf572ce SHA512 936b305cd1b0048fa09a9ac9b37cd2fee51e5bb4b7fd4ebbfe0cc5d098fc1323b50741506ba0d09ca39d2bebd86ef8aa7d4f3e2d4985a9e6f749b3664149bcaa
 MISC metadata.xml 2220 BLAKE2B 2910bcc8319062aa08b3621d8dc139774bf02fd5ece1b5f8251d79be459443c32f5edf8a6e692fcc81a81ad8c6b9b2beb8e90d101156827858ce10d94dc116d3 SHA512 2ad3d62fdb7a79b1cb582cdaa036c02f316f6210c8e6c98bef483c0347a94e41b2f91a01eccd0a76cb0a42eace09eeec49465241c132e35a74b17e8dc517b7b1
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/Email-Simple/Manifest b/dev-perl/Email-Simple/Manifest
index 269fe5942333..bb107a1ea54f 100644
--- a/dev-perl/Email-Simple/Manifest
+++ b/dev-perl/Email-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Simple-2.216.tar.gz 39695 BLAKE2B 2cb0f727a7799ccf29b8b23662a02bdf264880d33ee5a7d487c696bd8cc19f68257f2d154df37ff6a58b428b9784e0e80d587d28b1e6dbbfb99a5f3946b45bb5 SHA512 2d729b6ad3cc493d27a8b3f775c046ca16dc53e7fe701fa78c87fbdeb350d3c9fe546ab0721504747f443f0f4e33d395b08b53374b32f89a842ef09a5b1dde70
-EBUILD Email-Simple-2.216.0.ebuild 591 BLAKE2B 27950cd2b1ed0bd3e24caf6f67d9339074b422e54a3fcff6074f071ef6c9d0d33285e29f164da5ed212844496724ec423401b3374d686524c53030e5be14a28e SHA512 86a3fe66ae8aa5c781f8c3720f2487073a1c4e3f96d29dd6eb48bd1ea0389697ca45fe8a281bd86a33076a4875aaa205db21c5df1e70aedfb520ce5d0a9b26bd
+EBUILD Email-Simple-2.216.0.ebuild 610 BLAKE2B 9c7a26b14f2996bd1c02b699a0d53251e0e178195fb0dfd57e7be35bb114a42f47d3947b064f1d25c0e5a49b6da3f7466630eedbe40f433397a56b90573bad6a SHA512 b7b6ed2dca2a77732037c2d27f594ec8defab9a34899918b81d86fcedaa2d87f0c3d56b7ab1d726afd52e84b091a8fae656033f07f4ed8f4b6e6b03670b0e61c
 MISC metadata.xml 593 BLAKE2B e01a0f1939e01fc3879fec85862d2bf684054e9e6c79f15ccfc22cc6f74c540b6d5480ee2024bb460ff9558247ff71c95ee13870c321b50de7223b01deefdfde SHA512 14c3b41d49045be1c97dd164436477eb36c5d99fe2fcacff5033406cee3496d0f9dad2aef2b06d412791be355b61ee5bf508c099cd2a2a49e57c16a576843c09
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/IO-Multiplex/Manifest b/dev-perl/IO-Multiplex/Manifest
index 04a9d49266f9..20848d00cba8 100644
--- a/dev-perl/IO-Multiplex/Manifest
+++ b/dev-perl/IO-Multiplex/Manifest
@@ -1,3 +1,3 @@
 DIST IO-Multiplex-1.16.tar.gz 15974 BLAKE2B 9810093876f5c91ed6c3c3b983872b4b20ef08ae3e5d73deffe1a4554599d3b46bcb74e4a4402bf5167185cf973a5134c3e9a42ce1d9f5cd4edb0202178868f2 SHA512 695462be217a107f734e214d2f0a00800962abac24cf4e30272376f5effa25584bc458377feed16b5cc7bab5858c00e547dc97d02962e57b2b8fa6e55df20fa6
-EBUILD IO-Multiplex-1.160.0-r2.ebuild 387 BLAKE2B de686ee59a079f80127ac22b7d44a1c3f9677beda22afbaf05f349e5c42cabdadd6223521c4085439369ecb42177634a1018c91b2ef6f427005a0d5e9daa11f3 SHA512 e92b96c1b9ef882ce000b2e9c2756797e0c01f9e850fb623cf5d55985dc322ea7920f76acadc94b9112b061fcdfe3066280a041c1554d4ff7a7604c96393eacd
+EBUILD IO-Multiplex-1.160.0-r2.ebuild 393 BLAKE2B 0e7f738933494230428f8378986780d083b9b533132386b9c2ee4a6a7800fbfd7674304fa887202435ac4fb337f587e8243da529b236c398099ed5ebc35a1308 SHA512 7ad0b7fea193c40b993933133a91e60dd2ecd1ea940cde747fa64b9808ef2cd622b3d12c87eb94fa7069117820220b7cc246fa6e5ff980c1bb4e356322dccac4
 MISC metadata.xml 465 BLAKE2B b8a6ef010be002a36ab2e696e914041e3b8d61359802fcbb4afc49d7f7d00eb8c74e7007066c04cabb5f81fe707a806b78b46510ad6024811aa53dc62f528699 SHA512 498d83bb804ac12941570bfc1ff7a73417cea177c506be1941636a6b638cd47765ee1bb7029d99393cd4162a6506882d1e4da850c0d8f31b3ff67f2746c965af
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/MIME-Types/Manifest b/dev-perl/MIME-Types/Manifest
index f0c7a916009e..4ef31cf6f566 100644
--- a/dev-perl/MIME-Types/Manifest
+++ b/dev-perl/MIME-Types/Manifest
@@ -3,5 +3,5 @@ DIST MIME-Types-2.22.tar.gz 65002 BLAKE2B 1dd416b030e9a6b38897d316ebad618eef3916
 DIST MIME-Types-2.24.tar.gz 65785 BLAKE2B 07897834b5c8c75d21a909c1baeb55d19fa6c5cd7f7ae81b3525af8a7a68c16d06304e2fcda95e2d104cfd67c1a4ce2ba08b68d34b47e377015626a2b797f0dd SHA512 5f1ba7b461eb18438b7e1bcc49291d0a506d937f0020f2a8b17594e4de626110f8d4b4a767d78b491ae788b6a6ea531d8ce2c2245cc614700ac8fa6d320d2bd7
 EBUILD MIME-Types-2.210.0.ebuild 509 BLAKE2B d0aec2700c152124761b5021193e97ea40ba86c1e47f4491be50a5a0ac2191b28a1725e80812ae3397454055094cebcb36015dc124e5cdde720525fa39b3eb63 SHA512 88f1c91462dc9198b0ebce7d3a4c4655b766f8049e3dfee2acf5ba783f0ee10235c90e83e5778f402c1be38efb8fa83fee11752db293f4d6b5b53f900b3e6d15
 EBUILD MIME-Types-2.220.0.ebuild 514 BLAKE2B d4cf472201907bcebc9fa6bb178dd2d669a7a883b1043b939b65f7c69fdd040df845e6ecadfb749eae39a327ce5daacbde3a44a60d0b2c5d6cd0a4b410e0e15c SHA512 58a840b037845fd88779b58f49cd23a9e51d93bac637a9a75462f6b7d34d2fe2ebcd7278e5f867c32b23b8246c4e950c941ca6b1b1468a36d4ce8f40dd43a9e8
-EBUILD MIME-Types-2.240.0.ebuild 521 BLAKE2B 92fee94b8d86059d3cf7028df2ff5d31c776271f1915f5890ec5235ce6f668d4a4ed2b01531dec8db4cc0c0292cdcb621b62ffca813a18c75d5e06a2e246bf76 SHA512 9bc503516a965f1a6b443dd18f7149b8cc5e2e2d427917afdc6ca7acffb6622b73caa3bc0b5ac633d99de6fd2d2006ffc228b07b7d55a4b170ff7533f3f669a1
+EBUILD MIME-Types-2.240.0.ebuild 527 BLAKE2B a89a9f5b7c661fd90819325464839f77363436159ee9a1d5d2714d5bc5c11b9b5d2be1a96b388bb4947832e5d42a8b2b128e6687d28aaa07c461c794a3a48385 SHA512 6bdbe8bc2bbd76b3ccf0aca8ef1caf652457d65b8fb70974586ce1fcc0da98067d34dcd1a1c7721d2a3566891a74c2a6bcf4d9b598dcbb265bd8d77c306015f5
 MISC metadata.xml 500 BLAKE2B 91088b70d4c1f07e40f919ce3edf61cc48c80aaf4c0832e032fb2bcb4937a36b7818b296fa5e9840156fcd5248879c9224552e04b8d28cab0846a2d6b9b2b4b5 SHA512 b42970cbd2b5ab806f2b45e8859fb6e4bf200bf13b3040567a57ba34cb694c0ffe21178afab65f34d0b771dcf805f5ba744fcbb968ac6d764504d3a082ca09ff
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/Mail-DMARC/Manifest b/dev-perl/Mail-DMARC/Manifest
index 6a1b2f70c119..7a34653284fa 100644
--- a/dev-perl/Mail-DMARC/Manifest
+++ b/dev-perl/Mail-DMARC/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-DMARC-1.20210927.tar.gz 794723 BLAKE2B 3b0eeed4ccc6498c0af3afe20052e9ea0b0c8ba1625b80ee7b211d7f4235a4f595f7f15862b6b79642423dccd95755047ac53d54b30a5db0b0c05a6070725443 SHA512 eef5d0fda54ea45c04e61b4b6f7fae995404978c297289e68640d0409528542806ceed9dc4c701376c81014ac5d5df25f541a789f54fd982be8c4518fbcc524f
-EBUILD Mail-DMARC-1.202.109.270-r1.ebuild 1891 BLAKE2B c789d276ff3f491ddb679781c344b1d75e3a7057f77b7d8c877ed62c4ecb60b4b295c16c0204a82c6e8d94a8be78cd885e9ab606847ef4b01c3ca27ea3e831f0 SHA512 1d958019c277f9efacb998e6275a2dc8bfafa009fbd6299cd8772ce5e1db4e44bfacff0ec95030fafb5a0061084807a42b2b7fbd2d6f9dc33bdb1b73e4e01e17
+EBUILD Mail-DMARC-1.202.109.270-r1.ebuild 1917 BLAKE2B 19e2a7af8f81bcef247c71849d79064c283f9963235b57e4f26b00b5c8e3a2f80503835bae9a187e3b98349fb708853f49458fb83eb24e47da962b1e723cb64c SHA512 7415ecd39b7ce31399ac2f6a660205c279470215d24912e9758affd2882dfbdbaf238dad3a067b7648a941e0b78a251b362156f30292b17f414c77f2b3f7f829
 MISC metadata.xml 2239 BLAKE2B 7ce9d3d8be07ad9043047fda77be9bfcfd50fa61221b6040514e7178cc156f50e121f48f243e7c8af7e5dbd5b26c79706536fd619ec0e5ebd0289dae9930f681 SHA512 a43245d8d48cabb4b5b103168de5d2dd708bf59596a84ecddb0cf79f4e66d8003f43d97bcde808be300a5dc5cc00b39006aa5be9b1063e0dc16ef73067741605
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 9497d43a59b8..83bbc8eb0f09 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/MooX-Types-MooseLike/Manifest b/dev-perl/MooX-Types-MooseLike/Manifest
index 3a252ebd83f3..168f10429674 100644
--- a/dev-perl/MooX-Types-MooseLike/Manifest
+++ b/dev-perl/MooX-Types-MooseLike/Manifest
@@ -1,3 +1,3 @@
 DIST MooX-Types-MooseLike-0.29.tar.gz 18804 BLAKE2B 3007c5a58d708430c151e1b8bdaa3940c941774e24ce80079272ab168b8a41683b0fb29c52df32532c7c555a6e4f86eb1be49053dfe109495133c4391b23aaee SHA512 69ddd0d663d1ea23dfc7e47ec35192f1951f195f70f788bac47cc93e98d9e888394c07fc39f1740b7c1fd04f8724f2b0dfa14183fe33bceb9f77c1f1d1b8752e
-EBUILD MooX-Types-MooseLike-0.290.0-r1.ebuild 564 BLAKE2B 6051d865c7cdcd0ca98c7f9dfed3a0a865ef93d4c170d334fc2138af7699285ad232716d789fe54dcfbe07831d65eebb5680d9b615076b11a2141df40f79ecb1 SHA512 93c2baa161d59c864a67e499a21e41f409b7882d94d7eb5ee396810d50b9b41ff891f9458fae8de754fe29bc5bb964201f73feb679eaa9b73ebbacef262dd92f
+EBUILD MooX-Types-MooseLike-0.290.0-r1.ebuild 590 BLAKE2B 624cb7cbd3c0842638cf67aa8a064c2688097d9a528a0352277686b8d449ec757f892bf079ecbb4b9607f5158bb17e691400b0d198741d3126d1069e9f2f3a2d SHA512 16c69e0a0edf5d170e3660650a2c6ceb591e65c5c87c20c852b700b0ade9aa7dcec16449edff9a2cbaab73a59b39e9f66af1e1adf90ae3ccc3a363cb80e7e9e2
 MISC metadata.xml 618 BLAKE2B 201750ec2531dd26fffde147c4796595fbc0fd1e7f726b766e5be1eb378f810a65678f8fc41cad813fb284ce7db8613b457c3f353b919aca20997882949d9679 SHA512 dbbdb4bd4a979010c0ce549e77ca52ce8d27d56afc701fed41903e60d1a2346f3bd08ced35213ca408b8f07297e1d89c31cef43fd759862e3383279f4f10c30c
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/Manifest b/dev-perl/Net-IMAP-Simple/Manifest
index 54602b58aeb8..52021d91ba1c 100644
--- a/dev-perl/Net-IMAP-Simple/Manifest
+++ b/dev-perl/Net-IMAP-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST Net-IMAP-Simple-1.2212.tar.gz 45917 BLAKE2B e5f7fabbc6cd36af0a07a0c0d76ad5f65c888b23748abea54ad49cf032fa860c02a18a58c65b1bbd9c60133d60550b058a5822005789727b0084261daed040a8 SHA512 0c34388e9358864f74aacdd7bb046590a4d821f025ccfdc2490db4dfe017fb5ee3dea1cae96a408ed6518cc7e3bae20fe92296b9822d62c9ab2b20f26f873e74
-EBUILD Net-IMAP-Simple-1.221.200.ebuild 525 BLAKE2B c4859447f71486ed626b5738a9f2085174bad08962a1b4b200173d9ee7439947354933cc45f905d215b807d57fe5a8de19b10ef7b28249d9051c9386a34d063f SHA512 f180c1673f679a9d487946ad99b6e9b7c484cada43fecd20c7fdd9716e64b875bdb0dd6771b5b96163a00ba5c082b02b784fe3ebdcaf56ae6ee9ea50d815d7de
+EBUILD Net-IMAP-Simple-1.221.200.ebuild 551 BLAKE2B 00704f48e76ec6e113e883f321b4299ebe84d8411bfd3e693b6527c96bf72b53718b2af0efa87ecc20ee387e1e208d63937bd9d032564f22f3bd328d72417d85 SHA512 02164e5600570214fad465162e6dccde6b22a639c643a915da035373dee9d636758e6bb822b0fd63d5e80b07d98ce1d376ef55ca08d979481fa551497beb303d
 MISC metadata.xml 764 BLAKE2B 3e52c7847943fceec75da4c8dc20935fc054df949747cda27c34aec2eb86ed24d5302c544c1b6a25de5212863bad5d92ec4d95e329e9e4d88dbc7f53e2c1df69 SHA512 569da0be6d998733b53d597f74b7620e9eec422834b5783f31793cfefe6ee47b3e06bd3611df419e321b1fa2ee1cdb8cecce56c87bfa2975114b8ae0dcd892af
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/Manifest b/dev-perl/Net-SMTPS/Manifest
index e030bfc52751..f586a0c54ca8 100644
--- a/dev-perl/Net-SMTPS/Manifest
+++ b/dev-perl/Net-SMTPS/Manifest
@@ -1,3 +1,3 @@
 DIST Net-SMTPS-0.10.tar.gz 5309 BLAKE2B 6832b95d40a92b8fbd5ff381967122ab8d03ae8550181b00f931e1526d8f46ea7557ec615ca07675228daa1759b7856442307305916892052f6a7d70f4a600c5 SHA512 e9d2202f63c5149ea72d8b37e27a5c0a7d0259de6a2afd7dad4b59ce00121cedb212d73c1f50d2b6ac77a0e0934bdc750fed3be4865c5f84b805befbdab802c4
-EBUILD Net-SMTPS-0.100.0.ebuild 440 BLAKE2B f75668f75b097050245034afc9af693a08559f2e823f22243d69b02dcc9090e567fc09cf49b14effbf67a1410d4ed38fda9a9cc65bb06a4670f7708c41d55c70 SHA512 44fd871f3d92739768a0d863e4d60c81914c5f6e54b5acd02d762aa3611fcd521a2a4144c278061e3649c785d2651633e12e4b078f7a6cd4ca8e890ba7ba798a
+EBUILD Net-SMTPS-0.100.0.ebuild 466 BLAKE2B 00cdaaa0dc2dc97423c5877ad76eded1c553ce1f97801e002aea0c1089682aab145d0772b3b2b54f358ecbc250f2b3a6a01135742220e12d3500c846295e1e5f SHA512 7c4363453f6d3c7e8577f4b304bdda74ee3e9f2c6e66b8c0924f1cd597a41725ccb3c31e9b1d3acc0d6df95659d30f3aa0d1a1108f719508c24e89b4fbce2a63
 MISC metadata.xml 391 BLAKE2B 3ca0035db0ab987520e11cea275256d545570e4ea5c0137aef0bf543377fd312e6a256af0fb7ed1777de4fb9bed3acdfb2fcb558bf932088408840a2ee7dc77b SHA512 4616a8f4b40e6c21f2c5a63b5ea6dfbfc4f521461bedc90e9e9f9b60488cffff9cea13c4b533650b10a4ac08e3c32a5cafea691cfd47d6e1d3a71d34b27155e4
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/Manifest b/dev-perl/Net-Server/Manifest
index 152ec1c92b80..ba6874038e9c 100644
--- a/dev-perl/Net-Server/Manifest
+++ b/dev-perl/Net-Server/Manifest
@@ -1,3 +1,3 @@
 DIST Net-Server-2.010.tar.gz 145901 BLAKE2B 2b2339064e1e2a6d3296a19a497635fb4fafb7884e15cc04f3328df349086cbea561247c9d53a140e3c43a25be366fec566133a0e51dec1a4bec0d83f0950665 SHA512 b4c1a85263e81c4ad6f32e28acb5176002ad591a1140dca060b706901758f48d3c63c4077606d772540e18fc6fa6772e71d213d0a4940e903c597b0e0f844365
-EBUILD Net-Server-2.10.0.ebuild 595 BLAKE2B df113e312bb35f02f56cd27b416af4a768216f72a5a27554052b56e0e9a3492243bd0b5389d0addd4c8d1decb9f518b270bbc9e83318a527f1f8f0de46477d69 SHA512 f5bab93163664c58d5d380fcc3dee3d4746b16b37a39dd7d2ea10505e86e046452f46efaa7ec67d5fb8ad4b060948869985ce307b522bf92b74a5af326483957
+EBUILD Net-Server-2.10.0.ebuild 601 BLAKE2B d383e0d68af2b5a2d801255b62d3e74291221e3063bb7a837ff373df30b282c944ebda265808ab8d7ce9dfa509572fce5c738d7bdf42fcc04529eb9fa189ccc7 SHA512 bc4740f0e4a2cca35525f31669849aa1dbd1e1f8c8a8b2a996bcda01b6248a52007e7c93ef34c15edfb906a032f11e231ed03d3806f0085cfe09c50e6db8ec0a
 MISC metadata.xml 1990 BLAKE2B 7cf4859883e0922ee5ad6b110d383fa6387424933d97d50c1b4d62ba9dd3c35381d51c661c2e94c77ba6cbf6a864528904acee63539fbe2387111b594db67101 SHA512 6685fa6751bf1b3c6f937021b6997d099edf5fc6ef4ab360b460418f8a6f023e283738470cf04d994fa4959df5f700fd2a7cd9cef56945d1886aea13d568150d
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/Manifest b/dev-perl/Regexp-Common/Manifest
index 9a8b45ea7b92..8501dbbc26c7 100644
--- a/dev-perl/Regexp-Common/Manifest
+++ b/dev-perl/Regexp-Common/Manifest
@@ -1,3 +1,3 @@
 DIST Regexp-Common-2017060201.tar.gz 237881 BLAKE2B c7199552d6d495f7ee9b601f125e601c86b552eb658691f989ab37b25dcf0a60eea0f78735e713853d6a471f6bf0c2db350577e77c60b6272b4170594ed3cd18 SHA512 fd046d775214bdca42f868557559595360b069121a75fc119f45e064091000968d9d84154f8a0f06072ecff169dccecf68be58f99a7196932fcb4ffcbd678608
-EBUILD Regexp-Common-2017060201.0.0-r1.ebuild 471 BLAKE2B 9903f31bd3d2b0a121ebe56b13024217afcfe54d61508bf9e0f70e396baadddcd9a5f37960d39201db278a535d32816cb1bbeb5c03cccb2d3a790d26bfa91127 SHA512 5c4804f2336319ff58b3c5608a1768f3189bcdb727a4ecaf5275e291a51726142bade2f71ff2ced3ee414d8b4b35b452951513b974ade251220deea2efb7b964
+EBUILD Regexp-Common-2017060201.0.0-r1.ebuild 477 BLAKE2B 74eb30fbf2d5c796dcbab30ffa8a89e11d0d33e473af61e4e2b384d1a2d84bc0e32813bc4b4358237434ce9405f140789048f913d89fdd6e6c08365a97a3f881 SHA512 066148af07a03d4672c980615b31f1e18b7e8aa3f0887aa66837a55189d04d6e5fbc9b46615b8fe5bb11061e79578305964a6d7066cf28f230e9692d7f7c7c56
 MISC metadata.xml 2810 BLAKE2B 6e45a4442652346c457a06df42831fd18e4e5a8f31397b8d45314d1dd7ff72f432aff4184dfc29ea5af3280a6c8aa6ea0e1fcbd15fa22b73e3943f4360fd2d4f SHA512 b905d59b450d551f51013da62915cb1c02b7545ec33c1713c37d2f3abe0c89f199d5ccde9761ba9ad77a11a68d4f28fd38c132a08b643e64a6a11a28012d6971
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/Manifest b/dev-perl/Sub-Override/Manifest
index 9c1890e678e6..c66b259da074 100644
--- a/dev-perl/Sub-Override/Manifest
+++ b/dev-perl/Sub-Override/Manifest
@@ -1,3 +1,3 @@
 DIST Sub-Override-0.09.tar.gz 6462 BLAKE2B 27345159d3475c30c40852fa93db246c91b4d83806154adefcde907ff42ac0726d9c84880735a148acb6ce929a14c43d30287dd71307e41667841bf25db3bb99 SHA512 35000e8cabb6ca4cc0cac53af99fc9cb8ac14b1e71dbfa27dc58a339cb1b54e439064f2241798e351cc5ad297a2f9e4fde870ca97e2eb09a2430c11af589d412
-EBUILD Sub-Override-0.90.0-r1.ebuild 387 BLAKE2B 95b837a1418e9c9c9bba2b07d186ee5f5eea219a0bd5fbce627a44f40621a131e65bf14c97062fb2f514c13e5010fe06fd1560e380d5ed04dc25691d3a0fcc24 SHA512 c831c38575108e97c973fc52284f3d9990f8571e54b217e46bbf26602e23cd52a34df5457ca27d9ad923bdcb807ca60d6127a89775ba3b9248c41292b7b7d63a
+EBUILD Sub-Override-0.90.0-r1.ebuild 393 BLAKE2B 2538c96865d38410758a7935f91657a7fa2954870ebff1da2410a2e1de0455b9b9b184128586ddbeaa0419dfc03adeb7779cb8eb8adee15e42ee676c46d60cba SHA512 d58d6f444244263c330cdb766e213ed3cbd5ae5f6beba8060f447d2cac757ba267c6dcc0f841518a450fc3ac0b9d9484187f3cf9d73088766065f834c0922df9
 MISC metadata.xml 397 BLAKE2B 1a61a411220f9585aaaab226adb8fa83c98ff6d1070627e87546bcde43de61062809ffaa2e8775fa83edbad2141f1a50af687e63ae1931c27683164047376190 SHA512 cd767f5bc903fbc917a652cba9d5dea536730f13ce32b742b249cfc826ff3992c6bc9591602017ceb524509ae343a5a9a8c53ae8889b2ff138518c1d60f5a0f8
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/Manifest b/dev-perl/Test-MockObject/Manifest
index a5a584cdb094..13044d35c05f 100644
--- a/dev-perl/Test-MockObject/Manifest
+++ b/dev-perl/Test-MockObject/Manifest
@@ -1,3 +1,3 @@
 DIST Test-MockObject-1.20200122.tar.gz 30294 BLAKE2B 1c64896dc30b6a67eeac64395f9fb576217f5378d76a01b4942d36b134fe9059102ac055ccad4cfef3f93e71791b21a91f2bcc92dc3f63d1800bdac0b38db9a6 SHA512 05c0e007a22cbf24e5566e2045797b26dcadac697c8f0025422ded0c3ca03fa71d9df0149a28a97ea1454a27c77d22c46a80e705fbc309386b7d3220acd03c5f
-EBUILD Test-MockObject-1.202.1.220.ebuild 652 BLAKE2B 7db6c47666c64d7223eb8791e78d89960c1146dfd3d4ca5dca6399e5d253f73943036eea4a2e3865059f072809e85f933c224e9ed84b807c722aa9819e60db5b SHA512 5529547818de1f6b6506728eaae1fb40392b4df3a3155956fea349b9c95a3c733e3dbf969037a37fdeda88c87d4fb7c74f77b9288804683131ac972bb89dec0c
+EBUILD Test-MockObject-1.202.1.220.ebuild 664 BLAKE2B 48e350cc9d4bcc2c86426603816b6f70a4d909b74afd2deadeefae63c19504271fa681a1a700b369441862e1c7bce48f2130a7737190e28b087a69f1dea03d88 SHA512 1fb99a53e2395dd29ca4a04749002d3dbb9873b1b9d15a780b06b673c0ead9d16dc9c12efb96ad6f7d5ee0c83016878a77489be81beac3a9e20f456a2dcd115d
 MISC metadata.xml 475 BLAKE2B f55966a90391a6a5476adb171a2c8cea9ebcd902782d95e93764c7aa408a458a11466e5c89ef7688b2eada732eda126de7792ed056f79b94dd9a882c6c51cc3f SHA512 304d185031d364fcd6cb3ac9d2abce13e2fa60a765dc108a44c7cf3b387cc6467438e974a0dfafcf37480b40a8f64c3f7546c80c0061c2628afba57fb08730be
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/Manifest b/dev-perl/Test-Regexp/Manifest
index a93b1810307d..98b493b6e7c6 100644
--- a/dev-perl/Test-Regexp/Manifest
+++ b/dev-perl/Test-Regexp/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Regexp-2017040101.tar.gz 18904 BLAKE2B 9b7db35830d970ca2244a3db6ec0d11dee5b19d5e54e5e27b42b05f1a5bd4a0f394dcf1158cd14088a206e625144ddd85d732e4d10b20cb6cc16c8507806c7d9 SHA512 70595642f8f5cadd4cec73587af8b4e9ce793c37fdf02773d357b84ee8181750f5ae7fbfbc9a35ca3392f5af074ef5b5a1626547cc7a0c3f48439d4a24bdc0b8
-EBUILD Test-Regexp-2017040101.0.0-r1.ebuild 649 BLAKE2B b460772252b213523fa7f574041d91551ba74ece82cd0ae89d0d4fbac87197f2f28b9bf38ab8ee132f9ed2d2ad7264ece5b2b94e0c666731b4e174cf32d0e3aa SHA512 deb9597c5c50f447b8323f76ab273374776069845388cc9824c8b6cdc0d535f130e24c94d25ff9ba7c7c0f2dd50debc0fb2239a953a759b46fa2901668bbe1f4
+EBUILD Test-Regexp-2017040101.0.0-r1.ebuild 655 BLAKE2B a08d63fd8d0880d9319598f428225e3f6f247d4821d69e608f1282ee1a428dbc7665f5ab8c7cf4383da8c18f27cb2d0ba42c38f91c9fcf304c885b77f7ae333f SHA512 5077cadf9353b342c8afe9f008961f7bb587824df608e636c780d1550fcc50c752754d5de5a7fc337c42c0420be02521aa01f9f56d2828e8a07446fd445ae723
 MISC metadata.xml 523 BLAKE2B c5252f64f1294e170f53cd2142c7e597f52c96f09b8ec670c4e83ce85a6dc4594b4327233507f8461b55a8b652708d01e3d77ea783f4fd622aa1c9d4ccf3707f SHA512 606306340c2587602be82195b0929cd4521e34101fa45052994257381836dbba5c61848d153f3afc9cbd16070e4023bdef69a2a1d260a486d6f3b84c2959597f
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/Manifest b/dev-perl/Throwable/Manifest
index 9e3282cb2634..7a1e0cb60556 100644
--- a/dev-perl/Throwable/Manifest
+++ b/dev-perl/Throwable/Manifest
@@ -1,3 +1,3 @@
 DIST Throwable-1.000.tar.gz 21875 BLAKE2B afa787b0e29f8d962589edb87b93aa343d703ad00bf7e9d96b2a4a66b95ffdde5877a775a7aba053ee7b4d0ad2b7ba46677a1ed8d416003f70a2fdfa176c296e SHA512 d81d2e3eff78ad396e6e61ad09ecf3c1eaaf33ae24c8b74c8336b568dceb1b62aa03f9e8417df2edc55b0c6806599c7e88ccc43f2b45c11262fd8139706a9bc3
-EBUILD Throwable-1.0.0.ebuild 614 BLAKE2B 97b17e7730f68b6e4c653bcd59329caade2ada736ee6deb2c6c21aa9a1f34503df2505e123b3c0a151e6be84bd40fa27b788a99c8dead95a5efa85a5311093f0 SHA512 2ee61e5a89a0d5166311a4a3c221e9910f3565419bfeb78cd8855346fa1c8ec3f01bea285e9124ecd88d543397d4690e15c2c0dba8ff19f109bfcff3d4d032a7
+EBUILD Throwable-1.0.0.ebuild 640 BLAKE2B 365e8096e1b68571ee76d4ebb117371590c45487164f4aa258e452678a1ebc54878568f23733d5b4ab565cef976b2bd38017d4ce622b0e51470400405ed78d9d SHA512 6d4f218912f9967b196d1cdaf1c624f3dfe29d3a9e605306e9105b1ea6700ef1595819da5236b15f9698498059820c41976f4c3101810729f131af457c7f8d33
 MISC metadata.xml 516 BLAKE2B bd949a1514219b6558a4f98d79fc22fde82c76e0d754cbf68ad78a5ef04104dddeeb2c22a9f87b460a57486a58f5f703ab432b1bb4a89bc1a1d99b9686fac7d2 SHA512 10311fd94cb3484c138c924e5424cf50401bffeec193ee93645d4afd211607faff0312c16df0f50fcd52e68ecda7b8a0608bdd4c7a630489a1ac0a3217474e44
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/Manifest b/dev-perl/UNIVERSAL-can/Manifest
index c57a957f724b..ecebdf1363f3 100644
--- a/dev-perl/UNIVERSAL-can/Manifest
+++ b/dev-perl/UNIVERSAL-can/Manifest
@@ -1,3 +1,3 @@
 DIST UNIVERSAL-can-1.20140328.tar.gz 14654 BLAKE2B 9fb6830e745bab900228b2d3e62bb1abb03c8dfaf03e8ddf9f2ae6665be8748d8785d5629e19d80c3e53342f2f8c151f0539f9d6cfa29ef9ff7ac1f4e999a711 SHA512 6fb032b968fa87d95e6fa6897575c6374a2d43fe9d505e339e593bad398b444b9818c8214fe7ac67fa2cfa1013e5c6337c507c3ea6104c711e3ee3d5635f0bc0
-EBUILD UNIVERSAL-can-1.201.403.280-r1.ebuild 430 BLAKE2B f4c3536f8501d9a9ac668cf38bc84972483aa9ded20852801207dfbb8772e3c87377cb0af55454aa4aea692f9065a217b9b009e74b6d92b561f6b40d4efc5989 SHA512 e6099fd99873ae301243822f4879771df6c885a99f1ef128b98ad961825a40423635ff35ad378d7bb84cf6b1e0c9c84723d4dd46859da0ef4c944b8841319bad
+EBUILD UNIVERSAL-can-1.201.403.280-r1.ebuild 442 BLAKE2B 87465a869a23519f924fc0c108774fcb4386301af998b3c73697ed988e6704226c25cf7fa98c41b8fae6afd340968021870401d415d27b9afd80d7d79fe69841 SHA512 396cbd0b34476327044d97c67899e9e9ea01859c8c666396171b65d48f786cdff8e5aa4eeb7ff1ad84a2cbb64e6cec5e132d5b171657c9346757b31bfe1f7c4a
 MISC metadata.xml 399 BLAKE2B 4949fb386e154ec621d5c1efb76370306a3cc090c937510c4209e228c92c9ece1cb46103c7cdc63a6608ec9cb6fb3ed235d68b1d4b809b48e32623ac96478805 SHA512 030c81faf3a428b2055f5c37c956a3d068d2787391e99423c0ac7f7355867906266f8f6bfd1b87ee4be1e791294583cf49e40446b0f1d25caebc044b5222aa8c
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/Manifest b/dev-perl/UNIVERSAL-isa/Manifest
index 780c3b511138..bc58aef11dad 100644
--- a/dev-perl/UNIVERSAL-isa/Manifest
+++ b/dev-perl/UNIVERSAL-isa/Manifest
@@ -1,3 +1,3 @@
 DIST UNIVERSAL-isa-1.20171012.tar.gz 29345 BLAKE2B 1e4d9b87fe2da93343dbfb8ad58f073def486e67b7f070eda08df803c3df7f296d1cfff80b5ecea6937c0b5916e648b2e45c7fcc94bf12071522b8508bd0bbec SHA512 abc2943b1706c681734cc03d995859a7d853741ab2013b530aa9f290d8625c5074ec594062c97760044cc1261a20448b9f059287a8f3dae7ba8c303397610518
-EBUILD UNIVERSAL-isa-1.201.710.120-r1.ebuild 487 BLAKE2B bc8d3023d637f97625c359bde0ac26f3e602d06ca08f18755c7b329a5d9c9d69ecba03e1214e7e91b2c09caec4f944b0111421310005af79e5953e6cb2c0a131 SHA512 3c30f2d1036fb21efbe9a8883459f2528a04bc6dad63e32d0e823085b53b4163ff333d7d1b21f803e8f396ca822922f20078041dce9c156e9edf110af3616c18
+EBUILD UNIVERSAL-isa-1.201.710.120-r1.ebuild 499 BLAKE2B e24cf3d0a67e62c6794535afb06c8c769ee402ea16082da92d9b674c60bf18debc691ed5d0a7de7a793bdf30785084fa97d879ebf7d41f90c0c303a6607ea94c SHA512 f3644fb0387255a8dc647c77c307768c85f5c2ed864b5504f37f5fd5a243475a8f46684e70b36737ee260ac504f6fe2ca456cd81d1033f1d06f895a6958f3add
 MISC metadata.xml 399 BLAKE2B 05d2b9e1818e3e8d338915f89413fff1d33087a43367cf82f42eeb8e93c70dbc4344f030c3e96783fbd28124f479574001a9ccdb4ed53a7991d6c72573d61684 SHA512 c2b6d4d67849aff92511fa0bfc349c03058c4c297d61e58aac77e5373de8d46f5f5a31c659eff1d3b8c69c820cceae43306027ef24f43b8d2db2e4ca9ecd565a
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/Manifest b/dev-perl/bareword-filehandles/Manifest
index 0e51bd6222ef..7ac00795ef0a 100644
--- a/dev-perl/bareword-filehandles/Manifest
+++ b/dev-perl/bareword-filehandles/Manifest
@@ -1,3 +1,3 @@
 DIST bareword-filehandles-0.007.tar.gz 73269 BLAKE2B 7c16a8b68601c09d5d8a1fc616363efccd9c1b6da64de5ad8cca1ae961ec6eaf8c8575ec650b0de2725de1ee9ff02817fc4a2882d3800cdd2b4842ce30a62001 SHA512 e7bd4e2ce32b819086050d1619806a5ffedb08732a25a8786dc70f6c8bea3cb3dab2bcced2d5f02f8248ca816dcccdaa2a20c6c943dc5667f334e9e319dbee6d
-EBUILD bareword-filehandles-0.7.0-r1.ebuild 903 BLAKE2B 2b1822d7506480b9b37f8377ba73e6b7a687759b04979e60327d0401ce7234c511703d64888081551d5e7a8fccb6dbfb37e373e7ab6d8aa19ba85cc8c02c9126 SHA512 0d235c082fb30c1ee6ed118b01ffbed075c03fb60f3f4b46e45a978cf0b7e631e472a596b637ae83aae760b7e16abff709d884b040541518189e4aca1caed410
+EBUILD bareword-filehandles-0.7.0-r1.ebuild 909 BLAKE2B 7793b942bdbc88ceee3e62b56f21cbcd357212bd4013fbfac1588ca1bb50d03787ad44ef1f226c570b86beea2ddaf6ce2a75c4cf5f1b0d16371761bf456a2f38 SHA512 1730af75142560c8163b6b8c5c491130881e30e5160b0e69b016c8fd64d406f45279c342abb349d904c3f551671bfa3c93d204cd4174ed24a8ea1175832aed86
 MISC metadata.xml 413 BLAKE2B a8d1fabcdd73a980e69913aa7a18d50cdd74788d96938f84c7b0ae8ae22345d113908930e1bbaee6b9604eae57c9da7987542c30427d449f9b9d0dfb5cefc164 SHA512 03d1d1beebedacbb0c5da41501e1dead2d94ac20d3650d42331927f28019ab2167282d57717d9aaeadb23aa8560f17a521e77646f914ff844b0689c2e3173132
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/Manifest b/dev-perl/indirect/Manifest
index 3d2f2cd7e278..070940e9d85e 100644
--- a/dev-perl/indirect/Manifest
+++ b/dev-perl/indirect/Manifest
@@ -1,3 +1,3 @@
 DIST indirect-0.39.tar.gz 52231 BLAKE2B 8e2f9765ece6c2878e77eec2da0807b6e28c46868de213b99208bc5952443829a18083452abb806b37e4272029c16aa5db371bc757d944edb6b8f7710c06fcb2 SHA512 d3275a2cab2eeceef61756e08947d3072c0ce5cea2e8b70870c5fcbd9c63e56cf70568395002b7d02060cad3482f7f56723b1ad85fcf0a4c4ee2568b5035816c
-EBUILD indirect-0.390.0.ebuild 602 BLAKE2B 1ab59af7f14afa407ea2544f2fb0e7f582caffaeb7d01fe4694abfe858630271018deb51b8ad3e1714a53f789975ab0acab2993df4c3931599adbc688cd6f894 SHA512 c6805f2ad4ae0681a3acb4b36161df4aba9e3edbee1580848e56ba5ac9aa7e340dbb2a1245b63ae0e38111d75bd4146d09a71953e3a4fccf96ba6092f4483e4e
+EBUILD indirect-0.390.0.ebuild 608 BLAKE2B e21b59fefde7492b884d4320469634729db5faaea60f0192bc0e4c22b14bac0c253e8e9136468b17aabc5a6c17375f230c42616dffabc08dbc012675d64fd519 SHA512 b2ac927b80eb94affea591f2df67c6127d6c6522c189f1fa36bf77f3c89bde457cb935b616728527703a4766cacb2daa56d2c6b0b54d110e55c3c4b29261fc6c
 MISC metadata.xml 376 BLAKE2B 178803155d55d2dc5ff55487eda4258fbeac919c83e79159725bb4b8d454576ced5d2d68c866b3c43a44a88cf0bc07145503dc937e41d6c4c28fb0376ae2e8f8 SHA512 c5505fb68b8763a8f66f45d79426be028c105c65ce81d4f4fb4cd2e6155e15bf51d4cda95d546975ffa25d3afbda802e42a3d1f5d3fcddb68cf1043b63978a4b
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/Manifest b/dev-perl/multidimensional/Manifest
index 483f0d2bdc47..30bf0317a7bb 100644
--- a/dev-perl/multidimensional/Manifest
+++ b/dev-perl/multidimensional/Manifest
@@ -1,3 +1,3 @@
 DIST multidimensional-0.014.tar.gz 66968 BLAKE2B 0496081f7ea4b0c33e5805b85213fa582d58218d7e50614ae0a8660b1d28f823eeed3023f2fd10bb9055e89e38d365f4c1e9741fdaba0d6bc5fe1f67d7a8c461 SHA512 94c9dabb3023165a8dd140ef791e4aab980e3b604eae06ed0e29290aab67a9302f2cde4c8b394de0b4c55c5f78ce4510db902d615d665bf60b12ec409f341043
-EBUILD multidimensional-0.14.0.ebuild 661 BLAKE2B 54703c8b6227f773ea333012e6f28db93d7bbba987b0468c21d2220dc736929ed86bb0eb197526b0a1f09008f2d5346eba7c69ba2ec11d573a3c1d025feb7b5d SHA512 fdc4637bde34253836475f464b8b130135f7b0c0341605789ea246098c95eef0e38758b7922a0680df8fa37b2ceac7602a269d8e82762070115dcef1f2c9c0f1
+EBUILD multidimensional-0.14.0.ebuild 667 BLAKE2B 6fd18a2d27bfbcf2a02476cd384e433aa72f1aa563f391ac2e235c464f1d5851a1f47a77f0072ea9244f85343adb73e9b0e70e575398d84c75b4dbf2bf9a7123 SHA512 84d4a1870ad19d15af4854e8bbfdeedb99b17684e3a5071fd446748a0e1daf57e2e3480c08975c2d3e98c23f5b512a45dcb8efd9c63712d32b325d52c3ba6d90
 MISC metadata.xml 404 BLAKE2B f784d050b2d4801d334f0e893250450340904e81a1fecc07320b9250291f942642f2ebb05e6967b147603ac80aed44e8c743dda6d0227411f54fa3c1c2cecaa2 SHA512 c18ad390e98ac7f57b44ece421f351659d7717c503e3ad5a963438f3c514436749fb555f48de7509c4af652288bb7bd26a00aac30ac5ce9d890d57d53d02c04a
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/Manifest b/dev-perl/strictures/Manifest
index 760dfd6c42bf..3fa60b71b864 100644
--- a/dev-perl/strictures/Manifest
+++ b/dev-perl/strictures/Manifest
@@ -1,3 +1,3 @@
 DIST strictures-2.000006.tar.gz 22508 BLAKE2B e2d4a5aedb415473877838fbc43e176a8671c7be85b2b8090d6143b47cdd6bdd04b6e50e99e089c2459ef75027f9a5263ed4cb2f8a5024824b595e0cc86a397d SHA512 670857a491fa58b85b10ee3bb5c6b7be845798926327ff3a32a9b78cb86bbbb95bfcc358983ece766dc8ef19a1eae12091ec9d9a7fef6d3f5d44ee4f8c04b7d2
-EBUILD strictures-2.0.6.ebuild 640 BLAKE2B 48f648f72fb62594d6b26aa31db9481c4e36aed91727805f5a4002ad1b086fc7084b6c811b30bbbe4d6b5de9f61371c5f61db237513ad5cbe5d2674469043b53 SHA512 36f7442e0dd4771de4148d60b9a09bb197080e8c7b7573e0b9c2095ae885e8e5e20df0f1c7ef72bc8b9a9bc899e90c703dd3a8b1a309960f51a08fb1b71e7063
+EBUILD strictures-2.0.6.ebuild 646 BLAKE2B a7a2ea6d301c020b114339b9d4117e50abdda0c1e35d3480af1a216d8a2aab52a285081fbbd0e42cf9ec5c7b098533250e43b4d949b802625601f0c1be95bc8f SHA512 63f975d08844988f9fb7d22984f5ea02579428d5f9266b4b3d7796aac7922f108ee3ca78f7ff057adcaf7744833168ef4cdc73a442c11d00f6906d01ee04e708
 MISC metadata.xml 442 BLAKE2B 6c456c7a0d95c0543931362c942449c1fdbb472c9dc8ab7bf8afb4580c32d223db051a0e6ac8df0251e5369d2521b9497bf690e8616ebd0c6bf836934d9a080f SHA512 341bb487e498d61b9a9ce94ef91e79943e2bf609404b7f2c41be246f07f7007f01ce1e8b4c3d28f8510318ac1d258930fd1949bd8614c29e2e38f092a2eeda29
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/Manifest.gz b/dev-python/Manifest.gz
index f1de32f3bdd3..b6ecf2fe0de1 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pycdio/Manifest b/dev-python/pycdio/Manifest
index 00ecba9a2e66..782bcb2fe526 100644
--- a/dev-python/pycdio/Manifest
+++ b/dev-python/pycdio/Manifest
@@ -1,3 +1,4 @@
 DIST pycdio-2.1.1.tar.gz 246562 BLAKE2B 7dbbf384f9d70aade922172c6dd070229c1ffc65a76a491c45f91ec176bced9af0dc0e08f50f8ad78828273de14166eae886b402f282a10bdad3f8302276ef01 SHA512 4c756b1c2f39332add86e01af129ccb608178306be42c9719c163b6bad0ba4de3916ac477c6866450890e094b14a2689a24e7d19bcf13846330555c2bb1feaa7
+EBUILD pycdio-2.1.1-r1.ebuild 1051 BLAKE2B 36975259c16998802678cfb73a4e6c90d6a7336e585050d84c47ef52a9b58453b5ed9a437aadc0d6b7f5c529ef1ef7f9f2c5ef9271ed82619c7f7500293ccb6e SHA512 b8f6cba3eaf47936c32e4ea734fa996354e7c3c2c95792b8defb0cd612ae6908d92e368ff58a798acde40d9e567cad002276be133b75ead15cfd7ac3168cd3bc
 EBUILD pycdio-2.1.1.ebuild 948 BLAKE2B 8649bda8abe1d245b80abd9a4058d36fd0ce40fc7187768f16a86527b22b1ed8b7faee778cb4ab33644a9eff0d1ea7f5179eb31637d13ee454ee93eb320e5695 SHA512 6cf9dcd99dcc0a5dfa48b916f75bc01daaf1081a523e0961db38c7d2aa9e41933e65ce0f3edb71a92121985e148eb650f93ce56bd33c979766bb631603a8fc5f
 MISC metadata.xml 653 BLAKE2B 8cb2e5d7b92c99876fba8c0227e12c40af546d4a10fe108b04f47d4e718f08629ddf06af30458952e251b16310d01e1470966b14af96de39441a1879771b85a4 SHA512 30186cf5dcd94811a192207a368d5caf6c34e0c2de87f9de45d843c9c2327d9caae1f7d1ffa17a6debf9b28ef4d9f3bbb4e136c4894cb344aea59be4f8e4e406
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..94f8d9a685c4
--- /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_{8..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/pysvn/Manifest b/dev-python/pysvn/Manifest
index a6573a275ed4..929bf90ecad0 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,6 +1,4 @@
 AUX pysvn-1.9.18-tests-3.11.patch 1031 BLAKE2B 3886df331cbacedb7046b78a914b29cd65dd52854a12eeed91a83cd18997d2d8887ab099576b35f98f200d5a4bb726b38f155b9df36b7f8d676dd470962a6012 SHA512 ec1e83e905f0e1e0666e01d8cdf688c0fc04cef4a4e222b92abcdf777f7ed7884c68a742676cdc2f4642731d5d0a8abc5ca01f0fbf8c68a2a8b481726c22d858
-DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
 DIST pysvn-1.9.18.tar.gz 667827 BLAKE2B cd32b4ec55118becd496a9aab6f4dd2b9d57c82e12d5a08b18d36d0caffbafe7066ff45c9493a36499979e759d38dd6b15a68e7bb5819464362c2691e7599160 SHA512 0ca2924223cdc5f29e961e879db6b0f88e82b5c4c40df50169468dd5a72cbccddea9f0d1680ef4a54d45e89b4b2b2c3c22f5e76c66196783a89cac8b583b6623
-EBUILD pysvn-1.9.15-r1.ebuild 1272 BLAKE2B d2ba9aca8484b8006bd6a1c2fd76995123b0e99070817585ba6013261924091c9ec0bbc2932a69e8aa88647a4b885e2444e7b40983e03d497096b709cd98b767 SHA512 1890856b74902478cd993e40034998f4a9e61528f420ee88877a0210474f6f77119189348764dfa4c13a19f9f4510dd4c2737587fb0a78059c9cb9b119d8e9af
 EBUILD pysvn-1.9.18.ebuild 1283 BLAKE2B a113f06f65605a10f21b6eca09bd0af89b80d11e38bce5bb590ded64fe8a068e09b3f7a556011bc326d6a5c1a9865caed6abb78a53f7a385d75b6b63dc297196 SHA512 3d04fb07d6398a9b02315b9e8bafd8cd95d0777be07ffec1e6b5466932db352d40b9db7fc43f2ec7985ca67f877dfb0e7d5284c1e703d497e28248642d963698
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 243 BLAKE2B 4132ce663bce50db1d38951262df3581c535d89fd1e1c93fdfedf56306e5ef58043e5a915f871c76cd90c6e6425948192f384e4c8c20497b31a8a4ef5b90f5d2 SHA512 8f977e63a83b2460455f500646d19ed142090ad20acd5ff08a24d9b39f23e69efe6706834380abbd31cca705e3623b14e482cdd8f8a6323315a08fa11bd54951
diff --git a/dev-python/pysvn/metadata.xml b/dev-python/pysvn/metadata.xml
index 115e9d64a669..70d926f79d7e 100644
--- a/dev-python/pysvn/metadata.xml
+++ b/dev-python/pysvn/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">pysvn</remote-id>
+	</upstream>
 </pkgmetadata>
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 d24d0cde9d51..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_{8..10} )
-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/slimit/Manifest b/dev-python/slimit/Manifest
deleted file mode 100644
index cf11175f639a..000000000000
--- a/dev-python/slimit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX slimit-0.8.1-fix-python3.patch 18813 BLAKE2B d4cdfcce63635ad35ebd7c1c4a42ee9b1d4fba2dea4aac3a97274c98e012b615dbd121413243e1279c00ad731527bf311aa5fe4dc25fa174b5142abb4f990c32 SHA512 fad15e30fea0000f797db6e113ca83d847e412c5906e42d15bf1d8afab857d617403f92b733ebad761cd6182e16e5a8f21081829d2410f9842bd8fa8f093b8e8
-DIST slimit-0.8.1.tar.gz 90096 BLAKE2B 9bf7a00fa7aa48a47950b2db66868c03e3923ed7b878ac4d93bd92becc1909cb79a15365db8185f6d8872028e0d01343394e4c768149155bc6aaeb4acf69954f SHA512 ce33dd15c755b8327a73121322b525738b5f8d83c08b0b6329fa6e090575c68883b4bfa29df04544e5f566f3a81a60e480b5e760e2b0e67644a7db5e25604cc0
-EBUILD slimit-0.8.1-r1.ebuild 898 BLAKE2B 320e76b7d4f63da47a783ce4fafe4411a761060ddcfeacc3765f9ee66ca59c26fbe57f19f03f4bbd058693deb3bfec0934113099bb762dfd12095fd9dd1164f9 SHA512 8afc481fe2fa80962bac21cd8f2eaa2b8f68ea163e98b1fe78778d083e44fe49e7312c783ba933d9f56ef7d37c0d1c40c641e44e35dafaaaf2707c466c6eac7a
-MISC metadata.xml 481 BLAKE2B 539d2ed7bc3fd62c2a8ac890b4e5039ef73a607b3e4211ab482524198e259023eb3e2afcdf1bcd1192503fba960d6f644aaf46d36c0305bad598499694012d79 SHA512 0966a8ba9921fa789d95e8ad99d14a26c4fa80033a94ccbd1733d5ece54d6cad3d545cbc84bb4b5f7509081818ede9c9020d2103b1314ff0c206a4096104e628
diff --git a/dev-python/slimit/files/slimit-0.8.1-fix-python3.patch b/dev-python/slimit/files/slimit-0.8.1-fix-python3.patch
deleted file mode 100644
index a1af2de3dcf0..000000000000
--- a/dev-python/slimit/files/slimit-0.8.1-fix-python3.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From e8331659fb89e8a4613c5e4e338c877fead9c551 Mon Sep 17 00:00:00 2001
-From: Lele Gaifax <lele@metapensiero.it>
-Date: Sun, 9 Feb 2014 09:42:25 +0100
-Subject: [PATCH] Do not use ur"unicode-raw" strings, not supported by Python 3
-
-Use plain unicode strings instead, doubling backslashes when needed.
----
- src/slimit/tests/test_lexer.py |   6 +-
- src/slimit/unicode_chars.py    | 220 ++++++++++++++++++++---------------------
- 2 files changed, 113 insertions(+), 113 deletions(-)
-
-diff --git a/src/slimit/tests/test_lexer.py b/src/slimit/tests/test_lexer.py
-index 922d628..e94d588 100644
---- a/src/slimit/tests/test_lexer.py
-+++ b/src/slimit/tests/test_lexer.py
-@@ -87,8 +87,8 @@ def test_illegal_unicode_char_in_identifier(self):
-          ['ID i', 'ID my_variable_name', 'ID c17', 'ID _dummy',
-           'ID $str', 'ID $', 'ID _', 'ID CamelCase', 'ID class2type']
-          ),
--        (ur'\u03c0 \u03c0_tail var\ua67c',
--         [ur'ID \u03c0', ur'ID \u03c0_tail', ur'ID var\ua67c']),
-+        (u'\u03c0 \u03c0_tail var\ua67c',
-+         [u'ID \u03c0', u'ID \u03c0_tail', u'ID var\ua67c']),
-         # https://github.com/rspivak/slimit/issues/2
-         ('nullify truelie falsepositive',
-          ['ID nullify', 'ID truelie', 'ID falsepositive']),
-@@ -150,7 +150,7 @@ def test_illegal_unicode_char_in_identifier(self):
-         (r"""'\u0001' "\uFCEF" 'a\\\b\n'""",
-          [r"STRING '\u0001'", r'STRING "\uFCEF"', r"STRING 'a\\\b\n'"]
-          ),
--        (ur'"тест строки\""', [ur'STRING "тест строки\""']),
-+        (u'"тест строки\\""', [u'STRING "тест строки\\""']),
-         # Bug - https://github.com/rspivak/slimit/issues/5
-         (r"var tagRegExp = new RegExp('<(\/*)(FooBar)', 'gi');",
-          ['VAR var', 'ID tagRegExp', 'EQ =',
-diff --git a/src/slimit/unicode_chars.py b/src/slimit/unicode_chars.py
-index eec4411..b898138 100644
---- a/src/slimit/unicode_chars.py
-+++ b/src/slimit/unicode_chars.py
-@@ -30,127 +30,127 @@
- # 'Uppercase letter (Lu)', 'Lowercase letter (Ll)',
- # 'Titlecase letter(Lt)', 'Modifier letter (Lm)', 'Other letter (Lo)'
- LETTER = (
--    ur'[\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6'
--    ur'\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376'
--    ur'\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5'
--    ur'\u03F7-\u0481\u048A-\u0523\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA'
--    ur'\u05F0-\u05F2\u0621-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6'
--    ur'\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1'
--    ur'\u07CA-\u07EA\u07F4\u07F5\u07FA\u0904-\u0939\u093D\u0950\u0958-\u0961'
--    ur'\u0971\u0972\u097B-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8'
--    ur'\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1'
--    ur'\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32'
--    ur'\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74'
--    ur'\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3'
--    ur'\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10'
--    ur'\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D'
--    ur'\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99'
--    ur'\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0'
--    ur'\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D'
--    ur'\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8'
--    ur'\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0D05-\u0D0C'
--    ur'\u0D0E-\u0D10\u0D12-\u0D28\u0D2A-\u0D39\u0D3D\u0D60\u0D61\u0D7A-\u0D7F'
--    ur'\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30'
--    ur'\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D'
--    ur'\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB'
--    ur'\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC\u0EDD\u0F00'
--    ur'\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8B\u1000-\u102A\u103F\u1050-\u1055'
--    ur'\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E'
--    ur'\u10A0-\u10C5\u10D0-\u10FA\u10FC\u1100-\u1159\u115F-\u11A2\u11A8-\u11F9'
--    ur'\u1200-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288'
--    ur'\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5'
--    ur'\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F'
--    ur'\u13A0-\u13F4\u1401-\u166C\u166F-\u1676\u1681-\u169A\u16A0-\u16EA'
--    ur'\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C'
--    ur'\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA'
--    ur'\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19A9\u19C1-\u19C7'
--    ur'\u1A00-\u1A16\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF'
--    ur'\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1D00-\u1DBF\u1E00-\u1F15'
--    ur'\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D'
--    ur'\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC'
--    ur'\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071'
--    ur'\u207F\u2090-\u2094\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124'
--    ur'\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E'
--    ur'\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2C6F\u2C71-\u2C7D'
--    ur'\u2C80-\u2CE4\u2D00-\u2D25\u2D30-\u2D65\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6'
--    ur'\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE'
--    ur'\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C'
--    ur'\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D'
--    ur'\u3131-\u318E\u31A0-\u31B7\u31F0-\u31FF\u3400\u4DB5\u4E00\u9FC3'
--    ur'\uA000-\uA48C\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA65F'
--    ur'\uA662-\uA66E\uA67F-\uA697\uA717-\uA71F\uA722-\uA788\uA78B\uA78C'
--    ur'\uA7FB-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873'
--    ur'\uA882-\uA8B3\uA90A-\uA925\uA930-\uA946\uAA00-\uAA28\uAA40-\uAA42'
--    ur'\uAA44-\uAA4B\uAC00\uD7A3\uF900-\uFA2D\uFA30-\uFA6A\uFA70-\uFAD9'
--    ur'\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C'
--    ur'\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F'
--    ur'\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A'
--    ur'\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7'
--    ur'\uFFDA-\uFFDC]'
-+    u'[\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6'
-+    u'\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376'
-+    u'\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5'
-+    u'\u03F7-\u0481\u048A-\u0523\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA'
-+    u'\u05F0-\u05F2\u0621-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6'
-+    u'\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1'
-+    u'\u07CA-\u07EA\u07F4\u07F5\u07FA\u0904-\u0939\u093D\u0950\u0958-\u0961'
-+    u'\u0971\u0972\u097B-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8'
-+    u'\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1'
-+    u'\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32'
-+    u'\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74'
-+    u'\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3'
-+    u'\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10'
-+    u'\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D'
-+    u'\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99'
-+    u'\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0'
-+    u'\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D'
-+    u'\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8'
-+    u'\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0D05-\u0D0C'
-+    u'\u0D0E-\u0D10\u0D12-\u0D28\u0D2A-\u0D39\u0D3D\u0D60\u0D61\u0D7A-\u0D7F'
-+    u'\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30'
-+    u'\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D'
-+    u'\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB'
-+    u'\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC\u0EDD\u0F00'
-+    u'\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8B\u1000-\u102A\u103F\u1050-\u1055'
-+    u'\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E'
-+    u'\u10A0-\u10C5\u10D0-\u10FA\u10FC\u1100-\u1159\u115F-\u11A2\u11A8-\u11F9'
-+    u'\u1200-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288'
-+    u'\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5'
-+    u'\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F'
-+    u'\u13A0-\u13F4\u1401-\u166C\u166F-\u1676\u1681-\u169A\u16A0-\u16EA'
-+    u'\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C'
-+    u'\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA'
-+    u'\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19A9\u19C1-\u19C7'
-+    u'\u1A00-\u1A16\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF'
-+    u'\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1D00-\u1DBF\u1E00-\u1F15'
-+    u'\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D'
-+    u'\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC'
-+    u'\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071'
-+    u'\u207F\u2090-\u2094\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124'
-+    u'\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E'
-+    u'\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2C6F\u2C71-\u2C7D'
-+    u'\u2C80-\u2CE4\u2D00-\u2D25\u2D30-\u2D65\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6'
-+    u'\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE'
-+    u'\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C'
-+    u'\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D'
-+    u'\u3131-\u318E\u31A0-\u31B7\u31F0-\u31FF\u3400\u4DB5\u4E00\u9FC3'
-+    u'\uA000-\uA48C\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA65F'
-+    u'\uA662-\uA66E\uA67F-\uA697\uA717-\uA71F\uA722-\uA788\uA78B\uA78C'
-+    u'\uA7FB-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873'
-+    u'\uA882-\uA8B3\uA90A-\uA925\uA930-\uA946\uAA00-\uAA28\uAA40-\uAA42'
-+    u'\uAA44-\uAA4B\uAC00\uD7A3\uF900-\uFA2D\uFA30-\uFA6A\uFA70-\uFAD9'
-+    u'\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C'
-+    u'\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F'
-+    u'\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A'
-+    u'\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7'
-+    u'\uFFDA-\uFFDC]'
-     )
- 
- NON_SPACING_MARK = (
--    ur'[\u0300-\u036F\u0483-\u0487\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5'
--    ur'\u05C7\u0610-\u061A\u064B-\u065E\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7'
--    ur'\u06E8\u06EA-\u06ED\u0711\u0730-\u074A\u07A6-\u07B0\u07EB-\u07F3'
--    ur'\u0816-\u0819\u081B-\u0823\u0825-\u0827\u0829-\u082D\u0900-\u0902\u093C'
--    ur'\u0941-\u0948\u094D\u0951-\u0955\u0962\u0963\u0981\u09BC\u09C1-\u09C4'
--    ur'\u09CD\u09E2\u09E3\u0A01\u0A02\u0A3C\u0A41\u0A42\u0A47\u0A48'
--    ur'\u0A4B-\u0A4D\u0A51\u0A70\u0A71\u0A75\u0A81\u0A82\u0ABC\u0AC1-\u0AC5'
--    ur'\u0AC7\u0AC8\u0ACD\u0AE2\u0AE3\u0B01\u0B3C\u0B3F\u0B41-\u0B44\u0B4D'
--    ur'\u0B56\u0B62\u0B63\u0B82\u0BC0\u0BCD\u0C3E-\u0C40\u0C46-\u0C48'
--    ur'\u0C4A-\u0C4D\u0C55\u0C56\u0C62\u0C63\u0CBC\u0CBF\u0CC6\u0CCC\u0CCD'
--    ur'\u0CE2\u0CE3\u0D41-\u0D44\u0D4D\u0D62\u0D63\u0DCA\u0DD2-\u0DD4\u0DD6'
--    ur'\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB\u0EBC'
--    ur'\u0EC8-\u0ECD\u0F18\u0F19\u0F35\u0F37\u0F39\u0F71-\u0F7E\u0F80-\u0F84'
--    ur'\u0F86\u0F87\u0F90-\u0F97\u0F99-\u0FBC\u0FC6\u102D-\u1030\u1032-\u1037'
--    ur'\u1039\u103A\u103D\u103E\u1058\u1059\u105E-\u1060\u1071-\u1074\u1082'
--    ur'\u1085\u1086\u108D\u109D\u135F\u1712-\u1714\u1732-\u1734\u1752\u1753'
--    ur'\u1772\u1773\u17B7-\u17BD\u17C6\u17C9-\u17D3\u17DD\u180B-\u180D\u18A9'
--    ur'\u1920-\u1922\u1927\u1928\u1932\u1939-\u193B\u1A17\u1A18\u1A56'
--    ur'\u1A58-\u1A5E\u1A60\u1A62\u1A65-\u1A6C\u1A73-\u1A7C\u1A7F\u1B00-\u1B03'
--    ur'\u1B34\u1B36-\u1B3A\u1B3C\u1B42\u1B6B-\u1B73\u1B80\u1B81\u1BA2-\u1BA5'
--    ur'\u1BA8\u1BA9\u1C2C-\u1C33\u1C36\u1C37\u1CD0-\u1CD2\u1CD4-\u1CE0'
--    ur'\u1CE2-\u1CE8\u1CED\u1DC0-\u1DE6\u1DFD-\u1DFF\u20D0-\u20DC\u20E1'
--    ur'\u20E5-\u20F0\u2CEF-\u2CF1\u2DE0-\u2DFF\u302A-\u302F\u3099\u309A\uA66F'
--    ur'\uA67C\uA67D\uA6F0\uA6F1\uA802\uA806\uA80B\uA825\uA826\uA8C4'
--    ur'\uA8E0-\uA8F1\uA926-\uA92D\uA947-\uA951\uA980-\uA982\uA9B3\uA9B6-\uA9B9'
--    ur'\uA9BC\uAA29-\uAA2E\uAA31\uAA32\uAA35\uAA36\uAA43\uAA4C\uAAB0'
--    ur'\uAAB2-\uAAB4\uAAB7\uAAB8\uAABE\uAABF\uAAC1\uABE5\uABE8\uABED\uFB1E'
--    ur'\uFE00-\uFE0F\uFE20-\uFE26]'
-+    u'[\u0300-\u036F\u0483-\u0487\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5'
-+    u'\u05C7\u0610-\u061A\u064B-\u065E\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7'
-+    u'\u06E8\u06EA-\u06ED\u0711\u0730-\u074A\u07A6-\u07B0\u07EB-\u07F3'
-+    u'\u0816-\u0819\u081B-\u0823\u0825-\u0827\u0829-\u082D\u0900-\u0902\u093C'
-+    u'\u0941-\u0948\u094D\u0951-\u0955\u0962\u0963\u0981\u09BC\u09C1-\u09C4'
-+    u'\u09CD\u09E2\u09E3\u0A01\u0A02\u0A3C\u0A41\u0A42\u0A47\u0A48'
-+    u'\u0A4B-\u0A4D\u0A51\u0A70\u0A71\u0A75\u0A81\u0A82\u0ABC\u0AC1-\u0AC5'
-+    u'\u0AC7\u0AC8\u0ACD\u0AE2\u0AE3\u0B01\u0B3C\u0B3F\u0B41-\u0B44\u0B4D'
-+    u'\u0B56\u0B62\u0B63\u0B82\u0BC0\u0BCD\u0C3E-\u0C40\u0C46-\u0C48'
-+    u'\u0C4A-\u0C4D\u0C55\u0C56\u0C62\u0C63\u0CBC\u0CBF\u0CC6\u0CCC\u0CCD'
-+    u'\u0CE2\u0CE3\u0D41-\u0D44\u0D4D\u0D62\u0D63\u0DCA\u0DD2-\u0DD4\u0DD6'
-+    u'\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB\u0EBC'
-+    u'\u0EC8-\u0ECD\u0F18\u0F19\u0F35\u0F37\u0F39\u0F71-\u0F7E\u0F80-\u0F84'
-+    u'\u0F86\u0F87\u0F90-\u0F97\u0F99-\u0FBC\u0FC6\u102D-\u1030\u1032-\u1037'
-+    u'\u1039\u103A\u103D\u103E\u1058\u1059\u105E-\u1060\u1071-\u1074\u1082'
-+    u'\u1085\u1086\u108D\u109D\u135F\u1712-\u1714\u1732-\u1734\u1752\u1753'
-+    u'\u1772\u1773\u17B7-\u17BD\u17C6\u17C9-\u17D3\u17DD\u180B-\u180D\u18A9'
-+    u'\u1920-\u1922\u1927\u1928\u1932\u1939-\u193B\u1A17\u1A18\u1A56'
-+    u'\u1A58-\u1A5E\u1A60\u1A62\u1A65-\u1A6C\u1A73-\u1A7C\u1A7F\u1B00-\u1B03'
-+    u'\u1B34\u1B36-\u1B3A\u1B3C\u1B42\u1B6B-\u1B73\u1B80\u1B81\u1BA2-\u1BA5'
-+    u'\u1BA8\u1BA9\u1C2C-\u1C33\u1C36\u1C37\u1CD0-\u1CD2\u1CD4-\u1CE0'
-+    u'\u1CE2-\u1CE8\u1CED\u1DC0-\u1DE6\u1DFD-\u1DFF\u20D0-\u20DC\u20E1'
-+    u'\u20E5-\u20F0\u2CEF-\u2CF1\u2DE0-\u2DFF\u302A-\u302F\u3099\u309A\uA66F'
-+    u'\uA67C\uA67D\uA6F0\uA6F1\uA802\uA806\uA80B\uA825\uA826\uA8C4'
-+    u'\uA8E0-\uA8F1\uA926-\uA92D\uA947-\uA951\uA980-\uA982\uA9B3\uA9B6-\uA9B9'
-+    u'\uA9BC\uAA29-\uAA2E\uAA31\uAA32\uAA35\uAA36\uAA43\uAA4C\uAAB0'
-+    u'\uAAB2-\uAAB4\uAAB7\uAAB8\uAABE\uAABF\uAAC1\uABE5\uABE8\uABED\uFB1E'
-+    u'\uFE00-\uFE0F\uFE20-\uFE26]'
-     )
- 
- COMBINING_SPACING_MARK = (
--    ur'[\u0903\u093E-\u0940\u0949-\u094C\u094E\u0982\u0983\u09BE-\u09C0\u09C7'
--    ur'\u09C8\u09CB\u09CC\u09D7\u0A03\u0A3E-\u0A40\u0A83\u0ABE-\u0AC0\u0AC9'
--    ur'\u0ACB\u0ACC\u0B02\u0B03\u0B3E\u0B40\u0B47\u0B48\u0B4B\u0B4C\u0B57'
--    ur'\u0BBE\u0BBF\u0BC1\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCC\u0BD7\u0C01-\u0C03'
--    ur'\u0C41-\u0C44\u0C82\u0C83\u0CBE\u0CC0-\u0CC4\u0CC7\u0CC8\u0CCA\u0CCB'
--    ur'\u0CD5\u0CD6\u0D02\u0D03\u0D3E-\u0D40\u0D46-\u0D48\u0D4A-\u0D4C\u0D57'
--    ur'\u0D82\u0D83\u0DCF-\u0DD1\u0DD8-\u0DDF\u0DF2\u0DF3\u0F3E\u0F3F\u0F7F'
--    ur'\u102B\u102C\u1031\u1038\u103B\u103C\u1056\u1057\u1062-\u1064'
--    ur'\u1067-\u106D\u1083\u1084\u1087-\u108C\u108F\u109A-\u109C\u17B6'
--    ur'\u17BE-\u17C5\u17C7\u17C8\u1923-\u1926\u1929-\u192B\u1930\u1931'
--    ur'\u1933-\u1938\u19B0-\u19C0\u19C8\u19C9\u1A19-\u1A1B\u1A55\u1A57\u1A61'
--    ur'\u1A63\u1A64\u1A6D-\u1A72\u1B04\u1B35\u1B3B\u1B3D-\u1B41\u1B43\u1B44'
--    ur'\u1B82\u1BA1\u1BA6\u1BA7\u1BAA\u1C24-\u1C2B\u1C34\u1C35\u1CE1\u1CF2'
--    ur'\uA823\uA824\uA827\uA880\uA881\uA8B4-\uA8C3\uA952\uA953\uA983\uA9B4'
--    ur'\uA9B5\uA9BA\uA9BB\uA9BD-\uA9C0\uAA2F\uAA30\uAA33\uAA34\uAA4D\uAA7B'
--    ur'\uABE3\uABE4\uABE6\uABE7\uABE9\uABEA\uABEC]'
-+    u'[\u0903\u093E-\u0940\u0949-\u094C\u094E\u0982\u0983\u09BE-\u09C0\u09C7'
-+    u'\u09C8\u09CB\u09CC\u09D7\u0A03\u0A3E-\u0A40\u0A83\u0ABE-\u0AC0\u0AC9'
-+    u'\u0ACB\u0ACC\u0B02\u0B03\u0B3E\u0B40\u0B47\u0B48\u0B4B\u0B4C\u0B57'
-+    u'\u0BBE\u0BBF\u0BC1\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCC\u0BD7\u0C01-\u0C03'
-+    u'\u0C41-\u0C44\u0C82\u0C83\u0CBE\u0CC0-\u0CC4\u0CC7\u0CC8\u0CCA\u0CCB'
-+    u'\u0CD5\u0CD6\u0D02\u0D03\u0D3E-\u0D40\u0D46-\u0D48\u0D4A-\u0D4C\u0D57'
-+    u'\u0D82\u0D83\u0DCF-\u0DD1\u0DD8-\u0DDF\u0DF2\u0DF3\u0F3E\u0F3F\u0F7F'
-+    u'\u102B\u102C\u1031\u1038\u103B\u103C\u1056\u1057\u1062-\u1064'
-+    u'\u1067-\u106D\u1083\u1084\u1087-\u108C\u108F\u109A-\u109C\u17B6'
-+    u'\u17BE-\u17C5\u17C7\u17C8\u1923-\u1926\u1929-\u192B\u1930\u1931'
-+    u'\u1933-\u1938\u19B0-\u19C0\u19C8\u19C9\u1A19-\u1A1B\u1A55\u1A57\u1A61'
-+    u'\u1A63\u1A64\u1A6D-\u1A72\u1B04\u1B35\u1B3B\u1B3D-\u1B41\u1B43\u1B44'
-+    u'\u1B82\u1BA1\u1BA6\u1BA7\u1BAA\u1C24-\u1C2B\u1C34\u1C35\u1CE1\u1CF2'
-+    u'\uA823\uA824\uA827\uA880\uA881\uA8B4-\uA8C3\uA952\uA953\uA983\uA9B4'
-+    u'\uA9B5\uA9BA\uA9BB\uA9BD-\uA9C0\uAA2F\uAA30\uAA33\uAA34\uAA4D\uAA7B'
-+    u'\uABE3\uABE4\uABE6\uABE7\uABE9\uABEA\uABEC]'
-     )
- 
--COMBINING_MARK = ur'%s|%s' % (NON_SPACING_MARK, COMBINING_SPACING_MARK)
-+COMBINING_MARK = u'%s|%s' % (NON_SPACING_MARK, COMBINING_SPACING_MARK)
- 
- CONNECTOR_PUNCTUATION = (
--        ur'[\u005F\u203F\u2040\u2054\uFE33\uFE34\uFE4D-\uFE4F\uFF3F]'
-+        u'[\u005F\u203F\u2040\u2054\uFE33\uFE34\uFE4D-\uFE4F\uFF3F]'
-         )
- 
- DIGIT = (
--    ur'[\u0030-\u0039\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F'
--    ur'\u09E6-\u09EF\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0BE6-\u0BEF'
--    ur'\u0C66-\u0C6F\u0CE6-\u0CEF\u0D66-\u0D6F\u0E50-\u0E59\u0ED0-\u0ED9'
--    ur'\u0F20-\u0F29\u1040-\u1049\u1090-\u1099\u17E0-\u17E9\u1810-\u1819'
--    ur'\u1946-\u194F\u19D0-\u19DA\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59'
--    ur'\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\uA620-\uA629\uA8D0-\uA8D9'
--    ur'\uA900-\uA909\uA9D0-\uA9D9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19]'
-+    u'[\u0030-\u0039\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F'
-+    u'\u09E6-\u09EF\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0BE6-\u0BEF'
-+    u'\u0C66-\u0C6F\u0CE6-\u0CEF\u0D66-\u0D6F\u0E50-\u0E59\u0ED0-\u0ED9'
-+    u'\u0F20-\u0F29\u1040-\u1049\u1090-\u1099\u17E0-\u17E9\u1810-\u1819'
-+    u'\u1946-\u194F\u19D0-\u19DA\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59'
-+    u'\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\uA620-\uA629\uA8D0-\uA8D9'
-+    u'\uA900-\uA909\uA9D0-\uA9D9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19]'
-     )
diff --git a/dev-python/slimit/metadata.xml b/dev-python/slimit/metadata.xml
deleted file mode 100644
index 1623da04bf76..000000000000
--- a/dev-python/slimit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>paolo.pedroni@iol.it</email>
-		<name>Paolo Pedroni</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">slimit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/slimit/slimit-0.8.1-r1.ebuild b/dev-python/slimit/slimit-0.8.1-r1.ebuild
deleted file mode 100644
index d402ab74e3ea..000000000000
--- a/dev-python/slimit/slimit-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="A JavaScript minifier written in Python"
-HOMEPAGE="https://slimit.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/rspivak/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${P}-fix-python3.patch" )
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-
-	rm "${BUILD_DIR}"/lib/slimit/*tab.py || die
-
-	# Regenerate yacctab.py and lextab.py files to avoid warnings whenever
-	# the module is imported. See https://github.com/rspivak/slimit/issues/97
-	# for details
-	"${EPYTHON}" -B -c 'import slimit;slimit.minify("")' || die
-}
-
-python_test() {
-	epytest "${BUILD_DIR}"
-}
diff --git a/dev-python/uncertainties/Manifest b/dev-python/uncertainties/Manifest
index ad86dac58656..104bba806459 100644
--- a/dev-python/uncertainties/Manifest
+++ b/dev-python/uncertainties/Manifest
@@ -1,3 +1,3 @@
 DIST uncertainties-3.1.7.tar.gz 158727 BLAKE2B d68b74d291b1f6c4505a47f6fa19653eade43dc1ccaf78e02bd320df92d8bdaeac1b0808a21dceb046a6e2acd076836728b4014d39ca8da17647582320ce50e8 SHA512 24576415265df22459d83bb28e632195e6760204a6e11523821afe25222ea3e035bf7f10c552ec456bb2cdf42a09e296865f9bf0d13ff44beb88c11ebc479ff9
-EBUILD uncertainties-3.1.7.ebuild 702 BLAKE2B 08dd0d8fb9f14520ab47bc862556c91e5531409cec036155afd4917e5f9d220d602c7b7a9dbb0fcc63733200191a9264779f966851eded2d972c1e1f43b5c7fe SHA512 b9fa68d3bfde459f4e18795b5fceff4447e42dba2c2c1941a563d23b4bf48d3ff33d1fd83b2f01203810da4cba8f738a779912c95d2d8fbbd3ed2dc6a0b98820
-MISC metadata.xml 967 BLAKE2B 9a034d38b92f106bd05fff4c4e30830dd76ff91af3c6e9a7709a84f9ade8d9ad1b51979c45537a98e6088cb7c7a187aec37c64256a750389131f12d1b7361451 SHA512 c6fd9c00ca9f320ed433308918e1f0917c7548817b1ea4dbcf50044854e473c6657300550fb7aff0cd3b68be5c26622a4fe5a7995155485f1588e658ab51b7a8
+EBUILD uncertainties-3.1.7-r1.ebuild 895 BLAKE2B 9944677e52b745d94bf5baf1f46d336069dcd44661f8f55f94a48c162dd0b188f69b839bdf2c3c4bc1e042f834fc98df486006db51a953a72facd2f6c1c39fcb SHA512 824afefb1e35110daca33a332e8e3e0db84f0dd693c6ac14904fdc782404953f788d86637c5dbc899b58f20e29bd9e21c743fc9aaab6a2c71e4bf37427c0ba2e
+MISC metadata.xml 1030 BLAKE2B 7f3e44920c1d05ca25974f1167804d21e0280221ba73b07a759284f7fdd77b62a02037df2275d6a7709ea37113b78fb0fb2034c99e7247dd55262176125451e2 SHA512 961c7fc2f96b9ea0694fd6283f1ba54903c500f2d78c00957f908ba369ecbd7850c429e12bb35ec29b07ff807ae648ba1b37e2b6b82b5c9cb9935badafdc76ec
diff --git a/dev-python/uncertainties/metadata.xml b/dev-python/uncertainties/metadata.xml
index 7c343d7bf1e7..86cdd1f286cc 100644
--- a/dev-python/uncertainties/metadata.xml
+++ b/dev-python/uncertainties/metadata.xml
@@ -21,6 +21,7 @@
  are what is predicted by error propagation theory.    
   </longdescription>
   <upstream>
+    <remote-id type="github">lebigot/uncertainties</remote-id>
     <remote-id type="pypi">uncertainties</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/uncertainties/uncertainties-3.1.7.ebuild b/dev-python/uncertainties/uncertainties-3.1.7-r1.ebuild
index c7f85704f3f1..93177ac576f4 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_{8..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-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 35028b9baf71..42ae45f12433 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
deleted file mode 100644
index 4a10e55e45a4..000000000000
--- a/dev-ruby/gherkin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gherkin-5.1.0.gem 29696 BLAKE2B 2439b82a147a546e8df71e11996f9560a8720580e07795542fc81781449b483a42e54251f3d0dd3482331773b1cada1d61b468bfcec2a9464ee2542eef2ed13e SHA512 d935ccceaec493736f337a4c3db69909858d15f4c41e93ecfc6ca31a30fc48eec1cecbe71d455265e1062006f49f05461c9860c9b3cc4806bb25f42dec6f504e
-EBUILD gherkin-5.1.0.ebuild 567 BLAKE2B 989921fcd295f60a8840907ec6cf5453dc9098d3ede27337936ed8363bec24cdfba31709ff497cf8ebf948db95c262cbfc46431d16b62444f00509836d0b3070 SHA512 85993ec22ec039d8d83905deffb371cd7fa6675c9966f673ac3919551591678ca5452173e689a262fa4238e60385337447c6231bcc609c6cb8dc99c4fb9a0ceb
-MISC metadata.xml 343 BLAKE2B 56593cc21ed9e4232941cade2cc9bf904b5f15707991ab624633547e51b0cb8246639cac506743694b4f9898976404e6fb7796a4c64a443d522d6f3cb4f15113 SHA512 9681a006f6dbfc4ce958845c686d2651d253b198e1afc9b2862a47a8c4f75fa52f0e6059cf53c418880e380a024636bc813cefce7bd9fe22d277fcade1d9a84f
diff --git a/dev-ruby/gherkin/gherkin-5.1.0.ebuild b/dev-ruby/gherkin/gherkin-5.1.0.ebuild
deleted file mode 100644
index fb6de66d1c2e..000000000000
--- a/dev-ruby/gherkin/gherkin-5.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-# Don't install support scripts to avoid slot collisions.
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast Gherkin lexer and parser"
-HOMEPAGE="https://github.com/cucumber/gherkin"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-SLOT="5"
-IUSE=""
diff --git a/dev-ruby/gherkin/metadata.xml b/dev-ruby/gherkin/metadata.xml
deleted file mode 100644
index 0dedc164975c..000000000000
--- a/dev-ruby/gherkin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">cucumber/gherkin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 253e40cf5312..789293f61e1d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 8d11de059076..4c31d36fcbc7 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,11 +1,7 @@
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
-DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875350b5f2ec6676f6a6167e9bbc6b759c8cc0a29a6774877d3ab2f1c95954d83dbfe3e79669cc8968c1c533ec SHA512 ff89846b805267e2a4bff394c8285b9227d40a2cd93a7ca8fdf8cd6d38a3b2144d5e96b0bd1cef94714df630ad7a779d609e05585c671371124b400130f3b3b4
-DIST aruba-1.1.2.tar.gz 132680 BLAKE2B 328c012eccfb988eec280a102da94150d1811fc67816c09aa2b94f1b6a06ca68e21cd4612e87fba089f4eb9f3b90716cfe121bda306936eeb53019cec539e651 SHA512 58f658c118fe83ddfbb6c361ab3ce6ae5e6084e4233dba62350eba1c911d8ad0558d1ca604206691d097a48453d608042bd992730b92971cdd3d2475d8f6ca4e
 DIST aruba-2.0.0.tar.gz 132762 BLAKE2B b06190d3a1698c5a2d295df16096b2bd587c60a9c428d35e8ad24204b71b7a3d86f5b52a5f601f57204903412508faad3d4032f1499d78a309a99df63e8a68e5 SHA512 214de8dd3dd29b46ddac2605bab5008ac9d9755eef53c140aea5f160aba60ed9ac71ac5e1410f59700ddd8a506faedf6b54d99682c875faeaecbb47ad8660435
 DIST aruba-2.1.0.tar.gz 130073 BLAKE2B 534bc67cbc4b5871a1bc6e37170586b3a5829e70d611dde9fe130a4cfdce98044c1a3fe29de961419a605eb4bbe8e21b8efb52a61aa8a2d2b2b9fa7e42bd3169 SHA512 f30d67ba94157eaf0477a09f4049174ff0cd6195b92c4121117775e56502178525eb5a7f69148e7f5531d6d4e67f4ecd9d840e693c38340a10819a19247021fa
 EBUILD aruba-0.6.2-r2.ebuild 967 BLAKE2B 6a11fa4ca7af64f825b1251d470190a64608279aa1f2735e1ffd458479e22e9ffa6739bef16d3e714cab5ec53a16fd31401d1a47c675538a5fe8b2480d48204b SHA512 c922d4e5a19162aefb55b4415547222d1b799bcb7f239e6e9167a96349c76804b569829b60f91289e781c1dd4211361ac7b3ef547be92a8b35712dd5075b6916
-EBUILD aruba-1.0.3-r1.ebuild 1968 BLAKE2B 1423a47057cd55850ddffa55a807832d6c88a3d6c52b40151e6722f7b06c2486c6757286f184528e34b962ad39e87ff4853f94fa3422febf8c79b67529ba7fad SHA512 145d0ea4cc31df24758d3baa19567b82fc68a2a890034d3e03fc64ade8ea262954796c96f421bf77e45de6d79cd4db99cb59a25d26e71fa79c4680e18c35c897
-EBUILD aruba-1.1.2-r1.ebuild 1948 BLAKE2B 3350e24d20c4de6d9738efb11424e6963df85112e66286166285f81d7e100fea21e6d2e779ea3ba454b6345e51ba4ebb31374f14450de5d7f2af792c09f3f324 SHA512 a48b19aa3574fe8263224fd7b927ceb0201ac0baf57e9871c5ac1e886664f34f17e8fe7c1068f8fe57a8c08287af14ccb82f5880900a059761d15cf33237f2da
 EBUILD aruba-2.0.0.ebuild 2018 BLAKE2B a8cd9a16001d387a95bbcd76dc1d82aee2e36f907c8ed344d3bdef8055ef6987b0f01149c23100bb14bd4102e6ef7ad44d6c9003aacc1961f44f1e1e35cfd946 SHA512 a464afc8ce044abc9905999bd32187b7ec253a396cc0c6f34bf14c674870dde9386e39a05146ef58e2c00db60e5f12116564f180c2bc7e7fff41c9063a7035a3
 EBUILD aruba-2.1.0.ebuild 2108 BLAKE2B 0c66771968dd4cbbf2117bf342a418421d990e75dc781bb3400ae25d51c3f8ee5884da166331d24adeb10d9930faa920940dc3572ccc04a40dc586fc58bb7ba0 SHA512 3dcbd4b1e4673c2d74626080dd96866d41941e5014abd23b52fcc13518bff1f9c71becbdb35833be131da0bf942885158afb12cf6598599619bda27809a5f9d9
 MISC metadata.xml 297 BLAKE2B 013e79bd25020910ff023586ed3e1349ee1dcbf195b73c230133775c2fe031794f91fd7e54d4df43bfc61de716f452492f2b7af3ba7dbf7e04cf4a47ac16a00d SHA512 c57a4e881304d3bdc2001d4f221ec7d4789223fa36b104271ec9a2439e7730ccbfd349b16209ac6a59fe782618b14423cf3b7b345ef2a7d4944a535eaed75c9a
diff --git a/dev-util/aruba/aruba-1.0.3-r1.ebuild b/dev-util/aruba/aruba-1.0.3-r1.ebuild
deleted file mode 100644
index c9d582ff382c..000000000000
--- a/dev-util/aruba/aruba-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber steps for driving out command line applications"
-HOMEPAGE="https://github.com/cucumber/aruba"
-SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5
-	>=dev-ruby/contracts-0.16.0:0
-	>=dev-ruby/ffi-1.9
-	>=dev-ruby/rspec-expectations-3.4:3
-	dev-ruby/thor:1
-	>=dev-util/cucumber-2.4 <dev-util/cucumber-6"
-
-ruby_add_bdepend "test? ( dev-ruby/pry dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	# Remove bundler-related code.
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
-	rm Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/Before/,/^end/ s:^:#:' \
-		spec/spec_helper.rb features/support/env.rb || die
-	rm -f features/support/simplecov_setup.rb || die
-
-	sed -e "s:_relative ': './:" \
-		-e 's/git ls-files -z/find -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid features with minor output differences
-	sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
-	sed -i -e '/Failed detection of exact multi-line output/i@wip' features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature || die
-	sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
-
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
-}
diff --git a/dev-util/aruba/aruba-1.1.2-r1.ebuild b/dev-util/aruba/aruba-1.1.2-r1.ebuild
deleted file mode 100644
index 0d5d922bf2ac..000000000000
--- a/dev-util/aruba/aruba-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber steps for driving out command line applications"
-HOMEPAGE="https://github.com/cucumber/aruba"
-SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_rdepend "
-	=dev-ruby/bundler-2*
-	>=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5
-	>=dev-ruby/contracts-0.16.0:0 <dev-ruby/contracts-0.18:0
-	>=dev-ruby/rspec-expectations-3.4:3
-	dev-ruby/thor:1
-	>=dev-util/cucumber-2.4 <dev-util/cucumber-7"
-
-ruby_add_bdepend "test? ( dev-ruby/pry dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	# Remove bundler-related code.
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
-	rm Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/Before/,/^end/ s:^:#:' \
-		spec/spec_helper.rb features/support/env.rb || die
-	rm -f features/support/simplecov_setup.rb || die
-
-	sed -e 's:_relative ": "./:' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid features with minor output differences
-	sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
-	sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
-
-	# Avoid feature that requires aruba to be installed already
-	rm -r features/03_testing_frameworks/cucumber/disable_bundler.feature || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
-}
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index 11dbf92388c4..9b7240ee0ee3 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,9 +1,3 @@
-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
-EBUILD buildbot-badges-3.4.0.ebuild 929 BLAKE2B 4d55fd1681ffde007d5d7c0447ca0996d3a65f4640ee9680fc7f9073b62301c85590c408bc7e47234a9ad4f1320ec128c57776bed60e15c90cfa79b6d62c13cf SHA512 7f51477aaac9468a6010a3481efe7a10eec3033aac36b5b0dbd9e2498bb4b359311590a833633dc02ac9a64d69ff9b84e83b5bdd4ebaa6fae318bdeb2803fb1b
-EBUILD buildbot-badges-3.5.0.ebuild 929 BLAKE2B 4d55fd1681ffde007d5d7c0447ca0996d3a65f4640ee9680fc7f9073b62301c85590c408bc7e47234a9ad4f1320ec128c57776bed60e15c90cfa79b6d62c13cf SHA512 7f51477aaac9468a6010a3481efe7a10eec3033aac36b5b0dbd9e2498bb4b359311590a833633dc02ac9a64d69ff9b84e83b5bdd4ebaa6fae318bdeb2803fb1b
-EBUILD buildbot-badges-3.6.0.ebuild 929 BLAKE2B 4d55fd1681ffde007d5d7c0447ca0996d3a65f4640ee9680fc7f9073b62301c85590c408bc7e47234a9ad4f1320ec128c57776bed60e15c90cfa79b6d62c13cf SHA512 7f51477aaac9468a6010a3481efe7a10eec3033aac36b5b0dbd9e2498bb4b359311590a833633dc02ac9a64d69ff9b84e83b5bdd4ebaa6fae318bdeb2803fb1b
 EBUILD buildbot-badges-3.6.1.ebuild 929 BLAKE2B 4d55fd1681ffde007d5d7c0447ca0996d3a65f4640ee9680fc7f9073b62301c85590c408bc7e47234a9ad4f1320ec128c57776bed60e15c90cfa79b6d62c13cf SHA512 7f51477aaac9468a6010a3481efe7a10eec3033aac36b5b0dbd9e2498bb4b359311590a833633dc02ac9a64d69ff9b84e83b5bdd4ebaa6fae318bdeb2803fb1b
 MISC metadata.xml 762 BLAKE2B bad3590966f17a1a4f25b1b382be72f6e2a1ce77c5a0a806fb878b9d20d9c30dec6ea493a530e0aedaefe2dcc964fe7397e752f38a00f9feb2c8ee372d541c9a SHA512 f3936f9cedb5c400740e691833ee030996e61f0f9e6e7661adc5ace37f415c2d456092137a5d14cf792089387177499a36be0bdd53188676b699a829bfc21c24
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 37e3828ead37..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_{8..10} )
-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 37e3828ead37..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_{8..10} )
-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 37e3828ead37..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_{8..10} )
-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 02a8104b1dfa..58e921a471ae 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,9 +1,3 @@
-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
-EBUILD buildbot-console-view-3.4.0.ebuild 720 BLAKE2B a3f51e619f183f83855fd10efac13e7f3c2e182788ada0089f56dac4559319f63ba4d91df34de4802aa1140a4d4d0b68fec87ef427ec395c89f302bc9d92cec8 SHA512 9809463fedb463807372b89228cc648f427196e463ce213def6c14ab36b05a1bc58197ae5367cb027887971075d8b970f16f32fe747c5a4d12feb35184986981
-EBUILD buildbot-console-view-3.5.0.ebuild 720 BLAKE2B a3f51e619f183f83855fd10efac13e7f3c2e182788ada0089f56dac4559319f63ba4d91df34de4802aa1140a4d4d0b68fec87ef427ec395c89f302bc9d92cec8 SHA512 9809463fedb463807372b89228cc648f427196e463ce213def6c14ab36b05a1bc58197ae5367cb027887971075d8b970f16f32fe747c5a4d12feb35184986981
-EBUILD buildbot-console-view-3.6.0.ebuild 720 BLAKE2B a3f51e619f183f83855fd10efac13e7f3c2e182788ada0089f56dac4559319f63ba4d91df34de4802aa1140a4d4d0b68fec87ef427ec395c89f302bc9d92cec8 SHA512 9809463fedb463807372b89228cc648f427196e463ce213def6c14ab36b05a1bc58197ae5367cb027887971075d8b970f16f32fe747c5a4d12feb35184986981
 EBUILD buildbot-console-view-3.6.1.ebuild 720 BLAKE2B a3f51e619f183f83855fd10efac13e7f3c2e182788ada0089f56dac4559319f63ba4d91df34de4802aa1140a4d4d0b68fec87ef427ec395c89f302bc9d92cec8 SHA512 9809463fedb463807372b89228cc648f427196e463ce213def6c14ab36b05a1bc58197ae5367cb027887971075d8b970f16f32fe747c5a4d12feb35184986981
 MISC metadata.xml 661 BLAKE2B 00812636b1e2bf2b7d604a540ed1982e891894f38d8fa256bd954a693f6ff4b203c9a6cf8a2d4b67288b489a362a661b072de042dd3f62cf3d596ef14049e35c SHA512 1f905f5810e7a216e73e942fe2cb42302010fdb19078f20ee95a20555e2b2f0e13e29b3cf326d0a546bfc78e4d610d402199acbb915fc0b57ff55be3c402ec2b
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 5b7624cd297c..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_{8..10} )
-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 5b7624cd297c..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_{8..10} )
-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 5b7624cd297c..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_{8..10} )
-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 ec1e114a2381..559ea1072c3b 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,9 +1,3 @@
-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
-EBUILD buildbot-grid-view-3.4.0.ebuild 700 BLAKE2B 5786d88489beefb9743c24bb8358a15fa727abff3db1c1e3b74bf433b958fe8d89491c2a2080981ac3549afd8318646ee295295d9365a8210e25d6b16f959657 SHA512 fe5efc116d6eb48fd16addc7f360949d672d68f24f11843d588e2e396f7a7b8951c581e2aab140d1c5458295e5bc45368439112094f2be8aebe04256c537f12d
-EBUILD buildbot-grid-view-3.5.0.ebuild 700 BLAKE2B 5786d88489beefb9743c24bb8358a15fa727abff3db1c1e3b74bf433b958fe8d89491c2a2080981ac3549afd8318646ee295295d9365a8210e25d6b16f959657 SHA512 fe5efc116d6eb48fd16addc7f360949d672d68f24f11843d588e2e396f7a7b8951c581e2aab140d1c5458295e5bc45368439112094f2be8aebe04256c537f12d
-EBUILD buildbot-grid-view-3.6.0.ebuild 700 BLAKE2B 5786d88489beefb9743c24bb8358a15fa727abff3db1c1e3b74bf433b958fe8d89491c2a2080981ac3549afd8318646ee295295d9365a8210e25d6b16f959657 SHA512 fe5efc116d6eb48fd16addc7f360949d672d68f24f11843d588e2e396f7a7b8951c581e2aab140d1c5458295e5bc45368439112094f2be8aebe04256c537f12d
 EBUILD buildbot-grid-view-3.6.1.ebuild 700 BLAKE2B 5786d88489beefb9743c24bb8358a15fa727abff3db1c1e3b74bf433b958fe8d89491c2a2080981ac3549afd8318646ee295295d9365a8210e25d6b16f959657 SHA512 fe5efc116d6eb48fd16addc7f360949d672d68f24f11843d588e2e396f7a7b8951c581e2aab140d1c5458295e5bc45368439112094f2be8aebe04256c537f12d
 MISC metadata.xml 640 BLAKE2B 22ccf767dae88664f3da52b44a6cc1d7abe93e282db0bccd6fc7bcd20bad2719b3cbc0ae75a7a72baf6a542908e7155026d7fdf1fa6976b165129110e348e11a SHA512 d6c7605dc32e3fc40690a45b8bfc70fd73e82e07ddcd49d94503254c25f5d532fc21ce79b94a37fc0a1fd023f5632065c35e946f0d48bc802c051f04a5dcaf81
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 32ac344a514e..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_{8..10} )
-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 32ac344a514e..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_{8..10} )
-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 32ac344a514e..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_{8..10} )
-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 35372b3d5259..70667eff2e6a 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,9 +1,3 @@
-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
-EBUILD buildbot-pkg-3.4.0.ebuild 904 BLAKE2B 1cc28b279fabe652fa139e915877b970b93f3f9be1a7c565957995cc66de1f1c0bf49b091befbf403812a24241b23d3fc382f0de0cdc7f18de6c574939b565f6 SHA512 63d6097dcb833f15518feec342e99ea1127ad6e9084556799dbae55871555c96c6929750beb00c97feb81a733ce418d260663aaee8c2bccb8f1b7f5c5276b05c
-EBUILD buildbot-pkg-3.5.0.ebuild 904 BLAKE2B 1cc28b279fabe652fa139e915877b970b93f3f9be1a7c565957995cc66de1f1c0bf49b091befbf403812a24241b23d3fc382f0de0cdc7f18de6c574939b565f6 SHA512 63d6097dcb833f15518feec342e99ea1127ad6e9084556799dbae55871555c96c6929750beb00c97feb81a733ce418d260663aaee8c2bccb8f1b7f5c5276b05c
-EBUILD buildbot-pkg-3.6.0.ebuild 904 BLAKE2B 1cc28b279fabe652fa139e915877b970b93f3f9be1a7c565957995cc66de1f1c0bf49b091befbf403812a24241b23d3fc382f0de0cdc7f18de6c574939b565f6 SHA512 63d6097dcb833f15518feec342e99ea1127ad6e9084556799dbae55871555c96c6929750beb00c97feb81a733ce418d260663aaee8c2bccb8f1b7f5c5276b05c
 EBUILD buildbot-pkg-3.6.1.ebuild 904 BLAKE2B 1cc28b279fabe652fa139e915877b970b93f3f9be1a7c565957995cc66de1f1c0bf49b091befbf403812a24241b23d3fc382f0de0cdc7f18de6c574939b565f6 SHA512 63d6097dcb833f15518feec342e99ea1127ad6e9084556799dbae55871555c96c6929750beb00c97feb81a733ce418d260663aaee8c2bccb8f1b7f5c5276b05c
 MISC metadata.xml 1199 BLAKE2B 1eb102f71e83b2d11adff2f92f08614715428508b83042358d054babd4cd7f5bb63ef0e289fd9e60360111dccbd734422215b6f8a9811198f62c30cb82612566 SHA512 545c227af17fe4492aff85837e948769001d281dc40cbfdb5a74663dc5fde6989df632aab9a6f5cda644fd20f385d36469ec38b930bb42bfb61483c1c5e46faa
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 4d4e95e9196c..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_{8..10} )
-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 4d4e95e9196c..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_{8..10} )
-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 4d4e95e9196c..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_{8..10} )
-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 f41f5a1aba7a..81875ec9bf5a 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,9 +1,3 @@
-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
-EBUILD buildbot-waterfall-view-3.4.0.ebuild 759 BLAKE2B 0c1b064d404368d586b8f558e80465cc6dc055f048c1d8415854370b82eaf31677199c770281f8aab61bbc411e2f7454d1b638757aff10ff354842dacf58f295 SHA512 ad93403e653dc3a347717758ef2241a2bc2d345f0bda249ca914d3e93f156c805a8db7ffa3e6ef4fdbcdcf461bb9861a270c05dc60428f769d44df842b3972e5
-EBUILD buildbot-waterfall-view-3.5.0.ebuild 759 BLAKE2B 0c1b064d404368d586b8f558e80465cc6dc055f048c1d8415854370b82eaf31677199c770281f8aab61bbc411e2f7454d1b638757aff10ff354842dacf58f295 SHA512 ad93403e653dc3a347717758ef2241a2bc2d345f0bda249ca914d3e93f156c805a8db7ffa3e6ef4fdbcdcf461bb9861a270c05dc60428f769d44df842b3972e5
-EBUILD buildbot-waterfall-view-3.6.0.ebuild 759 BLAKE2B 0c1b064d404368d586b8f558e80465cc6dc055f048c1d8415854370b82eaf31677199c770281f8aab61bbc411e2f7454d1b638757aff10ff354842dacf58f295 SHA512 ad93403e653dc3a347717758ef2241a2bc2d345f0bda249ca914d3e93f156c805a8db7ffa3e6ef4fdbcdcf461bb9861a270c05dc60428f769d44df842b3972e5
 EBUILD buildbot-waterfall-view-3.6.1.ebuild 759 BLAKE2B 0c1b064d404368d586b8f558e80465cc6dc055f048c1d8415854370b82eaf31677199c770281f8aab61bbc411e2f7454d1b638757aff10ff354842dacf58f295 SHA512 ad93403e653dc3a347717758ef2241a2bc2d345f0bda249ca914d3e93f156c805a8db7ffa3e6ef4fdbcdcf461bb9861a270c05dc60428f769d44df842b3972e5
 MISC metadata.xml 681 BLAKE2B f74bd19772210f0ffbc45a54aa06a05c97c11bcc18a76ca621e4761d36f690bd0d1ce926b744e3b6c0dc83fd3bd709a2bbc7dc53c63c0364cd0e82bafaf0620f SHA512 37b2205043cbbfdf019b0a827494d28693e3e0537cad6fca6a1e46cccd3a6779f5b9244f2b9523953ae07238e8b8c90da00cf5061f8e6d54895c06c447137fb4
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 591aebc7cf5b..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_{8..10} )
-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 591aebc7cf5b..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_{8..10} )
-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 591aebc7cf5b..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_{8..10} )
-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 ab97a71f568c..8e6d788c2810 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -5,13 +5,7 @@ AUX buildbot_worker.service 296 BLAKE2B 2f557007489fa0d7c355dfcd12388c405fca269c
 AUX buildbot_worker.target 149 BLAKE2B 93902e53b76a09aac472280df295fd4aafe19aca634c90d170b98030def1f4c9beb1b33cecfe8d917581d4ec39919b6a8fbba7b89d6b745d254dcdabcfbd4b40 SHA512 5c5736b8f5bdff412c57971216b4559ea6582c7a3495762d7896eb89b1839a17827ea5396edfe6e43e7d9ec4d78fa1da34584a4589e38cd38aae26968703ce92
 AUX buildbot_worker_at.service 343 BLAKE2B 6fed117fe1e5478ef3d2fb1bfeac92fd9b9e9b50c6d184b05f13a8847acc74d461eb4ea7797c01366c1c340950dbd07e06683897095b992c3d01e263dd7b7192 SHA512 41c250e31ad0fdbb13830ed4ae0563572ac7edd7c037728cbad943e1d3f82559c41529993edddb922d46c20f7eaa7e7781f5ed1c548f7ed07bb7520e5e3019f8
 AUX buildbot_worker_at.service.conf 154 BLAKE2B 20323a777b44200c5a73278a10804169c64e07a5c2fc8695eb49339d1ba415b06324db6ae3084aa4fa6cfd1a684e4f41fb4b73436fa4305314faf9e5da485a9c SHA512 5fd61d4436652a927af9788799bb9f8b7a66baadc0bf486c9bbe171a5cd9ec8457719bdda45f911d5b0620db8fb4c494c75e2b2fd69951ee4dc83119dd7d6628
-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
-EBUILD buildbot-worker-3.4.0.ebuild 4644 BLAKE2B a934c87f28b81ab622e0ffcfb3e0e0636722b6d6ea0066fb9aedeb57b9f61857891007584bbcbcc1306b8454616f8a8c241def5467732818e54988e234ef4905 SHA512 a08935e46cb9bcd9ecf76a0e5e4cf94a31f5a27a4d22d94d9ab19e86e6ed163082b36d507d76be8e3692ae4278081d0d60aa8ed0d09b44e53939ad9050be6c0a
-EBUILD buildbot-worker-3.5.0-r1.ebuild 4820 BLAKE2B d56eb4bda74894de2a6130c5c87db55242e686f4ecc54d718a2c51f24500a61af92bbdf4e0c35b146f766ddcf6f065397158783d9da0ca4f493ab48fbd2e831c SHA512 33344be29c8aed20cc78a82563959d3881de5a3d1bc102018dc9539c39539cf3854cc2182d2534a4c671179ea54d27f179270c1708efdb97a454c125fa3e6683
-EBUILD buildbot-worker-3.6.0.ebuild 4820 BLAKE2B b3a98bb98922bd4f02b58e599e836e083ba156493f566ad37cb618d9a998fcfb96c3ed2246c38507ede4db4fcd98a305177b4636371514f1a06e95b96c157291 SHA512 683e621a440a3a7e99dde21bfd9897bf8e35a49dc2cc236a5612f8d45a2d20bf702019ca79146355c7dad1b6a10e5925e0eb25bfff584d27c981465606e902f5
-EBUILD buildbot-worker-3.6.1.ebuild 5280 BLAKE2B 58804ec7aacc6bd6ceb9930c714db5217137cf589df63bc850a9020645e80d137d7e2f1910df5eb174605fc9c561b62a358527add9b4e46b66ca9acd3c744443 SHA512 4172fd249064256bf9d5d06e33f72192d4a090bab89da689c9817923922b91704297140b1ee491e00a3236bcc56ff93aad11aa8e48eb0df9350e21b5c2e78b69
+EBUILD buildbot-worker-3.6.1-r2.ebuild 5280 BLAKE2B 58804ec7aacc6bd6ceb9930c714db5217137cf589df63bc850a9020645e80d137d7e2f1910df5eb174605fc9c561b62a358527add9b4e46b66ca9acd3c744443 SHA512 4172fd249064256bf9d5d06e33f72192d4a090bab89da689c9817923922b91704297140b1ee491e00a3236bcc56ff93aad11aa8e48eb0df9350e21b5c2e78b69
 EBUILD buildbot-worker-9999.ebuild 4937 BLAKE2B a98951fdbe07f022192a007be96cea17828a931ff4ff1be3326a95ed0c34bcda55949109627ed3a54f371ff08efbe02324a9e4aea7e35d23462fcd706de0c628 SHA512 5826a317217af4825f9fc59e57fb851767245a600947742dee28a3c2ec280f3936ac0b4a4f4757434ed16164ac6e3a461775f1a86bba00c477fb3fc7d4684ccc
 MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
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 e80a110a2894..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_{8..10} )
-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 2a3f7714573d..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_{8..10} )
-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 34360f39c453..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_{8..10} )
-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-r2.ebuild
index e2d1ed832b13..e2d1ed832b13 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.6.1-r2.ebuild
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 5f281102d9c6..a1b709d16720 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,9 +1,3 @@
-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
-EBUILD buildbot-wsgi-dashboards-3.4.0.ebuild 744 BLAKE2B 3fd09fab4929e3bb190370108cc583fe2df25514c79d60b16a332f516782a32cad2ea1c0a0e52a8e7b3c1e9e1327b536d18269cdb21d61c7f4bd16edf9303958 SHA512 b3a3e3e987888f539f2374e698042ad4f2a1ebb9c77f4921c75255964b469a393859220b56eae830830f5575ce58fcb2b5ae9dd627b81a5e3a203799ada10346
-EBUILD buildbot-wsgi-dashboards-3.5.0.ebuild 744 BLAKE2B 3fd09fab4929e3bb190370108cc583fe2df25514c79d60b16a332f516782a32cad2ea1c0a0e52a8e7b3c1e9e1327b536d18269cdb21d61c7f4bd16edf9303958 SHA512 b3a3e3e987888f539f2374e698042ad4f2a1ebb9c77f4921c75255964b469a393859220b56eae830830f5575ce58fcb2b5ae9dd627b81a5e3a203799ada10346
-EBUILD buildbot-wsgi-dashboards-3.6.0.ebuild 744 BLAKE2B 3fd09fab4929e3bb190370108cc583fe2df25514c79d60b16a332f516782a32cad2ea1c0a0e52a8e7b3c1e9e1327b536d18269cdb21d61c7f4bd16edf9303958 SHA512 b3a3e3e987888f539f2374e698042ad4f2a1ebb9c77f4921c75255964b469a393859220b56eae830830f5575ce58fcb2b5ae9dd627b81a5e3a203799ada10346
 EBUILD buildbot-wsgi-dashboards-3.6.1.ebuild 744 BLAKE2B 3fd09fab4929e3bb190370108cc583fe2df25514c79d60b16a332f516782a32cad2ea1c0a0e52a8e7b3c1e9e1327b536d18269cdb21d61c7f4bd16edf9303958 SHA512 b3a3e3e987888f539f2374e698042ad4f2a1ebb9c77f4921c75255964b469a393859220b56eae830830f5575ce58fcb2b5ae9dd627b81a5e3a203799ada10346
 MISC metadata.xml 680 BLAKE2B b3fea763f6f493b0fb8be5e0408f80b295a5d205c5d01443e3a47965a5c982dbcc8e1f806978b0d8939e31ffeaa425590f9be8d5b563f0c064d700b1f33343be SHA512 01aeda23d466d40dc4c2bf7668595795fb6f743930c168549f259fd2a6e0f3491044079ef039096d030dec48ebb2bf3977bb5084264381675984cf43e063e083
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 b67bfb3e65bf..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_{8..10} )
-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 b67bfb3e65bf..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_{8..10} )
-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 b67bfb3e65bf..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_{8..10} )
-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 7449e78dc8e7..41dbf29aadac 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,9 +1,3 @@
-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
-EBUILD buildbot-www-3.4.0.ebuild 715 BLAKE2B 0335bd4910cbfa25181f900c9ccdc1d4c16f9e71e097b246e1450359b7b38c118e871cd904d3bc921d7ce315d6180aa653a8269c5866807d1099de6b079edb0c SHA512 b6cc81a73694d0cbedc22945708c1ebd391389e3492dd9ab4441d44b88fcd0d5c8b16936b70bba3a3dcf5bba5c659d2047e9bd149c581ba61f4b17b654966275
-EBUILD buildbot-www-3.5.0.ebuild 715 BLAKE2B 0335bd4910cbfa25181f900c9ccdc1d4c16f9e71e097b246e1450359b7b38c118e871cd904d3bc921d7ce315d6180aa653a8269c5866807d1099de6b079edb0c SHA512 b6cc81a73694d0cbedc22945708c1ebd391389e3492dd9ab4441d44b88fcd0d5c8b16936b70bba3a3dcf5bba5c659d2047e9bd149c581ba61f4b17b654966275
-EBUILD buildbot-www-3.6.0.ebuild 715 BLAKE2B 0335bd4910cbfa25181f900c9ccdc1d4c16f9e71e097b246e1450359b7b38c118e871cd904d3bc921d7ce315d6180aa653a8269c5866807d1099de6b079edb0c SHA512 b6cc81a73694d0cbedc22945708c1ebd391389e3492dd9ab4441d44b88fcd0d5c8b16936b70bba3a3dcf5bba5c659d2047e9bd149c581ba61f4b17b654966275
 EBUILD buildbot-www-3.6.1.ebuild 715 BLAKE2B 0335bd4910cbfa25181f900c9ccdc1d4c16f9e71e097b246e1450359b7b38c118e871cd904d3bc921d7ce315d6180aa653a8269c5866807d1099de6b079edb0c SHA512 b6cc81a73694d0cbedc22945708c1ebd391389e3492dd9ab4441d44b88fcd0d5c8b16936b70bba3a3dcf5bba5c659d2047e9bd149c581ba61f4b17b654966275
 MISC metadata.xml 667 BLAKE2B 10cb0032009c616e55be86ca788abf9b643890605d456b71636b40b0b9591136270a2d30227d3b06854ddce18a7697a3326233cf6da0e1386af4f8102d8d53bc SHA512 d024b9e5148003c7d0d20c82d25bd376006d4c2d8bdd8d58c865f6f35a252333618ec3964a5af1baf63ba9ac7fd5b49fca4c65438066512a016804ef85032256
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 7834a034d6b5..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_{8..10} )
-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 7834a034d6b5..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_{8..10} )
-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 7834a034d6b5..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_{8..10} )
-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 7526a7c97ac7..52895571b719 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -3,13 +3,7 @@ AUX buildmaster.initd 1651 BLAKE2B 49012bf396862e28af3abcec1669bac93cfa4a60ae889
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
-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
-EBUILD buildbot-3.4.0-r1.ebuild 6653 BLAKE2B 8fc9cb4df5e6581771e89e91084d6679c67eb0b73c166c4a564920895767d7e9ec6fae53bd2631a56220baefb32e2d8cc8e686a36f29734702a88f107f37da57 SHA512 63dd31de86215b66f24cdcfd109e85ad3736060cae8439f04478a56d2bc53a5aa31e70faa0c7beb56dcce2dd6b1e79906e3d31846ff63795d9e9a093f8f38131
-EBUILD buildbot-3.5.0-r1.ebuild 6653 BLAKE2B e85f66fb8b27f230f24b932f348c2cd858d1b36ef8ca71f1db49747b85b407a4aef5e1c672f516315a5d118798cedc0bc84ecd85db9728cc4ca8489616eba76c SHA512 871cdc749948f80c7913e1d74f2b2341ef6688332be9979559acee835b0a6537d54897006ef1dea3b81feec74b7e90c7a1dd349626d1f8c70028741123cbb62f
-EBUILD buildbot-3.6.0.ebuild 6653 BLAKE2B 833bbcc0185d9ff6edba1807e3b79f6a7c3ff5ff08e914dfae925805b07b4eca0795f2ea69eb37550ebc3b2533cd841ca7fad5cec542224744a2df97a3b7ffb6 SHA512 f45af0cbcb10ea496301dd4329d2c394122ba5e3c3169a85c1daf083742de481c0ab44f7a624a5545a20daeb99b2b18d11cabe3a13d0ff7c49e19a10a42c31ec
 EBUILD buildbot-3.6.1.ebuild 6646 BLAKE2B 2f48622efa22f8273b976ef88abf888b770de8c2db6fb91b63e07538b50a1dfdff1eebdc62b4176d723969b9f028c048144ced39c0f2427402242f7bdca72b7b SHA512 b901c20cff21d8f4c3c4785690716672b64fc36cbaa6cda4e706aa35c87ca14c43fb6271290bd2fe2846f1fc565b7b8cdec51d08b786cd329c2bc30848b97313
 EBUILD buildbot-9999.ebuild 6525 BLAKE2B b490dc02be9125945d6b8a81f26d433488e0356aa67270ee43716543274979064ff76ceaf3c5eaaba90492108dc3e859ee8c64bfe3ffe8465aa96d54b4c16986 SHA512 4f13b80b3161cc4e60bf195c5668cc8436af9aa25893834816ad20dc5217b4c031df916c575ed7b4aaf7709c8f53b6b66af2efdba2f9bdb6a3099d5e466df22e
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
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 2805b245be55..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_{8..10} )
-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 38fdc881f1a2..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_{8..10} )
-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 63802dfa22aa..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_{8..10} )
-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/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 5baacebc95b6..862b8dc79928 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,7 +1,5 @@
 DIST cucumber-core-10.1.1.tar.gz 202764 BLAKE2B c5704ed4821d056aea7bf537c7193bb8965be5a6d0effad0f85f76c18e62acf7a2de981da05826fbd27c1e55122ba3ca9873729332a9840280d1638838af27c9 SHA512 c7c4de1c53a58b74e632019a9a69b3bac164da72ee3cef839d19c9548707c06ddac5e562013ca86992ca3d78ad96f23521ff69de83b3e9e614a336cc3d6ba9a6
 DIST cucumber-core-11.0.0.tar.gz 202792 BLAKE2B a85074a9bad6b91dcb2b409eee6162efed6890868b762ebd221ea2ab383a029eb7d7f605813e6e73f6bcbf4c526ffb94f26e7338e6cfdd94abf28d631bbd989e SHA512 fd2cb97d72f24e5a5c00336e4243594270546225a027ee23907256d81fdc9be01c017a4d25dea85727ca834a6d3e3fb1ae003357cf530eab9d44fc211d52f331
-DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
 EBUILD cucumber-core-10.1.1.ebuild 965 BLAKE2B 589c45d5dfad2f50c4d948c4cafd529b74efd3860c296dfe2c9e9da7e8e4e8d7aa6437350b2623748e5811bc11e4d709f4046523377be186b7ae0a27d0b4086a SHA512 09d741ea5c891b9428a3f5f6b22847c52e075a1fda813b60612182317edc7612a67b76c99cec3fd2e6056a854df4d1841a40843e7009572e3501e313d19ea7fe
 EBUILD cucumber-core-11.0.0.ebuild 979 BLAKE2B 6113d1c8719a56016275e56f5dbfcf274fd6664b71367b58c2449fe4dcbf0015bfc84aa94bdb3eb8e905dd02a19cea51490676c9dfc7a8cc72be67716e62396f SHA512 1e35ea81d37be62fde802309cd2f7bfc7168c95f726ac38f000e7175bd8ff5524f16246afac4d50009672fdd42c54db9a74d4e19f535b96c74bf7b27913cd318
-EBUILD cucumber-core-3.2.1.ebuild 1036 BLAKE2B 5974f4b5f2e4b10fc89b934e92917e95f500c07334d2d25ff06000f7cb626ff5412446765dee220def380ba8c17beede6778feff8471d80a70af0ded394a5110 SHA512 0063cd60aff9789447e75df8af18e6c1f736505aa124489617811f57a1dbd96387ade525d3273da06987e5596e5ca917e75dc5ed5e28d3a3953da02ac077475f
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
deleted file mode 100644
index 112f5bef7876..000000000000
--- a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-core-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-SLOT="$(ver_cut 1-2)"
-IUSE="test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/unindent-1.0
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/backports-3.8.0
-	>=dev-util/cucumber-tag_expressions-1.1.0
-	dev-ruby/gherkin:5
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
-	rm -f spec/readme_spec.rb || die
-
-	sed -i -e '1igem "gherkin"' $(find spec -name "*_spec.rb") || die
-}
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
deleted file mode 100644
index b8ff91b66d94..000000000000
--- a/dev-util/cucumber-expressions/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
-EBUILD cucumber-expressions-6.0.1.ebuild 457 BLAKE2B cd304a9f2061bab870bf07c9f4becfbb30da6b9d99bcf4e5718276c2481b5e489c799e901bfd6f27419cddfcd9c33b85e2b9c51c07786b4cd207d64b828a43a9 SHA512 ea7f1de3c983d02d6baf74053d9bb5c49c319096ebaf453f542dfbcd11718067b44c4c68f8a93ba86159b2b7f33547a5a8aa9259fc9c38f28a0bb26c7eb79290
-MISC metadata.xml 300 BLAKE2B a639d71f26516f07d45281d1036eed4e67653b41ad4644ebee63601681a288f8de93effc46f684df4d152eb2914abfaeb745045b075127d36c1bcc6bdc67d1c7 SHA512 27af0d39315115a4483da0c3d2d84ee4c7fba5891ef61ba06c776b86bf068c4a60e3766fc8c1c522402480543919434910decee43b3847bbdcce556cd91f8473
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
deleted file mode 100644
index 3982a7b68085..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="MIT"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-SLOT="6.0"
diff --git a/dev-util/cucumber-expressions/metadata.xml b/dev-util/cucumber-expressions/metadata.xml
deleted file mode 100644
index cc917e33f5f1..000000000000
--- a/dev-util/cucumber-expressions/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cucumber/cucumber</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
deleted file mode 100644
index 9e150d5fd1bb..000000000000
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
-EBUILD cucumber-tag_expressions-1.1.1.ebuild 444 BLAKE2B e48497332320230c09aea81609d4f82a2e312c4069b00b728314f45826323d37942b37ae50d48c88ca2f47b6973a8b6204dcc76409320a35d0faa98773e938d0 SHA512 8efc5a060873af1dfa1707fc22394d17e151acebedfaa98d2eaecf0bcff3c8d18d8b8eef2bc6dd2b36343a7d59623961afe6396da391492ae8f4e575f3b108e3
-MISC metadata.xml 300 BLAKE2B a639d71f26516f07d45281d1036eed4e67653b41ad4644ebee63601681a288f8de93effc46f684df4d152eb2914abfaeb745045b075127d36c1bcc6bdc67d1c7 SHA512 27af0d39315115a4483da0c3d2d84ee4c7fba5891ef61ba06c776b86bf068c4a60e3766fc8c1c522402480543919434910decee43b3847bbdcce556cd91f8473
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
deleted file mode 100644
index 50f2df52ed61..000000000000
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="MIT"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-SLOT="1"
diff --git a/dev-util/cucumber-tag_expressions/metadata.xml b/dev-util/cucumber-tag_expressions/metadata.xml
deleted file mode 100644
index cc917e33f5f1..000000000000
--- a/dev-util/cucumber-tag_expressions/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cucumber/cucumber</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 3a69e9197f79..582d24d85c1c 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,5 +1,3 @@
-DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
 DIST cucumber-wire-6.2.1.gem 12800 BLAKE2B 2a34fa803748499b2bceb270cd1532ce3373f416a8c6d7039b0f55b1f2bc94e9fdd8ce12f8d5f23d4d172ba70cd00b43bbc0629b72e5d5bd1dc55861cf732bb2 SHA512 b32d0f72a31b400ca1596b126d8566aae2ea49514ecd292c621d0d1624f66465dfcac1a6d80293dd15829a00f4080d54190680ede60d7c1c23d2cfec450d1cf3
-EBUILD cucumber-wire-0.0.1-r1.ebuild 493 BLAKE2B 3b26c3323530d510aec5a5071a20fd5e379f63c998f5a3fb608832c2fda89910e07b77f5f7e690954b3600d314e1a238073d123aabcc2248e91b4d64dee431e0 SHA512 2867c63cf53b26a4b6644bbaf6437f351efe4c9b6309353e502cf615fdac732bf9d39d8e216cd12fe664c38a65ea34b466922ca639d389a2f110610f3ed38d0f
 EBUILD cucumber-wire-6.2.1.ebuild 630 BLAKE2B 2938ef4a589ffb09aeb335e3d943078995cbca1eb75a50e03b9ba157342cc5ef41fd68fb678422dba8f0212a85485bbfb5ef31011220cdfb52f8ae2dedd4e2b8 SHA512 520a58a0e874fb9830d0df470d47cf3e5fbdcdaedfff6d72911c01718c6fa4701d7d0608eed9f4ac640c3e4d26b3037935db89864f2e3ac724006dfdca04e7fe
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
deleted file mode 100644
index 41837bf5e35b..000000000000
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-util/protobuf-cucumber/Manifest b/dev-util/protobuf-cucumber/Manifest
deleted file mode 100644
index ed720b3d6e94..000000000000
--- a/dev-util/protobuf-cucumber/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST protobuf-cucumber-3.10.8.gem 236544 BLAKE2B e81636fc06fbed54dc67def3d4d1c445a971d861e3dcd99aa406e137b858734d995100c76d33a6d00b6ec9584d8dbb8f1d05424e73d0f35a3d196cfb70ffc561 SHA512 904b3b6f0564a9db61c1b8e3aef10fe666dd602cf09c43c32241e908695b2f144be5e9ee094a21a07c43354ecaa3c9006ff62aa0e6f6ad2688b72bb9a40538a9
-EBUILD protobuf-cucumber-3.10.8-r1.ebuild 1014 BLAKE2B c47fc78644bbfd14e7e750c54908ad9bae1fa43beac96ac1f9985e263b80f6c08ff04da82e9c879de516eb2f406e1522d4fbd3eae09791a6469455014f3073be SHA512 474165466d6cfa7ee5eef3509c74441e13d52647443a5fe15048f48776f1b6b65614d26c17979676dd909e7588b725a8afd7073a2f0670d5f67b0b65b726b5b6
-MISC metadata.xml 305 BLAKE2B bb7ab120fe337a703088786a7e00a58896ba13b13ea3282e1f6e86a5d5d02d7769294d22a4f4f855ca498a7aaddd6f72afa059bb85f2630415455f329376db9c SHA512 c21190b85d3d2b1e439597ce04115c2bbe1e1baec66885c445e9987eec0648182cd488701760565bd4e6bda23b89e7942a6ee323ac34786d9f9a05db378573eb
diff --git a/dev-util/protobuf-cucumber/metadata.xml b/dev-util/protobuf-cucumber/metadata.xml
deleted file mode 100644
index 388add16003d..000000000000
--- a/dev-util/protobuf-cucumber/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-protobuf/protobuf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8-r1.ebuild b/dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8-r1.ebuild
deleted file mode 100644
index 52f124e5f5fd..000000000000
--- a/dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Google Protocol Buffers serialization and RPC implementation for Ruby"
-HOMEPAGE="https://github.com/ruby-protobuf/protobuf"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-3.2:*
-	dev-ruby/middleware
-	dev-ruby/thor:*
-	dev-ruby/thread_safe
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/timecop
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|pry\)/I s:^:#:' Rakefile spec/spec_helper.rb || die
-
-	# Avoid unpackaged optional dependency
-	rm -f spec/lib/protobuf/rpc/connectors/{ping,zmq}_spec.rb spec/functional/zmq_server_spec.rb || die
-	rm -rf spec/lib/protobuf/rpc/servers/zmq || die
-	sed -i -e '/context .zmq/,/^      end/ s:^:#:' spec/lib/protobuf/cli_spec.rb || die
-}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index cc1f7e317833..782cf4ed414f 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/xgamer/Manifest b/games-util/xgamer/Manifest
deleted file mode 100644
index 43449ea90a6c..000000000000
--- a/games-util/xgamer/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xgamer-0.6.2-desktopfile.patch 236 BLAKE2B 9d4cc7ce26065fd9692f9348347ae0b816021970811b1ac2471692b6b60d357139794501b23a04eb95080b63850ea35f0166b54c7debe6640fe071d4ecadd6eb SHA512 d2c378c955358067883ebe845be3f183ec2c0f52a712e0548dc80a8f0d12b38baea0ef57674fd7897c4102cbc1f24d48034dc7fd3fe814a1271a2961bdcd9210
-AUX xgamer-0.6.2-perl526.patch 284 BLAKE2B 8d2f85e21ab5ff7b189ee38a04a9e8fb52462cb50de2b12f44e49510d87d354164a0e3dc4ae27beb318d4c2f07a64cc3b0b7d819a7193f59f043230dc3fbe953 SHA512 54b3662ef1fc054ec7316529617320cabd400f1d7357d986d577c2049e9f27e543affd797eecb685761a3f982d17deabfb126261c5704bd79325e0e395578ca3
-DIST xgamer-0.6.2.tar.gz 43222 BLAKE2B cc5d4ea8505966a3312f7fed77088112e1015f61f2c0a7547dee15ecff232fb1a6b0175ac79348dba4d2bcf3172199b8d3caaa03da8c0889c6d0597d2e0047fa SHA512 caffebe5d4f07f532366e3a5f6ff717251f254d012bb5c33c431538720a2fa301ab8b9cf277771659655cac6fbe2734534146c224ef881486f7dfc51ac992315
-EBUILD xgamer-0.6.2-r1.ebuild 855 BLAKE2B 961924e76eafb469b9d6a4bfc5992717df64d36fe02d2f3ca55daa3e15cbb972de3bc0d094fe036c81d65a14f2b056a175c797dff41af16483c86ee76b924d8b SHA512 c9f6ac03bb739adc977a5786477f7d3e4326777d039e9dcf312e7cd86271b604a99157e3586294b736054e370094a01212b16d2e491264ecb7aff7aed6716d96
-MISC metadata.xml 330 BLAKE2B d44a87b8ed802d6e9487d66c1c6c37558bc3028874b57695a5eceee157f0d5402995d1d0373efbef3e180cab5ae2bc9d314629c7e3d1de4c0a14c7089a2ae164 SHA512 9cdb3d9cc2304bc16d69020353170cebd25aa1987f18b6d113a6d6d46087dbe69b8c0fed5bb7bdbc95b2883bf872635165e8da6d6762cf4b4f8539af8201123b
diff --git a/games-util/xgamer/files/xgamer-0.6.2-desktopfile.patch b/games-util/xgamer/files/xgamer-0.6.2-desktopfile.patch
deleted file mode 100644
index 3639de18e5e1..000000000000
--- a/games-util/xgamer/files/xgamer-0.6.2-desktopfile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xgamer/share/applications/xgamer.desktop
-+++ xgamer/share/applications/xgamer.desktop
-@@ -5,6 +5,6 @@
- Icon=xgamer
- StartupNotify=true
- Terminal=false
--Categories=GTK;Game
-+Categories=GTK;Game;
- Name=XGamer
- Comment=X Game Launcher
diff --git a/games-util/xgamer/files/xgamer-0.6.2-perl526.patch b/games-util/xgamer/files/xgamer-0.6.2-perl526.patch
deleted file mode 100644
index d59ba05263fb..000000000000
--- a/games-util/xgamer/files/xgamer-0.6.2-perl526.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN xgamer.orig/Build.PL xgamer/Build.PL
---- xgamer.orig/Build.PL	2012-09-21 17:23:27.000000000 +0200
-+++ xgamer/Build.PL	2017-07-08 20:33:44.566199833 +0200
-@@ -2,7 +2,8 @@
-  
- use strict;
- use warnings;
-- 
-+
-+use lib q[.]; 
- use inc::MyBuilder;
- use File::Spec::Functions;
-  
diff --git a/games-util/xgamer/metadata.xml b/games-util/xgamer/metadata.xml
deleted file mode 100644
index fc0d1bc575ec..000000000000
--- a/games-util/xgamer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">xgamer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/xgamer/xgamer-0.6.2-r1.ebuild b/games-util/xgamer/xgamer-0.6.2-r1.ebuild
deleted file mode 100644
index 5e9550c89395..000000000000
--- a/games-util/xgamer/xgamer-0.6.2-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=8
-
-inherit optfeature perl-module
-
-DESCRIPTION="A launcher for starting games in a second X session"
-HOMEPAGE="https://code.google.com/p/xgamer/"
-SRC_URI="https://xgamer.googlecode.com/files/${P}.tar.gz"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-lang/perl-5.10
-	>=x11-libs/gtk+-2.18:2
-	>=dev-perl/Gtk2-1.120
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	dev-perl/File-BaseDir
-	dev-perl/XML-Twig
-	dev-perl/glib-perl
-	x11-misc/numlockx
-	media-gfx/feh"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-perl/Module-Build"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-desktopfile.patch
-	"${FILESDIR}"/${P}-perl526.patch
-)
-
-pkg_postinst() {
-	optfeature "Integrates well for window management" x11-wm/openbox
-}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index e4e53bcf4dcc..bc8ac5fd3657 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/greetd/Manifest b/gui-libs/greetd/Manifest
index d51a6c2e5fc8..fc6d4d96a2e4 100644
--- a/gui-libs/greetd/Manifest
+++ b/gui-libs/greetd/Manifest
@@ -41,5 +41,5 @@ DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD greetd-0.8.0.ebuild 2069 BLAKE2B f32f83d3fddb59d530a020230803001dd209cb19a610ca458938fd67921cd7fd6f1e268425ea1d8a7059454fc0ff9990adec22a66e8ab524b9f9084b31a771e8 SHA512 4186a26287fbb737b32f3aed7d8286b745da88a881f2480f8dddab81d780ab301d3f8fb458061890d2d25bc170d0d9716e4aa5a30b616b2f1c2424e114e5e65c
+EBUILD greetd-0.8.0.ebuild 2235 BLAKE2B 00a9b76862ae16ec22dbe7b8f661fa8ede169b1eec4b38eed731e8c34803fc61901870e0e55bcd87e5c7adc652333919df00a12206dff74babb11ed311df5c8e SHA512 48a2caf51d6cf40501fbccc9a6ccf253b18b683587913330ac2ddb1f6229809e2c7973a2bc4ca2500784f95df8fc2579ac5bed6a1d4f23487cfd49dc573e0dff
 MISC metadata.xml 532 BLAKE2B 9157fee140b5ace151886ef0c534569be06beee4ac32330c93ee42c241e400fa5969c6d24630f53a324210966c22866881a459f073de0ceef9fc6c7ba8b889e8 SHA512 8411b426f1c09cfefc36fa3336deb383ba2bdd0914534db3e8f6cdb1c2ef914f9920c21a8d29eed6c6613c915d2105f3a4e09c1d5bfa3a0c6ed74f23f3e54c2c
diff --git a/gui-libs/greetd/greetd-0.8.0.ebuild b/gui-libs/greetd/greetd-0.8.0.ebuild
index 6ce509d028ae..3f805ab02280 100644
--- a/gui-libs/greetd/greetd-0.8.0.ebuild
+++ b/gui-libs/greetd/greetd-0.8.0.ebuild
@@ -88,7 +88,10 @@ src_compile() {
 }
 
 src_install() {
-	dobin target/release/{agreety,fakegreet,greetd}
+	# if USE=debug, install binaries from the debug directory; else
+	# install binaries from the release directory
+	# https://bugs.gentoo.org/889052
+	dobin target/$(usex debug debug release)/{agreety,fakegreet,greetd}
 
 	insinto /etc/greetd
 	doins config.toml
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index e9d6999208c5..e1dfdac0a0e0 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 6a30eb1fa0ce..4b97a3b9a6ee 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -13,5 +13,5 @@ DIST Mail-SpamAssassin-3.4.6.tar.bz2 6166807 BLAKE2B aa25c9e81f570d35e8594ba6d6d
 DIST Mail-SpamAssassin-4.0.0.tar.bz2 6371055 BLAKE2B 86f2167f6250a10a6bf871cc291f63ee9ee2d853b4183a637b4267e6979209196155be1b26e5e5b1093cf63841f9819a249de65e7002414a7e790ee1b67e5206 SHA512 a0fe5f6953c9df355bfa011e8a617101687eb156831a057504656921fe76c2a4eb37b5383861aac579e66a20c4454068e81a39826a35eb0266148771567bad5f
 DIST Mail-SpamAssassin-4.0.0.tar.bz2.asc 833 BLAKE2B 44170d411d9eb656d67bf4080807ad3c3fd9eff9f2eadadadbfde828e542bc57b5cdcfb062c7f210be4d721bdf9cf85aec9b1fb491076165453b000b47990f0d SHA512 b87a80d2b0b802f52df75e485878c53cc4fad52935ca2b14b1b06e46d334b52c673e66d61cc2155b5e812fa6a486f8e61f6a87794be2524acea1fd8ac42e7d6a
 EBUILD spamassassin-3.4.6-r2.ebuild 9839 BLAKE2B 3cfc005672dcf0ef16ad03dfe7316555b8623fcd2ef3a7a89f4921bf99da3a90e73b090207936091d467dfcaf5b956f27c2844fbca0762e25eec40aeb2aeef45 SHA512 28d27a5e1a14f9f2559731508c0c6114a3c4741e32c86a617a065c686ce094fb3c04c3372c3d87e24c7bcfbdb1421474af3af2966593066735c44dfd32c67b40
-EBUILD spamassassin-4.0.0.ebuild 10110 BLAKE2B 3ce46ff0f2181c1caf71380cf11d26382a3c2701081132de19ae6935e7d3e27ad5d0ee1d284717aac0f5101e4c277365e4c9a1bedc1bd0660a539b4f4b7123b0 SHA512 3040cce1c2c8d219b2659cef7bde42155481d9cc35301b15163f81b2cd351a1cbf23bfc366b6a53aa517ecc19c26b9057c8433a3c5124988d0431794c6d27b2e
+EBUILD spamassassin-4.0.0.ebuild 10136 BLAKE2B bb9c9666d857a0d1889841bea597470bbd53a62cd4b6f84a75950fccf5be3b3f96ec2653b170ddd9e6c56eb3899d26a2762ed87df88310fb0e604c93416bbfd7 SHA512 7bf4ff52632671e4500f84e736f4406ac410e3d27f5d7db14b3e20d2bdb88bf0ef579156576e64f38651629beee850cfe0be49a5eaf3294fc91ad1dd0622c1e2
 MISC metadata.xml 698 BLAKE2B 09a986c93fde495aceb1370ed7440e2d141d83a3b631e050d09571441637029d5beda9fed264d6d65fe094c99fc27c91a6ba350f55d6aa6136c484b2acbd874b SHA512 1bd90e2b4339e685ebc4af7ddd6f371cebd566610fe8cc256c5bf3d120ae9bb527da633c38fff9a9e1dbd7b4949ccd78dab6cb1016311ee23e143426ed61e515
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
index 7cbf5b0773e8..56f0b5d24c82 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 5236f1488855..297172d8909b 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 3e018d6792df..3b4fd73d4763 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -17,6 +17,6 @@ DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a8
 DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
-EBUILD netqmail-1.06-r14.ebuild 4304 BLAKE2B 3f76458c2a06a2cc8a8d65403a68a0e765e8cabc922f7809f8c70fcd09bd59e7a43410df96948fcc4d0b4926613e396d43be376386685a6a114c6a1f5207bd6d SHA512 89a0da991e4e28c6ef9b21e0ee5c61167a21e42edb080377a9b55fa7ffe5f7ac7a58dc45f7f71de81a6b873dc5a2d29f7e993546967893ea9e448f0d7134ec00
-EBUILD netqmail-1.06-r16.ebuild 4299 BLAKE2B 78f50319d1af44ce29c4c431549bd65562736732419ff8955ac3f84c36322141bb3832e9d0a65d178f737119a9dc21082c82a20f54f63436b153b199abee312a SHA512 911e5a19e52816ca86bb64fd216dda26ab99b2a517c2fcc354aaff1176e4d2c61119dbe765c3e41d3ed0fd179a8b3f43a97dbdc556ea642dd21e8a2e479c2a23
+EBUILD netqmail-1.06-r14.ebuild 4257 BLAKE2B 5d34c3c79efea985e3b83b521cbbdca8f1033ee9f825ede55432dc54a6bda2a147b07340b7947b29fa018ab5be9f637ade57e3ffafbe5cfebbcfd3527f8d4fb3 SHA512 b632ac8de6e27d923ce2d683a423697730c27d68352d314ec42f9dd88b7c012cedc7ba0076d39b17c5bb90b9c47c98616279bdfa0f0887fad549d9ffe78de82b
+EBUILD netqmail-1.06-r16.ebuild 4252 BLAKE2B a11f12b96633bb3c5f48922338019f0de54b00756d64456b75c7837c9abc1eb82babc98fc0134df375f3b48cb2502470eeace1cd08bf3f0495bcfa7661808e5b SHA512 c736d063e6638fd04d3e00b99dd8910c0a7ef6d0e57dbbb43f6d522bea64e6224736886d01a8f268658da4d0ac016d7a513c37bf68888603b3bbfce069604f2c
 MISC metadata.xml 751 BLAKE2B 7c0193a46c76729399440e8f40b9779fa78ac271df7d10320fdfe3ae626b16e764621eda348df7f83a8e4aff937e860cd84147c267061beb53313c18f1c2472b SHA512 6d6d1130e64a8b7ece04841047a80287bfe2c60b9ffc3517435bb5750961ee254877b7563fa4ddb939a66d3a8559ebf3ffe3f856c02de0f1397c66d62a0c3183
diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index e1f204048728..de1b07a4b18c 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
+IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"
 
@@ -67,9 +67,6 @@ RDEPEND="${DEPEND}
 	virtual/checkpassword
 	virtual/daemontools
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim
diff --git a/mail-mta/netqmail/netqmail-1.06-r16.ebuild b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
index 3a8a3899566f..10daf0337012 100644
--- a/mail-mta/netqmail/netqmail-1.06-r16.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r16.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
@@ -42,7 +42,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
+IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"
 
@@ -65,9 +65,6 @@ DEPEND="
 RDEPEND="${DEPEND}
 	sys-apps/ucspi-tcp
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim
diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 7dd94b01efa9..199e1c5a6028 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -7,7 +7,7 @@ DIST notqmail-1.08-tls-spp.patch 64223 BLAKE2B d2337017dacd41d975a9ebd4650cce584
 DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079faa490c0ed027d73a8b32de5d5907a54a59162b9b68479229c4b92a23fe28cd2f334123cfe674a94502b90a3635 SHA512 c18d09e28c2e580522eea144e5344e814811108b12f3272b4cf10ad58d9d3d8e666616dcfea2f369e226b68db4fe8cf67cbae994b242d36e9e07c289a0539394
 DIST notqmail-1.08.tar.xz.sig 195 BLAKE2B 0edf3758d24c22e69139a57804b5b39da6c5868c178af511ff5105cd45bf105f5bb903d94093d400c54126e359a259f32d8c8b25c2fb87233efd74fdb05593c1 SHA512 2d5e68d1f3d7330b8b58f54235ec22a94adc0811e23f4863fac806c7a3e0110e6388920c3089c68fa3bb438398d64ea6e37240d002225b1cab20460797487604
 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
-EBUILD notqmail-1.08-r5.ebuild 4131 BLAKE2B 8aeee72909ed9fb414e16ae761f3ebb7c023df4aa90505f0db0e08d45590a19344941b3bf4c79f7111e580b1bb03722b21d7da10ef2431df7b22f765571b3679 SHA512 2f324c80ad37c606ee8c629f60a2d73090a88e18871d70d58cef4a0d59da2f81316e914d16f7d8262358388559dc0cd1b35276ef55164012299e79f623706670
-EBUILD notqmail-1.08-r6.ebuild 4524 BLAKE2B 31b5cf9acd19cf68c8ed9220c6c28c6bb499fe70dbfad55b47062a71f9d85ae41f7bfaf77bce8a36a72f0b14afa46ca17f26b5a59009b9b71e8172aa9223bef2 SHA512 a257b1121b0426db9498ee6a74613cdf85c542540ea22c851e919871a200e3a5abd67828e3fa689a39b9727fad6b8a74819a0dcd964fdad03ce83aded8c4d1c7
-EBUILD notqmail-9999.ebuild 4397 BLAKE2B da75b6b18951a8d8f2e48c77b48b7253883b24e4e64df7934467934c749acf4d73a8dc3096fb0baa3c7f0f8c777c8bf48912196b5dffcd3e32bf86d9ac602406 SHA512 abe481ad33ea27b07bc79c396acf79c388e9ce0c1ee63890894573ad606152dc355cd4f78ff85b5b9370007e51d0991764fdde3e5464d5a8888e6f7ee5980fba
+EBUILD notqmail-1.08-r5.ebuild 4084 BLAKE2B a8029a025dbc0cce163f4881ddf5fd2186e5e61116fece2ad8da019496e38670cffd6d3393d238033af721e185438695f7b0ecb430fed91214b0be4619ba4a37 SHA512 b7df399a046bb9c886978130c017f48f5fd926f2c0fefb1bb48b916f4e329a323f70c4b5435dbd6c030c748f2f036bddfca28f272248e8d1e223e523992c6fb3
+EBUILD notqmail-1.08-r6.ebuild 4477 BLAKE2B 87e8386d1ca2fc5cbaca5cc87511d61806b9c24fbbf137f8f6f258731dadd27bf5ce92464dff168d2ce816fb39ba344ad3962ea52ad644f8f54c111f559184a0 SHA512 212446fcec2a5d2c2fa025e26d66fc2a1ae72c67468512d99b3ee0e2947a20248f8465f7770a7aa58ba98f5bbb9f09374097c62f8ec011a0b5eea1421f7c11b3
+EBUILD notqmail-9999.ebuild 4350 BLAKE2B a7ad675b4dabda0496444343239be506f7e33fdb1006d97fcaa16a8e15389a2a9ce17efbdc27704ca8c32af2231ba682a282ad69e7f5f86392deb4630fce9258 SHA512 cd9219a55e45bfaf326b43295216c1b7e8f166a0f520b2101d063764b2fb97109b786a05edf5e3095c03fa042211b770cdebe09fb29068628731f40843da0fa8
 MISC metadata.xml 753 BLAKE2B 86a0b2db6a95eb9035137a11dff5eca3280c427311af8ab9986392fb001707897723a582f4f0627a9a8e2add6c1ac6b3f842198c6e96abf49b15d340962779d6 SHA512 577360801e0a48aff8216a61c5351100369c4094aade0c1e21d6749965fcb9c8cfaf0c32ea6c8e28300cc5b78a75f2e58d4e1f5713e5c7c26d574830e0a486f9
diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
index 9717aa7f830d..7c324e45672e 100644
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
@@ -56,7 +56,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE=" gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+IUSE=" gencertdaily highvolume qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
@@ -78,9 +78,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim
diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
index 8e5a4d4b1b99..ea86d4a9ade7 100644
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -64,7 +64,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+IUSE="gencertdaily highvolume qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
@@ -89,9 +89,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim
diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index f07147afa4d4..bfa7c200a49a 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -61,7 +61,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+IUSE="gencertdaily highvolume qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
@@ -86,9 +86,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3ef7974a668f..2b8e69175c7d 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index cee974a08d9f..bd090626f24f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 31 Dec 2022 13:39:50 +0000
+Sat, 31 Dec 2022 19:39:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index a72301b16111..2040ef17a4f3 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538785 BLAKE2B a42e589b6c2be5ab4486b79822a326a12b3725dbc28e32cbb116cd453b6899511ab2026524f136171407f678f9acafd852f1a2a245b8caed5bad581d2eb86337 SHA512 8ff81ddfe9cd2569ab4fe6eabe9daf23f1f66918aba5cae55ff8241b2bb330fac90cb5595df81455bfa98b51ed1c6e965c73508fe1b662e752525e3e27b52956
-TIMESTAMP 2022-12-31T13:39:54Z
+TIMESTAMP 2022-12-31T19:39:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOwO6pfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOwkAxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBDRBAAtCRCei5EtDYf8QIVuTG03laJV7+ee2/6qqsunEKIccIenyc99QNbZcPP
-kDMaaSGnex4sAbb4LZBvlcUlJTPf+Yo3yvtXON+0N0QkULrd0Sh6PEbkkyGTtsRJ
-MG8UExapMHpNTkCnCoJHPa0/nNEO3j37/3L+9z7+2NO2FgEIePqLLEiSuYK1bCh5
-Ml1woIK61saAn6gOWXIZZatfPzeRQerGi0SYp6K/dEOg8BYD2Q4Yk34L75JYwxKe
-P+VAwYOM+i8sl0n8oTQCZGSpC/z5oJeuVBGP6vdx9Pku3xFyFm5Jl4A5LBoLMWW2
-TH4LIKxdf2aUOKJTGMknWB4tzdILie63Q+vfpL9516fKo9P+HcXYJOEG7UTL8b4Z
-8A/0OUzDCKPF/1XdF/3lgjwugzoZLs8d8Ld7TPFTHVKfPAY6OMUKKB/2bUjn3RYm
-vIrdLy3XpbcviM3lmhShYDUROpz3r/1kRmROLjTgtoxqG48G4IpyzfOXnD5eaT+V
-gi9Qa1gK5F77693ouUMEGIhwHa5SOY8r9ekaGXwZ/5+M5O5AWE3cyg5jjNtBVvr0
-vvLDNh4dsWKy9PlGmWLYZkUBIOkbytMBRqKiEHvKGvPSmR16qhJju/WwEIQ9mt28
-fZo5Le8MCKjPw7dU7xiSJAhzRTpsfncA4thw3eifno98MyG4CmU=
-=zgke
+klC7Iw/8DbN7sxL/j3tMLiRRTIYFsk7WgXGUJYKQM8o2jszZS9pCuQQHFmM0mggo
+jb1EPKMpKLPqfgFrtpewZFR7OiDOSWwXiSnrKUuMzCKtRCNmiKpUSJ3CmoK5CD+z
+5RHkU7yGfDlxEjQ+eMAB5pKOBjj7iVhKphPQpy2nmfNb9aUekY0oMijdbNChF5WE
+FpBd+dvbFBEh14vN0N1mmBlU3AkdnsCrSWcWRRHY7+xJOL6Zljp6m72T7p/GUmS0
+hRR+ipPP2hDk3yLMAoG8flPllWsEZ9IQPe9Anw51hUGsAVPJmB3BYOHqGoBxvuIE
+KbmvnTY/0YFUXmX034kdi8vUapIar+/TSYNanyX/ED8LlwxT3BfkvkCALadK8eHF
+C9HVXWWEZRwGO4cvY9YszYuOCxjyQIN2UaKqNgPEfvzPE623Z9yy2zro0FYH331u
+sWtdFHlC6qR+sQsnIu21IGsryUMshNGuHwM2HuqDvviqD/P9Y3LNS3w59pyZNC7v
+FBaRE7HvcTpZndThyKHpZ7xkle+6qBJZIuWzTRFafyQ5riBppnotfv2derhPbTNL
+UBXlYmcXmNQ39tloJIPETVljNWjLy97XflllFqS93Qp70WH/+01PwoiYZIKA0Oh0
+HhFVHalsNujZlwKBDt6h+rh9EtjhH7OAqrxK40Ii5NzXx7pCwFU=
+=34xu
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index cee974a08d9f..bd090626f24f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 31 Dec 2022 13:39:50 +0000
+Sat, 31 Dec 2022 19:39:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index fc358ff72118..ed3172c34c68 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-alternatives/Manifest.gz b/metadata/md5-cache/app-alternatives/Manifest.gz
index faa65bbaa5ae..ec9f0355d58e 100644
--- a/metadata/md5-cache/app-alternatives/Manifest.gz
+++ b/metadata/md5-cache/app-alternatives/Manifest.gz
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-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 41df13a13b24..f149c6bb5848 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r3 b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r3
deleted file mode 100644
index d8a026533931..000000000000
--- a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=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
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Xbox xdvdfs ISO extraction utility
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/xbiso/
-INHERIT=autotools flag-o-matic
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://sourceforge/xbiso/xbiso-0.6.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b83e97b0d28c573cfe59e351018e5f83
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 469cf6675ac2..2c4458a490f6 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/doxygen-1.9.6 b/metadata/md5-cache/app-doc/doxygen-1.9.6
index e4c170fe1329..1724ef5dd8c6 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.9.6
+++ b/metadata/md5-cache/app-doc/doxygen-1.9.6
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[xml(+)] >=dev-lang/python-3.8.16:3.8[xml(+)] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.11.1:3.11[xml(+)] >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[xml(+)] >=dev-lang/python-3.8.16:3.8[xml(+)] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-10:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doc? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) !!sys-devel/llvm:0
 DESCRIPTION=Documentation system for most programming languages
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://doxygen.nl/files/doxygen-1.9.6.src.tar.gz mirror://sourceforge/doxygen/rel-1.9.6/doxygen-1.9.6.src.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1c6ba01b3ccafb8054965c9cd4f0ea9e
+_md5_=f5df92cf79196457b69390fb1aa27033
diff --git a/metadata/md5-cache/app-doc/doxygen-9999 b/metadata/md5-cache/app-doc/doxygen-9999
index b4ff704f7bc1..f4dee1117ab2 100644
--- a/metadata/md5-cache/app-doc/doxygen-9999
+++ b/metadata/md5-cache/app-doc/doxygen-9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[xml(+)] >=dev-lang/python-3.8.16:3.8[xml(+)] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.11.1:3.11[xml(+)] >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[xml(+)] >=dev-lang/python-3.8.16:3.8[xml(+)] ) >=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 setup test unpack
 DEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-10:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doc? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) !!sys-devel/llvm:0
 DESCRIPTION=Documentation system for most programming languages
@@ -13,4 +13,4 @@ REQUIRED_USE=test? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c05a9e452f2d18035a496b0d293f47de
+_md5_=68bb3f7e73526a31b760ac00a40c0c1f
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 74d2f9edafbf..b9775f778e72 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r23 b/metadata/md5-cache/app-editors/emacs-23.4-r23
deleted file mode 100644
index 2203dafca2f3..000000000000
--- a/metadata/md5-cache/app-editors/emacs-23.4-r23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-IUSE=alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-SLOT=23
-SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=73000f5c19c1fa674152143f3165a178
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r13 b/metadata/md5-cache/app-editors/emacs-24.5-r13
deleted file mode 100644
index e9f8ffa82197..000000000000
--- a/metadata/md5-cache/app-editors/emacs-24.5-r13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) 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
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
-IUSE=acl alsa aqua athena dbus games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-SLOT=24
-SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ee4c5c0621ae3897f49f0e57f1ad31bf
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 27b13b31cc8f..cadf1ec6b207 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/dlx-1.5.20 b/metadata/md5-cache/app-emulation/dlx-1.5.20
deleted file mode 100644
index 098a4cda8b91..000000000000
--- a/metadata/md5-cache/app-emulation/dlx-1.5.20
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install
-DESCRIPTION=DLX Simulator
-EAPI=7
-HOMEPAGE=https://www.davidviner.com/dlx
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://www.davidviner.com/zip/dlx/dlx.zip -> dlx-1.5.20.zip
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=eaa0591c6669a0b1fac63db62c8b3378
diff --git a/metadata/md5-cache/app-emulation/dlx-1.5.20-r1 b/metadata/md5-cache/app-emulation/dlx-1.5.20-r1
deleted file mode 100644
index 8415ed49bfb3..000000000000
--- a/metadata/md5-cache/app-emulation/dlx-1.5.20-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install
-DESCRIPTION=DLX Simulator
-EAPI=8
-HOMEPAGE=https://www.davidviner.com/dlx
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://www.davidviner.com/zip/dlx/dlx.zip -> dlx-1.5.20.zip
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f22f2e34793580f0840abad29b49aa6d
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 96f7a9d7b574..e13aee02b9bf 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/prometheus-bin-2.26.1 b/metadata/md5-cache/app-metrics/prometheus-bin-2.26.1
deleted file mode 100644
index be72eff19e83..000000000000
--- a/metadata/md5-cache/app-metrics/prometheus-bin-2.26.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst
-DEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
-DESCRIPTION=prometheus monitoring system and time series database
-EAPI=7
-HOMEPAGE=https://prometheus.io
-INHERIT=systemd
-KEYWORDS=-* ~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/releases/download/v2.26.1/prometheus-2.26.1.linux-amd64.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9272c20d6b1ecdeb8dee6bd7447bb5fe
diff --git a/metadata/md5-cache/app-metrics/prometheus-bin-2.27.1 b/metadata/md5-cache/app-metrics/prometheus-bin-2.27.1
deleted file mode 100644
index 4755dc55697e..000000000000
--- a/metadata/md5-cache/app-metrics/prometheus-bin-2.27.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst
-DEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
-DESCRIPTION=prometheus monitoring system and time series database
-EAPI=7
-HOMEPAGE=https://prometheus.io
-INHERIT=systemd
-KEYWORDS=-* ~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/releases/download/v2.27.1/prometheus-2.27.1.linux-amd64.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9272c20d6b1ecdeb8dee6bd7447bb5fe
diff --git a/metadata/md5-cache/app-metrics/prometheus-bin-2.28.1 b/metadata/md5-cache/app-metrics/prometheus-bin-2.28.1
deleted file mode 100644
index 7e036e085e46..000000000000
--- a/metadata/md5-cache/app-metrics/prometheus-bin-2.28.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst
-DEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
-DESCRIPTION=prometheus monitoring system and time series database
-EAPI=7
-HOMEPAGE=https://prometheus.io
-INHERIT=systemd
-KEYWORDS=-* ~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/releases/download/v2.28.1/prometheus-2.28.1.linux-amd64.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9272c20d6b1ecdeb8dee6bd7447bb5fe
diff --git a/metadata/md5-cache/app-metrics/prometheus-bin-2.31.1 b/metadata/md5-cache/app-metrics/prometheus-bin-2.31.1
deleted file mode 100644
index 78016627c953..000000000000
--- a/metadata/md5-cache/app-metrics/prometheus-bin-2.31.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst
-DEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
-DESCRIPTION=prometheus monitoring system and time series database
-EAPI=8
-HOMEPAGE=https://prometheus.io
-INHERIT=systemd
-KEYWORDS=-* ~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/prometheus acct-user/prometheus !app-metrics/prometheus
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/releases/download/v2.31.1/prometheus-2.31.1.linux-amd64.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ffd41fe814a3487bc310a6d0cad85141
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 71525f0f8fe1..e7991c1c3645 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
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 6fa88e86ff77..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_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) 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(-)] ) )
-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_8 python_single_target_python3_9 python_single_target_python3_10
-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_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) 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(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9489d415ed0c74ab1552d5a592273f21
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 803848e35a1e..5a79e1e7db69 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/sc-7.16-r3 b/metadata/md5-cache/app-office/sc-7.16-r3
deleted file mode 100644
index a9e748ca1bf1..000000000000
--- a/metadata/md5-cache/app-office/sc-7.16-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Spreadsheet Calculator
-EAPI=6
-HOMEPAGE=http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=public-domain
-RDEPEND=>=sys-libs/ncurses-5.2:=
-SLOT=0
-SRC_URI=ftp://ibiblio.org/pub/Linux/apps/financial/spreadsheet/sc-7.16.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3768f694fbc319317a773fc4cdbb5361
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 5cf6994b966c..cb8a595d8ad7 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/crm114-20100106-r1 b/metadata/md5-cache/app-text/crm114-20100106-r1
index 57cbe1e7339a..39ee5617832a 100644
--- a/metadata/md5-cache/app-text/crm114-20100106-r1
+++ b/metadata/md5-cache/app-text/crm114-20100106-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install postinst prepare test
-DEPEND=dev-libs/tre mew? ( app-emacs/mew ) mimencode? ( net-mail/metamail ) normalizemime? ( mail-filter/normalizemime ) test? ( sys-apps/miscfiles )
+DEPEND=dev-libs/tre mew? ( app-emacs/mew ) normalizemime? ( mail-filter/normalizemime ) test? ( sys-apps/miscfiles )
 DESCRIPTION=A powerful text processing tool, mainly used for spam filtering
 EAPI=7
 HOMEPAGE=http://crm114.sourceforge.net/
 INHERIT=flag-o-matic toolchain-funcs
-IUSE=examples mew mimencode nls normalizemime test
+IUSE=examples mew nls normalizemime test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/tre mew? ( app-emacs/mew ) mimencode? ( net-mail/metamail ) normalizemime? ( mail-filter/normalizemime )
+RDEPEND=dev-libs/tre mew? ( app-emacs/mew ) normalizemime? ( mail-filter/normalizemime )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://crm114.sourceforge.net/tarballs/crm114-20100106-BlameMichelson.src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2953137335fef9abb51da2108b6d12b9
+_md5_=6f4c085612dc67508c68353167bc01e4
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 02cc660f4865..241f5eba9237 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
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 154f94c30c90..7c2364761a5f 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	1d1b325c00c1d24c564a1b49327ec3c5	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=49abc8a071634f44c9f517c79c0e3476
+_md5_=3154dcdd575d3c575724794925b2f05f
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.13-r1 b/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.13-r1
deleted file mode 100644
index 92a02b0619bf..000000000000
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.13-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio dev-libs/libgcrypt:0/20 dev-libs/libgpg-error dev-perl/DBD-mysql sys-libs/zlib sys-process/numactl || ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] ) !dev-db/percona-xtrabackup
-SLOT=0
-SRC_URI=amd64? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.13/binary/tarball/percona-xtrabackup-2.4.13-Linux-x86_64.libgcrypt20.tar.gz ) x86? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.13/binary/tarball/percona-xtrabackup-2.4.13-Linux-i686.libgcrypt20.tar.gz )
-_md5_=b1e9c70f9313577d3c3488c1b2aa5a52
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 6305e1404af9..bd43135b9950 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205 b/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
deleted file mode 100644
index f38f3f5425bd..000000000000
--- a/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-libs/boost
-DESCRIPTION=an extension to the Boost.MPL library
-EAPI=6
-HOMEPAGE=https://github.com/quinoacomputing/BoostMPLCartesianProduct
-INHERIT=vcs-snapshot toolchain-funcs
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=Boost-1.0
-RDEPEND=dev-libs/boost
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/quinoacomputing/BoostMPLCartesianProduct/archive/aeb0266b3a89f32c390dff51cb73a454d5d7a745.tar.gz -> boost-mpl-cartesian_product-20161205.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=b2e3f4caf476652d5148fcc96683cc51
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.3.0 b/metadata/md5-cache/dev-libs/ocl-icd-2.3.0
deleted file mode 100644
index c0d4b6e5e97f..000000000000
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems 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
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-util/opencl-headers-2021.04.29
-DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
-EAPI=7
-HOMEPAGE=https://github.com/OCL-dev/ocl-icd
-INHERIT=autotools flag-o-matic multilib-minimal ruby-single
-IUSE=+khronos-headers 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=amd64 ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=>=dev-util/opencl-headers-2021.04.29 !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
-SLOT=0
-SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.3.0.tar.gz -> ocl-icd-2.3.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c08e11c53becd57cd60f4117c471b171
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.3.1 b/metadata/md5-cache/dev-libs/ocl-icd-2.3.1
deleted file mode 100644
index f4832422faba..000000000000
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems 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
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-util/opencl-headers-2021.04.29
-DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
-EAPI=7
-HOMEPAGE=https://github.com/OCL-dev/ocl-icd
-INHERIT=autotools flag-o-matic multilib-minimal ruby-single
-IUSE=+khronos-headers 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=~amd64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-util/opencl-headers-2021.04.29 !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
-SLOT=0
-SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.3.1.tar.gz -> ocl-icd-2.3.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7f9db10a85a009bc9ed838eb62d543ca
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/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index b9f5188e4e2e..928b2f261e6c 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
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/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index b06a8c62590f..0b58ac07e0cd 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
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..d1273280575d
--- /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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[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_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_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( 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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=6ae569fea92b5cd5bb896f66fcea2352
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 9c4f6fcdd3ad..000000000000
--- a/metadata/md5-cache/dev-python/pysvn-1.9.15-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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_8 python_targets_python3_9 python_targets_python3_10
-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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/subversion-1.9 python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=54d9cb6ca5260105a0e0863811067222
diff --git a/metadata/md5-cache/dev-python/slimit-0.8.1-r1 b/metadata/md5-cache/dev-python/slimit-0.8.1-r1
deleted file mode 100644
index 1ca414c44f96..000000000000
--- a/metadata/md5-cache/dev-python/slimit-0.8.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ply:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A JavaScript minifier written in Python
-EAPI=7
-HOMEPAGE=https://slimit.readthedocs.io/en/latest/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/ply:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rspivak/slimit/archive/0.8.1.tar.gz -> slimit-0.8.1.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=0c5ac22971e46831574285b8cba79a4b
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 4f60382b7fc7..000000000000
--- a/metadata/md5-cache/dev-python/uncertainties-3.1.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/future[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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/sphinx-5.3.0 ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[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_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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( 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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=900dcbb44739ae32ae72d8f6fac8dd80
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..f6b07d5b195b
--- /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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[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_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[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_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_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( 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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=b260db76e3a11dda83a6e145b872932a
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 6b107ed791e1..15582b47ef7d 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/gherkin-5.1.0 b/metadata/md5-cache/dev-ruby/gherkin-5.1.0
deleted file mode 100644
index fa15a415414c..000000000000
--- a/metadata/md5-cache/dev-ruby/gherkin-5.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Fast Gherkin lexer and parser
-EAPI=6
-HOMEPAGE=https://github.com/cucumber/gherkin
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=https://rubygems.org/gems/gherkin-5.1.0.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=aff42f87036d8fc9e77e99f5fed5f0da
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 9cf446db309e..a2a2152efb66 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/aruba-1.0.3-r1 b/metadata/md5-cache/dev-util/aruba-1.0.3-r1
deleted file mode 100644
index b07049669b34..000000000000
--- a/metadata/md5-cache/dev-util/aruba-1.0.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] >=dev-ruby/ffi-1.9[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-devel/bc ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Cucumber steps for driving out command line applications
-EAPI=7
-HOMEPAGE=https://github.com/cucumber/aruba
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] >=dev-ruby/ffi-1.9[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-6[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://github.com/cucumber/aruba/archive/v1.0.3.tar.gz -> aruba-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9a31e86174aad224dfa3370e3c119ef6
diff --git a/metadata/md5-cache/dev-util/aruba-1.1.2-r1 b/metadata/md5-cache/dev-util/aruba-1.1.2-r1
deleted file mode 100644
index aeb7096c9fb0..000000000000
--- a/metadata/md5-cache/dev-util/aruba-1.1.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( =dev-ruby/bundler-2*[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-devel/bc ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Cucumber steps for driving out command line applications
-EAPI=7
-HOMEPAGE=https://github.com/cucumber/aruba
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( =dev-ruby/bundler-2*[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-7[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://github.com/cucumber/aruba/archive/v1.1.2.tar.gz -> aruba-1.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=2ddfe83f7cefacd4ac52d0a902c6d1b5
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 6ebe8680a1b9..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypugjs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=99e39ac8978f9c0fa8e15301378f0ad8
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 c6e1a245c8d3..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypugjs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=072124b1de0c448aac51260cd8880dbf
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 224677d958c6..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypugjs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=b8980a2e6ad5f324e935451ac25ef389
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 65f152233955..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/cairosvg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/klein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=04e332ae70e40c1ba0123817ff29cd4d
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 845a582592cf..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/cairosvg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/klein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=04e332ae70e40c1ba0123817ff29cd4d
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 6d32e07a510d..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/cairosvg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/klein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=04e332ae70e40c1ba0123817ff29cd4d
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 13f5d136683c..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8b9a30371e09859f3b37d76fa366f5e3
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 75c617e0df82..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8b9a30371e09859f3b37d76fa366f5e3
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 3b67f03c0a16..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8b9a30371e09859f3b37d76fa366f5e3
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 7008697717f3..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=5c28b7c52510d477250776aafc5cfcd2
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 a6b96b3817b9..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=5c28b7c52510d477250776aafc5cfcd2
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 1f1d1924b81b..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=5c28b7c52510d477250776aafc5cfcd2
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 3acddc368b83..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a3c86a1fc5e0ba9145a58e7f68cc00ec
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 bc39638bb994..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a3c86a1fc5e0ba9145a58e7f68cc00ec
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 dbabda33111d..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a3c86a1fc5e0ba9145a58e7f68cc00ec
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 2638c2e6e10f..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=e41f885ae665ad0cff045523e0a56bdd
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 fd6c6927ac64..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=e41f885ae665ad0cff045523e0a56bdd
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 c9ad0cfcaf15..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=e41f885ae665ad0cff045523e0a56bdd
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 1b1e994f3d35..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7d9d71e51699619763bab5afa79a51de
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 92f8b9a6d4c2..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d7ef068adedb7cf4afdc02ecb607f221
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 b675bfa816dd..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ce351c0f8ac684225b4b04352cc215a9
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.6.1 b/metadata/md5-cache/dev-util/buildbot-worker-3.6.1-r2
index 045838a612a5..045838a612a5 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.6.1
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.6.1-r2
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 7a6d7d1e46b6..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d1e58328cf11c13100718fae5fea1c51
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 268223a02198..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d1e58328cf11c13100718fae5fea1c51
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 501dc5c78b7d..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d1e58328cf11c13100718fae5fea1c51
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 e416cc6b2341..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-pkg-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a4884cd5285be0a7462ec5c06c684892
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 080dd4db8ec4..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-pkg-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a4884cd5285be0a7462ec5c06c684892
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 dc1a85416f5c..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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-pkg-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a4884cd5285be0a7462ec5c06c684892
diff --git a/metadata/md5-cache/dev-util/cucumber-core-3.2.1 b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
deleted file mode 100644
index 567d7f44ccc8..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-core-3.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby27? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby27(-)] dev-ruby/gherkin:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Executable feature scenarios
-EAPI=6
-HOMEPAGE=https://cucumber.io/
-INHERIT=ruby-fakegem eapi7-ver
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby27(-)] dev-ruby/gherkin:5[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3.2
-SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v3.2.1.tar.gz -> cucumber-core-3.2.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=6058a470933d5bdcda113433b67d4c8b
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1 b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
deleted file mode 100644
index a4bd7b5b3fe8..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=a simpler alternative to Regular Expressions
-EAPI=6
-HOMEPAGE=https://cucumber.io/
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://rubygems.org/gems/cucumber-expressions-6.0.1.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=1cb03291d66da40912ae9837e73decb2
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
deleted file mode 100644
index 8893a1f9e0e2..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Cucumber tag expressions for ruby
-EAPI=6
-HOMEPAGE=https://cucumber.io/
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://rubygems.org/gems/cucumber-tag_expressions-1.1.1.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=46af1ae9d04a30d6499950d2367a7452
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1 b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
deleted file mode 100644
index d0a194670d13..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Executable feature scenarios
-EAPI=6
-HOMEPAGE=https://cucumber.io/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/cucumber-wire-0.0.1.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=cc606ea19aa95de1d8db17b03334664b
diff --git a/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1 b/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1
deleted file mode 100644
index 72dd9708eeec..000000000000
--- a/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/activesupport-3.2:*[ruby_targets_ruby27(-)] dev-ruby/middleware[ruby_targets_ruby27(-)] dev-ruby/thor:*[ruby_targets_ruby27(-)] dev-ruby/thread_safe[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/timecop[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Google Protocol Buffers serialization and RPC implementation for Ruby
-EAPI=8
-HOMEPAGE=https://github.com/ruby-protobuf/protobuf
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/activesupport-3.2:*[ruby_targets_ruby27(-)] dev-ruby/middleware[ruby_targets_ruby27(-)] dev-ruby/thor:*[ruby_targets_ruby27(-)] dev-ruby/thread_safe[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/protobuf-cucumber-3.10.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c502bd175eac0904a7faa12fa16e1571
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 9feb60814126..82f8709988e3 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/xgamer-0.6.2-r1 b/metadata/md5-cache/games-util/xgamer-0.6.2-r1
deleted file mode 100644
index ef58c3595d11..000000000000
--- a/metadata/md5-cache/games-util/xgamer-0.6.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-perl/Module-Build dev-lang/perl test? ( virtual/perl-Test-Simple )
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-lang/perl-5.10 >=x11-libs/gtk+-2.18:2 >=dev-perl/Gtk2-1.120 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-BaseDir dev-perl/XML-Twig dev-perl/glib-perl x11-misc/numlockx media-gfx/feh dev-lang/perl
-DESCRIPTION=A launcher for starting games in a second X session
-EAPI=8
-HOMEPAGE=https://code.google.com/p/xgamer/
-INHERIT=optfeature perl-module
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-lang/perl-5.10 >=x11-libs/gtk+-2.18:2 >=dev-perl/Gtk2-1.120 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-BaseDir dev-perl/XML-Twig dev-perl/glib-perl x11-misc/numlockx media-gfx/feh dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xgamer.googlecode.com/files/xgamer-0.6.2.tar.gz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=22c2938a8b0e7e4ea42bc5d9bd310cce
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index a3b6fd4234d4..6e3a6d2531f8 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/greetd-0.8.0 b/metadata/md5-cache/gui-libs/greetd-0.8.0
index a8a49e7874ea..12b76537bf5d 100644
--- a/metadata/md5-cache/gui-libs/greetd-0.8.0
+++ b/metadata/md5-cache/gui-libs/greetd-0.8.0
@@ -12,4 +12,4 @@ RDEPEND=acct-user/greetd sys-auth/pambase sys-libs/pam
 SLOT=0
 SRC_URI=https://git.sr.ht/~kennylevinsen/greetd/archive/0.8.0.tar.gz -> greetd-0.8.0.tar.gz https://crates.io/api/v1/crates/arc-swap/0.4.6/download -> arc-swap-0.4.6.crate https://crates.io/api/v1/crates/async-trait/0.1.31/download -> async-trait-0.1.31.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/enquote/1.0.3/download -> enquote-1.0.3.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/libc/0.2.82/download -> libc-0.2.82.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/mio/0.7.7/download -> mio-0.7.7.crate https://crates.io/api/v1/crates/miow/0.3.6/download -> miow-0.3.6.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/ntapi/0.3.4/download -> ntapi-0.3.4.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/pam-sys/0.5.6/download -> pam-sys-0.5.6.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.4/download -> pin-project-lite-0.2.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.12/download -> proc-macro2-1.0.12.crate https://crates.io/api/v1/crates/quote/1.0.5/download -> quote-1.0.5.crate https://crates.io/api/v1/crates/rpassword/5.0.0/download -> rpassword-5.0.0.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/syn/1.0.21/download -> syn-1.0.21.crate https://crates.io/api/v1/crates/thiserror/1.0.17/download -> thiserror-1.0.17.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.17/download -> thiserror-impl-1.0.17.crate https://crates.io/api/v1/crates/tokio/1.0.2/download -> tokio-1.0.2.crate https://crates.io/api/v1/crates/tokio-macros/1.0.0/download -> tokio-macros-1.0.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=747eec15b8463a943fa2f4d4db485d40
+_md5_=6a6b678a8d086f585ce61e1cb3c214a1
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 4a18fd61c741..fb06e544d920 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/spamassassin-4.0.0 b/metadata/md5-cache/mail-filter/spamassassin-4.0.0
index 770bf0e4eecd..d2964432c9a5 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-4.0.0
+++ b/metadata/md5-cache/mail-filter/spamassassin-4.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://spamassassin.apache.org/
 INHERIT=perl-functions systemd toolchain-funcs verify-sig
 IUSE=berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Digest-SHA ssl? ( dev-libs/openssl:0= ) app-crypt/gnupg dev-perl/Archive-Zip dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Email-Address-XS dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/IO-String dev-perl/Mail-DKIM dev-perl/Mail-DMARC dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-LibIDN2 dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 dev-perl/Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-4.0.0.tar.bz2 verify-sig? ( https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-4.0.0.tar.bz2.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=111e0758fd3690c5b9ec89f607bd3aef
+_md5_=bc38a1ea56ea5441ef2350c0bcc9406d
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 0bc385d37616..60718eaadce4 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r14 b/metadata/md5-cache/mail-mta/netqmail-1.06-r14
index 3fbfc8b4bbb0..ecf82d0faf00 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r14
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r14
@@ -4,13 +4,13 @@ DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agen
 EAPI=7
 HOMEPAGE=http://netqmail.org https://cr.yp.to/qmail.html http://qmail.org
 INHERIT=qmail
-IUSE=authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla
+IUSE=authcram gencertdaily highvolume qmail-spp ssl vanilla
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
-RDEPEND=acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions sys-apps/groff ssl? ( >=dev-libs/openssl-1.1:0= ) sys-apps/ucspi-tcp virtual/checkpassword virtual/daemontools authcram? ( >=net-mail/cmd5checkpw-0.30 ) ssl? ( pop3? ( sys-apps/ucspi-ssl ) ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
+RDEPEND=acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions sys-apps/groff ssl? ( >=dev-libs/openssl-1.1:0= ) sys-apps/ucspi-tcp virtual/checkpassword virtual/daemontools authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( https://mirror.alexh.name/qmail/netqmail/netqmail-1.05-tls-smtpauth-20190114.patch http://inoa.net/qmail-tls/vu555316.patch https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch ) )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmail	240a1f5bdaca9816f1bf9196653abc13	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2148edefa50934c36763830fa32cae4c
+_md5_=fae70c617ebfef2c4b64aa0148420eb3
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r16 b/metadata/md5-cache/mail-mta/netqmail-1.06-r16
index b0f2ab9d098e..50406ea8540b 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r16
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r16
@@ -4,14 +4,14 @@ DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agen
 EAPI=8
 HOMEPAGE=http://netqmail.org https://cr.yp.to/qmail.html http://qmail.org
 INHERIT=qmail
-IUSE=authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla
+IUSE=authcram gencertdaily highvolume qmail-spp ssl vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=public-domain
 PDEPEND=virtual/daemontools
-RDEPEND=acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions sys-apps/groff ssl? ( >=dev-libs/openssl-1.1:0= ) sys-apps/ucspi-tcp authcram? ( >=net-mail/cmd5checkpw-0.30 ) ssl? ( pop3? ( sys-apps/ucspi-ssl ) ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
+RDEPEND=acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions sys-apps/groff ssl? ( >=dev-libs/openssl-1.1:0= ) sys-apps/ucspi-tcp authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( https://mirror.alexh.name/qmail/netqmail/netqmail-1.05-tls-smtpauth-20190114.patch http://inoa.net/qmail-tls/vu555316.patch https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch ) )
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmail	240a1f5bdaca9816f1bf9196653abc13	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=06b8baaa95672f9a2f0735bbc997e818
+_md5_=58960bfb5e8dd6b45b92eeb1c9756c57
diff --git a/metadata/md5-cache/mail-mta/notqmail-1.08-r5 b/metadata/md5-cache/mail-mta/notqmail-1.08-r5
index 09d4bf3e1894..b503cdd1459d 100644
--- a/metadata/md5-cache/mail-mta/notqmail-1.08-r5
+++ b/metadata/md5-cache/mail-mta/notqmail-1.08-r5
@@ -5,14 +5,14 @@ DESCRIPTION=Collaborative open-source successor to qmail
 EAPI=8
 HOMEPAGE=https://notqmail.org https://cr.yp.to/qmail.html http://qmail.org
 INHERIT=qmail systemd
-IUSE=gencertdaily highvolume pop3 qmail-spp ssl test vanilla
+IUSE=gencertdaily highvolume qmail-spp ssl test vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=public-domain
 PDEPEND=virtual/daemontools
-RDEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( >=dev-libs/openssl-1.1:0= ) test? ( dev-libs/check ) acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails sys-apps/ucspi-tcp ssl? ( pop3? ( sys-apps/ucspi-ssl ) ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/netqmail !mail-mta/sendmail !mail-mta/ssmtp[mta]
+RDEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( >=dev-libs/openssl-1.1:0= ) test? ( dev-libs/check ) acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails sys-apps/ucspi-tcp !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/netqmail !mail-mta/sendmail !mail-mta/ssmtp[mta]
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmail	240a1f5bdaca9816f1bf9196653abc13	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=55422db32a2fe1a894f8c9b0b9e34fba
+_md5_=1ca16aee5c7dae44caee91b9045a164d
diff --git a/metadata/md5-cache/mail-mta/notqmail-1.08-r6 b/metadata/md5-cache/mail-mta/notqmail-1.08-r6
index 2b26d5ce4611..684b5ccd4881 100644
--- a/metadata/md5-cache/mail-mta/notqmail-1.08-r6
+++ b/metadata/md5-cache/mail-mta/notqmail-1.08-r6
@@ -5,14 +5,14 @@ DESCRIPTION=Collaborative open-source successor to qmail
 EAPI=8
 HOMEPAGE=https://notqmail.org https://cr.yp.to/qmail.html http://qmail.org
 INHERIT=qmail systemd verify-sig
-IUSE=gencertdaily highvolume pop3 qmail-spp ssl test vanilla verify-sig
+IUSE=gencertdaily highvolume qmail-spp ssl test vanilla verify-sig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=public-domain
 PDEPEND=virtual/daemontools
-RDEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( >=dev-libs/openssl-1.1:0= ) test? ( dev-libs/check ) acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails sys-apps/ucspi-tcp ssl? ( pop3? ( sys-apps/ucspi-ssl ) ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/netqmail !mail-mta/sendmail !mail-mta/ssmtp[mta]
+RDEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( >=dev-libs/openssl-1.1:0= ) test? ( dev-libs/check ) acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails sys-apps/ucspi-tcp !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/netqmail !mail-mta/sendmail !mail-mta/ssmtp[mta]
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz verify-sig? ( https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz.sig ) https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmail	240a1f5bdaca9816f1bf9196653abc13	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=3fbd531aaaaf28b4d9b4b618ffca3a85
+_md5_=28d696318fc3e7b363289b4e1411fbdf
diff --git a/metadata/md5-cache/mail-mta/notqmail-9999 b/metadata/md5-cache/mail-mta/notqmail-9999
index 20a97bcfd0be..ec8c9a9d9400 100644
--- a/metadata/md5-cache/mail-mta/notqmail-9999
+++ b/metadata/md5-cache/mail-mta/notqmail-9999
@@ -5,14 +5,14 @@ DESCRIPTION=Collaborative open-source successor to qmail
 EAPI=8
 HOMEPAGE=https://notqmail.org https://cr.yp.to/qmail.html http://qmail.org
 INHERIT=qmail systemd git-r3
-IUSE=gencertdaily highvolume pop3 qmail-spp ssl test vanilla
+IUSE=gencertdaily highvolume qmail-spp ssl test vanilla
 LICENSE=public-domain
 PDEPEND=virtual/daemontools
 PROPERTIES=live
-RDEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( >=dev-libs/openssl-1.1:0= ) test? ( dev-libs/check ) acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails sys-apps/ucspi-tcp ssl? ( pop3? ( sys-apps/ucspi-ssl ) ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/netqmail !mail-mta/sendmail !mail-mta/ssmtp[mta]
+RDEPEND=net-dns/libidn2 net-mail/queue-repair sys-apps/gentoo-functions ssl? ( >=dev-libs/openssl-1.1:0= ) test? ( dev-libs/check ) acct-group/nofiles acct-group/qmail acct-user/alias acct-user/qmaild acct-user/qmaill acct-user/qmailp acct-user/qmailq acct-user/qmailr acct-user/qmails sys-apps/ucspi-tcp !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/opensmtpd !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/netqmail !mail-mta/sendmail !mail-mta/ssmtp[mta]
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmail	240a1f5bdaca9816f1bf9196653abc13	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8471bdf7ad2a0ed77b35a8e902ad8428
+_md5_=ef845ab9e0ca39a405be9c58b5146cbd
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 9eb9d8500dc4..479369274898 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/snortsam-2.70-r1 b/metadata/md5-cache/net-analyzer/snortsam-2.70-r1
deleted file mode 100644
index 156b9effe35e..000000000000
--- a/metadata/md5-cache/net-analyzer/snortsam-2.70-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DESCRIPTION=Snort plugin that allows automated blocking of IP addresses on several firewalls
-EAPI=7
-HOMEPAGE=http://www.snortsam.net/
-INHERIT=flag-o-matic toolchain-funcs vcs-clean
-IUSE=debug
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=http://www.snortsam.net/files/snortsam/snortsam-src-2.70.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ca03dc4290273620321179ab0ddd8555
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 5921ca188dd2..b2eba092e30d 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/dog-0.1.0 b/metadata/md5-cache/net-dns/dog-0.1.0
deleted file mode 100644
index 76ecb9581dec..000000000000
--- a/metadata/md5-cache/net-dns/dog-0.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/rust-1.37.0 dev-go/go-md2man ssl? ( dev-libs/openssl:0= ) !sys-apps/dog
-DESCRIPTION=A command-line DNS client like dig
-EAPI=7
-HOMEPAGE=https://dns.lookup.dog https://github.com/ogham/dog
-INHERIT=cargo
-IUSE=ssl debug
-KEYWORDS=~amd64
-LICENSE=EUPL-1.2 Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense unicode
-RDEPEND=ssl? ( dev-libs/openssl:0= ) !sys-apps/dog
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.61/download -> cc-1.0.61.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/datetime/0.5.1/download -> datetime-0.5.1.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/ipconfig/0.2.2/download -> ipconfig-0.2.2.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.80/download -> libc-0.2.80.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/native-tls/0.2.4/download -> native-tls-0.2.4.crate https://crates.io/api/v1/crates/openssl/0.10.30/download -> openssl-0.10.30.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.58/download -> openssl-sys-0.9.58.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/serde/1.0.117/download -> serde-1.0.117.crate https://crates.io/api/v1/crates/serde_json/1.0.59/download -> serde_json-1.0.59.crate https://crates.io/api/v1/crates/socket2/0.3.15/download -> socket2-0.3.15.crate https://crates.io/api/v1/crates/syn/1.0.48/download -> syn-1.0.48.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://github.com/ogham/dog/archive/v0.1.0.tar.gz -> dog-0.1.0.tar.gz
-_eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3331497a60600d4be2bbf134715f6813
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 19a83d58addb..f5eb07722924 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/ortp-0.23.0-r1 b/metadata/md5-cache/net-libs/ortp-0.23.0-r1
deleted file mode 100644
index 0375211c629e..000000000000
--- a/metadata/md5-cache/net-libs/ortp-0.23.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ssl? ( dev-libs/openssl:0= ) srtp? ( net-libs/libsrtp:0= ) doc? ( app-doc/doxygen ) virtual/pkgconfig
-DESCRIPTION=Open Real-time Transport Protocol (RTP, RFC3550) stack
-EAPI=6
-HOMEPAGE=http://www.linphone.org/
-IUSE=debug doc examples ipv6 minimal ntp-timestamp ssl srtp
-KEYWORDS=~alpha amd64 arm64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos
-LICENSE=LGPL-2.1
-RDEPEND=ssl? ( dev-libs/openssl:0= ) srtp? ( net-libs/libsrtp:0= )
-SLOT=0/9
-SRC_URI=mirror://nongnu/linphone/ortp/sources/ortp-0.23.0.tar.gz
-_md5_=660706cc93b19c65e9c646d1a5c9464e
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 437cb9a89772..0082f2906d58 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r3 b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r3
deleted file mode 100644
index 1a2f4b2df33b..000000000000
--- a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig 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
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses:= app-arch/sharutils net-mail/mailbase
-DESCRIPTION=Metamail (with Debian patches) - Generic MIME package
-EAPI=7
-HOMEPAGE=http://ftp.funet.fi/pub/unix/mail/metamail/
-INHERIT=autotools toolchain-funcs
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:= app-arch/sharutils net-mail/mailbase app-misc/mime-types sys-apps/debianutils !app-misc/run-mailcap
-SLOT=0
-SRC_URI=http://ftp.funet.fi/pub/unix/mail/metamail/mm2.7.tar.Z mirror://debian/pool/main/m/metamail/metamail_2.7-53.diff.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ae33e0ed3d54232bfb5574fcd8d843c9
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.4-r1 b/metadata/md5-cache/net-mail/vchkuser-0.4-r1
deleted file mode 100644
index 89dd77c14f7a..000000000000
--- a/metadata/md5-cache/net-mail/vchkuser-0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libpcre net-mail/vpopmail virtual/libcrypt:= || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) 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
-DESCRIPTION=qmail-spp plugin to check recipient existance with vpopmail
-EAPI=6
-HOMEPAGE=https://github.com/hollow/vchkuser
-INHERIT=autotools qmail
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/libpcre net-mail/vpopmail virtual/libcrypt:= || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] )
-SLOT=0
-SRC_URI=https://github.com/hollow/vchkuser/archive/v0.4.tar.gz -> vchkuser-0.4.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	qmail	240a1f5bdaca9816f1bf9196653abc13	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5751823b47112cea75dde2e2654e79c7
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 061e4a22d11f..09f49fe7bae4 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/cfengine-3.6.2-r1 b/metadata/md5-cache/net-misc/cfengine-3.6.2-r1
deleted file mode 100644
index 8858dbf417cb..000000000000
--- a/metadata/md5-cache/net-misc/cfengine-3.6.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=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
-DEFINED_PHASES=config configure install postinst prepare unpack
-DEPEND=acl? ( virtual/acl ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) selinux? ( sys-libs/libselinux ) tokyocabinet? ( dev-db/tokyocabinet ) qdbm? ( dev-db/qdbm ) libvirt? ( app-emulation/libvirt ) xml? ( dev-libs/libxml2:2 ) dev-libs/openssl:= dev-libs/libpcre:= net-libs/libnsl:=
-DESCRIPTION=An suite of programs for configuring and maintaining Unix-like computers
-EAPI=7
-HOMEPAGE=http://www.cfengine.org/
-INHERIT=autotools
-IUSE=acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet vim-syntax xml
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-PDEPEND=vim-syntax? ( app-vim/cfengine-syntax )
-RDEPEND=acl? ( virtual/acl ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) selinux? ( sys-libs/libselinux ) tokyocabinet? ( dev-db/tokyocabinet ) qdbm? ( dev-db/qdbm ) libvirt? ( app-emulation/libvirt ) xml? ( dev-libs/libxml2:2 ) dev-libs/openssl:= dev-libs/libpcre:= net-libs/libnsl:=
-REQUIRED_USE=^^ ( qdbm tokyocabinet )
-SLOT=3
-SRC_URI=http://cfengine.package-repos.s3.amazonaws.com/tarballs/cfengine-3.6.2.tar.gz masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-3.6.2.tar.gz -> cfengine-masterfiles-3.6.2.tar.gz )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f48e0acda8a5dda7b22d9a39eb64ade2
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 28f4f3be1543..485a3207efa4 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/brag-1.4.3 b/metadata/md5-cache/net-nntp/brag-1.4.3
deleted file mode 100644
index cf05289a9f29..000000000000
--- a/metadata/md5-cache/net-nntp/brag-1.4.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Brag collects and assembles multipart binary attachments from newsgroups
-EAPI=7
-HOMEPAGE=http://brag.sourceforge.net/
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tcl:0 app-text/uudeview
-SLOT=0
-SRC_URI=mirror://sourceforge/brag/brag-1.4.3.tar.gz
-_md5_=80059f748aee32f4a8e84ed1e4d6548e
diff --git a/metadata/md5-cache/net-nntp/tin-2.6.1 b/metadata/md5-cache/net-nntp/tin-2.6.1
index 38623312abb9..9207167f1228 100644
--- a/metadata/md5-cache/net-nntp/tin-2.6.1
+++ b/metadata/md5-cache/net-nntp/tin-2.6.1
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/icu:= dev-libs/libpcre:3 dev-libs/uulib sys-libs/ncurses:=[unic
 SLOT=0
 SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-2.6.1.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7cdf92925d9b093d5d96a563060b4e91
+_md5_=4b44a949d066989220aa6e86355854fd
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 2fda3ae998d1..653b465c2152 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
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 51afc303ecf8..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_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_8? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
-DESCRIPTION=Unit conversion program
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/units/units.html
-INHERIT=python-r1
-IUSE=+units-cur python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_8? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
-REQUIRED_USE=units-cur? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=0796eea06ac5abf0d65007e08c71b3ef
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..72fa804bc068
--- /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_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_8? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
+DESCRIPTION=Unit conversion program
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/units/units.html
+INHERIT=python-r1
+IUSE=+units-cur python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+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_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_8? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
+REQUIRED_USE=units-cur? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+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	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=7ba99451891d959b24fe1874c525c9ac
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 4a529c671de0..e7d185d8bb42 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
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/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 887c57e49ba2..65c28ae9b6ff 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/fakeroot-ng-0.18-r1 b/metadata/md5-cache/sys-apps/fakeroot-ng-0.18-r1
deleted file mode 100644
index fdea616f21cf..000000000000
--- a/metadata/md5-cache/sys-apps/fakeroot-ng-0.18-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A utility to run commands with fake root privileges
-EAPI=7
-HOMEPAGE=https://fakeroot-ng.lingnu.com/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/fakerootng/fakeroot-ng-0.18.tar.gz
-_md5_=ed061564039c9408f23a44b29449945d
diff --git a/metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806 b/metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806
deleted file mode 100644
index 8f36232c5360..000000000000
--- a/metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/gtk+:2
-DESCRIPTION=A simple graphical frontend for pmount
-EAPI=7
-HOMEPAGE=http://git.tdb.fi/?p=pmount-gui.git;a=summary
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=x11-libs/gtk+:2 sys-apps/pmount virtual/udev
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ssuominen/pmount-gui-0_pre20130806.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3b552098e628861625a35724c3a39649
diff --git a/metadata/md5-cache/sys-apps/texinfo-7.0.1 b/metadata/md5-cache/sys-apps/texinfo-7.0.1
index 8a7e0dccd6b7..62243767c3b0 100644
--- a/metadata/md5-cache/sys-apps/texinfo-7.0.1
+++ b/metadata/md5-cache/sys-apps/texinfo-7.0.1
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=sys-devel/gettext-0.19.6 )
+BDEPEND=sys-apps/help2man 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 )
 DESCRIPTION=The GNU info program and utilities
@@ -12,4 +12,4 @@ RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper
 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_=56227c9e0e43ef8ef05efeec5d5b011c
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..4ebf4132475f 100644
--- a/metadata/md5-cache/sys-apps/texinfo-7.0.1-r1
+++ b/metadata/md5-cache/sys-apps/texinfo-7.0.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=sys-devel/gettext-0.19.6 )
+BDEPEND=sys-apps/help2man 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 )
 DESCRIPTION=The GNU info program and utilities
@@ -12,4 +12,4 @@ RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper
 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_=60027f75b3a9d9cf6d17baeeba4ba5b3
diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e-r2 b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e-r2
deleted file mode 100644
index 6f07e8b824c3..000000000000
--- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/openssl:= perl? ( dev-lang/perl:= )
-DESCRIPTION=Command-line tools for building SSL client-server applications
-EAPI=7
-HOMEPAGE=https://www.fehcom.de/ipnet/ucspi-ssl.html
-INHERIT=fixheadtails qmail
-IUSE=bindist perl
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86
-LICENSE=public-domain
-RDEPEND=dev-libs/openssl:= perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp
-SLOT=0
-SRC_URI=https://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.99e.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmail	240a1f5bdaca9816f1bf9196653abc13	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=41ab7d8fdbff07ed3722f50850eec6d7
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 48b83bf86ef5..d206dad0d2eb 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
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/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4a9a8fb3f97a..1060ae97a1bc 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.86 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.86
new file mode 100644
index 000000000000..186843220c5b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.86
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+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.86
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-90.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-90.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-90.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-90.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-90.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-90.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	12a98c718ba8260077000c13b965ba1b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=f5915db1ba08e654025a55a5334970d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.0.16 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.0.16
new file mode 100644
index 000000000000..99e643789c79
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.0.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.0 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+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.16
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-16.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-16.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-16.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-16.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-16.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	12a98c718ba8260077000c13b965ba1b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=392369807f15be0a7245f60ea8ab9575
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.2 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.2
new file mode 100644
index 000000000000..a6f447e051d9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.1 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+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.2
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-3.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-3.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-3.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-3.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-3.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	12a98c718ba8260077000c13b965ba1b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=d08e032fdcba3e09e41b93805f955f58
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/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 00d70224548c..e15ee3e4cbe2 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
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/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 585b5941a509..3039b628e0b8 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/httpd-basic-0-r4 b/metadata/md5-cache/virtual/httpd-basic-0-r4
index c77d8c47951b..c535d66e1bff 100644
--- a/metadata/md5-cache/virtual/httpd-basic-0-r4
+++ b/metadata/md5-cache/virtual/httpd-basic-0-r4
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for static HTML-enabled webservers
 EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/fnord www-servers/h2o www-servers/monkeyd www-servers/nginx www-servers/thttpd www-servers/tomcat )
+RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/fnord www-servers/h2o www-servers/monkeyd www-servers/nginx www-servers/thttpd www-servers/tomcat )
 SLOT=0
-_md5_=4a3e91ad2ee87ab3f02206e3127a140f
+_md5_=800d6ff687d0e605f27c684a39792026
diff --git a/metadata/md5-cache/virtual/httpd-cgi-0-r4 b/metadata/md5-cache/virtual/httpd-cgi-0-r4
index 60f698a87fcb..9f595b979d1d 100644
--- a/metadata/md5-cache/virtual/httpd-cgi-0-r4
+++ b/metadata/md5-cache/virtual/httpd-cgi-0-r4
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for CGI-enabled webservers
 EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/fnord www-servers/h2o www-servers/monkeyd www-servers/nginx www-servers/thttpd www-servers/tomcat )
+RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/fnord www-servers/h2o www-servers/monkeyd www-servers/nginx www-servers/thttpd www-servers/tomcat )
 SLOT=0
-_md5_=cc4d71fedbbfbf2a3922b7b5915e252b
+_md5_=50d6e37c204c199b9e881a19a9b9db95
diff --git a/metadata/md5-cache/virtual/opencl-3-r2 b/metadata/md5-cache/virtual/opencl-3-r2
index b5d6f3d22b7c..ac901dca048b 100644
--- a/metadata/md5-cache/virtual/opencl-3-r2
+++ b/metadata/md5-cache/virtual/opencl-3-r2
@@ -4,7 +4,7 @@ EAPI=7
 INHERIT=multilib-build
 IUSE=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=amd64 ppc64 x86
-RDEPEND=|| ( dev-libs/opencl-icd-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=dev-libs/opencl-icd-loader[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
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=35be19a4eed4d96a315a4cbebf2c4e39
+_md5_=93807160bca9297118b92108182b6ebc
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index f240166afe68..5a218c898067 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1-r1 b/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1-r1
deleted file mode 100644
index 2fa1d0b5926c..000000000000
--- a/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2*
-DESCRIPTION=mod_common_redirect implements common redirects without mod_rewrite overhead
-EAPI=6
-HOMEPAGE=https://github.com/hollow/mod_common_redirect
-INHERIT=apache-module
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND==www-servers/apache-2*
-SLOT=0
-SRC_URI=https://nodeload.github.com/hollow/mod_common_redirect/tarball/v0.1.1 -> mod_common_redirect-0.1.1.tar.gz
-_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d
-_md5_=5f8b388dbf51dbc63fc0d1ca27599f97
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 0cab87bfd61a..abdd7c5e2444 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/gitea-1.18.0 b/metadata/md5-cache/www-apps/gitea-1.18.0
new file mode 100644
index 000000000000..c8d987186ecb
--- /dev/null
+++ b/metadata/md5-cache/www-apps/gitea-1.18.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam )
+DESCRIPTION=A painless self-hosted Git service
+EAPI=8
+HOMEPAGE=https://gitea.io https://github.com/go-gitea/gitea
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=fcaps go-module tmpfiles systemd flag-o-matic
+IUSE=+acct pam sqlite pie +filecaps
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git virtual/tmpfiles
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.18.0/gitea-src-1.18.0.tar.gz -> gitea-1.18.0.tar.gz
+_eclasses_=fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	go-module	4c4b34f361efda91762ffeda8f632c02	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=a68e1124f4de22fe45971037543dabbc
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 83bcbe666154..7d3a26e0bd5a 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/boa-0.94.14_rc21-r2 b/metadata/md5-cache/www-servers/boa-0.94.14_rc21-r2
deleted file mode 100644
index bcea95533538..000000000000
--- a/metadata/md5-cache/www-servers/boa-0.94.14_rc21-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex doc? ( virtual/latex-base ) virtual/pkgconfig
-DEFINED_PHASES=compile install
-DESCRIPTION=A very small and very fast http daemon
-EAPI=7
-HOMEPAGE=http://www.boa.org/
-INHERIT=systemd
-IUSE=doc
-KEYWORDS=~amd64 ~mips ~ppc ~riscv ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.boa.org/boa-0.94.14rc21.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f7850a9b89513de3fe8d7e71ecb06adc
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 5243d15f4f51..05abbbb75fd0 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/unclutter-8-r4 b/metadata/md5-cache/x11-misc/unclutter-8-r4
deleted file mode 100644
index d19efb18558b..000000000000
--- a/metadata/md5-cache/x11-misc/unclutter-8-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-base/xorg-proto
-DESCRIPTION=Hides mouse pointer while not in use
-EAPI=6
-HOMEPAGE=http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README
-INHERIT=toolchain-funcs
-KEYWORDS=~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86
-LICENSE=public-domain
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=ftp://ftp.x.org/contrib/utilities/unclutter-8.tar.Z
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=516f81e48b894ec0a8c75c4c7fffeb16
diff --git a/metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1 b/metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
deleted file mode 100644
index 9ec6dfb19fa5..000000000000
--- a/metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11vnc? ( x11-misc/x11vnc ) x11-base/xorg-proto
-DESCRIPTION=A tool for recording Flash SWF movies from VNC sessions
-EAPI=7
-HOMEPAGE=https://www.unixuser.org/~euske/vnc2swf/
-INHERIT=autotools
-IUSE=x11vnc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2+
-RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11vnc? ( x11-misc/x11vnc )
-SLOT=0
-SRC_URI=https://www.unixuser.org/~euske/vnc2swf/vnc2swf-0.5.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=b55227030e3cc24b8f8bb7d002187f26
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c3d55e65a12f..5eb8fd85364c 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14772 BLAKE2B c0ec43cf49df478cb5e350d1531aac9276432611988c7c802f82a19b2bd8015b2549c008676c973d5df46854083de41f73054765216654ba4bed37764d4a75a6 SHA512 e3e6cd7d6c0e6d8e35843328b38fd08e2693bc1ed83efb7e6b4ccd8b373e42dd390050e12471c82dcd3bf19fe6af8c3cf76d04659d93e15bf3785bb8aa0f4bd8
-TIMESTAMP 2022-12-31T13:39:54Z
+TIMESTAMP 2022-12-31T19:39:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOwO6pfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOwkAxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCBwg/+NQrYTmIR4MZKnHReyBOA7it11/p31TDwQ3v2H0/3bdvUnRBkPMRZI1nD
-HA0K5Au3Ou88eI6xNkrLTiDfG/QJo8MIOgWQ7kSrVi9eH7CKIdV+/mfXt5XHEix1
-T7vbdK04VAQO46OmvfjOkRqxWZs8DZjpIk36ecY/G852cmdjcNdzQ/MlIgLRXQAE
-Z+64fFk24xTUnwYb61styiiFG1l4Yg0Yv9BfXLa6Aj04RREZpl36ErB1g9645EY0
-J8aOdZXL03z8KHHSiJPbPqmKEg2s/h7kHZrF9oWzvXPYqFBdl2wC84Sx3gp9e8qJ
-IUab2fQL6fRTyxeImAl+A4CLHDvVpNPhQn1xtces8CYrW7k4beNvOn2yRZXh5TfP
-jLxEtpw9zZw9/lRWc91c6hnqxSiJ0DfEvMZPV2j+fY6/NmpHkteIs6t2QfKzElWv
-7/f98ALM8L3wxX/92/j0ckoIRiBwgSszS4ICmVB1HQdtBtMeHq5OptSItjGdwrrH
-fkoamDOLdB47MS5damh1kJLqCqiV/GdLXNAQ80Rudx+qAsWJ/8KxU58vhFkdePbu
-BTCgAlTEDp/vG4evgxSAIJIRTpNUcExjomz8581zSUZ12eBADCDlWu72kVT3NNTt
-7TI2NH5AeMUca5uMWlL6/vCeBAmU4ue5laZaUSop6p76ak8rcPA=
-=tGBn
+klCmHg//VRfYRt+2QqNQao6xEM5JVZdHaRbCiWPzeVTnAQIofRBUAiYouBGrUel7
+1DzdhRLw89LOPtZMsYcw8+2ngj0YtzjZYTMXjbgYbBpcjk7bZSU/xjOu86b80KGi
+rkjBxvOBPoT7bTwqZVZ66c5FX14Pi4+nhsQPcKqGipf4QlhKRt6aHXCkV6Gjm/ef
+EHwT6UpZPrvgyJZZHdrlZH7gCXzMtvIJzdBY4fHWd7X6ZPaj5cw/nnfdfYdwFuCq
+mqDET2T3m2dg5tuq8jof+h1UDH7ghet58EvtUMc7dHzm35G4GEtp9BWEdLUYhJMo
+gdCB7VMJ89Pjg5xHdsqa0oIwwBPrt1Lu96veoUsdBddYtJ9WGLJZ3qo0TvPSMoR5
+ARkgna5aGlIYxsFZTgEm7C3rcs2YNFLSVKQSXXpyKRrg31YfEqdLmYxyI90c1ofX
+gskpe3WeR2c4szwtLCHwAUx9dWqBEw1uCFoXXLkhLEbplXuDcVFGIinqlnt908kd
+Jk45HmdrpCO2bt2lPPbGaxAlTRjcsSL5JzsNUmQdNFf4AK9jBoZhrYpnIJovg1JG
+QyoC5/ZaBy7jKkaZ7kmuzX7JzWGBM+KueOcGVs/xF+6cPZkxc4DyLy1LE7baP0+3
+WhEqH40dwl5LZHO8x/PpJ9/8j836K3nqZ1WiYBc5tWcxhRG4X1M=
+=svQA
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index cee974a08d9f..bd090626f24f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 31 Dec 2022 13:39:50 +0000
+Sat, 31 Dec 2022 19:39:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 698590dd862b..b1180316b2e6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Dec 31 01:39:49 PM UTC 2022
+Sat Dec 31 07:39:53 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b7925eecf805..2aaf026c6d3e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 31 Dec 2022 13:45:01 +0000
+Sat, 31 Dec 2022 19:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 70e8086cd741..22c08d948840 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ac9229aefd8f3f4d95eb23ce181e63b28619c4f8 1672493504 2022-12-31T13:31:44+00:00
+ad1005791827a64477d8577281c409abcdbe479d 1672514708 2022-12-31T19:25:08+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index febc4b4353a6..3079d48657d1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1672494001 Sat 31 Dec 2022 01:40:01 PM UTC
+1672515601 Sat 31 Dec 2022 07:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index cee974a08d9f..bd090626f24f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 31 Dec 2022 13:39:50 +0000
+Sat, 31 Dec 2022 19:39:53 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d7b0d9cabd36..079fccb6e32f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest
deleted file mode 100644
index befc0648ae16..000000000000
--- a/net-analyzer/snortsam/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX snortsam-2.70-gentoo.patch 8979 BLAKE2B 7df4e769ed440b5bd595b6a62a414d9172ec283ab6f48bd00f5ede432c7430c1c936a9915ca40857216e926ccf7354cf45743e97fdbd945374efe01e403a928c SHA512 17f5b03820491ffbd8eda4b5cc99230ab358788194eb07221a303e98cc0ef5855d347804b30bd21f38d2a6f0e370f2433a691a33db0599c50887857bdadb53b6
-DIST snortsam-src-2.70.tar.gz 1971624 BLAKE2B 10f26afb8addffb52db099e0c376a9adb884b625503233b72203070cadc79a688c7a6950014759d6fb58c8844899482057d9701e9eaa5e9d12066f10e88d6421 SHA512 e0b6d53dfc0963e5a0012e25c1cd15f76263cc0d0158f6a50eab3876f1ae40c47eeafb7309113d27f1ca92d5491a19e32748c3bf51754be9320346ebbf26e5b1
-EBUILD snortsam-2.70-r1.ebuild 1015 BLAKE2B eca02a1a262fd4af2a799f139d91e85237bded56f6dd8835eb9a11498680a0719a5dbd7f3bc4069f13b89a95a5899a25eae5cee73a204f14d8489e79e77ece07 SHA512 ae07e5f8c5e0003aca62caf60ea7f4c0e80d40a3c1246fc08b0df22395ddb5530010820c6d47f5e883036e1de34cd0af4c0cd4537d7c686316683c4ef1a657aa
-MISC metadata.xml 287 BLAKE2B f19164a15f9d23702c60e146fcf4397bdceb885848c02ca219c14841ecf18066f94c8fff216a6d84e5480545161ead3535bf56e949b037fe61e2dbfd0ab33c48 SHA512 ec0634c44ec4f2564927d307807236bf9e623c63ebb6a5a2c8fcf9dc68f0f871eeee52e04675aa30a3aef2d73cbef0446d0ca7675da82e62cc57a1fd593855f0
diff --git a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch b/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
deleted file mode 100644
index f2d8fd330d33..000000000000
--- a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
+++ /dev/null
@@ -1,140 +0,0 @@
- makesnortsam.sh | 66 +++++++++++++++++++++------------------------------------
- 1 file changed, 24 insertions(+), 42 deletions(-)
-
-diff --git a/makesnortsam.sh b/makesnortsam.sh
-index 64c6eb6..37f66c9 100644
---- a/makesnortsam.sh
-+++ b/makesnortsam.sh
-@@ -36,8 +36,7 @@ SSP_OBSD_SRC="ssp_pf.c ssp_pf2.c"
- SSP_BSD_SRC="ssp_ipf.c ssp_ipfw2.c ssp_pf2.c"
- SSP_SUNOS_SRC="ssp_ipf.c"
- 
--CFLAGS="-O2 -D${systype}"
--LDFLAGS=
-+CFLAGS=" ${CFLAGS} -D${systype}"
- 
- # OS specific flags
- LINUX_CFLAGS=
-@@ -72,23 +71,23 @@ case "$1" in
- 
- 		case "${systype}" in
- 			Linux*)
--				gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
--					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM}
-+				${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} \
-+					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS}
- 				;;
- 
- 			OpenBSD*)
--				#gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
--				gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
-+				#${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
-+				${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
- 					${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM}
- 				;;
- 
- 			*BSD*)
--				gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
-+				${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
- 					${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM}
- 				;;
- 
- 			SunOS*)
--				gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
-+				${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
- 					${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM}
- 				;;
- 		esac
-@@ -104,23 +103,23 @@ case "$1" in
- 
- 		case "${systype}" in
- 			Linux*)
--				gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
-+				${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
- 					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM}
- 				;;
- 
- 			OpenBSD*)
--				#gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
--				gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
-+				#${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
-+				${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
- 					${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM}
- 				;;
- 
- 			*BSD*)
--				gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
-+				${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
- 					${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM}
- 				;;
- 
- 			SunOS*)
--				gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
-+				${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
- 					${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM}
- 				;;
- 		esac
-@@ -152,10 +151,10 @@ case "$1" in
- 		rm -f ${SAMTOOL}-debug
- 
- 		case "${systype}" in
--			Linux*)   gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
--			OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
--			*BSD*)    gcc ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
--			SunOS)    gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
-+			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
-+			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
-+			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS}  ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
-+			SunOS)    echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} $${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
- 		esac
- 
- 		echo "-------------------------------------------------------------------------------"
-@@ -167,10 +166,10 @@ case "$1" in
- 		SAMTOOL="${SAMTOOL}-debug"
- 
- 		case "${systype}" in
--			Linux*)   gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
--			OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
--			*BSD*)    gcc ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
--			SunOS)    gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
-+			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;;
-+			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
-+			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
-+			SunOS)    echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
- 		esac
- 		cd ..
- 	;;
-@@ -186,29 +185,12 @@ case "$1" in
- 		rm -f ${SNORTSAM}-debug
- 
- 		case "${systype}" in
--			Linux*)   gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;;
--			OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC}  -o ${SNORTSAM} ;;
--			*BSD*)    gcc ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC}   -o ${SNORTSAM} ;;
--			SunOS*)   gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;;
-+			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;;
-+			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS}  ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC}  ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
-+			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
-+			SunOS*)   echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC}-o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
- 		esac
- 
--
--		echo "-------------------------------------------------------------------------------"
--		echo "Building SnortSam (debug)"
--		echo "-------------------------------------------------------------------------------"
--
--		rm -f *.o
--		CFLAGS="${CFLAGS} -DFWSAMDEBUG"
--		SNORTSAM="${SNORTSAM}-debug"
--
--		case "${systype}" in
--			Linux*)   gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;;
--			OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC}  -o ${SNORTSAM} ;;
--			*BSD*)    gcc ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC}   -o ${SNORTSAM} ;;
--			SunOS*)   gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;;
--
--		esac
--		cd ..
- 		;;
- esac
- 
diff --git a/net-analyzer/snortsam/metadata.xml b/net-analyzer/snortsam/metadata.xml
deleted file mode 100644
index 211445353661..000000000000
--- a/net-analyzer/snortsam/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/net-analyzer/snortsam/snortsam-2.70-r1.ebuild b/net-analyzer/snortsam/snortsam-2.70-r1.ebuild
deleted file mode 100644
index d900b52d06f6..000000000000
--- a/net-analyzer/snortsam/snortsam-2.70-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs vcs-clean
-
-DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
-HOMEPAGE="http://www.snortsam.net/"
-SRC_URI="http://www.snortsam.net/files/snortsam/${PN}-src-${PV}.tar.gz"
-S="${WORKDIR}"/${PN}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="debug"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	ecvs_clean
-}
-
-src_configure() {
-	use debug && append-cflags -DFWSAMDEBUG
-	tc-export CC
-}
-
-src_compile() {
-	sh makesnortsam.sh || die
-}
-
-src_install() {
-	dobin snortsam
-
-	find . -depth -type f -name '*.asc' -delete || die
-	dodoc -r docs/. conf/.
-}
-
-pkg_postinst() {
-	elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
-	elog "Read the INSTALL file to configure snort for snortsam, and configure"
-	elog "snortsam for your particular firewall."
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 4c789ed31862..30ed1af62363 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dog/Manifest b/net-dns/dog/Manifest
deleted file mode 100644
index 0a78913a2553..000000000000
--- a/net-dns/dog/Manifest
+++ /dev/null
@@ -1,63 +0,0 @@
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
-DIST cc-1.0.61.crate 53454 BLAKE2B 250a847faed1e7ae0a7d3d0f15511222a8cae499aed1e6736d65234d6915cd64abf0b01df5bcc38ff2800902854ed57b297fea2c63d41a480b02cb07863a7490 SHA512 c238590712c5359040ff9670fb60690d983b1a2aa53ab7031f552b4eb026c9e305f401ade77ee389eff90dbadfed6eb1978f67bfa143589a0e0ccf39edafb5d6
-DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
-DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
-DIST ctor-0.1.16.crate 4770 BLAKE2B d1234c086e370d0f86b3ef7011c111a0e439c94ce0aa25bf16fde3496056d3143e5798b7eee1d47c72d90f564dbba06e49d9e7cd381597276c1789b47fbcd574 SHA512 68b4a39ff49bd1ccbbf467da5f376cffb68ca10290ee9c587b063f7281c84d36a5c93ae242702e2135b53178de984d99d4dc0c246d4fbd566b8e81b573f442b3
-DIST datetime-0.5.1.crate 117665 BLAKE2B dcada54d4232d9c163ee89a6836946ef0d18fc14b2979b0067fadd06d1fc36d40cec1a9dfce9f6d990e4c3432d7af456b3dc12444f17defa81c1f7e4e210d847 SHA512 4927cd48aa1a53a3c65cc22dca134c05cc1e024068fac715bb0ba2f0a13b151c564ff356a46c95ba5d8aec6b468907c2bdd862e9d4a25d021ff51f3231a0f4d5
-DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
-DIST dog-0.1.0.tar.gz 449366 BLAKE2B 7ea52027e73deb6db6cb67b89063cddd507246256b3ca93479a634ff6696ab6961f004da8272b4c535067868603d8218b44c3696e34b5126371a9e0d5fc36058 SHA512 03af5414b995710d22ea19bdbf382def4e53ae2870f396b4103546743c9cafcc445ee0819b6c8b7f435793fead5ebd03f091be89293a32847868a5544b4bc0e5
-DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
-DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
-DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
-DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
-DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
-DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
-DIST ipconfig-0.2.2.crate 23017 BLAKE2B 8e8358c30cb53bbfd58e002ec0e2ec7540970ef80809aa1124af907f8858ba2723adc0fc16bb5f79f0413f0cf4f44b2107fc62faccff3e6c58133871bfd4c08a SHA512 50e5685bcc0c422ac840b51c8309890ce978f2bdd16acb57600c5c468f4cbaaa31dcf136bdaef6de279713d2e6c21f96e54c3b4c6bb0b29daa2635d6be0c50ba
-DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c
-DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
-DIST native-tls-0.2.4.crate 32170 BLAKE2B ff0e24edcf4b1014e95990dcff7a5f2139bd3623b6b9809cf8fb95fe11720b8fbd0e563bfdfead36935e4d162b7c0829f51934d8ec191ad34bfe1d2ad2ede4a5 SHA512 810cda42159f302d315f05dde222e3ee20cfa30958d48bc547837f7d6df87a1b51d1239de90cc2901f48581be978c11f8e758fd69213a8a8fa85c71266302632
-DIST openssl-0.10.30.crate 191808 BLAKE2B a6c76278f0d5fa3cb27eacab96d6430dcfb04deeb37cb8c6ecdc9b446f1bc8c44a69dcd83f50a8c50c56a49e8950303e807f05e90de3040a616f9c47a2f0caaa SHA512 058e9a483a9d0936e77626698bea5049608a9cc4e59a406b39c0b678f78c9207c5604286473dab334fe1d10d850fabcd786c6b54888a7affadb594f9459f5dc9
-DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
-DIST openssl-sys-0.9.58.crate 47014 BLAKE2B a66f90a5cd9fc82ff22ad7481ca9e4a92c78852d25ee4151c09d5a4d23823942c28bed5d96d5130eeae005573d7120e7e5187a071ae81ff10572cebcc7db8b3f SHA512 098993619ea8effaa03ab61a0eaebc938d23cb8e5284b2dd45499972ae4c79abc36cbeeb51f34861a36816de9d02e2cece673f32fd042880669e99cfff181481
-DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
-DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
-DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
-DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e67515cf8aa528479e14bae9c79193652c435e9513e85b7958016c105ed581fcbae19ceaa742fac6b07374a2e6f7b57a689b2 SHA512 10010c6e6b02098def38a8e6cbfe34fd052fe5773628d57a8141c7933f868906870158b4d4b1948b752d2c5f7b2981806d5f835e125aa2447d408415ba764f71
-DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
-DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
-DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
-DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
-DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
-DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
-DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
-DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
-DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
-DIST security-framework-0.4.4.crate 54841 BLAKE2B 75cc13b6053b491564b9e5329cf56c2da8800e61980a7030d51b09cabe2275a33844a4eb8b030dc96292c54211a37c2e638ec7c2dc4b1f650d57b4eb782b7413 SHA512 d17788d1300ce6d6a552f78b278f50056800aeeaadf7039576ce75e975aa371c2c9b86de2aa2c96e8b208d9240d246e0230f8788372f0e0f800d55a7ae8b7955
-DIST security-framework-sys-0.4.3.crate 10508 BLAKE2B fc49b876d89f479c8654059163566d4b7db870dcc21d7e1061ed92fb6e9e1e8751b292b726020f73cd931797436f7fac02ec26ae7306fc826e8c4063cacbc5f8 SHA512 a849f53a0d222299a83b38c55dec7d1282027c7dcd962c8e638afb9aa2f96bc961e93ca2bd34bce424f408d239e09b7baaacde8c2ab53e78860dc31f6bd76746
-DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
-DIST serde_json-1.0.59.crate 114956 BLAKE2B 27552d21b80d88cc3c643b25e5f0105c0d79a7c74c5bc3c2cdcc68050103ad73b75f7ee9d1d5afb60adbae33c351091b180cb1f8aa17c80f06cce4fb4c57f2d8 SHA512 2f9bf96fa770f9be9c43fc889e1671e9bb883f49a820aa69a1709d9f679f21f01cef2b771eea4d1fe7994cf850af44577710521fffdc4cc46d0dc6f913842075
-DIST socket2-0.3.15.crate 29282 BLAKE2B 9ebbdd90073120d0457469907b02ac15cdc1805114fee8475b7be23478ed0215dbbae4506219d95b073f56f668e5b6b808f262da5c9ebae1ddce496166104fdd SHA512 dcd2ba06911d56ceb6859cd4053d8d9d32d485c71af86978dab0d4fd53c96e486c8729f93842711e8e9f2b0f8f4604c904c5ef2426c96660dbc05b3bed237d64
-DIST syn-1.0.48.crate 225747 BLAKE2B f7bfc4c38dec562a6dc7ecb7120c6df5e25ddc8591762bf5018ee0efa506613c9462a79e0e9cbd952cf5fa083abc164608d594bf2a47d226de4b4bdf02da050c SHA512 16b022a418eb9a7e5d651197561c329f749050a1710ff03b1af9a5f580543d00a1724826e0ced044d6ee4ad55dc615fff5a71ad72755e1685c429dc5853d93b3
-DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
-DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
-DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141
-DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST widestring-0.4.3.crate 26215 BLAKE2B 7e5cdbb58a23004bb76cc12d451fd891ef08c05f730b059eb62a0f5e9482dde58c4059f9c0892fb1ebebbc8ee85dd20ece3ebf12c48790dca5eaeeb20b81dc34 SHA512 48561bd8a3b589f2a0328d1286177fbc6c5bc534756898912cbaab81d742b64ef898eed75073484d5e30762ceda9d2e88710074e7e9ce1a7dd43b5d871de3860
-DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779cb365ad2fc97686a6c13de6a91d6204856ea35a18b86a7f32e8d4ac1ea2d2c096d7dd3e42f78400752cd3e2 SHA512 a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102
-EBUILD dog-0.1.0.ebuild 2022 BLAKE2B 31bbb81bcaf52c958d8a4ba476222c8e89f3df6a7c48757bcaeebb1f97df7831aa84dcefe35da47312885842051de2c51abff5f5bf7e03432bf6041716d74aaa SHA512 f1924ad8d0aa50fe9ab455152d5d84cbe79ea7d0fb2398c9a62a47a1b7abcfbcd82f2bbcb65bd40a375b591f9d82c09c8d5a0d468d1dd2e778d7a750f39d4fa3
-MISC metadata.xml 319 BLAKE2B df58eea03bd65b8302730ab63e63c32ac826fe24e97eeb5c67d7cb2c66e3f1d0129a925a33b381632144e7862f772913dfedba7e175689ff261bc3c9e28bf843 SHA512 d4fb851d1b1b3ab427299b499476bc524d458907264a7f86405afe4325cba2028023a3192e3738439161af8afe9ba5944d0fbf7825045dfa6caeb0a272f15d0b
diff --git a/net-dns/dog/dog-0.1.0.ebuild b/net-dns/dog/dog-0.1.0.ebuild
deleted file mode 100644
index b129d26d04b9..000000000000
--- a/net-dns/dog/dog-0.1.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-ansi_term-0.11.0
-ansi_term-0.12.1
-atty-0.2.14
-autocfg-1.0.1
-bitflags-1.2.1
-byteorder-1.3.4
-cc-1.0.61
-cfg-if-0.1.10
-core-foundation-0.7.0
-core-foundation-sys-0.7.0
-ctor-0.1.16
-datetime-0.5.1
-difference-2.0.0
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-getopts-0.2.21
-getrandom-0.1.15
-hermit-abi-0.1.17
-httparse-1.3.4
-ipconfig-0.2.2
-itoa-0.4.6
-lazy_static-1.4.0
-libc-0.2.80
-log-0.4.11
-native-tls-0.2.4
-openssl-0.10.30
-openssl-probe-0.1.2
-openssl-sys-0.9.58
-output_vt100-0.1.2
-pkg-config-0.3.19
-ppv-lite86-0.2.10
-pretty_assertions-0.6.1
-proc-macro2-1.0.24
-quote-1.0.7
-rand-0.7.3
-rand_chacha-0.2.2
-rand_core-0.5.1
-rand_hc-0.2.0
-redox_syscall-0.1.57
-regex-1.4.2
-regex-syntax-0.6.21
-remove_dir_all-0.5.3
-ryu-1.0.5
-schannel-0.1.19
-security-framework-0.4.4
-security-framework-sys-0.4.3
-serde-1.0.117
-serde_json-1.0.59
-socket2-0.3.15
-syn-1.0.48
-tempfile-3.1.0
-unicode-width-0.1.8
-unicode-xid-0.2.1
-vcpkg-0.2.10
-wasi-0.9.0+wasi-snapshot-preview1
-widestring-0.4.3
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-winreg-0.6.2
-"
-
-inherit cargo
-
-DESCRIPTION="A command-line DNS client like dig"
-HOMEPAGE="https://dns.lookup.dog https://github.com/ogham/dog"
-SRC_URI="$(cargo_crate_uris ${CRATES})
-	https://github.com/ogham/dog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EUPL-1.2 Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense unicode"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ssl"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	!sys-apps/dog
-"
-DEPEND="
-	${RUST_DEPEND}
-	dev-go/go-md2man
-	${RDEPEND}
-"
-QA_FLAGS_IGNORED="/usr/bin/dog"
-
-src_prepare() {
-	default
-	sed -e '/mutagen/d' -e '/features/d' -i dns/Cargo.toml || die
-	go-md2man -in man/dog.1.md -out dog.1 || die
-	rm -rf man || die
-}
-
-src_configure() {
-	local myfeatures=(
-		$(usex ssl tls '')
-		$(usex ssl https '')
-	)
-	cargo_src_configure --no-default-features
-}
-
-src_install() {
-	cargo_src_install
-	doman dog.1
-}
diff --git a/net-dns/dog/metadata.xml b/net-dns/dog/metadata.xml
deleted file mode 100644
index d49f098e416e..000000000000
--- a/net-dns/dog/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ogham/dog</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 12d1e70a420e..bb4a1ad95cfd 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
deleted file mode 100644
index d5d9d7fa75c1..000000000000
--- a/net-libs/ortp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ortp-0.23.0.tar.gz 540135 BLAKE2B 46bc411df48f7f8a2fd180ff75dc5f515c36a71bcaced0d3fcf5336ee8e142c6ae6d597ba39a92c38be78ce74d3eb79692f26596f37075829850222cdf381793 SHA512 70560168f1b138ad825e4e836e7ee218bd24b92a2d76666ba2794a4b31cadbdd8fdd40fee78d612187cde6a827005cbd836cdfc13a70947374356fb84a853ea4
-EBUILD ortp-0.23.0-r1.ebuild 1814 BLAKE2B 1eb39eb3d5b828392848ab307f0c9a385edfc2804ee1b20be08eef604656b71ce10ea334ca7f6114e3c6de42849e76750203f0ef023f787df01d9dbf7574aa8a SHA512 9ae4479564bbc1e4bf1397209cc9c358b811f221759f14833eee4cce1d43a2bdca91f3c2f5653fb82f21036b0ec4c1e3ad49eee9bb320deded65c2ee2a571d5d
-MISC metadata.xml 316 BLAKE2B e16fed41cfbd59c6adccffb0b20facd5b784ef68c5a2b894771d5635fc26f70c3797da37f67dcc06322bb8c897490b2b86e6fa28a7795c09f5753d03fe4bb080 SHA512 1173ac9eccfce2a1b3a034d7dde64824659ab1f033a80ef03389894d67f95f82016513eac13fbd54a3c6a795389200a9072685263c83ca222fcf627539fcf19c
diff --git a/net-libs/ortp/metadata.xml b/net-libs/ortp/metadata.xml
deleted file mode 100644
index 1b5d3956df0b..000000000000
--- a/net-libs/ortp/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<use>
-		<flag name="ntp-timestamp">Turn on NTP timestamping on received packet</flag>
-		<flag name="srtp">Add support for Secure RTP</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-libs/ortp/ortp-0.23.0-r1.ebuild b/net-libs/ortp/ortp-0.23.0-r1.ebuild
deleted file mode 100644
index 464e2482fe77..000000000000
--- a/net-libs/ortp/ortp-0.23.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/9"
-KEYWORDS="~alpha amd64 arm64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="debug doc examples ipv6 minimal ntp-timestamp ssl srtp"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	srtp? ( net-libs/libsrtp:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	# ${P} is added after ${docdir}
-	if use doc; then
-		sed -i -e 's/$(docdir)\/$(PACKAGE)-$(VERSION)/$(docdir)/' Makefile.in \
-			|| die "patching Makefile.in failed"
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		# memcheck is for HP-UX only
-		--disable-memcheck
-		# mode64bit adds +DA2.0W +DS2.0 CFLAGS wich are needed for HP-UX
-		--disable-mode64bit
-		# strict adds -Werror, do not want it
-		--disable-strict
-		# they seriously failed to understand AC_ARG_ENABLE...
-		--disable-tests_enabled
-		--enable-fast-install
-		--enable-libtool-lock
-		# this is fine as long as we do not link to polarssl
-		--enable-broken-srtp
-		# zrtp removed from the tree
-		--disable-zrtp
-
-		$(use_enable debug)
-		$(use_enable ipv6)
-		$(use_enable minimal perf)
-		$(use_enable ntp-timestamp)
-		$(use_enable ssl ssl-hmac)
-
-		--with-srtp=$(usex srtp "${EPREFIX}"/usr none)
-		$(use doc || echo ac_cv_path_DOXYGEN=false)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc src/tests/*.c
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index c35c4be5fdb9..d52ba97fe9ba 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
deleted file mode 100644
index f24995ef6ed6..000000000000
--- a/net-mail/metamail/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX metamail-2.7.45.3-CVE-2006-0709.patch 1900 BLAKE2B 8261d06b58fd84d2e35b7a2e45d8f5516f351700dc1ea1c079fc11ddaf7a3cb72416e66503abe78f464398dcea219cbc386a81dfaa4a9148b33503abd2208429 SHA512 41e527767582c55ebce32ff91db0510af402a35119ce680e84cdc032701f25faee336cee303ca8891b4d870a91991fd1c4ccb455042032d4337ae247a3a3dfa1
-AUX metamail-2.7.53.3-glibc-2.10.patch 718 BLAKE2B 83a95d5e03008f16449676ea6e8631e2447b77758155431355c804543afa509fba81627cb6e2d93af5e9e6e0d7853a82afb12a657c8afc970c1f6b768dd10394 SHA512 077ad34f5d7664ef9824b623c17d9828b64aa63045f854b4b65567a35bf6fd1d5753d6d3186e3a7d6b63c2854f23cb566911c6bc4dc0904ad7d035229b2543e4
-DIST metamail_2.7-53.diff.gz 322363 BLAKE2B bfb3ee13816a62f03ba5cdc3e54957b03d41662d1d32a908b7a02d92490f4c5eafd8e57d945e18902b873c9bbc4615ce7819bfb4fea3f227e1ca918aaa81fd28 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed
-DIST mm2.7.tar.Z 262881 BLAKE2B da245467b5dd009eb489e136d072205e5bc4a190b2b3a9c558f30c7dc6dfbecff8df1f51359cdc2561f7cd85519a6fd40705f2f640cb6632857507cb6bd551fe SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e
-EBUILD metamail-2.7.53.3-r3.ebuild 1723 BLAKE2B 4af9b69d45878bfd750f054c34535a25cfdb2de8c8465894202fdcb4cd0db79a5841984920287fa870b1f804a3d3200a22616a33614653258a330dcab2043152 SHA512 3ae29c12b9635fc9f1cd721b8155b700a2fb025cf9f4bc56381ef27d21530270774c49c8d8cfbf243674b85e6972da4543f61a14ee9b59b8e595bcfa843eef10
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/metamail/files/metamail-2.7.45.3-CVE-2006-0709.patch b/net-mail/metamail/files/metamail-2.7.45.3-CVE-2006-0709.patch
deleted file mode 100644
index 6572a514c37c..000000000000
--- a/net-mail/metamail/files/metamail-2.7.45.3-CVE-2006-0709.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/src/metamail/metamail.c.old	2006-03-14 10:13:35.000000000 -0800
-+++ src/src/metamail/metamail.c	2006-03-14 10:11:52.000000000 -0800
-@@ -313,7 +313,7 @@
-             WroteSquirrelFile = 0;
-         }
-         LineBuf = XMALLOC(char, LINE_BUF_SIZE);
--        sprintf(LineBuf, "--%s", boundary);
-+        snprintf(LineBuf, LINE_BUF_SIZE, "--%s", boundary);
-         strcpy(boundary, LineBuf);
-         boundarylen = strlen(boundary);
-         if (BoundaryCt >= BoundaryAlloc) {
-@@ -1712,7 +1712,7 @@
-                         if (boundary[0] == '"') {
-                             boundary=UnquoteString(boundary);
-                         }
--                        sprintf(LineBuf, "--%s", boundary);
-+                        snprintf(LineBuf, LINE_BUF_SIZE, "--%s", boundary);
-                         strcpy(boundary, LineBuf);
-                         boundarylen = strlen(boundary);
-                         if (BoundaryCt >= BoundaryAlloc) {
---- src/metamail/metamail.c.old	2006-03-14 10:12:39.000000000 -0800
-+++ src/metamail/metamail.c	2006-03-14 10:14:53.000000000 -0800
-@@ -445,7 +445,7 @@
-         }
-         LineBuf = malloc(LINE_BUF_SIZE);
-         if (!LineBuf) ExitWithError(nomem);
--        sprintf(LineBuf, "--%s", boundary);
-+        snprintf(LineBuf, LINE_BUF_SIZE, "--%s", boundary);
-         strcpy(boundary, LineBuf);
-         boundarylen = strlen(boundary);
-         if (BoundaryCt >= BoundaryAlloc) {
-@@ -2115,7 +2115,7 @@
-                         if (boundary[0] == '"') {
-                             boundary=UnquoteString(boundary);
-                         }
--                        sprintf(LineBuf, "--%s", boundary);
-+                        snprintf(LineBuf, LINE_BUF_SIZE, "--%s", boundary);
-                         strcpy(boundary, LineBuf);
-                         boundarylen = strlen(boundary);
-                         if (BoundaryCt >= BoundaryAlloc) {
diff --git a/net-mail/metamail/files/metamail-2.7.53.3-glibc-2.10.patch b/net-mail/metamail/files/metamail-2.7.53.3-glibc-2.10.patch
deleted file mode 100644
index 7da331adbbf8..000000000000
--- a/net-mail/metamail/files/metamail-2.7.53.3-glibc-2.10.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur mm2.7.orig/src/metamail/uue.c mm2.7/src/metamail/uue.c
---- mm2.7.orig/src/metamail/uue.c	1993-07-28 21:31:02.000000000 +0300
-+++ mm2.7/src/metamail/uue.c	2009-08-07 12:09:35.000000000 +0300
-@@ -30,7 +30,7 @@
- }
- 
- 
--getline (buf, size, fp)
-+get_line (buf, size, fp)
- char *buf;
- int size;
- FILE *fp;
-@@ -70,7 +70,7 @@
-     char buf[63];
- 
-     while (1) {
--	if (getline (buf, sizeof buf, infp) < 0) {
-+	if (get_line (buf, sizeof buf, infp) < 0) {
- 	    fprintf (stderr, "Premature EOF!\n");
- 	    return;
- 	}
-@@ -82,7 +82,7 @@
- 	}
-     }	
-     while (1) {
--	if (getline (buf, sizeof buf, infp) < 0) {
-+	if (get_line (buf, sizeof buf, infp) < 0) {
- 	    fprintf (stderr, "Premature EOF!\n");
- 	    return;
- 	}
diff --git a/net-mail/metamail/metadata.xml b/net-mail/metamail/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-mail/metamail/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-mail/metamail/metamail-2.7.53.3-r3.ebuild b/net-mail/metamail/metamail-2.7.53.3-r3.ebuild
deleted file mode 100644
index 1d4ff4fdfb68..000000000000
--- a/net-mail/metamail/metamail-2.7.53.3-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-MY_PV=$(ver_cut 1-2)
-DEB_PV=${MY_PV}-$(ver_cut 3)
-
-DESCRIPTION="Metamail (with Debian patches) - Generic MIME package"
-HOMEPAGE="http://ftp.funet.fi/pub/unix/mail/metamail/"
-SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
-	mirror://debian/pool/main/m/metamail/metamail_${DEB_PV}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="sys-libs/ncurses:=
-	app-arch/sharutils
-	net-mail/mailbase"
-RDEPEND="
-	${DEPEND}
-	app-misc/mime-types
-	sys-apps/debianutils
-	!app-misc/run-mailcap"
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/mm${MY_PV}/src
-
-src_prepare() {
-	eapply "${WORKDIR}"/metamail_${DEB_PV}.diff
-	eapply "${FILESDIR}"/${PN}-2.7.45.3-CVE-2006-0709.patch
-	eapply "${FILESDIR}"/${P}-glibc-2.10.patch
-
-	# respect CFLAGS
-	sed -i -e 's/CFLAGS/LIBS/' \
-		"${S}"/src/{metamail,richmail}/Makefile.am || die
-
-	# add missing include - QA
-	sed -i -e '/config.h/a #include <string.h>' \
-		"${S}"/src/metamail/shared.c || die
-
-	# Fix building with ncurses[tinfo]
-	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \
-		src/richmail/Makefile.am \
-		src/metamail/Makefile.am || die
-
-	eapply_user
-	eautoreconf
-	chmod +x "${S}"/configure
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CREDITS README
-	rm man/mmencode.1
-	rm man/mailcap.5
-	doman man/* debian/mimencode.1 debian/mimeit.1
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}
diff --git a/net-mail/vchkuser/Manifest b/net-mail/vchkuser/Manifest
deleted file mode 100644
index 38a8969ab301..000000000000
--- a/net-mail/vchkuser/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vchkuser-0.4.tar.gz 5890 BLAKE2B 2b48f085fdc6acd86cce3c1e12ad2e445ef1059e6f1446719cbfb3649cfe67df36255cc220ef063fbd699d7f26bb1cefde20a0759cc45e0e92ea93c6711f1015 SHA512 3c33a1c26abeaf45ca90ac1f1c9cf7b1ae6eba3f6e5a8d0d8d0d12dce98fbada4209cd916af7af69d7682c174d88741b1140e5c758a08e0d196e73f2b6145699
-EBUILD vchkuser-0.4-r1.ebuild 965 BLAKE2B d961c42935552e63457b57bac37d56cfb18485ffc0d8d5a95d78e49bf476d903a4e85875b29ca6b1e11ede819090bae4bd337322bfb41addea93ae4509729963 SHA512 1a1b298ffc054147bdc6ebdb64f0dc6ce7f491d2d85fe467ca7aa46c811a3e0c2ab0765549628e505bd18e1ce21daf9e90db27272a904841bbdde26f28daedb7
-MISC metadata.xml 324 BLAKE2B 87635b8bbfda42277ecb70ca546061214be901b4e13956b4220ec934ae030cef97badfa58fbff8a7c438d7f78d48e611189ebe5e41fd8653d1cb82e91cbf8c27 SHA512 dc65cbdd04d083e1e1bd577fbd6cb69a28d2100eb8e6b4e9a7f7f02f7b8fdc3d235cbe100278666302b7b1053ae74dde7e3b4a4a9791d1e36a2176bde1f46ab2
diff --git a/net-mail/vchkuser/metadata.xml b/net-mail/vchkuser/metadata.xml
deleted file mode 100644
index fcc1a7eab8a0..000000000000
--- a/net-mail/vchkuser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="debug">Enables debug messages to syslog</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">hollow/vchkuser</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/vchkuser/vchkuser-0.4-r1.ebuild b/net-mail/vchkuser/vchkuser-0.4-r1.ebuild
deleted file mode 100644
index b7a64c31e963..000000000000
--- a/net-mail/vchkuser/vchkuser-0.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools qmail
-
-DESCRIPTION="qmail-spp plugin to check recipient existance with vpopmail"
-HOMEPAGE="https://github.com/hollow/vchkuser"
-SRC_URI="https://github.com/hollow/vchkuser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	dev-libs/libpcre
-	net-mail/vpopmail
-	virtual/libcrypt:=
-	|| (
-		mail-mta/netqmail[qmail-spp]
-		mail-mta/qmail-ldap[qmail-spp]
-	)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/hollow-${PN}-8a048f7"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--with-vpopuser=vpopmail \
-		--with-qmailgroup=nofiles \
-		--with-vpopmaildir="${EPREFIX}"/var/vpopmail \
-		--with-qmaildir=${QMAIL_HOME}
-}
-
-src_install() {
-	default
-
-	fowners vpopmail:nofiles "${QMAIL_HOME}"/plugins/vchkuser
-	fperms 4750 "${QMAIL_HOME}"/plugins/vchkuser
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c7a6bd03b3c1..abe0e6717388 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
deleted file mode 100644
index dbce6288a8fd..000000000000
--- a/net-misc/cfengine/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX cf-execd.rc6 319 BLAKE2B 0abc025c3b122627576a4f93b7963a5bfc4b9695153e02b855812cab529ada9acbddbbda63095f893eeccf3d5c1c6b861d5f7130db31d56ebbad3d70c9d33af4 SHA512 cac7ac5126d8d2f3c3acf61a694e89f6a2cddbf0748442e4ce82064a520c077adf2bf6cdcd8dda398b684699c03031e9b48178bd21c97badaa84a2776a04998d
-AUX cf-monitord.rc6 316 BLAKE2B b19ff5106f87b5fed13e090552c9aa00b67d8c6597525e055823638a9c7909da810efddea216177b42557ac15ea760c89e488960526a624c4c7a7b3c30f0dd78 SHA512 d141891e6cac6ddc4dad6c7caa623e5fb43846a91c23ae99fcc27e9fad5aeed6c5ee2ddc4bf88363523bd04c977241d649b818833e13a58319c4b8a48efadb1a
-AUX cf-serverd.rc6 311 BLAKE2B 82ee5abedac139a55ff886c8503d17f6ef35a3da9bb14975b5e9647652545869cfd30cadb3ed553c868040a23f4a42a6da6eb29aed8a4cece5bb19401108b835 SHA512 ef22d159ab71c311e5105709956cfca11dbe1569de4278a87bfbe82a496ac9b0e715b35f65b66a36dc84b7f4254d00172f16ab72240348282f9702b084a7b8bf
-AUX cfengine-3.6.2-ifconfig.patch 486 BLAKE2B c8ccad409a64f1a0232fc800fe3787ece597c63728a7dd890ffbf363bed81d2be22b6354df9acf6d7082fe573418ba53e805ce1581251a458811cccb084a144e SHA512 f2cd1c008f3d4dea418207660c6d6cc4769e7effa50259b59e74ecc3e6fc1581f282fec1482046f50c0e0aa46d40084aa1616bd618de33ae3055ce626bfa9c5d
-AUX cfengine-3.6.2-sysmacros.patch 555 BLAKE2B e1111a7cd5dd1b28787c0db6af1f55fed2b95ac3f1267eb5ad516584f6bf4c070a5243185808ce772c2a70171bcf3e5eb331bc0cfc5b82a04e8dccd99fdce761 SHA512 404468a5e10b535c8f10c2cff9c8928730a4323145cd29cfc080cd3af9effef1b890fb038f3dad8d84ba67d1af72b402d35cc1f382ff34fb0cdd07b8af23732c
-DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
-DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
-EBUILD cfengine-3.6.2-r1.ebuild 4223 BLAKE2B d2d7a41ddefc5649a5dee43e95416fad9ecab14debaedf8a7f1cd8ad67dbc5fde1a104b89921c330c203e8eac234420be509c42943e93ad345236adcf1f8393a SHA512 c60eefa03c939b6f01c9f8d9c9a8b0249a9882a30ddcf8a716e16def13ca3bb7eeea9bac280e9f50735ef2298445c750d21cf7b4aee607e4c67edd66f9b23f68
-MISC metadata.xml 2059 BLAKE2B e4209b077bcc24a7023de92434a76ff2ba6c7eeeb7cb0cfcc5ffaf5b013581c5d3d7d76b9e06fb8ef60836f82d874987cf25b673bf9dbd7bd43181c06fc64220 SHA512 46eeec6d3549f1295fb5de51690ae3735057784c34c4950ba0eb9cc38fed355010602e6c36a03026b6465c4bbd6183ecb0ad946c991910ee707de0c524001417
diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
deleted file mode 100644
index e9cd762ac986..000000000000
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An suite of programs for configuring and maintaining Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz
-	masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz -> ${PN}-masterfiles-${MY_PV}.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet vim-syntax xml"
-
-DEPEND="acl? ( virtual/acl )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )
-	selinux? ( sys-libs/libselinux )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	qdbm? ( dev-db/qdbm )
-	libvirt? ( app-emulation/libvirt )
-	xml? ( dev-libs/libxml2:2  ) \
-	dev-libs/openssl:=
-	dev-libs/libpcre:=
-	net-libs/libnsl:="
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-REQUIRED_USE="^^ ( qdbm tokyocabinet )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-ifconfig.patch"
-		"${FILESDIR}/${P}-sysmacros.patch"
-	)
-	default
-	eautoreconf
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if use masterfiles; then
-		unpack ${PN}-masterfiles-${MY_PV}.tar.gz
-	fi
-}
-
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-
-	econf \
-		--enable-fhs \
-		--docdir=/usr/share/doc/${PF} \
-		--with-workdir=/var/cfengine \
-		--with-pcre \
-		$(use_with acl libacl) \
-		$(use_with qdbm) \
-		$(use_with tokyocabinet) \
-		$(use_with postgres postgresql) \
-		$(use_with mysql mysql check) \
-		$(use_with libvirt) \
-		$(use_enable selinux)
-
-	# Fix Makefile to skip inputs, see below "examples"
-	#sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
-	# We install the documentation through portage
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
-
-	emake DESTDIR="${D}" install
-
-	# fix ifconfig path in provided promises
-	find "${ED}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
-
-	# Evil workaround for now..
-	mv "${ED}"/usr/share/doc/${PN}/ "${ED}"/usr/share/doc/${PF}
-
-	dodoc AUTHORS
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/example*
-	fi
-
-	# Create cfengine working directory
-	dodir /var/cfengine/bin
-	fperms 700 /var/cfengine
-
-	# Copy cfagent into the cfengine tree otherwise cfexecd won't
-	# find it. Most hosts cache their copy of the cfengine
-	# binaries here. This is the default search location for the
-	# binaries.
-	for bin in promises agent monitord serverd execd runagent key; do
-		dosym ../../../usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
-	done
-
-	if use masterfiles; then
-		insinto /var/cfengine
-		doins -r "${WORKDIR}/masterfiles"
-	fi
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT=/var/cfengine/masterfiles' >"${ED}/etc/env.d/99${PN}" || die
-}
-
-pkg_postinst() {
-	echo
-	elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0"
-	echo
-	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
-	echo
-
-	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-
-	# Fix old cf-servd, remove it after some releases.
-	local found=0
-	for fname in $(find "${EROOT}"/etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
-		found=1
-		rm "$fname"
-		ln -s /etc/init.d/cf-serverd $(echo "$fname" | sed 's:cf-servd:cf-serverd:')
-	done
-
-	if [ "${found}" -eq 1 ]; then
-		echo
-		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
-	fi
-}
-
-pkg_config() {
-	if [[ -z ${ROOT} ]]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
-			einfo "Generating keys for localhost."
-			/usr/sbin/cf-key
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/files/cf-execd.rc6 b/net-misc/cfengine/files/cf-execd.rc6
deleted file mode 100644
index 8c3936d8a718..000000000000
--- a/net-misc/cfengine/files/cf-execd.rc6
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-	after cf-serverd
-}
-
-start() {
-	ebegin "Starting cf-execd"
-	start-stop-daemon --start --exec /usr/sbin/cf-execd -- ${EXTRA_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cf-execd"
-	start-stop-daemon --stop --pidfile /var/cfengine/cf-execd.pid --exec /usr/sbin/cf-execd
-	eend $?
-}
diff --git a/net-misc/cfengine/files/cf-monitord.rc6 b/net-misc/cfengine/files/cf-monitord.rc6
deleted file mode 100644
index 6f985a62b020..000000000000
--- a/net-misc/cfengine/files/cf-monitord.rc6
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting cf-monitord"
-	start-stop-daemon --start --exec /usr/sbin/cf-monitord -- ${EXTRA_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cf-monitord"
-	start-stop-daemon --stop --pidfile /var/cfengine/cf-monitord.pid --exec /usr/sbin/cf-monitord
-	eend $?
-}
diff --git a/net-misc/cfengine/files/cf-serverd.rc6 b/net-misc/cfengine/files/cf-serverd.rc6
deleted file mode 100644
index d73e2bc2c729..000000000000
--- a/net-misc/cfengine/files/cf-serverd.rc6
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting cf-serverd"
-	start-stop-daemon --start --exec /usr/sbin/cf-serverd -- ${EXTRA_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cf-serverd"
-	start-stop-daemon --stop --pidfile /var/cfengine/cf-serverd.pid --exec /usr/sbin/cf-serverd
-	eend $?
-}
diff --git a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
deleted file mode 100644
index a31b3513ded4..000000000000
--- a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cfengine-3.6.2.orig/libenv/unix_iface.c	2014-09-25 07:53:31.000000000 -0400
-+++ cfengine-3.6.2/libenv/unix_iface.c	2014-11-26 23:55:20.151351070 -0500
-@@ -625,7 +625,7 @@
-         return;
-     }
- #else
--    if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL)
-+    if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL && (pp = cf_popen("/bin/ifconfig -a", "r", true)) == NULL)
-     {
-         Log(LOG_LEVEL_VERBOSE, "Could not find interface info");
-         return;
diff --git a/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch b/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch
deleted file mode 100644
index 7aa8e2779253..000000000000
--- a/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes compile on glibc-2.25
-
-Fixes: https://bugs.gentoo.org/612658
---- cfengine-3.6.2.orig/libutils/platform.h	2014-09-25 04:53:31.000000000 -0700
-+++ cfengine-3.6.2/libutils/platform.h	2017-10-20 15:11:15.676360363 -0700
-@@ -360,12 +360,13 @@ void globfree(glob_t *pglob);
- 
- #ifdef __linux__
- # if defined(__GLIBC__) || defined(__BIONIC__)
- #  include <net/route.h>
- #  include <netinet/in.h>
- #  include <netinet/ip.h>
-+#  include <sys/sysmacros.h>
- # else
- #  include <linux/route.h>
- #  include <linux/in.h>
- #  include <linux/ip.h>
- # endif
- #endif
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
deleted file mode 100644
index 864d0db466b4..000000000000
--- a/net-misc/cfengine/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sysadmin@gentoo.org</email>
-		<name>Gentoo Sysadmin Project</name>
-	</maintainer>
-	<use>
-		<flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag>
-		<flag name="masterfiles">Install the Masterfiles Policy Framework</flag>
-		<flag name="qdbm">Use <pkg>dev-db/qdbm</pkg> as database backend</flag>
-		<flag name="tokyocabinet">Use <pkg>dev-db/tokyocabinet</pkg> as database backend</flag>
-	</use>
-	<longdescription>
-	Cfengine, or the configuration engine is an autonomous agent and a middle to
-	high level policy language for building expert systems which administrate
-	and configure large computer networks. Cfengine uses the idea of classes and
-	a primitive intelligence to define and automate the configuration and
-	maintenance of system state, for small to huge configurations. Cfengine is
-	designed to be a part of a computer immune system, and can be thought of as
-	a gaming agent. It is ideal for cluster management and has been adopted for
-	use all over the world in small and huge organizations alike.
-	</longdescription>
-	<longdescription lang="ja">
-	Cfengine 、つまり the configuration engine (設定エンジン)は大規模
-	コンピュータ・ネットワークの管理と設定を行うエキスパート・システム
-	を構築するためのハイレベルなポリシ言語の自律型エージェントとその
-	ミドルを指します。莫大な設定を軽減するため、Cfengineはクラス概念と
-	プリミティブ・インテリジェンスの導入及びシステム状態の設定と保守を
-	自動化します。Cfengine は免疫型システムの一部としてデザインされ、
-	ゲーム・エージェントにもなります。クラスタ制御には最適で、世界中
-	の小さな組織および大きな組織で採用されています。
-	</longdescription>
-</pkgmetadata>
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 9b3ef2572c41..633872535403 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/brag/Manifest b/net-nntp/brag/Manifest
deleted file mode 100644
index 5f2074f6c8c6..000000000000
--- a/net-nntp/brag/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST brag-1.4.3.tar.gz 18230 BLAKE2B 04b5b7b3eab57d16452713ccdd4d8751451680c3280d1df8f9eef7e6b05087c00bebda0cefa9146120e772f6f0c267a4eb1198ec481f9c63d0d8019ace7eca35 SHA512 42e2601bd80be0a609acbf5bce2ea1f31a5d9420efee5e594278b394a196bfd2a52753603654f821c7a4908ce32a8495840409f1e5a4c1894a7de253a8378b2c
-EBUILD brag-1.4.3.ebuild 477 BLAKE2B 4d617f3a83aa2f7d8640256d95fb94dc09231ed159f61b378fb3a8053378b1b6567caff74ea0b5737956de8aa504a86d0525d57aa7ca0058e5c8422759e1f7d2 SHA512 d0eeb1a4b3de4b959890f2ddd0d955e88389742f7f65ef4b8ca46d131b7746ba3fac4bbce2e4ab51be889ceef32eb46ea3529c1f0dcbb8052c9fea055ad6fc28
-MISC metadata.xml 247 BLAKE2B db02c69806ccc844c6212f9ca5b5f42e24df5b8dddf6c5a861f0613580a6029ee5705dfa8f804645865587f860c79871b184d35213d3bebfe9c6b00b7cb2791d SHA512 7bda725cd9c4f47aaa04d6b5dfd8f2fb7faaf81091152c5216a8be854cab26886f4018191a180750270b7e20c3a8d22abb293c9a287e08b66633140e77c8f470
diff --git a/net-nntp/brag/brag-1.4.3.ebuild b/net-nntp/brag/brag-1.4.3.ebuild
deleted file mode 100644
index 95547c6f993c..000000000000
--- a/net-nntp/brag/brag-1.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Brag collects and assembles multipart binary attachments from newsgroups"
-HOMEPAGE="http://brag.sourceforge.net/"
-SRC_URI="mirror://sourceforge/brag/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-RDEPEND="
-	dev-lang/tcl:0
-	app-text/uudeview"
-
-src_compile() { :; }
-
-src_install() {
-	dobin brag
-	dodoc CHANGES README
-	doman brag.1
-}
diff --git a/net-nntp/brag/metadata.xml b/net-nntp/brag/metadata.xml
deleted file mode 100644
index e58e1d9f5ad3..000000000000
--- a/net-nntp/brag/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">brag</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 5cdb605f3ded..1648cbcf859c 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,3 +1,3 @@
 DIST tin-2.6.1.tar.xz 1570500 BLAKE2B ec9c54b8b89ecd33a42ede37c8db50828de2dce56ddff01900121903a18d73bde8a06733ca2dfb72c676eb373b5ea874cecb9a1ee7890ada4ad6539d9ff1a435 SHA512 dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3
-EBUILD tin-2.6.1.ebuild 2024 BLAKE2B f973aa8e2e5abe9c3f8f5ef4e2751319b95a0af7212cd7169d54ef5e98988ce4a0c7080c1c461d76bb2cd9122521aa247d7846c7355bbd7ec8c91e73fe862294 SHA512 af5555984f5dfdeb0ae4458a54b2f27667ca22a57ec8448be116c26599315c2269d2aaaf3e4e765de3fcd22e8f0b09aa473b84df594d03371c1943f6e072d3be
+EBUILD tin-2.6.1.ebuild 1970 BLAKE2B b1e42d73336f0d390b9cdab824fc7ff57d6c65487b40bed165eed788725751f0462f1002f6d354f1b3958ae5706960782c387bbec35a799a7b57c987b5d67a8f SHA512 a8edc47a1844bd9e8be30b61f872e07c461a4893f220ba7f6f3f90cc97b85bac2fd8f9eba9dc24a97d52e55964c382e1c6dd29830c3962b898d2880d061e0cbb
 MISC metadata.xml 408 BLAKE2B a89a2128685a8dc089ba37438352ae8c7171b74c90a8f838a5b7d930b142a90e6d69672ec4ec3f4e97e71c6b38ef9daf988bd5b46d6ccc9f3e4aa0f173075679 SHA512 26855098ca6c2da9fa4edf5620be29402f3c854280e3ca1b26a43af9d630ca34d229a34cc7b513c20c0a03c9e500830fc586f0086668042cff645d08741306b3
diff --git a/net-nntp/tin/tin-2.6.1.ebuild b/net-nntp/tin/tin-2.6.1.ebuild
index 96afdff40fa7..9a5e6df36f8c 100644
--- a/net-nntp/tin/tin-2.6.1.ebuild
+++ b/net-nntp/tin/tin-2.6.1.ebuild
@@ -82,6 +82,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "MIME articles support" net-mail/metamail
 	optfeature "spell checker support" app-text/aspell
 }
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b8331cb25d16..38b455cf3cd0 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 26983de4b5a7..9b064ee72495 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2022-12-31)
+# seccomp cannot be disabled via a runtime toggle which introduces substantial
+# fragility to Portage which relies on pax-utils' scanelf heavily. bug #815877.
+app-misc/pax-utils seccomp
+
 # Sam James <sam@gentoo.org> (2022-12-29)
 # Needs yet-unpackaged libxmlpp-5.0, bug #888898
 www-client/elinks javascript
@@ -24,11 +29,6 @@ app-metrics/collectd collectd_plugins_gmond
 # Broken when trying to use sys-libs/binutils-libs header, bug #879067
 >=x11-libs/cairo-1.17.6 debug
 
-# John Helmert III <ajak@gentoo.org> (2022-11-29)
-# sys-apps/ucspi-ssl is last rited
-mail-mta/netqmail pop3
-mail-mta/notqmail pop3
-
 # Joonas Niilola <juippis@gentoo.org> (2022-11-25)
 # x11-wm/stumpwm-22.05_p20220818[doc] is totally broken. Bug #882935
 x11-wm/stumpwm doc
@@ -119,17 +119,6 @@ dev-lang/rust llvm-libunwind
 # ebuild support is there but currently failing to link
 app-antivirus/clamav jit
 
-# Sam James <sam@gentoo.org> (2022-09-06)
-# Incompatible with merged-usr and is a fundamentally flaky approach.
-# - app-arch/lbzip2: bug #868318 (possible solution in bug #868651)
-# - app-arch/pigz: bug #868312 (possible solution in bug #868648)
-# It's suggested that users who want this feature use a wrapper
-# script in /usr/local (or otherwise on PATH), or configure tools
-# like tar to use lbzip2 & pigz respectively using EXTRA_ECONF.
-app-arch/lbzip2 symlink
-app-arch/pbzip2 symlink
-app-arch/pigz symlink
-
 # Sam James <sam@gentoo.org> (2022-08-26)
 # Broken at runtime for now (bug #865113).
 sys-devel/binutils gprofng
@@ -751,10 +740,6 @@ net-analyzer/nmap system-lua
 # Most targets do not support ASAN/etc... #504200.
 sys-devel/gcc sanitize
 
-# Mike Frysinger <vapier@gentoo.org> (2014-02-03)
-# Upstream says to not use this for now.
-dev-libs/elfutils threads
-
 # Gilles Dartiguelongue <eva@gentoo.org> (2013-12-23)
 # Gstreamer support fails to build due to libtool shortcomings when using
 # an intermediate library as a dependency of another libtool target dependency.
diff --git a/profiles/package.mask b/profiles/package.mask
index 372a07c828af..ccd987923076 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,26 @@
 
 #--- END OF EXAMPLES ---
 
+# Arthur Zamarin <arthurzam@gentoo.org> (2022-12-31)
+# EAPI=6 ebuild, live only packages for 1 year! maintainer-needed package.
+# Removal: 2023-01-30.  Bug #889200.
+app-containers/docker-gc
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2022-12-31)
+# EAPI=6 ebuild, live only packages for 6 years!
+# Removal: 2023-01-30.  Bug #889198.
+app-vim/lightline
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2022-12-31)
+# Live only packages for 4 years!
+# Removal: 2023-01-30.  Bug #889196.
+sys-auth/google-authenticator-libpam-hardened
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2022-12-31)
+# EAPI=6 ebuild, live only packages for 6 years!
+# Removal: 2023-01-30.  Bug #889194.
+x11-plugins/pidgin-funyahoo-plusplus
+
 # Maciej Barć <xgqt@gentoo.org> (2022-12-29)
 # Real upstream dead, uses old R5RS standard, many open bugs.
 # Removal on 2022-01-29.
@@ -1009,145 +1029,16 @@ dev-ruby/rspec-retry
 # no need for this package. Removal on 2023-01-03.
 x11-themes/mate-themes-meta
 
-# Hans de Graaff <graaff@gentoo.org> (2022-12-02)
-# Old cucumber slots and dependencies for already removed
-# cucumber-3. These have no value as standalone packages.
-# Removal in 14 days.
-dev-ruby/gherkin
-dev-util/cucumber-core:3.2
-dev-util/cucumber-expressions
-dev-util/cucumber-tag_expressions
-dev-util/cucumber-wire:0
-dev-util/protobuf-cucumber
-
-# Hans de Graaff <graaff@gentoo.org> (2022-12-01)
-# Old slot without dependencies on it. Blocks removal of
-# ruby27-only dev-util/cucumber-3.x. Use a newer slot instead.
-# Removal in 30 days.
-dev-util/aruba:1
-
-# Ulrich Müller <ulm@gentoo.org> (2022-11-30)
-# SLOTs 23 and 24 of app-editors/emacs, corresponding to GNU Emacs
-# versions 23.4 and 24.5. These versions were released in January 2012
-# and April 2015, respectively, and have a non-trivial security issue
-# with ctags. Please upgrade to >=app-editors/emacs-25 and update your
-# Emacs Lisp packages with emacs-updater.
-# Masked for removal in 30 days. Bugs #882347, #882349, #883687.
-app-editors/emacs:23
-app-editors/emacs:24
-
-# John Helmert III <ajak@gentoo.org> (2022-11-29)
-# Unmaintained and outdated in Gentoo, compatibility issues with
-# openssl-1.1. Removal in 30 days. Bug #696936.
-sys-apps/ucspi-ssl
-
-# John Helmert III <ajak@gentoo.org> (2022-11-29)
-# Authentication bypass vulnerability, unmaintained in Gentoo, source
-# package available. Use app-metrics/prometheus instead. Removal in 30
-# days. Bug #883637.
-app-metrics/prometheus-bin
-
 # Piotr Karbowski <slashbeast@gentoo.org> (2022-11-29)
 # Multiple stability issues, deadlocks on exit, broken API.
 # Bug #883559
 =net-p2p/qbittorrent-4.5.0
 
-# John Helmert III <ajak@gentoo.org> (2022-11-27)
-# Unmaintained upstream, several unresolved public vulnerabilities,
-# Removal in 30 days. Bug #882773.
-www-servers/boa
-
 # David Seifert <soap@gentoo.org> (2022-11-27)
 # Broke API for C++, causes massive carnage for consumers.
 # Bug #883223.
 ~dev-libs/glib-2.74.2
 
-# Michał Górny <mgorny@gentoo.org> (2022-11-27)
-# Broken with OpenSSL-3.  Last upstream activity in 2021, no reply
-# to the bug.
-# Removal on 2022-12-27.  Bug #805233.
-net-dns/dog
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-27)
-# Broken with modern dev-python/setuptools versions.  Last upstream
-# commit in 2018.  No reverse dependencies.
-# Removal on 2022-12-27.  Bug #822840.
-dev-python/slimit
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-27)
-# Unmaintained.  HOMEPAGE is gone.  Uses GTK+2.
-# Removal on 2022-12-27.  Bug #821118.
-games-util/xgamer
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-27)
-# Unmaintained, ancient package.  x11-misc/unclutter-xfixes is
-# a superior replacement.
-# Removal on 2022-12-27.  Bug #880845.
-x11-misc/unclutter
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-27)
-# Unmaintained.  Last bumped in 2005.  Superseded by Python version
-# with last release in 2008, then by vnc2flv with last release in 2010.
-# Removal on 2022-12-27.  Bug #880927.
-x11-misc/vnc2swf
-
-# Michael Mair-Keimberger <mmk@levelnine.at> (2022-11-25)
-# Unmaintained, last release a decade ago, upstream declared it EOL
-# Removal in 30 days.
-net-analyzer/snortsam
-
-# John Helmert III <ajak@gentoo.org> (2022-11-24)
-# Binary package several releases behind the source-based package,
-# multiple vulnerabilities, unmaintained for several years. Removal in
-# 30 days. Bugs #849389, #882783.
-dev-db/percona-xtrabackup-bin
-
-# John Helmert III <ajak@gentoo.org> (2022-11-24)
-# Compatibility issues with openssl-1.1*, numerous build issues, version
-# in tree is EOL upstream. Removal in 30 days. Bug #882759.
-net-misc/cfengine
-
-# Pascal Jäger <pascal.jaeger@leimstift.de> (2022-11-24)
-# No maintainer, last release in 1994. Fails to build
-# with clang-16. Runtime crash in certain conditions.
-# Removal on 2022-12-23.
-# Bugs #549922 #713492 #731256 #875464 #882263
-# Removal Bug: #882631
-net-mail/metamail
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-23)
-# Unpredictable build failures reported.  No revdeps left.
-# dev-libs/opencl-icd-loader is a good replacement.
-# Removal on 2022-12-23.  Bug #733018.
-dev-libs/ocl-icd
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-23)
-# Packages with no maintainer and major issues reported.
-#
-# app-cdr/xbiso: bug #882089, last release in 2005
-# app-emulation/dlx: bug #874933, last release in 2001
-# app-office/sc: bug #877051, last release in 2002
-# net-libs/ortp: bug #874003, last bumped in 2014
-# net-nntp/brag: revdep of app-text/uudeview
-# sys-apps/fakeroot-ng: bug #851543, last release in 2013
-# sys-apps/pmount-gui: bug #776397, last bumped in 2013, commit in 2019
-# www-apache/mod_common_redirect: bug #874660, bumped in 2010, repo gone
-#
-# Removal on 2022-12-23.
-app-cdr/xbiso
-app-emulation/dlx
-app-office/sc
-net-libs/ortp
-net-nntp/brag
-sys-apps/fakeroot-ng
-sys-apps/pmount-gui
-www-apache/mod_common_redirect
-
-# David Seifert <soap@gentoo.org> (2022-11-23)
-# EAPI 6, no revdeps in tree, never made it into upstream boost, library
-# only, last release 6 years ago. Removal on 2022-12-23.
-dev-libs/boost-mpl-cartesian_product
-
 # Matt Turner <mattst88@gentoo.org> (2022-11-16)
 # Packages or their dependencies have not been ported to libsoup:3.0, while
 # other non-slotted dependencies have been.
@@ -1156,11 +1047,6 @@ media-sound/gnome-music
 net-libs/libzapojit
 net-misc/gnome-online-miners
 
-# Jonas Stein <jstein@gentoo.org> (2022-11-13)
-# Dead upstream
-# Removal after 2023-01-01.  Bug #881249.
-net-mail/vchkuser
-
 # Jaco Kroon <jaco@uls.co.za> (2022-11-05)
 # Some potentially breaking changes here, please check the UPGRADE.txt file.
 # Most important:  chan_sip no longer builds by default, if you've migrated to
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
index b5253a73af32..1e9c38d2ccd6 100644
--- a/profiles/updates/2Q-2018
+++ b/profiles/updates/2Q-2018
@@ -5,7 +5,6 @@ move kde-apps/kstars sci-astronomy/kstars
 move media-video/kamoso kde-apps/kamoso
 move app-backup/kbackup kde-apps/kbackup
 move x11-proto/xcb-proto x11-base/xcb-proto
-move dev-db/xtrabackup-bin dev-db/percona-xtrabackup-bin
 move ros-meta/geometry_experimental ros-meta/geometry2
 slotmove =dev-ruby/websocket-driver-0.7.0 0 0.7
 move kde-plasma/oxygen-fonts media-fonts/oxygen-fonts
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6bcbcb7a42ff..5bf346184d8a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1092,7 +1092,6 @@ app-text/crengine-ng:libunibreak - Use dev-libs/libunibreak for hyphenation
 app-text/crengine-ng:libutf8proc - Use dev-libs/libutf8proc for manipulating unicode strings
 app-text/crengine-ng:lto - Use link time optimization
 app-text/crm114:mew - Add support for using the mewdecode mime decoder (app-emacs/mew)
-app-text/crm114:mimencode - Add support for using the mimencode mime (net-mail/metamail)
 app-text/crm114:normalizemime - Add support for using the normalizemime (mail-filter/normalizemime)
 app-text/crqt-ng:chm - Support chm format
 app-text/crqt-ng:fribidi - Support bidirectional text by dev-libs/fribidi
@@ -2045,7 +2044,6 @@ dev-libs/ncnn:vulkan - Enable vulkan compute support
 dev-libs/nettle:asm - Support assembly hand optimized crypto functions (i.e. faster run time)
 dev-libs/nss:cacert - Include root/class3 certs from CAcert (https://www.cacert.org/)
 dev-libs/nss:utils - Install utilities included with the library
-dev-libs/ocl-icd:khronos-headers - Install Khronos OpenCL headers.
 dev-libs/onigmo:combination-explosion-check - enable combination explosion check
 dev-libs/onigmo:crnl-as-line-terminator - enable CR+NL as line terminator
 dev-libs/oniguruma:crnl-as-line-terminator - Enable CR+NL as line terminator
@@ -6071,8 +6069,6 @@ net-libs/nodejs:system-ssl - Use system OpenSSL instead of the bundled one
 net-libs/nodejs:systemtap - Enable SystemTAP/DTrace tracing
 net-libs/ntirpc:gssapi - Include support for RPCSEC GSS
 net-libs/ntirpc:rdma - Include support for RDMA RPC
-net-libs/ortp:ntp-timestamp - Turn on NTP timestamping on received packet
-net-libs/ortp:srtp - Add support for Secure RTP
 net-libs/pjproject:amr - Inlcude AMR codec in the build
 net-libs/pjproject:epoll - Use /dev/epoll ioqueue on Linux (experimental)
 net-libs/pjproject:g711 - Include G.711 codecs in the build
@@ -6165,7 +6161,6 @@ net-mail/tpop3d:flatfile - Enable authentication against /etc/passwd-style flat
 net-mail/tpop3d:passwd - Enable /etc/passwd authentication
 net-mail/tpop3d:sha1 - Use OpenSSL for sha1 encrypted passwords.
 net-mail/tpop3d:shadow - Enable /etc/shadow authentication
-net-mail/vchkuser:debug - Enables debug messages to syslog
 net-mail/vpopmail:clearpasswd - Enables cleartext password storage in the vpasswd files
 net-mail/vpopmail:ipalias - Enables enable-ip-alias-domains
 net-mail/vpopmail:maildrop - Enables mail-filter/maildrop support in vdelivermail
@@ -6265,10 +6260,6 @@ net-misc/bfgminer:ztex - Enable support for mining with Ztex FPGAs
 net-misc/bird:client - Build the ncurses/readline full featured CLI
 net-misc/bird:libssh - Enables net-libs/libssh binding, mendatory for RPKI support
 net-misc/casync:fuse - Enable fuse support
-net-misc/cfengine:libvirt - Enable support for virtual machine management through app-emulation/libvirt
-net-misc/cfengine:masterfiles - Install the Masterfiles Policy Framework
-net-misc/cfengine:qdbm - Use dev-db/qdbm as database backend
-net-misc/cfengine:tokyocabinet - Use dev-db/tokyocabinet as database backend
 net-misc/cgminer:ants1 - Enable support for Antminer S1 Bitmain
 net-misc/cgminer:ants2 - Enable support for Antminer S2 Bitmain
 net-misc/cgminer:ants3 - Enable support for Antminer S3 Bitmain
@@ -7918,7 +7909,6 @@ sys-apps/systemd-utils:tmpfiles - Enable systemd-tmpfiles
 sys-apps/systemd-utils:udev - Enable systemd-udev (userspace device manager)
 sys-apps/tcp-wrappers:netgroups - Support matching NIS (host) netgroup names via the @netgroup syntax (if you don't know what this means, you most likely do not need it)
 sys-apps/texinfo:standalone - Build standalone version that survives all Portage bugs
-sys-apps/ucspi-ssl:bindist - Disable EC/RC5 algorithms in OpenSSL for patent reasons.
 sys-apps/usbguard:umockdev - Enables support for dev-util/umockdev
 sys-apps/usermode-utilities:fuse - Build tools (currently umlmount) needing fuse
 sys-apps/util-linux:audit - Use sys-process/audit to emit audit messages about system changes
@@ -8892,7 +8882,6 @@ x11-misc/tint2:battery - Enable battery status plugin
 x11-misc/tint2:sanitize - Enable ASAN
 x11-misc/tint2:tint2conf - Build/Install tint2conf as well
 x11-misc/urxvt-perls:deprecated - Install scripts which have been marked as deprecated by upstream
-x11-misc/vnc2swf:x11vnc - Install script that depends on x11vnc
 x11-misc/wbar:gtk - Enables the gtk-based wbar-config GUI
 x11-misc/x11vnc:xdamage - Enable support for the Xdamage library
 x11-misc/x11vnc:xfixes - Enable support for the Xfixes library
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index eb8750e696c8..afd96b787ba3 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index e2f36547befe..7c0fa8048704 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,5 +1,5 @@
 AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457a08ddbe98e85cd3c195c149215de8753aa72fec618ccf4bdf584002c507cc53532ee92af6e8097c7fa2573628de34b17c SHA512 f54fb5d006263f89ff8c376f100066d79883b68a30441e8665ca4d8a6aa061e5c697c715ccb93c67a692145a44a441862039e5249e4795159f1c43a12ffe1c97
 AUX units-2.20-readerror.patch 306 BLAKE2B 7007ed50539043f1b21a9676c8d1ff377d1d6e1d9e1d3e4bca9e4dcda520d77cddc28abe35333cd1cb4a5d451264d94f22bc6594a5f1fd15488d5d5e1d5bf12d SHA512 4d1acb3ca6e4bd2874854cfa27e8bc5418ef30d628589eace8011733556835feb30630a2b37bb1e5e975392fe75e684b48f31a9b2624b8703714dbb501f6f27d
 DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62
-EBUILD units-2.21.ebuild 1196 BLAKE2B 82474e1b2b54891cf7e4021ec1137b1e7721c6b0d5809530aff9cde1c18f114f8a30aa9ade3e01759f8a913e8190a2ab38ec1bebdd1b26a4582ec608dcf5fbe2 SHA512 1c2dd9233318b8058f24a3b7152e801afad1a54c09cf0a3693ebf04850cebe9c7ab69f5e8bce0abafc9821c895594b3465b705de3ac271f825e62eaaa7b3f80a
+EBUILD units-2.21-r1.ebuild 1157 BLAKE2B 92060e7cdd34d40c91c607386acaf27ef4f84633d25ce6cddcf88d2ed780b22dd2ee45d5ae42e071ea2625781a7a7aff60552c2f2cb0fd90eaceeaaefeea6a4b SHA512 9bc18b5703a1edd3d885d056289478e9fdb3dfcf5afc2bed8b8a53f91b4ab35b49ef6cdf402f5c1b46e362a0bc0fef0fa517a55ebdbd2c12c21af8c9d4452e30
 MISC metadata.xml 356 BLAKE2B e29e63011490681ea66a493a573fef96d45c5cc045ee87534380ba64c4bb56e14231f64b87527105d6ec560326c52c61e72746f8d4e61b820e3bb87a7b92086c SHA512 36bab25faccb86cfc0f2d8f864788dbf1a561d9dd94c76dab878bd9e7b29f55f74ed115f1d374230bd9745038612b9f6343a9a1832bf025ca0e654d4074bdf7b
diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21-r1.ebuild
index 0c1c7e86fb23..e87fc75a74bc 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/Manifest.gz b/sci-libs/Manifest.gz
index 20744bba4754..7d78a3dcd98f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index b8b433766177..bd15dc2e9520 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -9,6 +9,7 @@ AUX opencascade-7.5.3-tbb-2021.patch 1931 BLAKE2B cf4f6895f7418a4af75f164065945a
 AUX opencascade-7.6.2-avoid-pre-stripping-binaries.patch 1187 BLAKE2B fbfc9f3aafc4e69259cc37e82c266f7af979716bed7d80fd0f680b4b6d6fdad3b26b0214f06fbbc8ee09db08602572a4543ad0aa8ec7b1af98139312cdba291d SHA512 04c7f37e42eeafe6d8ee99df8c50bb5bf8bbc90c8b958fcf486adbfbf79fcba60c4a3bbbf7495388096f5902b0af7280f0561556eae6e6f030b73850df55ca2c
 AUX opencascade-7.7.0-add-missing-include-limits.patch 459 BLAKE2B 507fd80c08c52ea1e9a9e70a0cbc6bee4f7093123de71f2b173e2d43355a1cc8a45f05e4acc7c07dbdfa1035fe13c97d56466a15e386c00c03c283dddd6b71a5 SHA512 048384188731831f7dd47d32d38df115a3e4c6abaf47615233b16c00b0547fee8ec757623d5c7ff0250988c9d47c0821fa06f95a69413fe2c339f0a5a47223d1
 AUX opencascade-7.7.0-avoid-pre-stripping-binaries.patch 1357 BLAKE2B 2f26c4a4e4737971b0bf14828acc7c6049ad75920853f565705699ab58bf60d6e4aa5473114c6224938870e19439b569ce2112af2e9b0742c361cc54a68421ae SHA512 202994e6a0b42c2469f8fc11ace7364ce41056192393bd2930fba1468809ce8992169a6ccbe909930ad181d9c633fc9f6169f7ef72ef071c0186ae7f2ecdb456
+AUX opencascade-7.7.0-build-against-vtk-9.2.patch 1360 BLAKE2B 39bcae904286687ff2aca6662f18d67e72a341e98281b0b04b7b302ad9d0adfa576ad82ce3cfa646e1b9f4107580231bf8613d0cdb72791fda478485c8072827 SHA512 3afb471767b78b4096e00a8eab4c71a90944c70945a16f45ac372ab824c4c6a140c165882e7cb15c95c95d70ae4c9298cc03fc7cd4ebe920bb7ed4eb38aba0a5
 AUX opencascade-7.7.0-fix-installation-of-cmake-config-files.patch 1823 BLAKE2B e84bb8627ba5cee166c483631511d150ef9af2c1aa966d7154926600da0674214b3fce8363dcff7d94204c36a92f236ede0f7849039a3bd4509d04d91444204f SHA512 242604d59b3596644b1efa95ce9d7b3d30dbb1bd49f79e28a4ea66ac9b6d4728a32cf31ceb9078875a39bb7b8775ba3ce685560045684b803037a61e2f37d2a4
 AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
@@ -17,6 +18,6 @@ DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0
 DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
 EBUILD opencascade-7.5.2-r6.ebuild 4944 BLAKE2B 7478866b004cdb0e8a29b0341646e367dda0637b06ef844e159c5e10449d45a62a79f37cf4386a709a082c4b002db7623de7f75f72a8b0c50a031d1e248c7bed SHA512 dd8bf6a0c7d60e9e1cd20b88805e7106f552f773c736df619885479319d81ee54de6a793e56d6189836421e0ba454d1e780294961760ca9914c25a032959830c
 EBUILD opencascade-7.5.3-r8.ebuild 4977 BLAKE2B 09303b0bd2784d3db5eb2ed08f6cfa961a3a520a415612fd85e17d378bdf8783e57d8aa5400f8667fd73f21e272818e1e30def087dee9f88c5fd961e9b372a46 SHA512 1a3b1c38a9c7a3a04360261e995994c762389512aac0cd82687c08f7beb6491350d768d5343b54b83460538e663788bf5e00b503936f5364b3296a20039da935
-EBUILD opencascade-7.6.3.ebuild 4801 BLAKE2B 7402f2c1ebf69843ca7e249c245cf94a9f45edc5b4b910db040a266c6261fe1729c2da004190ba304e82723b230d8b11e0526c08c6838c66005ee5bfdbe2ca2c SHA512 3661d30160b39f460d03961c26ce72011b98442c0aa193c7f56a31cd7f32de841288168fe9b9d94f870e1ac8f107c5d98e4fd66c7c82cb9b41b36fae9dfc4650
-EBUILD opencascade-7.7.0.ebuild 5164 BLAKE2B f640cc6253c349bcc267bd0ab60ce167b542fb1764279dfd15be8dc74d8f791245d1cb4de8e6fa7ddda21186cdfe9d98d74a5104caa4b22d2a139d6d25988e9e SHA512 e38ca1791b719052eb6faa33427cdd411f487d2e22749fcef25adb42507b31ebc504bc098cac32969b608a829ace68886b04886ea88942d0c75e0ce4d74b551b
+EBUILD opencascade-7.6.3-r1.ebuild 4886 BLAKE2B 69c281d17b0090eb774cc3700d1598c7478e04980e374e84b03b0ce030f42d817108f5c8b16f60312c1251f48b99ad208567252b753ecd9e979c75d43fcd6917 SHA512 8c2e84dcb8a8c8926c871a635d5619dfba09ee5a5a16a705146edafba11de60518d0e34432897a187e17d54db1a8489291f36a3a29da23beccb2988b9a610047
+EBUILD opencascade-7.7.0-r1.ebuild 5009 BLAKE2B 83e7b873df183ee3592b8e4b3384de5dcf93f9ac0d739b9b3bb787f330699b817a79f3d6569750d2327a6a31175b1cd53fe4b343ae60aeeb2d9a0f31debfc7b1 SHA512 38a8370974b89f829d44d5d3489ef3f24ecf7647bb945dd2cec33b824fb242bfec6b430249dcd210e20643d5460ab6638a27a0e51c654a799d201aca7598e844
 MISC metadata.xml 1102 BLAKE2B 8569899b7ab437a4115ced11d3421f063d99233ed81bb5360228e580b20af2ee9753b41a8b3cb1291550160fa627058d915fde0e23514dcbed0f9cddc961ae11 SHA512 e9a38c41beec8eb54d6b9232447df3bc05635318f8dc727ddebc5f13be4d58b8d10576ddbb07a9fef41ba2adeb7ba1abcb4e10087b4711c4ff348d873c4916a8
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/Manifest.gz b/sys-apps/Manifest.gz
index a2ba11730d95..27e5dba565db 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fakeroot-ng/Manifest b/sys-apps/fakeroot-ng/Manifest
deleted file mode 100644
index 0a03ede98545..000000000000
--- a/sys-apps/fakeroot-ng/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX fakeroot-ng-gcc-4.8.2.patch 235 BLAKE2B c18f46d8149e7961d6b7c682e6662194f0ce533aae33b1a5fa6a37a95a297f2f0418503066a760834c86c76813758bb051582087953064cc4f039c23e866e664 SHA512 ad5e13c291c6fc9a8fa883cebfc25c14103b2c52c9b7309bea3dd6c46244b1af2278ddfdff98b2e18cf1c3cc7ba5b98097b6280e8761b757cea87ac107b31179
-DIST fakeroot-ng-0.18.tar.gz 207870 BLAKE2B d2e0eff8ec508bb5dcad89f51b80162b3a9fc769d24561cddbbeb83d02e9d6089c9252ad60a628f33c7a5c8d07c7e9db29a19247e6ee9106ff2e68a13ba4e3cd SHA512 8ece6830d229b92537d9c0a2eb42cb9ec4ae6b83453303004dded5eab0707b9ae8eaa2c71aac6ea68226c43cf08db6b0939a9422aab32948f5ecb185ee01d854
-EBUILD fakeroot-ng-0.18-r1.ebuild 382 BLAKE2B e88d9041ac1e27e82a8de5c9696e9f0fd7a882a18ee3a7cdadb7e0cd1b65bfe527955fdafe0318283fcf852542d4a3fce99dafb6697a2750e233f01e8aba8e8f SHA512 fa843fd4f63512c5ce5121c647a2f47ba0076a79e112adc04a376efec5b5681bde122aa8a69265f119a65cd557b95e001b5001a48e54029e5d7e8b6d8e6f79fe
-MISC metadata.xml 248 BLAKE2B f2dd13f64cd8d23cc29c6fd6c629bbab812186bc37bd796536d75222d67b76a2c0d088033f653661a537b1d6334dbc71e67b755972b8da58408eba04cf33bc90 SHA512 d9f7d7b957873ee88bc8ecaaf9d2329e1f0080f4c7a19e2e77fa2e212b150b2083e9e2ef3e9e6c0f9afbd39f1db9a2901a4790913e4b15141d6cf274e5635613
diff --git a/sys-apps/fakeroot-ng/fakeroot-ng-0.18-r1.ebuild b/sys-apps/fakeroot-ng/fakeroot-ng-0.18-r1.ebuild
deleted file mode 100644
index dae7a63ec7ce..000000000000
--- a/sys-apps/fakeroot-ng/fakeroot-ng-0.18-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A utility to run commands with fake root privileges"
-HOMEPAGE="https://fakeroot-ng.lingnu.com/"
-SRC_URI="mirror://sourceforge/${PN//-/}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-gcc-4.8.2.patch"
-)
diff --git a/sys-apps/fakeroot-ng/files/fakeroot-ng-gcc-4.8.2.patch b/sys-apps/fakeroot-ng/files/fakeroot-ng-gcc-4.8.2.patch
deleted file mode 100644
index 50df56d51bdb..000000000000
--- a/sys-apps/fakeroot-ng/files/fakeroot-ng-gcc-4.8.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 1/arch/linux/i386/platform_specific.h
-+++ 1/arch/linux/i386/platform_specific.h
-@@ -2,6 +2,7 @@
- #define PLATFORM_SPECIFIC_H
- 
- #include <asm/ptrace.h>
-+#include <sys/types.h>
- #include <sys/syscall.h>
- #include <sys/resource.h>
- 
diff --git a/sys-apps/fakeroot-ng/metadata.xml b/sys-apps/fakeroot-ng/metadata.xml
deleted file mode 100644
index 55787f6a7f20..000000000000
--- a/sys-apps/fakeroot-ng/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">fakerootng</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-apps/pmount-gui/Manifest b/sys-apps/pmount-gui/Manifest
deleted file mode 100644
index a619af7febf7..000000000000
--- a/sys-apps/pmount-gui/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pmount-gui-0_pre20130806.tar.xz 5132 BLAKE2B 7c575f4ab9ebe632eebed0a73ef2dfe3e7ffeb47cb28ab39a3c8928d2f0bb8f0b118e00d8d9a7d9663721016c93fda33c803bcd6c283ad7f4b5e7ea4df401c04 SHA512 97871dcfbd14a26f93186b8e08d5512c6b7d6fbf76c94a9e4f0f8e74404ce7a8e1139bb5d3fd432fb1b228ff48f9f56195124839431f6a5d3d82f43165a2b5ce
-EBUILD pmount-gui-0_pre20130806.ebuild 685 BLAKE2B 7ff56b654a859e9dd94c819cd6806d2fd7f6f9e11a4798c59857c26543495467d371f8729905e2472171ba42f537f4c262b438e17fbd54d67074d4407da50324 SHA512 1bb09be6111648618b3f235c8b35592c15ebd9f155a57449a1c9660d56a5f8d1209d370e20217a83fecb3398ecb0bec44a5687e6644a0840ab0b3634e7e312b6
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-apps/pmount-gui/metadata.xml b/sys-apps/pmount-gui/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/sys-apps/pmount-gui/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-apps/pmount-gui/pmount-gui-0_pre20130806.ebuild b/sys-apps/pmount-gui/pmount-gui-0_pre20130806.ebuild
deleted file mode 100644
index 2fa0665d5f77..000000000000
--- a/sys-apps/pmount-gui/pmount-gui-0_pre20130806.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="git://git.tdb.fi/pmount-gui"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit toolchain-funcs
-
-DESCRIPTION="A simple graphical frontend for pmount"
-HOMEPAGE="http://git.tdb.fi/?p=pmount-gui.git;a=summary"
-
-LICENSE="BSD-2"
-SLOT="0"
-
-DEPEND="x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	sys-apps/pmount
-	virtual/udev"
-BDEPEND="virtual/pkgconfig"
-
-src_compile() {
-	emake CC="$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README.txt
-}
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 19456ef188c6..95b631a5bf1d 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -4,6 +4,6 @@ AUX texinfo-7.0.1-lto-type-mismatch.patch 1154 BLAKE2B 852f3c217ee856747534410f8
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
 DIST texinfo-7.0.1.tar.xz 4890348 BLAKE2B 9d61722e7ff8a71e05770552050cc861d778b9faa95f801e40d4353601a5692f01ad8e794dfb0e7b5b29efa2c701de4a76505732a806b0303b5c1fe0599816f1 SHA512 8e1616341fbbfe0cd90bd1b0452874c75b99d88dffe5f88c53fdc32f00d67c07c15c6c774b241e1f7507f0347314737e533854939c3be6334ca9feb9cd049009
 EBUILD texinfo-6.8.ebuild 1717 BLAKE2B 0ce639bd82dac4bcc580415852c093773954c2f33a811133fcb4ee8361e30935b40ba2796bfe807f848bbebe3acf5985fb549f11dfc6d90dbcb397ab0fc959ea SHA512 017f861563fe14381776c7fb62b79b8a99059e63d0f752a4b8dc71559ba57c6c56307ef751bea42b01c1afd3ebfface75c108be260f920f1a1fc6e3ffd72c40f
-EBUILD texinfo-7.0.1-r1.ebuild 1865 BLAKE2B 29598b7002b2cc2137031d4013b471943533fb559cc278d61590d1a7f4245019dbdc489640dfaf5bc3702e1c515615d64f0ebe176f373b31109bf0f41d32a94b SHA512 5f9abfc3c799e4e26b94a323bbf6a969f7c6eff5793a91e2c8b4cad50b21e79060cf8478c6df67c7a821fc8054feda66a0329a94aa56e4dedda80930c0b202c1
-EBUILD texinfo-7.0.1.ebuild 1765 BLAKE2B e3f5a92d0a214945414813167e2e35848cefb8f6359e71c01e75bf2e0a0663073aa0b847ba2afd31fee544dcf0adfcb19467ace9b066834d5888d5f0fa8a6c07 SHA512 94bd17b16fe0aee5f511750dcdeb937813f9fac837585edb63eab2ac2505eb265311ce4366b487f1254693449d20e89be35881f3c1b12d7ffbca109030a31683
+EBUILD texinfo-7.0.1-r1.ebuild 1887 BLAKE2B d5d8967d7ea61187c7953423d9ae364198d727b22b25d116a8e317c18d641d8a2d4454a320cd8cbe293b753a5a327886fc3203c9c7582bc4f5e8bb1613f28dd8 SHA512 80334945f621ea9fe0603f2aa9502d146b8b0b71ff2d6b51e06d82253c12fbde38a589abe90104bd8272eadb5a148bc5b7fdfaae6a25c1f2ba13681ea4ca9e64
+EBUILD texinfo-7.0.1.ebuild 1787 BLAKE2B e275a3450fe2ce726647a347066e0a7730b4a3fdaa8b931f18c56e6b36b3e847773960eb541349e9b85499c52fba3b80c9d2f1ea8a05790106bde3dafde22e82 SHA512 9cdaf80221be13e539633430915a193532c86ce9d9db8db5c7ba573afffcb6f153dfa922fea0ea5d05aba5919941a04de55cfc8c1377f71f6757d24a5d54e2ab
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
index ac7dbea1ee77..09499a77dda3 100644
--- a/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
@@ -33,7 +33,10 @@ RDEPEND="
 	nls? ( virtual/libintl )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
+BDEPEND="
+	sys-apps/help2man
+	nls? ( >=sys-devel/gettext-0.19.6 )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-lto-type-mismatch.patch
diff --git a/sys-apps/texinfo/texinfo-7.0.1.ebuild b/sys-apps/texinfo/texinfo-7.0.1.ebuild
index 9669d1502f2e..05ce4eb6f6dd 100644
--- a/sys-apps/texinfo/texinfo-7.0.1.ebuild
+++ b/sys-apps/texinfo/texinfo-7.0.1.ebuild
@@ -33,7 +33,10 @@ RDEPEND="
 	nls? ( virtual/libintl )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
+BDEPEND="
+	sys-apps/help2man
+	nls? ( >=sys-devel/gettext-0.19.6 )
+"
 
 src_prepare() {
 	default
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
deleted file mode 100644
index b0eddfa4476e..000000000000
--- a/sys-apps/ucspi-ssl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ucspi-ssl-0.99e-fno-common.patch 1255 BLAKE2B 0a278c0340f2c8f7663afe25bc9478e5798e7fb51195a52fcf4a2ac887fd4d809ef4a617131f146a89095748208ecaea753746b6d4075cd528aad0ddac081a5a SHA512 87b0f8d955f4e9a0c3168d1ff7e29dd8844d34086b0aa77c2cc9b2bdbb1858a2e22e07178a18e04175e325e1e6fb4e4bacec89bdc3571dd973731344664012cc
-DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
-EBUILD ucspi-ssl-0.99e-r2.ebuild 1483 BLAKE2B 9d2b463bf3a1000c472d8926e78ddbd794f4e761766ec5a8d694a8b6621a80c3e8b340b2814ccb07517ef68837820dcf97f668545b28089bfc5fed147213822d SHA512 391a2ec8133539aad73cd846f05e23e41acfc45ab4b930c7881dfee4d5e0069c2042d0297fa21c520130cd51e6e51c214050ee65b783fbefe20d43d437b60d5c
-MISC metadata.xml 551 BLAKE2B 722aca8c638d9295469fff01028266cf48f77e8f81c88c103d9e8644f3336e86e4f9ab6a4faa8b6484d2e22478c5f1445dc4c6b233f0bf50117407a31d240ca4 SHA512 c63db8b7aeb9b543444cf0caa96152ed45896b7aa90b318b9f1225d6629a8b59365445ccfcec0a7afe0e520982cd668b0c1315b069b95baa81cf93cc766c6b68
diff --git a/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch
deleted file mode 100644
index ea7aa0a47688..000000000000
--- a/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://bugs.gentoo.org/707156
---- a/src/ip6_bit.c
-+++ b/src/ip6_bit.c
-@@ -7,7 +7,7 @@
- 
- #define BITSUBSTITUTION
- 
--char strnum[FMT_ULONG];
-+extern char strnum[FMT_ULONG];
- 
- /**
-  * This function converts a IPv6 address into its binary representation.
---- a/src/remoteinfo.c
-+++ b/src/remoteinfo.c
-@@ -50,7 +50,7 @@ static int doit(stralloc *out,int s,char ipremote[4],uint16 portremote,char iplo
- {
-   buffer b;
-   char bspace[128];
--  char strnum[FMT_ULONG];
-+  extern char strnum[FMT_ULONG];
-   int numcolons;
-   char ch;
- 
---- a/src/sslclient.c
-+++ b/src/sslclient.c
-@@ -98,7 +98,7 @@ static stralloc moreaddresses;
- 
- static stralloc tmp;
- static stralloc fqdn;
--char strnum[FMT_ULONG];
-+extern char strnum[FMT_ULONG];
- char ipstr[IP6_FMT];
- 
- char seed[128];
---- a/src/sslhandle.c
-+++ b/src/sslhandle.c
-@@ -91,7 +91,7 @@ static stralloc remotehostsa;
- char *remotehost = 0;
- char *verifyhost = 0;
- 
--char strnum[FMT_ULONG];
-+extern char strnum[FMT_ULONG];
- char strnum2[FMT_ULONG];
- 
- static stralloc tmp;
---- a/src/sslserver.c
-+++ b/src/sslserver.c
-@@ -87,7 +87,7 @@ char *verifyhost = 0;
- unsigned long uid = 0;
- unsigned long gid = 0;
- 
--char strnum[FMT_ULONG];
-+extern char strnum[FMT_ULONG];
- char strnum2[FMT_ULONG];
- 
- static stralloc tmp;
diff --git a/sys-apps/ucspi-ssl/metadata.xml b/sys-apps/ucspi-ssl/metadata.xml
deleted file mode 100644
index e90a9bc5ced8..000000000000
--- a/sys-apps/ucspi-ssl/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<bugs-to>mailto:feh@fehcom.de</bugs-to>
-	</upstream>
-	<longdescription>
-		sslserver, sslclient, and sslhandle are command-line tools for
-		building SSL client-server applications. They conform to the UNIX
-		Client-Server Program Interface, UCSPI.
-	</longdescription>
-	<use>
-		<flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r2.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r2.ebuild
deleted file mode 100644
index e264af9da7fc..000000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="https://www.fehcom.de/ipnet/ucspi-ssl.html"
-SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86"
-IUSE="bindist perl"
-
-DEPEND="
-	dev-libs/openssl:=
-	perl? ( dev-lang/perl:= )"
-RDEPEND="${DEPEND}
-	sys-apps/ucspi-tcp"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_prepare() {
-	ht_fix_all
-
-	sed -i -e 's:auto:gcc:' conf-cc || die
-	sed -i -e 's:-m64::' conf-ld || die
-	qmail_set_cc
-
-	echo "/usr/bin" > conf-tcpbin || die
-	echo "/usr/share/ca-certificates/" > conf-cadir || die
-	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
-	echo "/usr/" > src/home || die
-	sed -i -e 's:HOME/command:/usr/bin:' \
-		src/sslcat.sh src/sslconnect.sh src/https\@.sh || die
-
-	# workaround: SSL_TXT_ECDH is always set in openssl/ssl.h, even with openssl[bindist]
-	#sed -i -e 's:SSL_TXT_ECDH:ENABLE_SSL_TXT_ECDH:' src/ucspissl.h src/ssl_params.c conf-ecdh || die
-
-	default
-}
-
-src_compile() {
-	cd src || die
-	emake sysdeps
-	emake uint32.h
-	emake
-}
-
-src_install() {
-	dodoc -r doc/.
-	doman man/*
-
-	cd src || die
-	dobin $(<../package/commands-base)
-	use perl && dobin $(<../package/commands-sslperl)
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 785a93bf7ac5..97ed38686d2f 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index aad5be1cc68d..666bf88012c4 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -6,5 +6,5 @@ DIST binutils-2.39-patches-5.tar.xz 82924 BLAKE2B 2cf75f661989f22270d6afe5f3c543
 DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
 EBUILD binutils-hppa64-2.37_p1-r2.ebuild 13273 BLAKE2B 2dd83c1466b42667496a8a37c40a2df498dd7b1de4ecd78a5583cd77ff27befa2bb22110e24622149b4a85c212f03e2a064aa961c13a966123eb8744caf02aa8 SHA512 e9575a12a0a13047c687c918c16ec4c3b93e10f26cb88add82ae1c2bb8f57c7619bc41a6586e231940412ae3974e327acdae567ce4e0e0523f2b654aadfb607b
 EBUILD binutils-hppa64-2.38-r2.ebuild 13286 BLAKE2B 0ea74ad439d7bc9ba9e4e79b69069f2cd14da3047c6ae4cb98932ce9dadedf5e4992e605d59762034df7aad5b6455d3df4bc994179acc29c53f9bc624a0c6826 SHA512 9bbc89df99cd78d26f5368600524dab466dbdf954b1affa5f5a04f25538b2caa89e8a08a2f514d5381299a0c5a47f200c7024b902e1d1b2c5f24081eb3410954
-EBUILD binutils-hppa64-2.39-r4.ebuild 14292 BLAKE2B 35841ec91601bbec0f9fad99c54201a6fe73d079f5fb18f7fa77d4fccccd0e5efdf7c357b12b957ceccb2e3ea042cbc892ba141749542ad0e01177c305c4e63f SHA512 de48bcf6a01941567c1f4beb6d208a68298e443d7c37d86ce61135d0774acb72104018bcbf5c04d06b1b3eca0564d4032eda2680741272a44b617f8c6d1ede5e
+EBUILD binutils-hppa64-2.39-r4.ebuild 14291 BLAKE2B 4ed50e5d1d74e26fb4c8764249874835f41cc5428a71e4ace3df5d5f56ba5cb7fbd03a1ca4e10afafa7c7b0ccfa79dce53a3cf84a3cf4bee93d61022d6c5ae2c SHA512 784b89e8d29d328da306670c61d9a3d009b6dc84fedd04edf5dacd9f185264533dcfd440f3156771ca044932fd60cc47d55d63caf355dfeed132d7e79ed10a21
 MISC metadata.xml 1004 BLAKE2B 069a799bb001c8c22afecebe6156098546f39e9e03c2ac194172ef6f0f49de976db90bfef03c634cdb696d9484d38bb5f2abb3fcbf7c6cda7cb14a39e5f4a87f SHA512 faa4cb332dd6eeff2ecd4dbfec67693bffcaafba588fb2ef6f64ea5e978c24646d0a555c39983497e660be1cd0518bf15dbc03f89584533f9271d58afb4a3f56
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/Manifest b/sys-devel/binutils/Manifest
index 186cab9231e3..9954bd72058e 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -27,6 +27,6 @@ EBUILD binutils-2.35.2.ebuild 12660 BLAKE2B fa9a02b7f8671ae143fd7b7c57455c14c8fb
 EBUILD binutils-2.36.1-r2.ebuild 12562 BLAKE2B a4b167d673eba6363b4b8588b2bf0708fc6658a53442027a61f7f16f22cb7e7239279f531ba13b50fe434841ad51f4ff24f962679d513391c6dbac47d65b6c8e SHA512 001fb6d62e387bcbd19380f3e2b70bf165be9a018d3377c1f697c48bf8323a49d0d65502e98ebb3536f9436259a91f04a7b154870dea1e9f41eeef030c845261
 EBUILD binutils-2.37_p1-r2.ebuild 13033 BLAKE2B 03ea9dff3a46146cd7cbdc717301b0f522d175d196f6d7552bd432be9c6f58ea776b5434e81b4997fa3cc770899258eae750b68eaa9e2238aa5d5f3873ba853e SHA512 de72d5f4b635f78995ae8fe8cc6e99eab9c5755b79f96e462a66f6b1fe8a886ea1cc818a9dcb431e516f8e80d0c3d36b29719805f0bea7e81fc30d4c7a3b3c13
 EBUILD binutils-2.38-r2.ebuild 13411 BLAKE2B e232741b2c698961615d2ea9b0590f7a2ffd9a93981cd913c3789185989f0f96107af2448c9452f46e8b2e445d8cc5e2f8e8649ecce2187c0c78f8251dd0b653 SHA512 464409d4225d308bfba9d549ac7a4a177684f4022a6a65479fb1e028e14cc5030784bda394f7f99568efadcf1c8c372cc1d2246d42ccd020ea5a6226d0fbcfbf
-EBUILD binutils-2.39-r4.ebuild 13945 BLAKE2B 75f0acdd4541f99d79f646051cf1c8f3e2e4a978c6a1d6051a9c082268130eca306762d25e464a27e2ce24f2b0981ce90494a1b7cc95436224096bbf8cc5af3c SHA512 5bde1c17b60caffc76721e008b2a2980beed04da22b9647bdb083d836021ab84fca240adc805b3639a0b676ba4d3a740f5aadcd72024d62bac935fc93bef35bf
+EBUILD binutils-2.39-r4.ebuild 13937 BLAKE2B 77ad82e27bebe116112ea2a0198c4b0a1e4fa981a746fcb9fa4c84889119b6798455b1071a9963f8ff43d2a12ae894b7cf970ac551dcbd4f2916f4422968827c SHA512 29bad23ae51c8990c3b2c12e6f5e6198ab5807267a8b8ac45f85101dd4e251ed90717ecbb9d28c784aa4a85fc9dda0eb2dac975b84965f3f3a5652c2d65d264c
 EBUILD binutils-9999.ebuild 13998 BLAKE2B adf97f4a9dfc01597113cc54ff40a2f7e6d2f85644fa91c4d2d8818009be5e28feb8b67a06711e4d209d154ee5d511882a7067f2f4ff767eb3ddaedf8628d817 SHA512 2268ab4cfd953dacec94fa33122e122369cc54fbecaa977dad66c1687024b7ded729a75ee796fa4b890d16a3557352999001d150d804cb4da0e2f51fbe75e376
 MISC metadata.xml 889 BLAKE2B 9a627ab3db90639c30e19df93a064f9129d684ffe1176159d526ba7ba2e68c4c2cded8437382ceb97a5e2578fe79583042f6914a2b7650bb777ec1ce6bebd425 SHA512 b691e0335c2b059596557a3943047b0b8e718cc84c4fd885d44fe9887d3d170fce1317ba9949c3921a6e242434a24041777967e67beba911edf6932fe9f3d3cd
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 d79a5e2a059c..fa4367b40ece 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -17,10 +17,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
@@ -41,6 +43,7 @@ EBUILD gcc-11.3.1_p20221209.ebuild 1286 BLAKE2B 5bb5bb1dfa617deb42fd1194fd51172e
 EBUILD gcc-11.3.1_p20221223.ebuild 1294 BLAKE2B c6aa11e60a7cd0d5906fb0ef055b53583472fb17a5715f8f3450ce13cad83ae9f04cb42f10b41b8905532e0538b78e36d6fca8d56bf1550ee2f20b03cef0f4d1 SHA512 62e61d7502d140012879dadee28dc8140215b43a5bb24b4e59fce1cf697b5bf4d1433b887f8958d77c92abd3c7f06a2d4a90ae93bfc9baf1640b0d048132b872
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
+EBUILD gcc-12.2.1_p20221126.ebuild 1437 BLAKE2B be29d238ca36333c711e627b74e5ff647115259acaa853afab9b21436ff2738bf7529a6290339a0fd6c9cb79a93ba9df553cff6f30f9ff67dea07ae8632accb2 SHA512 a93d611ec6e1dcb9563ea7664c5c2840ebccf90c5cade0ac5000e6922219a2c5e1c1a6912f44c35597feb0ee218e7103b848bcb7f3fe7289ea724955b58604e7
 EBUILD gcc-12.2.1_p20221210.ebuild 1434 BLAKE2B 5755d51a87eaf089108e881d501d0464514131bf0ca753abf13d012acc813ac5e7165f4fefb9117a0fda18118bf1fbee837e66fca083431a34021c37c9438368 SHA512 14f1a37595812c10b4da0c6ce970ea00a45e66b884df8102879c5f9c5d65472ac1196528f64ba1a5aae442f586d5f210939d7f8e26a1f4e9d1a7c7c03ca94198
 EBUILD gcc-12.2.1_p20221224.ebuild 1434 BLAKE2B 2e78e2f2c44d329e9bf4360083f27579fecff712f773f854be0d5fbc79f71ef028114388d6ecce3ec3201d4698a5ae35969614746811ecb361dbb4ea61b22478 SHA512 176164b6d9af91e1b09230626e2705e0a483a21b6d7e2042e4a6b17455964a30b8e4f7b5a0957f9b3c91c91fc53b8a6b77e98be74c897a9ef778854e8ca0e998
 EBUILD gcc-12.3.9999.ebuild 1545 BLAKE2B 78fdc4a7b20d22bba137cba00e49d2249c5616bf1c4cf619162da1d98c750fb3da71fbb1cd4e136624cc4e0a112547e6c4c29992aa58ab12507917c7d728831a SHA512 f3562696a79035e64b8e79cee720fe24c7041bf922d79e5cff1ae864a533997995465d0871bfc4f87f6d5a66e7f8ac02c490792554a0628ae30d96a061ef9279
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/Manifest.gz b/sys-kernel/Manifest.gz
index 3b3c81bfbd50..ee44c621ba0d 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 0e68592879b8..64ca6ccb5d49 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -64,6 +64,9 @@ DIST genpatches-5.15-88.extras.tar.xz 3932 BLAKE2B d504a1d8dc4510e870c34d5e35594
 DIST genpatches-5.15-89.base.tar.xz 3552056 BLAKE2B 2131869a216e9e99fe893e502e9dff10ef486fcbd0a130db2621ecbc61194d4f224745d146213edf35083752de89624346eb7fcd7c2fb53f414d3ddc200b5b51 SHA512 ac840d8ea832f5a388ace30cc435501112992a16834dfd01bef764683b415405b1f9fa644062c8ca3ecb18739e55133f2282281436847d9ceae8fd6104dc583e
 DIST genpatches-5.15-89.experimental.tar.xz 5424 BLAKE2B 36c186a46ac6f9965e28b1757e06ec76ebf472ea869bfd0e3b21f400a1baf31993fd537be5cec83facbb76ff5359cdf768d51e92ef551a4f78e4d5c3243cb453 SHA512 ad63c5676b64b330555d5969be19c239663c635dadc7ee25efa9d4742b3dd54e068493322d07662b064e4bab3ac90b2886a0c18cedef6e8e6b896b3576f9886a
 DIST genpatches-5.15-89.extras.tar.xz 3932 BLAKE2B 25a5b47eed2412b6d660572c266fd8d22be0c3e570dab6d45a7e6a0015227a1b4cd468582bebe3ebc7f47600d3ad30a5853dc2398e39ae02352a1b5df1faea36 SHA512 b4ce39a33610e5ff1c3309f787dddca702e55d81b19dbfb9300386a246e758ca9192eb98189ed01ba138d38947fa35e27dc6d3b459da059807bee93289845879
+DIST genpatches-5.15-90.base.tar.xz 3757428 BLAKE2B 30e129e5362a5fd690d8273a36e102510e113415e3241f838b366c2e35dbf1b95fa30d6e34e6e36c5d938855aefcc66a039f1242ea8a69263fdbaf84c46434c4 SHA512 bca6d1252657ad611a71ed2ea128887b131f9dad83f4c0007573b2637fd79b117023d0ade5b833070a8c86ab4f698d0b3250e01b612a0b65515a164fdc9d1212
+DIST genpatches-5.15-90.experimental.tar.xz 5424 BLAKE2B bd4bf49ca8783eea5bd093e1c8a12481211cc1904cbfed27513a996b182d752719378f6b225b6b650bfa926a970f34446257e232c5fbca9a55c513a9a559b881 SHA512 f66fb915fbf70522adbf3d076c5cc061e9aae6edcafd48e074e63a05d54bab91e578e710dfd30c0812fd389854bde68c964428175bfe357f4b5377e079b82b6b
+DIST genpatches-5.15-90.extras.tar.xz 3932 BLAKE2B e84edd591a94f2d21593f86aa7ed2a27980e099b388f49e899655dd687d459be87491c6441b73a5c024c43bb81f74103ef226d3bc3ae42d089749db0b06ccf45 SHA512 687240f034abd1e91d85e057bae2693129ef6fc4b6119c71df00c306ae2d1cc64ea294a76ce8017b7f2b0ac557c41b9ac70d4fb466ca2899a3c544490421df45
 DIST genpatches-5.4-230.base.tar.xz 5241272 BLAKE2B 59a4ad6f7b2f3380e5521a2d48e7da526bb8dc177d04c147e5699b75efd76e62e94b97a96d7d2f50c70fdd684c57f76f1a0017fafc223f7a31f7d26ef24a5365 SHA512 f69615ad62cef31b53cb89ce072760e17f9f22a40217ca1057e34939ed2fbaadafea2811e68fbbb91f62aeb630d4ca71ed63442efa5448c1e44554a4cbb57b12
 DIST genpatches-5.4-230.experimental.tar.xz 16912 BLAKE2B 993d8daee45da9acd7c54828694637c3e154f9df403a5e4c3bbd917d8459b00ec2b1ba2c370aeb69b39b7cca86d8c29305c04a6e619f616424287ee0b50d7f4d SHA512 779078a726e6b247bd84f5c9454473b902204f73bb02e536af4e199b769479ee72319ea9741222849db94bfe8f1e61577d4f884970b9c3b79bb34110e1dd4b81
 DIST genpatches-5.4-230.extras.tar.xz 1812 BLAKE2B 62c614ec2f856867ab6e6953fcbe533fba508263a2f0e0f9e422ba9c4f159af9564d8ad57368f4e8a9e645302b3cdc8ef1ac5a626cb8e18380c025f3290ba56a SHA512 911595072c899538d66313d24585df62a9dd4e44e46980b14e1b6d0c61a64d55b6a66e4b30cae49965900bbbe634c2ebb36aac1d084038829da2a1a59b721186
@@ -85,12 +88,18 @@ DIST genpatches-6.0-14.extras.tar.xz 3804 BLAKE2B c12099272fc09f02aae38288969f12
 DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771f615640c8c3adaee94432580f5df51cb2a488794a376c9355d568ab4b3014fe23e4c9fb000bb9ed6948b4225211df862d6 SHA512 64d5d04b8c1b3c3967fd22cfd975b7f9bbf37e7d7d4e966c7017b589837cfa02200a80880f13ac52942fd845c9835143d809817f5517c91992e30e101b15c775
 DIST genpatches-6.0-15.experimental.tar.xz 71060 BLAKE2B 5a01b91228d2622303167eeee219627ff4da2bf2058407193ead0dd9739202bde4834c0fa8a19b358469972739c47cf5bf50f408a07d26b80c8747b9482d867b SHA512 474c7647fd8657391e06b4363f3a7c711c0d7b8af1da5aa812e66061a21f52eb8c578ee8b5043fe2e44325a76fbec574c5abea69e3c258ba782caa24089bb037
 DIST genpatches-6.0-15.extras.tar.xz 3804 BLAKE2B 84856863ba0897a7ac9238094fec3d46a39cfed7db81d1021b236fcf0bbd4bd893ba44af4ddcc9ae955ab66424afd70ead4fa714a1b68e11d7e66539f94a6cf5 SHA512 7e49da632e9bf5a78c80a0817708e571452f92a99fa91daca8495282fd0ed955bb16a5fb57ebbfff68e9fe6733655c4d04967c6931d1acf6dc6102a44bd9b04f
+DIST genpatches-6.0-16.base.tar.xz 995192 BLAKE2B 17cfba17971fadc2e389f14e4787604489f8a30760f3687df364d053999819dfbe63264eaff4b04bf7df00d66278e6d56d856e09a043407e282bbcb2fbce4c7d SHA512 fc199b59ee9392693147cdfcd11d26cacc5ae5b4a76a3734f32e2b86a027e0d13a4ad5927ab06d333b7ec89f1983acacd876c272cb48e6555e1b067b0c7ae63d
+DIST genpatches-6.0-16.experimental.tar.xz 71068 BLAKE2B 4c22f54fc7822013caa058ddb5c58276a4fb096ab9ce27bbc6ef89ff4e2cb53090305c406b3871ead0af859d348d5ed6085ca0e360c199cf75593cdca96a7f55 SHA512 d0cc4bb3b543ab597c354c957df3737496f1c9ed53b78a738af331dd5900c2f5e4438352e0ad49ede57a34f3591c0eaeeec94c7131f6012c07fede93adb28639
+DIST genpatches-6.0-16.extras.tar.xz 3804 BLAKE2B e03fc44e706291fe586f115e0cf58c78fea7f259a02cbc05cd9bd44166de7f329c538e00a86ca9151cdcad66f029f52266816199743fcf176e0e0295c785a833 SHA512 06ad99c99c6b130e6b6aca4918ffdd693b04830ec475a397f697e70ed2356c43a177a67ef46141d28fdc7ade2eb9941f24402c82304340b000f28831f4ea83e2
 DIST genpatches-6.1-1.base.tar.xz 4304 BLAKE2B f58a4e46ba85da5bee55c6fa14a57e7546813d167ac3d78fa8bfe4b386ce2240279b7c936094271cffbabd9f6eafd76a7bd609fb2136400cef2eaf443b452cd3 SHA512 310c97fb844db4ffd7272144d1d2d3d5fee1ecc31527ef3a6f0b67f0fbf1f3b7f9f9db9ae52f6e309cb7a8e0790019707db24db5db670d58179b7648c677c1d2
 DIST genpatches-6.1-1.experimental.tar.xz 5404 BLAKE2B 6dd8a66d711349295afb76d3eb495315eec50c670a77d6b54e2ec846f933aa0d3afe8498af9def34d1cefac474732050a8494373cef08e6336120bb50bef13cd SHA512 42ce951cd7873675dfdca54fd5a61b8a6971ad14fa8a09acebd350eb7c83fa0f0d4e90f73e4885db05fa75c41ba614449999332a73294462acf20b5bee2cec02
 DIST genpatches-6.1-1.extras.tar.xz 3804 BLAKE2B 62ee97ed9142b41f415129dfb12d10387561258c6798f055ef5c8767ca0f31b36d785045df4207f704ea37f6764a0fb6e6fb78859c0679ca5a75a5aa5fc458cd SHA512 21b8f5a44809a9866063fbac676df25db709105c702a5b90e5acb21f6a01f60d3a559d8398dba1ec2b0ade89b3a45b587933cb7ded0621d8e4aa13b4d4eb5daa
 DIST genpatches-6.1-2.base.tar.xz 15048 BLAKE2B 84d1f7b4cb2c13e70b0d542853856f05de48739400f66253fd277167144ae0c259579e539d43ce65d2ee206a2820ec2ef288d9296c68a4dbd674c43d378102b9 SHA512 e349b8b535e8ab9f70cd01c513480cf75bd10dd2f2d5ef15f97734ecc9e481f137dc1cfa4c50f8a1a2f3549bf0142f83f7224603f881e66af130cbe1f8023496
 DIST genpatches-6.1-2.experimental.tar.xz 71192 BLAKE2B 9e1995de2e1afd01d09da2ff9bdcde69e87215da78b2353a73f84abc27f3c886acba0d2251c1f096c6d424d07214acd249b61e6cf239205b9bd4415213cb2bc3 SHA512 94e5c1bd2eb99dfc32dc74251f210a1be7d9f244f7a53e65eb4b0dd3b97a34cd5d13d1526e52d34d319812738c579a0e6c656ea954904ce45627d9816182942d
 DIST genpatches-6.1-2.extras.tar.xz 3808 BLAKE2B 70f549904446897e8f955146dba039b43681e03e0d72049e35473ac6ff5d05a1a72c124d410fdfe065d5652c0f0312c6eb4907afbb475e3cd9828c3f0edb6fa2 SHA512 9f92c3b899a8b106649003acccd33cb3cfaf9838ec421998d3b587893b2e6705068fdc0ff7b52ae78203dc793b6064742b721e68bb1e8d7160c48b419062448a
+DIST genpatches-6.1-3.base.tar.xz 331284 BLAKE2B 66670841382237e0d222ba04fea65c98420c15160c7c9073b3107efc2779aceca0bea1643be6c06d5d1ea15558cf53676d25921013bd437027090be4acb85228 SHA512 5873cfa3f67a8118d92b141406298760b54c8b3625081c5dae79fe0c07e3eae20474cbc85601e871a6bdb5b3ed2f70e16e1939d8e4af67db7598af845853f0f1
+DIST genpatches-6.1-3.experimental.tar.xz 71516 BLAKE2B 03bc845d4559717e54b63ec659b9b4fc6b088b76da8ff9a762e4da52dc50af5cc646fe3203a23095b759a3ce4d181685c0dbc775c82ad8c01ff2748aa97ccadc SHA512 7456313059a3a8463019536dfe0f6d5f5cdec659f6fb8275c235e20def546ce299a227bec30d3af6655fcdca105ac923f5b2cb1f5751e55666cf60e99e43b034
+DIST genpatches-6.1-3.extras.tar.xz 3808 BLAKE2B e4dbbeabac30e90a113041d4402bcb53d27a77408cdcf2e36dba448e680899efe7a62abd6b64574d778b8b058bba09ca0ae9830fc2ce4956cc2548dd243f00ef SHA512 17482b5ac89d4a2da96142195dbb6660295f0a2d8a321a92b1629d5f77e50c125115f2dbab6409867a989747dd28d6d42ca57d2f1e0193e731eb9d57ed5e1dd2
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
@@ -121,6 +130,7 @@ EBUILD gentoo-sources-5.15.82.ebuild 748 BLAKE2B 6db343bc25c120fa82be0fea758df22
 EBUILD gentoo-sources-5.15.83.ebuild 748 BLAKE2B 29742af8beeca8f1b8689ede6dceb62ccc013f10618c02b41abef8b2c5187ae0f0ed96cdc71104fa1d656d4e1dba95eb51165d1ebde367a8750edcc3ba587209 SHA512 1aa3f78259c73ebdaf47a0daf19adfab9e866d03f7e0f590824e536c74191dda9f6bea634ae6921fad6acff1ed73761fef733e8279dd1ceb775707164ba272cb
 EBUILD gentoo-sources-5.15.84.ebuild 748 BLAKE2B 0af1faee39266a589441cc909f028b681fe6cc0039f42e75dd7f91211236ce6b9293015b56144de248849af05b64461657984211208db31d087e4c47da2a893d SHA512 1e0aa21439f4a950dba7b7c481eccf1a52e9ff1388b7dd6128b6b7d801a0d385043098ba33d810ca3fb844b6ef9be6347edf08047a047f87feb4f856d67ea5cb
 EBUILD gentoo-sources-5.15.85.ebuild 748 BLAKE2B 98d8a82d22924528a32ee4daa9b93f016c360eef31c9f3ec557e69e2f8d71414ee1afad09ecf0b50341abe39531cd9c65ac9bceffa5e4d57052b233c4db0f529 SHA512 611c617a1175b052e9c830706ee0d9e0cf562134f36622b6cefa1d1bc3f9e51398ece7ac8c4903998fa2b8fe04262cb77ddf0d58269737746054a206b8c93983
+EBUILD gentoo-sources-5.15.86.ebuild 748 BLAKE2B 883bdc38cce33064073711c90a385141a32a386d0238456326e51649e3cc22c7fbfd884e4fb215aa7e11e8e51cac1d063c63c00ed9064bb57b1cdee308259ff8 SHA512 62907ada2c2f03cc479f6577d6082882a3f0a93f7382deda6a400a9597c97ecc78f48fcdcb318325af1189b0c2ea1ba6b9a3ef368d3d52052591ad8d37508045
 EBUILD gentoo-sources-5.4.225.ebuild 734 BLAKE2B 0c6a7f1bccf894e65c65c0871196dd54adfef2801a1fe64acd20f297c6dd024cd101febca5014cfbf5af4310408b60ae0ebfc839fb8368ad2e9d31fe84caac03 SHA512 8828e4b7a8dbca88d205bc964bb709fba2e16e12938306bc269fef1c00f55867087145a08b55a5fee7c410b38e829eac22e8e64b718cf7c6ee41d2527e01cff1
 EBUILD gentoo-sources-5.4.226.ebuild 742 BLAKE2B 9b5afb9b4846c7f1e3260480d19ce8c9ed257befacc536a3ad1ec2c7328e7285e718a8cb8242c8874dd7c3c75c053624b32a6e59b9a25d0ea7d8cc90931069f4 SHA512 f69dd54f61f7833905fd650bb41f407f2696bc38ca01403e27bedc3d559c6a83d9339a5710cff633ce24f000eeddf818a66ebbbae72fabdcba05fa085a60eeff
 EBUILD gentoo-sources-5.4.227.ebuild 742 BLAKE2B 26797ad2bea2eff7809c80273f171e482de41535a96fa0d32aad15d1ffd83e78de0c590a55e3b3a499e18c127ecadad023fa8b5f070047558be5516783307f97 SHA512 02c8b7a0746a43ed0445c88ad6746abc4fa9fb8de94b6717d472952dbebbd6003e81a6065941882c9408b229f59c4619ed618c2253adac6c528d329e9a985691
@@ -128,6 +138,8 @@ EBUILD gentoo-sources-5.4.228.ebuild 742 BLAKE2B 283725fbaf07811472c3478858d3c91
 EBUILD gentoo-sources-6.0.13.ebuild 742 BLAKE2B a776c8acf62c71990205444dbcc91ee6497b129f0cffe91a46a656ce9d376299985831d32da405790c53f8bf332560fd10c2a5a389e8fb0bc076292d6835fa3a SHA512 7eeb9ffbb469c44d42769beda98c1afa022475b7fc55690b4d76b64acbe0ad884a288bce5b4da4e8baa9f67ccd762eb79c738218886bdf59440491995e8233be
 EBUILD gentoo-sources-6.0.14.ebuild 742 BLAKE2B 31d367e09b24a52e3bc3a9537ad829850dea730cd589626fcdd6209c3c3d2864bba9866240892d685a55132ea0f265604fb375337c0a8a2da5e99edb59d76037 SHA512 c9dd14bb7e31f6aee7214a74c8195f663dfac0db16f7fa01fc77cdf649171c2433157d1287c420120e6695061b9eaa97519121c97fed34ea7b400af9194d7ea9
 EBUILD gentoo-sources-6.0.15.ebuild 742 BLAKE2B 63381debe04b3b6a2550c64d745c5124c311a8f3372d32c7d1e3dde4134d1980f7b5223ccc40396ec2e93e82fb49cdee9eb72af33906e84507be8f62b0a199be SHA512 4f868b2a033fc7c1bf7f22fb03b01d6aa75c85615c4bd29c11df250d27fdfe2e9cb1ca675683e2172ab37e1b1b1fdb2ed51f0e439c58464b0c2e4380fc06c122
+EBUILD gentoo-sources-6.0.16.ebuild 742 BLAKE2B 4156dd6298aacff8389672358ef446d023a937dff53dad32cf4ddfd200f70d97b10511d073d3208ae1dd2ab8a68e84723ae4217ddbc2b5f5b8650d90d570d8b3 SHA512 d5319327891a906c2176b76cc22c55c3631a8c11786b2c35c70035c01b4f9c634f61e227c35c0632dd2da8854970ba765ea6e85ad3d684788a49662677787594
 EBUILD gentoo-sources-6.1.0.ebuild 741 BLAKE2B 173a99711cf7e2f80832dead06826d0a5196bf35d364b5445b0da5f60901cde8c4f71757c68780a2768d344dd516fc77a6136a0f3c8ab1639fcfec24b8ef49a7 SHA512 fab36547339b5d28de0b9553b1997a4159099a9b2959539d842e3afe88ff3bde955b4babbcf566ec0baffd06fb636b553aca59cf9f7aad5d0a4d5c4a687c466d
 EBUILD gentoo-sources-6.1.1.ebuild 741 BLAKE2B 850fb58340c7bda3854cc22131fa1c3e294255fe09dced4b9d7a177c2b451ee7a447ec397d05c15d86592a58c59ed3e83c45870b7c85391064dd03f77c11b672 SHA512 557b739782cff1984ffdac9a947f15bbfac6d5e8e455ab92635ad9d40ad8b5d2fefd6c47777e9aa93af35cdaae2a69106498776ac6c33d1de4161200560e51d5
+EBUILD gentoo-sources-6.1.2.ebuild 741 BLAKE2B d7cc73a7e5bd4a201e540683366f944b5e6da10f5502b73717871b6da04c552b9a8c4191bae054b9285ab2508b6f7d7e450ce70ad5896a6e7d271c20be410085 SHA512 8fbb04ab8751f268974607acba538391a68df12f9db90b32c99770efd3690acc042ff5fabad499d2cba894e6cd8b2c14819e4a51b73bce5ba300d685b96b3745
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.86.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.86.ebuild
new file mode 100644
index 000000000000..3a2a303d76f4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.86.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="90"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.0.16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.0.16.ebuild
new file mode 100644
index 000000000000..b1fa09213065
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.0.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="16"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.2.ebuild
new file mode 100644
index 000000000000..9fc029507ff0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="3"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 9397fda3a671..34aa3f498058 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -10,16 +10,16 @@ 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
 EBUILD vanilla-sources-4.14.302.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.19.269.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.9.336.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-5.10.161.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.15.85.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.15.86.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-5.4.228.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-6.0.15.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-6.1.1.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-6.0.16.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-6.1.2.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 MISC metadata.xml 340 BLAKE2B e283ab9d2ebb7212e3ba37850c93761f165b4697a2ee6dbf07a67ce907df8ec71b3290a411cb81af8d8d8869b7e45c572487d4d2667dc0a0971986f0f6d1aa8e SHA512 bd0f7f570230dd5bd9f6e270345a3ebc556eb2dbcd19b04e33b5c6df8d9e6735a6e23fe934b39d9ef130ab5e78c6fdd29d7a167cb8ee4ac8ce919c75cec7425c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.0.15.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.86.ebuild
index 39693afef068..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.0.15.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-6.1.1.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.0.16.ebuild
index 39693afef068..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.1.1.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-5.15.85.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.1.2.ebuild
index 39693afef068..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.85.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/Manifest.gz b/sys-libs/Manifest.gz
index 2c1de196943f..2ac8a484dae3 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index cfa658297a44..5d794ca48e40 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -16,5 +16,5 @@ EBUILD binutils-libs-2.35.2.ebuild 4100 BLAKE2B 521acb4f160e171efd6500aba598825f
 EBUILD binutils-libs-2.36.1-r2.ebuild 4053 BLAKE2B 1d2c9609ce0fa3aff3222d89ee237ba73d31515bb0032ffd8d6b6a9a04060aec1df32cb727572a0a20b9ba64834dc43c2260f3401703cb711d0d5516e136a3d1 SHA512 e355a34921f4a260f2f61a222365703b1afc103fc993e255801a8c2deec42409ba1aec8a22d734c38a4440c385b29f81eac52c4584431ee54d0cf0cfe611ff6c
 EBUILD binutils-libs-2.37_p1-r2.ebuild 4126 BLAKE2B 63dcef180b378d47d48f714e095ff2ce98dcd027de0d176c64179fcfe1f48df5f451468fb974176ade21914f4ba731487b91b03223eba11662be17cb3b42c9c1 SHA512 c659774de8238e81669507dfd5b2a565b5deaa8c54fe12ee02f5b3b204a147b2aea5bb9a6707930d0ac3ca10225ce486f294e510402b37c99ee1f6c170c31ecc
 EBUILD binutils-libs-2.38-r2.ebuild 4803 BLAKE2B 60922f7c60d381f778474a74497a70c652033a92f0fbbac3fab30a2fe4c4a88afcb4931a3914a4c5ca6a853653f83f941253398128dddf21636e8eb95643265e SHA512 f479a863a002bc373c188ccc55c5ad9c2791d32dc64af9cd3e5896204b6e0438a52035622697888e7fc16a0bf7d3df79c3eea2ec8c2e3b4c443b82637a1dbd0d
-EBUILD binutils-libs-2.39-r4.ebuild 4819 BLAKE2B ab21c2cbe79b9ea63d0ed704fd39e5ad2de2a925be27d7d88f9d97a5c9b0bbf2742ad6da44ab0d20998735d58c2072f14ee2f293ca8d0fbbb6610285e5888d7e SHA512 67973ea47726a1789ff4ecd69aa716ed8fec5330e49f869adf59e5e62a483127f73316f2c473bf61d4560e58dccb1f64268c44e8497b32aec900aa204e613d65
+EBUILD binutils-libs-2.39-r4.ebuild 4811 BLAKE2B 0aa3431de9e88fbcaece3c177db1a154f0b72c62249905e38bedb3852525247700d7aca738d9fce5eb52b9db6ef76d5643e47b2a3482f9c160475cfc456788e3 SHA512 dc3988a84c0d9389c9674852b7348788e6bbc9cffd445289f8ac51a2964b761546dfbafb4ba229fed6d6b63fe9b8b0fe6f5db3a72cc79824f877adaacc4d2a25
 MISC metadata.xml 612 BLAKE2B ceaafd9fd1421e9f3993e003d0029c92a78054c7a2b90bd78afc05370ad19c931c6a7c150545cfb7d57165168e0fdaf3a00dde1905b328826a91cbc70d9548a8 SHA512 c8d33bb8d1c62c7e95758624ed0febbc9d40e9f141bfd280837b3207bcd771412158d71c0cb5548d60be0b236f6fe103621daf7efa8875191982859b566ffa8d
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/virtual/Manifest.gz b/virtual/Manifest.gz
index 67495427f7c7..5420aa745ac5 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/httpd-basic/Manifest b/virtual/httpd-basic/Manifest
index 69aa05019e1c..a6de03df5fe4 100644
--- a/virtual/httpd-basic/Manifest
+++ b/virtual/httpd-basic/Manifest
@@ -1,2 +1,2 @@
-EBUILD httpd-basic-0-r4.ebuild 542 BLAKE2B 0bc1bbc86902e34b8660146d9a8e0273ca79a2cc2df918434f7b6b158d382a575e271b7081288373bbc72f719e254b59885057ad18cf80f2fcd1d6cd7fcde3cf SHA512 13f96b8ebccebf93adaab38f358487dc3ffb09bd2d437448f9cd10ff9777c4f85fde134767be649d15d2c337ddba2f2a812cf85cda67e1f3aa9a9e4f113fbd8c
+EBUILD httpd-basic-0-r4.ebuild 524 BLAKE2B 74feca975213ce2c01bcdffa4183b9dfa938d23a701fe59a8001c55e865a3b89a40fce7883546c7e14b6bfb5d3e4ae1b58d68fc95fd6c51b996afb35d2faef54 SHA512 dc89b34c2d100815e1fe44263098fe880da1be8e47be888087b3a3971bc9ab8453e327ae7df1fda5013e67ffff4d39a73f0cc01d1e1ee86793ea092fe9092fac
 MISC metadata.xml 275 BLAKE2B 800d0273e4eaea030ee56e1b3ee332d0c3c4609c35b5c567323ccf8203638434135d53e5b1d9e6757ab86cdedb7bbe2c1d1d2f4f50962613dbfe6644f094fc93 SHA512 e1f715c47a745d66a020fa2351b82e974cfd196a4e50d2a232b55290f550e5cb91ebebba9ff7461d3412ba980f108158de766ef3f78bb603e34e25e88288eef8
diff --git a/virtual/httpd-basic/httpd-basic-0-r4.ebuild b/virtual/httpd-basic/httpd-basic-0-r4.ebuild
index 5abdfae24176..2b24ea0462b8 100644
--- a/virtual/httpd-basic/httpd-basic-0-r4.ebuild
+++ b/virtual/httpd-basic/httpd-basic-0-r4.ebuild
@@ -12,7 +12,6 @@ RDEPEND="
 	|| (
 		www-servers/apache
 		www-servers/lighttpd
-		www-servers/boa
 		www-servers/fnord
 		www-servers/h2o
 		www-servers/monkeyd
diff --git a/virtual/httpd-cgi/Manifest b/virtual/httpd-cgi/Manifest
index d0e33997065a..b2c49d32db7a 100644
--- a/virtual/httpd-cgi/Manifest
+++ b/virtual/httpd-cgi/Manifest
@@ -1,2 +1,2 @@
-EBUILD httpd-cgi-0-r4.ebuild 552 BLAKE2B 4c309c349d43e7781a9aa1cc354a305812deddea5d256bc8f159b503deee23e73741cc052cb8e32e489acea3287faf8a7fb83141e721930f7e6ca132011e22e5 SHA512 a8034ea09f58f7fc50038a5e21981a3b844df839f7f44bebf1c575ab904f8a35535e89c58f3b59e6b62a280deb0ce534bf75bc3b6f7db27f240b431912c5f3ea
+EBUILD httpd-cgi-0-r4.ebuild 534 BLAKE2B 22306d8d06c480fd40991ddc64f984493d91cbd670bae0c617a36f062d802dfd4c52b815ac30f3ff9cd4f83c2575f96981c25e89f589e3af7a6080f04b61b82c SHA512 e3d810fbf732e6a7b19570dc69d8c297a34a171b309095e6dc156788f0a7b437bcca3732b894a518703f9f88711a866cd707cafd4eead084193cf36f775b5ce4
 MISC metadata.xml 275 BLAKE2B 800d0273e4eaea030ee56e1b3ee332d0c3c4609c35b5c567323ccf8203638434135d53e5b1d9e6757ab86cdedb7bbe2c1d1d2f4f50962613dbfe6644f094fc93 SHA512 e1f715c47a745d66a020fa2351b82e974cfd196a4e50d2a232b55290f550e5cb91ebebba9ff7461d3412ba980f108158de766ef3f78bb603e34e25e88288eef8
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r4.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r4.ebuild
index d4e818febb99..8d1874478709 100644
--- a/virtual/httpd-cgi/httpd-cgi-0-r4.ebuild
+++ b/virtual/httpd-cgi/httpd-cgi-0-r4.ebuild
@@ -12,7 +12,6 @@ RDEPEND="
 	|| (
 		www-servers/apache
 		www-servers/lighttpd
-		www-servers/boa
 		www-servers/fnord
 		www-servers/h2o
 		www-servers/monkeyd
diff --git a/virtual/opencl/Manifest b/virtual/opencl/Manifest
index 99e8dfc85f78..70848d591796 100644
--- a/virtual/opencl/Manifest
+++ b/virtual/opencl/Manifest
@@ -1,2 +1,2 @@
-EBUILD opencl-3-r2.ebuild 1382 BLAKE2B dc5204084bf3b8df84a0d549f06d0495de3f8339200e9f227611037924a73b79f0f15dc68de9a51a6c0721db5bef19d1699b4a12fef4ffa807988f063ec5f1ad SHA512 0f7debcd0e3a1b71510b94cd0f338a53f1284afeee55c3311ba2785557c263bb1a4b1d18c6c5f54cd09e869d67b9f54ea9b27f3df2ac3e38f327590746d9d9fe
+EBUILD opencl-3-r2.ebuild 1324 BLAKE2B 0ae21451e724868f9eb82cd4fcc398d84157ea9925bfa4d13dba66df9e7424a1308e25cfff6da770f27ae4a394d393c7e61f42593c649b754d48554cae1338e5 SHA512 003f585ecdd46930c62846420899ddb688de95f00bcf51546de9ff7427f4bc122bbe55464a323c5bda24ca75b20f27bfaa95c80d8be71ce159bfe0ff1216d021
 MISC metadata.xml 259 BLAKE2B cc7abf54ed4398a2cfb77310c63f5fae3e432488b0c7466f8148c5d009d38aa4ca78eef78712f0b7b6aca6710aab1dfe3c07440f36179fde03f8a97a49b3c080 SHA512 6f50c5d3c735db431156906312a7c1dab3723d8c9e51d15148b92d97a998221c6838eb926f36c6b924c9fc8a6a64ba904e36482ff5164867c482502aa638462f
diff --git a/virtual/opencl/opencl-3-r2.ebuild b/virtual/opencl/opencl-3-r2.ebuild
index 0d693f856d84..f496ca068a76 100644
--- a/virtual/opencl/opencl-3-r2.ebuild
+++ b/virtual/opencl/opencl-3-r2.ebuild
@@ -9,8 +9,9 @@ DESCRIPTION="Virtual for OpenCL API"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 
-RDEPEND="|| ( dev-libs/opencl-icd-loader[${MULTILIB_USEDEP}]
-	dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}] )"
+RDEPEND="
+	dev-libs/opencl-icd-loader[${MULTILIB_USEDEP}]
+"
 
 pkg_postinst() {
 	elog
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index ba4e487863c4..119652d65420 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_common_redirect/Manifest b/www-apache/mod_common_redirect/Manifest
deleted file mode 100644
index 0dfc19e4f0b8..000000000000
--- a/www-apache/mod_common_redirect/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 20_mod_common_redirect.conf 133 BLAKE2B 1353b28961812a4cb9e8aae0bc53feeb6de2b15238d64c8680402c5b118765b6233ec2521cfd1ec3cc7d9dd1400ba17d370c4b062ce1792d032c91e5c45ef796 SHA512 5152736abde393b0ab9e1df1167cdaaf951ef23ad83e53482eacad4a49b3cdef9d840bc4d0ff38504ea2bdb0d78dc5e5075b2e83726068d495b1aafd30f39d69
-DIST mod_common_redirect-0.1.1.tar.gz 3341 BLAKE2B 124c5dbf239351514522c87cfd69bcdae45a6220944e1a88f082224e537419930ba5f5121f065cd6f0f9f51a17a19e0b8ff76c513eb2f10f440f3238b874d234 SHA512 861f7db59095f35b760ab67e703a6ae40c0f31d310c9b9498d7d477ffcdf1f1f673fd0f637acbd1c3911ac140581dfa49457ae56602035f8e834f56774706263
-EBUILD mod_common_redirect-0.1.1-r1.ebuild 766 BLAKE2B 96dad47721c3dec6ecfd065737610864b5341262f429f6b0e188e6a8f191b7e4589b45f90b50fe4a17f9c2004b8b7b84645fd8a946c1a602cd7347db79b53ba3 SHA512 859f5ae8fb2ec9c9182c1e6b22df7a1c268dc5ceba24fc19aa5241ad47db3d793c2aa7b9d177c13618b54486156509e18f374d24a6295f1838d252ed6df71efd
-MISC metadata.xml 259 BLAKE2B bd062a11d6ee8d1111c3b3c87257ae4ed364c912ae390ceec07797d8d362a4546b7d5c6c9209652a8bf2933f0bc492ee3078b49b466f8c25e296f5f349b7c562 SHA512 4164f825ca5f62ef52e0eef0bf6aee1fa57967ed93e306769a8495308b566c6c8f3e698de7857fdd75aa1a42914e0f7d15d5b3a975b00ab38f1c4306fdc2e4a1
diff --git a/www-apache/mod_common_redirect/files/20_mod_common_redirect.conf b/www-apache/mod_common_redirect/files/20_mod_common_redirect.conf
deleted file mode 100644
index f2d135e66ecd..000000000000
--- a/www-apache/mod_common_redirect/files/20_mod_common_redirect.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfDefine COMMON_REDIRECT>
-LoadModule common_redirect_module modules/mod_common_redirect.so
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_common_redirect/metadata.xml b/www-apache/mod_common_redirect/metadata.xml
deleted file mode 100644
index e665fe8795fe..000000000000
--- a/www-apache/mod_common_redirect/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">hollow/mod_common_redirect</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apache/mod_common_redirect/mod_common_redirect-0.1.1-r1.ebuild b/www-apache/mod_common_redirect/mod_common_redirect-0.1.1-r1.ebuild
deleted file mode 100644
index cf68396b12e2..000000000000
--- a/www-apache/mod_common_redirect/mod_common_redirect-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit apache-module
-
-GITHUB_AUTHOR="hollow"
-GITHUB_PROJECT="mod_common_redirect"
-GITHUB_COMMIT="595a370"
-DESCRIPTION="mod_common_redirect implements common redirects without mod_rewrite overhead"
-HOMEPAGE="https://github.com/hollow/mod_common_redirect"
-SRC_URI="https://nodeload.github.com/${GITHUB_AUTHOR}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz"
-S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-need_apache2
-
-src_install() {
-	APACHE2_MOD_CONF="20_${PN}"
-	APACHE2_MOD_DEFINE="COMMON_REDIRECT"
-	APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
-	apache-module_src_install
-}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 6f5153f4a3c1..7a365ab51298 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 3979cd164d9b..924e57764487 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -2,5 +2,7 @@ AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r3 732 BLAKE2B 8227349f9ffe5dbf7c59efc3b1e250bf8184a72d37958c0ce0a2d8affabaadcb6aaf271b1402c7ac127b80d534f4f72b888ccdce7aa5f7a7cf86a0efe0e719e0 SHA512 7c8aa33dcea56b6fccac23095f7b84225f1c85541cd5eb3536d2901e638c391e025bd9db28bd10c26ef91e5a8fe2d12a878040cf21d4b983858a19f2cac7d1b0
 DIST gitea-1.17.4.tar.gz 52844862 BLAKE2B fe5f52be1c9697032fb7b8e84d90be9b540b4cede67ff4dcc3392621eb206efa0f273589e5fcd0f9f7f56de9dbd42804c9117c21ef2538d7aaaf8cbf13b984f4 SHA512 1bae6e11d441f4efe0b92882a5c2c1f4ada9015d49e6140bac87be1a103e23fd622543bf2d988fe9e9d57c26545b53c5acca31aac13034e01f41d5731ac02809
+DIST gitea-1.18.0.tar.gz 55508056 BLAKE2B bb6a5e98a087bc12e5afafa9c9d95fb381fd96cdd2823e411ab079c3797053c56951bfab1353bcfcee9d58234bb9a63cb029fee03f157b8f00ecc38687f7bb8e SHA512 b205d8d2d957b322e114621ca5c25500d5123d7df874d204e28e3a58c1e101e7849810f380b45957c6f504008d4632b75fc0adbc99ff13e0c8498640da3c42cd
 EBUILD gitea-1.17.4.ebuild 3317 BLAKE2B fc94b9df66f3ac86dd27022cf4620b8b554b9ce500a0011d6683f13e4f8445967041335ff48e847c803406c08e9a7ca46504ac12551709ee7e890d028a727753 SHA512 62b06fe8e30338a0704e39d01dc8f9a82d3a6b390c80aa4f5c8f10830c7db21875c996a7d8f778382cce0e79297fb26aff32c414c0efab730a52066d3375c2eb
+EBUILD gitea-1.18.0.ebuild 3318 BLAKE2B 2442718948c1e3f7fbf59404c94f78243832d9584dd237e82988e4dbf50f47f255bb14afb21f9159dbc84ac68de8a4082151cb0da6a7ad9894ebc38cf6a1aa90 SHA512 0e5c8a43de3b0c3d33eedacb201612c202930d2494a11fe5cf0f22a0a0066925c02f25d32bef8da79445e69a3bc55fe2bf26d0e8001bdcbf1a318f773e65e6ed
 MISC metadata.xml 339 BLAKE2B 6117542b37ffbb9dc5aa2420c5846c95864b632cb35e1c69acea24d0eaed05767b0c3607a58bc9ab8e54596927072f1c7c5cb795ee44d076b7ac027d0ee65a58 SHA512 9b05184ccba06361a7dfdecced7ad53d887065763bbbc736aedc791d9089f146f99fbbd6a483bdaf47a6ee5d4965dfc2a66e6990bea1beb599baf621c2c16471
diff --git a/www-apps/gitea/gitea-1.18.0.ebuild b/www-apps/gitea/gitea-1.18.0.ebuild
new file mode 100644
index 000000000000..c3facdc15fbb
--- /dev/null
+++ b/www-apps/gitea/gitea-1.18.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module tmpfiles systemd flag-o-matic
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/go-gitea/gitea.git"
+else
+	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct pam sqlite pie"
+
+DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=(
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	-m 711 cap_net_bind_service+ep usr/bin/gitea
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
+		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
+		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
+		-e "s#^MODE = console#MODE = file#"
+		-e "s#^LEVEL = Trace#LEVEL = Info#"
+		-e "s#^LOG_SQL = true#LOG_SQL = false#"
+		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
+	fi
+}
+
+src_configure() {
+	# bug 832756 - PIE build issues
+	filter-flags -fPIE
+	filter-ldflags -fPIE -pie
+}
+
+src_compile() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		DRONE_TAG="${PV}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
+		TAGS="${gitea_tags[*]}"
+	)
+
+	GOFLAGS=""
+	if use pie ; then
+		GOFLAGS+="-buildmode=pie"
+	fi
+
+	env "${makeenv[@]}" emake EXTRA_GOFLAGS="${GOFLAGS}" backend
+}
+
+src_install() {
+	dobin gitea
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/gitea.confd-r1" gitea
+	newinitd "${FILESDIR}/gitea.initd-r3" gitea
+	newtmpfiles - gitea.conf <<-EOF
+		d /run/gitea 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/gitea.service-r3 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.example.ini app.ini
+	if use acct; then
+		fowners root:git /etc/gitea/{,app.ini}
+		fperms g+w,o-rwx /etc/gitea/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/gitea
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	tmpfiles_process gitea.conf
+
+	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
+	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
+	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
+	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 79ba9b764eb1..7f431ba49e2c 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/boa/Manifest b/www-servers/boa/Manifest
deleted file mode 100644
index d97f03cf97bb..000000000000
--- a/www-servers/boa/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX boa-0.94.14_rc21-ENOSYS.patch 800 BLAKE2B 30ec3eb9ce83e32d4e04034d7f6810360ee27922b64972b7bf5469a70531f4c98ce917496c989501f427adce3ce285ca50d1ef87c5d887333e2044cbe7d29738 SHA512 2f3131f32fc748ff9ad1dca746597939662ebbcde086df1f21de4e6e84afda26309bee32de86ebce650070ce1020b7edaecdf3e096e3ed124739193cc479adb6
-AUX boa-0.94.14_rc21-texi.patch 431 BLAKE2B 41e647b4a412ba0b06319d3360383d6d999d59d9beb68ff3311b96e8a0514aa78e23d2f4df738080684f2cdda8367493ee488ebc42ee94c931e14d79e57eeeb2 SHA512 da7c2f362331b4d1684bd134b5bef2cc49316c7abeafec2bdbcb6c1e49d62eddc36ac47a4dc282285e0b0dc625dc46c30c910d819cfd97a970cffd92e0c90800
-AUX boa.conf 7339 BLAKE2B 59211052cd07561f765afcf5897fae5a79b7bdcf044c950e4e6cfb9a775e03cd5eeb2a2e3e56e9d75cc99d907b72b3a283d4f296e987a86b65aa606710a54a12 SHA512 28a4d171aa31cdc961d93df0076f520d1c3d8d502027c7ade2acdd63a154c5c1efbda63a94a1569cc23a824f2637cec134201e2994ace5d0ae65d60134e7322c
-AUX boa.conf.d 104 BLAKE2B 2153bf930ea1994ee5d9311c39f154c52c366b60cba60b63e89f2fee3f08159c95a4ab3642360e518ea62162a37f97be26d473786f7347291325177fd2605859 SHA512 334e6699d2a8e83fd81c08df5d140658a8cfcc10538c3496752c5eb37a4ce89ed604a9c094c767dc3d8d88053176f88dc8b9ec9b85ac134f09bf0fc15df994fe
-AUX boa.initd 639 BLAKE2B 10155fd3f9ccd0c47155820985d00fbd45b5e95399634cfa95ee865b9d6c6a6b3ae91775f7f5d084054f984bec185ca6743a59da13a432fd59852d4c979d33fe SHA512 41c242e17c5cc21c7834a4b7c2123fe47b00b3a107dd11c003bbb21d6ff599df1adfe0c58d7451a3326662d9c802af78996a6c4434ee0407f26eedeb45559305
-AUX boa.service 131 BLAKE2B a77133453d32a7798704019470156e54842878f125f3bdab28f71ed804aa4b910621328b7b486a4b24dceaf1e82012a09de59977a460263c57e0e8aaa13f5329 SHA512 62628a38bd679e10b0f5d3712d206fe292d4adf0ed4af9387b7e923ce0c2efad060f139a8cf5d0aad89485ee4ba94565387e6cf0858e779538d24705aa01ee99
-AUX mime.types 5488 BLAKE2B c87384f25be47bc2640029ff51b7e10b830a3544c89072f8033bb23018920ef9d98b2db7f8c6d71e4bb5157f3858c49d682d0eb8708273a4ede0afffa7f86239 SHA512 5498bc2cf93640f04240b96ff6ac297d9900d44180a9fc6d4a763f5c97c140f46e0a16efb736be6e295b9448915c80830854eb2c705f37b04633fed6352262bd
-DIST boa-0.94.14rc21.tar.gz 199950 BLAKE2B 763c3f9d3b4a0442d16372121b9d1a584dbfc43848c3cd89a8f33e4728dc2924fc32161dd8b756d74fcaa6ddbc5839b59a3cc4b88353892d79eb455a09687700 SHA512 ca8e5c2c29f0b6cd4fd2f7268682dc345c1d37f4de099319e22d63d822a72195659d707e148f2e2725edec88d90208fc40702f15ab2cacadc9957f1a0437d798
-EBUILD boa-0.94.14_rc21-r2.ebuild 1200 BLAKE2B 6568ef329d2c30bbc2308bb5d626cba2d8221124fc24dd90a21807b24dbf60d5007cc367fcf8f74d2a9e97cdc0a89995fa32d8ad6c4ea728b5750ea80f92371d SHA512 9ba996a574f2c1462afcdfe5cd86871b5cc5faec47e274d0dade15a2dd418865b546a9b6300a085b45614f3c67dc9420ada1529a327702d30daf1cf10df58880
-MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/www-servers/boa/boa-0.94.14_rc21-r2.ebuild b/www-servers/boa/boa-0.94.14_rc21-r2.ebuild
deleted file mode 100644
index 7af929d263e5..000000000000
--- a/www-servers/boa/boa-0.94.14_rc21-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-MY_P=${P/_/}
-DESCRIPTION="A very small and very fast http daemon"
-SRC_URI="http://www.boa.org/${MY_P}.tar.gz"
-HOMEPAGE="http://www.boa.org/"
-S=${WORKDIR}/${MY_P}
-
-KEYWORDS="~amd64 ~mips ~ppc ~riscv ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND=""
-BDEPEND="sys-devel/bison
-	sys-devel/flex
-	doc? ( virtual/latex-base )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-texi.patch
-	"${FILESDIR}"/${P}-ENOSYS.patch
-)
-
-src_compile() {
-	default
-
-	if ! use doc; then
-		sed -i -e '/^all:/s/boa.dvi //' docs/Makefile || die
-	fi
-	emake docs
-}
-
-src_install() {
-	dosbin src/boa
-	doman docs/boa.8
-	doinfo docs/boa.info
-	if use doc; then
-		dodoc docs/boa.html
-		dodoc docs/boa_banner.png
-		dodoc docs/boa.dvi
-	fi
-
-	keepdir /var/log/boa
-	keepdir /var/www/localhost/htdocs
-	keepdir /var/www/localhost/cgi-bin
-	keepdir /var/www/localhost/icons
-
-	newinitd "${FILESDIR}"/boa.initd boa
-	newconfd "${FILESDIR}"/boa.conf.d boa
-
-	systemd_dounit "${FILESDIR}"/boa.service
-
-	exeinto /usr/lib/boa
-	doexe src/boa_indexer
-
-	insinto /etc/boa
-	doins "${FILESDIR}"/boa.conf
-	doins "${FILESDIR}"/mime.types
-}
diff --git a/www-servers/boa/files/boa-0.94.14_rc21-ENOSYS.patch b/www-servers/boa/files/boa-0.94.14_rc21-ENOSYS.patch
deleted file mode 100644
index 35dc3d2493e7..000000000000
--- a/www-servers/boa/files/boa-0.94.14_rc21-ENOSYS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-check for sendfile() returning ENOSYS and fall back to standard I/O.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=330871
-
-diff -Naur boa-0.94.14rc21-orig/src/pipe.c boa-0.94.14rc21/src/pipe.c
---- boa-0.94.14rc21-orig/src/pipe.c	2007-07-01 10:49:23.000000000 -0600
-+++ boa-0.94.14rc21/src/pipe.c	2007-07-01 10:56:56.000000000 -0600
-@@ -215,7 +215,9 @@
- 	}
- 	req->ranges->start = sendfile_offset;
-         if (bytes_written < 0) {
--            if (errno == EWOULDBLOCK || errno == EAGAIN) {
-+            if (errno == ENOSYS) {
-+                return io_shuffle(req);
-+			} else if (errno == EWOULDBLOCK || errno == EAGAIN) {
-                 return -1;          /* request blocked at the pipe level, but keep going */
-             } else if (errno == EINTR) {
-                 goto retrysendfile;
diff --git a/www-servers/boa/files/boa-0.94.14_rc21-texi.patch b/www-servers/boa/files/boa-0.94.14_rc21-texi.patch
deleted file mode 100644
index 7853433efb1b..000000000000
--- a/www-servers/boa/files/boa-0.94.14_rc21-texi.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/docs/boa.texi	2003-02-02 06:02:22.000000000 +0100
-+++ b/docs/boa.texi	2007-05-21 01:22:27.997819260 +0200
-@@ -33,10 +33,10 @@
- @direntry
- * Boa: (boa).           The Boa Webserver
- @end direntry
--@end ifinfo
- 
- @comment node-name,     next,           previous, up
- @node Top, Introduction, , (dir)
-+@end ifinfo
- 
- Welcome to the documentation for Boa, a high performance
- HTTP Server for UN*X-alike computers, covered by the
diff --git a/www-servers/boa/files/boa.conf b/www-servers/boa/files/boa.conf
deleted file mode 100644
index a888ffc5427b..000000000000
--- a/www-servers/boa/files/boa.conf
+++ /dev/null
@@ -1,191 +0,0 @@
-# Boa v0.94 configuration file
-# File format has not changed from 0.93
-# File format has changed little from 0.92
-# version changes are noted in the comments
-#
-# The Boa configuration file is parsed with a lex/yacc or flex/bison
-# generated parser.  If it reports an error, the line number will be
-# provided; it should be easy to spot.  The syntax of each of these
-# rules is very simple, and they can occur in any order.  Where possible
-# these directives mimic those of NCSA httpd 1.3; I saw no reason to 
-# introduce gratuitous differences.
-
-# The "ServerRoot" is not in this configuration file.  It can be compiled
-# into the server (see defines.h) or specified on the command line with
-# the -c option, for example:
-#
-# boa -c /usr/local/boa
-
-
-# Port: The port Boa runs on.  The default port for http servers is 80.
-# If it is less than 1024, the server must be started as root.
-
-Port 80
-
-# Listen: the Internet address to bind(2) to.  If you leave it out,
-# it takes the behavior before 0.93.17.2, which is to bind to all
-# addresses (INADDR_ANY).  You only get one "Listen" directive,
-# if you want service on multiple IP addresses, you have three choices:
-#    1. Run boa without a "Listen" directive
-#       a. All addresses are treated the same; makes sense if the addresses
-#          are localhost, ppp, and eth0.
-#       b. Use the VirtualHost directive below to point requests to different
-#          files.  Should be good for a very large number of addresses (web
-#          hosting clients).
-#    2. Run one copy of boa per IP address, each has its own configuration
-#       with a "Listen" directive.  No big deal up to a few tens of addresses.
-#       Nice separation between clients.
-# The name you provide gets run through inet_aton(3), so you have to use dotted
-# quad notation.  This configuration is too important to trust some DNS.
-
-#Listen 192.68.0.5
-
-#  User: The name or UID the server should run as.
-# Group: The group name or GID the server should run as.
-
-User nobody
-Group nogroup
-
-# ServerAdmin: The email address where server problems should be sent.
-# Note: this is not currently used, except as an environment variable
-# for CGIs.
-
-#ServerAdmin root@localhost
-
-# ErrorLog: The location of the error log file. If this does not start
-# with /, it is considered relative to the server root.
-# Set to /dev/null if you don't want errors logged.
-# If unset, defaults to /dev/stderr
-
-ErrorLog /var/log/boa/error_log
-# Please NOTE: Sending the logs to a pipe ('|'), as shown below,
-#  is somewhat experimental and might fail under heavy load.
-# "Usual libc implementations of printf will stall the whole
-#  process if the receiving end of a pipe stops reading."
-#ErrorLog "|/usr/sbin/cronolog --symlink=/var/log/boa/error_log /var/log/boa/error-%Y%m%d.log"
-
-# AccessLog: The location of the access log file. If this does not
-# start with /, it is considered relative to the server root.
-# Comment out or set to /dev/null (less effective) to disable 
-# Access logging.
-
-AccessLog /var/log/boa/access_log
-# Please NOTE: Sending the logs to a pipe ('|'), as shown below,
-#  is somewhat experimental and might fail under heavy load.
-# "Usual libc implementations of printf will stall the whole
-#  process if the receiving end of a pipe stops reading."
-#AccessLog  "|/usr/sbin/cronolog --symlink=/var/log/boa/access_log /var/log/boa/access-%Y%m%d.log"
-
-# UseLocaltime: Logical switch.  Uncomment to use localtime 
-# instead of UTC time
-#UseLocaltime
-
-# VerboseCGILogs: this is just a logical switch.
-#  It simply notes the start and stop times of cgis in the error log
-# Comment out to disable.
-
-#VerboseCGILogs
-
-# ServerName: the name of this server that should be sent back to 
-# clients if different than that returned by gethostname + gethostbyname 
-
-#ServerName www.your.org.here
-
-# VirtualHost: a logical switch.
-# Comment out to disable.
-# Given DocumentRoot /var/www, requests on interface 'A' or IP 'IP-A'
-# become /var/www/IP-A.
-# Example: http://localhost/ becomes /var/www/127.0.0.1
-#
-# Not used until version 0.93.17.2.  This "feature" also breaks commonlog
-# output rules, it prepends the interface number to each access_log line.
-# You are expected to fix that problem with a postprocessing script.
-
-#VirtualHost 
-
-# DocumentRoot: The root directory of the HTML documents.
-# Comment out to disable server non user files.
-
-DocumentRoot /var/www/localhost/htdocs
-
-# UserDir: The name of the directory which is appended onto a user's home
-# directory if a ~user request is recieved.
-
-UserDir public_html
-
-# DirectoryIndex: Name of the file to use as a pre-written HTML
-# directory index.  Please MAKE AND USE THESE FILES.  On the
-# fly creation of directory indexes can be _slow_.
-# Comment out to always use DirectoryMaker
-
-DirectoryIndex index.html
-
-# DirectoryMaker: Name of program used to create a directory listing.
-# Comment out to disable directory listings.  If both this and
-# DirectoryIndex are commented out, accessing a directory will give
-# an error (though accessing files in the directory are still ok).
-
-DirectoryMaker /usr/lib/boa/boa_indexer
-
-# DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker
-# has been commented out, the the on-the-fly indexing of Boa can be used
-# to generate indexes of directories. Be warned that the output is 
-# extremely minimal and can cause delays when slow disks are used.
-# Note: The DirectoryCache must be writable by the same user/group that 
-# Boa runs as.
-
-# DirectoryCache /var/spool/boa/dircache
-
-# KeepAliveMax: Number of KeepAlive requests to allow per connection
-# Comment out, or set to 0 to disable keepalive processing
-
-KeepAliveMax 1000
-
-# KeepAliveTimeout: seconds to wait before keepalive connection times out
-
-KeepAliveTimeout 10
-
-# MimeTypes: This is the file that is used to generate mime type pairs
-# and Content-Type fields for boa.
-# Comment out to avoid loading mime.types (better use AddType!)
-
-MimeTypes /etc/boa/mime.types
-
-# DefaultType: MIME type used if the file extension is unknown, or there
-# is no file extension.
-
-DefaultType text/plain
-
-# AddType: adds types without editing mime.types
-# Example: AddType type extension [extension ...]
-
-# Uncomment the next line if you want .cgi files to execute from anywhere
-#AddType application/x-httpd-cgi cgi
-
-# Redirect, Alias, and ScriptAlias all have the same semantics -- they
-# match the beginning of a request and take appropriate action.  Use
-# Redirect for other servers, Alias for the same server, and ScriptAlias
-# to enable directories for script execution.
-
-# Redirect allows you to tell clients about documents which used to exist in
-# your server's namespace, but do not anymore. This allows you to tell the
-# clients where to look for the relocated document.
-# Example: Redirect /bar http://elsewhere/feh/bar
-
-# Aliases: Aliases one path to another.
-# Example: Alias /path1/bar /path2/foo
-
-Alias /doc /usr/share/doc
-Alias /icons /var/www/localhost/icons
-
-# ScriptAlias: Maps a virtual path to a directory for serving scripts
-# Example: ScriptAlias /htbin/ /www/htbin/
-
-ScriptAlias /cgi-bin/ /var/www/localhost/cgi-bin/
-
-# Do not remove this line if you are using sys-apps/OpenRC to manage the
-# boa server.
-# A PidFile setting is needed in order for OpenRC to stop boa, and it
-# must match the setting in the service script.
-
-PidFile /run/boa.pid
diff --git a/www-servers/boa/files/boa.conf.d b/www-servers/boa/files/boa.conf.d
deleted file mode 100644
index 5952e434dbc5..000000000000
--- a/www-servers/boa/files/boa.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-# config file for /etc/init.d/boa
-#
-# The only option allowed is '-c ServerRoot'
-BOA_OPTS="-c /etc/boa"
diff --git a/www-servers/boa/files/boa.initd b/www-servers/boa/files/boa.initd
deleted file mode 100644
index fe9b63efe1d6..000000000000
--- a/www-servers/boa/files/boa.initd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: Standard config is in /etc/boa/boa.conf
-# NB: Arguments to pass to boa are in /etc/conf.d/boa
-
-command=/usr/sbin/boa
-command_args="${BOA_OPTS}"
-pidfile="/run/boa.pid"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	if [ -e /etc/conf.d/boa ] && [ -n "${BOA_OPTS}" ]; then
-		SR="$(echo ${BOA_OPTS} | awk '{ FS = " " } { print $2 }')"
-	else
-		SR=/etc/boa
-	fi
-
-	if [ ! -e ${SR}/boa.conf ] ; then
-		eerror "You need a ${SR}/boa.conf to run Boa"
-		eerror "There is a sample file in /usr/share/docs/boa"
-		return 1
-	fi
-}
diff --git a/www-servers/boa/files/boa.service b/www-servers/boa/files/boa.service
deleted file mode 100644
index e4410d8e061f..000000000000
--- a/www-servers/boa/files/boa.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Boa web server
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/boa -d
-
-[Install]
-WantedBy=multi-user.target
diff --git a/www-servers/boa/files/mime.types b/www-servers/boa/files/mime.types
deleted file mode 100644
index 53f6ea1011c8..000000000000
--- a/www-servers/boa/files/mime.types
+++ /dev/null
@@ -1,205 +0,0 @@
-###############################################################################
-#
-#  MIME-TYPES and the extensions that represent them
-#
-#  This file is part of the "mime-support" package.  Please send email (not a
-#  bug report) to mime-support@packages.debian.org if you would like new types
-#  and/or extensions to be added.
-#
-#  Note: Compression schemes like "gzip", "bzip", and "compress" are not
-#  actually "mime-types".  They are "encodings" and hence must _not_ have
-#  entries in this file to map their extensions.  The "mime-type" of an
-#  encoded file refers to the type of data that has been encoded, not the
-#  type of the encoding.
-#
-###############################################################################
-
-
-application/activemessage
-application/andrew-inset
-application/applefile
-application/atomicmail
-application/cu-seeme				csm cu
-application/dca-rft
-application/dec-dx
-application/dsptype				tsp
-application/futuresplash			spl
-application/ghostview
-application/mac-binhex40			hqx
-application/macwriteii
-application/msaccess				mdb
-application/msword				doc dot
-application/news-message-id
-application/news-transmission
-application/octet-stream			bin
-application/oda					oda
-application/pdf					pdf
-application/pgp-signature			pgp
-application/postscript				ps ai eps
-application/remote-printing
-application/rtf					rtf
-application/slate
-application/vnd.ms-excel			xls xlb
-application/vnd.ms-powerpoint			ppt pps pot
-application/vnd.wap.wmlc			wmlc
-application/vnd.wap.wmlscriptc			wmlsc
-application/wita
-application/wordperfect5.1			wp5
-application/zip					zip
-application/x-123				wk
-application/x-bcpio				bcpio
-application/x-chess-pgn				pgn
-application/x-core
-application/x-cpio				cpio
-application/x-csh
-application/x-debian-package			deb
-application/x-director				dcr dir dxr
-application/x-dms				dms
-application/x-dvi				dvi
-application/x-executable
-application/x-font				pfa pfb gsf pcf pcf.Z
-application/x-gnumeric				gnumeric
-application/x-gtar				gtar tgz
-application/x-hdf				hdf
-application/x-httpd-php				phtml pht php
-application/x-httpd-php3			php3
-application/x-httpd-php3-source			phps
-application/x-httpd-php3-preprocessed 		php3p
-application/x-httpd-php4			php4
-application/x-ica				ica
-application/x-java				class
-application/x-javascript			js
-application/x-kdelnk
-application/x-kchart				chrt
-application/x-killustrator			kil
-application/x-kpresenter			kpr kpt
-application/x-kspread				ksp
-application/x-kword				kwd kwt
-application/x-latex				latex
-application/x-lha				lha
-application/x-lzh				lzh
-application/x-lzx				lzx
-application/x-maker				frm maker frame fm fb book fbdoc
-application/x-mif				mif
-application/x-msdos-program			com exe bat dll
-application/x-msi				msi
-application/x-netcdf				nc cdf
-application/x-ns-proxy-autoconfig		pac
-application/x-object				o
-application/x-ogg				ogg
-application/x-oz-application			oza
-application/x-perl				pl pm
-application/x-redhat-package-manager		rpm
-application/x-rx
-application/x-sh
-application/x-shar				shar
-application/x-shellscript
-application/x-shockwave-flash			swf swfl
-application/x-stuffit				sit
-application/x-sv4cpio				sv4cpio
-application/x-sv4crc				sv4crc
-application/x-tar				tar
-application/x-tcl
-application/x-tex
-application/x-tex-gf				gf
-application/x-tex-pk				pk PK
-application/x-texinfo				texinfo texi
-application/x-trash				~ % bak old sik
-application/x-troff				t tr roff
-application/x-troff-man				man
-application/x-troff-me				me
-application/x-troff-ms				ms
-application/x-ustar				ustar
-application/x-wais-source			src
-application/x-wingz				wz
-
-audio/basic					au snd
-audio/midi					mid midi
-audio/mpeg					mpga mpega mp2 mp3
-audio/mpegurl					m3u
-audio/prs.sid					sid
-audio/x-aiff					aif aiff aifc
-audio/x-gsm					gsm
-audio/x-pn-realaudio				ra rm ram
-audio/x-wav					wav
-
-image/bitmap					bmp
-image/gif					gif
-image/ief					ief
-image/jpeg					jpeg jpg jpe
-image/pcx					pcx
-image/png					png
-image/tiff					tiff tif
-image/vnd.wap.wbmp				wbmp
-image/x-cmu-raster				ras
-image/x-coreldraw				cdr
-image/x-coreldrawpattern			pat
-image/x-coreldrawtemplate			cdt
-image/x-corelphotopaint				cpt
-image/x-jng					jng
-image/x-portable-anymap				pnm
-image/x-portable-bitmap				pbm
-image/x-portable-graymap			pgm
-image/x-portable-pixmap				ppm
-image/x-rgb					rgb
-image/x-xbitmap					xbm
-image/x-xpixmap					xpm
-image/x-xwindowdump				xwd
-
-inode/chardevice
-inode/blockdevice
-inode/directory-locked
-inode/directory
-inode/fifo
-inode/socket
-
-message/external-body
-message/news
-message/partial
-message/rfc822
-
-multipart/alternative
-multipart/appledouble
-multipart/digest
-multipart/mixed
-multipart/parallel
-
-text/comma-separated-values			csv
-text/css					css
-text/english
-text/html					htm html xhtml
-text/mathml					mml
-text/plain					txt text diff
-text/richtext					rtx
-text/tab-separated-values			tsv
-text/vnd.wap.wml				wml
-text/vnd.wap.wmlscript				wmls
-text/xml					xml
-text/x-c++hdr					h++ hpp hxx hh
-text/x-c++src					c++ cpp cxx cc
-text/x-chdr					h
-text/x-crontab
-text/x-csh					csh
-text/x-csrc					c
-text/x-java					java
-text/x-makefile
-text/x-moc					moc
-text/x-pascal					p pas
-text/x-setext					etx
-text/x-sh					sh
-text/x-tcl					tcl tk
-text/x-tex					tex ltx sty cls
-text/x-vcalendar				vcs
-text/x-vcard					vcf
-
-video/dl					dl
-video/fli					fli
-video/gl					gl
-video/mpeg					mpeg mpg mpe
-video/quicktime					qt mov
-video/x-mng					mng
-video/x-ms-asf					asf asx
-video/x-msvideo					avi
-video/x-sgi-movie				movie
-
-x-world/x-vrml					vrm vrml wrl
diff --git a/www-servers/boa/metadata.xml b/www-servers/boa/metadata.xml
deleted file mode 100644
index 076793e3f54b..000000000000
--- a/www-servers/boa/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 62fd19aecfe0..ee8a74335421 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/unclutter/Manifest b/x11-misc/unclutter/Manifest
deleted file mode 100644
index 756127fa1a51..000000000000
--- a/x11-misc/unclutter/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX unclutter-8-FocusOut.patch 525 BLAKE2B 4e1c89a6d7bd91483a91683d1ad1f0cc8c873e778673a2c72b7632c833f28bd97b7b4e6fafdca0eb3ff503ce96134198c43ea5ac54a6a9691c2c80d2328b403f SHA512 4ab3cab96574a545595a643e79dca102ace5bb4b853f514bc8a34457a14a4ee68bc89f5c8171d23b7f4e29cd951a60cdb47cc07901327984bdd39ef33f57877e
-AUX unclutter-8-include.patch 183 BLAKE2B bdbab7861a4baad3fcebdbec9082242398385186b9098cdf37f90c7b5c657407b225722711fbab1ab26d42331af18dbdb0c33f9ec922225e5fdc0e7ed88bf600 SHA512 726437d5cb6e813930b661bb47d2f15f3e37fc050f670a2125cc330f29b0ebcb97325886af21bab788d17e264e9e7c20d2c087d5b184730d3c06409304317bfa
-DIST unclutter-8.tar.Z 12344 BLAKE2B 10090ec2f3772c17d00cbcb27f416fb528b75641b7d57eeb36ab7e19af2510ebc5901a0394c0ee590a38afb8bf64d4b2b2ed069b0b1a44edcb9b37701f89c9b5 SHA512 9a64e6eceae685cf34b1ea85818735f8f85514ba1eea262476653886d74e469cfd6b9a39edbd098b138a5c89e6b97b42cf251bee59272c76cbeba190979744b4
-EBUILD unclutter-8-r4.ebuild 759 BLAKE2B cdea012b8c5537eafbdad9c0f03d1ef4050f65ab1629956ade200c061ea114920e3d5b85693afde1ff1471cdcdcbe3695373d0dc813d66383b0430dec0c5e682 SHA512 1fd3681f9d0cd36a3ad3047033a890423f4f105431e7a4eec49a833e4006a65fed6ac778658b0cffc835b34ce97b3b9d9e53bcbf4b40b113ea700237a0690707
-MISC metadata.xml 273 BLAKE2B e41a84edc2f2bf01256d6c759fec49da44a20e3d595a6fe56f96239ab26213551ae190621a5e8f9523b777c42364680fd61a6423b08eada73b97eb4e81253dd7 SHA512 985a49dc2d598b61be8510f6f86c4894825a56392af613ecdc68de499242f1e7e910f8320e0fd0540bc5f42dde80a4f0b18b6919320ee60aa39da1441c147274
diff --git a/x11-misc/unclutter/files/unclutter-8-FocusOut.patch b/x11-misc/unclutter/files/unclutter-8-FocusOut.patch
deleted file mode 100644
index d26ef8e6a652..000000000000
--- a/x11-misc/unclutter/files/unclutter-8-FocusOut.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fixes blinking pointer and 100% CPU usage with GTK applications
-Author: Tao Nelson <taobert@gmail.com>
-Debian-Bug: 266118
-
---- a/unclutter.c
-+++ b/unclutter.c
-@@ -399,7 +399,9 @@
- 		do{
- 		    XNextEvent(display,&event);
- 		}while(event.type!=LeaveNotify &&
--		       event.type!=FocusOut &&
-+		    /* Some gtk applications seem not to like this:
-+		     * event.type!=FocusOut && 
-+		     */
- 		       event.type!=UnmapNotify &&
- 		       event.type!=ConfigureNotify &&
- 		       event.type!=CirculateNotify &&
diff --git a/x11-misc/unclutter/files/unclutter-8-include.patch b/x11-misc/unclutter/files/unclutter-8-include.patch
deleted file mode 100644
index 688fa129c561..000000000000
--- a/x11-misc/unclutter/files/unclutter-8-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/unclutter.c
-+++ b/unclutter.c
-@@ -24,6 +24,7 @@
- #include <X11/Xutil.h>
- #include <X11/Xproto.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include "vroot.h"
- 
- char *progname;
diff --git a/x11-misc/unclutter/metadata.xml b/x11-misc/unclutter/metadata.xml
deleted file mode 100644
index 3ab9b4a739d3..000000000000
--- a/x11-misc/unclutter/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-misc/unclutter/unclutter-8-r4.ebuild b/x11-misc/unclutter/unclutter-8-r4.ebuild
deleted file mode 100644
index eb64cdd7a8d4..000000000000
--- a/x11-misc/unclutter/unclutter-8-r4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hides mouse pointer while not in use"
-HOMEPAGE="http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README"
-SRC_URI="ftp://ftp.x.org/contrib/utilities/${P}.tar.Z"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-include.patch
-	"${FILESDIR}"/${P}-FocusOut.patch
-)
-
-src_compile() {
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin unclutter
-	newman unclutter.man unclutter.1x
-	einstalldocs
-}
diff --git a/x11-misc/vnc2swf/Manifest b/x11-misc/vnc2swf/Manifest
deleted file mode 100644
index 25cc1de8ecbe..000000000000
--- a/x11-misc/vnc2swf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX vnc2swf-0.5.0-respect-AR.patch 773 BLAKE2B 808a213a1adf20ed42e0488b789e3bc863caa8980717fe742209b621f40209aeb92a29857802e346f3c0d6c1281d854aa21aef1fd65a760b1ea3c06cae091e53 SHA512 f2d32fdcf85af359eae49c622570e6abba7f3214333636512b8c839cc2893997b24231ffaf18abe448ca68eef4efeba95b83d3abf526079dc071e6a6768c74b1
-DIST vnc2swf-0.5.0.tar.gz 438058 BLAKE2B bb0effab90934746451efbe23610b3534de31ca1f5f8331dfc1f907b9733f69e78d960bd8d27cc6d75cb0ef688045b019b9b984dcd0e6207819e0590b35fa183 SHA512 f1551015eaafb7810b5d6367b73605f97bc5c0d4d3449dfe1a98af90f743133c0534c8988ee72ce2fc8599926a5f3ed5a785bf18788522b4a7c3cb8bc0529913
-EBUILD vnc2swf-0.5.0-r1.ebuild 1085 BLAKE2B b2be3168b626fd4cc3d8994575b7134c3bc77dd6a9919c4a5082ef7a39dfefc6690aa755907f14f03d26f434a3915fb031fa2748bef4fc321e0dcbafcc07a2c1 SHA512 a30fdf7fb403edb8d31a71bdad69787221d3cbb5b489fc6fdab42f99da1708d05e5e6f4a786071d4b19ff55d65ca96e0b1b348a00b9f6ffb6fced342590021dc
-MISC metadata.xml 596 BLAKE2B d79d88b66f386a41c34af7a191c439a649615fca9b5d89f32faf7b781b49e019b11391c1cfd6b6becba5614c1534c2965831fe57095ec24becd3270bfee0d226 SHA512 065a88a1ebac6008d04f469d402c0003f1d5eb4368442e518e6440d430c1d2e5353b2d98054da35f8771e779dbe359091d9df7f38fd378ef448881dd1b9ac9ca
diff --git a/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch b/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch
deleted file mode 100644
index 4c03bb7e5c16..000000000000
--- a/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -12,6 +12,9 @@
- AC_PROG_MAKE_SET
- AC_LANG_CPLUSPLUS
- 
-+AC_ARG_VAR([AR], [the archiver to use])
-+AC_CHECK_TOOL([AR], [ar])
-+
- case "`(uname -sr) 2>/dev/null`" in
- "SunOS 5"*)
-   SOLARIS=yes
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -95,7 +95,7 @@
- LIBS = @LIBS@
- LDFLAGS = @LDFLAGS@
- RANLIB = @RANLIB@
--AR = ar cq
-+AR = @AR@ cq
- 
- prefix = /usr/X11R6
- exec_prefix = $(prefix)
---- a/rdr/Makefile.in
-+++ b/rdr/Makefile.in
-@@ -37,7 +37,7 @@
- LIBS = @LIBS@
- LDFLAGS = @LDFLAGS@
- RANLIB = @RANLIB@
--AR = ar cq
-+AR = @AR@ cq
- 
- .SUFFIXES:
- .SUFFIXES: .cxx .c .o
---- a/rfb/Makefile.in
-+++ b/rfb/Makefile.in
-@@ -36,7 +36,7 @@
- LIBS = @LIBS@
- LDFLAGS = @LDFLAGS@
- RANLIB = @RANLIB@
--AR = ar cq
-+AR = @AR@ cq
- 
- .SUFFIXES:
- .SUFFIXES: .cxx .c .o
diff --git a/x11-misc/vnc2swf/metadata.xml b/x11-misc/vnc2swf/metadata.xml
deleted file mode 100644
index 4c6374289b6c..000000000000
--- a/x11-misc/vnc2swf/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
-  <longdescription>
-  Vnc2swf is a cross-platform screen recording tool for ShockWave Flash (swf)
-  format. Vnc2swf comes with two different implementations, a Python one
-  (pyvnc2swf) and C one (vnc2swf).
-  </longdescription>
-  <use>
-    <flag name="x11vnc">Install script that depends on x11vnc</flag>
-  </use>
-</pkgmetadata>
diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
deleted file mode 100644
index a589a99435ca..000000000000
--- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool for recording Flash SWF movies from VNC sessions"
-HOMEPAGE="https://www.unixuser.org/~euske/vnc2swf/"
-SRC_URI="https://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="x11vnc"
-
-RDEPEND="
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11vnc? ( x11-misc/x11vnc )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-respect-AR.patch # bug 726264
-)
-
-src_prepare() {
-	default
-	sed -i -e "s:docs:html:" README || die
-	sed -i -e "s:-mouse ::" -e "s:./vnc2swf:vnc2swf:" recordwin.sh || die
-
-	mv configure.{in,ac} || die
-	eautoconf
-}
-
-src_install() {
-	dobin vnc2swf
-	if use x11vnc; then
-		# this USE flag is needed because recordwin
-		# only works on x11vnc
-		newbin recordwin.sh recordwin
-	fi
-	insinto /etc/X11/app-defaults
-	newins Vnc2Swf.ad Vnc2Swf
-	dodoc README*
-
-	docinto html
-	dodoc docs/*.{html,swf}
-}