gentoo auto-resync : 20:12:2022 - 19:52:06

author: V3n3RiX <venerix@koprulu.sector> 2022-12-20 19:52:06 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-20 19:52:06 +0000
commit: d4d7098dcb2f9dd257109bbcb55fd40beda1b78d (patch)
tree: 48d3c6b3c45f18db0f90650f822ea19a10284f61
parent: 4161fa7d1be6dac96e36f8ed343f234a8ef3a74f (diff)
730 files changed, 1419 insertions, 11971 deletions
diff --git a/Manifest b/Manifest
index 72cf1764a8ce..8dad33442ab5 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29758 BLAKE2B ffb90c3e486234f6c51d87956c89715ee6f2895ef7b6a687a0c1db9d61c40960367f464f9f2b19d8fc2b999b6b2870cc595c37533546c89f8dc2dfd37efd90ed SHA512 892b694ea9ed86cca6b07aec03751064de29270c8550f0b0048bfd945b66fbc637919cc80fcacadd16456001e6601a24e5880a9e1d8d34055cb7291c28afa41c
-TIMESTAMP 2022-12-20T13:09:57Z
+MANIFEST Manifest.files.gz 29812 BLAKE2B 462eac9be8d83f9d52240f8f9d21f75d3b26637bbba06e6622e4f2279d84b987c2b7bffcc8708531f62b17f63f3da563d51500285283c20f71dc2b281f86b6ce SHA512 85f321eb5e6bf58478032f50630ce0a3dd1670340e2a266cf49a29f509837b470fbd436216256ed37cb163566aeeccb221cde5fce1cf17b0c4a817df0a42262d
+TIMESTAMP 2022-12-20T19:10:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOhtCVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOiCI1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAWyA//fg9XJTnuaZTsiwNEU3gnZrXAupSR0qYBdUP07pcRbJ6uisJ+M2tZShNn
-0w1UbXFh/yUO8w+diWQywItBZykr8Fkwms5puu+K0FKVQoJjC48lLtIOX0Mw4CCZ
-Uk7HqJTW/CVkf6Ft71eCpEOaZis9PK8yrBVDPvCJ6a4A8S3tP/f7y+2nCMtAP9+n
-3jq8e17bdksF8Kr+tc2aiKGk8JXBxhyL8FFzZrhQ3c1192m9ahW+9KJ0grUFKxSg
-zd+R/omJ0o+jMqnf2nNdxwHXJFvpZXu9iYh3bUCODzXnr4Rc0V7wW5uEgPM5xSez
-r+NdhMiiLhe1LC5LPUDJchSLOuZcp5yJz2KyoHMCSAKwCHBpdmK4kLvn7fKyVE8r
-Bt9FuhO0LvBP+sqvjxe4p12zN5dcH94SKumTdMyXtgFl6BVSvF11PcJ3kDYeSeZP
-CHxSRaIqKoFWtEliNkkHNxIshqPdjsF5hUaS17/3wzOdfXXoGClO1mpQkNjWRp9D
-rZQOEXlzACvgYnTFahuv9M4OlYhhZO449D7JARO70sGP0PfRR2velt+8WChJqN3W
-DhwkFBMBQSbGEVMymOybpIW4Te8LRObRegQu5GUP2SkdXSYgl0qgig3pTRRWSJFx
-TMq6Vj8IixgiL0t9RZwrF/Eq1sWHECFfIOHR05H8L/fuRV2vwoY=
-=6vKu
+klAdHw/+MtDa+hV5iDbvk4cVecD42XjhZaZjAvYFJ90HpDQ76kC7fVMckiIJu/AS
+qr9+yrzteO0D1YRDYcYtKkBln4klWlAuKaNPjCR+T6+8ajNQS/pVq0CNByU/oVfT
+I3ekcB0xjTdLl6Xa4aYA/Cz1ct4MwKxoXD29vZa1DohNKxYRavIbMxGKUztrB3QE
+BZSoa6oeIxiEd+I3XEEjdGnriO8TrRdmIR4xHiMAUOaPYgodVZyJ5pr1egLxrevh
+NZzz9ZuIurPemLXBL2VVDp4+v6RrcKRk+MvyiG7y9GCSFabu6ooQkxeVloFF8tuP
+ytm0Gnfk2KpmN5INy/Hr2E0J8u5ruAWMSeLC8l2wdHvjRm+jGTCBSQtoc4jmsROy
+Kjt0avLrLub86OY5YhzOgHaugp7fVEmXlTMGdPMHL7L9VgkIMIVA44SaLBkPFGLE
+2/rtUrBI1rcsXrIWKrQfuEvI8BuqqkWznvResC2Azei710Zrsep9FfCiINcIz+IB
+6pu5a/jjApYlgNjjqk1CDTgmTfwLyClKHKMJDQNqQzEEgIzag1A5f6jUEgmDielQ
+6xymBb6HTYuyMeaIgYtBCoSiRbnFd93TW/LqM6Tuiufp04uBBnoIRTW5J3Z+KVWM
+eJk5bgRc4JnZFUos515dmJt7rSGuoFuKVeKiFbv8UQUc2P2IDrY=
+=V1Uu
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 87866ba39245..67d05cec18c6 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index d2f939d8d535..d334ff85d0d4 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/cmd5checkpw/Manifest b/acct-group/cmd5checkpw/Manifest
deleted file mode 100644
index 13b4bd2cdb04..000000000000
--- a/acct-group/cmd5checkpw/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD cmd5checkpw-0-r1.ebuild 151 BLAKE2B b9774fa5138f3fd300ce55dbec30d7fff567a64ed0c1665e372989ffea1b5d8e9144b04b49ff49f0bca2f7bac3eb6d69bc3054c7a3ee2318d3baf76ec14790f8 SHA512 3b2599082e395ebe674d222027afe7bc877c41be1f53c9510c3ab003569d501223f17005a390a362634c43bc1f930861b5bd39a31a1061126be3256018f715b9
-MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-group/cmd5checkpw/cmd5checkpw-0-r1.ebuild b/acct-group/cmd5checkpw/cmd5checkpw-0-r1.ebuild
deleted file mode 100644
index 6873ca559f38..000000000000
--- a/acct-group/cmd5checkpw/cmd5checkpw-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=212
diff --git a/acct-group/cmd5checkpw/metadata.xml b/acct-group/cmd5checkpw/metadata.xml
deleted file mode 100644
index 630f5673b82e..000000000000
--- a/acct-group/cmd5checkpw/metadata.xml
+++ /dev/null
@@ -1,12 +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>eike@sf-mail.de</email>
-		<name>Rolf Eike Beer</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 2133c9b4eca3..f69c988dc1e5 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/cmd5checkpw/Manifest b/acct-user/cmd5checkpw/Manifest
deleted file mode 100644
index ed5d73fbb615..000000000000
--- a/acct-user/cmd5checkpw/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD cmd5checkpw-0-r1.ebuild 233 BLAKE2B 4a1358b4eb1c7e009025b5d455eddb49bf98f3cd892f1da66b306c9214065fb7c76aed422702c7abc4b7797ad2f75eab958ee982e2241969bc34664f25d1a002 SHA512 6aae3e8287c8fa27c548b182e6daab8183289aa04da0bfb1ca6d04e86c43ef4cf31b580afaff0b0e8ea4d9ec935566ec6a3dcf2cd81d4e6eebf552052c36d739
-MISC metadata.xml 393 BLAKE2B 0418582717cfcf9f4ef97e59682e42599c8c8cafd9f5c00bbb4f738997edf6bd589c66646c502c886d07833624036811ff63b66deab7b51b563c4e41641f71d2 SHA512 840cf32e6949bcc9d993bb5500318e5614d076d9c9e286a3b3543ae568a81923802d19a9152f8d1ad70fc88e00c23cf582bbae8f4cc40a0219fe9cad75ba8973
diff --git a/acct-user/cmd5checkpw/cmd5checkpw-0-r1.ebuild b/acct-user/cmd5checkpw/cmd5checkpw-0-r1.ebuild
deleted file mode 100644
index c4772b70850d..000000000000
--- a/acct-user/cmd5checkpw/cmd5checkpw-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for cmd5checkpw"
-ACCT_USER_ID=212
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/cmd5checkpw/metadata.xml b/acct-user/cmd5checkpw/metadata.xml
deleted file mode 100644
index 630f5673b82e..000000000000
--- a/acct-user/cmd5checkpw/metadata.xml
+++ /dev/null
@@ -1,12 +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>eike@sf-mail.de</email>
-		<name>Rolf Eike Beer</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 021280887aaf..c09fd5054cdd 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-cmdb/Manifest b/app-admin/ansible-cmdb/Manifest
deleted file mode 100644
index 3804037754ee..000000000000
--- a/app-admin/ansible-cmdb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ansible-cmdb-1.30.tar.gz 179165 BLAKE2B 377b182ffd0f7cf6630011f7df82fe1155c0f00a482e91e0d8206eee5aab167eb96dc936b2fbd02c6c80e725b9767f25a02422d538ee7ecf95ad1e9be51fe81a SHA512 e4561976588d6268c6849a4b1656c57d9a0f2db9256b2d2821f9c1a8c23fdb92b843b06bb94b44db565966c209b62da4bb11dfa41319a3b01ea4c7a53dde930f
-EBUILD ansible-cmdb-1.30-r1.ebuild 496 BLAKE2B e724817e1010c8ac6e267aa50195621856127cd94863610a7dabddd9b67ae19fe513fcb1395808326e84b79d2673dbe1c1ef0b96c64f5ec42c16283bda915ef5 SHA512 77f632c6e05011fedf46917a2e85039d406381dc4bfa8121c37418bef6ea8282f9ae5fb099dbd9dcb98bbb538d2428d7a1fc764e6d8ccd71d7c4a7eaa9ff99c0
-MISC metadata.xml 388 BLAKE2B 04a511386c1150e100086291db2a8ff393457b73f6f9a54bab3c01e55a517be4a1c090c41242db3a2c74e4d4b8f1717e384d76e81ca67970f97ab03ce99fb3a4 SHA512 671112cc1c44a438513845bcdd4a26ad1070f75115a918e8ac214c680718e0c54577371f28c1be71a74dbae3feff708a33b871f51d889ede3a1c36137afb8a66
diff --git a/app-admin/ansible-cmdb/ansible-cmdb-1.30-r1.ebuild b/app-admin/ansible-cmdb/ansible-cmdb-1.30-r1.ebuild
deleted file mode 100644
index a87e1129b407..000000000000
--- a/app-admin/ansible-cmdb/ansible-cmdb-1.30-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=8
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Ansible Configuration Management Database"
-HOMEPAGE="https://github.com/fboender/ansible-cmdb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/jsonxs[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/app-admin/ansible-cmdb/metadata.xml b/app-admin/ansible-cmdb/metadata.xml
deleted file mode 100644
index bc1cb5f88825..000000000000
--- a/app-admin/ansible-cmdb/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">fboender/ansible-cmdb</remote-id>
-		<remote-id type="pypi">ansible-cmdb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
deleted file mode 100644
index 8848ef95c48e..000000000000
--- a/app-admin/prelude-manager/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX prelude-manager-3.1.0-run.patch 570 BLAKE2B 9690826651d7a747d282cdc1591ad1ac2fadfa791b38e0ea09eea8bc2efae56e55bcd5b127087f94876982009a7821dd8f91b910ac8ab0b52ba1b7c8d75153e2 SHA512 6e8d59b49de65c00abf756c823acb43d65af065bae363f83c3f8d9b6b8743b6a449f517d129cd7d98054ded94faccf33d29e1570462e73ffd51d070da0d081c5
-AUX prelude-manager.initd 591 BLAKE2B 495b56179aedd0ec3c925d6e269c9d114d9fc5ef968aa9b1c10736ea1ffeb2a4895222e282627a186b248faf4e71808e548cb9cc24b2a645dfcf3d70072cc1f1 SHA512 0115c313fd1e964508951a9074aeb9cd5b63a14d2a63d5f205dd141d22b806955c1852d9291945725dc6d9474210700edaeb444962fd7e2f673a7adf51a8c902
-AUX prelude-manager.run 133 BLAKE2B b91c630c269ff09327da88cbcaaca6108121a5ae16d499a889a2cdb7e6dd7b844b3c89799fa60cb71deb9609210abbb08b059f9fbef2def7d06c7ce506225c19 SHA512 f129cc45efb710d336dd177ba465f542aaac767579dafbbacbdc88b56fcf3b95eb219a9dff7863ca47475748b93d001218ff28a7e49b3060c62278a72666986e
-AUX prelude-manager.service 398 BLAKE2B b409fd283baa3d85c0b25149e2912483e29f090338cc659c3444e2f51ca228b50cf2d5172ecf85b16a40c50f515def2ed178c6a2d85caeaa8b7b75b5ac5ddf45 SHA512 b3700ef920e739f521c87477a8752f787345971cd7077a4a0722b3d4069ca2ba55df3db87da4b544f559cd2e4faf2ef3b068e1c5dead6003f580dc04b4590495
-DIST prelude-manager-5.2.0.tar.gz 1564874 BLAKE2B cd00aca6a533cdb47e311c4a8eed17d514f39de3b1c5a4b334b8e8c8c2d318b36d1fc843bf36be0383da2ae5f4e41a936fc70ad92d5b55ab56e9a34c36fc1dae SHA512 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6
-EBUILD prelude-manager-5.2.0-r1.ebuild 1503 BLAKE2B 29be9775334209c55b93235e7ce1627002b82c4924608d3ff9f36778ab4e41d58e3f47210f767e18ca49623d0157b514c46aeaeb43da18d045e057eec26bb051 SHA512 b86db89b3f02a8b8aac4d120f6ae85ff4d3b53a533944c3c4176bf66879b42026b16e17f8093eb8fb3883dcce59523954e46ddc22ff59ca89b70fbced79b663a
-MISC metadata.xml 699 BLAKE2B f72c7b82bd1ff6d66e8d2051b4e144d0432867138bc0e927cb9629a815cfe5273e53bf65ca9bd8254082fb9dcda18d10aa43093b4ed802e972dca4b6af357efc SHA512 f98ba6225d44e5ed846fb43ffe5655a650663bfd4c234e1a7c362db403fece90c5a37e1e03aca8f3400b82be0dbbf37687ca6e4eae7208033b9804f95ec47edb
diff --git a/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch b/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch
deleted file mode 100644
index 4012c6c4b794..000000000000
--- a/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-When : everytime
-Why : Fix the run dir to comply with the Gentoo FS layout.
---- a/configure.ac
-+++ b/configure.ac
-@@ -337,7 +337,7 @@
- 
- manager_failover_dir=$LOCALSTATEDIR/spool/prelude-manager/failover
- manager_scheduler_dir=$LOCALSTATEDIR/spool/prelude-manager/scheduler
--manager_run_dir=$LOCALSTATEDIR/run/prelude-manager
-+manager_run_dir=/run/prelude-manager
- 
- AC_DEFINE_UNQUOTED(REPORT_PLUGIN_DIR, "$report_plugin_dir", Prelude-Manager report plugin directory)
- AC_DEFINE_UNQUOTED(DECODE_PLUGIN_DIR, "$decode_plugin_dir", Prelude-Manager decode plugin directory)
diff --git a/app-admin/prelude-manager/files/prelude-manager.initd b/app-admin/prelude-manager/files/prelude-manager.initd
deleted file mode 100644
index 14a39ba415e8..000000000000
--- a/app-admin/prelude-manager/files/prelude-manager.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BIN_MANAGER=/usr/bin/prelude-manager
-PID_MANAGER=/run/prelude-manager/prelude-manager.pid
-
-depend() {
-  need net
-}
-
-start() {
-  ebegin "Starting prelude-manager"
-  checkpath -d -m 0755 -o root:root /run/prelude-manager
-  start-stop-daemon --start --exec $BIN_MANAGER \
-    --pidfile $PID_MANAGER -- -d -P $PID_MANAGER
-  eend $?
-}
-
-stop() {
-  ebegin "Stopping prelude-manager"
-  start-stop-daemon --stop --exec $BIN_MANAGER \
-    --pidfile $PID_MANAGER
-  eend $?
-}
diff --git a/app-admin/prelude-manager/files/prelude-manager.run b/app-admin/prelude-manager/files/prelude-manager.run
deleted file mode 100644
index 739808485129..000000000000
--- a/app-admin/prelude-manager/files/prelude-manager.run
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configuration to create /run/prelude-manager directory
-# Used as part of systemd's tmpfiles
-
-d /run/prelude-manager 0755 root root
diff --git a/app-admin/prelude-manager/files/prelude-manager.service b/app-admin/prelude-manager/files/prelude-manager.service
deleted file mode 100644
index 15eee91b8aa7..000000000000
--- a/app-admin/prelude-manager/files/prelude-manager.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Prelude-Manager service
-DefaultDependencies=no
-After=remote_fs.target
-Before=prelude-lml.service prelude-correlator.service
-
-[Service]
-ExecStart=/usr/bin/prelude-manager -d -P /run/prelude-manager/prelude-manager.pid
-Type=forking
-PIDFile=/run/prelude-manager/prelude-manager.pid
-Restart=always
-
-[Install]
-WantedBy=prelude-lml.service prelude-correlator.service multi-user.target
diff --git a/app-admin/prelude-manager/metadata.xml b/app-admin/prelude-manager/metadata.xml
deleted file mode 100644
index 921cf39372d1..000000000000
--- a/app-admin/prelude-manager/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 -->
-	<longdescription lang="en">
-		Prelude-Manager is a high availability server that
-		accepts secured connections from distributed sensors
-		and saves received events to a media specified by the user
-		(database, log file, mail etc.). The server schedules and
-		establishes the priorities of treatment according to the
-		critical character and the source of the alerts.
-	</longdescription>
-	<use>
-		<flag name="dbx">Enables Prelude Manager storing Prelude alerts into database through <pkg>dev-libs/libpreludedb</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/app-admin/prelude-manager/prelude-manager-5.2.0-r1.ebuild b/app-admin/prelude-manager/prelude-manager-5.2.0-r1.ebuild
deleted file mode 100644
index 9ac8724e854b..000000000000
--- a/app-admin/prelude-manager/prelude-manager-5.2.0-r1.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
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Bus communication for all Prelude modules"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbx geoip snmp tcpd xml"
-
-RDEPEND="net-libs/gnutls:=
-	>=dev-libs/libprelude-5.2.0
-	<dev-libs/libprelude-6
-	dbx? (
-		>=dev-libs/libpreludedb-5.2.0
-		<dev-libs/libpreludedb-6
-	)
-	geoip? ( dev-libs/libmaxminddb )
-	snmp? ( net-analyzer/net-snmp )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-run.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		$(use_with dbx libpreludedb-prefix)
-		$(use_enable geoip libmaxminddb)
-		$(use_enable snmp snmp)
-		$(use_with tcpd libwrap)
-		$(usex xml '' '--without-xml-prefix')
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	rm -rv "${ED}/run" || die "rm failed"
-	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
-	keepdir /var/spool/prelude/prelude-manager{,/failover,/scheduler}
-
-	find "${D}" -name '*.la' -delete || die
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 5a192d70afa4..571f8d745f90 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bloscpack/Manifest b/app-arch/bloscpack/Manifest
deleted file mode 100644
index 48c9d6164fcb..000000000000
--- a/app-arch/bloscpack/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bloscpack-0.16.0.tar.gz 99059 BLAKE2B 415894771d6b987170b6938fd20ad065d30075410ddf021bd6e65e3e02d12bff6f5bb22960cdd186d9e52666a1d934047e0383e5d74016c3ad2ba1eef06cafb6 SHA512 0608c795570961c2dc6ba5a6ea3c8c79b215609c2d141db797429abbceb8ee43843196a2d14fc94797d7df62d562abf5efdae10f093154d5d7a20b3b9bcd85ed
-EBUILD bloscpack-0.16.0.ebuild 769 BLAKE2B d8ac4d80bc193c9f7de5e35e5798ee0ff0adb7eedb92895565c6671e87e2cb0210cf11a7cd5ea4c3a741f76544d19483fae608c5204e8a7dc041295d221a242e SHA512 66d415e5819ea0ab64b61b4644e0cb116908419df1bb782b17d4676123433c25d97cd2db6f66cc9c4353bac3544937f3a51c8ba2327a2473edc93c907021865d
-MISC metadata.xml 666 BLAKE2B 59a1b6098288335841a72f4ef4d9f8a5ef452d6211299e917480cdc7b4164e7ed3e54ec4c9436c66aa32d3f7bff0cab9a7c2ddf3f97ce4519ba3817607d602d6 SHA512 743e7b3a25e7416c5a870edfcd69607a18587acc1bb171912b85bea822e90792f9f5215e3aa6e1998337ad7dbb349aeb4d9d3295b14fe9d01f7e0de09715e60a
diff --git a/app-arch/bloscpack/bloscpack-0.16.0.ebuild b/app-arch/bloscpack/bloscpack-0.16.0.ebuild
deleted file mode 100644
index eb9555caa3d5..000000000000
--- a/app-arch/bloscpack/bloscpack-0.16.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Blosc compression"
-HOMEPAGE="https://github.com/Blosc/bloscpack"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# needs porting to newer numpy, bug #732790
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/blosc[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests nose
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die
-}
diff --git a/app-arch/bloscpack/metadata.xml b/app-arch/bloscpack/metadata.xml
deleted file mode 100644
index 427fc0e662c7..000000000000
--- a/app-arch/bloscpack/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <longdescription lang="en">
-    Command line interface to and serialization format for Blosc, a high
-    performance, multi-threaded, blocking and shuffling compressor. Uses
-    python-blosc bindings to interface with blosc.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">bloscpack</remote-id>
-    <remote-id type="github">Blosc/bloscpack</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 24aff0357434..e3e47da3b9e9 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgweb/Manifest b/app-backup/borgweb/Manifest
deleted file mode 100644
index 024056251201..000000000000
--- a/app-backup/borgweb/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST borgweb-0.2.0.tar.gz 503852 BLAKE2B 6d37eeca4893f825486d46e03d8212fc3597a8704cee976429a7c55f7ab98b405038948ce7e407fa7c78a2a9f6c2b0ca4307144ffae3bf68ad6e582921989bfb SHA512 7898caf803b82e910eaa1672b892657038da6606777ecefd97c27698c14524094f0c1741621ad4ff9a230d66454de419558644ba185488b0fdb5e1aa604010a0
-DIST borgweb-0.3.0.tar.gz 512052 BLAKE2B a783a4d0528b0d501918b958facbfbee131e95a8219bf9608572e402f6e6e3010f6716c64e76ef72858e949b505ef8c4eefd5f6512dd1b0ef767a32d2c493fc5 SHA512 90867338f3678732ade97f9b595579cc5aabf6ee824b0bd4dec986ae04db94304dee1d8ae1275331d93a2b3a89916ed11e834ace8a92cf196f4050178bf96625
-EBUILD borgweb-0.2.0-r2.ebuild 459 BLAKE2B 48d31dd7526a985a35ef6db237ac492810d2baca5452be74eb01ee2041d40e447ae23cfd0359eb9e7fc7dfad80da00a1c824907812d815bb0041126732d34b71 SHA512 fd42dc35ab698a373580b3620a8ced3ab98509a5ca1341c23aaaa655e3bc74be84ce4b08e20e050e1aaf7d0be11d1a5005f3c03157765881db32fc2c2e6fe309
-EBUILD borgweb-0.3.0.ebuild 459 BLAKE2B 48d31dd7526a985a35ef6db237ac492810d2baca5452be74eb01ee2041d40e447ae23cfd0359eb9e7fc7dfad80da00a1c824907812d815bb0041126732d34b71 SHA512 fd42dc35ab698a373580b3620a8ced3ab98509a5ca1341c23aaaa655e3bc74be84ce4b08e20e050e1aaf7d0be11d1a5005f3c03157765881db32fc2c2e6fe309
-MISC metadata.xml 333 BLAKE2B a0685971dbfb7e1fe88af47901cc32558826799cd55d8a527d17c5ec63889408c38f3813463e85790e679dd8adf7fb3e45ed0d8f4292e64de86d34424bde6a14 SHA512 e6d1d62892708b8f0040743a036d931403cb4ccd6d7007ffa63be6fb7115ea45c5c84af3af5dc97fc1c61f07144e79352985d47bc2d504d7993d1a1767d54abb
diff --git a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
deleted file mode 100644
index 6ed8f90906be..000000000000
--- a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Browser-based user interface for BorgBackup"
-HOMEPAGE="https://pypi.org/project/borgweb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-backup/borgbackup[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]"
diff --git a/app-backup/borgweb/borgweb-0.3.0.ebuild b/app-backup/borgweb/borgweb-0.3.0.ebuild
deleted file mode 100644
index 6ed8f90906be..000000000000
--- a/app-backup/borgweb/borgweb-0.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Browser-based user interface for BorgBackup"
-HOMEPAGE="https://pypi.org/project/borgweb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-backup/borgbackup[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]"
diff --git a/app-backup/borgweb/metadata.xml b/app-backup/borgweb/metadata.xml
deleted file mode 100644
index 2daaa17a826b..000000000000
--- a/app-backup/borgweb/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>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">borgweb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 528fe0ec07b7..c3081bc3edaf 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 09cf7d0ee9a6..5f718a33b7c8 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -12,7 +12,7 @@ DIST gnupg-2.4.0.tar.bz2 7666935 BLAKE2B cc4bcd439a3283df5932c0c41873a3b85de0710
 DIST gnupg-2.4.0.tar.bz2.sig 119 BLAKE2B 238e07f48d7cf13d1030801d16dfd0af0411b5a9ebf0594124dc5edc02953187dd5fe7c9b7cca3edd63bd4ffb3604a098ee71031bf8fcef731e55268efb1f509 SHA512 3ed098ad036907fde2c80fdd09a5f3fd1a151ecfa47b5a34a949e129fcd1a748ab0ed7219433e5104d98a670bd91d353157ef2e8cc4e0c5817da2d7da58c4b20
 EBUILD gnupg-2.2.39.ebuild 5348 BLAKE2B c1aa7063d623fd45825d528ff392e309620b37a484787151ee786401d067c451c9a4d068d505c114630dbe812aeb0ee497d3ac2149d59abc373c48385b76ba29 SHA512 cf8f0474601831b51a333167257b3f4e18d91e34a2c16ccd27f81092ecf0a19a79056469a715e602379435c7e0699051ef130d014b7239d7d926c8661535ff6c
 EBUILD gnupg-2.2.40.ebuild 5392 BLAKE2B 7baa24fb4c25ce4257d90c76114b682c76df4667cb97daeee1a9e20a2e3d41d39b8692be5aa0370d332d70acc2fd0445990eb7ce22b7ae58183c614a4a7e0577 SHA512 a095333fcb38cfe6f0e7a051f578683c55644b1d6a5eb8534a180b2598646f504ac0ff255b96732ed56851fc2699e6155f28d95b1dee832a494a9af8632d4a7e
-EBUILD gnupg-2.2.41.ebuild 5558 BLAKE2B 1e4a44c8001e1e801c0c632d9920488c70b4961bed4069342b38f1936c841c6704ad502de0145547fa1e694971c3a0a46a5fab78da1c3db6b6b78a38c4609d67 SHA512 e7115699c050336e8c49f4bd8ef19c6169c46241ac0b115ba818e1ffba40e25dc759c3705892301e77d1819aacc4bc490c563336c37abfb4d7d134bc4cdf6aa6
+EBUILD gnupg-2.2.41.ebuild 5570 BLAKE2B 59785124ef2a33d16911558b5acd9db90de91f457a55e2426827d6fe33524fcd7ccd119300c76caea8bd794cf2aba654aa7a12a19cc6150b781851e9360b03ca SHA512 1ad2cdd977f46d6f676bd6090b85a1f25692419f3b3dd186b17a6bb39a4887649ef77a0b717f30ade7add964e4302f80ac2e2f49b60905afe577e0ca41dea8b5
 EBUILD gnupg-2.3.8.ebuild 5577 BLAKE2B dcb32e4f411c1aba0954ba2cd2c30528a82ecb9988c334e65d3c92db42fb2442464e719d6f6a738c61ef05dd9548e1dab90a9b033cf75d7f39c528469d9b07c5 SHA512 ce7ec66d3543a61a6ab7c9a36c88ec8bf5308ec72a78f7b0a3406fbdfd1b04b78623963104157e64b215ba056fcdb855d169b4ffc918e52c2f8a258d40f42619
-EBUILD gnupg-2.4.0.ebuild 5727 BLAKE2B 9a3baf5fa43e62ebeb537c0acd0eac57f8ef1c290fe34855e91be0bf03879ab81662c58f66abfba14ad2d042794e7bb1c8032410eb0525b62f60db1805c4a770 SHA512 c3063af38b5dd16fa077dc43f74a09b96648b8cbef8b0c1f24cf687ad8454fe945edcf98faca186636906169123e2b2385a33d55585821a54cd961ecaa2e262d
+EBUILD gnupg-2.4.0.ebuild 5731 BLAKE2B ac7e9b6916113d5f1546a9534d89342093e6f581219693e112e3884d63c15978615c302b951f3636be8933320b18177d66814961a3e2f771335c3559b2e30f8b SHA512 5238046d39bd9cb6e6a831d81e7dafaab619a48b0aafc0f204190928ddd7dd74f036b850037caa7683f34d7b1993a2af96006b1de1c93f85a4b4f16dcf9d4290
 MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de
diff --git a/app-crypt/gnupg/gnupg-2.2.41.ebuild b/app-crypt/gnupg/gnupg-2.2.41.ebuild
index ab8c34f65904..37e68bc395e3 100644
--- a/app-crypt/gnupg/gnupg-2.2.41.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.41.ebuild
@@ -150,11 +150,9 @@ my_src_test() {
 my_src_install() {
 	emake DESTDIR="${D}" install
 
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
+	use tools && dobin \
+		tools/{gpg-zip,gpgconf,gpgsplit,gpg-check-pattern} \
+		tools/make-dns-cert
 
 	dosym gpg /usr/bin/gpg2
 	dosym gpgv /usr/bin/gpgv2
@@ -170,6 +168,8 @@ my_src_install() {
 my_src_install_all() {
 	einstalldocs
 
+	use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
+
 	use doc && dodoc doc/*.png
 
 	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
diff --git a/app-crypt/gnupg/gnupg-2.4.0.ebuild b/app-crypt/gnupg/gnupg-2.4.0.ebuild
index cd23acb62742..8c58fb2730da 100644
--- a/app-crypt/gnupg/gnupg-2.4.0.ebuild
+++ b/app-crypt/gnupg/gnupg-2.4.0.ebuild
@@ -154,11 +154,7 @@ my_src_test() {
 my_src_install() {
 	emake DESTDIR="${D}" install
 
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
+	use tools && dobin tools/{gpgconf,gpgsplit,gpg-check-pattern} tools/make-dns-cert
 
 	dosym gpg /usr/bin/gpg2
 	dosym gpgv /usr/bin/gpgv2
@@ -174,6 +170,8 @@ my_src_install() {
 my_src_install_all() {
 	einstalldocs
 
+	use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
+
 	use doc && dodoc doc/*.png
 
 	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 23f3c4c548fd..e1d829f15ee8 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest
deleted file mode 100644
index 94c25cca9987..000000000000
--- a/app-emulation/aqemu/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX aqemu-0.9.2-crash-fix.patch 4881 BLAKE2B 6e16f480b9a0623ed1469b3a6eb7401323f65e7298d3e3a98b7410b809567d4d8774ebf22da0a43942d1dff9ba06fa0884502ce9ff016088ed736ec4291413f9 SHA512 ec99b5eb47d18accee560980376759475fb8d4f6f22f84dbae08775c9513b5c183891e048ae60655bcd9c7df63dc9b85913fd23f6ffeadae3d8fa97aa4d16259
-AUX aqemu-0.9.2-docs.patch 537 BLAKE2B 5a96b909a29e78aaac8cd71551aa0f5223ef7e4782d365308241a71c59d9e4e8e2acd2e9cdc72d95e876d5ec5dcdae054716b0ed23bf66d5879b2263c691b5c5 SHA512 df50688b5abb1225ce48eb6a1626030869a0d42b701c72ca325e71073d35aad5fda56e97939e5a41f5d3da0af57d89e8c2535845d4c5f0f3eb898f294dc5bef8
-AUX aqemu-0.9.2-include.patch 202 BLAKE2B 1f189a225adbda7e1b9e9e89820e1966c35c8b0f40bc1df0caf89117988c6ddfc4060a2cfeeffc082775b7f11be15fb3aecac623806a9a4d9567aee2746aa9ed SHA512 adb3a92fbfeb8bb5025fd1b3b7587af2b390d111cb42bd48f031b2d5eebebd132a03a84a7026bf0bb17fa627ed49558ef5237e6472d8558f3ba3fff82ab52dad
-AUX aqemu-0.9.2-qtbindir.patch 514 BLAKE2B 9d6245d1745248db021cf9883bf9f8a00223ba781a2ba9bbc6561e4fb7239aa6c2baab7a1324edbbf157d68a829116ecc07b24bb13d714321ce145de447b9bb6 SHA512 f85e6c2487dfef86470773949f6796af9efdf066d9871ac4cdfddd064c85fbf893574e602ab2c6cd1198dc9eb76f0722b5a85ec046b2dca2275a24799418c996
-DIST aqemu-0.9.2.tar.gz 1373465 BLAKE2B 8b2b3ed311f8dd723a0d06ab74659514c6ccda67643c747af832f1677ab86ffcecde3607ead0b3410a310c38a2fe360a5ff187ef86b5953e4f5a5054a862c26c SHA512 9d4808172ee1be82509956560e4d3f9ee349fedd920342146083cc9bc79ef51fc95937c64f20ffb13e2849c577f95f59b5b65271d6e29e2d2e1ec2d1562006ba
-EBUILD aqemu-0.9.2-r2.ebuild 934 BLAKE2B b3dbb7c2deffdff1157130054c5de9e0e568e0a8ed383fef18199c0d79fe68904ee6eb27930e188e72509efeb9826e00daaa582e53cccc2746d667e2ae8d727c SHA512 f0dc3398cbd41156cd09748926b5836cb1b670d539c723876d672c9c540867c5e1e272d8ed057e30f7912d2d4103a34132c421b535eb8e1c0502dc76687c86ad
-MISC metadata.xml 299 BLAKE2B e49f8725de4fe8aca9401286dff3d9cfbc980d916cc3310b49953db2b1e749e96121a9679adc4297435f89f57967fc08e98f0df8e8fd00d5245e293f327bd948 SHA512 bcbc0350f5f41fe9da0efd3c9e596f314cacd88661c4ec62b5694d45b6c03664935b9ac9c338612de63bd73f08b16d108d085db78fac7031449e3e3edcf0090e
diff --git a/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild b/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
deleted file mode 100644
index 6a2be65aaa60..000000000000
--- a/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Graphical interface for QEMU and KVM emulators, using Qt5"
-HOMEPAGE="https://sourceforge.net/projects/aqemu"
-SRC_URI="https://github.com/tobimensch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="vnc"
-
-RDEPEND="
-	app-emulation/qemu
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	vnc? ( net-libs/libvncserver )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS CHANGELOG README TODO )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.2-qtbindir.patch"
-	"${FILESDIR}/${PN}-0.9.2-include.patch"
-	"${FILESDIR}/${PN}-0.9.2-docs.patch"
-	"${FILESDIR}/${PN}-0.9.2-crash-fix.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMAN_PAGE_COMPRESSOR=OFF
-		-DWITHOUT_EMBEDDED_DISPLAY=$(usex vnc OFF ON)
-	)
-
-	cmake_src_configure
-}
diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch b/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch
deleted file mode 100644
index ef4c1a146461..000000000000
--- a/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-https://github.com/tobimensch/aqemu/pull/116
-https://bugs.gentoo.org/738020
-
-From dc19121a923c71eed248cd6310b9b06ec0af6abe Mon Sep 17 00:00:00 2001
-From: Moskaliou Nikita <44800696+nikitamos@users.noreply.github.com>
-Date: Sun, 5 Dec 2021 19:36:44 +0300
-Subject: [PATCH] Change widgets names
-
-Several widgets in the src/Main_Window.ui file had the same name ("widget"), for several users AQEMU crashed with SEGFAULT. So, the names were changed and now everything works fine
---- a/src/Main_Window.ui
-+++ b/src/Main_Window.ui
-@@ -226,7 +226,7 @@
-              </widget>
-             </item>
-             <item>
--             <widget class="QWidget" name="widget" native="true">
-+             <widget class="QWidget" name="general_Machine_Sets" native="true">
-               <layout class="QGridLayout" name="gridLayout_12">
-                <property name="leftMargin">
-                 <number>24</number>
-@@ -275,9 +275,6 @@
-                    <property name="maxCount">
-                     <number>64</number>
-                    </property>
--                   <property name="sizeAdjustPolicy">
--                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
--                   </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="1">
-@@ -294,9 +291,6 @@
-                    <property name="maxCount">
-                     <number>16</number>
-                    </property>
--                   <property name="sizeAdjustPolicy">
--                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
--                   </property>
-                    <item>
-                     <property name="text">
-                      <string>1</string>
-@@ -395,9 +389,6 @@
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
--                   <property name="sizeAdjustPolicy">
--                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
--                   </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="2">
-@@ -526,9 +517,6 @@
-                    <property name="maxCount">
-                     <number>8</number>
-                    </property>
--                   <property name="sizeAdjustPolicy">
--                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
--                   </property>
-                    <item>
-                     <property name="text">
-                      <string>Floppy</string>
-@@ -586,9 +574,6 @@
-                    <property name="maxCount">
-                     <number>8</number>
-                    </property>
--                   <property name="sizeAdjustPolicy">
--                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
--                   </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="0">
-@@ -618,9 +603,6 @@
-                    <property name="maxCount">
-                     <number>128</number>
-                    </property>
--                   <property name="sizeAdjustPolicy">
--                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
--                   </property>
-                    <item>
-                     <property name="text">
-                      <string>en-us (default)</string>
-@@ -1333,7 +1315,7 @@
-              </widget>
-             </item>
-            </layout>
--           <zorder>widget</zorder>
-+           <zorder>general_Machine_Sets</zorder>
-            <zorder>GB_Options</zorder>
-            <zorder>GB_Audio</zorder>
-            <zorder>GB_Memory</zorder>
-@@ -2457,7 +2439,7 @@
-                     </layout>
-                    </item>
-                    <item row="1" column="0" colspan="2">
--                    <widget class="QWidget" name="widget" native="true">
-+                    <widget class="QWidget" name="protocol_Sets" native="true">
-                      <layout class="QHBoxLayout" name="Widget_Redirection_Protocol">
-                       <property name="spacing">
-                        <number>6</number>
-@@ -2515,7 +2497,7 @@
-                     </widget>
-                    </item>
-                    <item row="2" column="0" colspan="2">
--                    <widget class="QWidget" name="widget" native="true">
-+                    <widget class="QWidget" name="ip_Sets" native="true">
-                      <layout class="QHBoxLayout" name="Widget_Redirection_Net">
-                       <property name="spacing">
-                        <number>6</number>
-@@ -3018,7 +3000,7 @@
-      <x>0</x>
-      <y>0</y>
-      <width>982</width>
--     <height>32</height>
-+     <height>22</height>
-     </rect>
-    </property>
-    <widget class="QMenu" name="menuVM">
diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch b/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch
deleted file mode 100644
index e3fab7fbf209..000000000000
--- a/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -273,9 +273,9 @@ MACRO( create_docs _sources )
- 	ENDFOREACH( curFile )
- ENDMACRO( create_docs )
- 
--CREATE_DOCS( docs_bz2 AUTHORS CHANGELOG README TODO )
--ADD_CUSTOM_TARGET( docs ALL DEPENDS ${docs_bz2} )
--INSTALL( FILES ${docs_bz2} DESTINATION share/doc/aqemu )
-+#CREATE_DOCS( docs_bz2 AUTHORS CHANGELOG README TODO )
-+#ADD_CUSTOM_TARGET( docs ALL DEPENDS ${docs_bz2} )
-+#INSTALL( FILES ${docs_bz2} DESTINATION share/doc/aqemu )
- 
- # Build RCC files (GUI icons)
- MACRO( pack_icons _sources )
diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-include.patch b/app-emulation/aqemu/files/aqemu-0.9.2-include.patch
deleted file mode 100644
index 98a14068a7cd..000000000000
--- a/app-emulation/aqemu/files/aqemu-0.9.2-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/docopt/docopt_value.h
-+++ b/src/docopt/docopt_value.h
-@@ -13,6 +13,7 @@
- #include <vector>
- #include <functional> // std::hash
- #include <iosfwd>
-+#include <stdexcept>
- 
- namespace docopt {
- 
diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch b/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch
deleted file mode 100644
index 5c5548058427..000000000000
--- a/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Ensure the Qt 5 version of rcc is used instead of whatever is in $PATH.
-
-Gentoo-bug: 589332
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -285,7 +285,7 @@
- 		
- 		SET( _out ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.rcc )
- 		
--		ADD_CUSTOM_COMMAND( OUTPUT ${_out} COMMAND rcc ARGS ${_in} -binary -o ${_out} DEPENDS ${_in} )
-+		ADD_CUSTOM_COMMAND( OUTPUT ${_out} COMMAND ${Qt5Core_RCC_EXECUTABLE} ARGS ${_in} -binary -o ${_out} DEPENDS ${_in} )
- 		
- 		SET( ${_sources} ${${_sources}} ${_out} )
- 	ENDFOREACH( curFile )
diff --git a/app-emulation/aqemu/metadata.xml b/app-emulation/aqemu/metadata.xml
deleted file mode 100644
index b13470d746c5..000000000000
--- a/app-emulation/aqemu/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 -->
-	<upstream>
-		<remote-id type="sourceforge">aqemu</remote-id>
-		<remote-id type="github">tobimensch/aqemu</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index d0fc6939bc80..01fcd4d2d716 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/ovaldi/Manifest b/app-forensics/ovaldi/Manifest
deleted file mode 100644
index a25a44a5b209..000000000000
--- a/app-forensics/ovaldi/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX ovaldi-5.10.1.7-disable-acl.patch 1159 BLAKE2B e7c477fdfa53bc0ed8866d39c58b1ed1e28789db1b663b4b2c22e99d2a41474f2f684581b81dd4123ad5f2d49b45acbaff82da38d3d61881f01b5d202684a089 SHA512 85dcd92468641294f132ffbdd4cc23bfcb4a96fd6db52322cf1abca086617b83798323e6bd2e4447467530a2c8f8b681ffabef3f193ea7a09cdbca93e33d2f6e
-AUX ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch 762 BLAKE2B 3d1018ee87b8a15ec2b8b487a8e5eb9bfa17be265e3ec1c84a17b877ccaa38605127539e410772c23474395db984427780d4bb28ebb5223c1785f1cd7b161c58 SHA512 b597ee411d478758f5d5de0bb486b75190cf7ac2a9297c407016f66bc28ddbd6692b25c83adaed0abf9931c86909c61fbff7a834f82e5f0bd0068a04659f8f36
-AUX ovaldi-5.10.1.7-gcc11.patch 2378 BLAKE2B 8e0256c20f50748840457e16b5e9e1150917c7015b72873007db90a6294b31b485776bfcb8c44eae9bfe23a774e8a5c4ba7aa6fa6d3ef98a8080354d5d0b0df0 SHA512 41932b423992f4cb698db2af7fed0ecf21c77986eee2d284b631dcb89175e040850ba52fa91218a39b468f7eab0ac336327d5b31e5bcf0b5d4a1d58e3b2e0e9c
-DIST ovaldi-5.10.1.7-src.tar.bz2 20391784 BLAKE2B 7e2c719f0819f967c6aee533bb881c29ffac756461460d73e3231f1cffd254d88a26e716f0334d023daa7fa6f9c314bf7a42b6c13e2a90daa558e589d135479c SHA512 22c373436889b03ffb5d479bd322703bbd8b5b335f116a3b38a3d206ddaaf3115961ab89597c3907b6e5d745eb302a042c135c73cde0eaae10e51f5d6e3e55ec
-EBUILD ovaldi-5.10.1.7-r1.ebuild 3024 BLAKE2B 29609cff8c0433059cb943ecb7ea9fca7263be79e45d5de6f884469ba6e332bc035df66fbe729b0e982a17c94d08a46e1c62d515433baaf3b4c3dfdaa7a6bbd0 SHA512 08eb28897db991f47c082081bdf72c8db6f4b1ce39f5d927eb4bcb65f457b4400a412a1fde8e2ea97a40bbe9c176b583c99ab8724a751f0f6f5343fad51114ca
-MISC metadata.xml 244 BLAKE2B 1e98392617c2226a41348e7fbdd2e5f83cf42f4e683b5f0df82b16746bd3b095e52bedd1ce0c066e7a55fe1f62dfea39b603fbe5054003fbfded557d83a08482 SHA512 074eaa2c5c5145f60ec5b93c7aef02a8f9e4b9b85676f5663034f41f60e3dacf38f7c8f0f0909dc43e4b085ae779e67b61395b0a35f251bc23abbb281de0360c
diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch
deleted file mode 100644
index 0a8b5fa6a188..000000000000
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/probes/unix/FileProbe.cpp
-+++ b/src/probes/unix/FileProbe.cpp
-@@ -386,18 +386,8 @@
- 	   6) If a file has an ACL, the value will be 'true'.
- 	*/
- 	
--	int hasExtendedAcl = acl_extended_file(filePath.c_str());
--	if(hasExtendedAcl > -1){ // behavior 4, 5, and 6
--          item->AppendElement(new ItemEntity("has_extended_acl",Common::ToString(hasExtendedAcl),OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_EXISTS,0));
--	}else{
--	  if(errno == EOPNOTSUPP){ // behavior 3
--	    item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_DOES_NOT_EXIST,0));
--          }else{ // behavior 2
--	    item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_ERROR,0));
--            item->AppendMessage(new OvalMessage(string("Error reading ACL data: ") + strerror(errno)));
--          }
--	}
--
-+	// behavior 1
-+	item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_NOT_COLLECTED,0));
- # else
- 	// behavior 1
- 	item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_NOT_COLLECTED,0));
diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch
deleted file mode 100644
index 9f0a0e05e401..000000000000
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/src/probes/unix/Process58Probe.cpp
-+++ b/src/probes/unix/Process58Probe.cpp
-@@ -743,26 +743,8 @@
- }
- 
- bool Process58Probe::RetrieveSelinuxDomainLabel(pid_t pid, string *label, string *err) {
--	security_context_t sctx;
--	int ec = getpidcon(pid, &sctx);
--	if (ec == -1) {
--		// getpidcon man page doesn't say errno is set... so we can't get a
--		// reason for the error.
--		*err = "getpidcon() failed";
--		return false;
--	}
--
--	SecurityContextGuard scg(sctx);
--	ContextGuard cg(sctx);
--
--	const char *tmp = context_type_get(cg);
--	if (!tmp) {
--		*err = string("context_get_type(")+sctx+"): "+strerror(errno);
--		return false;
--	}
--
--	*label = tmp;
--	return true;
-+	*err = string("context_get_type(NotImplmented)");
-+	return false;
- }
- 
- #elif defined SUNOS
diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-gcc11.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-gcc11.patch
deleted file mode 100644
index 1c71f7016d77..000000000000
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-gcc11.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/src/AbsProbe.cpp
-+++ b/src/AbsProbe.cpp
-@@ -52,7 +52,7 @@
- 	// use const wherever it makes sense, to ensure const-correctness??
- 	// Or maybe I should have implemented operator<() for items and
- 	// used the default std::less template...?
--	typedef set<Item*, std::less<const Item*> > ItemCache;
-+	typedef set<Item*, std::less<Item*> > ItemCache;
- 	ItemCache globalItemCache;
- }
- 
---- a/src/ErrnoException.h
-+++ b/src/ErrnoException.h
-@@ -49,10 +49,10 @@
- 		SetErrorMessage(syscall+": "+std::strerror(errnoVal));
- 	}
- 
--	virtual ~ErrnoException() throw () {
-+	virtual ~ErrnoException() {
- 	}
- 
--	virtual const char* what() const throw() {
-+	virtual const char* what() const noexcept {
- 		return errorMessage.c_str();
- 	}
- };
---- a/src/OutOfMemoryException.h
-+++ b/src/OutOfMemoryException.h
-@@ -47,10 +47,10 @@
- 		: Exception(msg, severity, cause) {
- 	}
- 
--	virtual ~OutOfMemoryException() throw () {
-+	virtual ~OutOfMemoryException() {
- 	}
- 
--	virtual const char* what() const throw() {
-+	virtual const char* what() const noexcept {
- 		return errorMessage.c_str();
- 	}
- };
---- a/src/probes/unix/RunLevelProbe.cpp
-+++ b/src/probes/unix/RunLevelProbe.cpp
-@@ -125,7 +125,7 @@
- 
- 
- void
--RunLevelProbe::_verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const throw( ProbeException ) {
-+RunLevelProbe::_verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const {
-   
-   // check datatypes - only allow string
-   if( service_name->GetDatatype() != OvalEnum::DATATYPE_STRING ){
---- a/src/probes/unix/RunLevelProbe.h
-+++ b/src/probes/unix/RunLevelProbe.h
-@@ -76,7 +76,7 @@
-  */
- struct ltrunlevel_item_comparator
- {
--  bool operator() ( const runlevel_item &r1, const runlevel_item &r2 )
-+  bool operator() ( const runlevel_item &r1, const runlevel_item &r2 ) const
-   {
-     return r1.service_name.compare(r2.service_name) < 0;
-   }
-@@ -115,7 +115,7 @@
-       @param runlevel the runlevel runlevel_object entity
-       @throws ProbeException if invalid operations or datatypes are encountered
-     */
--    void          _verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const throw( ProbeException );
-+    void          _verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const;
- 
-     /**
-       Checks to see if the given filename is either "." or ".."
diff --git a/app-forensics/ovaldi/metadata.xml b/app-forensics/ovaldi/metadata.xml
deleted file mode 100644
index 0011ef603d31..000000000000
--- a/app-forensics/ovaldi/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">ovaldi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-forensics/ovaldi/ovaldi-5.10.1.7-r1.ebuild b/app-forensics/ovaldi/ovaldi-5.10.1.7-r1.ebuild
deleted file mode 100644
index 50a05b8d222f..000000000000
--- a/app-forensics/ovaldi/ovaldi-5.10.1.7-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Free implementation of OVAL"
-HOMEPAGE="http://oval.mitre.org/language/interpreter.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl ldap selinux"
-
-DEPEND="
-	dev-libs/libgcrypt:=
-	dev-libs/libpcre:=
-	dev-libs/xalan-c:=
-	dev-libs/xerces-c:=
-	sys-apps/util-linux:=
-	sys-libs/libcap
-	acl? ( sys-apps/acl:= )
-	ldap? ( net-nds/openldap:= )
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if ! use ldap ; then
-		einfo "Disabling LDAP probes"
-		sed -i 's,.*ldap,//&,' src/linux/ProbeFactory.cpp || die
-		sed -i 's,.*LDAP,//&,' src/linux/ProbeFactory.cpp || die
-		sed -i 's/-lldap//' project/linux/Makefile || die
-		sed -i 's/-llber//' project/linux/Makefile || die
-		sed -i 's/.*LDAPProbe.h.*//' src/linux/ProbeFactory.h || die
-		rm src/probes/independent/LDAPProbe.{cpp,h} || die
-	fi
-
-	if ! use acl ; then
-		sed -i 's,.*libacl,//&,' src/probes/unix/FileProbe.h || die
-		eapply "${FILESDIR}"/${P}-disable-acl.patch
-		sed -i 's, -lacl , ,' project/linux/Makefile || die
-	fi
-
-	einfo "Disabling rpm probes"
-	sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
-
-	# same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree
-	einfo "Disabling dpkg probes"
-	sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die
-
-	#Disabling SELinux support
-	if ! use selinux ; then
-		rm src/probes/linux/SelinuxSecurityContextProbe.cpp || die
-		rm src/probes/linux/SelinuxBooleanProbe.cpp || die
-		rm src/probes/linux/SelinuxBooleanProbe.h || die
-		eapply "${FILESDIR}"/${P}-disable_RetrieveSelinuxDomainLabel.patch
-		sed -i 's,.*selinux.*,//&,' src/linux/ProbeFactory.cpp || die
-		sed -i 's,.*Selinux.*,//&,' src/linux/ProbeFactory.cpp || die
-		sed -i 's,.*selinux.*.h.*,//&,' src/probes/unix/Process58Probe.cpp || die
-		sed -i 's,.*SecurityContextGuard.h.*,//&,' src/probes/unix/Process58Probe.cpp || die
-		sed -i 's, -lselinux,,' project/linux/Makefile || die
-	fi
-
-	# missing header for realloc and free
-	sed -i 's,#include <unistd.h>,&\n#include <stdlib.h>,' src/linux/NetworkInterfaces.cpp || die
-	sed -i 's,#include <unistd.h>,&\n#include <stdlib.h>,' src/linux/SystemInfo.cpp || die
-
-	# respect CXX, CXXFLAGS and LDFLAGS
-	sed -e '/^CPPFLAGS/s/$(INCDIRS)/$(CXXFLAGS) \0/' \
-		-e 's/$(CXX) $^/$(CXX) $(LDFLAGS) $^/g' \
-		-i project/linux/Makefile || die
-
-	# no such library on linux
-	sed -i 's,-lxalanMsg,,' project/linux/Makefile || die
-
-	eapply "${FILESDIR}"/${P}-gcc11.patch
-	eapply_user
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_compile() {
-	emake -C project/linux
-}
-
-src_install() {
-	# no make install in Makefile
-	dosbin project/linux/Release/ovaldi project/linux/ovaldi.sh
-	dodir /var/log/ovaldi
-
-	insinto /usr/share/ovaldi
-	doins -r xml/.
-
-	dodoc docs/{README.txt,version.txt}
-	doman docs/ovaldi.1
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 222287401980..e78b20d84cf3 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-sunpinyin/Manifest b/app-i18n/fcitx-sunpinyin/Manifest
deleted file mode 100644
index 87209c3ce2ab..000000000000
--- a/app-i18n/fcitx-sunpinyin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST fcitx-sunpinyin-0.4.2.tar.xz 42984 BLAKE2B 1f64d96d35c6f455be15a56eb065d97a988f671d40392a3ea3e96fc53b22cf048cff61f406d0e001cc7cfe531a8dc5508ef7862c17253b409330ac2d0af52f7c SHA512 8ade5d94e5227c0b72d2844c09c2699e4b8c66cecbd4107791168d27e15f68b28a4445bf42df7bd6fb44119ec42c5b574293bb417dcde8998578f0debd656a2a
-EBUILD fcitx-sunpinyin-0.4.2.ebuild 837 BLAKE2B 3f5f3fb6ce12b4f4c2afa072a2f7956cb8677bf75ed88a8f0e08fff80864eebdc75c7725a8b79d76cb8d2247d7bdec61ec2cbb4c11613dbfa0fc01c5b0b1a48d SHA512 dab7e0bf4fa3b051f816b3a2848c8f57a6e984a3ee467c6c0af7fd30d2b8b1b249b589d0ba8d78a0e589a7437f3c7ec54258ca345d9251851852deca1e41bbe3
-EBUILD fcitx-sunpinyin-4.9999.ebuild 811 BLAKE2B 6ae98312e88bde2da2d6439b85ad9f9a1653aa691e459240f40824522eee67f7582d0a777461c43b3fe9d1516b51a07333896d48e65d3e0db7cfc6cf9b62369e SHA512 af403d1715e14ca877460ba2e08adef7cb8b980c234938dc7a246117cfb741d29ac991d1b3d976fd4e5af65283f43d95571ebd90a254222deb6f28cd92c27ff8
-MISC metadata.xml 469 BLAKE2B 9505e1bca0a92a469fd384ab3900c355507ee330e80dcf566cd027f31fd46bc54533326b8c90c10c10b1dbff6fc7679bd05de2a6b85268d466c758ea665a7217 SHA512 5fe1dea7527c15de2601b3834924fd16f6a58f8fb00bab1bab03644df1b4da04f0f9052e35362b2cfd16015f3154c19df0051302f6026a97d95e8dee73867414
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
deleted file mode 100644
index f42e0fcb150c..000000000000
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2010-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin"
-fi
-
-DESCRIPTION="Chinese SunPinyin input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-DEPEND=">=app-i18n/fcitx-4.2.9:4
-	>=app-i18n/sunpinyin-2.0.4_alpha:=
-	virtual/libintl"
-RDEPEND="${DEPEND}
-	app-i18n/sunpinyin-data"
-
-DOCS=(AUTHORS)
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
deleted file mode 100644
index 3a652f5a19c5..000000000000
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2010-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin"
-fi
-
-DESCRIPTION="Chinese SunPinyin input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS=""
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-DEPEND=">=app-i18n/fcitx-4.2.9:4
-	>=app-i18n/sunpinyin-2.0.4_alpha:=
-	virtual/libintl"
-RDEPEND="${DEPEND}
-	app-i18n/sunpinyin-data"
-
-DOCS=(AUTHORS)
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-i18n/fcitx-sunpinyin/metadata.xml b/app-i18n/fcitx-sunpinyin/metadata.xml
deleted file mode 100644
index 374486963ca8..000000000000
--- a/app-i18n/fcitx-sunpinyin/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>arfrever.fta@gmail.com</email>
-		<name>Arfrever Frehtes Taifersar Arahesis</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">fcitx/fcitx-sunpinyin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-i18n/ibus-kkc/Manifest b/app-i18n/ibus-kkc/Manifest
deleted file mode 100644
index 20d91bd18dfb..000000000000
--- a/app-i18n/ibus-kkc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ibus-kkc-1.5.22_p20170607.tar.gz 55162 BLAKE2B 9d34a7da99a1792cad9ca1b82665b8008a2b11c7e09cdce7e0a5e9d0e9d482798a1facaf8d35e3daa296638383c267af70ae00d50b2c601b66895a0b1c8d2817 SHA512 519be83e17d9556c6839ecad2af4a46665a6aafd0f8072f4c1d2c8af33eb3ac814517b5b42513b898afe86ededf35b9082b9a1fb2a699dcb88757b159d5b74cf
-EBUILD ibus-kkc-1.5.22_p20170607.ebuild 779 BLAKE2B e20002a467c28e31a5d837e71c432a5190de99068f4c1c1cd755a7ce67c8af7828481e6d18f7e8c47c4ea70a4728d1b06cf48fd8f8c1ec53b7c43fd1a58c7d7d SHA512 4829a1e97feff5c95b248d5ad3647cf3dd9e5d07c85d82f832b86794ce76ce0495cfccc0831a147c59f3e8c78e7483fda4b9eda302e9ec93a84feac9505d4407
-MISC metadata.xml 313 BLAKE2B b1e1bcedbf32369841d3810fa0b7bca1b839f314b87e38f87b09761622f5c7dfa139b00e40cb605fbb847bcd7be00cb9f5d74e14f3ccf05196c088bc790f7692 SHA512 5d10e6154d3f6dade76491ab31ce770f8b967d536cfd90cc34b2e751d999a72c807c3d3704c5512b4c6299e141dcf3887661a64db4248a8bf7f93a5748a9d6de
diff --git a/app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild b/app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild
deleted file mode 100644
index a7cb005d4f3b..000000000000
--- a/app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools vala vcs-snapshot
-
-EGIT_COMMIT="f7516ae20cb648cd8b0904aec5853d3a3d2611c4"
-
-DESCRIPTION="Japanese Kana Kanji conversion engine for IBus"
-HOMEPAGE="https://github.com/ueno/ibus-kkc"
-SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DEPEND="app-i18n/ibus
-	app-i18n/libkkc
-	x11-libs/gtk+:3
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	app-i18n/skk-jisyo"
-BDEPEND="$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-i18n/ibus-kkc/metadata.xml b/app-i18n/ibus-kkc/metadata.xml
deleted file mode 100644
index 74de0fde210d..000000000000
--- a/app-i18n/ibus-kkc/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>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ueno/ibus-kkc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
deleted file mode 100644
index 94ac8fede0b6..000000000000
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch 4693 BLAKE2B 1cc396678b14eb1d42909b1448c7f9f53c370fa3a9c061574fcb13149b8f791e988cb4f6a5f4018eeb248e0cb49dcad6332e23d8207f42bf142462d81e689c43 SHA512 c32d569dfc42947afece3650409bbbe1c56bddd73e43a0c609d2fc989711cf80a3cf728c5ce7de9dc446bcb5f37d44f1ea6965ddc630a7af2bf01305802567b1
-DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
-EBUILD ibus-sunpinyin-2.0.4_pre20200306162733.ebuild 2161 BLAKE2B 0aa5bf0da7d17c2b15b75dee6d87b8eb430c502ab45088d602a623859c1012407e290ec44dbe32b826fbb2624d6926195842a8b16839a0710b5089426cfd9e3d SHA512 28375c8cc311379a9eb49d5f3a4eb295b93ef5ee8a8ef060d32e61236dd60bb0f775607bf6148c875335a899609589320f8291c8fa2c8209d367bf280d80e5ad
-MISC metadata.xml 421 BLAKE2B 3b413555276753d7d056c926cc5aa5d22dc5f1350fa7f87b9a4b22390e26e0373f5ffc14830b9abca9d048f405955f565e1a6487c7f33ae2c47a6c22e9f48867 SHA512 1786c309e3e4f974a57f49d8e10f02e2dccb5101b9d27d4933c30077c78a067f3c6f3a9e74f83a051a2b0d802b46f482a30ecb1aad7a0bf08b5c73897c5bfb6d
diff --git a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch
deleted file mode 100644
index 09bc30d44cfb..000000000000
--- a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-https://github.com/sunpinyin/sunpinyin/issues/111
-
---- a/wrapper/ibus/setup/main.py
-+++ b/wrapper/ibus/setup/main.py
-@@ -63,7 +63,7 @@
- class Logger:
-     @staticmethod
-     def pr(message):
--        print >> sys.stderr, message
-+        print(message, file=sys.stderr)
- 
- 
- class Option(object):
-@@ -73,10 +73,10 @@
-     """
-     config = ibus.Bus().get_config()
-     __wrappers = {
--        type(True): glib.Variant.new_boolean,
--        type(1): glib.Variant.new_int32,
--        type('str'): glib.Variant.new_string,
--        type([]): glib.Variant.new_strv,
-+        bool: glib.Variant.new_boolean,
-+        int: glib.Variant.new_int32,
-+        str: glib.Variant.new_string,
-+        list: glib.Variant.new_strv,
-     }
- 
-     def __init__(self, name, default):
-@@ -258,7 +258,7 @@
-     def read_config(self):
-         if not self.saved_pairs:
-             self.saved_pairs = self.read()
--        keys = set([pair.split(':')[0] for pair in self.saved_pairs])
-+        keys = {pair.split(':')[0] for pair in self.saved_pairs}
-         for opt in self.options:
-             opt.is_enabled = (opt.key() in keys)
-             # throw away unknown pair
-@@ -445,28 +445,28 @@
-     # TODO: the UI should looks like a virtual keyboard,
-     #       user are allowed to choose the mappings to all punctuation keys.
-     def __init__(self):
--        mappings = [MappingInfo('togglebutton1', [('`',None), ('~',u'～')]),
-+        mappings = [MappingInfo('togglebutton1', [('`', None), ('~', '～')]),
-                     MappingInfo('togglebutton2', []),
--                    MappingInfo('togglebutton3', [('2',None), ('@',u'＠')]),
--                    MappingInfo('togglebutton4', [('3',None), ('#',u'＃')]),
--                    MappingInfo('togglebutton5', [('4',None), ('$',u'¥' )]),
--                    MappingInfo('togglebutton6', [('5',None), ('%',u'％')]),
--                    MappingInfo('togglebutton7', [('6',None), ('^',u'…')]),
--                    MappingInfo('togglebutton8', [('7',None), ('&',u'＆')]),
--                    MappingInfo('togglebutton9', [('8',None), ('*',u'＊')]),
--                    MappingInfo('togglebutton10', [('9',None), ('*',u'（')]),
--                    MappingInfo('togglebutton11', [('0',None), ('*',u'）')]),
--                    MappingInfo('togglebutton12', [('-',u'－'), ('_',u'——')]),
--                    MappingInfo('togglebutton13', [('=',u'＝'), ('+',u'＋')]),
--                    MappingInfo('togglebutton14', [('\\',None), ('|',u'‖')]),
--                    MappingInfo('togglebutton27', [('[',u'〔'), ('{',u'｛')]),
--                    MappingInfo('togglebutton28', [(']',u'〕'), ('}',u'｝')]),
-+                    MappingInfo('togglebutton3', [('2', None), ('@', '＠')]),
-+                    MappingInfo('togglebutton4', [('3', None), ('#', '＃')]),
-+                    MappingInfo('togglebutton5', [('4', None), ('$', '¥' )]),
-+                    MappingInfo('togglebutton6', [('5', None), ('%', '％')]),
-+                    MappingInfo('togglebutton7', [('6', None), ('^', '…')]),
-+                    MappingInfo('togglebutton8', [('7', None), ('&', '＆')]),
-+                    MappingInfo('togglebutton9', [('8', None), ('*', '＊')]),
-+                    MappingInfo('togglebutton10', [('9', None), ('*', '（')]),
-+                    MappingInfo('togglebutton11', [('0', None), ('*', '）')]),
-+                    MappingInfo('togglebutton12', [('-', '－'), ('_', '——')]),
-+                    MappingInfo('togglebutton13', [('=', '＝'), ('+', '＋')]),
-+                    MappingInfo('togglebutton14', [('\\', None), ('|', '‖')]),
-+                    MappingInfo('togglebutton27', [('[', '〔'), ('{', '｛')]),
-+                    MappingInfo('togglebutton28', [(']', '〕'), ('}', '｝')]),
-                     MappingInfo('togglebutton39', []),
-                     MappingInfo('togglebutton40', []),
--                    MappingInfo('togglebutton50', [(',',None), ('<',u'〈')]),
--                    MappingInfo('togglebutton51', [('.',u'·'), ('>',u'〉')]),
--                    MappingInfo('togglebutton52', [('/',u'／'), ('?',None)])]
--                    #'\'',(u'‘',u'’'),
-+                    MappingInfo('togglebutton50', [(',', None), ('<', '〈')]),
-+                    MappingInfo('togglebutton51', [('.', '·'), ('>', '〉')]),
-+                    MappingInfo('togglebutton52', [('/', '／'), ('?', None)])]
-+                    #'\'', ('‘', '’'),
-         MultiCheckDialog.__init__(self, ui_name="punctmapping",
-                                   config_name="General/PunctMapping/Mappings",
-                                   mappings=mappings,
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
deleted file mode 100644
index 3a4dfec5de4c..000000000000
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit python-single-r1 scons-utils toolchain-funcs
-
-MY_PN="sunpinyin"
-MY_P="${MY_PN}-${PV}"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
-elif [[ "${PV}" == *_pre* ]]; then
-	SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
-fi
-
-DESCRIPTION="Chinese SunPinyin engine for IBus"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
-	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${MY_P}.tar.gz"
-else
-	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/v${PV/_/-}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( CDDL LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-DEPEND="app-i18n/ibus
-	~app-i18n/sunpinyin-${PV}
-	dev-libs/glib:2
-	virtual/libintl"
-RDEPEND="${DEPEND}
-	app-i18n/sunpinyin-data
-	gui? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			app-i18n/ibus[introspection,python,${PYTHON_USEDEP}]
-			dev-python/pygobject[${PYTHON_USEDEP}]
-		')
-		x11-libs/gtk+:3[introspection]
-	)"
-
-if [[ "${PV}" == *_pre* ]]; then
-	S="${WORKDIR}/${MY_PN}-${SUNPINYIN_GIT_REVISION}"
-elif [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/${MY_PN}-${PV/_/-}"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.4_pre20200306162733-python-3.patch"
-)
-
-src_prepare() {
-	default
-	sed -e "/^exec python /s/python/${EPYTHON}/" -i wrapper/ibus/setup/ibus-setup-sunpinyin.in || die
-
-	if ! use gui; then
-		sed \
-			-e "s:'setup/ibus-setup-sunpinyin'::" \
-			-e "/env\.Alias('install-libexec'/s:, setup_target::" \
-			-i wrapper/ibus/SConstruct || die
-	fi
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_compile() {
-	escons -C wrapper/ibus \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--libexecdir="${EPREFIX}/usr/libexec" \
-		--datadir="${EPREFIX}/usr/share"
-}
-
-src_install() {
-	escons -C wrapper/ibus --install-sandbox="${D}" install
-}
diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml
deleted file mode 100644
index d07fba105be9..000000000000
--- a/app-i18n/ibus-sunpinyin/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<use>
-		<flag name="gui">Install graphical user interface tool (ibus-setup-sunpinyin)</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">sunpinyin/sunpinyin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-i18n/libkkc-data/Manifest b/app-i18n/libkkc-data/Manifest
deleted file mode 100644
index 90a1eab9907b..000000000000
--- a/app-i18n/libkkc-data/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libkkc-data-python3.patch 5566 BLAKE2B 6f7fdb8d7157f44e5d73521d2f5ca446729cedfcaa37b85c4f4b06bf063ac59eac4c803422f482cdef460b2025cdd9b8af8f26a3a56ecb38bfd10b49fb19e497 SHA512 3c353ad81fc7f7e773e7a1dfd3b488891c1ac6624e1abfdbf7c66d7a021a302e96e06d358bc1bb0587ddd413d23cf02efbb1b232a2dce03fe56aa744b80efef4
-DIST libkkc-data-0.2.7.tar.xz 22262552 BLAKE2B 2c735ee9fabf8f8f201591c9ed584cece22ddcd15da5f36b39bb422b1bce1dbcbcd66f71b5713e2dd4c5e2862b06b014c24a4a3db63c86ecee20519434da9261 SHA512 61c0cd8c0fa41ed8df49cac6709eebb245cc965d7e192b1ba945e95f2fc46aca8aa48c16e1977a12c157c55dab6b9f4c30f4905806725eca6e697b762eb7cbd7
-EBUILD libkkc-data-0.2.7.ebuild 522 BLAKE2B 3487d56f9c52e8b16c28e2788e6e7d97080916c60f74bf8d99e8a3aee1d4fed909e3465e385d86fae3415b92cf817d59298f1e7f0392ce1cdc70ffccf83f4f81 SHA512 2fe14d480f674c1cbcfaa01faab181b732f1664bf7cfeb91632a7c4fb306d49c056fc8d2bdd3a4ad88c39e0b51ef633bed36a5f55c2656df8fd28fccf3115562
-MISC metadata.xml 311 BLAKE2B caecd09cb85c028dbe6478523352bfaa1c577a93b747a39c4eafe68f7d154bb191320cb079e6cf288b59a5298a7953d0fd4d9ad3ab4a8973a5f6d04479e6222f SHA512 2ba94abaadf513ede547763494675f10a8d897be296937a9bff0ab97af7267f5213f4057d5b8a6127c913ecf4752661c4b873ee1cbda337002168a5dd1969c44
diff --git a/app-i18n/libkkc-data/files/libkkc-data-python3.patch b/app-i18n/libkkc-data/files/libkkc-data-python3.patch
deleted file mode 100644
index 46109a92dff8..000000000000
--- a/app-i18n/libkkc-data/files/libkkc-data-python3.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From ba1c1bd3eb86d887fc3689c3142732658071b5f7 Mon Sep 17 00:00:00 2001
-From: Takao Fujiwara <tfujiwar@redhat.com>
-Date: Mon, 30 Jul 2018 15:26:37 +0900
-Subject: [PATCH] build: Enable python3
-
----
- tools/genfilter.py | 18 +++++++--------
- tools/sortlm.py    | 23 ++++++++-----------
- 2 files changed, 19 insertions(+), 22 deletions(-)
-
-diff --git a/tools/genfilter.py b/tools/genfilter.py
-index 5ffab32..0c5f75a 100644
---- a/tools/genfilter.py
-+++ b/tools/genfilter.py
-@@ -84,24 +84,24 @@ def __init__(self, infile, outfile, record_size):
- 
-     def generate(self):
-         size = os.fstat(self.infile.fileno()).st_size
--        n = size / self.record_size
-+        n = size // self.record_size
-         m = int(math.ceil(-n*math.log10(ERROR_RATE) /
-                           math.pow(math.log10(2), 2)))
--        m = (m/8 + 1)*8
-+        m = (m//8 + 1)*8
-         inmem = mmap.mmap(self.infile.fileno(),
-                           size,
-                           access=mmap.ACCESS_READ)
--        outmem = bytearray(m/8)
--        for i in xrange(0, n):
-+        outmem = bytearray(m//8)
-+        for i in range(0, n):
-             offset = i*self.record_size
-             b0, b1 = struct.unpack("=LL", inmem[offset:offset+8])
--            for k in xrange(0, 4):
-+            for k in range(0, 4):
-                 h = murmur_hash3_32(b0, b1, k)
-                 h = int(h * (m / float(0xFFFFFFFF)))
--                outmem[h/8] |= (1 << (h%8))
-+                outmem[h//8] |= (1 << (h%8))
-         inmem.close()
--        # Convert bytearray to str, for Python 2.6 compatibility.
--        self.outfile.write(str(outmem))
-+        # Convert bytearray to bytes, for Python 3 compatibility.
-+        self.outfile.write(bytes(outmem))
- 
- if __name__ == '__main__':
-     import sys
-@@ -110,7 +110,7 @@ def generate(self):
-     parser = argparse.ArgumentParser(description='filter')
-     parser.add_argument('infile', type=argparse.FileType('r'),
-                         help='input file')
--    parser.add_argument('outfile', type=argparse.FileType('w'),
-+    parser.add_argument('outfile', type=argparse.FileType('wb'),
-                         help='output file')
-     parser.add_argument('record_size', type=int,
-                         help='record size')
-diff --git a/tools/sortlm.py b/tools/sortlm.py
-index a0dd8fe..40f0837 100644
---- a/tools/sortlm.py
-+++ b/tools/sortlm.py
-@@ -40,10 +40,10 @@ def __init__(self, infile, output_prefix):
-         self.__min_cost = 0.0
- 
-     def read(self):
--        print "reading N-grams"
-+        print("reading N-grams")
-         self.__read_tries()
-         self.__read_ngrams()
--        print "min cost = %lf" % self.__min_cost
-+        print("min cost = %lf" % self.__min_cost)
- 
-     def __read_tries(self):
-         while True:
-@@ -58,7 +58,7 @@ def __read_tries(self):
-             line = self.__infile.readline()
-             if line == "":
-                 break
--            line = line.strip()
-+            line = line.strip('\n')
-             if line == "":
-                 break
-             match = self.__ngram_line_regex.match(line)
-@@ -89,7 +89,7 @@ def __read_ngrams(self):
-                 line = self.__infile.readline()
-                 if line == "":
-                     break
--                line = line.strip()
-+                line = line.strip('\n')
-                 if line == "":
-                     break
-                 match = self.__ngram_line_regex.match(line)
-@@ -125,14 +125,11 @@ def __write_ngrams(self):
-         def quantize(cost, min_cost):
-             return max(0, min(65535, int(cost * 65535 / min_cost)))
- 
--        def cmp_header(a, b):
--            return cmp(a[0], b[0])
--
--        print "writing 1-gram file"
-+        print("writing 1-gram file")
-         unigram_offsets = {}
-         unigram_file = open("%s.1gram" % self.__output_prefix, "wb")
-         offset = 0
--        for ids, value in sorted(self.__ngram_entries[0].iteritems()):
-+        for ids, value in sorted(self.__ngram_entries[0].items()):
-             unigram_offsets[ids[0]] = offset
-             s = struct.pack("=HHH",
-                             quantize(value[0], self.__min_cost),
-@@ -143,13 +140,13 @@ def cmp_header(a, b):
-             offset += 1
-         unigram_file.close()
- 
--        print "writing 2-gram file"
-+        print("writing 2-gram file")
-         bigram_offsets = {}
-         bigram_file = open("%s.2gram" % self.__output_prefix, "wb")
-         keys = self.__ngram_entries[1].keys()
-         items = [(struct.pack("=LL", ids[1], unigram_offsets[ids[0]]), ids) for ids in keys]
-         offset = 0
--        for header, ids in sorted(items, cmp=cmp_header):
-+        for header, ids in sorted(items, key=lambda x: x[0]):
-             value = self.__ngram_entries[1][ids]
-             bigram_offsets[ids] = offset
-             s = struct.pack("=HH",
-@@ -160,11 +157,11 @@ def cmp_header(a, b):
-         bigram_file.close()
- 
-         if len(self.__ngram_entries[2]) > 0:
--            print "writing 3-gram file"
-+            print("writing 3-gram file")
-             trigram_file = open("%s.3gram" % self.__output_prefix, "wb")
-             keys = self.__ngram_entries[2].keys()
-             items = [(struct.pack("=LL", ids[2], bigram_offsets[(ids[0], ids[1])]), ids) for ids in keys]
--            for header, ids in sorted(items, cmp=cmp_header):
-+            for header, ids in sorted(items, key=lambda x: x[0]):
-                 value = self.__ngram_entries[2][ids]
-                 s = struct.pack("=H",
-                                 quantize(value[0], self.__min_cost))
diff --git a/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild b/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild
deleted file mode 100644
index cde6550d2441..000000000000
--- a/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-any-r1
-
-DESCRIPTION="Language model data for libkkc"
-HOMEPAGE="https://github.com/ueno/libkkc"
-SRC_URI="https://github.com/ueno/${PN%-*}/releases/download/v0.3.5/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')"
-
-PATCHES=( "${FILESDIR}"/${PN}-python3.patch )
diff --git a/app-i18n/libkkc-data/metadata.xml b/app-i18n/libkkc-data/metadata.xml
deleted file mode 100644
index 6853c12be89d..000000000000
--- a/app-i18n/libkkc-data/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>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ueno/libkkc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-i18n/libkkc/Manifest b/app-i18n/libkkc/Manifest
deleted file mode 100644
index 0b335e9eac0f..000000000000
--- a/app-i18n/libkkc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libkkc-marisa-glib.patch 714 BLAKE2B dfe2c8c3f3fe0de904678a21890d99c548d08c2f79c9a2a5bf54080529336a0afe9ad1ef613fd1c2a2b692a3de6edd17e15a7434cb4c677660c035badc303c2a SHA512 b5f5f2158329b883709242bf7415fe91d1637f1ae6f8620ddf1b872b652292bda237b92ff1c0595168f3eb2b9b33cb48e33f02bcebd031081f2dff0b8493509f
-DIST libkkc-0.3.5_p20210928.tar.gz 390022 BLAKE2B d4b44861f4526f4f9581cd9343fb4d8dd361967cce153ab92fb9a3334502bd583081d4ae3c01879c94aee710d347c23d3372c0deb20d711b9792eb73a28b3beb SHA512 9c46ef09242ecf3d4864fff0e7df7ff362d71c382bb92fe1e784bd20bdf737dc6a528b57342093ab4415926b15f09db44a10b8088d1c9f8b9cebcb428aaee8c6
-EBUILD libkkc-0.3.5_p20210928.ebuild 1506 BLAKE2B 85943d5a57b656474f946449f72c2d9b8ad6c99345d2740bf34da023a4c8733e31a8e059c0bdb54bb7b44f701faacdc018b72c36b2697331596dc33c5fcd0c71 SHA512 f846510ef6de2f1cf2673ac62f9a068bac1b7fe27a38d2d7e8097c06526d45e507e0102022f6607b9a4e2d40b6929bed94ccedb755f9c93a06694c49449804ff
-EBUILD libkkc-9999.ebuild 1455 BLAKE2B 1fb2ca9fb62b7146abe5da7e49f11463824b5b83c8f8d99b572183d017b62e3983793c4745ffc1d8e45f82b7dcf8e76414644943d9d627c8032da3f68f1eec2b SHA512 52bd3c5257d28ae2a62b1c873d9f378cffa7007c77fe168a8decc7ed817d8eeca7fef5b82f82bdf431046290f1075c0432bbc936fc332aaf465412d02dcb3d46
-MISC metadata.xml 459 BLAKE2B fa914e2f676f1065402ac064f0253cd3ad5a97af0fa72f333bf312b033a1d8c7c40be04f6d9626afa4ad0b67c5cdfd6da4c75e0d261cfafcbe5010e8c994e4ec SHA512 8483db54ccb88733e541875f527350354c48bb258b7a7eb18f8d092eb4a1906082072178ad9ab371039dfc8dd2b2727dc4c269e5089f648a0bd03a3ee1233bf7
diff --git a/app-i18n/libkkc/files/libkkc-marisa-glib.patch b/app-i18n/libkkc/files/libkkc-marisa-glib.patch
deleted file mode 100644
index 2b013d4f5779..000000000000
--- a/app-i18n/libkkc/files/libkkc-marisa-glib.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/libkkc/Makefile.am
-+++ b/libkkc/Makefile.am
-@@ -49,7 +49,11 @@
- 	-DLOCALEDIR=\"$(datadir)/locale\"	\
- 	-I $(top_srcdir)			\
- 	$(NULL)
--libkkc_la_LIBADD = $(LIBKKC_LIBS) $(top_builddir)/marisa-glib/libmarisa-glib.la
-+libkkc_la_LIBADD =					\
-+	$(LIBKKC_LIBS)					\
-+	$(top_builddir)/marisa-glib/libmarisa-glib.la	\
-+	$(MARISA_GLIB_STATIC_DEPENDENCIES)		\
-+	$(NULL)
- libkkc_la_LDFLAGS =							\
- 	$(CODE_COVERAGE_LDFLAGS)					\
- 	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"	\
-@@ -66,7 +70,6 @@
- libkkc_internals_la_LIBADD =			\
- 	$(libkkc_la_LIBADD)			\
- 	$(libkkc_la_OBJECTS)			\
--	$(MARISA_GLIB_STATIC_DEPENDENCIES)	\
- 	$(NULL)
- libkkc_internals_la_LDFLAGS =			\
- 	$(CODE_COVERAGE_LDFLAGS)		\
diff --git a/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild b/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild
deleted file mode 100644
index fec5bceb750c..000000000000
--- a/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools python-any-r1 vala
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/ueno/libkkc"
-elif [[ "${PV}" == *_p* ]]; then
-	inherit vcs-snapshot
-
-	EGIT_COMMIT="cdcaf4dceaf273bfe7b018a4a651a92f786c6ec6"
-fi
-
-DESCRIPTION="Japanese Kana Kanji conversion input method library"
-HOMEPAGE="https://github.com/ueno/libkkc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-elif [[ "${PV}" == *_p* ]]; then
-	SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls static-libs"
-
-RDEPEND="app-i18n/libkkc-data
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	dev-libs/marisa
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
-	$(vala_depend)
-	dev-libs/gobject-introspection
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch )
-
-python_check_deps() {
-	has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	vala_src_prepare
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild
deleted file mode 100644
index cbad641cc798..000000000000
--- a/app-i18n/libkkc/libkkc-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools python-any-r1 vala
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/ueno/libkkc"
-elif [[ "${PV}" == *_p* ]]; then
-	inherit vcs-snapshot
-
-	EGIT_COMMIT=""
-fi
-
-DESCRIPTION="Japanese Kana Kanji conversion input method library"
-HOMEPAGE="https://github.com/ueno/libkkc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-elif [[ "${PV}" == *_p* ]]; then
-	SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls static-libs"
-
-RDEPEND="app-i18n/linkkc-data
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	dev-libs/marisa
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
-	$(vala_depend)
-	dev-libs/gobject-introspection
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch )
-
-python_check_deps() {
-	has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	vala_src_prepare
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/app-i18n/libkkc/metadata.xml b/app-i18n/libkkc/metadata.xml
deleted file mode 100644
index 6686fae672e1..000000000000
--- a/app-i18n/libkkc/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>arfrever.fta@gmail.com</email>
-		<name>Arfrever Frehtes Taifersar Arahesis</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ueno/libkkc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest
deleted file mode 100644
index ee81b2e94cbe..000000000000
--- a/app-i18n/sunpinyin-data/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST dict.utf8-20131214.tar.bz2 674512 BLAKE2B b5e1756b52e8b4fd7839d4a72004b7ddc789986899cc626341f13b702ee1e0b54780c992b2988289bdbe7ff979f3243efc1b5a5e04a0529b9a3f6b327a49faef SHA512 adaf52a27c6afdeb950912845f3fcb7a6799f997d50a2892ceecf76ed13e3644407338d734832c2ce4b09bce11fec4731774f1eb2dd4c30bea5490555915bd5b
-DIST lm_sc.3gm.arpa-20140820.tar.bz2 36623028 BLAKE2B 9456c51dbba59e5d20a1bdd9b06f0ef863c77eb7651287b45f143e6919aedf46ea81ca4da5c037c4b9775c19e68849720cb0e1b3db4cc9dd8df84832ac2eba6a SHA512 ea3ede62eb993c4d21ca7cf339635f4686493a0cefd57df4a31f00a001e67502a13ff9612ff667b941b82b47de00be9f3c9689677d04195a7ef8716bac087519
-EBUILD sunpinyin-data-20140820.ebuild 1120 BLAKE2B 5e0fe189975aff78dd8c1aa060dd38410ec3bbf48c9fc69afe25cdcf1ef564ddece901625f5ffe613851d3bb36c81a9dad3912d2817380d5a35ee3fbc2373c86 SHA512 095437b862ae66316c108134e60aaee8cd952b053e23eacbb96f52d0feb470e87b92b9f15618001263af1093576162da536e2d0945ed33449c27abc6edcbb294
-MISC metadata.xml 329 BLAKE2B e8af2229536f58bd5a36e51afd60c63ef56bf4d02002e90fa7cd9b97681a610cd669bd1c83ee48b441a9167903511faff140197ea51ccbafb85f8323ba6e5642 SHA512 f79be60ea988b1a0db4b8c2b84e47a078717eced5c456919ab588828b14a7d503d17d051650ab86cb17d77b6d671c7ed0720f848b4125074866966493a8cdec0
diff --git a/app-i18n/sunpinyin-data/metadata.xml b/app-i18n/sunpinyin-data/metadata.xml
deleted file mode 100644
index c458036026f6..000000000000
--- a/app-i18n/sunpinyin-data/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>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">sunpinyin/open-gram</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
deleted file mode 100644
index c2bcae4866a7..000000000000
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2013-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit edo
-
-DICT_VERSION="20131214"
-LM_VERSION="${PV}"
-
-DESCRIPTION="Data sets for SunPinyin"
-HOMEPAGE="https://github.com/sunpinyin/open-gram"
-SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
-	mirror://sourceforge/open-gram/lm_sc.3gm.arpa-${LM_VERSION}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE=""
-
-# https://github.com/sunpinyin/sunpinyin/commit/0fff1e78d9a409205e025736286838721a2ccbf8
-BDEPEND=">=app-i18n/sunpinyin-2.0.4_pre20140819192400"
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	default
-	mkdir "${S}" || die
-	mv "${WORKDIR}"/dict.utf8 "${S}" || die
-	mv "${WORKDIR}"/lm_sc.3gm.arpa "${S}" || die
-}
-
-src_compile() {
-	# lm_sc.t3g
-	edo slmpack lm_sc.3gm.arpa dict.utf8 lm_sc.3gm
-	edo slmthread lm_sc.3gm lm_sc.t3g.orig
-	edo tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g
-	# lexicon3
-	edo genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin
-}
-
-src_install() {
-	insinto /usr/share/${PN/-data}
-	doins lm_sc.t3g pydict_sc.bin
-}
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
deleted file mode 100644
index 20ded3e63d1c..000000000000
--- a/app-i18n/sunpinyin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
-EBUILD sunpinyin-2.0.4_pre20200306162733.ebuild 1603 BLAKE2B 9f459f133b0a5864ee1ba9678b3e1465345c9007d0349ecf51c83c29ac4b1511e2aa66078775aec81d2d321833a78bbdb66cbaff4e101bdb2fd54655a991c980 SHA512 0835bfb61388595386aa9d5d10dd7acae5a04d299d9b0867fb7f2a216e00eaf8dbb1d18fba4c2367de4c7e4e771fe1aa0b33397918221af2c1fa3f87972de69d
-MISC metadata.xml 329 BLAKE2B ae12dbfefc0d959e096722bb38250c1100ef684d340a2c35012ca4700cd3498e04cdd7f42028b51587d2202a419de9513af1a5cce4aac7ccca206dd302cdd5da SHA512 bb572b7fa4623dfdf63f15be02449479fa4de2557cec4896d743c5e5f1ecbcb98544fabba0111f4e6544fafca95a1b82bfd819e74a4f4543fb2e7b0f3fdc1858
diff --git a/app-i18n/sunpinyin/metadata.xml b/app-i18n/sunpinyin/metadata.xml
deleted file mode 100644
index de8f4d24515d..000000000000
--- a/app-i18n/sunpinyin/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>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">sunpinyin/sunpinyin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
deleted file mode 100644
index ada55c754c6c..000000000000
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit python-any-r1 scons-utils toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
-elif [[ "${PV}" == *_pre* ]]; then
-	SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
-fi
-
-DESCRIPTION="Statistical Language Model (SLM) based Chinese input method library"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
-	SRC_URI="https://github.com/sunpinyin/${PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="https://github.com/sunpinyin/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="|| ( CDDL LGPL-2.1 )"
-SLOT="0/3"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE=""
-
-BDEPEND="dev-lang/perl
-	virtual/pkgconfig"
-DEPEND="dev-db/sqlite:3
-	virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-if [[ "${PV}" == *_pre* ]]; then
-	S="${WORKDIR}/${PN}-${SUNPINYIN_GIT_REVISION}"
-elif [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-src_prepare() {
-	default
-	sed -e "/^docdir =/s:/sunpinyin:/${PF}:" -i SConstruct || die
-
-	# https://github.com/sunpinyin/sunpinyin/issues/109
-	sed -e "/^Requires: sqlite3$/s/^Requires:/Requires.private:/" -i sunpinyin-2.0.pc.in || die
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_compile() {
-	escons \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	escons --install-sandbox="${D}" install
-}
diff --git a/app-i18n/xsunpinyin/Manifest b/app-i18n/xsunpinyin/Manifest
deleted file mode 100644
index c03c36670070..000000000000
--- a/app-i18n/xsunpinyin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
-EBUILD xsunpinyin-2.0.4_pre20200306162733.ebuild 1936 BLAKE2B 6e507b1540616bbd5d87e6d1c3deffd060c75e4ab75645d459e1840b000b0c092e4ec298db7d44ca17c297a131d1a5d66dd41fd017c4e803bbe4fc47e4677cf9 SHA512 1ff0c9405ff9b24dc3a3fda59b214a54ab4d37ed06313b4aea9b7067bc51ce3cc4ac6d1c22ffec3a52bc8ad41f094bcdee500af5146bf0e3b96c7a813ad7db4d
-MISC metadata.xml 319 BLAKE2B e966c669b50788c09ccd6de3f5b51746dac53d811a11d37f4454e4ddef02b133842eac2dfedd255555866b1cbbfe4d57cb496c251fdd3a8955b9071d488c4283 SHA512 104788170ec22eb2401da9d90a5ed00afa7fecfe1748fa2538cd15dd46edaecb9fcaae18fc1b6c41980d3a0c5770785f616f02e6717386821ef6eee02ad384b2
diff --git a/app-i18n/xsunpinyin/metadata.xml b/app-i18n/xsunpinyin/metadata.xml
deleted file mode 100644
index e9f122857cf4..000000000000
--- a/app-i18n/xsunpinyin/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>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">sunpinyin/sunpinyin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
deleted file mode 100644
index 3a4878507e31..000000000000
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit python-any-r1 scons-utils toolchain-funcs
-
-MY_PN="sunpinyin"
-MY_P="${MY_PN}-${PV}"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
-elif [[ "${PV}" == *_pre* ]]; then
-	SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
-fi
-
-DESCRIPTION="Standalone XIM server for SunPinyin"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
-	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${MY_P}.tar.gz"
-else
-	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/v${PV/_/-}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( CDDL LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="~app-i18n/sunpinyin-${PV}
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/pango"
-RDEPEND="${DEPEND}
-	app-i18n/sunpinyin-data"
-
-if [[ "${PV}" == *_pre* ]]; then
-	S="${WORKDIR}/${MY_PN}-${SUNPINYIN_GIT_REVISION}"
-elif [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/${MY_PN}-${PV/_/-}"
-fi
-
-src_prepare() {
-	default
-
-	# https://github.com/sunpinyin/sunpinyin/pull/101
-	sed -e "/^[[:space:]]*print /s/print \(.*\)/print(\1)/" -i wrapper/xim/SConstruct || die
-
-	# https://github.com/sunpinyin/sunpinyin/issues/110
-	sed -e "s/^\( *\)('CXX', 'CXX'),/&\n\1('AR', 'AR'),\n\1('RANLIB', 'RANLIB'),/" -i wrapper/xim/SConstruct || die
-
-	# https://github.com/sunpinyin/sunpinyin/issues/114
-	sed -e "/^#include <iconv\.h>$/d" -i wrapper/xim/xim.c || die
-}
-
-src_configure() {
-	tc-export AR CC CXX RANLIB
-}
-
-src_compile() {
-	escons -C wrapper/xim \
-		--prefix="${EPREFIX}/usr"
-}
-
-src_install() {
-	escons -C wrapper/xim --install-sandbox="${D}" install
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index dadc0ddd4d29..f20220badb2d 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/glimpse/Manifest b/app-misc/glimpse/Manifest
deleted file mode 100644
index 4b5580f40008..000000000000
--- a/app-misc/glimpse/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX glimpse-4.18.6-makefile.patch 1048 BLAKE2B e937f045dec826e5660ba4f38e4f6c9dd05ee4cd71b5b9044d5c9f24c22d5ad91745d526638b2daebf29dc8ae5b0fafe0c30a3f13a46193185805be7e61a730a SHA512 568b0cc6f52d8ce79e5ad552a302a814162072b85f1a3b7bd2b00bf18ae2d7526429f68f6910d9fb91ddcde43387a2778f9f61ed3f86f0fb533b69946cfef0b7
-DIST glimpse-4.18.6.tar.gz 812595 BLAKE2B 427ab2523236d9aa04ad789d001d5234483842f4d8d812a01b7cf2adc9354917da2e95df7b88917d8c0a282c7aab67bfd2cfbb87a6600a31fe6b07b6936137c9 SHA512 884daf2057f46bbe29ad2c3e9000e18a3fcc5101abdcb5193dcf66e5da650e2528a6d2cef05ab4176243f381ba03f533cba989cad329697808d97a61f1b42d3a
-EBUILD glimpse-4.18.6-r1.ebuild 1426 BLAKE2B 131003ede44ee69c3b8bb3d60467f75c8e58f7b7a65406cfedf67ead7e08d51c2dad62289c22024d4b6c54ab75a6e9ea7e86fe8a8c6c465a267428b84f2baa67 SHA512 a719ebb0e5bd8d9e1564a0e1cda70c1c97475646304fa64cd2dfe405129f47849256042b47ab2f1bb00cfc094b592cd547bb22eaa49c659bf399e6d3ded39531
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch b/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch
deleted file mode 100644
index a6f3b430d62b..000000000000
--- a/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/Makefile.in	2006-03-10 20:42:12.000000000 -0500
-+++ b/Makefile.in.new	2010-08-12 21:12:41.000000000 -0400
-@@ -52,7 +52,7 @@
- PROGAGREP	= agrep/agrep
- OPTIMIZEFLAGS   = -O2
- INCLUDEFLAGS    = -I$(INDEXDIR) -I$(AGREPDIR) -I$(TEMPLATEDIR)/include
--CFLAGS          = $(INCLUDEFLAGS) $(DEFS)
-+CFLAGS          = $(INCLUDEFLAGS) $(DEFS) $(OPTIMIZEFLAGS)
- 
- OBJS		= get_filename.o \
- 		get_index.o \
-@@ -78,7 +78,7 @@
- 		$(INDEXDIR)/memlook.c \
- 		$(INDEXDIR)/io.c
- 
--all:	build-sub @TARGET@
-+all:	build-sub
- Sall:		$(PROG) $(PROGSERVER) $(PROGINDEX) 
- agrep:		$(PROGAGREP)
- NOTSall:	$(NOTSPROG) $(NOTSPROGSERVER)
-@@ -87,6 +87,7 @@
- 	for d in $(SUBDIRS) ; do \
- 		( cd $$d; $(MAKE) ); \
- 	done
-+	$(MAKE) @TARGET@
- 
- # Check target
- 
-@@ -105,11 +106,11 @@
- 
- install-man:
- 	for d in $(MANUAL) ; do \
--		$(INSTALL_MAN) $$d $(mandir) ; \
-+		$(INSTALL_MAN) $$d $(mandir)/man1/ ; \
- 	done
- 
- installdirs:	mkinstalldirs
--	$(srcdir)/mkinstalldirs $(bindir) $(mandir)
-+	$(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1/
- 
- clean:
- 	for d in $(SUBDIRS); do \
diff --git a/app-misc/glimpse/glimpse-4.18.6-r1.ebuild b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
deleted file mode 100644
index 7f8a98ea0ad9..000000000000
--- a/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A index/query system to search a large set of files quickly"
-HOMEPAGE="http://webglimpse.net/"
-SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static"
-
-RDEPEND="!dev-libs/tre
-	!dev-ruby/amatch
-	!app-text/agrep"
-
-PATCHES=( "${FILESDIR}/${PN}-4.18.6-makefile.patch" )
-
-src_prepare() {
-	sed -i \
-		-e "s:CC=.*:CC=$(tc-getCC):" \
-		-e 's:-O3 -fomit-frame-pointer:$(OPTIMIZEFLAGS):' \
-		dynfilters/Makefile.in \
-		|| die "removing -O3 failed"
-	sed -i \
-		-e '/^CFLAGS/s:$: $(OPTIMIZEFLAGS):' \
-		{agrep,compress,index}/Makefile.in \
-		libtemplate/{template,util}/Makefile.in \
-		|| die "inserting OPTIMIZEFLAGS failed"
-	sed -i \
-		-e 's:$(mandir):&/man1/:' \
-		agrep/Makefile.in \
-		|| die "adding man1 to man install dir failed"
-
-	sed -i \
-		-e '/^LDFLAGS/d' \
-		{agrep,compress,index}/Makefile.in \
-		|| die "LDFLAGS sed failed"
-
-	default
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	default
-}
-
-src_compile() {
-	# The OPTIMIZEFLAGS variable is our own, patched in...
-	emake OPTIMIZEFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	# The build system is buggy; we get sandbox violations without this.
-	emake prefix="${ED}/usr" install
-}
diff --git a/app-misc/glimpse/metadata.xml b/app-misc/glimpse/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/app-misc/glimpse/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-portage/Manifest.gz b/app-portage/Manifest.gz
index 7b5688b0a9ad..b496c638054c 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/distpatch/Manifest b/app-portage/distpatch/Manifest
deleted file mode 100644
index 452bc453ab2a..000000000000
--- a/app-portage/distpatch/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX distpatch-python3-support.patch 15542 BLAKE2B bd0e0ca9d1c77c0ddcfa254f723488ce44002258988854b5a4d911e6d919d93653d07a66f43dec63ede94d914ea98e72e8fba4f7f2510e2bae23f75447cb71ae SHA512 1384cbe023f8cbf6dd67990c1a2bc6b80c9ef9a19082e76353dc3079dbdd4e2e330b344e7292cece4587e1dccabba58fdeb4aa1cadaf2425fe143fec223c23ee
-DIST distpatch-0.1.2.tar.gz 19998 BLAKE2B 1ede140e1b427df8f35011a025dc81b614c1a372668e41a26bbd02a3ab084b97c504a5de8e288a9d16d75439d0e3393ac13ef8cf49d55620babcee79fd137699 SHA512 f4dd08fd69a5b2030e0b912c1153994bcc03f40af65fff185231a220c110d0e7b5a4acf402d116e9dbfef86b13d17036ca563d0fefd89bc62809e1ecc9acf1ed
-EBUILD distpatch-0.1.2-r2.ebuild 601 BLAKE2B a7ad57cb018e1fe77f182952bee188c269b3cccd927390eb0db83bc31d6ba2f4746901c7392f52b24431eff585253612c4923c2efe9ede809d79a9c9536a6987 SHA512 9e84e5650d8f6100d7cbc797748bd979483762573de8f9201d6ec50aa128bd32f7487b53d0b8eb98c3ce6f94042e9e2fdda4c1dde729e465c78d4c5a0736ab85
-MISC metadata.xml 420 BLAKE2B e05b176a6adc97ddb6dc1c0a5e6d74ec7c182ac5888e58dd25be263eef5c9300e17b87100e0d487c79a535f24ac9cc9937aac77b31bbb79e6e2b95e640ff7507 SHA512 10b011f430228cd515514e944a96e9e8c3da4f1c1afb0b7a1bc9ec8b16bb009ea71d42729e6124af6b335e0413308834964b1f748cc4c44fff6edf2256a0b9a0
diff --git a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
deleted file mode 100644
index dbc1ab1b44d9..000000000000
--- a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Distfile Patching Support for Gentoo Linux (tools)"
-HOMEPAGE="https://github.com/rafaelmartins/distpatch"
-SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=( "${FILESDIR}/${PN}-python3-support.patch" )
-
-RDEPEND="
-	>=dev-util/diffball-1.0.1
-	dev-python/snakeoil[${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1.8.3[${PYTHON_USEDEP}]"
diff --git a/app-portage/distpatch/files/distpatch-python3-support.patch b/app-portage/distpatch/files/distpatch-python3-support.patch
deleted file mode 100644
index eec335633d77..000000000000
--- a/app-portage/distpatch/files/distpatch-python3-support.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 0274956acf4479b7346ac441fe09f2e56d575c47 Mon Sep 17 00:00:00 2001
-From: "Rafael G. Martins" <rafael@rafaelmartins.eng.br>
-Date: Wed, 26 Feb 2020 18:22:06 +0100
-Subject: [PATCH] python3 support
-
----
- distdiffer           | 46 ++++++++++++++++++++++----------------------
- distpatch/chksums.py | 12 ++++++------
- distpatch/deltadb.py |  4 ++--
- distpatch/diff.py    | 12 ++++++------
- distpatch/package.py |  6 +++---
- distpatch/patch.py   |  4 ++--
- distpatch/stats.py   |  6 +++---
- distpatcher          | 32 +++++++++++++++---------------
- distpatchq           | 28 +++++++++++++--------------
- 9 files changed, 75 insertions(+), 75 deletions(-)
-
-diff --git a/distdiffer b/distdiffer
-index a2b933d..6975b5c 100755
---- a/distdiffer
-+++ b/distdiffer
-@@ -73,39 +73,39 @@ def main():
-         return
- 
-     if args.verbose:
--        print '>>> Starting distdiffer ...\n'
-+        print('>>> Starting distdiffer ...\n')
- 
-     for package in packages:
-         if args.verbose:
--            print '>>> Package: %s' % package
-+            print('>>> Package: %s' % package)
-         pkg = Package(db)
-         try:
-             pkg.diff(package)
--        except Exception, err:
--            print >> sys.stderr, str(err)
-+        except Exception as err:
-+            print(str(err), file=sys.stderr)
-         if args.verbose:
--            print '    >>> Versions:'
-+            print('    >>> Versions:')
-             for cpv in pkg.ebuilds:
--                print '        %s' % cpv
--            print '    >>> Deltas:'
-+                print('        %s' % cpv)
-+            print('    >>> Deltas:')
-             if len(pkg.diffs) == 0:
--                print '        None\n'
-+                print('        None\n')
-             else:
-                 for diff in pkg.diffs:
--                    print '        %s -> %s' % (diff.src.fname,
--                                                diff.dest.fname)
-+                    print('        %s -> %s' % (diff.src.fname,
-+                                                diff.dest.fname))
-         if len(pkg.diffs) == 0:
-             continue
-         if args.verbose:
--            print '    >>> Fetching distfiles:'
-+            print('    >>> Fetching distfiles:')
-         try:
-             pkg.fetch_distfiles()
--        except Exception, err:
--            print >> sys.stderr, str(err)
--            print
-+        except Exception as err:
-+            print(str(err), file=sys.stderr)
-+            print()
-             continue
-         if args.verbose:
--            print '    >>> Generating deltas:'
-+            print('    >>> Generating deltas:')
-         for diff in pkg.diffs:
-             if args.verbose:
-                 sys.stdout.write('        %s -> %s ... ' % (diff.src.fname,
-@@ -116,20 +116,20 @@ def main():
-                               not args.no_compress, args.force)
-             except DiffExists:
-                 if args.verbose:
--                    print 'up2date!'
--                    print '            %s' % os.path.basename(diff.diff_file)
--            except Exception, err:
-+                    print('up2date!')
-+                    print('            %s' % os.path.basename(diff.diff_file))
-+            except Exception as err:
-                 if args.verbose:
--                    print 'failed!'
--                    print '            %s: %s' % (err.__class__.__name__, str(err))
-+                    print('failed!')
-+                    print('            %s: %s' % (err.__class__.__name__, str(err)))
-             else:
-                 if args.verbose:
--                    print 'done!'
--                    print '            %s' % os.path.basename(diff.diff_file)
-+                    print('done!')
-+                    print('            %s' % os.path.basename(diff.diff_file))
-                 db.add(diff.dbrecord)
-             diff.cleanup()
-         if args.verbose:
--            print
-+            print()
- 
- if __name__ == '__main__':
-     main()
-diff --git a/distpatch/chksums.py b/distpatch/chksums.py
-index 808dc59..d3dffab 100644
---- a/distpatch/chksums.py
-+++ b/distpatch/chksums.py
-@@ -26,16 +26,16 @@ class ChksumValue(object):
-         self._handler = get_handler(algorithm)
- 
-     def to_str(self):
--        if isinstance(self.value, basestring):
-+        if isinstance(self.value, str):
-             return self.value
--        elif isinstance(self.value, long):
-+        elif isinstance(self.value, int):
-             return self._handler.long2str(self.value)
-         raise ChksumException('Invalid value: %s' % self.value)
- 
-     def to_long(self):
--        if isinstance(self.value, long):
-+        if isinstance(self.value, int):
-             return self.value
--        elif isinstance(self.value, basestring):
-+        elif isinstance(self.value, str):
-             return self._handler.str2long(self.value)
-         raise ChksumException('Invalid value: %s' % self.value)
- 
-@@ -69,11 +69,11 @@ class Chksum(object):
-                 raise ChksumException('File not found: %s' % fname)
- 
-             values = get_chksums(fname, *self.algorithms)
--            chksums = zip(self.algorithms, values)
-+            chksums = list(zip(self.algorithms, values))
- 
-         # if provided checksums, use them
-         else:
--            chksums = chksums.items()
-+            chksums = list(chksums.items())
- 
-         # validate checksums, and set attributes
-         tmp_algorithms = list(self.algorithms)
-diff --git a/distpatch/deltadb.py b/distpatch/deltadb.py
-index 77d8c21..345077d 100644
---- a/distpatch/deltadb.py
-+++ b/distpatch/deltadb.py
-@@ -40,7 +40,7 @@ import os
- 
- from collections import OrderedDict
- from fcntl import lockf, LOCK_EX, LOCK_UN
--from itertools import izip
-+
- from shutil import rmtree
- from snakeoil.chksum import get_handler
- from snakeoil.fileutils import AtomicWriteFile
-@@ -171,7 +171,7 @@ class DeltaDB(list):
-         pieces = line.split()
-         chksums = OrderedDict()
-         uchksums = OrderedDict()
--        for key, value in izip(pieces[::2], pieces[1::2]):
-+        for key, value in zip(pieces[::2], pieces[1::2]):
-             key = key.lower()[:]
-             mykey = key[0] == 'u' and key[1:] or key
-             myvalue = get_handler(mykey).str2long(value.strip())
-diff --git a/distpatch/diff.py b/distpatch/diff.py
-index d5818f1..eeaf8a6 100644
---- a/distpatch/diff.py
-+++ b/distpatch/diff.py
-@@ -37,11 +37,11 @@ class DiffUnsupported(Exception):
- 
- 
- _supported_formats = [
--    u'.tar',
--    u'.tar.gz', u'.tgz', u'.gz',
--    u'.tar.bz2', u'.tbz2', u'.bz2',
--    u'.tar.xz', u'.xz',
--    u'.tar.lzma', u'.ĺzma',
-+    '.tar',
-+    '.tar.gz', '.tgz', '.gz',
-+    '.tar.bz2', '.tbz2', '.bz2',
-+    '.tar.xz', '.xz',
-+    '.tar.lzma', '.ĺzma',
- ]
- 
- 
-@@ -152,7 +152,7 @@ class Diff(object):
-         try:
-             patch = Patch(self.dbrecord)
-             patch.reconstruct(output_dir, tmp_dir, False)
--        except PatchException, err:
-+        except PatchException as err:
-             if clean_sources:
-                 os.unlink(self.diff_file)
-             raise DiffException('Delta reconstruction failed: %s' % str(err))
-diff --git a/distpatch/package.py b/distpatch/package.py
-index 553fc18..3c834cc 100644
---- a/distpatch/package.py
-+++ b/distpatch/package.py
-@@ -35,17 +35,17 @@ class Package(object):
-         diffs = []
-         taken = {}
-         for ebuild_id in range(len(self.ebuilds) - 1):
--            cpvs = self.ebuilds.keys()
-+            cpvs = list(self.ebuilds.keys())
-             src_cpv = cpvs[ebuild_id]
-             dest_cpv = cpvs[ebuild_id + 1]
-             src_ebuild = self.ebuilds[src_cpv]
-             dest_ebuild = self.ebuilds[dest_cpv]
--            for src_distfile in src_ebuild.src_uri_map.keys():
-+            for src_distfile in list(src_ebuild.src_uri_map.keys()):
-                 avg_distfile = None
-                 avg_ebuild = None
-                 max_avg = 0.0
-                 avgs = {}
--                for dest_distfile in dest_ebuild.src_uri_map.keys():
-+                for dest_distfile in list(dest_ebuild.src_uri_map.keys()):
-                     prefix = ''
-                     suffix = ''
-                     for i in range(min(len(src_distfile), len(dest_distfile))):
-diff --git a/distpatch/patch.py b/distpatch/patch.py
-index c210a5e..83eb3d6 100644
---- a/distpatch/patch.py
-+++ b/distpatch/patch.py
-@@ -14,7 +14,7 @@ import portage
- import posixpath
- import re
- 
--from itertools import izip
-+
- from portage.package.ebuild.fetch import fetch
- from shutil import move
- from subprocess import call
-@@ -96,7 +96,7 @@ class Patch(object):
-         if self.src != DeltaDBFile(src):
-             raise PatchException('Bad checksum for source: %s' % \
-                                  self.src.fname)
--        for delta, delta_record in izip(deltas, self.dbrecords):
-+        for delta, delta_record in zip(deltas, self.dbrecords):
-             if delta_record.delta != DeltaDBFile(delta):
-                 raise PatchException('Bad checksum for delta: %s' % \
-                                      delta_record.delta.fname)
-diff --git a/distpatch/stats.py b/distpatch/stats.py
-index 187f926..7716e07 100644
---- a/distpatch/stats.py
-+++ b/distpatch/stats.py
-@@ -48,7 +48,7 @@ class Stats(object):
-             delta = float(record.delta.chksums['size'])
-             dest = float(record.dest.chksums['size'])
-             ratio.append(100 - ((delta / dest) * 100))
--        pyplot.plot(range(1, len(ratio) + 1), sorted(ratio))
-+        pyplot.plot(list(range(1, len(ratio) + 1)), sorted(ratio))
-         pyplot.axes()
-         pyplot.xlabel('Deltas (total: %i)' % len(ratio))
-         pyplot.ylabel('Percentage of savings (for compressed files)')
-@@ -60,6 +60,6 @@ class Stats(object):
-         for record in self.deltadb:
-             dest.append(int(record.dest.chksums['size']))
-             delta.append(int(record.delta.chksums['size']))
--        pyplot.plot(range(len(dest)), dest)
--        pyplot.plot(range(len(delta)), delta)
-+        pyplot.plot(list(range(len(dest))), dest)
-+        pyplot.plot(list(range(len(delta))), delta)
-         pyplot.show()
-diff --git a/distpatcher b/distpatcher
-index 05980e2..984e4c2 100755
---- a/distpatcher
-+++ b/distpatcher
-@@ -69,35 +69,35 @@ def main():
-         return
- 
-     if args.verbose:
--        print '>>> Starting distpatcher ...\n'
-+        print('>>> Starting distpatcher ...\n')
- 
-     for cpv in cpv_list:
-         if args.verbose:
-             if args.distfile:
--                print '>>> Distfile: %s' % cpv
-+                print('>>> Distfile: %s' % cpv)
-             else:
--                print '>>> CPV: %s' % cpv
-+                print('>>> CPV: %s' % cpv)
-         pkg = Package(db)
-         if args.distfile:
-             pkg.patch_distfile(cpv, args.output_dir)
-         else:
-             pkg.patch(cpv, args.output_dir)
-         if args.verbose:
--            print '    >>> Deltas:'
-+            print('    >>> Deltas:')
-             if len(pkg.patches) == 0:
--                print '        None\n'
-+                print('        None\n')
-             else:
-                 for patch in pkg.patches:
--                    print '        %s' % '\n            -> '.join(
--                        [i.delta.fname for i in patch.dbrecords])
-+                    print('        %s' % '\n            -> '.join(
-+                        [i.delta.fname for i in patch.dbrecords]))
-         if len(pkg.patches) == 0:
-             continue
-         if args.verbose:
--            print '    >>> Fetching deltas:'
-+            print('    >>> Fetching deltas:')
-         for patch in pkg.patches:
-             patch.fetch_deltas(args.root_url, args.input_dir)
-         if args.verbose:
--            print '    >>> Reconstructing distfiles:'
-+            print('    >>> Reconstructing distfiles:')
-         for patch in pkg.patches:
-             if args.verbose:
-                 sys.stdout.write('        %s ... ' % '\n            -> '.join(
-@@ -106,17 +106,17 @@ def main():
-             try:
-                 patch.reconstruct(args.input_dir, args.output_dir,
-                                   not args.no_compress)
--            except PatchException, err:
-+            except PatchException as err:
-                 if args.verbose:
--                    print 'failed!'
--                    print '            %s' % str(err)
-+                    print('failed!')
-+                    print('            %s' % str(err))
-             else:
-                 if args.verbose:
--                    print 'done!'
--                    print '            %s' % \
--                          os.path.basename(patch.dest.fname)
-+                    print('done!')
-+                    print('            %s' % \
-+                          os.path.basename(patch.dest.fname))
-         if args.verbose:
--            print
-+            print()
- 
- if __name__ == '__main__':
-     main()
-diff --git a/distpatchq b/distpatchq
-index 902f6c0..e6bcebe 100755
---- a/distpatchq
-+++ b/distpatchq
-@@ -48,7 +48,7 @@ def delta_fetch_size(pkg, filename, distfiles_dir=None, deltas_dir=None):
-     except OSError:
-         pass
-     if filename in distfiles:
--        print 0
-+        print(0)
-         return 0
-     pkg.patch_distfile(filename, distfiles_dir)
-     if len(pkg.patches) == 0:
-@@ -62,7 +62,7 @@ def delta_fetch_size(pkg, filename, distfiles_dir=None, deltas_dir=None):
-         if dbrecord.delta.fname in deltas:
-             continue
-         fetch_size += int(dbrecord.delta.chksums.size.to_long())
--    print fetch_size
-+    print(fetch_size)
- 
- 
- def delta_verify_checksums(pkg, filename, distfiles_dir=None):
-@@ -96,20 +96,20 @@ def delta_verify_checksums(pkg, filename, distfiles_dir=None):
-     return 0 if dest_record.uchksums == _Chksum(usrc) else 4
- 
- 
--commands = sorted(i for i in globals().keys() if not i.startswith('_'))
-+commands = sorted(i for i in list(globals().keys()) if not i.startswith('_'))
- 
- 
- def usage(argv):
--    print '>>> distpatch information query tool'
--    print '>>> Usage: distpatchq <command> [<option> ...]'
--    print
--    print 'Available commands:'
-+    print('>>> distpatch information query tool')
-+    print('>>> Usage: distpatchq <command> [<option> ...]')
-+    print()
-+    print('Available commands:')
-     for name in commands:
-         function = globals()[name]
-         if function.__doc__ is None:
--            print '   ' + name
--            print '      MISSING DOCUMENTATION!'
--            print
-+            print('   ' + name)
-+            print('      MISSING DOCUMENTATION!')
-+            print()
-             continue
- 
-         # introspect command arguments
-@@ -120,14 +120,14 @@ def usage(argv):
-             args.append('<%s>' % arg)
-         for arg in spec.args[-opt:]:
-             args.append('[%s]' % arg)
--        print '   ' + name + ' ' + ' '.join(args)
-+        print('   ' + name + ' ' + ' '.join(args))
-         lines = function.__doc__.split('\n')
-         if len(argv) > 1:
-             for line in lines:
--                print "      " + line.strip()
-+                print("      " + line.strip())
- 
-     if len(argv) == 1:
--        print "\nRun distpatchq with --help for info"
-+        print("\nRun distpatchq with --help for info")
- 
- if __name__ == '__main__':
-     if len(_sys.argv) < 2:
-@@ -150,7 +150,7 @@ if __name__ == '__main__':
-     req = len(spec.args) - opt
- 
-     if len(_sys.argv) < req + 2:
--        print "Invalid number of arguments!!"
-+        print("Invalid number of arguments!!")
-         _sys.exit(2)
- 
-     dbfile = _sys.argv[2]
--- 
-2.21.0
-
diff --git a/app-portage/distpatch/metadata.xml b/app-portage/distpatch/metadata.xml
deleted file mode 100644
index 55a41ba18371..000000000000
--- a/app-portage/distpatch/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-needed -->
-  <stabilize-allarches/>
-  <upstream>
-    <maintainer status="active">
-      <email>rafaelmartins@gentoo.org</email>
-      <name>Rafael G. Martins</name>
-    </maintainer>
-    <remote-id type="github">rafaelmartins/distpatch</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 20df84ac0d10..c8c82d75f764 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/agrep/Manifest b/app-text/agrep/Manifest
deleted file mode 100644
index 71c324b2f03b..000000000000
--- a/app-text/agrep/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST agrep-2.04.tar.Z 62351 BLAKE2B 7856c172aff84d188cc38e83fc8eece63f66cb30a8a1753ec5f54d98fbc47a33d9caad69520c531c66f2958c762f26312032ee7a9e4e4040709f4d366fdbf4a9 SHA512 4524250c2c0b309243fd245efb04fa8d867f45a92b0d977b29d2ff8ec99586c16c35b8a78cdd5aeb4c529fe0270c8b1220d6ddf52d947e6181a5f04bdbed5aee
-EBUILD agrep-2.04-r2.ebuild 771 BLAKE2B fc5f0c0b084856f8cfae2a8808623aa2b640cc3978c84e622458188aa8fc5ce2f890c17002182f0c6a84529d91dcdb84ff9016407707ceb704561c4465875f8b SHA512 013fe2447495566f531f8dba96d6189dda0e0ce41f7e46fddad96158ae0ae0e03399a6b4f9ffb53fa26a1097b5662440d7c1162a4510107f8ab88ea78966ff1d
-MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/app-text/agrep/agrep-2.04-r2.ebuild b/app-text/agrep/agrep-2.04-r2.ebuild
deleted file mode 100644
index 522dc26f746a..000000000000
--- a/app-text/agrep/agrep-2.04-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A tool for the fast searching of text allowing for errors in the search pattern"
-HOMEPAGE="ftp://ftp.cs.arizona.edu/agrep/README"
-SRC_URI="ftp://ftp.cs.arizona.edu/${PN}/${P}.tar.Z"
-
-LICENSE="AGREP"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris"
-
-RDEPEND="
-	!dev-libs/tre
-	!dev-ruby/amatch
-	!app-misc/glimpse"
-
-DOCS=( README agrep.algorithms agrep.chronicle COPYRIGHT contribution.list )
-
-src_compile() {
-	sed -i \
-		-e 's/^CFLAGS.*//' \
-		-e "s:\$(CFLAGS):& \$(LDFLAGS) :" Makefile || die
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/app-text/agrep/metadata.xml b/app-text/agrep/metadata.xml
deleted file mode 100644
index 6258504e5133..000000000000
--- a/app-text/agrep/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>shell-tools@gentoo.org</email>
-		<name>Gentoo Shell Tools Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-text/q-text-as-data/Manifest b/app-text/q-text-as-data/Manifest
deleted file mode 100644
index b1b7346659c0..000000000000
--- a/app-text/q-text-as-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST q-2.0.10.tar.gz 218824 BLAKE2B 91f6485d94325768d7bfd32223d379cd90f3ade3760e44c859ec25aee6aeb73c943b3dedbf56b378222f6bc094faf160d86dcacab3dd0ce5ebf93230ca61696d SHA512 ab503a555380b6d17500972256db5e9eb19066d7a1f480091e777681d694746d6d7743254f3839bfd2f08697308aee8cea60e4583a0b1a4d93caf522342f25b2
-EBUILD q-text-as-data-2.0.10.ebuild 1099 BLAKE2B c1b9568351faef21e244e49be0d1815ac69ac7b2f0a8e2b633420f20a32293e5cfacd7dab0a277461560c29fcc96c8b54380ee33d38b33479c2ebf4891ec78ba SHA512 66c61af048a7b42c588842f3990e69f5a1b8da9dfd67662b9f2afb1be0d8cb8896ebf3aca275cdcf385fd6729d682ae0227217716e588ecad3928f366ce7f88c
-MISC metadata.xml 301 BLAKE2B 9206a1875198ac00a604f34c30430ae8480c45cf53a1e66e030c1e08320258473dfcb08769d794f6790f6e7f8e7aa5d9fb7ce1b93a8d658c98ceb60d8b10d8f1 SHA512 4ca26288c6dcf39c6c0df5023f83f6891e8f54e243c2098834b3fbf26bfafbcfd52180b80a715c5b590bb2c034866519f4668d8076b393959a19967297b59e64
diff --git a/app-text/q-text-as-data/metadata.xml b/app-text/q-text-as-data/metadata.xml
deleted file mode 100644
index c75df62c69dc..000000000000
--- a/app-text/q-text-as-data/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>robbat2@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">harelba/q</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
deleted file mode 100644
index 9a0608dbb926..000000000000
--- a/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-r1
-
-DESCRIPTION="A CLI tool that allows direct execution of SQL-like queries on text"
-HOMEPAGE="http://harelba.github.io/q/"
-MY_P="q-${PV}"
-SRC_URI="https://github.com/harelba/q/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Upstream is wrong
-# http://harelba.github.io/q/#requirements
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	: # Do not use the Makefile
-}
-
-q_install() {
-	python_newexe bin/q.py q-text-as-data
-}
-
-src_install() {
-	python_foreach_impl q_install
-	newdoc bin/.qrc dot-qrc
-	dodoc doc/*
-}
-
-pkg_postinst() {
-	einfo "On Gentoo, the 'q' binary is most often provided by app-portage/portage-utils;"
-	einfo "Thus, this tool is install as 'q-text-as-data' rather than 'q'."
-}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 4dca7808f296..a8d51cb2c4ae 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/pydiction/Manifest b/app-vim/pydiction/Manifest
deleted file mode 100644
index 46b49686dea0..000000000000
--- a/app-vim/pydiction/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pydiction-1.2.3.zip 475441 BLAKE2B 709d4de30d21ff0ba27b5b0c11276731bdef03d754c1799857ceba7edbea4fc0640714cda4103ed58878b02cc00feed5d6b08df2647139fa84910cf92db51dea SHA512 91da1d8a9be89095072724d77bdcaa342fbd5479f5027d7ed7bb2d4a382c7385b2b7fae91c1cd94605232b34a96370a86096e3c32db0d106cbcda2a82f409922
-EBUILD pydiction-1.2.3-r2.ebuild 930 BLAKE2B 8903b8d82bb5a7ffcd508808b9297dfaa011fd7e50049153092c288ce33ab7ac4afd8d85190ba893e4b082e46b9a3cdbcac118dc8fd9bf8c3d241e630b73e457 SHA512 ba4f70f5d3a45acf8df4d865bdf660703c0bbd022d02345bfafe50f948e4ac53a67744c24e6d2f0db6e221abb92796066a3399e96e96961dd8b2c22a641c3b36
-MISC metadata.xml 362 BLAKE2B f923ae39469c511f31b26afb4db8fd9fbf4ae25007fbe5776acf2459ee7d535563dd08f55d68e2c01c6e40143253983123261a28cc9bfa043b63c1002bc015f8 SHA512 d6ecd571cf7f106a46faaf308deeff1862599fcd46d57ec744d4bec8072902b9578fb7d17e75191c3b5ee2dde28d846ac93a66f99cfa440a3fd93aa0a57a2233
diff --git a/app-vim/pydiction/metadata.xml b/app-vim/pydiction/metadata.xml
deleted file mode 100644
index fe9fc85f6d19..000000000000
--- a/app-vim/pydiction/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>vim@gentoo.org</email>
-		<name>Gentoo Vim Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-vim/pydiction/pydiction-1.2.3-r2.ebuild b/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
deleted file mode 100644
index aea6beb9b9f0..000000000000
--- a/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit vim-plugin python-r1
-
-DESCRIPTION="vim plugin: tab-complete your Python code"
-HOMEPAGE="https://rkulla.github.io/pydiction/"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
-S="${WORKDIR}/${PN}-master"
-
-LICENSE="vim"
-KEYWORDS="amd64 ppc ppc64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="app-arch/unzip"
-RDEPEND="${PYTHON_DEPS}"
-
-src_install() {
-	# Rename pydiction script.
-	mv "${PN}.py" "${PN}" || die
-
-	# We're going to remove those files in a second
-	# otherwise they're installed by Portage.
-	local pyfiles=( complete-dict "${PN}" )
-	insinto "/usr/share/${P}"
-	doins complete-dict
-
-	# pydiction is treated a singular script that lives on its own.
-	python_foreach_impl python_doscript "${PN}"
-	rm -v "${pyfiles[@]}" || die
-
-	vim-plugin_src_install
-}
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
deleted file mode 100644
index 787ac5a3ec32..000000000000
--- a/app-vim/vimoutliner/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
-EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1252 BLAKE2B 44f517be04e1c185975c54aa81e50de9eddd02df83d025d42a6fd97d3041fab8223ab981bed2f1090fb93798a8257c760ab8cf2191fa41c16a9823af41d3a721 SHA512 2d7c60a8bc274e0877584b9e5ee0c6388f9a3004dac76963e119eebfc2cc6a375c13dcb82d70bbb7a3bea600e9d1113676acf8150eabcc7590b9ab1c015d8614
-MISC metadata.xml 362 BLAKE2B b11e339607d5236d7d6cbd6c3dd5428a0e028b6f2fdbb4b616b61aab78198440c11c9a474e51f862d9065c6ceac2549e8f5e1c9b0e3b630cf27fabb9491b9b59 SHA512 652c9c68e44b4d3bd9def19905ca7495492524180d800523fcea1d4370212b43aec2c963636dc1d00aad244ce040e54a5329e27b6d51c2fb1ceb8cb461e9595d
diff --git a/app-vim/vimoutliner/metadata.xml b/app-vim/vimoutliner/metadata.xml
deleted file mode 100644
index 9b88a985b4a7..000000000000
--- a/app-vim/vimoutliner/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vim@gentoo.org</email>
-		<name>Gentoo Vim Project</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">vimoutliner/vimoutliner</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
deleted file mode 100644
index 93677fff20fd..000000000000
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit python-single-r1 vim-plugin vcs-snapshot
-
-# Commit Date: 1 Mar 2018
-COMMIT="4f12628247940d98eedd594961695dc504261058"
-
-DESCRIPTION="Vim plugin for easy and fast outlining"
-HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
-SRC_URI="https://github.com/vimoutliner/vimoutliner/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ia64 ppc sparc x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-VIM_PLUGIN_HELPFILES="vimoutliner"
-VIM_PLUGIN_MESSAGES="filetype"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/autopep8[${PYTHON_USEDEP}]')
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( README CHANGELOG TODO.otl )
-
-src_prepare() {
-	default
-
-	sed -e '1s:^:#!/usr/bin/python\n:' \
-		-i "${S}"/vimoutliner/scripts/otl2latex/otl2latex.py || die
-	find "${S}" -type f -exec chmod a+r {} \; || die
-}
-
-src_compile() {
-	local pyscript _pyscript
-	for pyscript in $(find "${S}" -type f -name \*.py); do
-		_pyscript=$(basename "${pyscript}")
-		[[ ${_pyscript} == "otl.py" ]] && continue
-		2to3 -w -n --no-diffs "${pyscript}" >& /dev/null || die
-		python_fix_shebang -f -q "${pyscript}"
-	done
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 58decd5709cc..0eb1802a3014 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index ae3feb38f646..1ebddcf1a782 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,7 +1,9 @@
 AUX muParser-2.3-export-cmake.patch 13652 BLAKE2B a83680f1214a6941a89f28fbdf0789fd665ca002d4259ffb802cc32c37f83a48f45b601c52640a9e0bcb39b4e4869317ccb71898b557f9b19caaf5b3ee11ecec SHA512 a126199cb71e8160f78bd3872fe252ce7cc77f99185af8922750bee85b0a60a2657a688913a9df897d15c76bd0446d16371cf792f334b96e101e07d84856bb6b
 DIST muParser-2.3.2.tar.gz 103979 BLAKE2B f892b4d440a1b7326be27aa0a2b703ccafc02de5e881ef4780e8907688cf7905284f3e5f5855ad2596683f1dad309d287ebae527d917ebf5e0dad045551df7de SHA512 8ef5c8b3834da3995a782b7364a4eb4197fb706bee4cadabe5511d2a9cf2912c3db6de422a91eff7f9690f8c9c355b9900335e940749d5c243cb732ac1992aef
 DIST muParser-2.3.3.tar.gz 112100 BLAKE2B 79a0a29781596f114aeea9756a5a2141eed19857c08d0a32093353eb049f8b179af577cbd07747d2b8093e448714397b47f36c68e54bbce22386f5ec06365bda SHA512 f7e01c83f6ffe71e240653c47fdb8f3152d7fdf61b5997a3c717dec50d0175065c4fc4241ec95fb35b60b968c5c965a820009163ebe84f0fa57d64b3a23226b4
+DIST muParser-2.3.4.tar.gz 112693 BLAKE2B 860c24d45140ad4339efcd5f5c221454c051565a1362907fd01499cfda0ef3c304333507c4d9c43644dac63e5fb4963fef6e3a2e565febf1a80807e0a0242c87 SHA512 5226fd666eaf3ff7e661bbf72e60114d0ceed10491ffa4ed2dd34cd669c6c21c037eff0388402d6b9d60b0a5a27b03ca35153e0c048328abc75dfd1eaf38ceca
 EBUILD muParser-2.3.2-r1.ebuild 760 BLAKE2B d4ef7432bf604bf572d0288def30e751e1e2e1cd805eae9e11661a7d4bd944b21f7feecca2f52210cc55e9816df971e97a7827f85e1bdba01979b8a1ade5700d SHA512 8b1f3729601ce7c4b1b0c9dac06d89ecbe8f81792190b5cf3bab1ea15e398c3e5317738a5d292a59dcafc43f6782f2d78f348143bb09eb1c75ef38ac32c246ab
 EBUILD muParser-2.3.3-r1.ebuild 843 BLAKE2B 395991416aaec947b2bccb86fdc7a4d0471078c8e46daa0120717bb4b608ed63346b3fd5f967862612c8b84cadb392dcdf677ef450f523b5aef559e504db2733 SHA512 402b6fb135656b387784bb3f4ddc15a93d75db612b715a778388914b564cdba2e6e3d9e81ca042d9a22502ef5170234c28adb13b9d8ea86b754a923ed1e9b736
 EBUILD muParser-2.3.3.ebuild 802 BLAKE2B f1d5b921fe5324a899c5ba4059f5fec3b957cee7072492c771026e043ed9e72c9b93c222708f334712f0fe8dedb470daa2604aef16537523f3cfb843c801d355 SHA512 0565d02b64d673345491379efaceee394d0455170c5287d89de23d12b956060a769ccbd062a8dabd48d4687e8dba474c8b25d5775383a0a623f6fe5f3b1b10b2
+EBUILD muParser-2.3.4.ebuild 756 BLAKE2B e441034b1f10fac4c4899feec1a6331b27c7f4052a82192ba491417121d45ccede74e116731c91adeafed19d2be9076156d1b27ef98cd7ebbdda1f7655a51079 SHA512 10a51aafb0c9ec081b1e88b47cfd5028523e1567bd599a13e34b29fe2aaa782994cc733bd4fef0948963ebe9f0c489f0079313dfbded615edd150e78cebe775e
 MISC metadata.xml 709 BLAKE2B 5d0cd5c59febf43e133ac02eda2385845011a02875825df5db2cfc357302e4a012d79ff569a3eb68259e43bd9b369534c9ce54762724c4ce7eb8879f61566f70 SHA512 97adfbf9f21d728f340d653c51f6f4e4937963418a910cd45b53bd3a0b99305b0f5736aed2f8b0facdd2de12c2df332f3def4d0ba6560e2ef31c9de1b58bc092
diff --git a/dev-cpp/muParser/muParser-2.3.4.ebuild b/dev-cpp/muParser/muParser-2.3.4.ebuild
new file mode 100644
index 000000000000..4dd7dfcdf406
--- /dev/null
+++ b/dev-cpp/muParser/muParser-2.3.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for parsing mathematical expressions"
+HOMEPAGE="https://beltoforion.de/en/muparser/"
+SRC_URI="https://github.com/beltoforion/muparser/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/muparser-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc openmp test wchar"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_WIDE_CHAR=$(usex wchar)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_compile test
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/dev-cpp/pstreams/Manifest b/dev-cpp/pstreams/Manifest
deleted file mode 100644
index bd5fb4b8a34e..000000000000
--- a/dev-cpp/pstreams/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pstreams-1.0.1.tar.gz 66188 BLAKE2B 937b9ae833dcace9f0f44dbac6907d5c73c5757f604ea96835c0ddf0ec9abd5fa4f40a1c01872a47fd0bcdc094f90215da6b7f80f261172f93f7b5233b60a5cb SHA512 279f758a4aeba124227e3de07e202f6cd838bfca4f34829a446f2f20cf426bd404f28960b881f810b5f2038e3946d38174ca09e6a07d5dacc0501f41746245e6
-DIST pstreams-docs-1.0.1.tar.gz 178382 BLAKE2B dd44e4c6acd83dfc6896145e77408d7c23150c1156e477ccb4052341e041d82163d0ee3e8069ea5fda9033617c3a1162fc2068835d089f6ce7614477c2e3e58b SHA512 e645cb3d1c20cc0c717d03aa24e500489452d0880af0feddcf234e713878159b22a891ec04a66f0aad6988e71418a224a4ba66064e6a83578ecf957d9af167e2
-EBUILD pstreams-1.0.1.ebuild 777 BLAKE2B c23cdf54bbfbc0ae0e223037257562a0260a283fc155018b5c4940546e44184fe5aa2a6abe66357d324f102c5b12d06199b2afac1b376948149352e91bfed4ec SHA512 2c9046a4453063263709e7bfbdc47d1a120e1e5dbe2457b3ea704e06c89d47a1cd9cf0fc6d087e9ccc1c1288f435df922499d6699fcd4155f336a6efc4f4d3d5
-MISC metadata.xml 338 BLAKE2B 97ac4307fd02728e8bfbb47c6488b22c0717df23097bf461ec1acdc454b51e58c88ecfab2d797672e0e1c8659abf6bfe17f605f409d9a90a8f6fe8b42f92c1d5 SHA512 31a94ad5ed7f005dbbb06b6cbd0c5166ab7486b636b5fe2bd052086b3c7c6a4dc3b0119b846f7ab5a8064ad6d6fc7e71f1a81fa3119b0f7a103e7f4824e82d1e
diff --git a/dev-cpp/pstreams/metadata.xml b/dev-cpp/pstreams/metadata.xml
deleted file mode 100644
index cccd40057baf..000000000000
--- a/dev-cpp/pstreams/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>printing@gentoo.org</email>
-		<name>Gentoo Printing Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pstreams</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-cpp/pstreams/pstreams-1.0.1.ebuild b/dev-cpp/pstreams/pstreams-1.0.1.ebuild
deleted file mode 100644
index 9f2d12528d54..000000000000
--- a/dev-cpp/pstreams/pstreams-1.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ wrapper for the POSIX.2 functions popen(3) and pclose(3)"
-HOMEPAGE="http://pstreams.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${PN}-docs-${PV}.tar.gz )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="doc"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_compile() {
-	if use doc; then
-		doxygen -u || die
-		emake docs
-	fi
-}
-
-src_test() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		check
-}
-
-src_install() {
-	doheader pstream.h
-
-	dodoc AUTHORS ChangeLog README
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/${PN}-docs-${PV}/*
-	fi
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 01508cfdcc2a..50b803202650 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/cpp-driver/Manifest b/dev-db/cpp-driver/Manifest
deleted file mode 100644
index 98f8ca43eba9..000000000000
--- a/dev-db/cpp-driver/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cpp-driver-2.11.0.tar.gz 9392387 BLAKE2B 37d6063b33cd9821faa15d0eb8cb7e87d3a57a58384cf60dd623f94c9246250ba00c3303d9e0ca586f5455d449c9749058e9ed5dcb06d736591329b252bc1ffc SHA512 c8ccb3b10895c3e8f3bcf9543dff233a45c468b1b5e9c9c848d651b13c1b3f76cd0edd20fbff8e6e093767e1a2c8d360447496f1ef4370c1776d3fad28a9b3a3
-EBUILD cpp-driver-2.11.0.ebuild 552 BLAKE2B c7576df4a2f79e8052c6abd3d1236eaa731c9e6e5f5b68cec1d6533e93584e4addf5b8639e4b03f7de2da3adfe64fe27196fe51d4ca1844d4af293a67d4b9bac SHA512 60f4d050e118ad6aaf8d0dd579a9ad7b46cf446e246cc236969c763c1f544b8d89983530692e14bd82670e2c369ebe68e204dbfbbbee98521e13e907695b74d5
-MISC metadata.xml 480 BLAKE2B 94a9df31634afb1d8ac120b79bbd189e0fceaae596cedefa4da9aec35589e28e6f5b1e5540fd36b07bc114e6200589a7cb5071e0f5d3cb67bdac52b4d1a6cb81 SHA512 552ebb5f85c95c42577560ed7f42a666b9efe01120199be7cc339538cb1b497fbfaf7406b13cdef18ad55144c0046fc0bad318f6f1052fb7811b29e13dd8e11c
diff --git a/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild b/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild
deleted file mode 100644
index d9088c8dee8d..000000000000
--- a/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="DataStax C/C++ Driver for Cassandra"
-HOMEPAGE="https://datastax.github.io/cpp-driver/"
-SRC_URI="https://github.com/datastax/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND="
-	dev-libs/libuv:=
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DCASS_USE_OPENSSL=$(usex ssl) )
-	cmake_src_configure
-}
diff --git a/dev-db/cpp-driver/metadata.xml b/dev-db/cpp-driver/metadata.xml
deleted file mode 100644
index c66f9b3de0ce..000000000000
--- a/dev-db/cpp-driver/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>
-	<longdescription lang="en">
-		DataStax Cassandra C/C++ driver for Apache Cassandra or Scilla. 
-		This driver works exclusively with the Cassandra Query Language v3 
-		(CQL3) and Cassandra's native protocol.
-	</longdescription>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">datastax/cpp-driver</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index 54c4008f4099..fafa562c502f 100644
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
diff --git a/dev-erlang/riakc/Manifest b/dev-erlang/riakc/Manifest
deleted file mode 100644
index 679c3fc0218e..000000000000
--- a/dev-erlang/riakc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST riakc-2.4.2.tar.gz 273312 BLAKE2B 0428990472f99d8824299b4a100d00c328f97ce6a93c0460e30e11e7669453790d8d6804d066a69390da8a28ea9a7aed59a72887376fccfa008010db3faee439 SHA512 ec1712dfc2a3ec0dca237bb9050fc901bed4eddfe200b92ff878c1e37db4511bcb3b78c036e803ea0c81dfa4279022ce668288a4cecde51ef0afd0583cffb0a6
-EBUILD riakc-2.4.2.ebuild 708 BLAKE2B 5d1d0b88800ca4d62dc0a09ea85cba1e720aaed176fb882c229dceaefda0294a66e6fd8d14111e44c34f3ac72e65f78b8e292990bf7f537329591801e8c3ed70 SHA512 c553560fa9a64da87339b7f44f78bf08a367689c869c6818cb56fe74b1bc3fa5f5c66e79f909c1f5e7e3726efc2c0f6f184b69dc2bdbb3c596dfaa4863de6e6e
-MISC metadata.xml 257 BLAKE2B ec0e57a2f7e902e04008196a670dded59b89759fc5b227ebe028856a64701b091a8d338eb96502b970cd34d3ececc882a364c5ad4e1b76c40924d7817a4bb442 SHA512 2ad7b79e1aeed13d14a56dd2c8a0da5aca6cfeb1b7930aac03a4a2bfb13931725df3bb70d5f099495630ea7e37e770f624bf364fe6a60923196f02d8642a4e98
diff --git a/dev-erlang/riakc/metadata.xml b/dev-erlang/riakc/metadata.xml
deleted file mode 100644
index 3e94915e0204..000000000000
--- a/dev-erlang/riakc/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">basho/riak-erlang-client</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-erlang/riakc/riakc-2.4.2.ebuild b/dev-erlang/riakc/riakc-2.4.2.ebuild
deleted file mode 100644
index 511f7c788d79..000000000000
--- a/dev-erlang/riakc/riakc-2.4.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-MY_PN="riak-erlang-client"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Erlang clients for Riak"
-HOMEPAGE="https://github.com/basho/riak-erlang-client"
-SRC_URI="https://github.com/basho/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/riak_pb-2.1.4.2
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md RELNOTES.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	rebar_src_prepare
-	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
-	rm -r "${S}/priv" || die
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b22818f74cdb..5b3d75e506f3 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
deleted file mode 100644
index e1b5c70e3953..000000000000
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-AUX aws-sdk-cpp-1.8.105-remove_Werror_from_FLAGS.patch 1782 BLAKE2B c5434d3cc5ca2329ec67fd403741a2fcfdeee27b1c0450e077b1cb8a4c924b867f155034fd5581d7c1147ddbc3922e6b26686c167649b939d0b3938b93d351ae SHA512 69d99680e1a7a1c43a9e4fd04884a8d11542c931a95896faf59a35df1e669bfb3dcf8b8217dc263567d1b1036ffdacaa889982306bc1a404fe93722a110f948d
-AUX aws-sdk-cpp-1.8.160-disable_http_testing.patch 692 BLAKE2B a4c8af84357958b34f0f597e005d2906c62cfbdccf818275ee95e09140c6d79d720000737cd900a5ba81058f2ef0ceb45c091e3e6e76c385fb5757a75c5985bb SHA512 8e2604a83de3eb083da49ada6d692d8debf5288dd9b7846578d26158cc0ca1699329d3aac9fed73ef1e4a0d3caab264324acb26e7219948856ae40be7d4e8065
-AUX aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch 256 BLAKE2B 66653717a66f51d8403367b8471eee9022045ce5340a232c0bce9cb47fd5ce1ab58e097155048ec54d2fbdd072ebd9c9eeb63f7c9a194445c8833cffc224fa84 SHA512 2af8fbf593cd2bbd7acbdb18f994f18b516abe58a4bb9ee215a72932ec62e463c33e04733bc9be6a60539e1ac8a3beaf4b0611cf0fca97fea1eddbcaa9315e53
-AUX aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch 787 BLAKE2B c7a7a0bf1de4041b64e5afa2073fb426659a82a64b10bfaba05ae1dffd8a4819e073692992c49ed66493569dc33ca736c4a27dac2da07d1235be48cffddca16f SHA512 d3246dbbbf8e7598053933d949a1c43b5c5929049eea12aae0ef00182594aba5dea9a5b3ea22bf795d9ecd2f4a6880bc815b83ed4532c0bc94a901894704e73c
-AUX aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch 194 BLAKE2B 7f6d935c5dff0ebb0701003e6daaba0d174cb90c3f39dd6da7dbab5ac5660b4d9685e5a00cfe7977ecbab5f6d27ebb8b3ed05b839a2322a56fb813dda72e02e5 SHA512 7754c2c0a418b8af82129eaea26cea102aa3e529d40d4cecdec2ae5bbf3b7c05ae0dade1d44efd550a8d068db671d15cafb17ced049c430c1589c1cdf8c0ed92
-AUX aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch 192 BLAKE2B 10515a1e1693ee6b9948d14fbf7fc32369f4bc3cb6be700fd7eaae7fa910610d1c15fc9ef87318a6dc0e46c2a0205af759a56780c28f71c830627aa62a2588b3 SHA512 73ecd702f3c48ab28584dfeecdc75939a5bb7cad981145e75200f09c85ba7acd19a59f010f6952849385da9a0cd9f321907f61f60984d7d3d43b5e817437d0e0
-AUX aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch 1189 BLAKE2B 06e22f18204f52e85ad711f34ee592fdb1e307031fda5200890326b1ea53c2063cb9bf41f28958cce5a9882560ade1d8991e87d7bb01728ca538263ece289494 SHA512 138e71ca235d92ef0495b9442d32f622c2863f5c121064cc88b43caf422cadc32fa400d0b269f04cbba3c60b99da1fb0e218632c109a846610710f743f3eeb63
-AUX aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch 703 BLAKE2B 0e279260d96518f2bc37d2864f927db028e72b1053d382d13dfec92832e0a77ac406267b68ee7bda46d229bc0343d842dddb54ccd737f6270fd66f02d35c1d17 SHA512 27e3d293dab3663f2086cbc0c5d5f1396a6fea67762573c35bfee839f843f80fe1664a77ff7122bf79494710daf74ee2f9eef85d8c147b94c7642762c617482e
-AUX aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch 904 BLAKE2B 295c0c15811b6d2fbcb3ea450bc81160deed1812d2a41d8df4e831037c0084a083c3fa59132bd419c6d63798a53527493d8c3617452b9eed453a81d255ec45ba SHA512 5b3e062abec35fff84a651c71844c0d9ea2a4762f286114d968f2034998a18f72cd51bdd09cb70f5e3f2d51fd56feba2c79e04fe091ba55fd0d19822ee3ea3bb
-AUX aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch 3737 BLAKE2B b977ae06b5f4e2f8d2bcd4efc0e20ac003f5491d801a1a6da58758bf17ccbf107956cf1fb26fcfc03c3adccbc086e51e5bc36ff6ebda2166bce74f70bf544252 SHA512 342e65e170adef6b3dc5337fb2526cdf5d06bedd3bcadcc96860f4fd9aee6080b8f797c6694f605629de1b7d7b9e123169d843f2d6d27db35ba81cf30ab793e8
-AUX aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch 861 BLAKE2B e2853b580a3951bb2b611399162b7094fb1a9b72e965cab113737844d24cde45c32c690335829fca7cd5ee34b1aff77d370097a78891929eb9887964b954e9a8 SHA512 42b6711bcb02d36d741e3f9b79f249c6df28201ea5541814fea76b9e6bb54263a7437471591b5e081489d0d35892f70e2184a5c5c3eea5a286bbb5c3af27ac3a
-AUX aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch 777 BLAKE2B 7655be825103d59c0fece0f11c09b065baa7e4b4e15fcd50961b556aaffe91bb7e118ff32b19a1077e1c13a752580b6a624f0e4c6c7fab588c8bd7f2da068ca5 SHA512 99e11c9570d2aaf086317e7c82c45758a8e1ce6d4dbfe9ddc7c4de9a0843ac854e5f7192a3caf2915628b55e24ec7d4b4fa6f9656f08e344753bbc890952a168
-AUX aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch 1268 BLAKE2B d2bb69c98a0e90a9880962a6acb11392ba7e0610e1bedcc97cfe74cbf39fed61df24888987dc4fdb9e1b785f499fdd46e5216da24f2d081051b03e6143e84aa3 SHA512 4c09def5eddef31da4563eeeb6794af217a3badb841c8079d6caf4b9a63460b7a9fb60aa632ac4d4e622e435381705a410d698bc1d19087274612ba00db3474a
-AUX aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch 348 BLAKE2B 99321dd97a9888bab32e41797558c617410d228c64619f19a08052fabc2f9536a1bde1fcfb2232ed442ee788ef338c8cec1a46f25a74e91641d442b2e0189810 SHA512 5cfcfc0b9b13cfa57c5f28a3537a3208d0516fe6aa941ba91f90b294c5e7c95db9699430071c12db5040c3208af318eba16db68ecd2d6feb52ac1c41d2ac6005
-AUX aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch 1243 BLAKE2B f6ecdfae9a6380869f5082bd72d1ba463c052bed59c0fb754b569fa56b35bc8c67172c7669ee90492eacd6e8db50ec1a1374e3106758edfb3c8e6a6e26a9d7be SHA512 2ba7a617f4880cc632b75330afc2890bab3a0dfd0017904ac53c3bfe23535b85ee4228a79ce94c2d908d3a4e8bee6abab97836d15a59c42babdb67a6f9ee5eff
-AUX aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch 319 BLAKE2B ca9b1664bc74bb4aec09efdfd640deda357c5f10e28ed6a3716096067669643436c35b93db0cab6ac9ff0582d77c548aadddc33dde36fb5759921a93127035be SHA512 3cc6ada02f65d97a2351ea4e9700db7ebe532084cbae5934371685d9a424993cbf60e68e6b64aad0d389c9c8774602cd6132cec351e136b5de8249d00ad32023
-AUX aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch 850 BLAKE2B 9ba442243492283f95d92769541dfcd218120e94cc96d857b10380d9cd6adc876a4b3c962dbc5171776be9a02dd236ae220924be7a481f0793927c16709539c2 SHA512 8975a8ea5162a7253c2b2ce64b47848b5ae566eef95ce432df2e8046ef82b66a78ff292e0fefde07a0a128a864716abcf077a6270abb6314ba0c6bd15fc39f7f
-DIST aws-sdk-cpp-1.8.105.tar.gz 31880249 BLAKE2B 1a2eb972b716c656f45b8d1d12fc3e7280c171e4a19eb5431e320511365d305211e8567aa7fcc3e21f553ad5befda91829df6ccf60c23296d210d0c7347bb2a2 SHA512 a76da095718c8569c62597431d29a0a54c1a7f81c1825894f0f40b1a971a3e0b4f0813da4ac929612b9bb5f92501ee6a034436faa6eef678d936117765baab7e
-DIST aws-sdk-cpp-1.8.160.tar.gz 33282825 BLAKE2B 3c48edb5578d4450feeab94f9c44ec8222e2e7785d8f69d468b97cddc9bb503bb1648facdce85c2c90a73141c60a22aa6d1e29aeb4b8a904f8e926055f48124e SHA512 b71bed89d27361bf735907ad86908a3dcb952ff6ba9d6c2c04dd2ff6afded777b12ad2da79ba97744ef9ade6fa21a5ff4451f5b664bbab8bae4864fa4e0db073
-EBUILD aws-sdk-cpp-1.8.105.ebuild 9041 BLAKE2B 2ddb765354bd6014db3fd1314f24b1b38f74b2c67ed598f4ebe41850cfa234dd966764299d767a9dbfed13cd90139eb744b7a71b737cb3c0ba11999503555b38 SHA512 1222b81e1ccc19293caf7db0409afff062c48841be9d31f656c5f375d23e73a687672d425099f6b8ec821784472baf47e5fb4e133e6f07ed95cdfb53e689a184
-EBUILD aws-sdk-cpp-1.8.160.ebuild 9509 BLAKE2B 423af5155225aa77265566e0f1ee5b0c9f3573130c9bd4785796a7cb632c989f415ecb1dfabfe2e80d9e50e5157b3210253bc9872fd2542679b7aa4ca8e57fad SHA512 ae5839eca94771969a0bfb163ed8fe4ce7a5cd337529adeb11394b6c538207a04da5edf2d963c183f43c74b243ed1e54d379ce19ecdae35414777349b49d7e4d
-MISC metadata.xml 25699 BLAKE2B 4662acd176c98401cad6082878d3fd3ac5e0f05743df35271325fb87139f52fbf950542db97d3b252c57a4f93ec52f10e83fee7d6ce3ac2fcad940bb9dc9ee6b SHA512 dab97e400567d1b836ed8fcd59b2df0bc1502da4ace395695c77fa50712cb9649afe2bb8e985aaeae90d1119eecb3bfae2e42a7989bf639490305992280df483
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.105.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.105.ebuild
deleted file mode 100644
index 88c4f757a87c..000000000000
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.105.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="AWS SDK for C++"
-HOMEPAGE="https://aws.amazon.com/sdk-for-cpp/"
-SRC_URI="https://github.com/aws/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MODULES=(
-	access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media
-	cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs
-	eks elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events
-	forecast frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail
-	lookoutvision machinelearning macie managedblockchain marketplace mwaa networkmanager opsworks
-	organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3
-	sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract timestream transcribe
-	translate waf
-)
-
-IUSE="+http pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	http? ( net-misc/curl:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
-	>=dev-libs/aws-c-event-stream-0.2.5:=[static-libs=]
-	>=dev-libs/aws-checksums-0.1.10:=[static-libs=]
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-upgrade_android-build_build_and_test_android_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_ExtractBuildArgs_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_handle_release_notification_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_move_release_doc_to_models_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_build_3rdparty_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_build_example_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_dummy_web_server_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_endpoints_checker_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_gather_3rdparty_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_generate_sdks_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_renew_license_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_run_integration_tests_py-3.9.patch
-	"${FILESDIR}"/${P}-remove_Werror_from_FLAGS.patch
-)
-
-src_configure() {
-	local mybuildtargets="core"
-
-	for module in ${MODULES[@]}; do
-		if use ${module}; then
-			if [ "${module}" = "access-management" ] ; then
-				mybuildtargets+=";${module};accessanalyzer;acm;acm-pca;dataexchange;iam"
-				mybuildtargets+=";identity-management;identitystore;ram;sso;sso-admin;sso-oidc;sts"
-			elif [ "${module}" = "apigateway" ] ; then
-				mybuildtargets+=";${module};apigatewaymanagementapi;apigatewayv2"
-			elif [ "${module}" = "budgets" ] ; then
-				mybuildtargets+=";${module};ce;cur"
-			elif [ "${module}" = "cloud-desktop" ] ; then
-				mybuildtargets+=";appstream;workdocs;worklink;workmail;workmailmessageflow;workspaces"
-			elif [ "${module}" = "cloud-dev" ] ; then
-				mybuildtargets+=";cloud9;codeartifact;codebuild;codecommit;codedeploy;codeguruprofiler"
-				mybuildtargets+=";codeguru-reviewer;codepipeline;codestar;codestar-connections"
-				mybuildtargets+=";codestar-notifications;honeycode;xray"
-				if ! use "queues"; then
-					mybuildtargets+=";queues"
-				fi
-			elif [ "${module}" = "cloud-media" ] ; then
-				mybuildtargets+=";elastictranscoder;mediaconnect;mediaconvert;medialive;mediapackage"
-				mybuildtargets+=";mediapackage-vod;mediastore;mediastore-data;mediatailor"
-			elif [ "${module}" = "cloud-mobile" ] ; then
-				mybuildtargets+=";amplify;appsync;devicefarm;mobile;mobileanalytics;pinpoint"
-				mybuildtargets+=";pinpoint-email;sms-voice"
-				if ! use "sns"; then
-					mybuildtargets+=";sns"
-				fi
-			elif [ "${module}" = "cloudhsm" ] ; then
-				mybuildtargets+=";${module};cloudhsmv2"
-			elif [ "${module}" = "cloudsearch" ] ; then
-				mybuildtargets+=";${module};cloudsearchdomain"
-			elif [ "${module}" = "cloudwatch" ] ; then
-				mybuildtargets+=";application-insights;appmesh;auditmanager;cloudtrail;compute-optimizer"
-				mybuildtargets+=";detective;devops-guru;guardduty;health;inspector;logs;monitoring;synthetics"
-			elif [ "${module}" = "cognito" ] ; then
-				mybuildtargets+=";cognito-identity;cognito-idp;cognito-sync"
-			elif [ "${module}" = "dynamodb" ] ; then
-				mybuildtargets+=";${module};dax;dynamodbstreams"
-			elif [ "${module}" = "ec2" ] ; then
-				mybuildtargets+=";${module};autoscaling;autoscaling-plans;application-autoscaling"
-				mybuildtargets+=";ec2-instance-connect;elasticfilesystem;imagebuilder;savingsplans"
-			elif [ "${module}" = "ecr" ] ; then
-				mybuildtargets+=";${module};ecr-public"
-			elif [ "${module}" = "eks" ] ; then
-				mybuildtargets+=";${module};emr-containers"
-			elif [ "${module}" = "elasticloadbalancing" ] ; then
-				mybuildtargets+=";${module};elasticloadbalancingv2"
-			elif [ "${module}" = "email" ] ; then
-				mybuildtargets+=";${module};sesv2"
-			elif [ "${module}" = "events" ] ; then
-				mybuildtargets+=";${module};eventbridge"
-			elif [ "${module}" = "forecast" ] ; then
-				mybuildtargets+=";${module};forecastquery"
-			elif [ "${module}" = "iot" ] ; then
-				mybuildtargets+=";${module};greengrass;iot1click-devices;iot1click-projects"
-				mybuildtargets+=";iotanalytics;iot-data;iotevents;iotevents-data;iot-jobs-data"
-				mybuildtargets+=";iotsecuretunneling;iotsitewise;iotthingsgraph"
-			elif [ "${module}" = "kinesis" ] ; then
-				mybuildtargets+=";${module};firehose;ivs;kinesisanalytics;kinesisanalyticsv2"
-				mybuildtargets+=";kinesisvideo;kinesis-video-archived-media;kinesis-video-media"
-				mybuildtargets+=";kinesis-video-signaling"
-			elif [ "${module}" = "lex" ] ; then
-				mybuildtargets+=";${module};lex-models"
-			elif [ "${module}" = "macie" ] ; then
-				mybuildtargets+=";${module};macie2"
-			elif [ "${module}" = "marketplace" ] ; then
-				mybuildtargets+=";marketplacecommerceanalytics;marketplace-catalog"
-				mybuildtargets+=";marketplace-entitlement;meteringmarketplace;pricing"
-				mybuildtargets+=";servicecatalog-appregistry"
-			elif [ "${module}" = "opsworks" ] ; then
-				mybuildtargets+=";${module};opsworkscm"
-			elif [ "${module}" = "other" ] ; then
-				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;appflow;braket;clouddirectory"
-				mybuildtargets+=";comprehend;comprehendmedical;connect;connect-contact-lens"
-				mybuildtargets+=";connectparticipant;customer-profiles;datapipeline;databrew;datasync"
-				mybuildtargets+=";directconnect;discovery;dms;docdb;ds;dynamodb;gamelift;glue"
-				mybuildtargets+=";groundstation;healthlake;importexport;kafka;lakeformation"
-				mybuildtargets+=";migrationhub-config;mq;mturk-requester;neptune;quicksight;redshift"
-				mybuildtargets+=";robomaker;sdb;schemas;service-quotas;servicecatalog;servicediscovery"
-				mybuildtargets+=";signer;sms;snowball;ssm;states;storagegateway;support;swf"
-			elif [ "${module}" = "outposts" ] ; then
-				mybuildtargets+=";${module};s3outposts"
-			elif [ "${module}" = "personalize" ] ; then
-				mybuildtargets+=";${module};personalize-events;personalize-runtime"
-			elif [ "${module}" = "polly" ] ; then
-				mybuildtargets+=";${module};text-to-speech"
-			elif [ "${module}" = "qldb" ] ; then
-				mybuildtargets+=";${module};qldb-session"
-			elif [ "${module}" = "rds" ] ; then
-				mybuildtargets+=";${module};pi;rds-data"
-			elif [ "${module}" = "resource-groups" ] ; then
-				mybuildtargets+=";${module};resourcegroupstaggingapi"
-			elif [ "${module}" = "route53" ] ; then
-				mybuildtargets+=";${module};route53domains;route53resolver"
-			elif [ "${module}" = "s3" ] ; then
-				mybuildtargets+=";${module};athena;awstransfer;glacier;s3-encryption;s3control;transfer"
-			elif [ "${module}" = "sagemaker" ] ; then
-				mybuildtargets+=";${module};sagemaker-a2i-runtime;sagemaker-edge"
-				mybuildtargets+=";sagemaker-featurestore-runtime;sagemaker-runtime"
-			elif [ "${module}" = "timestream" ] ; then
-				mybuildtargets+=";timestream-query;timestream-write"
-			elif [ "${module}" = "transcribe" ] ; then
-				mybuildtargets+=";${module};transcribestreaming"
-			elif [ "${module}" = "waf" ] ; then
-				mybuildtargets+=";${module};fms;network-firewall;waf-regional;wafv2"
-			else
-				mybuildtargets+=";${module}"
-			fi
-		fi
-	done
-
-	local mycmakeargs=(
-		-DAUTORUN_UNIT_TESTS=$(usex test)
-		-DBUILD_DEPS=NO
-		-DBUILD_ONLY="${mybuildtargets}"
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DCPP_STANDARD=17
-		-DENABLE_RTTI=$(usex rtti)
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_UNITY_BUILD=$(usex unity-build)
-		-DNO_ENCRYPTION=$(usex !ssl)
-		-DNO_HTTP_CLIENT=$(usex !http)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.160.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.160.ebuild
deleted file mode 100644
index d1b0790ea76e..000000000000
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.160.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="AWS SDK for C++"
-HOMEPAGE="https://aws.amazon.com/sdk-for-cpp/"
-SRC_URI="https://github.com/aws/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MODULES=(
-	access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media
-	cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs
-	eks elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events
-	forecast frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail
-	lookoutvision machinelearning macie managedblockchain marketplace mwaa networkmanager opsworks
-	organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3
-	sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract timestream transcribe
-	translate waf wellarchitected
-)
-
-IUSE="+http pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	http? ( net-misc/curl:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	>=dev-libs/aws-c-common-0.5.2:=[static-libs=]
-	>=dev-libs/aws-c-event-stream-0.2.7:=[static-libs=]
-	>=dev-libs/aws-checksums-0.1.10:=[static-libs=]
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-upgrade_android-build_build_and_test_android_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_ExtractBuildArgs_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_handle_release_notification_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_move_release_doc_to_models_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_build_3rdparty_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_build_example_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_dummy_web_server_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_endpoints_checker_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_gather_3rdparty_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_generate_sdks_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_renew_license_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_run_integration_tests_py-3.9.patch
-	"${FILESDIR}"/${PN}-1.8.105-remove_Werror_from_FLAGS.patch
-	"${FILESDIR}"/${P}-disable_http_testing.patch
-)
-
-src_configure() {
-	local mybuildtargets="core"
-
-	for module in ${MODULES[@]}; do
-		if use ${module}; then
-			if [ "${module}" = "access-management" ] ; then
-				mybuildtargets+=";${module};accessanalyzer;acm;acm-pca;dataexchange;iam"
-				mybuildtargets+=";identity-management;identitystore;ram;sso;sso-admin;sso-oidc;sts"
-			elif [ "${module}" = "apigateway" ] ; then
-				mybuildtargets+=";${module};apigatewaymanagementapi;apigatewayv2"
-			elif [ "${module}" = "budgets" ] ; then
-				mybuildtargets+=";${module};ce;cur"
-			elif [ "${module}" = "cloud-desktop" ] ; then
-				mybuildtargets+=";appstream;workdocs;worklink;workmail;workmailmessageflow;workspaces"
-			elif [ "${module}" = "cloud-dev" ] ; then
-				mybuildtargets+=";cloud9;codeartifact;codebuild;codecommit;codedeploy;codeguruprofiler"
-				mybuildtargets+=";codeguru-reviewer;codepipeline;codestar;codestar-connections"
-				mybuildtargets+=";codestar-notifications;honeycode;xray"
-				if ! use "queues"; then
-					mybuildtargets+=";queues"
-				fi
-			elif [ "${module}" = "cloud-media" ] ; then
-				mybuildtargets+=";elastictranscoder;mediaconnect;mediaconvert;medialive;mediapackage"
-				mybuildtargets+=";mediapackage-vod;mediastore;mediastore-data;mediatailor"
-			elif [ "${module}" = "cloud-mobile" ] ; then
-				mybuildtargets+=";amplify;appsync;devicefarm;mobile;mobileanalytics;pinpoint"
-				mybuildtargets+=";pinpoint-email;sms-voice"
-				if ! use "sns"; then
-					mybuildtargets+=";sns"
-				fi
-			elif [ "${module}" = "cloudhsm" ] ; then
-				mybuildtargets+=";${module};cloudhsmv2"
-			elif [ "${module}" = "cloudsearch" ] ; then
-				mybuildtargets+=";${module};cloudsearchdomain"
-			elif [ "${module}" = "cloudwatch" ] ; then
-				mybuildtargets+=";application-insights;appmesh;auditmanager;cloudtrail;compute-optimizer"
-				mybuildtargets+=";detective;devops-guru;guardduty;health;inspector;logs;monitoring;synthetics"
-			elif [ "${module}" = "cognito" ] ; then
-				mybuildtargets+=";cognito-identity;cognito-idp;cognito-sync"
-			elif [ "${module}" = "dynamodb" ] ; then
-				mybuildtargets+=";${module};dax;dynamodbstreams"
-			elif [ "${module}" = "ec2" ] ; then
-				mybuildtargets+=";${module};autoscaling;autoscaling-plans;application-autoscaling"
-				mybuildtargets+=";ec2-instance-connect;elasticfilesystem;imagebuilder;savingsplans"
-			elif [ "${module}" = "ecr" ] ; then
-				mybuildtargets+=";${module};ecr-public"
-			elif [ "${module}" = "eks" ] ; then
-				mybuildtargets+=";${module};emr-containers"
-			elif [ "${module}" = "elasticloadbalancing" ] ; then
-				mybuildtargets+=";${module};elasticloadbalancingv2"
-			elif [ "${module}" = "email" ] ; then
-				mybuildtargets+=";${module};sesv2"
-			elif [ "${module}" = "events" ] ; then
-				mybuildtargets+=";${module};eventbridge"
-			elif [ "${module}" = "forecast" ] ; then
-				mybuildtargets+=";${module};forecastquery"
-			elif [ "${module}" = "iot" ] ; then
-				mybuildtargets+=";${module};greengrass;greengrassv2;iot1click-devices;iot1click-projects;iotanalytics"
-				mybuildtargets+=";iot-data;iotdeviceadvisor;iotevents;iotfleethub;iotevents-data;iot-jobs-data"
-				mybuildtargets+=";iotsecuretunneling;iotsitewise;iotthingsgraph;iotwireless"
-			elif [ "${module}" = "kinesis" ] ; then
-				mybuildtargets+=";${module};firehose;ivs;kinesisanalytics;kinesisanalyticsv2"
-				mybuildtargets+=";kinesisvideo;kinesis-video-archived-media;kinesis-video-media"
-				mybuildtargets+=";kinesis-video-signaling"
-			elif [ "${module}" = "lex" ] ; then
-				mybuildtargets+=";${module};lex-models;lexv2-models;lexv2-runtime"
-			elif [ "${module}" = "macie" ] ; then
-				mybuildtargets+=";${module};macie2"
-			elif [ "${module}" = "marketplace" ] ; then
-				mybuildtargets+=";marketplacecommerceanalytics;marketplace-catalog"
-				mybuildtargets+=";marketplace-entitlement;meteringmarketplace;pricing"
-				mybuildtargets+=";servicecatalog-appregistry"
-			elif [ "${module}" = "opsworks" ] ; then
-				mybuildtargets+=";${module};opsworkscm"
-			elif [ "${module}" = "other" ] ; then
-				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;appflow;appintegrations;braket;clouddirectory"
-				mybuildtargets+=";comprehend;comprehendmedical;connect;connect-contact-lens"
-				mybuildtargets+=";connectparticipant;customer-profiles;datapipeline;databrew;datasync"
-				mybuildtargets+=";directconnect;discovery;dms;docdb;ds;dynamodb;gamelift;glue"
-				mybuildtargets+=";groundstation;healthlake;importexport;kafka;lakeformation"
-				mybuildtargets+=";migrationhub-config;mq;mturk-requester;neptune;quicksight;redshift"
-				mybuildtargets+=";robomaker;sdb;schemas;service-quotas;servicecatalog;servicediscovery"
-				mybuildtargets+=";signer;sms;snowball;ssm;states;storagegateway;support;swf"
-			elif [ "${module}" = "outposts" ] ; then
-				mybuildtargets+=";${module};s3outposts"
-			elif [ "${module}" = "personalize" ] ; then
-				mybuildtargets+=";${module};personalize-events;personalize-runtime"
-			elif [ "${module}" = "polly" ] ; then
-				mybuildtargets+=";${module};text-to-speech"
-			elif [ "${module}" = "qldb" ] ; then
-				mybuildtargets+=";${module};qldb-session"
-			elif [ "${module}" = "rds" ] ; then
-				mybuildtargets+=";${module};pi;rds-data"
-			elif [ "${module}" = "resource-groups" ] ; then
-				mybuildtargets+=";${module};resourcegroupstaggingapi"
-			elif [ "${module}" = "route53" ] ; then
-				mybuildtargets+=";${module};route53domains;route53resolver"
-			elif [ "${module}" = "s3" ] ; then
-				mybuildtargets+=";${module};athena;awstransfer;glacier;s3-encryption;s3control;transfer"
-			elif [ "${module}" = "sagemaker" ] ; then
-				mybuildtargets+=";${module};sagemaker-a2i-runtime;sagemaker-edge"
-				mybuildtargets+=";sagemaker-featurestore-runtime;sagemaker-runtime"
-			elif [ "${module}" = "timestream" ] ; then
-				mybuildtargets+=";timestream-query;timestream-write"
-			elif [ "${module}" = "transcribe" ] ; then
-				mybuildtargets+=";${module};transcribestreaming"
-			elif [ "${module}" = "waf" ] ; then
-				mybuildtargets+=";${module};fms;network-firewall;waf-regional;wafv2"
-			else
-				mybuildtargets+=";${module}"
-			fi
-		fi
-	done
-
-	local mycmakeargs=(
-		-DAUTORUN_UNIT_TESTS=$(usex test)
-		-DBUILD_DEPS=NO
-		-DBUILD_ONLY="${mybuildtargets}"
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DCPP_STANDARD=17
-		-DENABLE_RTTI=$(usex rtti)
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_UNITY_BUILD=$(usex unity-build)
-		-DNO_ENCRYPTION=$(usex !ssl)
-		-DNO_HTTP_CLIENT=$(usex !http)
-	)
-
-	if use test; then
-		# (#759802) Due to network sandboxing of portage, internet connectivity
-		# tests will always fail. If you need a USE flag, because you want/need
-		# to perform these tests manually, please open a bug report for it.
-		mycmakeargs+=(
-			-DENABLE_HTTP_CLIENT_TESTING=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.105-remove_Werror_from_FLAGS.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.105-remove_Werror_from_FLAGS.patch
deleted file mode 100644
index 8130066cc391..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.105-remove_Werror_from_FLAGS.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/cmake/compiler_settings.cmake	2020-12-12 15:31:17.703362345 +0100
-+++ b/cmake/compiler_settings.cmake	2020-12-12 15:31:53.641363625 +0100
-@@ -53,7 +53,7 @@
- endmacro()
- 
- macro(set_gcc_warnings)
--    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra")
-+    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-pedantic" "-Wextra")
-     if(COMPILER_CLANG)
-         if(PLATFORM_ANDROID)
-             # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning.
---- a/cspell.json	2020-12-12 15:31:17.703362345 +0100
-+++ b/cspell.json	2020-12-12 15:31:42.488363228 +0100
-@@ -13,7 +13,7 @@
-         // CMake
-         "cmake", "DCMAKE", "AUTORUN", "DEPS", "STREQUAL", "RPATH", "STREQUAL", "DTARGET", "TOOLCHAIN", "DANDROID", "DBUILD", "DGIT", "SYSROOT", "DSTATIC", "BINDIR", "LIBDIR", "INCLUDEDIR", "DHAS",
-         // Compiler and linker
--        "Wpedantic", "Wextra", "Werror", "xldscope", "Wtype", "Wunused", "RTTI", "ffunction", "fdata", "fsanitize", "pathconf", "unistd", "umask",
-+        "Wpedantic", "Wextra", "xldscope", "Wtype", "Wunused", "RTTI", "ffunction", "fdata", "fsanitize", "pathconf", "unistd", "umask",
-         // Android NDK
-         "JNIEXPORT", "jint", "JNICALL", "jobject", "jclass", "jmethod", "Ljava",
-         // XML parser
---- a/CI/install-test/CMakeLists.txt	2020-12-12 15:31:17.704362345 +0100
-+++ b/CI/install-test/CMakeLists.txt	2020-12-12 15:32:06.433364080 +0100
-@@ -4,4 +4,4 @@
- find_package(AWSSDK REQUIRED COMPONENTS s3)
- add_executable(${PROJECT_NAME} "main.cpp")
- target_link_libraries(${PROJECT_NAME} ${AWSSDK_LINK_LIBRARIES})
--target_compile_options(${PROJECT_NAME} PRIVATE "-Wall" "-Werror")
-+target_compile_options(${PROJECT_NAME} PRIVATE "-Wall")
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.160-disable_http_testing.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.160-disable_http_testing.patch
deleted file mode 100644
index 8bf926148e52..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.160-disable_http_testing.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp	2021-03-14 12:52:01.193340560 +0100
-+++ b/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp	2021-03-14 12:52:42.684342951 +0100
-@@ -18,7 +18,7 @@
- using namespace Aws::Utils;
- using namespace Aws::Client;
- 
--#ifndef NO_HTTP_CLIENT
-+#if !defined(NO_HTTP_CLIENT) && ENABLE_HTTP_CLIENT_TESTING
- static void makeRandomHttpRequest(std::shared_ptr<HttpClient> httpClient)
- {
-     auto request = CreateHttpRequest(Aws::String("http://some.unknown1234xxx.test.aws"),
-@@ -319,4 +319,4 @@
- }
- #endif // ENABLE_CURL_CLIENT
- #endif // ENABLE_HTTP_CLIENT_TESTING
--#endif // NO_HTTP_CLIENT
-+#endif // !defined(NO_HTTP_CLIENT) && ENABLE_HTTP_CLIENT_TESTING
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
deleted file mode 100644
index 658abfded785..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CI/ConstructReleaseDoc.py	(original)
-+++ b/CI/ConstructReleaseDoc.py	(refactored)
-@@ -35,6 +35,6 @@
-     releases.append(release)
-     changeDoc["releases"] = releases
- 
--    print(json.dumps(changeDoc))
-+    print((json.dumps(changeDoc)))
- 
- Main()
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch
deleted file mode 100644
index fb6856abff3c..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/CI/ExtractBuildArgs.py	(original)
-+++ b/CI/ExtractBuildArgs.py	(refactored)
-@@ -3,15 +3,15 @@
- import json
- 
- if len(sys.argv) != 2:
--    print >> sys.stderr, "    Usage: python ExtractBuildArgs.py <ArgName>"
-+    print("    Usage: python ExtractBuildArgs.py <ArgName>", file=sys.stderr)
-     exit (-1)
- 
- try:
-     data = json.load(open('BuildSpec.json'))
-     if sys.argv[1] == "cmakeFlags" and data["cmakeFlags"] != "":
--        print(data["cmakeFlags"])
-+        print((data["cmakeFlags"]))
-     elif sys.argv[1] == "branch" and data["branch"] != "":
--        print(data["branch"])
-+        print((data["branch"]))
- except:
--    print >> sys.stderr, "No related args found in BuildSpec.json"
-+    print("No related args found in BuildSpec.json", file=sys.stderr)
-     exit(-1)
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch
deleted file mode 100644
index ddd162025b49..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/CI/handle_release_notification.py	(original)
-+++ b/CI/handle_release_notification.py	(refactored)
-@@ -1,5 +1,5 @@
- 
--from __future__ import print_function
-+
- 
- import json
- import zipfile
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch
deleted file mode 100644
index ef7a384d7e6e..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/CI/move_release_doc_to_models.py	(original)
-+++ b/CI/move_release_doc_to_models.py	(refactored)
-@@ -1,5 +1,5 @@
- 
--from __future__ import print_function
-+
- 
- import json
- import zipfile
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch
deleted file mode 100644
index e77436236c9d..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/android-build/build_and_test_android.py	(original)
-+++ b/android-build/build_and_test_android.py	(refactored)
-@@ -120,13 +120,13 @@
-  
-     validTests = GetTestList( buildSharedObjects )
-     if runTest not in validTests:
--        print( 'Invalid value for runtest option: ' + runTest )
-+        print(( 'Invalid value for runtest option: ' + runTest ))
-         print( 'Valid values are: ' )
--        print( '  ' + ", ".join( validTests ) )
-+        print(( '  ' + ", ".join( validTests ) ))
-         raise ArgumentException('runtest', runTest)
-         
-     if not IsValidABI(abi):
--        print('Invalid argument value for abi: ', abi)
-+        print(('Invalid argument value for abi: ', abi))
-         print('  Valid values are "armeabi-v7a"')
-         raise ArgumentException('abi', abi)
- 
-@@ -140,7 +140,7 @@
-         avd = FindAVDForABI(abi, avdABIs)
- 
-     if not IsValidAVD(avd, abi, avdABIs):
--        print('Invalid virtual device: ', avd)
-+        print(('Invalid virtual device: ', avd))
-         print('  Use --avd to set the virtual device')
-         print('  Use "android lists avds" to see all usable virtual devices')
-         raise ArgumentException('avd', avd)
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
deleted file mode 100644
index 5322430bfb38..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CI/binary-release-pipeline/lambda_publish.py	(original)
-+++ b/CI/binary-release-pipeline/lambda_publish.py	(refactored)
-@@ -39,9 +39,9 @@
-                 prefix = publish_key_prefix,
-                 config = config
-             )
--            print('Uploading artifacts to https://s3.console.aws.amazon.com/s3/object/{bucket}/{key}'.format(
-+            print(('Uploading artifacts to https://s3.console.aws.amazon.com/s3/object/{bucket}/{key}'.format(
-                 bucket = publish_bucket,
--                key = publish_key))
-+                key = publish_key)))
- 
-             s3.meta.client.copy(
-                 { 'Bucket': input_artifacts[i]['location']['s3Location']['bucketName'],
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
deleted file mode 100644
index f17f05b3d3d5..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/doc_crosslinks/generate_cross_link_data.py	(original)
-+++ b/doc_crosslinks/generate_cross_link_data.py	(refactored)
-@@ -17,14 +17,14 @@
-         if match:
-             with codecs.open(join(apiDefinitionsPath, file), 'rb', 'utf-8') as api_definition:
-                 api_content = json.loads(api_definition.read())
--                if "uid" in api_content["metadata"].keys():
-+                if "uid" in list(api_content["metadata"].keys()):
-                     sdks[api_content["metadata"]["uid"]] = getServiceNameFromMetadata(api_content["metadata"])
-            
-     return sdks
-     
- def getServiceNameFromMetadata(metadataNode):
-     toSanitize = ""
--    if "serviceAbbreviation" in metadataNode.keys():
-+    if "serviceAbbreviation" in list(metadataNode.keys()):
-         toSanitize = metadataNode["serviceAbbreviation"]
-     else: 
-         toSanitize = metadataNode["serviceFullName"]
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch
deleted file mode 100644
index 885f94800c17..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/scripts/build_3rdparty.py	(original)
-+++ b/scripts/build_3rdparty.py	(refactored)
-@@ -237,7 +237,7 @@
-         dependentInstallFile = os.path.join( uppercaseLib + "-prefix", "src", uppercaseLib + "-build", "cmake_install.cmake" )
-         dependentInstallDirectory = '"' + os.path.join( installDirectory, "external", dependentLib ) + '"'
-         dependent_install_call = "cmake -DCMAKE_INSTALL_CONFIG_NAME=" + config + " -DCMAKE_INSTALL_PREFIX=" + dependentInstallDirectory + " -P " + dependentInstallFile + " .."
--        print( "dependent install call = " + dependent_install_call )
-+        print(( "dependent install call = " + dependent_install_call ))
-         subprocess.check_call( dependent_install_call, shell = True )
- 
- 
-@@ -254,7 +254,7 @@
- 
-     sourcePlatform = platform.system()
-     if not sourcePlatform in platformEnvironments:
--        print( "Platform " + sourcePlatform + " not supported as a build platform" )
-+        print(( "Platform " + sourcePlatform + " not supported as a build platform" ))
-         return 1
- 
-     platformEnv = platformEnvironments[ sourcePlatform ]
-@@ -292,12 +292,12 @@
-         shutil.rmtree( installDirectory )
- 
-     if not architecture in platformBuildTargets:
--        print( "No definition for target architecture " + architecture )
-+        print(( "No definition for target architecture " + architecture ))
-         return 1
- 
-     targetPlatformDef = platformBuildTargets[ architecture ]
-     if not sourcePlatform in targetPlatformDef[ 'buildPlatforms' ]:
--        print( "Platform " + sourcePlatform + " does not support building for architecture " + architecture )
-+        print(( "Platform " + sourcePlatform + " does not support building for architecture " + architecture ))
-         return 1
- 
-     buildEnvironment = buildEnvironments[ targetPlatformDef[ 'build_environment' ] ]
-@@ -338,18 +338,18 @@
-                 cmake_call_list = cmake_call_list + " -DCUSTOM_PLATFORM_DIR=\"" + customPlatformDir + "\""
- 
-             cmake_call_list = cmake_call_list + " " + quotedSourceDir
--            print( "cmake call = " + cmake_call_list )
-+            print(( "cmake call = " + cmake_call_list ))
-             subprocess.check_call( cmake_call_list, shell = True )
- 
-             parallelBuildOption = buildEnvironment[ 'parallel_option' ].replace("??", str(parallelJobs))
-             build_call_list = buildEnvironment[ 'global_build_call' ] + archConfig[ 'build_params' ]
-             if parallelBuildOption != "":
-                 build_call_list = build_call_list + [ parallelBuildOption ]
--            print( "build call = " + str( build_call_list ) )
-+            print(( "build call = " + str( build_call_list ) ))
-             subprocess.check_call( build_call_list )
- 
-             install_call = "cmake -DCMAKE_INSTALL_CONFIG_NAME=" + archConfig[ 'config' ] + " -DCMAKE_INSTALL_PREFIX=" + quotedInstallDirectory + " -P cmake_install.cmake " + quotedSourceDir
--            print( "install call = " + install_call )
-+            print(( "install call = " + install_call ))
-             subprocess.check_call( install_call, shell = True )
- 
-             # platform specific stuff
-@@ -365,9 +365,9 @@
-             os.chdir( ".." )
- 
-         else:
--            print("Build target config " + targetConfig + " does not exist for architecture " + architecture)
--
--    print( "Aws SDK for C++  finished 3rd party installation into: " + installDirectory )
-+            print(("Build target config " + targetConfig + " does not exist for architecture " + architecture))
-+
-+    print(( "Aws SDK for C++  finished 3rd party installation into: " + installDirectory ))
-     
- 
- # On windows: Run from powershell; make sure msbuild is in PATH environment variable  
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch
deleted file mode 100644
index 8596e41c5f27..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/scripts/build_example.py	(original)
-+++ b/scripts/build_example.py	(refactored)
-@@ -56,13 +56,13 @@
-     cmake_call = cmake_call + " -DCMAKE_PREFIX_PATH=" + sdkInstallDir
-     cmake_call = cmake_call + " -DAWSSDK_ROOT_DIR=" + sdkInstallDir
-     cmake_call = cmake_call + " " + sourceDir
--    print("cmake call = " + cmake_call)
-+    print(("cmake call = " + cmake_call))
-     subprocess.check_call(cmake_call, shell = True)
-     
-     build_call = buildEnvironment[ platform ][ 'global_build_call' ]
-     build_call = build_call + buildEnvironment[ platform ][ 'configs' ].replace("??", buildType)
-     build_call = build_call + buildEnvironment[ platform ][ 'parallel_option' ].replace("??", parallel)
--    print("build call = " + build_call)
-+    print(("build call = " + build_call))
-     subprocess.check_call(build_call, shell = True)
- 
- def Main():
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch
deleted file mode 100644
index 396d1b134ebd..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/scripts/dummy_web_server.py	(original)
-+++ b/scripts/dummy_web_server.py	(refactored)
-@@ -78,7 +78,7 @@
-             self._set_headers()
-             self.wfile.write(self._html("hi!"))
-         except socket.error as e:
--            print ("socket.error : Connection broke. Aborting" + str(e))
-+            print(("socket.error : Connection broke. Aborting" + str(e)))
-             self.wfile._sock.close()
-             self.wfile._sock = None
-             return False
-@@ -111,7 +111,7 @@
-     server_address = (addr, port)
-     httpd = server_class(server_address, handler_class)
- 
--    print("Starting httpd server on {}:{}.".format(addr, port))
-+    print(("Starting httpd server on {}:{}.".format(addr, port)))
-     httpd.serve_forever()
-     httpd.stop_server()
- 
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch
deleted file mode 100644
index 3fd67591c098..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/scripts/endpoints_checker.py	(original)
-+++ b/scripts/endpoints_checker.py	(refactored)
-@@ -64,8 +64,8 @@
-     strippedContent = RemoveCPPComments(content);
-     match = ScanContent(strippedContent);
-     if match:
--        print inputFile;
--        print "..." + strippedContent[match.start() : match.end()] + "...";
-+        print(inputFile);
-+        print("..." + strippedContent[match.start() : match.end()] + "...");
-         return True;
- 
-     return False;
-@@ -109,7 +109,7 @@
- assert ScanContent("\"cn-north-2 doesn't exist\"") == None;
- 
- ###################Test End######################################
--print "Start checking hard coded endpoints in source files...";
-+print("Start checking hard coded endpoints in source files...");
- exitCode = 0;
- RootDir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)));
- for root, dirnames, fileNames in os.walk(RootDir):
-@@ -117,5 +117,5 @@
-         if fileName.endswith(('.h', '.cpp')):
-             targetFile = os.path.join(root, fileName);
-             exitCode |= CheckFile(targetFile);
--print "Finished checking hard coded endpoints in source files with exit code",exitCode,".";
-+print("Finished checking hard coded endpoints in source files with exit code",exitCode,".");
- exit(exitCode);
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch
deleted file mode 100644
index c1141bdf53e5..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scripts/gather_3rdparty.py	(original)
-+++ b/scripts/gather_3rdparty.py	(refactored)
-@@ -200,7 +200,7 @@
- 
-     # shutil.rmtree( destDir )
- 
--    print( "Aws SDK for C++  finished 3rd party pre-build gather into: " + uploadZipFile )
-+    print(( "Aws SDK for C++  finished 3rd party pre-build gather into: " + uploadZipFile ))
-     
- 
- Main()
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch
deleted file mode 100644
index 12b910425bf5..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/scripts/generate_sdks.py	(original)
-+++ b/scripts/generate_sdks.py	(refactored)
-@@ -94,7 +94,7 @@
-                  with zipfile.ZipFile(output.strip().decode('utf-8'), 'r') as zip:
-                      zip.extractall(outputDir)
-     except EnvironmentError as  ex:
--        print('Error generating sdk {} with error {}'.format(sdk, ex))
-+        print(('Error generating sdk {} with error {}'.format(sdk, ex)))
- 
- def Main():
-     arguments = ParseArguments()
-@@ -105,11 +105,11 @@
-     sdks = DiscoverAllAvailableSDKs(arguments['pathToApiDefinitions'])
- 
-     if arguments['listAll']:
--        for key, value in sdks.iteritems():
-+        for key, value in sdks.items():
-             print(value)
- 
-     if arguments['serviceName']:
--        print('Generating {} api version {}.'.format(arguments['serviceName'], arguments['apiVersion']))
-+        print(('Generating {} api version {}.'.format(arguments['serviceName'], arguments['apiVersion'])))
-         key = '{}-{}'.format(arguments['serviceName'], arguments['apiVersion'])
-         GenerateSdk(arguments['pathToGenerator'], sdks[key], arguments['outputLocation'], arguments['namespace'], arguments['licenseText'], arguments['standalone'], arguments['enableVirtualOperations'])
- 
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch
deleted file mode 100644
index d73fa82ff1c0..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scripts/renew_license.py	(original)
-+++ b/scripts/renew_license.py	(refactored)
-@@ -55,7 +55,7 @@
-     if (skipFile(inputFile)):
-         return False;
- 
--    print ("Process file: " + inputFile)
-+    print(("Process file: " + inputFile))
-     with open(inputFile) as ftarget:
-         content = ftarget.read()
- 
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch
deleted file mode 100644
index f451e707f40b..000000000000
--- a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/scripts/run_integration_tests.py	(original)
-+++ b/scripts/run_integration_tests.py	(refactored)
-@@ -52,11 +52,11 @@
-         testExe = os.path.join(arguments[ "testDir" ], testName if testHasParentDir else "", testName) + exeExtension
-         # when build with BUILD_ONLY, not all test binaries will be generated.
-         if not os.path.isfile(testExe):
--            print("Test: \"{}\" doesn't exist, skipped.".format(testExe))
-+            print(("Test: \"{}\" doesn't exist, skipped.".format(testExe)))
-             continue
-         prefix = "--aws_resource_prefix=" + platform.system().lower()
--        print("testExe = " + testExe)
--        print("prefix = " + prefix)
-+        print(("testExe = " + testExe))
-+        print(("prefix = " + prefix))
-         AddExecutableBit(testExe)
-         subprocess.check_call([testExe, prefix])
- 
diff --git a/dev-libs/aws-sdk-cpp/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml
deleted file mode 100644
index f6161d03b690..000000000000
--- a/dev-libs/aws-sdk-cpp/metadata.xml
+++ /dev/null
@@ -1,479 +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>amit.prakash.ambasta@gmail.com</email>
-	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>sven.eden@prydeworx.com</email>
-		<name>Sven Eden</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		The AWS SDK for C++ provides a modern C++ version C++ 11 or later interface for Amazon Web Services AWS.
-		It is meant to be performant and fully functioning with low- and high-level SDKs, while minimizing
-		dependencies and providing platform portability Windows, OSX, Linux, and mobile.
-
-		AWS SDK for C++ is in now in General Availability and recommended for production use. We invite our
-		customers to join the development efforts by submitting pull requests and sending us feedback and ideas
-		via GitHub Issues.
-	</longdescription>
-	<use>
-		<flag name="http">Enable http support via <pkg>net-misc/curl</pkg></flag>
-		<flag name="rtti">Flag to enable/disable rtti within the library</flag>
-		<flag name="unity-build">
-			Build using a single unified .cpp file for each service library.
-			Reduces the size of static library binaries
-		</flag>
-
-		<flag name="access-management">
-			AWS Access Management, a meta-flag that enables:
-			AWS Certificate Manager (ACM): Provision, manage, and deploy SSL/TLS certificates on AWS
-				managed resources.
-			AWS Data Exchange            : A service that makes it easy for customers to find, subscribe
-				to, and use third-party data in the AWS Cloud.
-			AWS IAM Access Analyzer      : Identify any policies that grant access to an external
-				principal.
-			Identity and Access Management (IAM): A web service for securely controlling access to AWS
-				services.
-			Resource Access Manager (RAM): Customers who operate multiple accounts can create resources
-				centrally and use AWS RAM to share them with all of their accounts to reduce
-				operational overhead.
-			SSO : AWS Single Sign-On (SSO) makes it easy to centrally manage access to multiple AWS
-				accounts and business applications and provide users with single sign-on access to all
-				their assigned accounts and applications from one place.
-			Also enables acm-pca, identity-management, identitystore, sso-admin, sso-oidc and sts
-			(Security Token Service).
-		</flag>
-		<flag name="apigateway">
-			Create and deploy your own REST and WebSocket APIs at any scale.
-			Also enables apigatewaymanagementapi and apigatewayv2.
-		</flag>
-		<flag name="appconfig">Quickly deploy application configurations to applications of any size.</flag>
-		<flag name="backup">AWS Backup is a fully managed backup service</flag>
-		<flag name="batch">Run batch computing workloads on the AWS Cloud</flag>
-		<flag name="budgets">
-			Use AWS Budgets to plan service usage, service costs, and instance reservations.
-			Also enables the following related modules:
-			AWS Cost Explorer (CE)     : Programmatically query cost and usage data.
-			Cost and Usage Report (CUR): Programmatically create, query, and delete AWS Cost and Usage
-				report definitions.
-		</flag>
-		<flag name="chime">Amazon Chime, a secure, real-time, unified communications service.</flag>
-		<flag name="cloud-desktop">
-			AWS end user computing services.
-			AppStream 2.0: Fully managed, secure application streaming service.
-			WorkDocs     : Fully managed, secure enterprise storage and sharing service.
-			WorkLink     : Fully managed, cloud-based service that enables secure, one-click access to
-				internal websites and web apps from mobile devices.
-			WorkMail     : Managed email and calendaring service.
-			WorkSpaces   : Cloud-based desktop experience for end users.
-			Also enabled workmailmessageflow.
-		</flag>
-		<flag name="cloud-dev">
-			Enables in-cloud developer tools:
-			Cloud9      : Cloud-based integrated development environment IDE to write, run, and debug code.
-			CodeArtifact: Secure and scalable artifact management service for software development.
-			CodeBuild   : Managed build service that compiles, runs unit tests and produces artifacts.
-			CodeCommit  : Privately store and manage Git repositories in the AWS cloud.
-			CodeDeploy  : Automate the deployment and updating of applications.
-			CodeGuru    : Provides intelligent recommendations for improving application performance,
-				efficiency, and code quality in your Java applications.
-			CodePipeline: Continuous delivery service to model, visualize, and automate the steps required
-				to release software.
-			CodeStar    : Quickly develop, build, and deploy applications on AWS. Also enables
-				codestar-connections and codestar-notifications.
-			Honey Code  : Fully managed service to quickly build mobile and web apps for teams.
-			Queues      : Simple queue class. Allows standard queue operations top, delete, and push. Also
-				has higher level, asynchronous interface with callbacks.
-			X-Ray       : Provides request tracing, exception collection, and profiling capabilities.
-		</flag>
-		<flag name="cloud-media">
-			AWS Media modules for transforming, converting, delivering and streaming media.
-			Elastic Transcoder     : Convert media files stored in Amazon S3 into media files in the formats
-				required by consumer playback devices.
-			Elemental Media Connect: Secure and flexible transport service for live video.
-			Elemental Media Convert: Format and compress offline video content for delivery to televisions
-				or connected devices.
-			Elemental Media Live   : Video service that allows easy and reliable creation of live outputs
-				for broadcast and streaming delivery.
-			Elemental Media Package: Just-in-time video packaging and origination service. (Includes
-				mediapackage-vod)
-			Elemental Media Store  : Video origination and storage service.Manage video assets as objects in
-				containers to build dependable, cloud-based media workflows. (Includes mediastore-data)
-			Elemental Media Tailor : Personalization and monetization service that allows scalable server-
-				side ad insertion.
-		</flag>
-		<flag name="cloud-mobile">
-			AWS Mobile modules for handling mobile application management and delivery.
-			Amplify    : Comprehensive set of SDKs, libraries, tools, and documentation for client app
-				development.
-			AppSync    : Enterprise level, fully managed GraphQL service with real-time data synchronization
-				and offline programming features.
-			Device Farm: Test iOS, Android and Fire OS apps on real, physical phones and tablets that are
-				hosted by AWS.
-			PinPoint   : Engage customers by sending them email, SMS and voice messages, and push
-				notifications. (Includes pinpoint-email and sms-voice)
-			SNS        : Amazon Simple Notification Service, see USE flag sns.
-			Also enables mobile and mobileanalytics.
-		</flag>
-		<flag name="cloudformation">
-			Create and provision AWS infrastructure deployments predictably and repeatedly. Use a template
-			file to create and delete a collection of resources together as a single unit (a stack).
-		</flag>
-		<flag name="cloudfront">
-			Delivers static and dynamic web content through a worldwide network of edge locations that
-			provide low latency and high performance.
-		</flag>
-		<flag name="cloudhsm">
-			Secure cryptographic key storage by providing managed hardware security modules in the AWS
-			Cloud.
-			Also enables cloudhsmv2.
-		</flag>
-		<flag name="cloudsearch">
-			Fully managed service in the cloud to set up, manage, and scale a search solution for websites.
-			Also enables cloudsearchdomain.
-		</flag>
-		<flag name="cloudwatch">
-			Amazon CloudWatch monitors Amazon Web Services (AWS) resources and the applications run on AWS
-			in real time.
-			The following modules besides monitoring are also enabled:
-			Application Insights: Monitor .NET and SQL Server applications.
-			App Mesh            : Monitor and control microservices running on AWS.
-			Audit Manager       : Helps to continuously audit your AWS usage to simplify how you manage
-				risk and compliance with regulations and industry standards.
-			CloudTrail          : Monitor AWS deployments in the cloud by getting a history of AWS API
-				calls, including API calls made via the AWS Management Console, the AWS SDKs, the
-				command line tools, and higher-level AWS services.
-			Compute Optimizer   : Recommends optimal AWS compute resources for your workloads.
-			Detective           : Analyze, investigate, and identify the root cause of security findings
-				or suspicious activities. 
-			DevOps Guru         : Generates operational insights using machine learning to help to improve
-				the performance of operational applications.
-			GuardDuty           : Continuous security monitoring service.
-			Health              : Provides personalized information about events that can affect the AWS
-				infrastructure, guides through scheduled changes, and accelerates the troubleshooting
-				of issues that affect AWS resources and accounts.
-			Inspector           : A security vulnerability assessment service that helps improve the
-				security and compliance of
-			AWS resources.
-			Logs                : Monitor, store, and access log files from Amazon EC2 instances, AWS
-				CloudTrail, or other sources.
-			Synthetics          : Create canaries, configurable scripts that run on a schedule, to monitor
-				your endpoints and APIs.
-		</flag>
-		<flag name="cognito">
-			Create unique identities, authenticate these identities with identity providers and save mobile
-			user data in the AWS Cloud.
-			Enables cognito-identity, cognito-idp and cognito-sync
-		</flag>
-		<flag name="config">
-			Provides a detailed view of the resources associated with your AWS account, including how they
-			are configured, how they are related to one another, and how the configurations and their
-			relationships have changed over time.
-		</flag>
-		<flag name="dlm">
-			Amazon Data Lifecycle Manager (DLM):
-			Manage the lifecycle of AWS resources. Create lifecycle policies to automate operations on
-			specified resources.
-		</flag>
-		<flag name="ebs">
-			Amazon Elastic Block Store (Amazon EBS) is a web service that provides block level storage
-			volumes for use with EC2 instances. EBS volumes are highly available and reliable storage
-			volumes that can be attached to any running instance and used like a hard drive.
-		</flag>
-		<flag name="ec2">
-			Amazon Elastic Compute Cloud (EC2) is a web service that provides resizeable computing capacity.
-			This flag also enables the following modules:
-			Auto Scaling       : Set up dynamic and predictive scaling for scalable AWS resources. Also
-				enables autoscaling-plans and application-autoscaling.
-			EC2 Image Builder  : Fully-managed AWS service that makes it easier to automate the creation,
-				management, and deployment of customized, secure, and up-to-date “golden” server images
-				that are pre-installed and pre-configured with software and settings to meet specific IT
-				standards.
-			Elastic File System: EFS provides file storage for Amazon EC2 instances.
-			Savings Plan       : Flexible pricing model that helps you save a significant percentage on
-				Amazon EC2 and Fargate usage.
-		</flag>
-		<flag name="ecr">
-			Amazon Elastic Container Registry (ECR) is a fully managed Docker container registry.
-			Also enables Amazon ECR Public.
-		</flag>
-		<flag name="ecs">
-			Amazon Elastic Container Service (ECS) is a highly scalable, fast, container management service.
-		</flag>
-		<flag name="eks">
-			Amazon Elastic Kubernetes Service (EKS) is a managed service to run Kubernetes on AWS without
-			own Kubernetes clusters.
-			Also enables Amazon EMR on EKS.
-		</flag>
-		<flag name="elasticache">
-			Set up, manage, and scale distributed in-memory cache environments in the AWS Cloud
-		</flag>
-		<flag name="elasticbeanstalk">Quickly deploy and manage applications in the AWS Cloud.</flag>
-		<flag name="elastic-inference">
-			Amazon Elastic Inference is a service that allows you to attach low-cost GPU-powered
-			acceleration to many Amazon machine instances in order to reduce the cost of running deep
-			learning inference by up to 75%. Amazon Elastic Inference supports TensorFlow, Apache MXNet, and
-			ONNX models through MXNet.
-		</flag>
-		<flag name="elasticloadbalancing">
-			Automatically distribute incoming application traffic across multiple targets, such as EC2
-			instances.
-			Also enables elasticloadbalancingv2.
-		</flag>
-		<flag name="elasticmapreduce">
-			Amazon Elastic MapReduce (EMR) processes large amounts of data efficiently using Hadoop
-			processing combined with several AWS products.
-		</flag>
-		<flag name="email">
-			Amazon Simple Email Service (Amazon SES):
-			An email platform to send and receive email using ones own email addresses and domains.
-			See: https://docs.aws.amazon.com/ses/latest/DeveloperGuide/Welcome.html
-			Also enables sesv2
-		</flag>
-		<flag name="es">
-			Amazon Elasticsearch Configuration Service (ES) is an API to create, configure, and manage
-			Elasticsearch domains.
-		</flag>
-		<flag name="events">
-			Serverless event bus service to connect applications with data from a variety of sources.
-			Also enables eventbridge.
-		</flag>
-		<flag name="forecast">
-			Amazon Forecast is a fully managed deep learning service for time-series forecasting. Time-
-			series forecasting is useful in multiple domains, including retail, financial planning, supply
-			chain, and healthcare.
-			Also enables the forecastquery module.
-		</flag>
-		<flag name="frauddetector">
-			Amazon Fraud Detector is a fully managed service that helps you detect suspicious online
-			activities such as the creation of fake accounts and online payment fraud. With Amazon Fraud
-			Detector, you can create a fraud detection ML model with just a few clicks and use it to
-			evaluate online activities in milliseconds.
-		</flag>
-		<flag name="fsx">Amazon FSx is a fully managed service to launch and use shared file storage.</flag>
-		<flag name="globalaccelerator">
-			AWS Global Accelerator is a network layer service for accelerators to improve availability and
-			performance for internet applications used by a global audience.
-		</flag>
-		<flag name="iot">AWS IoT
-			This is a meta-flag for all Internet of Things modules provided by the SDK:
-			iot           : enables secure, bi-directional communication between Internet-connected things
-				(such as sensors, actuators, embedded devices, or smart appliances) and the AWS Cloud
-				over MQTT and HTTP.
-			greengrass    : Extends AWS onto physical devices so they can act locally on the data they
-				generate. Installed are both Version 1 and Version 2.
-			iot1click     : A service for simple devices to trigger AWS Lambda functions that execute a
-				specific action.
-			iotanalytics  : Provides advanced data analysis for AWS IoT.
-			iotevents     : Monitor equipment or device fleets for failures or changes in operation, and
-				trigger actions when such events occur.
-			iotsitewise   : Easily collect, organize, and analyze data from industrial equipment at scale.
-			iotthingsgraph: Integrated set of tools that enable developers to build IoT applications using
-				devices and services that use different data representation standards and communication
-				protocols.
-			Also enables iot1click-devices, iot1click-projects, iotdeviceadvisor, iot-data, iotevents-data, iotfleethub,
-			iot-jobs-data, iotsecuretunneling and iotwireless.
-		</flag>
-		<flag name="kendra">
-			Amazon Kendra is a search service, powered by machine learning, that enables users to search
-			unstructured text using natural language.
-		</flag>
-		<flag name="kinesis">
-			Amazon Kinesis
-			Collect, process, and analyze video and data streams in real time. The following modules besides
-			kinesis are enabled:
-			firehose        : Load data streams into AWS data stores.
-			ivs             : Managed live streaming solution for creating interactive video experiences.
-			kinesisanalytics: Process and analyze streaming data using SQL or Java. (Also enables 
-				kinesisanalyticsv2)
-			kinesisvideo    : Capture, process, and store video streams for analytics and machine learning.
-			Additionally kinesis-video-archived-media, kinesis-video-media and kinesis-video-signaling are
-			enabled.
-		</flag>
-		<flag name="kms">
-			AWS Key Management Service (KMS)
-			An encryption and key management service scaled for the cloud.
-		</flag>
-		<flag name="lex">
-			Amazon Lex is an AWS service for building conversational interfaces into applications using
-			voice and text. Installed are both Version1 and Version 2.
-			Also enables lex-models.
-		</flag>
-		<flag name="lambda">AWS Lambda: Run code without provisioning or managing servers.</flag>
-		<flag name="license-manager">
-			Streamlines the process of bringing software vendor licenses to the cloud.
-		</flag>
-		<flag name="lightsail">
-			The easiest way to get started with AWS for developers who just need virtual private servers
-		</flag>
-		<flag name="lookoutvision">
-			Amazon Lookout for Vision enables you to find visual defects in industrial products, accurately
-			and at scale. 
-		</flag>
-		<flag name="machinelearning">
-			The algorithms of Amazon Machine Learning create machine learning (ML) models by finding
-			patterns in existing data. The service uses these models to process new data and generate
-			predictions for application.
-		</flag>
-		<flag name="macie">
-			A security service that uses machine learning to automatically discover, classify, and protect
-			sensitive data in AWS.
-			Also enables macie2
-		</flag>
-		<flag name="managedblockchain">
-			Create and manage scalable blockchain networks using popular open source frameworks. Currently,
-			Managed Blockchain supports the Hyperledger Fabric open source framework.
-		</flag>
-		<flag name="marketplace">
-			AWS Marketplace is an online store where you can buy or sell software that runs on Amazon Web
-			Services (AWS).
-			Marketplace support consists of the marketplacecommerceanalytics module plus:
-			Marketplace Entitlement Service: A contract verification feature that AWS Marketplace sellers
-				can use to verify the amount of the sellers product (for example, end user licenses or
-				storage, data, or compute capacity) the customer has purchased.
-			Marketplace Metering Service   : A pricing and metering feature that AWS Marketplace sellers can
-				use to directly charge for their software along one of four dimensions: users, data,
-				bandwidth, or hosts.
-			Also enables marketplace-catalog, pricing and servicecatalog-appregistry.
-		</flag>
-		<flag name="mwaa">
-			Amazon Managed Workflows for Apache Airflow (Amazon MWAA) is a managed service for Apache
-			Airflow that makes it easy for you to build and manage your workflows in the cloud.
-		</flag>
-		<flag name="networkmanager">
-			Transit Gateway Network Manager (Network Manager) enables you to create a global network, in
-			which you can monitor your AWS and on-premises networks that are built around transit gateways.
-		</flag>
-		<flag name="organizations">
-			Account management service that to consolidate multiple AWS accounts into an organization to be
-			centrally managed.
-		</flag>
-		<flag name="opsworks">
-			AWS OpsWorks is a simple and flexible way to create and manage stacks and applications.
-			Also enables opsworkscm.
-		</flag>
-		<flag name="other">
-			This is a meta-flag for rarely needed modules that in themselves need not much build time. If
-			you would like to have any of the following modules to have their own USE flag, please open a
-			bug report and it will most probably get one.
-			The modules are:
-			AWSMigrationHub, alexaforbusiness, appflow, appintegrations, braket, clouddirectory, comprehend,
-			comprehendmedical, connect, connect-contact-lens, customer-profiles, datapipeline, databrew,
-			datasync, directconnect, discovery, dms, docdb, ds, dynamodb, gamelift, glue, groundstation,
-			healthlake, importexport, kafka, lakeformation, migrationhub-config, mq, mturk-requester,
-			neptune, quicksight, redshift, robomaker, sdb, schemas, service-quotas, servicecatalog,
-			servicediscovery, signer, sms, snowball, ssm, states, storagegateway, support and swf.
-		</flag>
-		<flag name="outposts">
-			AWS Outposts brings native AWS services, infrastructure, and operating models to virtually any
-			data center, co-location space, or on-premises facility. You can use the same services, tools,
-			and partner solutions to develop for the cloud and on premises.
-			Also enables s3outposts.
-		</flag>
-		<flag name="personalize">
-			Real-time personalization and recommendations, based on the same technology used at Amazon.com.
-			Also enables personalize-events and personalize-runtime.
-		</flag>
-		<flag name="polly">
-			Amazon Polly
-			A Text-to-Speech (TTS) cloud service that converts text into lifelike speech.
-			Also enables text-to-speech, which needs you to enable pulseaudio support to work.
-		</flag>
-		<flag name="qldb">
-			Amazon Quantum Ledger Database (Amazon QLDB) is a fully managed ledger database that provides a
-			transparent, immutable, and cryptographically verifiable transaction log owned by a central
-			trusted authority. You can use Amazon QLDB to track all application data changes, and maintain
-			a complete and verifiable history of changes over time.
-			Also enables qldb-session.
-		</flag>
-		<flag name="queues">
-			AWS Queues is a simple queue class.
-			Allows standard queue operations top, delete, and push. Also has higher level, asynchronous
-			interface with callbacks.
-		</flag>
-		<flag name="rds">
-			Amazon Relational Database Service (RDS) is a web service to set up, operate, and scale a
-			relational database in the cloud.
-			Also enables pi (Performance Insights) and rds-data.
-		</flag>
-		<flag name="route53">
-			AWS Route 53 is a highly available and scalable Domain Name System (DNS) web service.
-			Also enables route53domains and route53resolver.
-		</flag>
-		<flag name="rekognition">Add image and video analysis to applications.</flag>
-		<flag name="resource-groups">
-			AWS Resource Groups and Tag Editor
-			Organize AWS resources into groups, tag resources using virtually any criteria, and manage,
-			monitor, and automate tasks on grouped resources.
-			Also enables resourcegroupstaggingapi. (Resource Groups Tagging API)
-		</flag>
-		<flag name="s3">
-			Amazon Simple Storage Service Storage for the internet.
-			Additionally to the s3 module, the following modules are activated:
-			Athena           : Interactive query service to analyze data in Amazon S3 using standard SQL.
-			Glacier          : Storage solution for cold data.
-			Transfer for SFTP: Transfer files directly into and out of Amazon S3 using SFTP.
-			Also enables s3-encryption, s3control and transfer.
-		</flag>
-		<flag name="sagemaker">
-			Amazon SageMaker
-			Fully managed machine learning service. With Amazon SageMaker, data scientists and developers
-			can quickly and easily build and train machine learning models, and then directly deploy them
-			into a production-ready hosted environment.
-			Also enables sagemaker-a2i-runtime, sagemaker-edge, sagemaker-featurestore-runtime and
-			sagemaker-runtime.
-		</flag>
-		<flag name="secretsmanager">
-			Encrypt, store, and retrieve credentials for databases and other services.
-		</flag>
-		<flag name="securityhub">Provides a comprehensive view of the security state of AWS resources.</flag>
-		<flag name="serverlessrepo">
-			AWS Serverless Application Repository
-			Enables teams, organizations, and individual developers to find, deploy, publish, share, store,
-			and easily assemble serverless architectures.
-		</flag>
-		<flag name="shield">AWS Shield, protection against DDoS attacks</flag>
-		<flag name="sns">
-			Amazon Simple Notification Service (SNS) is a web service that enables applications, end-users,
-			and devices to instantly send and receive notifications from the cloud.
-		</flag>
-		<flag name="sqs">
-			Amazon Simple Queue Service (SQS): Fully managed message queuing service that makes it easy to
-			decouple and scale microservices, distributed systems, and serverless applications.
-		</flag>
-		<flag name="textract">
-			Amazon Textract to add document text detection and analysis to applications.
-		</flag>
-		<flag name="timestream">
-			Store and analyze sensor data for IoT applications, metrics for DevOps use cases, and telemetry
-			for application monitoring scenarios such as clickstream data analysis.
-			Note: The two modules enabled are timestream-query and timestream-write.
-		</flag>
-		<flag name="transcribe">
-			A transcription services for audio files. It uses advanced machine learning technologies to
-			recognize spoken words and transcribe them into text.
-			Also enables transcribestreaming.
-		</flag>
-		<flag name="translate">
-			A neural machine translation service for translating text to and from English across a breadth
-			of supported languages.
-		</flag>
-		<flag name="waf">
-			The Web Application Firewall (WAF) can monitor web requests that are forwarded to Amazon
-			CloudFront distributions or an Application Load Balancer. Can also be used to block or allow
-			requests based on conditions such as the IP addresses that requests originate from or values in
-			the requests.
-			Also enables fms, network-firewall, waf-regional and wafv2
-		</flag>
-		<flag name="wellarchitected">
-			Use the AWS Well-Architected Tool to review your workloads against current AWS architectural best practices.
-			The AWS Well-Architected Tool measures the workload and provides recommendations on how to improve your
-			architecture.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
deleted file mode 100644
index 8388fda03b5d..000000000000
--- a/dev-libs/libprelude/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libprelude-4.0.0-fix-python-bindings.patch 1136 BLAKE2B 287f5e3c049ef4d3af54932f968f1973aebe0541e50403e4154512772e9d625324e879a06ff4c5810bb90f3d2c968c09fa361067435e7e4bc6131ea78f6ad794 SHA512 6990cd9e79d6e9e42c9f377f1c9a9f48920310aaf47d9bc731fc133c743256874a613ad5740eb4bc25825b341e313f79c8cfa1160a58e6eda228b9ca6bfef2b2
-AUX libprelude-5.1.0-fix_gtkdoc_1.32.patch 416 BLAKE2B 9717541a0d57a0fb97a7f4f2b9d466d65f8091e96707cb7a20e61ce3aef925d44b93a71f03d90c074592e0bf91a133c7a2b87996ceabb10810a3795a595d874c SHA512 1b35a8b5af4701c51e3d9a20eaf501cf81f429b2f2f16c0d8fecefa51a3438b35cf237db3c4696c56e53a2a87b0663a08a73d72edac207ae04b067ef2c4dc6fe
-AUX libprelude-5.2.0-luabindings_liblua.patch 611 BLAKE2B 8541a59228a9e8d0b35cc22ec2d26f3f01a91348fd7eb293f68c637b1ca176c86cfa28578d28b8c290f76bf8b4adba2ff5f7da7a8fd16ee4b846730c4cd04b56 SHA512 1a45fc0fb71850769e0b23c0b1ce8eae0912bdb3398baaef91b631b622fbd7166a11cc1f501d8dfa063b8dc5230c41b3e521b57792d8c865b94d9a6efea2c995
-AUX libprelude-5.2.0-slibtool.patch 2276 BLAKE2B 434b6e5ef887dcc086812a6ceffc5830bd572cc4c87481f960f0fa3e9395979ea8338759c73f7376337ffb99e7a6f7a37587582d4fd300f5fcc74aba5ee8ccb0 SHA512 eb1cd21a7c91e49315720be68b7f2e25ce91b81d2591b6ca05aa37e428503a272f1bbb833039857788d2007a3e1b5e9f04947478ed909c43a7593218084811f8
-DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0
-EBUILD libprelude-5.2.0-r10.ebuild 2123 BLAKE2B d82deff66f83bcfdb9f82ac32a30b03b691ef5fd96433fd1795b42be0d8907cd82cfa8241440a9795980ff0d959a276b37533fa588b100d2ad0972e6e9e31ba6 SHA512 f585ba73df601f538ef2ec2bdc1459c6f76692b14b2be3d7044ed1746ca678d9d0916e951ac0a78b4d365444ca7524c812f1a354d056a0bc4bb4dd475c99fe57
-MISC metadata.xml 666 BLAKE2B c133e5679e6a366f65f627ce547abd85393a9e17be6fada179b78a8ecfe85700291f688ad93c2afc9cc08a1554c0a0b783e53835fd3d62a65e21a01024d25042 SHA512 65a571f4f6602982484f9ce258bf684cec128c0460e9df37153e0647370beb3304404534f909cc72c775e05f04aea3ff8e2d0a1b3e19edfcb004789b35d60313
diff --git a/dev-libs/libprelude/files/libprelude-4.0.0-fix-python-bindings.patch b/dev-libs/libprelude/files/libprelude-4.0.0-fix-python-bindings.patch
deleted file mode 100644
index 7336b620045a..000000000000
--- a/dev-libs/libprelude/files/libprelude-4.0.0-fix-python-bindings.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/bindings/python/Makefile.am	2017-07-17 12:03:05.653000000 +0200
-+++ b/bindings/python/Makefile.am	2017-09-06 18:51:57.179778549 +0200
-@@ -9,35 +9,6 @@
- all-am: python-build
- 
- python-build: _prelude.cxx
--if HAVE_PYTHON2
--	CC="$(CXX)" $(PYTHON2) setup.py build
--endif
--if HAVE_PYTHON3
--	CC="$(CXX)" $(PYTHON3) setup.py build
--endif
--install-exec-hook:
--if HAVE_PYTHON2
--	$(PYTHON2) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` --prefix @prefix@
--endif
--if HAVE_PYTHON3
--	$(PYTHON3) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` --prefix @prefix@
--endif
--
--uninstall-hook:
--if HAVE_PYTHON2
--	$(PYTHON2) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` --prefix @prefix@
--endif
--if HAVE_PYTHON3
--	$(PYTHON3) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` --prefix @prefix@
--endif
--
--clean-local:
--if HAVE_PYTHON2
--	$(PYTHON2) setup.py clean -a
--endif
--if HAVE_PYTHON3
--	$(PYTHON3) setup.py clean -a
--endif
- 
- _prelude.cxx prelude.py: $(top_srcdir)/bindings/c++/include/*.hxx $(top_srcdir)/bindings/libpreludecpp.i libpreludecpp-python.i 
- if HAVE_SWIG
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch
deleted file mode 100644
index 3495ebf62ccb..000000000000
--- a/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/docs/api/libprelude-docs.xml
-+++ b/docs/api/libprelude-docs.xml
-@@ -51,10 +51,6 @@
-     <xi:include href="xml/idmef-value.xml"/>
- 
-   </chapter>
--  <chapter id="object-tree">
--    <title>Object Hierarchy</title>
--     <xi:include href="xml/tree_index.sgml"/>
--  </chapter>
-   <index id="api-index-full">
-     <title>API Index</title>
-     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff --git a/dev-libs/libprelude/files/libprelude-5.2.0-luabindings_liblua.patch b/dev-libs/libprelude/files/libprelude-5.2.0-luabindings_liblua.patch
deleted file mode 100644
index 6eeb4beb92b4..000000000000
--- a/dev-libs/libprelude/files/libprelude-5.2.0-luabindings_liblua.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Compiled Lua modules must not link against liblua.
-
---- a/bindings/lua/Makefile.am
-+++ b/bindings/lua/Makefile.am
-@@ -9,7 +9,7 @@
- 
- AM_CPPFLAGS = -I@top_srcdir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include @LUA_CFLAGS@ -I@top_srcdir@/libmissing -I@top_builddir@/libmissing
- 
--prelude_la_LDFLAGS = -module -avoid-version @LUA_LIBS@
-+prelude_la_LDFLAGS = -module -avoid-version
- prelude_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la
- prelude_la_SOURCES = prelude.cxx
- preludedir = $(libdir)/lua/@LUA_VERSION@
diff --git a/dev-libs/libprelude/files/libprelude-5.2.0-slibtool.patch b/dev-libs/libprelude/files/libprelude-5.2.0-slibtool.patch
deleted file mode 100644
index 6a1bed0d5c0a..000000000000
--- a/dev-libs/libprelude/files/libprelude-5.2.0-slibtool.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Bug: https://bugs.gentoo.org/790647
-
-From: orbea <orbea@riseup.net>
-Date: Sun, 10 Jul 2022 09:26:59 -0700
-Subject: [PATCH] Fix the build with slibtool
-
-The build system should not use the .libs directory which is for
-internal use by the libtool implementation only. GNU libtool is far less
-strict than slibtool in these cases.
-
---- a/bindings/c++/Makefile.am
-+++ b/bindings/c++/Makefile.am
-@@ -21,7 +21,7 @@ libpreludecpp_la_SOURCES = \
- 	prelude-log.cxx
- 
- libpreludecpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDECPP_SONAME@
--libpreludecpp_la_LIBADD  = $(top_builddir)/src/.libs/libprelude.la
-+libpreludecpp_la_LIBADD  = $(top_builddir)/src/libprelude.la
- libpreludecpp_la_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/src/include -I$(top_srcdir)/src/include -I$(top_builddir)/src/libprelude-error -I$(top_builddir)/bindings/c++/include -I$(top_srcdir)/bindings/c++/include 
- 
- endif
---- a/bindings/lua/Makefile.am
-+++ b/bindings/lua/Makefile.am
-@@ -10,7 +10,7 @@ dist_swigdata_DATA = libpreludecpp-lua.i
- AM_CPPFLAGS = -I@top_srcdir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include @LUA_CFLAGS@ -I@top_srcdir@/libmissing -I@top_builddir@/libmissing
- 
- prelude_la_LDFLAGS = -module -avoid-version
--prelude_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la
-+prelude_la_LIBADD = $(top_builddir)/bindings/c++/libpreludecpp.la
- prelude_la_SOURCES = prelude.cxx
- preludedir = $(libdir)/lua/@LUA_VERSION@
- prelude_LTLIBRARIES = prelude.la
---- a/bindings/ruby/Makefile.am
-+++ b/bindings/ruby/Makefile.am
-@@ -9,7 +9,7 @@ EXTRA_DIST = libpreludecpp-ruby.i Prelude.cxx
- rbexec_LTLIBRARIES = Prelude.la
- Prelude_la_CPPFLAGS = $(RUBY_INCLUDES) $(RUBY_CCFLAGS) -I@top_builddir@ -I$(top_srcdir)/src/include -I$(top_builddir)/src/include -I@top_builddir@/src/libprelude-error -I$(top_srcdir)/bindings/c++/include
- Prelude_la_LDFLAGS = -module -avoid-version
--Prelude_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la $(RUBY_LIBS)
-+Prelude_la_LIBADD = $(top_builddir)/bindings/c++/libpreludecpp.la $(RUBY_LIBS)
- nodist_Prelude_la_SOURCES = Prelude.cxx
- 
- Prelude.cxx: $(top_srcdir)/bindings/c++/include/*.hxx $(top_srcdir)/bindings/libpreludecpp.i libpreludecpp-ruby.i 
diff --git a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
deleted file mode 100644
index b075361a5e28..000000000000
--- a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby25 ruby26 ruby27"
-DISTUTILS_OPTIONAL=1
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit autotools distutils-r1 lua-single ruby-single
-
-DESCRIPTION="Prelude-SIEM Framework Library"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua perl python ruby"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="net-libs/gnutls:=
-	lua? ( ${LUA_DEPS} )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND=">=dev-lang/swig-4.0.0
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	lua? ( ${LUA_DEPS} )
-	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-	virtual/pkgconfig
-	app-alternatives/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
-	"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
-	"${FILESDIR}/${PN}-5.2.0-luabindings_liblua.patch"
-	"${FILESDIR}/${PN}-5.2.0-slibtool.patch" # 790647
-)
-
-src_prepare() {
-	default
-
-	# Avoid null runpaths in Perl bindings.
-	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
-
-	eautoreconf
-
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-easy-bindings
-		--with-swig
-		--without-python2
-		--localstatedir="${EPREFIX}/var"
-		$(use_with lua)
-		$(use_with perl)
-		$(usex perl '--with-perl-installdirs=vendor' '')
-		$(use_with ruby)
-	)
-
-	if use python; then
-		python_setup
-		myconf+=( --with-python3="${EPYTHON}" )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_install
-	fi
-
-	keepdir /var/spool/prelude
-}
diff --git a/dev-libs/libprelude/metadata.xml b/dev-libs/libprelude/metadata.xml
deleted file mode 100644
index cff50f46e8bf..000000000000
--- a/dev-libs/libprelude/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-needed -->
-	<longdescription lang="en">
-		Libprelude is a library that guarantees secure connections between all sensors
-		and the Prelude Manager. Libprelude provides an Application Programming Interface
-		(API) for the communication with Prelude sub-systems, it supplies the necessary
-		functionality for generating and emitting IDMEF events with Prelude and automates
-		the saving and re-transmission of data in times of temporary interruption of one
-		of the components of the system.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
deleted file mode 100644
index 6bf860dbb725..000000000000
--- a/dev-libs/libpreludedb/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libpreludedb-4.0.0-fix-python-bindings.patch 1075 BLAKE2B 414a9308a10b2c0aeeb12b462c8a972341161c308bfce2ab9c94d25a63dc14f01f2ed3484f690b994e8f509262f99406e19c25ec9a70ee5eeaca3b7c5823c055 SHA512 61309ae2d68aeeca5321fb2592f7d01e57b00b10ed04e63d1c011aa96115855087abd0fb4687f09d04b01b488dda840bef08cc9c1d0ec714064c1322f9589a2e
-AUX libpreludedb-5.1.0-fix_gtkdoc_1.32.patch 431 BLAKE2B 243bda8c42be083a0c5d38bf8a9f6c5553b4801b527212e38b8b3f81096656d6ef1592f9b86c3ed39b5767addfde71bc796c90e90fc046b4759fc092fd02c491 SHA512 afd38dfdec1f946946ad3f7ca17f5e5c7a0c16bd4a296b639132ec801cccce23594c047b7936bbcb85c28dd9ca9eef7a302b92c3bb4aa71305b33ae0fb700688
-DIST libpreludedb-5.1.0-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b308a641942e41c82eb9642dc7817ac1134ac52c8f24e38b68e0dacc5adedc30ba0611e84c97bb51f444b75b2b98884c0f21312da58f40b6d8 SHA512 24881cfe0e471e934fc9b1bd64dd901303f68615e1700ce92d6bc7324b28587aef8cc05be9cc7c2545f86666064607d8113c5273381bf9306ef69f569ab9d1bf
-DIST libpreludedb-5.2.0.tar.gz 1372810 BLAKE2B 5a6bed23eba77591b8e97bb3c6f2b321970c94f88fb86094146a1a3fa64cc0f0c97ca1d1488b2202ab7042207ca2ca4f74029415ef1ca6ea13c84d158a23473f SHA512 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744
-EBUILD libpreludedb-5.2.0.ebuild 1885 BLAKE2B c5e561f17eddd531fe106409c10d7a7731bfe7ad93494f8c3415080c4301f569bd87d11a7a5d60d143182a9f9577195218ffa5431457609ae960026d90ddbbb5 SHA512 8c30a23e4812bd7b8efa953967e5e936e9429a6c3562b1fa122b2143f21106deeece524b283d2792bcf3137a78344e476d4208f4f5a9e15e22c0a220fe8310c2
-MISC metadata.xml 535 BLAKE2B edeb9bd1c236b095157daf54bb8c5f3d3b13c752691916a299d06028150159ea0716bb6ae822626cdfa997013f020fb329673fbae504d052aab5a137016259d3 SHA512 3480d1027cf20ae097a773c6cdbeeab0a3a6d842b225b09e4fdac64fe1c992d79569b88d8e8dacbb9f82e73b887d2c7477aa88390bbaeb6f3ac3c9948d972826
diff --git a/dev-libs/libpreludedb/files/libpreludedb-4.0.0-fix-python-bindings.patch b/dev-libs/libpreludedb/files/libpreludedb-4.0.0-fix-python-bindings.patch
deleted file mode 100644
index 7fb93c269ef2..000000000000
--- a/dev-libs/libpreludedb/files/libpreludedb-4.0.0-fix-python-bindings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/bindings/python/Makefile.am	2017-07-18 12:27:27.278000000 +0200
-+++ b/bindings/python/Makefile.am	2017-09-07 23:41:21.279920258 +0200
-@@ -6,36 +6,6 @@
- all-am: python-build
- 
- python-build: _preludedb.cxx
--if HAVE_PYTHON2
--	CC="$(CXX)" $(PYTHON2) setup.py build
--endif
--if HAVE_PYTHON3
--	CC="$(CXX)" $(PYTHON3) setup.py build
--endif
--install-exec-hook:
--if HAVE_PYTHON2
--	$(PYTHON2) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
--endif
--if HAVE_PYTHON3
--	$(PYTHON3) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
--endif
--
--uninstall-hook:
--if HAVE_PYTHON2
--	$(PYTHON2) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
--endif
--if HAVE_PYTHON3
--	$(PYTHON3) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
--endif
--
--clean-local:
--if HAVE_PYTHON2
--	$(PYTHON2) setup.py clean -a
--endif
--if HAVE_PYTHON3
--	$(PYTHON3) setup.py clean -a
--endif
--
- 
- _preludedb.cxx preludedb.py: $(top_srcdir)/bindings/c++/include/*.hxx $(top_srcdir)/bindings/libpreludedbcpp.i libpreludedbcpp-python.i
- if HAVE_SWIG
diff --git a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch
deleted file mode 100644
index ecc6d5dc4e02..000000000000
--- a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/docs/api/libpreludedb-docs.xml
-+++ b/docs/api/libpreludedb-docs.xml
-@@ -26,10 +26,6 @@
-     <xi:include href="xml/preludedb-sql-settings.xml"/>
- 
-   </chapter>
--  <chapter id="object-tree">
--    <title>Object Hierarchy</title>
--     <xi:include href="xml/tree_index.sgml"/>
--  </chapter>
-   <index id="api-index-full">
-     <title>API Index</title>
-     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff --git a/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild b/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
deleted file mode 100644
index e3db909f7abf..000000000000
--- a/dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1
-
-DESCRIPTION="Framework to easy access to the Prelude database"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres python sqlite"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/libprelude-5.2.0
-	<dev-libs/libprelude-6
-	net-libs/gnutls:=
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND=">=dev-lang/swig-4.0.0
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	virtual/pkgconfig
-	app-alternatives/yacc
-	python? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
-	"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
-	"${DISTDIR}/${PN}-5.1.0-update_m4_postgresql.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-easy-bindings
-		--without-swig
-		--without-python2
-		--localstatedir="${EPREFIX}/var"
-		$(use_with mysql)
-		$(use_with postgres postgresql)
-		$(use_with sqlite sqlite3)
-	)
-
-	if use python; then
-		python_setup
-		myconf+=( --with-python3="${EPYTHON}" )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_install
-	fi
-}
diff --git a/dev-libs/libpreludedb/metadata.xml b/dev-libs/libpreludedb/metadata.xml
deleted file mode 100644
index 7bc26282c762..000000000000
--- a/dev-libs/libpreludedb/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		The PreludeDB Library provides an abstraction layer upon the type and the
-		format of the database used to store IDMEF alerts. It allows developers
-		to use the Prelude IDMEF database easily and efficiently without
-		worrying about SQL, and to access the database independently of the
-		type/format of the database.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/tree-sitter-bash/Manifest b/dev-libs/tree-sitter-bash/Manifest
index 7aad14a16f37..70f73ddc5327 100644
--- a/dev-libs/tree-sitter-bash/Manifest
+++ b/dev-libs/tree-sitter-bash/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-bash-0.19.0.tar.gz 187286 BLAKE2B 8812a593366a65a9cae3eaac5bb81c71e95f4abe8558a01b908333e471f05714b1c768b71e66d3890d1e63202819290813e499a5e8ba49e72bb466b9b0f245f8 SHA512 62bc8bc25c999f9c79632bd6b236edd21ef15b14365dd1a956237b11a32f5e60a2f420ec67b60d46203699b7841d4bc10978fc0307d0c4013b376c6c024d89ae
-EBUILD tree-sitter-bash-0.19.0.ebuild 357 BLAKE2B 7a97bbfcc5ec16d0571e39bd94d93aca4c8aa274a4bd3028abfcdbbb52d20b8ae1f67e45054c09377b5ae10484247eb434afe906be6f57b9f2b14513b0b07bc1 SHA512 886cc524300f1d5d2210645d13c607e6ed1f70d30faea18d3a81f10b957f3c4f781fce864b7475236ad0cee82ffe66afb60f1f14e76abccc775608f5fa47bd2c
+EBUILD tree-sitter-bash-0.19.0.ebuild 364 BLAKE2B aa9e2ebb88fc9b7cfc560a1363d7f6627f3a15e4be9d050a8c86ce394fb31717cc3bbafa1bd4be4e72d7a1798371743952780f96cab888fe5166312dbe30431e SHA512 08d01e57e92bcf1f0fd0f745b05e547e82655e15aba70a93b43f6893c9f1db4ed0faad844b3ad8d1a9d63eac7124c09237b58a9ec6c02bb0688db57ae2428a75
 MISC metadata.xml 446 BLAKE2B 60052c2b380610a7baea0e630cbe82709976827341183e1a1a7c846913f3fb0ae8ad85c40701ec827685592e326405a9b2cab1674d015c7111c1df90ad8a162f SHA512 e845bf4cd56026aec1b531cd23ea6bf5eed38ac0d3f91dedead87907e4708bac82db87b3c7ccaa1135a4c25911f2b369836c2689faac9ad54782978dd2c8f95b
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
index fddac91db5da..bf87fe76c9f8 100644
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
@@ -10,4 +10,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 9a70dc73e079..fc4877126ebd 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,6 +1,4 @@
 AUX zziplib-0.13.72-Wint-conversion.patch 1043 BLAKE2B 6ff6a4079cd6fba6f67649eb41e175caae47455bcd31d4deebaa2e4e66995c8d9c0aa6ef3f9d2edbb18570f47a5e6350eb7ba2a644e7115954876357b3fe64e9 SHA512 45af2a1268ded5a2e88ce6956e3ad775e7c51ac4aebea753d630d53e465d3444bcdcbbc5d8e47b6843cd50d5cd3d1467648eba9059dad2fbb52704bf4525ce29
 DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
-EBUILD zziplib-0.13.72-r1.ebuild 1274 BLAKE2B fea6732f9c9b459b847851f8a499cbca55dd47e099303c471e2a3c706f00f0aacd5a7b8d74e17699449a9e2696af9caacc5f7e239bdc7ff780a455e577f01306 SHA512 f419584e12105707e4374536b1c4d7c28e64d6e562bff665528c27806fa4ab2a43a12ac5f41800ce9b5e57893ef750e7d7445525974dd9d38aa64503c846ae8c
 EBUILD zziplib-0.13.72-r2.ebuild 1560 BLAKE2B 376e1431138b9f186d00030c559515d2c854f6d130954ef04251bf93b26e12b50e6112feaa61cf8c8fd98ce250c21c00ebaea6dc3f05d719237db8e4397f65ef SHA512 554b7253b7af8226d311d3b7ad6485831c980302c887acc002d085363be526b3bb55fc99a5b200b917d99cbf6661f3601ff18b0935d6297edffc5ee2df745836
-EBUILD zziplib-0.13.72.ebuild 1266 BLAKE2B 75e64e1acaac3e4fd491f4732b5da5c699967d6bf5dcde7779676a58c434ffeb82eca730b77610152941b7ac7dfcd1559705a34bdb76dc935b04d852e4bf6252 SHA512 8761584f792225866541d6d778ebef3f60ac71aafc6816fe7181dfd9b8fd9802f4909b9cd88255eb9dcf3a3160b721fb2e9cf2f90be7c131dd09de5e8f939129
 MISC metadata.xml 300 BLAKE2B 5bd0efee346b2d954d36b1dd83e1d8ef54944ec7f7fb3a88bdcba73b2f85d0236cd638f763388ed43a30c44f9db5b83223310d66232731e6d37ef57315c04129 SHA512 0a233cbfe081cd55c76d8229261f1d8d8a8bf1435886c36e938a3a059a2db9b44bed165b7aeddbe568756a3e19e3cbd12dbee659a5a8eb2feea21c5f2ab35d22
diff --git a/dev-libs/zziplib/zziplib-0.13.72-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.72-r1.ebuild
deleted file mode 100644
index c8ee6ff4ef33..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.72-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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="https://github.com/gdraheim/zziplib https://zziplib.sourceforge.net"
-SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="sdl static-libs"
-
-# Tests require internet access
-# https://github.com/gdraheim/zziplib/issues/24
-
-BDEPEND="
-	${PYTHON_DEPS}
-"
-DEPEND="
-	sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.6 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DZZIPSDL="$(usex sdl)"
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DBUILD_TESTS=OFF
-		-DZZIPTEST=OFF
-		-DZZIPDOCS=ON
-		-DZZIPWRAP=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/zziplib/zziplib-0.13.72.ebuild b/dev-libs/zziplib/zziplib-0.13.72.ebuild
deleted file mode 100644
index bc39bf3ec8d0..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.72.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="https://github.com/gdraheim/zziplib https://zziplib.sourceforge.net"
-SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0/13"
-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="sdl static-libs"
-
-# Tests require internet access
-# https://github.com/gdraheim/zziplib/issues/24
-
-BDEPEND="
-	${PYTHON_DEPS}
-"
-DEPEND="
-	sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.6 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DZZIPSDL="$(usex sdl)"
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DBUILD_TESTS=OFF
-		-DZZIPTEST=OFF
-		-DZZIPDOCS=ON
-		-DZZIPWRAP=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index e2f6944ab061..8772df9ee4dd 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/Manifest b/dev-php/PEAR-PEAR_PackageFileManager/Manifest
deleted file mode 100644
index ca915d00f599..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PEAR_PackageFileManager-1.7.2.tgz 38104 BLAKE2B 126578a570db3e92b8c3b3d04588a77e81b14ed6b6c40e9a6c90739d2ae86bfaad8cac2b5ece4deaea9ea1e356d2645997402200236e394f68c0dc5fa9eaafe5 SHA512 4a0a201fea221a8e2d21199f99d4f145e39f42344a0057f32bfefd96aa2635e12ea75ee6b6ac64c52a8d35be5e2a65fa5399b3195592dea9ba10191c45fc0056
-EBUILD PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild 426 BLAKE2B ea7ad04a92fdc84aa9d7ff2cddfd2cede42c93772efce964406213060cd3982515ce047ba3da25466062d2c5f19d21e7c405d830e54e76cbdc77a89690643a37 SHA512 5eac9a418d350650a680bde42b0da7c800ef10cfa7f05e1ccc6db7d2baa11639b8ab98fcf8c669ee755319b39af3427fdbd42f9618ee2f23367d77d2c61bce7c
-MISC metadata.xml 326 BLAKE2B debc8a1572593f5af6a8a0a4d43febb4aef7be992ac993d8b1eb73c41fb4410eb1f4c1a37956ee65880ecd9b536367a002bcfb7cfdbb181a8f48ef407e6e3746 SHA512 823e0f674a4aba9101661e3e5cab3a8125631f6b4e57a884e3a38e7522dec41c715060010c8cb1505d3f7af65f31260a45d024d864a6ec8a391cbd8e654acb80
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild b/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild
deleted file mode 100644
index b0973dc62119..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit php-pear-r2
-
-DESCRIPTION="Updates an existing package.xml file with a new filelist and changelog"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/php-5.3:*
-	>=dev-php/PEAR-PEAR-1.10.1
-	dev-php/PEAR-PEAR_PackageFileManager2
-	dev-php/PEAR-PEAR_PackageFileManager_Plugins"
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
deleted file mode 100644
index 98e5afa08817..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager/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>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pear">PEAR_PackageFileManager</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/Manifest b/dev-php/PEAR-PEAR_PackageFileManager2/Manifest
deleted file mode 100644
index b1195c238130..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PEAR_PackageFileManager2-1.0.4.tgz 43365 BLAKE2B 5eae7eb6f2ae91487ab83dc048ff2fa4c63a4f8208e88e0897340ef63aded28b355f22aec8e12e4da918ed1f24434c6269b53f4755ec80cf4edf7a240e03e545 SHA512 2748ebb21158521a74246ea410f9a30ae6d4b41e88aba543888238c5fc53060e6cf5c537cb95f595147690a2cbdfaaa34a6b3280924ee153cd3d47f2deb3a636
-EBUILD PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild 387 BLAKE2B e41776339c8d2ebf530126add435d4364d6f51fd3eb996c4e3d9420fe3434db1bbd2fa9811e5b8a27c8854fb6898cfdb0f5112fa731e5932abfb826758b45605 SHA512 b67af6ee028bc546e29922385f7b3e023a2b83dfb0f438939b9345473962567729a3752dc2b287077f7f16328e534d34a8357c8763f6ce43d798d62f8d284cdf
-MISC metadata.xml 327 BLAKE2B 60eef7d53119f6ede530dd05b0bbcff073e48ba493e604fd6dbff164c9c3c2671b3de7b39d6c2dab81d4e0f6598629fa22f8c31fa2a783b724c0b7285bd78a9c SHA512 ac28d261a33d56a29c37c352449495c40b610388fb2a8d43ee8a3617a9d721d58606ba14aca1f6004a247ad568bf685c9b501384d99e054840b875f90fa5a2d9
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild b/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild
deleted file mode 100644
index e896e2b1d697..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit php-pear-r2
-
-DESCRIPTION="Updates an existing package.xml file with a new filelist and changelog"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/php-5.3:*
-	>=dev-php/PEAR-PEAR-1.10.1
-	dev-php/PEAR-PEAR_PackageFileManager_Plugins"
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml
deleted file mode 100644
index d4583a1190ac..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager2/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>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pear">PEAR_PackageFileManager2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest
deleted file mode 100644
index 052cb534c6e6..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PEAR_PackageFileManager_Plugins-1.0.4.tgz 20967 BLAKE2B 5f883e117af879c67badb5c9c8b11e1211b3f9ee3b0516d43ca489ea05d6d4678281062a1a75da15e2158583169e7c31ca900bdea83137d991ed7dd923abb2e6 SHA512 7461ba3dc6f51263383136041d217e2d0d7607c5ef9f8766e08466118f2c869a037622750dd7bdcbbf2a114efde096b3192bbf5229f62ea42adfe83d36451fa0
-EBUILD PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild 390 BLAKE2B f2ab2088bdf0733d450e628027d2b70ea6fcda5697c5aeae3bb39e677a9092ada5423f98746ada52c9f74f777777968ef7dbac4227b0fa6154a60b355b608a20 SHA512 4ba0b3af245b548fd7bcd7479cca31a46148bea2300108a0b6642e7dc5cd6b6c60e0ed0da4d0f9ac9127c0580834eb00325152ec40d88b3136c8f86332a869dd
-MISC metadata.xml 334 BLAKE2B 4e5533af4ba1b6083c36dc56bad44b895a5d48853f7404973f9e19db7f61c24776f56e671de34c8ce939d126c6966dc2fa1e8877e88180b98f4d1df9d71fceb5 SHA512 a3732a5bdd2f40c951309c5374fbb794aeb04d3e1df8ec3715c49724daa18f7d17bcd0d4283250fe52045d93acef621414f0aceb2c5419934effc2b0a290f030
diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild
deleted file mode 100644
index 021965393c4f..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit php-pear-r2
-
-DESCRIPTION="Various methods to check files to update an existing package.xml file"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-php/PEAR-PEAR-1.10.1
-	>=dev-php/PEAR-XML_Serializer-0.19.0
-	>=dev-lang/php-5.3:*[xml,simplexml]"
diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml
deleted file mode 100644
index 1c8dc329dd56..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/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>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pear">PEAR_PackageFileManager_Plugins</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/PEAR-VersionControl_SVN/Manifest b/dev-php/PEAR-VersionControl_SVN/Manifest
deleted file mode 100644
index 48dcd12f16f2..000000000000
--- a/dev-php/PEAR-VersionControl_SVN/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST PEAR-VersionControl_SVN-0.5.2_p20180314.tar.gz 36697 BLAKE2B 998e9c08d19284de2bd723fff07bc4c319ed65b12baad012f5f8e6b283060cd25cdefa5141e71f8368555d963e7ab1eec7b8e41d38cbd9a89dbd6977f72b5102 SHA512 aaba6fcd65d3906c9d98085b109d1357578be7557a9ac5b5997ae9a9896cb0970f3bf707246e5afc68dfbb8268a8fad36265b484220387b56e8de85e390db82a
-DIST VersionControl_SVN-0.5.2.tgz 31356 BLAKE2B d59971b0677d3e88b47f1fb249c6ba6971db7b868e390589705058fa0cc19a3b4e7a2da38db78b37a9fa7b8f9233297a4fb5376b1b225c8e93f41bbe65c99007 SHA512 09aaab0461a52fe87e5723472b9978c8f928a4741e11a69672ae1350ecdf90b287d951b8343b5fbfbc1d7cd449055cb249f229a1e943cdcd807e9b36e0a48b86
-EBUILD PEAR-VersionControl_SVN-0.5.2-r1.ebuild 586 BLAKE2B fe71070981e12a7151c32e16d4f4d08259dd4fbb79b4b70f43eb18a39763e4cd3de7c734cabf4759f6eda80de2f0711d62466607332b2a128c1077db84efd767 SHA512 12ce42b63818dc4bfd2960ee83c640767ca70fb782853aa1783e160699b793bec7d3d3f69a39e812d0a8dd0c3182b77fce0e9678b3c2061bcf896aea23eeb004
-EBUILD PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild 965 BLAKE2B 72beccc5044c03c88d58f0575e1dada39292e4ea5d29ead31707ec4d1b9cee4a38dee55826d144bb924ae2bc50c8e628fddb35ebbd8b847692a1d25eb7b195c1 SHA512 bf52d4ed345cf970e1569a70852650a41e474609d3628335b858cfec61fd9d6b3f2e1d9b04821d308672dd5b4c99eb8377415a93fbf6f7ccdfa67df2804e9887
-MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild
deleted file mode 100644
index 7fea8919316e..000000000000
--- a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit php-pear-r2
-
-DESCRIPTION="Simple OO wrapper interface for the Subversion command-line client"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-RDEPEND=""
-
-src_prepare() {
-	einfo "Patching SVN.php and SVN/Command.php to use proper paths by default"
-	sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN.php || die "sed failed"
-	sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN/Command.php || die "sed failed"
-	default
-}
diff --git a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild
deleted file mode 100644
index d1a06c8cfbfd..000000000000
--- a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit php-pear-r2 vcs-snapshot
-
-DESCRIPTION="Simple OO wrapper interface for the Subversion command-line client"
-SRC_URI="https://github.com/pear/VersionControl_SVN/archive/6c9580df92f0cc77a6eb6fcc216c56913bf308e7.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND=""
-DEPEND="test? ( dev-vcs/subversion <dev-php/phpunit-6 )"
-S="${WORKDIR}/PEAR-${PHP_PEAR_PKG_NAME}-${PV}"
-
-src_prepare() {
-	einfo "Patching SVN.php and SVN/Command.php to use proper paths by default"
-	sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN.php || die "sed failed"
-	sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN/Command.php || die "sed failed"
-	sed -i 's/ +%d / %i /' tests/resetxml_19910.phpt || die
-	default
-}
-
-src_test() {
-	phpunit tests || die "Tests failed"
-}
diff --git a/dev-php/PEAR-VersionControl_SVN/metadata.xml b/dev-php/PEAR-VersionControl_SVN/metadata.xml
deleted file mode 100644
index 77793b997e9e..000000000000
--- a/dev-php/PEAR-VersionControl_SVN/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>php-bugs@gentoo.org</email>
-	<name>PHP</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-php/agavi/Manifest b/dev-php/agavi/Manifest
deleted file mode 100644
index 374d0c1d7ca5..000000000000
--- a/dev-php/agavi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX agavi-executable 443 BLAKE2B 6fa22601439d966a6dc0c9db98f3004f362e6345fed70053d47529184b8c806d8342b0ffbd63c6e5019d0266a3ca64654126e4cb8369b141d48679a16a0d2b3a SHA512 5e9e6583a53bb3a8eb8e31e1dd2853c00bfdb95f3531e3d78bae9b401b67dd2e3011721113a219d86f1fe771238c34ad2cb6d2afd03c9227d17124a6a38e09ae
-DIST agavi-1.0.8.tgz 2074126 BLAKE2B b38ff9f15e877604376c6704f007044ed4907df9dcd303646e85d54e98ae65f8f2182841001414ee9326e92515cabb0839f150544e8121c1f87ebf79e6dd4a41 SHA512 9e75ef0be455e329db8b2389d7fd7a7acb25d04dda6c31dea15496dc4e24ab17cf0e44e199d0c2a9fb11987331d582cf0c700adee815cac7276c32643b9183ee
-EBUILD agavi-1.0.8.ebuild 858 BLAKE2B a5c90e867181244004ce83fa6206fd686d9ccffb6216d17e1b2ee65364e8b87d334d70e8a39201ec353318bcb3330b6264e1a7ef9f44bec26fab3b20a9ec7f64 SHA512 8086155d88e61be70cf70f49eaa94f78f20af9ff7e6e025033bde4dad14828a4af0d40a502ce3487361391d9c1b83c7e8892d44677ac83a35a0658a8dce682e1
-MISC metadata.xml 593 BLAKE2B 6550ec4c010159035cd9a6f779da0163fc6597c67d647b41f9308d8eb40801ae500874fb1d5e2ddd59ae8f5f286721afb3dd4aae8972125fee9503b42b201da0 SHA512 307b41dc99780f39fcc273c2676f71334ddfd6a9c4ed24b58e1ce37c0bbfc7c94183cf1ca663f7e6aa38e89cf740b075ff929f8389bc2718501181c72f5e042e
diff --git a/dev-php/agavi/agavi-1.0.8.ebuild b/dev-php/agavi/agavi-1.0.8.ebuild
deleted file mode 100644
index 3b7ac5c7ebea..000000000000
--- a/dev-php/agavi/agavi-1.0.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="PHP MVC application framework"
-HOMEPAGE="http://www.agavi.org/"
-SRC_URI="http://www.agavi.org/download/${PV}.tgz -> ${P}.tgz"
-LICENSE="BSD LGPL-2.1+ icu unicode public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples +executable iconv session soap xmlrpc"
-
-RDEPEND="dev-lang/php[iconv?,session?,soap?,xml,xmlrpc(-)?]
-	executable? ( dev-php/phing )"
-
-DOCS=(
-	API_CHANGELOG
-	CHANGELOG
-	CHANGELOG-0.9
-	CHANGELOG-0.10
-	CHANGELOG-0.11
-	CONTRIBUTING.md
-	README.md
-	RELEASE_NOTES
-	RELEASE_NOTES-0.9
-	RELEASE_NOTES-0.10
-	RELEASE_NOTES-0.11
-	UPGRADING
-)
-
-src_install() {
-	einstalldocs
-	use executable && newbin "${FILESDIR}/${PN}-executable" "${PN}"
-	use examples && dodoc -r samples
-
-	insinto "/usr/share/php/${PN}"
-	doins -r src/*
-}
diff --git a/dev-php/agavi/files/agavi-executable b/dev-php/agavi/files/agavi-executable
deleted file mode 100644
index 06405d6ca2e7..000000000000
--- a/dev-php/agavi/files/agavi-executable
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# A (heavily) modified version of the agavi-dist script shipped with
-# the Agavi package.
-#
-
-# Set this to the path to the Agavi installation's source directory. This is
-# the directory that contains the `agavi.php' file.
-AGAVI_SOURCE_DIRECTORY="/usr/share/php/agavi"
-
-php -d memory_limit=2G \
-    -f "${AGAVI_SOURCE_DIRECTORY}/build/agavi/script/agavi.php" \
-    -- \
-    --agavi-source-directory "${AGAVI_SOURCE_DIRECTORY}" "$@"
diff --git a/dev-php/agavi/metadata.xml b/dev-php/agavi/metadata.xml
deleted file mode 100644
index 33a2e0ebdc07..000000000000
--- a/dev-php/agavi/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>php-bugs@gentoo.org</email>
-    <name>PHP</name>
-  </maintainer>
-  <use>
-    <flag name="executable">
-      Install the "agavi" executable used to manage projects. This
-      requires <pkg>dev-php/phing</pkg>, and may be omitted if you are
-      (for example) deploying an existing site to a production server.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">agavi/agavi</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-php/phing/Manifest b/dev-php/phing/Manifest
deleted file mode 100644
index f961b3821dc5..000000000000
--- a/dev-php/phing/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX autoload.php 418 BLAKE2B 8999ecee030a7d3eab49102bea8bf3aedff8c0e35021947279fee65ed9c0fa2f6bdc923a5e48437f314623cfed7545b3f4e30e8eb19610091c13a897c93278ca SHA512 81a22775a38d08e681e0f0a97fd6f125065be86fb491894f397cb25cc8240a7038b6cf061c77cc0c4837cc5a68aef909fe3a94ae84165a5f358050fac0164cd1
-DIST phing-2.16.1.tgz 4149013 BLAKE2B 266c124237d437361e9e18a42c9358fc18cfacfaa798a3a92a31858b7c1af847cde2cac43e0fcfe3759e8291639de9ec564f977fe00939316dbacdfd266e4e92 SHA512 e0832396dac9fbd43680f01acfa55f3ed2819726ace1db4ec9addf18c9c023c4f63143c6a63bbe1b16c2bd19dba54f503efdc77d772a3239bc8f9efe0ab375bb
-DIST phing-2.16.3.tgz 858508 BLAKE2B f1125420989af4ec9d1795044d96131a78012d5000eb8adaf9d076f4e2bbceeab0f11b9a24b79425fff179b4ec9dbe5a33aba65dbd4de6b70e64c1cb7c243004 SHA512 b564ddea969bd2a538e09768f6e4d88e9e61ecf6d783db4e328ef9be00099b1fee6ac6dac49b61bab6243e61969131d22869e95b8f063b9c233fd23afa314d30
-DIST phing-2.16.4.tgz 860196 BLAKE2B 0db5171e4076ab07de6118fb11daedef27247b785a2f15899d7b24c677edee334df2b2dbb1d7386e546cfa9d81cea942d967531793333d67d70e8898e2472978 SHA512 e3c0aa808e75c1f4ed73bd179261dfa5e6c52ae480567d4503cade939ef4b7430a1ac90097bfb246e0dd29e3bca6a22b200a995e4dd5442b283948aaf26ee311
-EBUILD phing-2.16.1.ebuild 1552 BLAKE2B 4ebbe638f537094ae2fc898f9fa9f3d1d6fa3955a4b0ba7f2da50cf03efc24e42917ccb02caed1855858ea8dea7885a0e5b7142848c42cec3cd35cfcc1842cbd SHA512 3e10a755f846b85b70e405839537c237c373b4c1a3428157077d2621ce023e4d0d59573e81d706a8cf85e505329b7511153bbc8e92292b7475db813a5ca55773
-EBUILD phing-2.16.3.ebuild 1549 BLAKE2B bb4a01d8042712ccc0e0562cd38be6569af3b368735013dd247ffc1de2c0aef73e7b707b443c14c379626aa334b1ddb3d4a5b659b49f1ee46d43b5d42d43231f SHA512 7936e5cb4e5d1487fd8ed20d44d334ec182ff285139a57f51c5fd5d4163bc0ae5d8f6c3619b9450b466d7572f2b641fb8065a1a40f3d1e5abb2631c51ffdd7ad
-EBUILD phing-2.16.4.ebuild 1549 BLAKE2B 3c13dc0d968ac4bb9c7d0ad921bf58c1ab99d48fb2c1321a1bb8d9d951a732498290c7ee81564c4b85b7644054b25e3eb6d6ab8b1886b6df73686f53688a59af SHA512 816cd9e9b7936e54fea2996108b949ef5d1440f35bb6ee6a9b46eef4454a2bd2859ac4ff987227aa3f535e40161f577df409994270611cb0689d10c58f7ab483
-MISC metadata.xml 472 BLAKE2B bc2e72f9fa751a9830abefe05cc7a62a7b7ad120395d20a32e2e3e6fe35f823fe8b8f3e13322419da3ef2236e25c0c409212ce32d15fee602df4e7652fc92e94 SHA512 c132fcac37c27cf61e67b53bf66c1a578ecddc3e79711117e467e45450cbe53a69636382c6e698100bbbe5e378c0db5896bb62badbce2cb803ee8e5d1de58930
diff --git a/dev-php/phing/files/autoload.php b/dev-php/phing/files/autoload.php
deleted file mode 100644
index 437a7dc7ee1e..000000000000
--- a/dev-php/phing/files/autoload.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$vendor_dir = '/usr/share/php';
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-  require_once("${vendor_dir}/Fedora/Autoloader/autoload.php");
-}
-
-/*
-  At least for the moment, we don't need to autoload the Phing classes
-  themselves, because the "require" statements are all still there.
-*/
-
-\Fedora\Autoloader\Dependencies::required(
-  array("${vendor_dir}/Symfony/Component/Yaml/autoload.php")
-);
diff --git a/dev-php/phing/metadata.xml b/dev-php/phing/metadata.xml
deleted file mode 100644
index f1663a24278b..000000000000
--- a/dev-php/phing/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>php-bugs@gentoo.org</email>
-    <name>PHP</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">phingofficial/phing</remote-id>
-  </upstream>
-  <use>
-    <flag name="zip">
-      Support zip archives by requiring said support in
-      <pkg>dev-lang/php</pkg>.
-    </flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-php/phing/phing-2.16.1.ebuild b/dev-php/phing/phing-2.16.1.ebuild
deleted file mode 100644
index 30583fdb8fe3..000000000000
--- a/dev-php/phing/phing-2.16.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="PHP project build system based on Apache Ant"
-HOMEPAGE="https://www.phing.info/"
-SRC_URI="https://www.phing.info/get/${P}.tgz"
-
-LICENSE="FDL-1.3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples minimal zip"
-
-RDEPEND="dev-lang/php:*[cli,xml,xslt,zip?]
-	dev-php/symfony-yaml
-	!minimal? (
-		dev-php/PEAR-HTTP_Request2
-		dev-php/PEAR-PEAR_PackageFileManager
-		dev-php/PEAR-VersionControl_SVN
-		dev-php/PHP_CodeCoverage
-		dev-php/phpDocumentor
-		dev-php/phpmd
-		dev-php/phpunit
-		dev-php/simpletest
-		dev-php/xdebug
-	)"
-
-S="${WORKDIR}"
-
-src_install() {
-	dodoc CHANGELOG.md CREDITS.md README.md
-	dodoc -r docs/docbook5/en/output/hlhtml
-	use doc && dodoc -r docs/api
-	use examples && dodoc -r docs/example
-
-	# Install the executable (and the PHP file it wraps) outside of the
-	# PHP include directory, since nobody should be including it.
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	insinto "/usr/share/${PN}/bin"
-	doins "bin/${PN}.php"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	# Phing tries to get the version number from this file.
-	insinto "/usr/share/${PN}/etc"
-	doins etc/VERSION.TXT
-
-	# The executable will only look for autoload.php in one place, so we
-	# create an (otherwise pointless) vendor directory to house it.
-	insinto "/usr/share/${PN}/vendor"
-	doins "${FILESDIR}/autoload.php"
-
-	# But install the library under /usr/share/php.
-	insinto "/usr/share/php"
-	doins -r "classes/${PN}"
-}
diff --git a/dev-php/phing/phing-2.16.3.ebuild b/dev-php/phing/phing-2.16.3.ebuild
deleted file mode 100644
index a85ce522c145..000000000000
--- a/dev-php/phing/phing-2.16.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PHP project build system based on Apache Ant"
-HOMEPAGE="https://www.phing.info/"
-SRC_URI="https://www.phing.info/get/${P}.tgz"
-
-LICENSE="FDL-1.3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples minimal zip"
-
-RDEPEND="dev-lang/php:*[cli,xml,xslt,zip?]
-	dev-php/symfony-yaml
-	!minimal? (
-		dev-php/PEAR-HTTP_Request2
-		dev-php/PEAR-PEAR_PackageFileManager
-		dev-php/PEAR-VersionControl_SVN
-		dev-php/PHP_CodeCoverage
-		dev-php/phpDocumentor
-		dev-php/phpmd
-		dev-php/phpunit
-		dev-php/simpletest
-		dev-php/xdebug
-	)"
-
-S="${WORKDIR}"
-
-src_install() {
-	dodoc CHANGELOG.md CREDITS.md README.md
-	dodoc -r docs/docbook5/en/output/hlhtml
-	use doc && dodoc -r docs/api
-	use examples && dodoc -r docs/example
-
-	# Install the executable (and the PHP file it wraps) outside of the
-	# PHP include directory, since nobody should be including it.
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	insinto "/usr/share/${PN}/bin"
-	doins "bin/${PN}.php"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	# Phing tries to get the version number from this file.
-	insinto "/usr/share/${PN}/etc"
-	doins etc/VERSION.TXT
-
-	# The executable will only look for autoload.php in one place, so we
-	# create an (otherwise pointless) vendor directory to house it.
-	insinto "/usr/share/${PN}/vendor"
-	doins "${FILESDIR}/autoload.php"
-
-	# But install the library under /usr/share/php.
-	insinto "/usr/share/php"
-	doins -r "classes/${PN}"
-}
diff --git a/dev-php/phing/phing-2.16.4.ebuild b/dev-php/phing/phing-2.16.4.ebuild
deleted file mode 100644
index 7d5bc50b8c70..000000000000
--- a/dev-php/phing/phing-2.16.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PHP project build system based on Apache Ant"
-HOMEPAGE="https://www.phing.info/"
-SRC_URI="https://www.phing.info/get/${P}.tgz"
-
-LICENSE="FDL-1.3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples minimal zip"
-
-RDEPEND="dev-lang/php:*[cli,xml,xslt,zip?]
-	dev-php/symfony-yaml
-	!minimal? (
-		dev-php/PEAR-HTTP_Request2
-		dev-php/PEAR-PEAR_PackageFileManager
-		dev-php/PEAR-VersionControl_SVN
-		dev-php/PHP_CodeCoverage
-		dev-php/phpDocumentor
-		dev-php/phpmd
-		dev-php/phpunit
-		dev-php/simpletest
-		dev-php/xdebug
-	)"
-
-S="${WORKDIR}"
-
-src_install() {
-	dodoc CHANGELOG.md CREDITS.md README.md
-	dodoc -r docs/docbook5/en/output/hlhtml
-	use doc && dodoc -r docs/api
-	use examples && dodoc -r docs/example
-
-	# Install the executable (and the PHP file it wraps) outside of the
-	# PHP include directory, since nobody should be including it.
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	insinto "/usr/share/${PN}/bin"
-	doins "bin/${PN}.php"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	# Phing tries to get the version number from this file.
-	insinto "/usr/share/${PN}/etc"
-	doins etc/VERSION.TXT
-
-	# The executable will only look for autoload.php in one place, so we
-	# create an (otherwise pointless) vendor directory to house it.
-	insinto "/usr/share/${PN}/vendor"
-	doins "${FILESDIR}/autoload.php"
-
-	# But install the library under /usr/share/php.
-	insinto "/usr/share/php"
-	doins -r "classes/${PN}"
-}
diff --git a/dev-php/phpmd/Manifest b/dev-php/phpmd/Manifest
deleted file mode 100644
index cd2de14932c2..000000000000
--- a/dev-php/phpmd/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX autoload.php 325 BLAKE2B 73cdf98199c37978e3a82ff70583220bc9a93494ca204d6a9da321b943407db5144ac376c40590a7bf784109633679a267838e9e52889977947395e5ee38528c SHA512 2cbb2349a598c9515cd995b22cb685d4ea6e9e5edc6c0e5ce602f7520c4aa70cc63872c31209720019c424ab188b063aedf7829899882608eafca9c83794d219
-DIST phpmd-2.6.0.tar.gz 57496 BLAKE2B 447e1b0a18372abc82746e8f2a47ea0df76fdeea51e7012ea63a0d644f7cd71790a3e354584d18f57bab3e7211f1037ff3f61aff367c3419caa44e77e79d1cbb SHA512 7c81bef8457f28dd40b908f535cf432d65ba6910c54f730b4d9f7a0bffa096653af029701a6ce4bd22910ec69453c5ff22c657100757d7d6eacff2226b597023
-DIST phpmd-2.8.2.tar.gz 68049 BLAKE2B 5135364fd77aa7e56bcbc7cda7b8bff1daf08211ff2a555aadb6f9fd6706d138bd89a3bfdb8b33f15df8746826d2c09435fa1d69109609a2e7b63843ba15e0fc SHA512 7c793181fa954b8c67334c0e0bdbb5bd93244233c404fb8b51ceacb3ede121e7fb66f69d555455fddbf333741a8d8636b85f20884a09988934e128f853f6faaa
-EBUILD phpmd-2.6.0.ebuild 1124 BLAKE2B 6e6e34fb5ddb5c00a14c76df601255368822c999ab8756fa35af633e4857759d6fa9d641ef25095bd5bbf703a46fef32d42c0d9e3e5f027e31811d425ce1ccac SHA512 1fe7d91ededcddcdc8b3b8b722be70592ee2f6d2fca08543a62abdc5e6dc7bbfee5cad97774fed9c3394134c230b35a45d2799043da2e609b36e64ae641ebc87
-EBUILD phpmd-2.8.2.ebuild 1121 BLAKE2B 6e0ecb3f10faa0d5c6aa42de1d6c1e68958a5e61aa3a9800c2204134e6d8a0675fdf71999d594b8c1880086d0fd816dd248ba71497243f93c4c1f2723c355c0f SHA512 9d28c9c06b28a7263cb0223e6abc5d77a857b20cff3bdb263230cda907610e70b0a411957acd8f3561d9972b93d754e1b3b39d8481404d3c47123ba3fef988e9
-MISC metadata.xml 326 BLAKE2B 1b709b3d804b596f4b2150d0e88acd87fdad0885ed32e000aa09d6b6e9fd477efd1fc12ad4caea0816ba3b22225ca41242fbe77ac2aa76adb3c4bac3e8552791 SHA512 1371d25f236599552ace64ec4c5d9e63f9a9ad889adf0f2c2d87442683eee593fbf4f50118bda94efd80acc0cb722b275baaace7bcbda33dd2edd344ace0cd55
diff --git a/dev-php/phpmd/files/autoload.php b/dev-php/phpmd/files/autoload.php
deleted file mode 100644
index b0fa4764c7ca..000000000000
--- a/dev-php/phpmd/files/autoload.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-  require_once('/usr/share/php/Fedora/Autoloader/autoload.php');
-}
-
-\Fedora\Autoloader\Autoload::addPsr4(
-  'PHPMD\\',
-  __DIR__ . '/../src/main/php/PHPMD'
-);
-
-
-\Fedora\Autoloader\Dependencies::required(
-  array('/usr/share/phpdepend/vendor/autoload.php')
-);
diff --git a/dev-php/phpmd/metadata.xml b/dev-php/phpmd/metadata.xml
deleted file mode 100644
index 740f8008e0e1..000000000000
--- a/dev-php/phpmd/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>php-bugs@gentoo.org</email>
-    <name>PHP</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">phpmd/phpmd</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-php/phpmd/phpmd-2.6.0.ebuild b/dev-php/phpmd/phpmd-2.6.0.ebuild
deleted file mode 100644
index dc08acef5020..000000000000
--- a/dev-php/phpmd/phpmd-2.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="PHP mess detector"
-HOMEPAGE="http://www.phpmd.org/"
-
-# The test suite is absent from the release tarballs because
-# the only build system that Composer understands is "cp -r".
-# To obtain the tests, we would need to grab a VCS snapshot.
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/php[xml]
-	dev-php/phpdepend"
-
-src_install() {
-	dodoc AUTHORS.rst CHANGELOG CONTRIBUTING.md README.rst
-
-	# The executable will only look for autoload.php in one place, so we
-	# create an (otherwise pointless) vendor directory to house it.
-	insinto "/usr/share/${PN}/vendor"
-	doins "${FILESDIR}/autoload.php"
-
-	insinto "/usr/share/${PN}/src"
-	doins -r src/main
-
-	# The executable uses relative include paths, so the one users will
-	# actually run needs to be symlinked into the source tree.
-	exeinto "/usr/share/${PN}/src/bin"
-	doexe "src/bin/${PN}"
-	dosym "../share/${PN}/src/bin/${PN}" "/usr/bin/${PN}"
-}
diff --git a/dev-php/phpmd/phpmd-2.8.2.ebuild b/dev-php/phpmd/phpmd-2.8.2.ebuild
deleted file mode 100644
index e760429e045b..000000000000
--- a/dev-php/phpmd/phpmd-2.8.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PHP mess detector"
-HOMEPAGE="http://www.phpmd.org/"
-
-# The test suite is absent from the release tarballs because
-# the only build system that Composer understands is "cp -r".
-# To obtain the tests, we would need to grab a VCS snapshot.
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/php[xml]
-	dev-php/phpdepend"
-
-src_install() {
-	dodoc AUTHORS.rst CHANGELOG CONTRIBUTING.md README.rst
-
-	# The executable will only look for autoload.php in one place, so we
-	# create an (otherwise pointless) vendor directory to house it.
-	insinto "/usr/share/${PN}/vendor"
-	doins "${FILESDIR}/autoload.php"
-
-	insinto "/usr/share/${PN}/src"
-	doins -r src/main
-
-	# The executable uses relative include paths, so the one users will
-	# actually run needs to be symlinked into the source tree.
-	exeinto "/usr/share/${PN}/src/bin"
-	doexe "src/bin/${PN}"
-	dosym "../share/${PN}/src/bin/${PN}" "/usr/bin/${PN}"
-}
diff --git a/dev-php/simpletest/Manifest b/dev-php/simpletest/Manifest
deleted file mode 100644
index 22f2ec21bce6..000000000000
--- a/dev-php/simpletest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST simpletest-1.1.7.tar.gz 763745 BLAKE2B 20c61b8dce5c628c6f26ef60b605b7ce3bb61c95a43a8f29bf5d176c03bc43f1e463d5ff301c93ddd71e43419773f2c99a3cb52561c6a8d6b0d586ef2341708e SHA512 105ce73a36bb3885ee27052b5bc7fde775ec04afc725ab45c79cf103639e9c7d8bd7f9e279f5b07ad5d1e9ccf3797741506e3bf07b57283b5f1b3f39901ad852
-EBUILD simpletest-1.1.7.ebuild 550 BLAKE2B b0c760fd6746b8a973af59e77e81507a9f6b311b02fc55d60c035d09cab4fd547dbbd095612315f579b4b52ecb30f2d445291ed92edb4ccd9739449882c1cbab SHA512 1d2f01ed7f9da2eca32283459a35668847e43c0329380f276fec6b315bf9301f73ca6af6733907df1ceba394b75881ed2113cd4ae0aaa769f36b1b8f68b34286
-MISC metadata.xml 326 BLAKE2B 0631a470b41bf37345bf3c64e4b8a63eb42ae42465a038dd67250a1308bc024fa04e09fc814338cc313bff8a486b1cc64408b020fb54a5da0b5ad134c26105c0 SHA512 d62ec5dfa0fd5453b7d174f410d676b071aee9f303373049a48619c9a3812e824536ab14d478748a4bb905628be2794362248a72633493ddf8388e99072985be
diff --git a/dev-php/simpletest/metadata.xml b/dev-php/simpletest/metadata.xml
deleted file mode 100644
index 6eef45d6cc49..000000000000
--- a/dev-php/simpletest/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>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">simpletest/simpletest</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/simpletest/simpletest-1.1.7.ebuild b/dev-php/simpletest/simpletest-1.1.7.ebuild
deleted file mode 100644
index 90a8205b07e1..000000000000
--- a/dev-php/simpletest/simpletest-1.1.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="A PHP testing framework"
-HOMEPAGE="http://www.simpletest.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php:*"
-
-src_install() {
-	local DOCS=( docs HELP_MY_TESTS_DONT_WORK_ANYMORE README.md TODO.xml )
-	einstalldocs
-
-	insinto "/usr/share/php/${PN}"
-	doins -r *.php extensions packages tutorials
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 27509fcf98ca..15057659d104 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/Rx/Manifest b/dev-python/Rx/Manifest
deleted file mode 100644
index a6ff5f43c2ca..000000000000
--- a/dev-python/Rx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST RxPY-3.2.0.tar.gz 891490 BLAKE2B 9d4e72c20544f1c607fa28963193ca88d7d6f63c0e4a3faa4e3aafba6cce5bb0c1b99ca7a8fb62052adc3dc02b7ca71d4c190704f18819fbb2598a38b2ce86da SHA512 08a53344ea374b025e51ebf3a7de5ea4e83c7062d0c9a3370b795a56156c8aa068f2b3415f6e5e9e2424a11bcef53a412fd0667afb0016b58b7d2a741ea1007a
-EBUILD Rx-3.2.0.ebuild 584 BLAKE2B 7a0a1213c358dc9d4630cb81993e2b2fc92ed95b4f886f6173ddab6b9db02e4494a68062b0780b11989c8321f9fe94d722e00e8a18f62f791f644da5fa040cb5 SHA512 db84008a1f254378eed449a45f585ab491cc303638deb0127a093e8968782a3a24ba87920b2a97f5eba08f33bf8c71bd313d9798a33635218662d0fc330e6700
-MISC metadata.xml 411 BLAKE2B 89b4b19b080c920f8c311727bf9bc24bf885304a2d20376d9b89c5e1e7ff44517c5c159d71220bcb5f35c03a622e3e53d44cd74a75cbb31b21eb4da7ee94c5a0 SHA512 72d7e845dada768226febee7590c96a6bf1490f54917b22aac6185b481092ecd79310da03270ad1b7145dee8cc51ab58e2c6673feac0f2b671b8051c13ae7749
diff --git a/dev-python/Rx/Rx-3.2.0.ebuild b/dev-python/Rx/Rx-3.2.0.ebuild
deleted file mode 100644
index d7dc1233b7a3..000000000000
--- a/dev-python/Rx/Rx-3.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-MY_P="RxPY-${PV}"
-DESCRIPTION="Reactive Extensions for Python"
-HOMEPAGE="http://reactivex.io/"
-SRC_URI="
-	https://github.com/ReactiveX/RxPY/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/Rx/metadata.xml b/dev-python/Rx/metadata.xml
deleted file mode 100644
index 6b756aa65624..000000000000
--- a/dev-python/Rx/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">Rx</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/bert/Manifest b/dev-python/bert/Manifest
deleted file mode 100644
index f4f39a7f934d..000000000000
--- a/dev-python/bert/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bert-2.0.0-remove-basestring-fix.patch 647 BLAKE2B 19b7b65b41be9c3b929c0dc2c92d5f511017f093e924813d547e29a763a0fc23d557798be5542a2991fdb2a808afc087a8e5c40dc03d06d1864564ef6a566aa9 SHA512 e4554308cd81c9b7bd69cac3eed2bb65ce604bfbc494f644b7b0dccbad527af973cb7afb4589b602457ecccbc893f50acbd1031aff87ed30b06f2824ff20d548
-DIST bert-2.2.0.tar.gz 3541 BLAKE2B 3f1f87d5205e1098f7d170da5a4e331f9421151af536c106ce2de925082c48bc739df4bbe2294a2dbe8f65d2ccc24a1d5bb944ad90e80e558cb5032e4fd7c639 SHA512 417c9752362c6dc7ade8078f259d1674fcddd09b6af595694a9c31e886dbb523460413d4bf041db29afd4d67a9d639ef8f9254077c31d1593657ad52f8ef45a8
-EBUILD bert-2.2.0-r1.ebuild 519 BLAKE2B 9074f3732c947d58509b1ed88e89c4f0169e87962e3b1a9b7e074725f25283bbd34b515a4e56f9ae4e3d665e55d582750f5ea8b73748b06c2c6c70288f154f7c SHA512 17fcbf16ef8bc545718f52ddd3344cc24082cc49420bac723850c636612994f83e16a35cc04af5dc5852ee036490704a3d5d0bccf4e479b566a1a352231ca9c4
-MISC metadata.xml 390 BLAKE2B a4e19fdfa922722d9567edc7fa88c44214bf9a7d2944e8cb2932d425d621b17ddb35ad24fcbc6cd5ab38c117845596eb635dc415f510169ec687517f2f3b8fd9 SHA512 ba375d5d896b29c74a72bb34d2f34da958f4c2a29965e9052fc790d91d8667d96d539708afd51654dcc0dddb77663a3e29418603dd63213fe980ca441bd45c66
diff --git a/dev-python/bert/bert-2.2.0-r1.ebuild b/dev-python/bert/bert-2.2.0-r1.ebuild
deleted file mode 100644
index c23e0654aa0d..000000000000
--- a/dev-python/bert/bert-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,21 +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..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="BERT Serialization Library"
-HOMEPAGE="https://pypi.org/project/bert/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="dev-python/basho-erlastic[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-remove-basestring-fix.patch" )
diff --git a/dev-python/bert/files/bert-2.0.0-remove-basestring-fix.patch b/dev-python/bert/files/bert-2.0.0-remove-basestring-fix.patch
deleted file mode 100644
index 3854e95cdb3a..000000000000
--- a/dev-python/bert/files/bert-2.0.0-remove-basestring-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bert/codec.py	2018-03-07 20:11:38.117925147 -0800
-+++ b/bert/codec.py	2018-03-07 20:12:19.681258078 -0800
-@@ -92,7 +92,7 @@
-             return (Atom("bert"), Atom("false"))
-         elif obj is None:
-             return (Atom("bert"), Atom("nil"))
--        elif isinstance(obj, basestring) and not self.__is_ascii(obj):
-+        elif isinstance(obj, str) and not self.__is_ascii(obj):
-             return (Atom("bert"), Atom("string"), Atom(self.encoding.upper()), obj.encode(self.encoding))
-         elif isinstance(obj, dict):
-             return (Atom("bert"), Atom("dict"), [(self.convert(k), self.convert(v)) for k, v in obj.items()])
diff --git a/dev-python/bert/metadata.xml b/dev-python/bert/metadata.xml
deleted file mode 100644
index 780239f4c9ac..000000000000
--- a/dev-python/bert/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">bert</remote-id>
-    <remote-id type="github">samuel/python-bert</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/flask-assets/Manifest b/dev-python/flask-assets/Manifest
deleted file mode 100644
index 6ceb1d441519..000000000000
--- a/dev-python/flask-assets/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flask-assets-0.12.tar.gz 23017 BLAKE2B df7eb45a9abdd0be3f23655f49d30b53c90ea204fa0c91c286657d6b12750c7cdb11e78c2c8e140dc8677c90f52fa44c7d776c446c8fd4f92a060a570bdacb2c SHA512 28a5b275ba002c32e53200038673e507556d0acc12ccc9d2678ea3c179aa93eff275dd8fca9686186d20b65faa1600902e892a6aa4043df449c399008a37179d
-EBUILD flask-assets-0.12.ebuild 483 BLAKE2B a186a315ccf7e286c9ee81d02ddd3680a6f17705652ff0702d3976730e85cc870da0dba8e52fa7c4c3d5a4766a061bb30e2ff7f29cb31264dda450e0f67a1f06 SHA512 caf5384979f98385021d0cbac5c9e3a3c4dbfed5bd06b282deab86d7493878c6b4c1141683cef679f9357faea771dc57da1d9a519b8f8f54fb54406521ee2bac
-MISC metadata.xml 410 BLAKE2B 8511207736a655a7ff56cb6047315cb3ed834007e007c1abb2f96606ff47edc8a47705217d7866c3f31ead0a9f80d03973288d23a6945527bda5946c941e5cd1 SHA512 22fdf365db2d96670a4c42f9621c0d23ee5c8e4e11f2917b65aaa0548998a1e9bf73bdd3d5c975e0d06330689be6a59f691c3a8d24b1c94790998fa102434bee
diff --git a/dev-python/flask-assets/flask-assets-0.12.ebuild b/dev-python/flask-assets/flask-assets-0.12.ebuild
deleted file mode 100644
index 851c9b12a082..000000000000
--- a/dev-python/flask-assets/flask-assets-0.12.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Flask webassets integration"
-HOMEPAGE="https://github.com/miracle2k/flask-assets"
-SRC_URI="https://github.com/miracle2k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-RDEPEND="
-	>=dev-python/flask-0.8
-	dev-python/webassets"
-BDEPEND="
-	${RDEPEND}"
diff --git a/dev-python/flask-assets/metadata.xml b/dev-python/flask-assets/metadata.xml
deleted file mode 100644
index 005f8e3c2150..000000000000
--- a/dev-python/flask-assets/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>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">miracle2k/flask-assets</remote-id>
-		<remote-id type="pypi">Flask-Assets</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
deleted file mode 100644
index 9f83950936b6..000000000000
--- a/dev-python/gevent/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gevent-21.12.0.tar.gz 6201851 BLAKE2B 8c02f42d6024e912e51754df876d4f4895acdf466f2400e9fdca69ad5c7c77df7ee05f3e4c2c1e1d5731c282b62d5c940d9ca6396c27d6fe6e8a0ec13013591c SHA512 805ddb475281b6c4c46cdf5a714915b6612512745121e7b153f3d33f3460135efa4994e0ff1601402d4f7b80d285cbfdc0d5d93799fbeb8ddbf2a52888cd91ad
-DIST gevent-22.10.1.tar.gz 6543407 BLAKE2B 5686a9b03d74b756b4b3d387eec5318a0edfa1de46d7c19266175111b02ecab85bc75f7b777cf708dcae58a04c564c2ec0488d19f8a8128563d38dc8b6f0606c SHA512 b91638a0e36e1e6fdc15886b78586660046134c18786bbbf2498b940abddad18e4200e0bfc759afd40b5d8304c2bb8ae131c39f7cf84c3b675a2f3d51ed261c6
-EBUILD gevent-21.12.0-r1.ebuild 2593 BLAKE2B 040364f8cb75ee3dcb3737f6c25459ee02df6413dcda1480fcafc4dfebf304f4aab68b71d39b33c74710ce52afe38972f0bc9e0afa0d278307a1f0694892741a SHA512 54b7bfca9903bf9af2f65cb3ca94b13178421e69ec60e758fb73c256f2a1eb488aee33ec14fccbd5baad6820c1ae9fe3b13edef8a296183fe5d3a0c573fdd051
-EBUILD gevent-22.10.1-r1.ebuild 2446 BLAKE2B 2c594801ea1812f4e147d86413b80842728538db09d37b1dcd7a91f1b1e46474aa90239a38e7171e71549512c42b42ca6b7de213c87ad9c31f427dce66bcd825 SHA512 7d46ea4f3ea5e2ce74491ea42d1e1d7891ceb8ebf8a25c6b6d67b5286aa388b5b04a8a9c347c0ad8aeb1ea50527a37d98f69bd5ba2e22e702dd549af0578674c
-MISC metadata.xml 375 BLAKE2B 684f4f58e0d1f61195c30baa6b962f877ce7243305feb39a60a0a3dbd34e1095194be9b148644914bc1fbb74ac3bd5a692fd90343ccb9b2ec7bffd518ddd2492 SHA512 84242102ecfed7551ec1e95d3dee7ef56e154db34e3eb3e8255974ea48e879220b0b38acffa61a760521a1278c5074a20c22426e18bd0530935fbd671a2ea60d
diff --git a/dev-python/gevent/gevent-21.12.0-r1.ebuild b/dev-python/gevent/gevent-21.12.0-r1.ebuild
deleted file mode 100644
index 14068454cad1..000000000000
--- a/dev-python/gevent/gevent-21.12.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/libev-4.31:=
-	dev-libs/libuv:=
-	<dev-python/greenlet-2[${PYTHON_USEDEP}]
-	>=net-dns/c-ares-1.12:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc
-
-# Tests take long and fail terribly a few times.
-# It also seems that they require network access.
-#RESTRICT="test"
-
-python_prepare_all() {
-	export GEVENTSETUP_EMBED="false"
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_test() {
-	# Just in case.
-	export GEVENTTEST_USE_RESOURCES=-network
-
-	cd src/gevent/tests || die
-
-	# Tests which need network but aren't marked as such
-	echo "test__getaddrinfo_import.py" >> tests_that_dont_use_resolver.txt || die
-	echo "test_socketqcqqrwns.py" >> tests_that_dont_use_resolver.txt || die
-
-	# Test hangs (testPeek)
-	echo "test_socket.py" >> tests_that_dont_use_resolver.txt || die
-
-	# TODO: figure out how to make them work and not hang
-	#GEVENT_RESOLVER=ares \
-	#       "${EPYTHON}" -m gevent.tests \
-	#       --verbose \
-	#       -uall,-network \
-	#       --config known_failures.py \
-	#       --ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_RESOLVER=dnspython \
-		"${EPYTHON}" -m gevent.tests \
-		--verbose \
-		-uall,-network \
-		--config known_failures.py \
-		--ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_RESOLVER=thread \
-		"${EPYTHON}" -m gevent.tests \
-		--verbose \
-		-uall,-network \
-		--config known_failures.py \
-		--ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_FILE=thread \
-		"${EPYTHON}" -m gevent.tests \
-		--verbose \
-		-uall,-network \
-		--config known_failures.py \
-		test__*subprocess*.py || die
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gevent/gevent-22.10.1-r1.ebuild b/dev-python/gevent/gevent-22.10.1-r1.ebuild
deleted file mode 100644
index 01efb01c343e..000000000000
--- a/dev-python/gevent/gevent-22.10.1-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="
-	https://www.gevent.org/
-	https://github.com/gevent/gevent/
-	https://pypi.org/project/gevent/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/libev-4.31:=
-	dev-libs/libuv:=
-	<dev-python/greenlet-2[${PYTHON_USEDEP}]
-	>=net-dns/c-ares-1.12:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc
-
-python_prepare_all() {
-	export GEVENTSETUP_EMBED="false"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Just in case.
-	export GEVENTTEST_USE_RESOURCES=-network
-
-	cd src/gevent/tests || die
-
-	# Tests which need network but aren't marked as such
-	echo "test__getaddrinfo_import.py" >> tests_that_dont_use_resolver.txt || die
-	echo "test_socketqcqqrwns.py" >> tests_that_dont_use_resolver.txt || die
-
-	# Test hangs (testPeek)
-	echo "test_socket.py" >> tests_that_dont_use_resolver.txt || die
-
-	# TODO: figure out how to make them work and not hang
-	#GEVENT_RESOLVER=ares \
-	#       "${EPYTHON}" -m gevent.tests \
-	#       --verbose \
-	#       -uall,-network \
-	#       --config known_failures.py \
-	#       --ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_RESOLVER=dnspython \
-		"${EPYTHON}" -m gevent.tests \
-		--verbose \
-		-uall,-network \
-		--config known_failures.py \
-		--ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_RESOLVER=thread \
-		"${EPYTHON}" -m gevent.tests \
-		--verbose \
-		-uall,-network \
-		--config known_failures.py \
-		--ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_FILE=thread \
-		"${EPYTHON}" -m gevent.tests \
-		--verbose \
-		-uall,-network \
-		--config known_failures.py \
-		test__*subprocess*.py || die
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gevent/metadata.xml b/dev-python/gevent/metadata.xml
deleted file mode 100644
index 92f238969d44..000000000000
--- a/dev-python/gevent/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">gevent/gevent</remote-id>
-    <remote-id type="pypi">gevent</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
deleted file mode 100644
index 29f3199ad24f..000000000000
--- a/dev-python/geventhttpclient/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST geventhttpclient-2.0.2.tar.gz 73821 BLAKE2B 6e12c0a7eabf2d15540192e161f27e4ef5aa771ac8b60deb00c0dbfd804e5d81f729609649c88b9b8cd51125b06afaf3d31367896ada339731ba3606ef64edda SHA512 d22453bc4fef8d9ad3b98a137d74df1647c69c594a8fa4b49848e71ca472373e44c70e3ed3798d73aca9089495cff1b5f888d1b1e39b1da60ee9052935b7b0a1
-DIST geventhttpclient-2.0.7.tar.gz 75969 BLAKE2B f749e42ccfd981cc67c1692695454f410708ca75f24b2ae6408556bda07d1e45f367421fbddc203f46ac82daf539d192fdab16245a20b6f3f883478c8b8e354f SHA512 7570b297c13a28761ec639721ecb44fdcac46141167e67ceac4e632058458b62acef0513c794c80e44980747807a175e7a39e6c5ff272be3ceddbeca9f629114
-DIST geventhttpclient-2.0.8.tar.gz 76142 BLAKE2B f55847347861680d227830c818487cfc444ffd822c54480f416874e71901b541d374f84c354247d9537dc3e5796790bf316139d819264fcba09ce565b569cb2a SHA512 0de485c4efff810da561e4bef67a19d763ccbff4d3b952aa57e576ba4d50a97fe5f818f0c927548643d1f68fb6a3db405669c58c2298a3ea809179f5a97cb810
-EBUILD geventhttpclient-2.0.2.ebuild 1537 BLAKE2B 1ef76232051fb2b29c2feefd2861a279ef6230f10c8d51a7653fb02d1d584b5d8d5766b301530b0df460bb873459a9482f02fb3538d982901a858c63746d4727 SHA512 830b8b365c850876e18de556f426e3ad061cff7c126b916dd662ee6ace14d1a83b733c0238fa33060e557f9a3ce78a5b4d3fc0b7ad15e7e160029852f50f6908
-EBUILD geventhttpclient-2.0.7.ebuild 1541 BLAKE2B 133d5086e2ac682cc5d41f6153f9579f4337ce70f6c5fe9844e38e5c86f5ef379b39a22480ff3a8c01df0c39b1fdc00ff7730d9719f322c756af3fbaa782e3ff SHA512 765b80365d81f20eded6be8ac7d3ef6dffe4dce45e938aa596c0e01a083501fb22c151500b3d10ed15d7e11e45f93e2f65333718ae00e70dbe017fcaa5870b8f
-EBUILD geventhttpclient-2.0.8.ebuild 1541 BLAKE2B 7a80475bc8a8efa427497e77fac36b0f42b250cf0db89441f7413cd09ee90fec31c2b5fc1fdb0e514ec09cef5dfb89a9430d0838559791dcb0dba8c8900dbb4d SHA512 956fcf3a5d86cfeaf576d2b9147142ce34fce720cea447aecc8c95d86daace736be1ef17e377dea841871fc884ea5d501fee37a6bd61b367be7eba5eb8590933
-MISC metadata.xml 580 BLAKE2B 24b9860ee1f361f1ced81967a404c4cf773e415c053ac83ff0b2bb97bcbbaa5cbba4e7faddcb615379d3057d2c3c28d59f9c8a0a36135edf9165615610ecce45 SHA512 5c3a892358d1fc3594d08c3551b441eaa2e38c60cd06952a62631a4ac687ab730be559ecfb17f9ab7878d0052b4ff7e03d6d49fd1a277bff71c1ef4fc369daf8
diff --git a/dev-python/geventhttpclient/geventhttpclient-2.0.2.ebuild b/dev-python/geventhttpclient/geventhttpclient-2.0.2.ebuild
deleted file mode 100644
index 350f1a9322de..000000000000
--- a/dev-python/geventhttpclient/geventhttpclient-2.0.2.ebuild
+++ /dev/null
@@ -1,52 +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 distutils-r1
-
-DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
-HOMEPAGE="
-	https://github.com/geventhttpclient/geventhttpclient/
-	https://pypi.org/project/geventhttpclient/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/gevent[events(+),${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Avoid ModuleNotFoundError for tests we skip later
-	sed -e '/^import dpkt.ssl/d' -i src/geventhttpclient/tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# These SNI tests require dpkt which is not in the tree
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Skip tests which require internet access
-	epytest -m "not online"
-}
diff --git a/dev-python/geventhttpclient/geventhttpclient-2.0.7.ebuild b/dev-python/geventhttpclient/geventhttpclient-2.0.7.ebuild
deleted file mode 100644
index 5850080039c3..000000000000
--- a/dev-python/geventhttpclient/geventhttpclient-2.0.7.ebuild
+++ /dev/null
@@ -1,52 +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 distutils-r1
-
-DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
-HOMEPAGE="
-	https://github.com/geventhttpclient/geventhttpclient/
-	https://pypi.org/project/geventhttpclient/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/gevent[events(+),${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Avoid ModuleNotFoundError for tests we skip later
-	sed -e '/^import dpkt.ssl/d' -i src/geventhttpclient/tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# These SNI tests require dpkt which is not in the tree
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Skip tests which require internet access
-	epytest -m "not online"
-}
diff --git a/dev-python/geventhttpclient/geventhttpclient-2.0.8.ebuild b/dev-python/geventhttpclient/geventhttpclient-2.0.8.ebuild
deleted file mode 100644
index 309aa9811720..000000000000
--- a/dev-python/geventhttpclient/geventhttpclient-2.0.8.ebuild
+++ /dev/null
@@ -1,52 +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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
-HOMEPAGE="
-	https://github.com/geventhttpclient/geventhttpclient/
-	https://pypi.org/project/geventhttpclient/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/gevent[events(+),${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Avoid ModuleNotFoundError for tests we skip later
-	sed -e '/^import dpkt.ssl/d' -i src/geventhttpclient/tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# These SNI tests require dpkt which is not in the tree
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Skip tests which require internet access
-	epytest -m "not online"
-}
diff --git a/dev-python/geventhttpclient/metadata.xml b/dev-python/geventhttpclient/metadata.xml
deleted file mode 100644
index f7551c444a51..000000000000
--- a/dev-python/geventhttpclient/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sbraz@gentoo.org</email>
-		<name>Louis Sautier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">geventhttpclient</remote-id>
-		<remote-id type="github">geventhttpclient/geventhttpclient</remote-id>
-		<bugs-to>https://github.com/geventhttpclient/geventhttpclient/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/libpy_simdjson/Manifest b/dev-python/libpy_simdjson/Manifest
deleted file mode 100644
index 1a68874eba46..000000000000
--- a/dev-python/libpy_simdjson/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libpy_simdjson-0.4.0.tar.gz 3319968 BLAKE2B bb24af861cda5973af73718f098a514e74e852f59703c694a7bd4875f183cb0daacab7cedca9757df42557f6d1d9e2408e15443977a1dbdd6bb12cd09a488774 SHA512 c3a8c1a24f338d1fdcd0a07c64da8887b0e6e44dc701ddc23f27d569319c01d9f7ff9198de6d828e2925c2fd6444b64e3273f4e16fc9d5c1a173c6edfaccd83f
-EBUILD libpy_simdjson-0.4.0.ebuild 809 BLAKE2B c58b2bf07a7739e9e8c90ed14b38ce69a03ea5b253edfd6b00eadc79fa102a86e8419ef5195c64531b126f3510d2da56266c5778f5547832b04c7000be7c9dcb SHA512 c61894c0b8750147a52b8880696bd02aaadcb15b31aca1908f682138805134d186251b9d080037c1a12dba8ca5e47859f4ad0cbf0cbf5ce0484f1a0d7faee232
-MISC metadata.xml 393 BLAKE2B 671033d018db6de39f55789238e1d3ea0cd3faf93fd100047a278c2d3a2c86090f89de379a0ebb205f3fc030ad5ee8976adb50e6239bafbe5e24395abfdb6072 SHA512 f6d1b8e24d6044f597ed3bbdbb3afad9c8ff087dc18e4b813674147c9066e220c875a690b8d475c90f0d54bc6588de5da86ad73162090ae5af407ac443dcee88
diff --git a/dev-python/libpy_simdjson/libpy_simdjson-0.4.0.ebuild b/dev-python/libpy_simdjson/libpy_simdjson-0.4.0.ebuild
deleted file mode 100644
index 9b3c74690bbe..000000000000
--- a/dev-python/libpy_simdjson/libpy_simdjson-0.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for simdjson using libpy"
-HOMEPAGE="https://github.com/gerrymanoim/libpy_simdjson"
-SRC_URI="https://github.com/gerrymanoim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-cpp/range-v3:=
-	dev-libs/simdjson:=
-	dev-libs/libpy[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# benchmark tests have extra dependencies
-	rm libpy_simdjson/tests/test_benchmark.py || die
-
-	sed -e 's:werror=True:werror=False:' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libpy_simdjson/metadata.xml b/dev-python/libpy_simdjson/metadata.xml
deleted file mode 100644
index 2b81aa958c23..000000000000
--- a/dev-python/libpy_simdjson/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">libpy-simdjson</remote-id>
-		<remote-id type="github">gerrymanoim/libpy_simdjson</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-html/Manifest b/dev-python/pytest-html/Manifest
deleted file mode 100644
index c0fc872769eb..000000000000
--- a/dev-python/pytest-html/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-html-3.1.1.tar.gz 38548 BLAKE2B d2491280ceb4524a10a46891448bb63fe997a4be82062e727fb1d79ef6154a0b4229bbec27c6601372776f7c8dd124aab5d4968482fc24ad24330db5d2520187 SHA512 78091b485d153b54cd76abb8cfeb6494830b1b51a10dc0c00c73eccf67962d2805e3f83972c7ccfd1f877a939b582f80d5ddd5273fd1ddcac2a1a9c2eb121300
-EBUILD pytest-html-3.1.1.ebuild 773 BLAKE2B 7abea4bab14bd19d440e0ad9ab1907dbddadf9dfa53e8bbdd851221c2f0fb2f0770e795f3fa2b27f2c84ee4359221ffd307fd5727286f4cc50d0fd56d5b52d49 SHA512 4fc675e4646b3093488f1a444335b9e2f75286ece6f25688608db932e8b947c9a9f2e136d792fdae14a108be4ce31aeeb92b8772001bf309eb980766584ed538
-MISC metadata.xml 355 BLAKE2B 5446d5fe85ef69fa4a60a8fb32cfa805d61cd958cf2676c1c6727ce229aac8b115eb4a98d6865e8a4e7474517471b2dfbb28e72dee75796d5b119c98cd7e163b SHA512 ef1ac38e97a25941605ef44f6d872d30a8bcebf2997cd732b5dee2aef948be2346eaa9ae360953ce02c7b1223b454470c1d4328f24b0fa8c6a3d61bd0af8590a
diff --git a/dev-python/pytest-html/metadata.xml b/dev-python/pytest-html/metadata.xml
deleted file mode 100644
index 177f435f2933..000000000000
--- a/dev-python/pytest-html/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>
-	<upstream>
-		<remote-id type="pypi">pytest-html</remote-id>
-		<remote-id type="github">pytest-dev/pytest-html</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/pytest-html/pytest-html-3.1.1.ebuild b/dev-python/pytest-html/pytest-html-3.1.1.ebuild
deleted file mode 100644
index 192558f52378..000000000000
--- a/dev-python/pytest-html/pytest-html-3.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Plugin for generating HTML reports for py.test results"
-HOMEPAGE="https://github.com/pytest-dev/pytest-html/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-# Lots of test failures...
-RESTRICT="test"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-metadata[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
-		py.test -v -r a testing/test_pytest_html.py || die
-}
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
deleted file mode 100644
index f6752d36024b..000000000000
--- a/dev-python/pytest-salt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pytest-salt-2020.1.27-r2.patch 744 BLAKE2B 43eadb0fb01406efb9e67388a6b0ca5a021ae6ec622ec5dd5dfb1ab9575489c711dc805ce64e1373e4a0044490d71132ff4eb9584f3e9f2fb043a168d18d8349 SHA512 b0a0d56dc7d5ab43a1970488128c97de5f2c266523889896cab53040cb8eb426bda88cd8d641d706b6d09fbaf1b3f439cbfe947264cc004e766e6cc84350076f
-DIST pytest-salt-2020.1.27.tar.gz 64141 BLAKE2B 2b9261af2de28f8dce1abcd71b586594075916c8a5dbb27a24f15b9d95a575624be118d1c742f02020d3b968ffa4654cf6cd0dabefffe6876b87a4d1d58c3d60 SHA512 b0632e21f1ea5c3b57eb681cd8b270721cafd270321b708fca65427fc89817ed9e9a4216a520f35988c6866b1ed76ed84838009da9052a11cf8782d4dcf118ba
-EBUILD pytest-salt-2020.1.27-r3.ebuild 1124 BLAKE2B 82db57b425f082d43fa03cbb2788d6492d5678696ad881988b7555bf492b086854a300b513ca34bd380166ba7ecef0b8a3b0a4e8e26adab7ad36c8ffc583eff8 SHA512 b21a7c8bb4de543414346f080f682fd7a8867cddd77b60e13a6c187fad97e9f95a059bf3b9badb5751f3c1a79b72e2a369676de50ccee772844f65ddf7fa31d7
-MISC metadata.xml 324 BLAKE2B 27b257868d62a71fa6682c3cbdf197679770a52df2e203de05a69c4e3c64ec69d3b87438b4122ef2393128ee4f85d8851dbb75c3bb8ec12fd70994fe63e8dca7 SHA512 bb45c2e8139cc8c008dd79f4a590c12bd843b6295c8e4a9456e888f9b630efc23845e52cd9f660e09438539a8740a43eb61548f532236b88a61191643bb813ed
diff --git a/dev-python/pytest-salt/files/pytest-salt-2020.1.27-r2.patch b/dev-python/pytest-salt/files/pytest-salt-2020.1.27-r2.patch
deleted file mode 100644
index 35dca262478b..000000000000
--- a/dev-python/pytest-salt/files/pytest-salt-2020.1.27-r2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fixes a Doctestitem has no attribute 'fixturenames'
-Fix by David Denoncin based on https://github.com/saltstack/pytest-salt/issues/48
-
---- a/pytestsalt/fixtures/daemons.py  2021-03-02 15:19:40.500254583 +0100
-+++ b/pytestsalt/fixtures/daemons.py	2021-03-02 15:20:40.706920871 +0100
-@@ -1658,7 +1658,6 @@
-     Fixtures injection based on markers
-     '''
-     for fixture in ('salt_master', 'salt_minion', 'salt_call', 'salt', 'salt_key', 'salt_run'):
--        if fixture in item.fixturenames:
--            after_start_fixture = '{}_after_start'.format(fixture)
-+        if fixture in getattr(item, 'fixturenames', ()):
-             if after_start_fixture not in item.fixturenames:
-                 item.fixturenames.append(after_start_fixture)
diff --git a/dev-python/pytest-salt/metadata.xml b/dev-python/pytest-salt/metadata.xml
deleted file mode 100644
index 1c259ca3d683..000000000000
--- a/dev-python/pytest-salt/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>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pytest-salt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
deleted file mode 100644
index 3548c336d99d..000000000000
--- a/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-DESCRIPTION="PyTest Salt Plugin"
-HOMEPAGE="https://github.com/saltstack/pytest-salt"
-SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-
-# See bug #740882 re salt/tornado dependency
-RDEPEND="
-	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.2.0[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	|| (
-		app-admin/salt[${PYTHON_USEDEP}]
-		dev-python/tornado[${PYTHON_USEDEP}]
-	)
-"
-#BDEPEND="
-#   test? ( app-admin/salt[${PYTHON_USEDEP}] )
-#"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2020.1.27-r2.patch"
-)
-
-# Tests need network access
-RESTRICT="test"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/requests_pkcs12/Manifest b/dev-python/requests_pkcs12/Manifest
deleted file mode 100644
index f3c5b4b7fb29..000000000000
--- a/dev-python/requests_pkcs12/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST requests_pkcs12-1.14.tar.gz 4896 BLAKE2B a8a3f0796092c66c210616ace20fb15cd82beb3ff3c0c0d1f2dccbd1ed7d62092a1faa69986e4f23d0b94af54f7f9b8819730f0c04c251fb751256dbd4c6bb56 SHA512 2d97b44b676c9e6e6eef127494d6c4a34179b8f69d8674ad9ecd9aa4171e5eb46a29a45ad5b5e8fe9facf234c1b7645fc5c87cef2b336beab941ce3e684c6d25
-EBUILD requests_pkcs12-1.14.ebuild 540 BLAKE2B 5be443d6d3969647f16f83df6763b91785b002df2a7c6501b83ca2b907daf11544041c621f18165fed22f7edc32ac21cd6933010d09e349ff6380b97583f471e SHA512 17205325fd6e2b4a02a033dacd0adcf81834989eb6ce122d2cd566b2841a0fd282ae12b5eed70548765bacf74191b3fc7bcc9bef01e265b6576718076544274a
-MISC metadata.xml 556 BLAKE2B 36d568f8279e130486b6946550b2acce63e87f44f2b65f2c5df69d97880bb6fb053d30335a6ea6400e8d0290d44a79f7ef757cfea1feda109ee05c4e14ec8d45 SHA512 220eee0f3b7e87493ec2ceb7fa80b8a7dade81fd02eb8b39f7488946c41a861e9f57ebdacbae153d4e6ed05c7c9382c6796152b7561fdad0401952ad3b0406e9
diff --git a/dev-python/requests_pkcs12/metadata.xml b/dev-python/requests_pkcs12/metadata.xml
deleted file mode 100644
index 1136cb253f34..000000000000
--- a/dev-python/requests_pkcs12/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>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
-	<longdescription lang="en">
-		Adds PKCS#12 support to the Python requests library in a clean way, without monkey patching or temporary files.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">m-click/requests_pkcs12</remote-id>
-		<remote-id type="pypi">requests-pkcs12</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/requests_pkcs12/requests_pkcs12-1.14.ebuild b/dev-python/requests_pkcs12/requests_pkcs12-1.14.ebuild
deleted file mode 100644
index 24765222be05..000000000000
--- a/dev-python/requests_pkcs12/requests_pkcs12-1.14.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Adds PKCS#12 support to the Python requests library in a clean way"
-HOMEPAGE="https://github.com/m-click/requests_pkcs12"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND=""
-
-RDEPEND="
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-RESTRICT="test" # no tests
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index d27057b7fa77..e8bd4e142a2a 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,5 +1,5 @@
 DIST rpyc-5.2.3.tar.gz 1267934 BLAKE2B 3c03d587293375f875de31d6a89ba07b47bd4f4ff9fd5c7b23ed0c83e420e9d2bab08844c3538299797203ac90e7e81b955db02de70bf1cee5ea59d8475a6848 SHA512 4be189a719be100886e08d9c2c0769d12b7d1c5e167c197ebee1a3db542e228f2124fea976e5af3680136b298ce4632c79b2f302128dff31ebf45dcf52a9743f
 DIST rpyc-5.2.3_p1.tar.gz 1269198 BLAKE2B 288568fcd34787850968d4e3fd9ca7c2d29e506f1331b746104760e678dfef43fd30b08f68b3bdda6df84d488f88dc76cfdd23d5a5ad0a4cefeab468ac6a1b0b SHA512 4b29899a51364779185d2b56f5d5ee4c650c40b8322e5594500222fdcec85414cdbabd41437467e2ff73124a79e8c9cde23dfe89138abb935732ccaba69de2bb
-EBUILD rpyc-5.2.3-r3.ebuild 2089 BLAKE2B 3d33a3520dca7ef1bbdfb477548e943ef76aee15bc8bf0f9e713d7108875e46d6ee5d9bb9d4610934a869a441a67a320889d0131c032351a9e963a077294640b SHA512 ada7525c16934719dd52ee96bce609d2831883a55bc544be8fe7ff341322a4ae21601e696c3ef5e8b4cac3468e9903e7b9155b1223b68c32dfce5f5c7d6aa8b0
+EBUILD rpyc-5.2.3-r3.ebuild 2007 BLAKE2B 098b93db8c01dec350b65af4dba8eecdc3130b993550bf3ce672534fa79112737df958499313570b4b32509f56e52e6d426535405b28727d9fd0cdf0eced8928 SHA512 aa6ac17c3aa2350a5313227911c45c6637aee59060693c976b0b9abd147799620ed1d4bd819c2f415926b10b8d3ef7f667c2812ccf5be7499f582093d6b5c5da
 EBUILD rpyc-5.2.3_p1.ebuild 1936 BLAKE2B c79f627bc722b32027051cf245ed9263c5d53271e95f2f5c751b16bd8992cd617f35722e77ca06df5b72cee0c91c730f2e2d21623422729c42859ce53ee010a4 SHA512 6bffe86a512bb8bda622e1f7ef04cabc1d44f865a9fb8bc00f4259e85e985236f8f733c98870b93e348286a62a0a3b31c8b337870c0e48a3907c727b87cf89b7
-MISC metadata.xml 736 BLAKE2B d6f6d76b5118e6f8aef119b975572ba95875f89bc2a4b2bb072e1b1ccccfb4593845e16ea0c62a4436ce419a3792b89b7a995c36a2ce979cf85db0dbd5f6754f SHA512 7714c32ffeb31611fe41d2ec674b774fdd46b137a90bb52245b1dcc229f2577739d33d61788ec123cce0c4dec3da49a19fdcc4eb307ea3af26ae8c4195bb0d93
+MISC metadata.xml 654 BLAKE2B f84ea5b5fb66c2661bdcbed8566a77c872b6f1b3a6b0cb021269657b21fd414e70edf03f205ee2038d9d83a20e25d32b15760d915b98066aa7fe1a4cfeb3bd16 SHA512 6ea40af97501443c8d4ae783137bb9547c5a4cc3685c01b9d684691d110f67eb43056acfcebcc510c06fc40ff596ad9e3e30cf76cb07807f23250721e93b4954
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index 0cc85787c0c5..9bb47af5f2a2 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/metadata.xml
@@ -15,8 +15,6 @@
 		<flag name="numpy">Run tests depending on
 			<pkg>dev-python/numpy</pkg>, <pkg>dev-python/pandas</pkg>
 		</flag>
-		<flag name="gevent">Use <pkg>dev-python/gevent</pkg> for GeventServer
-		</flag>
 		<flag name="gdb">Run tests depending on <pkg>sys-devel/gdb</pkg>
 		</flag>
 	</use>
diff --git a/dev-python/rpyc/rpyc-5.2.3-r3.ebuild b/dev-python/rpyc/rpyc-5.2.3-r3.ebuild
index e41a3d9bcf0b..22aea49bdb94 100644
--- a/dev-python/rpyc/rpyc-5.2.3-r3.ebuild
+++ b/dev-python/rpyc/rpyc-5.2.3-r3.ebuild
@@ -20,11 +20,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 # USE flags gdb, numpy are used *only* to run tests depending on these packages
-IUSE="test numpy gdb gevent"
+IUSE="test numpy gdb"
 RESTRICT="!test? ( test )"
 
 CDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
-	gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
 	gdb? ( sys-devel/gdb )"
 
 DEPEND="${CDEPEND}
@@ -52,9 +51,7 @@ src_prepare() {
 	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
 	fi
 
-	if ! use gevent
-	then rm tests/test_gevent_server.py || die "rm test_gevent_server.py failed"
-	fi
+	rm tests/test_gevent_server.py || die "rm test_gevent_server.py failed"
 
 	if ! use gdb
 	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
diff --git a/dev-python/slackclient/Manifest b/dev-python/slackclient/Manifest
deleted file mode 100644
index caa1bf41a194..000000000000
--- a/dev-python/slackclient/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST slackclient-2.5.0.tar.gz 49814 BLAKE2B 19f9e66af086d431494de0ef7f3569657eb769022223d0e9b0f74c0600858e20de397fd385dc1c41d416eb3a98a7437d2b0c1b5e156be6d98941b26749103c5b SHA512 3a7a1e741e81e673cb09f8b1d9a18ca3d0e7a0e41a7ac6062725b87752f3877548faa0f9150eb1b1775479dfe9035d03fd4d991ac108b0f634cc179f4b70e2db
-EBUILD slackclient-2.5.0.ebuild 790 BLAKE2B 7c648214f76763f58e759472ff53257ec3d8a08f3748f21ce49e8ed30f3b73f67d47e7497d8391246aeebd199c5cc32941837d621f50aa5d95c1c893df274ce9 SHA512 a3552841681eb0fa346767048356ccba9e8ac0b20112ddf15462546e8f41c34dd4386cb59ab320bd9ee6fb55eebadacc12c8cf14246d2d80b99203bd5db53171
-MISC metadata.xml 416 BLAKE2B d7cad6c381983ec77b1aa4213696960f53bdfe27ede5fc61dd1d7518f0eef8ecff78748a2feba5f8934bafbd97469050d0db3fdc5454f56091a4b37c5fe8cf6c SHA512 a8ab6e05beaaef6ddfe6d7a40303281166c1caebbb79c87383b40455640e9d22230e90348945dc7de9e2cc60d4d6b53f031f17c040e3f002f4905c916b40638d
diff --git a/dev-python/slackclient/metadata.xml b/dev-python/slackclient/metadata.xml
deleted file mode 100644
index 3d3c0d259590..000000000000
--- a/dev-python/slackclient/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>robbat2@gentoo.org</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">slackapi/python-slackclient</remote-id>
-		<remote-id type="pypi">slackclient</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/slackclient/slackclient-2.5.0.ebuild b/dev-python/slackclient/slackclient-2.5.0.ebuild
deleted file mode 100644
index b9fe8acb2f4c..000000000000
--- a/dev-python/slackclient/slackclient-2.5.0.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Client for Slack supporting the Slack Web and Real Time Messaging API"
-HOMEPAGE="https://github.com/slackapi/python-slackclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test" # upstream does not include tests in the package tarball!
-
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	# Upstream uses pytest-runner as an extra optional target in setup.py as
-	# part of tooling to generate distfiles.
-	sed -i \
-		-e '/setup_requires=/s,"pytest-runner",,' \
-		"${S}"/setup.py || die
-	default
-}
diff --git a/dev-python/tvdb_api/Manifest b/dev-python/tvdb_api/Manifest
deleted file mode 100644
index f5adc094f59e..000000000000
--- a/dev-python/tvdb_api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tvdb_api-3.0.2.tar.gz 20436 BLAKE2B d9df5f1e2e8dd26486ec5aa2fa542534e43e08ce9c19ae8f8e48a05b3167db856ccb7765bb7d7acb4adcf7a53f5deff299f69123d60c3495ec1cc4d849d3e0b5 SHA512 b6c3c04eb300f2a371f50ef0331ca1ae602c7ccda2a0d8ad52f5c89fac5cf4dff77ce11d0dc774aa2a8dc1e02798a4432262cbaafea9239693c300931213107c
-EBUILD tvdb_api-3.0.2.ebuild 465 BLAKE2B 8fc5319d6a930e654059b82611954c7e94c58008546f9c22f640d12dbd4fb69bf0fd93bef5c7ad6d19bc5d2ad9b26d1e238d4a678b0dc4367f11e613e6e1bc4f SHA512 2508133aa6eb8606a320a221ec7e488a60b267d94ec02e6c81ea04f23207a5ea9ce1514772994ed8af9d2bb5368b370408787128fd40525347d632531f36e9a2
-MISC metadata.xml 315 BLAKE2B c3449dd20fceb8f3f3e6a4d44a80c4f187ccc7eda5fa030828425ed06c28f95558250a834325e11c00285c3c5e587d1a1b6756f79fdcee3b811550238d437672 SHA512 96e0a4a6b68c1620f06a100f947309c6daef99f1ff246cb009e2b379ed3d236ca0e7e1417c340678382d0b20898a708d8136c4aa942f035848c7ea1e035140dd
diff --git a/dev-python/tvdb_api/metadata.xml b/dev-python/tvdb_api/metadata.xml
deleted file mode 100644
index 0573aff57f62..000000000000
--- a/dev-python/tvdb_api/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-needed -->
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">dbr/tvdb_api</remote-id>
-		<remote-id type="pypi">tvdb-api</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/tvdb_api/tvdb_api-3.0.2.ebuild b/dev-python/tvdb_api/tvdb_api-3.0.2.ebuild
deleted file mode 100644
index 4432098ac2ae..000000000000
--- a/dev-python/tvdb_api/tvdb_api-3.0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to thetvdb.com API"
-HOMEPAGE="https://github.com/dbr/tvdb_api"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-cache[${PYTHON_USEDEP}]"
diff --git a/dev-python/webassets/Manifest b/dev-python/webassets/Manifest
deleted file mode 100644
index 443cb6ec2680..000000000000
--- a/dev-python/webassets/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX webassets-2.0-python39.patch 898 BLAKE2B 7d350d5a7d35a49598229b3d559ecbf4a870f24de5f2aa2bb83f7d7e6374b150b6bdcdebfbba304b2ee74783c648f1dfa98dbb3044be966342c00cb16bcc943d SHA512 6e2073ed553fcb2523a26aeff30f36de68a45dbe032a207fe12906424021d0aae7bd6bc4934f79352644ceffb9147e39bc09d824a36f23093d8a2dc58d57e28f
-DIST webassets-2.0.tar.gz 185864 BLAKE2B 8aaa7091c27644c6c464d13d106218e28531415458e67696c0243943a92a3869e23c7ff0aa8461abb876a178e3ad44f4b47a5366edb885d308dd8ec0f17ad034 SHA512 6d62d4e5c1ed81a2d235c24776b632574f3670ae3d863c5f5a79d0e1afc7acfa7965e532b7975503df758dbe6c8dbd857b250a6ea8e4b414c8f1ae12fb8addd7
-EBUILD webassets-2.0.ebuild 1072 BLAKE2B 2e1a77aa66b1606d74466c307d81c4bde4f5388c5cb8ed43ac64cdd98ca07f2ac54cad3eb939e498811f961e59321666bd18762f7ea839870aca5a7bcdc9f31d SHA512 c0f0063220a81aae2f28c43f411d13a1324387c5808178a62b142f14e0469d0e480f43a9bce137e42e84c0150659f5fc0939fcc4b39da4dbff473174e14f28c3
-MISC metadata.xml 372 BLAKE2B c1a1dfc335a04122b142c199b9041d4deff42cd971fa988ca7018fc3a26c62147fb2bd8a582f990382213e7d8791e13e67ba1cf570fd6c50ee003bcaa3fa7549 SHA512 cc5ca9432c6b229d8e5c23e39ed634624589f33958131ece0b09256c964aa0ef3678a0c6a4549ab80cebba55e73b833eaabf18c929431067c9747d029cc50e80
diff --git a/dev-python/webassets/files/webassets-2.0-python39.patch b/dev-python/webassets/files/webassets-2.0-python39.patch
deleted file mode 100644
index 006c020469f4..000000000000
--- a/dev-python/webassets/files/webassets-2.0-python39.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/miracle2k/webassets/commit/a563935df6702ff5e38e5b84a262c295e4cdf455.patch
-From a563935df6702ff5e38e5b84a262c295e4cdf455 Mon Sep 17 00:00:00 2001
-From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date: Wed, 22 Jan 2020 00:49:31 +0530
-Subject: [PATCH] Use is_alive instead of isAlive for Python 3.9 compatibility.
-
----
- tests/test_script.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_script.py b/tests/test_script.py
-index a83bc07f..d17a83bb 100644
---- a/tests/test_script.py
-+++ b/tests/test_script.py
-@@ -192,7 +192,7 @@ def start_watching(self):
- 
-     def stop_watching(self):
-         """Stop the watch command thread."""
--        assert self.t.isAlive() # If it has already ended, something is wrong
-+        assert self.t.is_alive() # If it has already ended, something is wrong
-         self.stopped = True
-         self.t.join(1)
- 
diff --git a/dev-python/webassets/metadata.xml b/dev-python/webassets/metadata.xml
deleted file mode 100644
index 8d3e20005efc..000000000000
--- a/dev-python/webassets/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">miracle2k/webassets</remote-id>
-		<remote-id type="pypi">webassets</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/webassets/webassets-2.0.ebuild b/dev-python/webassets/webassets-2.0.ebuild
deleted file mode 100644
index 0f25c54ae40d..000000000000
--- a/dev-python/webassets/webassets-2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asset management for Python web development"
-HOMEPAGE="https://github.com/miracle2k/webassets"
-SRC_URI="https://github.com/miracle2k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# ^^ pypi tarball is missing tests
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-# dev-ruby/sass confuses the tests, they expect 'sass' as the reference
-# compiler
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		!!dev-ruby/sass
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0-python39.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# webassets wants /usr/bin/babel from babeljs,
-	# but we have only one from openbabel
-	# ... and we don't have postcss
-	sed -i \
-		-e 's|\(TestBabel\)|No\1|' \
-		-e 's|\(TestAutoprefixer6Filter\)|No\1|' \
-		tests/test_filters.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
deleted file mode 100644
index ad2c090a84e5..000000000000
--- a/dev-python/ws4py/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ws4py-0.5.1-python3.7+-compatibility.patch 3713 BLAKE2B f5c811b6dce12637307d2a845daa0e9e932452ba34416b088531734013f1617901617d82804b32ec22026d50c27152b68fb548b0871a11ac20ffa21fc5b435b0 SHA512 3012d74e348f7965fee811c9b0e290dcefcc4f365159ecc0fc5bc9dc77ff0e5e6d1448b62b0ced1f9e87dc2bf29f9a831d110301257d260dcb3f2d1ee7ed4f80
-DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
-EBUILD ws4py-0.5.1-r1.ebuild 1743 BLAKE2B ed4c8ea0213fe3df48e17f013d65b41a3c3225935bdb965ee516d626d6311df84506c4b4baa7d854844e06779e2b0c8329b1763d70a64d45b4aac304d2f5de9a SHA512 a61a7d6f5a3d540e30bd1810bece0aee68213886a4d4aa1f784595f6d916b78b940c3350dc2db80a5c1fe2c7bdd61accb38d482fc410a98ad30bf2c43f6d6126
-EBUILD ws4py-9999.ebuild 1745 BLAKE2B eb23de9bb77ec680e7d8d7b1886c92e17dacf760f0c6b73e87ff848c8022e9e146a677566ffd6f85e936aeffbb12703ae65a78f8964416f2454a0c8fce798a85 SHA512 6004de1ccdb82b63e1eb4bd9f1570a7dcbb7ff49f4017346072802f96edecae369df8b4f403b6bdf3c2bc3ede6d5cbd4c876f14a5330111ed749d6bc2b99ee6c
-MISC metadata.xml 424 BLAKE2B 7de8ba5be6abffa07db15ec9bf768480c63cc74485965890c14926964690be45d8a244bf859646413f30432b7beb70fdf085dc73b4542ce8d26f0a7498a555b2 SHA512 2ce66adf4df239dfbe6f80b0b7a9489163798f2f1352360a3018f409a699a48cb0da919b71952678689c49279655db9b98862ee27a5c420563f01068f0320ae0
diff --git a/dev-python/ws4py/files/ws4py-0.5.1-python3.7+-compatibility.patch b/dev-python/ws4py/files/ws4py-0.5.1-python3.7+-compatibility.patch
deleted file mode 100644
index 12b14111634a..000000000000
--- a/dev-python/ws4py/files/ws4py-0.5.1-python3.7+-compatibility.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From: Matthias Klose <doko@ubuntu.com>
-Date: Sun, 29 Jul 2018 09:01:36 +0200
-Subject: Fix compatibility with Python 3.7.
-Origin: http://launchpadlibrarian.net/380629852/python-ws4py_0.4.2+dfsg1-2_0.4.2+dfsg1-2ubuntu1.diff.gz
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903529
-
----
- test/autobahn_test_servers.py | 4 ++--
- ws4py/async_websocket.py      | 9 +++++++--
- ws4py/server/tulipserver.py   | 7 ++++++-
- 3 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/test/autobahn_test_servers.py b/test/autobahn_test_servers.py
-index 3e33f82..8b77954 100644
---- a/test/autobahn_test_servers.py
-+++ b/test/autobahn_test_servers.py
-@@ -142,7 +142,7 @@ def run_python_wsgi(host="127.0.0.1", port=9002):
-     """
-     run_python_wsgi_async(host, port, False)
- 
--def run_python_wsgi_async(host="127.0.0.1", port=9010, async=True):
-+def run_python_wsgi_async(host="127.0.0.1", port=9010, async_=True):
-     """
-     Runs wsgi server on python 2.x with async middleware"
-     """
-@@ -153,7 +153,7 @@ def run_python_wsgi_async(host="127.0.0.1", port=9010, async=True):
-     from ws4py.server.wsgiutils import WebSocketWSGIApplication
- 
-     app = WebSocketWSGIApplication(handler_cls=EchoWebSocket)
--    if async:
-+    if async_:
-         def middleware(app):
-             def later(environ, start_response):
-                 for part in app(environ, start_response):
-diff --git a/ws4py/async_websocket.py b/ws4py/async_websocket.py
-index 9e2a4c7..096763d 100644
---- a/ws4py/async_websocket.py
-+++ b/ws4py/async_websocket.py
-@@ -18,6 +18,11 @@ delegated_generator_websocket_on_top_of_asyncio.py
- import asyncio
- import types
- 
-+try:                                                     # pragma: no cover
-+    asyncio_ensure_future = asyncio.ensure_future        # Python >= 3.5
-+except AttributeError:                                   # pragma: no cover
-+    asyncio_ensure_future = getattr(asyncio, 'async')    # Python < 3.5
-+
- from ws4py.websocket import WebSocket as _WebSocket
- from ws4py.messaging import Message
- 
-@@ -84,7 +89,7 @@ class WebSocket(_WebSocket):
-         def closeit():
-             yield from self.proto.writer.drain()
-             self.proto.writer.close()
--        asyncio.async(closeit())
-+        asyncio.asyncio_ensure_future(closeit())
- 
-     def _write(self, data):
-         """
-@@ -94,7 +99,7 @@ class WebSocket(_WebSocket):
-         def sendit(data):
-             self.proto.writer.write(data)
-             yield from self.proto.writer.drain()
--        asyncio.async(sendit(data))
-+        asyncio.asyncio_ensure_future(sendit(data))
- 
-     @asyncio.coroutine
-     def run(self):
-diff --git a/ws4py/server/tulipserver.py b/ws4py/server/tulipserver.py
-index 2786c16..ce2e9fb 100644
---- a/ws4py/server/tulipserver.py
-+++ b/ws4py/server/tulipserver.py
-@@ -6,6 +6,11 @@ import io
- 
- import asyncio
- 
-+try:                                                     # pragma: no cover
-+    asyncio_ensure_future = asyncio.ensure_future        # Python >= 3.5
-+except AttributeError:                                   # pragma: no cover
-+    asyncio_ensure_future = getattr(asyncio, 'async')    # Python < 3.5
-+
- from ws4py import WS_KEY, WS_VERSION
- from ws4py.exc import HandshakeError
- from ws4py.websocket import WebSocket
-@@ -40,7 +45,7 @@ class WebSocketProtocol(asyncio.StreamReaderProtocol):
-         #self.stream.set_transport(transport)
-         asyncio.StreamReaderProtocol.connection_made(self, transport)
-         # Let make it concurrent for others to tag along
--        f = asyncio.async(self.handle_initial_handshake())
-+        f = asyncio.asyncio_ensure_future(self.handle_initial_handshake())
-         f.add_done_callback(self.terminated)
- 
-     @property
diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml
deleted file mode 100644
index bcbb23469491..000000000000
--- a/dev-python/ws4py/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-needed -->
-	<use>
-		<flag name="client">Install client modules</flag>
-		<flag name="server">Install server modules</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">Lawouach/WebSocket-for-Python</remote-id>
-		<remote-id type="pypi">ws4py</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
deleted file mode 100644
index 7313ee949cf5..000000000000
--- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# We could depend on dev-python/cherrypy when USE=server, but
-# that is an optional component ...
-# Same for dev-python/tornado and USE=client ... so why not???
-# pypy is viable but better with a cutdown set of deps
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)?"
-
-MY_PN="WebSocket-for-Python"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Lawouach/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Lawouach/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
-HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+client +server test +threads"
-RESTRICT="!test? ( test )"
-# doc build requires sphinxcontrib ext packages absent from portage
-
-RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	client? ( >=dev-python/tornado-3.1[${PYTHON_USEDEP}] )
-	server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
-
-DEPEND="test? (
-		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch
-)
-
-python_test() {
-	# testsuite displays an issue with mock under py3 but is non fatal
-	"${EPYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
-	use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
-}
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
deleted file mode 100644
index 3818a848170e..000000000000
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# We could depend on dev-python/cherrypy when USE=server, but
-# that is an optional component ...
-# Same for dev-python/tornado and USE=client ... so why not???
-# pypy is viable but better with a cutdown set of deps
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)?"
-
-MY_PN="WebSocket-for-Python"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Lawouach/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Lawouach/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 arm ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
-HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+client +server test +threads"
-RESTRICT="!test? ( test )"
-# doc build requires sphinxcontrib ext packages absent from portage
-
-RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	client? ( >=dev-python/tornado-3.1[${PYTHON_USEDEP}] )
-	server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
-
-DEPEND="test? (
-		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch
-)
-
-python_test() {
-	# testsuite displays an issue with mock under py3 but is non fatal
-	"${EPYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
-	use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b5962a906b8f..14e04565eef2 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/comparator/Manifest b/dev-util/comparator/Manifest
deleted file mode 100644
index 5fdd2fe36c4b..000000000000
--- a/dev-util/comparator/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX comparator-2.12-gcc10.patch 793 BLAKE2B 0bab88fa6aeaf046ee4dc569aeb0d3344a2a9def5e2a67f1139fd59621dac0cb7f89468b04fd776b4a81f883c55fe5d311890409a0de22363ada166c3c20475a SHA512 c4e4c03f0dd8759e2fbd9421465b75254f4a02a56846347c4f1062c411c124f62e803854af389a527a8323f57daef563f7948eac5fbe25ff3e0529c7384a1287
-DIST comparator-2.12.tar.gz 1463333 BLAKE2B 081251a0a3cb2f99d5b74092a46a868741049d27c367fc9bc3445d35fe01eaaaee75f7afd3674ecdc2569c2ac1ef2d5acd838a546aa307b33c977c4c8a91db12 SHA512 dc5acf3d5900e293e3f0188c0809bc99f2f18edb55df882b2e12e66bc655e7faf030b8daffdd2d175234b398e6a8c125ca6af615933c998651d7f1579734b080
-EBUILD comparator-2.12.ebuild 959 BLAKE2B d5159ce9fcd3d2f7e458335b0a5ca7cff1d6cb40ffd0d90a2bb1efe2fe571642ad262f9ef24d3ad620d11d917641fd657053489d8c3ed8e99de6686099827572 SHA512 5ced27685dc2aef7126cf5b32ad83961fc3fadd5235b3ae19fc6ee22c6225e91abdfa8b4efda98e9ce68d6f410a2d8f05c6514642620e885dbd298c17f7e2b2f
-MISC metadata.xml 332 BLAKE2B 662fc1433ec368077f53a78f4eb2674b86b0abe6bf942023278186a9bc41dfeb21863d88967ef96addc4b2734478899f096fefd211da7bac575b25dc074f3ce9 SHA512 d17b110c1f0f21b14f32eb56cfc30e70b46d5418c90d57050c5d8b3152e618ff5da4e691e004ccecfdeaf1281fcbaa178d6dd182f03e7dd6b2fa5664292964e9
diff --git a/dev-util/comparator/comparator-2.12.ebuild b/dev-util/comparator/comparator-2.12.ebuild
deleted file mode 100644
index 0e2845da1354..000000000000
--- a/dev-util/comparator/comparator-2.12.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="ESR's utility for making fast comparisons among large source trees"
-HOMEPAGE="http://www.catb.org/~esr/comparator/ https://gitlab.com/esr/comparator"
-SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
-
-DEPEND="=app-text/docbook-xml-dtd-4.1.2*
-	app-text/xmlto"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
-src_prepare() {
-	default
-	sed -e '/python setup.py install/d' -i Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-	emake comparator.html scf-standard.html
-	distutils-r1_src_compile
-}
-
-src_install() {
-	emake ROOT="${D}" install
-	distutils-r1_src_install
-	docinto html
-	dodoc *.html
-}
diff --git a/dev-util/comparator/files/comparator-2.12-gcc10.patch b/dev-util/comparator/files/comparator-2.12-gcc10.patch
deleted file mode 100644
index 8ba6914129f8..000000000000
--- a/dev-util/comparator/files/comparator-2.12-gcc10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c7fdc67aefb67851a1210c7d5adfc7287c4b6572 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Mon, 15 Jun 2020 01:14:24 +0300
-Subject: [PATCH] Fix compilation with GCC10
-
-Fix compilation with -fno-common, which is enabled by default in GCC10.
----
- shred.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/shred.h b/shred.h
-index d7eeb93..0e35b28 100644
---- a/shred.h
-+++ b/shred.h
-@@ -100,7 +100,7 @@ extern int shredfile(struct filehdr_t *,
- extern void sort_hashes(struct sorthash_t *hashlist, int hashcount);
- 
- /* linebyline.c feature analyzer */
--struct analyzer_t linebyline;
-+extern struct analyzer_t linebyline;
- 
- /* shredcompare.c functions */
- extern int merge_compare(struct sorthash_t *obarray, int hashcount);
--- 
-2.26.2
-
diff --git a/dev-util/comparator/metadata.xml b/dev-util/comparator/metadata.xml
deleted file mode 100644
index 450b6e7f024a..000000000000
--- a/dev-util/comparator/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>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="gitlab">esr/comparator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
deleted file mode 100644
index a173bdc4120c..000000000000
--- a/dev-util/rosinstall_generator/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX yaml.patch 493 BLAKE2B ce0d917dc54edda1423b29c1f39662c56e6be8b0c33012cc8cbb8a86b4fe20c9a25139ed2b59db9aca245ebae01a7a1f06f4956a8521bc046ffd46ed795752c9 SHA512 d63da158e7a496da2de41bbfe453e492cd32b9380b11f3201491fc40bc6a9f4057adc19ce0ce7e417080bb9ded0010790caf69d7cd50373cd53033f37a42c456
-DIST rosinstall_generator-0.1.22.tar.gz 11902 BLAKE2B 6dd41c8b86146a9e50d4a20fd4991ed247de915d29f051c6dc416b6820386497ccf3a9cf6dde16e039932c354d7dfc5b6706bc206c16b068633fbddb69686452 SHA512 c1801ea441d1765090684a12e559a39ce496d08f91021b13d026a4127e5bc16974daa2cb561f0ed6c54a31216f57c1f3e257b4a96aec8255c34b37c5545123c6
-EBUILD rosinstall_generator-0.1.22-r1.ebuild 1120 BLAKE2B 059dca47a9a67b7f56c11312463296537e295971f23b59f078d2bcffa1eac0807364f6a29607843de82a79c66c5002fb47f16d6bfa24c467836a9e9e7aea402b SHA512 37be09684eb12d66b3e2a3ffd3501c025d126e1f2ca4befa94d35a57daad6f07570a1064b694085b6d4341efa3c3f11c91f18e61ccea4b4bde02e333c879a0f6
-EBUILD rosinstall_generator-9999.ebuild 1120 BLAKE2B 059dca47a9a67b7f56c11312463296537e295971f23b59f078d2bcffa1eac0807364f6a29607843de82a79c66c5002fb47f16d6bfa24c467836a9e9e7aea402b SHA512 37be09684eb12d66b3e2a3ffd3501c025d126e1f2ca4befa94d35a57daad6f07570a1064b694085b6d4341efa3c3f11c91f18e61ccea4b4bde02e333c879a0f6
-MISC metadata.xml 354 BLAKE2B 16acf949aa47961c553efdf3bf4c32cfcc50b72fae944f2526cb81e30fb6dc15ca8e92c248279491c6a64d9ac6ceb91ba69ad353309f6b08747a2022324005ba SHA512 6eac034959e592cea371a1999dd9c77271b0d84171ffae072ca4df08f7fa5fd3a8cad18e9cea6fd67b4f10d6e0a84b59a3bda5b7f7257c1f059052cc3cbfc737
diff --git a/dev-util/rosinstall_generator/files/yaml.patch b/dev-util/rosinstall_generator/files/yaml.patch
deleted file mode 100644
index 668e1ef58b71..000000000000
--- a/dev-util/rosinstall_generator/files/yaml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rosinstall_generator-0.1.22/test/test_distro.py
-===================================================================
---- rosinstall_generator-0.1.22.orig/test/test_distro.py
-+++ rosinstall_generator-0.1.22/test/test_distro.py
-@@ -53,7 +53,7 @@ def _get_test_dist():
-       type: distribution
-       version: 2
-     '''
--    return DistributionFile('test', yaml.load(test_dist_yaml))
-+    return DistributionFile('test', yaml.safe_load(test_dist_yaml))
- 
- 
- def test_get_package_names():
diff --git a/dev-util/rosinstall_generator/metadata.xml b/dev-util/rosinstall_generator/metadata.xml
deleted file mode 100644
index 02bd7f1072cc..000000000000
--- a/dev-util/rosinstall_generator/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>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-infrastructure/rosinstall_generator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild
deleted file mode 100644
index ce7bd63097bd..000000000000
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosinstall_generator"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="https://wiki.ros.org/rosinstall_generator"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosinstall_generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
-	>=dev-python/rosdistro-0.5.0[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-PATCHES=( "${FILESDIR}/yaml.patch" )
-
-python_test() {
-	nosetests --with-coverage || die
-}
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
deleted file mode 100644
index ce7bd63097bd..000000000000
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosinstall_generator"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="https://wiki.ros.org/rosinstall_generator"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosinstall_generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
-	>=dev-python/rosdistro-0.5.0[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-PATCHES=( "${FILESDIR}/yaml.patch" )
-
-python_test() {
-	nosetests --with-coverage || die
-}
diff --git a/dev-util/stubgen/Manifest b/dev-util/stubgen/Manifest
deleted file mode 100644
index 96ab76e11433..000000000000
--- a/dev-util/stubgen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stubgen-2.08.tar.gz 104152 BLAKE2B d3e419cb2dcfe4dfc3f6c04cbf7bd4d0fb380804a1b42f66c7f2fb40ba5e581f1b9342666e008650beaa67a79c4acdb73a6c790bd8f2cbb467c1afe53d311cb0 SHA512 daf8a83963fbc8b6857036a3f67a25031fc9e5f032ffedb1e041246354ede2363f5324b6f52ffe69fb41caa177eeca0a1c120f235e460043da1db5fb78fa5e41
-EBUILD stubgen-2.08.ebuild 530 BLAKE2B 41c99792d97be48861d441a0b5c428a2c09765caf13730f6dfa5d798795874bd9f460245ec15615e1c7a10b2a8eea361ee0184ebe928fe2ac75c8093476e58c8 SHA512 86f11d59910980c6eb84e8555a0310b43d13cf4021828ac0a1a50265ea6432448681930f0d5337e485e4a14a46d849d25c6d4da1bd991e60fd4c1428c657b402
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-util/stubgen/metadata.xml b/dev-util/stubgen/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/dev-util/stubgen/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-util/stubgen/stubgen-2.08.ebuild b/dev-util/stubgen/stubgen-2.08.ebuild
deleted file mode 100644
index b346c7e54de3..000000000000
--- a/dev-util/stubgen/stubgen-2.08.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A member function stub generator for C++"
-HOMEPAGE="http://www.radwin.org/michael/projects/stubgen/"
-SRC_URI="http://www.radwin.org/michael/projects/${PN}/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ChangeLog README
-	doman ${PN}.1
-}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 8f74fe31dd63..cc1f7e317833 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
deleted file mode 100644
index 0289ca7702ea..000000000000
--- a/games-util/pyfa/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe
-AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768c9c582da4ebbef36b4848aca225220e2057c0fab088a060cc2149aed961f2063a1a34326b71f0cf3bb411105a77a7 SHA512 a0174726777d82229dcd167b005e176012a9c4398f066f183bf0b8d59bd1854411e74bca1c3848396a8c50be327c8ec4e21dde6d56d045b2af4cd13a68e0cc99
-AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
-DIST pyfa-2.43.0.tar.gz 31776698 BLAKE2B 819596e670b62dad4a10edbb49f5b93e5b0d53b1976b6c1f3272731f5769897ec6f12ae681f6503966de2d91d31dc0ee5d5c8ce0cd34354279dc71a6ae20996f SHA512 847ed7b9590103b2d49fa1e60d5162c800c58a94be20bd67bb10aa0b9e2957db987464bec9941feed27b61fd49d38e6c4171d932a5450e317427a8ea54b4e890
-EBUILD pyfa-2.43.0.ebuild 2733 BLAKE2B 742fb98ce9aea88bd097bb5ccfd8d7fa9f2815d3ed7277aafc06384710380d65eb0a437173b8db5030681b006fd9e715d8cf3b22ef9ea94a13f07d95f58b398e SHA512 d671f922d7ca3f9b7d558e1276c1894619766e847f5d4f88efe728dbec41aa339b3511d86d1f87bc63f3ea92b0771dda8c232cb3e128bfad87f1c1c995610e22
-EBUILD pyfa-9999.ebuild 2627 BLAKE2B 67af875c3c233f08b4b70e2597fd44f07d256672610ad9925603ea6f04d857317c2880b85d1827b72ae7c04a175723361692aa0547064db232a7af5d6ad80caa SHA512 301908cd18992a20c324266921eb45c7932b7cfa869d6c9466bb4cf77c5abe6f2860044c3145ae214689b274d3d96d6d8a37e4cf0ddbef07cca9fc1dc3ea32f8
-MISC metadata.xml 785 BLAKE2B c83f7f8e35d76c3752f466c521a5ad25c8cb13299d3be3a1cd7623956c457009e43a858cc31fcfd91df04af7830101a9bfef84cba704c1e3b15c6cd00e3e7026 SHA512 1c25a53d0659232c25323186753915c4ee2e2f5eab5f9b682e42c5983f7fecda8399559df717cbf5c8b0f46db1cb42753371e3448908c5952a00a43fb06f22de
diff --git a/games-util/pyfa/files/configforced-1.15.1.py b/games-util/pyfa/files/configforced-1.15.1.py
deleted file mode 100644
index 51fcb958cedc..000000000000
--- a/games-util/pyfa/files/configforced-1.15.1.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Gentoo-specific settings
-pyfaPath = u'%%SITEDIR%%/pyfa'
-gameDB = u'%%EPREFIX%%/usr/share/pyfa/eve.db'
-imgsZIP = u'%%EPREFIX%%/usr/share/pyfa/imgs.zip'
diff --git a/games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch b/games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch
deleted file mode 100644
index fc691d48bb4c..000000000000
--- a/games-util/pyfa/files/pyfa-2.9.3-import-pyfa.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c12e4c1358025940aa1fbdf0e17f85e3821e7230 Mon Sep 17 00:00:00 2001
-From: Andreas Zuber <zuber@puzzle.ch>
-Date: Mon, 30 Oct 2017 09:52:32 +0100
-Subject: [PATCH] import pyfa
-
-Append $(python_get_sitedir)/pyfa to import path
-
-Ensures that pyfa's import statements continue to work for systemwide
-installation.
----
- pyfa.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pyfa.py b/pyfa.py
-index d73ef097..dbf73db2 100755
---- a/pyfa.py
-+++ b/pyfa.py
-@@ -22,6 +22,7 @@
- import datetime
- import os
- import sys
-+sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
- from optparse import AmbiguousOptionError, BadOptionError, OptionParser
-
- import config
---
-2.21.0
-
diff --git a/games-util/pyfa/files/pyfa.desktop b/games-util/pyfa/files/pyfa.desktop
deleted file mode 100644
index 07f3f0ee22a7..000000000000
--- a/games-util/pyfa/files/pyfa.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Pyfa
-Comment=Ship fitting application for EVE Online
-Icon=pyfa
-Terminal=false
-Type=Application
-Categories=Game;RolePlaying;
-Exec=pyfa
diff --git a/games-util/pyfa/metadata.xml b/games-util/pyfa/metadata.xml
deleted file mode 100644
index c2d78520a7dd..000000000000
--- a/games-util/pyfa/metadata.xml
+++ /dev/null
@@ -1,21 +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>a.zuber@gmx.ch</email>
-    <name>Andreas Zuber</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription lang="en">
-  Pyfa is the Python Fitting Assistant, a standalone application for creating
-  fittings for the EVE Online SciFi MMORPG. It provides many advanced features
-  such as graphs and full calculations of any possible combination of modules,
-  fits, etc.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">pyfa-org/Pyfa</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-util/pyfa/pyfa-2.43.0.ebuild b/games-util/pyfa/pyfa-2.43.0.ebuild
deleted file mode 100644
index 0487cf9afef8..000000000000
--- a/games-util/pyfa/pyfa-2.43.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit desktop edos2unix python-single-r1 xdg
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Pyfa-${PV}"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-		>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.23[${PYTHON_USEDEP}]
-		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
-		>=dev-python/markdown2-2.3.5[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/python-jose-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-cache-0.8.1[${PYTHON_USEDEP}]
-		>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.2.2[wxwidgets,${PYTHON_USEDEP}]
-	')"
-BDEPEND="app-arch/zip"
-
-PATCHES=(
-	# fix import path in the main script for systemwide installation
-	"${FILESDIR}/${PN}-2.9.3-import-pyfa.patch"
-)
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py
-
-	default
-
-	# make python recognize pyfa as a package
-	touch __init__.py || die
-
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		-e "s:%%EPREFIX%%:${EPREFIX}:" \
-		"${FILESDIR}/configforced-1.15.1.py" > configforced.py || die
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		pyfa.py > pyfa || die
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	python_domodule eos gui service utils graphs
-	python_domodule config*.py __init__.py version.yml configforced.py db_update.py
-	python_doscript pyfa
-
-	insinto /usr/share/${PN}
-
-	einfo "Creating database ..."
-	${EPYTHON} ./db_update.py || die
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
deleted file mode 100644
index 1bf3c9464b03..000000000000
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit desktop edos2unix python-single-r1 xdg
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Pyfa-${PV}"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-		>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
-		>=dev-python/markdown2-2.3.5[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_USEDEP}]
-	')"
-BDEPEND="app-arch/zip"
-
-PATCHES=(
-	# fix import path in the main script for systemwide installation
-	"${FILESDIR}/${PN}-2.9.3-import-pyfa.patch"
-)
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py
-
-	default
-
-	# make python recognize pyfa as a package
-	touch __init__.py || die
-
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		-e "s:%%EPREFIX%%:${EPREFIX}:" \
-		"${FILESDIR}/configforced-1.15.1.py" > configforced.py || die
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		pyfa.py > pyfa || die
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	python_domodule eos gui service utils graphs
-	python_domodule config*.py __init__.py version.yml configforced.py db_update.py
-	python_doscript pyfa
-
-	insinto /usr/share/${PN}
-
-	einfo "Creating database ..."
-	${EPYTHON} ./db_update.py || die
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index c5dcc6158dcf..e8c0b7127dd7 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 0fe35c33f3a5..fe2b51aab7d1 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -5,5 +5,5 @@ DIST gnome-shell-43.1.tar.xz 1947824 BLAKE2B d03bf5e970a92762724e5e1ab534e610f73
 DIST gnome-shell-43.2.tar.xz 1946776 BLAKE2B 0b581ed84bb3b8804cb4b5be07ae6be479f1092abf4c018d140edc81dcf0f88dc6c3321f591bc55c16e2141b4dd59e353c1f244749de13e4571a5b5aba6ad57d SHA512 f25754b60696723db3db4141eb14fda88f5d913cc8a9d7270a34b9a1493f9bd4caadf45b142fd0bd82f594d9fb47980c3b0242bb58ee184a61968f0d1f09bfc4
 EBUILD gnome-shell-42.5-r2.ebuild 7512 BLAKE2B 38c7c58e13fb94ed45205192c6da4b6f98c0bd9bd7f0b3e05cf873904e3560b5018885fdfc84f0c799a92fcc5d2314c07f1797a4dce02b29e72883eee5ac40ef SHA512 a27b74b05f7a9540eecf73fce261fd0434c8d86a321a7d53db7b11c496892b7be55f671e2d2edfacec25c8638308bc74f264e45b589f6d52e04328560941704a
 EBUILD gnome-shell-43.1.ebuild 6433 BLAKE2B 621e39f822dfa659dbedaebcdf8eb3985565b3648646522458227f7ad455068bae108c016133236f04ce4c496c4cf725009a893e9b5f6e6aaafdf95fdbd92b27 SHA512 41ffd85589ecbb2e59a7364631eabfc51c435004916db3418c218371a974790b68aa6d679866b5ae63130d7336a6b2b13e4582ef1216b6291ea7a4d16c7e6194
-EBUILD gnome-shell-43.2.ebuild 6431 BLAKE2B 4a5657b740ff745d79228e0aace77ce13ab7c9b9ee4d7e2d14f3cbd97908d44a91e063a8f45c991af8211813057b16e141f0ac9bae56e1f98510a01f192e9463 SHA512 48f6c662fb067472db402a18054b0757dec7a9b8ba8f62679c04c81162ee6a39e9dcbcd303b01e54390376cc7bff75a7e828eaabc00e73150db2a1ea5f6dfca9
+EBUILD gnome-shell-43.2-r1.ebuild 6431 BLAKE2B c27b238c78ca891a742ba28018f34dbd0106f2e31881176c966ab565cab1b0d0eb1f545f0280d57e01e55cb3779539069d361505131277c36a6352623736f729 SHA512 c7da6032b1ffb4fdccee9bfa8ce1e4f55044e1f38bc349de2089ae4b2ad7f6211b9060278e36b34d4d6d338d97333db586394671c940174ea1fdaf728f83443a
 MISC metadata.xml 1187 BLAKE2B 112179de090fbd712f5af966853e0837f7b0cdd78e377fce9c8d3c6078e17ac98acfaabf93dfc738a45fb78a94f82903f5d8609bdd7f3769877e6ac24a5424a1 SHA512 f679fd454c50795c347235ebab1ce8b2e070c4afd797ce574226dee7aae25991a00e2c98000b11178f8aa943af1be8652b585937f8cab41ef349b6ee7b897d05
diff --git a/gnome-base/gnome-shell/gnome-shell-43.2.ebuild b/gnome-base/gnome-shell/gnome-shell-43.2-r1.ebuild
index 9d766d42896b..1b060f26a09e 100644
--- a/gnome-base/gnome-shell/gnome-shell-43.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-43.2-r1.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 DEPEND="
-	>=gnome-extra/evolution-data-server-3.33.1:=
+	>=gnome-extra/evolution-data-server-3.46.0:=
 	>=app-crypt/gcr-3.90.0:4=[introspection]
 	>=dev-libs/glib-2.68:2
 	>=dev-libs/gobject-introspection-1.49.1:=
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index d5df182c4af4..aa49ad369331 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index bcfaabed0fe8..a6f4c965c090 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,6 @@
+AUX libkdcraw-22.12.0-libraw-0.21.patch 814 BLAKE2B 326e093214e2ec1ef0b329ee56bec0a465805ede166c4e05374eae5ebe6d480fe83ddfb340c5bae7fa81c5b1e9ce0d7a6c709c1c58738806f0d3ca92bca8b3b2 SHA512 b343bfd66423e51aa20e38e72c42738c1aec1f9cbf002101c44d156a90289cdff2596890925c341553c39f236ec2e28ca944316c16d677c97ba0c0de0acb14b3
 DIST libkdcraw-22.08.3.tar.xz 37420 BLAKE2B 2124743e44aa8b0b51246e7195a42e7dddd5e29d944d3489d84de4e08f4eb623e068ec092fea69c1ecfb41038091f76e7e17ae0c46439d52491ea17f12c65756 SHA512 d30080ddb53810a753e508f4dd76acfac8d5a20a52b714f114e3bf8ffbdd62e96c0d3f2502eb51d409cdc245a56dc7cd5726344498dec1787f99e606a7fbbac3
 DIST libkdcraw-22.12.0.tar.xz 37436 BLAKE2B 8121e85fa2e0db4780ba6c1ce7469d1ca5254deee9c83489ca2ce8d68bb8e9e0521c8ceeb21525992a3c91b254b1e6688f0ea9cd93cdefeab80c75045a208522 SHA512 77a4680a7e5dd5b3a5c9b9a982c4e3e6300a42ce019b84c9c2b96908b28a1549869b4796cff1f6813db0174a956ad3ae39b8c6c6593c3a877ec3691e5bca4a8e
 EBUILD libkdcraw-22.08.3.ebuild 377 BLAKE2B ee74fbca1e5f82c67a44d4113fae2d312f0b2ee37cf2940d9327f395545ac2b139c6b5dfac6f2e209f7c915c784f7a0270066e55a0cd96d2e7db7014febd42f4 SHA512 dc288d97d353c8df07a1d2b0fce2ffad42e3e8d4ae013eb3c9d445a464b05525796175d3b4b4251a6bc2ce5fb7b4c2f804fa7e4f015a5aa85d649bdb8da6e0ec
-EBUILD libkdcraw-22.12.0.ebuild 380 BLAKE2B 3d4909041ff9fc960b0aff18278fa82c07570cb0f5bff6b5a559b26af6f6fa9012a3f61cbf063d6a0778d9cb57f653478b4484741ab15ec41b1ef72caaab9b78 SHA512 bd70919f65efdedd6a038c751fa1febbede87934047b440e456e578def4e75b02d6278a50c745bde8ea856876a2ad69a45f6a3fc159390f370f88b6d6493fe0c
+EBUILD libkdcraw-22.12.0.ebuild 443 BLAKE2B 02995afd21ddb847f4d2ab4e2f30f54280647d46cab9d295a9bc60b00bce8fecef35432111f8059f1b483ede09acf87ea3138054ec7f253a0c33c7370b882e43 SHA512 4240372a635c1d6c1c7f0eba2fa52fa494fdd40dd09503d6d3531602accb10f3e19cfd82491c41ace2ba47a26cc4f66a94774eb7f04af7cf4b608376e6c5e983
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkdcraw/files/libkdcraw-22.12.0-libraw-0.21.patch b/kde-apps/libkdcraw/files/libkdcraw-22.12.0-libraw-0.21.patch
new file mode 100644
index 000000000000..1c03556777f3
--- /dev/null
+++ b/kde-apps/libkdcraw/files/libkdcraw-22.12.0-libraw-0.21.patch
@@ -0,0 +1,28 @@
+From 0843c601cbb9a9bb5774ed01b7d90e68fd17950a Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sun, 18 Dec 2022 15:59:51 +0100
+Subject: [PATCH] Fix build with libraw 0.21
+
+---
+ src/kdcraw.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/kdcraw.cpp b/src/kdcraw.cpp
+index 376a37d..1433c4b 100644
+--- a/src/kdcraw.cpp
++++ b/src/kdcraw.cpp
+@@ -357,7 +357,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI
+     d->setProgress(0.3);
+ 
+     raw.imgdata.params.output_bps  = 16;
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++    raw.imgdata.rawparams.shot_select = shotSelect;
++#else
+     raw.imgdata.params.shot_select = shotSelect;
++#endif
+     ret                            = raw.unpack();
+ 
+     if (ret != LIBRAW_SUCCESS)
+-- 
+GitLab
+
diff --git a/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild b/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild
index 7cee686a58c3..1997ea10e90a 100644
--- a/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-22.12.0.ebuild
@@ -18,3 +18,5 @@ DEPEND="
 	>=media-libs/libraw-0.16:=
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-libraw-0.21.patch ) # bug 887355
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 8bb26741ae7f..1b82ea523851 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index 22f186c1aad9..0b0a893e0580 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -1,5 +1,5 @@
 DIST pyzor-1.0.0_p20200523.tar.gz 138077 BLAKE2B 13ad30f06ce32a24a42dd5aaa21ad2a6700df1bac3dc54a86532748688b094ee0f56a8e28e34336298388c6e0b95868e95d040866c9afa561d867069496608fe SHA512 afe3b14794aea68b1a7d72840257976c7c9f755a6f6dcaaf6ebacab465c176fe2aa84f3fe176006cdbe26ef0b07ed949f75f6ef729f65c604fadf6ce8472da8f
 DIST pyzor-1.0.0_p20211223.tar.gz 138500 BLAKE2B 242a7b2df3451f659d820771454e685868792bd2275b6d69d4c4adfd6044c781abe2d72fe1500a6074851faf8e88e95d6578c546d4d95fda03e11609d1a0b436 SHA512 218bea40515a21b1e08b2bad5b7ba339ba84fff2da425dc58df72a967730ebe10e319944e1604ff56bb37f6a8ae7bc0cd974b54b18a4878ba103131b8ea47b67
-EBUILD pyzor-1.0.0_p20200523.ebuild 1565 BLAKE2B 09a2f7abd6979ffede603c0e20f3a6656481fba2c97a67801dea217440f5e1eff9da8b0efca6ece299be75edd61072760d0dfd53f2d06785f72192c29e104354 SHA512 4c387c7cbafd33ffdc3476844e1eb7314d8b8cc8307c51c8291e270cce580845e61c98d39f4fac5661bd20a546eb44ac656f25275cd0f0e92243dd813770c3e2
-EBUILD pyzor-1.0.0_p20211223.ebuild 1545 BLAKE2B 10993f8e26f8a7454520aa988b54552eb086f903961424d56713c8b3ba5abb3b30e363cc7911cbdcaddcec9165c2cec1a7da62e608b9c2fa9b58f867ffc61092 SHA512 446fcb3c7ce7722840a0de6013d9d3c39fa2441e10217910eb141f4527cf70d42b55458f4c09f7c36e327f860383eb430af3e4f5fb1bf27397c0d7d817a118c8
-MISC metadata.xml 954 BLAKE2B 62c3a125c862739d03a90657b689242c2e184ffa34b63a59697053cd6385d0d0804c1fa4246146b8fbdb08563d906e4179456b21ee5371889765c53446ebb061 SHA512 1bfbaabcb0b795d2ef3dc4763a46c909c422e23bafd522e072b2d00cc374713c78c005fba26d5df6f8cbbb7a2e411fba36a7741098e17890e4a7dee83b40038f
+EBUILD pyzor-1.0.0_p20200523.ebuild 1508 BLAKE2B 972ca30a7412c885c4daec70ffe226f78991441c25a618c322250c6f94f6caeb64a16a3a7476b13699e5d83d1e757f64a42b1a86aa72ec2a0f9b3bba3cd38eec SHA512 f43440511388db91ebca1fa9e440edc942edaeb0c2b80b5f24d61fb71f696e78a6377f8ee567c63ea3624f3bfa4e8c4a88b1ef7b81cc8f2ab949892efde63689
+EBUILD pyzor-1.0.0_p20211223.ebuild 1488 BLAKE2B 1d05f681f67bdeffc7dff61a335c39bc3f67c223960fc6489a4090c5fc6d32980b9df591dfa1ab91a3e439bc0f26ff7c4fba52c92308d2423e8c5d4fcdcc68e9 SHA512 c3d1711e9b8eb07b6a01dced17a3e1ef64a10d9ad5a3fc274b8c7d1e1e27fb6390d2062833aadb92f16dc3c69cbe7c7383067fc10749bd163e1ad276c97a26a0
+MISC metadata.xml 845 BLAKE2B 864c09201b76bf8e4ad67bc51482be1e517ce05c29fb05772bd72569ee2dee89d0cc957b77a6193ef5724fca4dd53e3b667de4a14c506165cbc59175f0af2e07 SHA512 a2678815e0042af4fab7741d87d9259d9fc84d8a7397ab03044e8b1c9dc654af6dce5ba0df8134a1b68bd26d898e9b566a26ce20a19ce4b01a29b202963bf409
diff --git a/mail-filter/pyzor/metadata.xml b/mail-filter/pyzor/metadata.xml
index 66d14edeee1b..f8858867b591 100644
--- a/mail-filter/pyzor/metadata.xml
+++ b/mail-filter/pyzor/metadata.xml
@@ -18,9 +18,6 @@
       Enables the redis back-end database engine for pyzord through
       <pkg>dev-python/redis-py</pkg>
     </flag>
-    <flag name="gevent">
-      Use <pkg>dev-python/gevent</pkg> to enable asynchronous operation
-    </flag>
   </use>
   <upstream>
     <remote-id type="github">SpamExperts/pyzor</remote-id>
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
index 0cc093a2cfd7..5ad4570d7488 100644
--- a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
@@ -16,13 +16,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
-IUSE="doc gdbm gevent mysql pyzord redis test"
+IUSE="doc gdbm mysql pyzord redis test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	pyzord? (
 		gdbm? ( $(python_gen_impl_dep 'gdbm') )
-		gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
 		mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
 		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
 	)"
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
index 9880725042d8..8320a319614d 100644
--- a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
@@ -16,13 +16,12 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc gdbm gevent mysql pyzord redis test"
+IUSE="doc gdbm mysql pyzord redis test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	pyzord? (
 		gdbm? ( $(python_gen_impl_dep 'gdbm') )
-		gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
 		mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
 		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
 	)"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 6028611e71b8..1903db9b0f7a 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index a90b1b521678..7dd94b01efa9 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 4334 BLAKE2B 2b1b9369b3ce11e42b1c113b0bdd65c32fda0e2de2f61d3e4175ccef5967c0d87deb7642ae906b804c3d25cd353e61d1c3353f66225c283482419e1028c748f8 SHA512 a25241b37373d686665d9a5bbbd7344d314a0175831fa003d5ae096806199bd56c3c6c7a8a1ff9dc011c977fcf19da9a196ddabe207b62190c87829a7121f95d
-EBUILD notqmail-1.08-r6.ebuild 4728 BLAKE2B 3d14b08335dcb8ac56391a687d2f69266d9b5d2b3498e49524cbe3ed25feaf516121cf601edb2a853c42f8af7c11ba9a37c9f955fcb08249fbd3d0ba5434c93d SHA512 35bc54f23af995596597257d0d9de0efcb3640fbef809f8e9bc20250a04a30df8448e4dc55ed1028f88d1dd62b1a40665cf9cc41360a29341642018f7c3b6947
-EBUILD notqmail-9999.ebuild 4601 BLAKE2B 93a521ea72c4ea5155770a3e5193ee0fd1a631229165af9f3d7bdc8685c5343ffd2fc4df426efa4907f01250aafe81bbb6078ef13ddd82745190e83316d0aabf SHA512 8c6c79f4a98e993e4376c56e0804cfb8f0860df5e8154c4d2f38f49e32c849987780cdad30e0c7ce8f86ceb436527ddfb0643f74bcd3fe63842c4135c9cb44d9
-MISC metadata.xml 808 BLAKE2B cc8d44eab1a8ceb2d0c46fee94d29b3fa631497d833c2404951a47c01898d33484db1f2c05571b66ef40d0293fbe396d8eb95b3249e85fa5c1fb0e0b320157bb SHA512 33bad8403da1c2fc99bc3fb73f4209fa297645b6abbe323bd3aabfc8b8b5fa809281ebd325742344a9b2d252a1f6c68dd518f9cbe63086ecf6d0e340ba6a7ea8
+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
+MISC metadata.xml 753 BLAKE2B 86a0b2db6a95eb9035137a11dff5eca3280c427311af8ab9986392fb001707897723a582f4f0627a9a8e2add6c1ac6b3f842198c6e96abf49b15d340962779d6 SHA512 577360801e0a48aff8216a61c5351100369c4094aade0c1e21d6749965fcb9c8cfaf0c32ea6c8e28300cc5b78a75f2e58d4e1f5713e5c7c26d574830e0a486f9
diff --git a/mail-mta/notqmail/metadata.xml b/mail-mta/notqmail/metadata.xml
index b0dda7e29117..dd95c000ec99 100644
--- a/mail-mta/notqmail/metadata.xml
+++ b/mail-mta/notqmail/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="authcram">Enable AUTHCRAM support</flag>
 		<flag name="gencertdaily">Generate SSL certificates daily instead of
 			hourly</flag>
 		<flag name="highvolume">Prepare notqmail for high volume servers</flag>
diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
index 62f982fa263e..9717aa7f830d 100644
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r5.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
@@ -56,8 +56,8 @@ SRC_URI="${SRC_URI}
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
+IUSE=" gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -78,7 +78,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
 	)
@@ -133,12 +132,7 @@ src_prepare() {
 
 	qmail_src_postunpack
 
-	if ! use authcram; then
-		einfo "Disabled CRAM_MD5 support"
-		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
-	else
-		einfo "Enabled CRAM_MD5 support"
-	fi
+	einfo "Enabled CRAM_MD5 support"
 
 	ht_fix_file Makefile*
 }
diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
index f8fec34a0f00..8e5a4d4b1b99 100644
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -64,8 +64,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} != 9999 ]] ; then
@@ -89,7 +89,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
 	)
@@ -149,12 +148,7 @@ src_prepare() {
 
 	qmail_src_postunpack
 
-	if ! use authcram; then
-		einfo "Disabled CRAM_MD5 support"
-		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
-	else
-		einfo "Enabled CRAM_MD5 support"
-	fi
+	einfo "Enabled CRAM_MD5 support"
 
 	ht_fix_file Makefile*
 }
diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 6ce036b2f82c..f07147afa4d4 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -61,8 +61,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} != 9999 ]] ; then
@@ -86,7 +86,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
 	)
@@ -142,12 +141,7 @@ src_prepare() {
 
 	qmail_src_postunpack
 
-	if ! use authcram; then
-		einfo "Disabled CRAM_MD5 support"
-		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
-	else
-		einfo "Enabled CRAM_MD5 support"
-	fi
+	einfo "Enabled CRAM_MD5 support"
 
 	ht_fix_file Makefile*
 }
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index e48198daab05..56ea1164c559 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-hide/Manifest b/mate-extra/caja-hide/Manifest
deleted file mode 100644
index 1697d0e47d13..000000000000
--- a/mate-extra/caja-hide/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX caja-hide-0.9.0-py3-support.patch 684 BLAKE2B d0288daa9870a00b2d77a865f54567c51809548314c4d9659c270698563f59c4378734ee7f2386e9bd643fe0a7fe0226f5e8693e0d84e19c1c03e72da09a2cad SHA512 eb78fb5495d34b1e5ccf22d39b2cdbe8b482d3f205c5a4dcc42d592c9c18ba7a9aa81a98d27dbfb4331e2d5db79a4c08e121565b206d84898d242500a7c82677
-DIST caja-hide-0.9.0.tar.gz 17487 BLAKE2B 182a4e65745a6c3dbbc40121d95f7b5b34b4660ceb9fcffc60ddd51bdc3949191b7eafa258950b0a6b9a6befd63e4b6842481f20ba31b4bfab0668c261e87470 SHA512 86a3d5a661a731caf740c4086ffc041f9f5cb21f996bc21d92cf5d53df108d6d14b753165ee992f3d5574957850f041d03e4d78447fb4db67bf989f16eb5471c
-EBUILD caja-hide-0.9.0.ebuild 857 BLAKE2B 7f31e3b6b66b265d6ad60fec751ef0f7a9966f507ec68f3f64ffa17af9b35ec895c9ebbbc05e1ef1dfd9faae8aa5a3d6f1427b0bf0f58e181892a9b2f762f6f9 SHA512 9d547258d09f1ba71e16adf16f4b13fd913271a4f014ec0eda95de3f2d8b71c2ba12cd5c5108a6a1b4c41c254d9945536f64dfd4006796a5ee8c3c1528b51419
-MISC metadata.xml 339 BLAKE2B bbccf302fa0acbe64be6e9ae3df7c077b973fd09b52ae17c34fb66de08d9fd96cc3a422a5dc7e80ab2c4b7136781d498472719b176127c92c877faf95074edcf SHA512 1de3b2610ae117e18a4f270398c63f0570f4d9fbe8643a52bb06703f141ac7a9784b4ef54edcea8b355c7749860fb0a9573eb7ec5742d7ecf1f2e976ec7dfbfe
diff --git a/mate-extra/caja-hide/caja-hide-0.9.0.ebuild b/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
deleted file mode 100644
index c8112e94cf5d..000000000000
--- a/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_8,3_9,3_10,3_11} )
-inherit python-single-r1
-
-MY_PN="Caja-hide"
-
-DESCRIPTION="Hide files without renaming them in MATE's Caja"
-HOMEPAGE="https://github.com/Fred-Barclay/Caja-hide"
-SRC_URI="https://github.com/Fred-Barclay/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep 'dev-python/future[${PYTHON_USEDEP}]')
-	dev-python/python-caja[${PYTHON_SINGLE_USEDEP}]
-	x11-misc/xautomation
-"
-BDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-py3-support.patch"
-)
-
-src_install() {
-	insinto /usr/share/caja-python/extensions
-	doins src/caja-hide.py
-}
diff --git a/mate-extra/caja-hide/files/caja-hide-0.9.0-py3-support.patch b/mate-extra/caja-hide/files/caja-hide-0.9.0-py3-support.patch
deleted file mode 100644
index 1e8e9994456e..000000000000
--- a/mate-extra/caja-hide/files/caja-hide-0.9.0-py3-support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# futurized
---- a/src/caja-hide.py
-+++ b/src/caja-hide.py
-@@ -1,3 +1,6 @@
-+from __future__ import absolute_import
-+from __future__ import division
-+from __future__ import unicode_literals
- # Caja Hide - Extension for Caja to hide files without renaming them
- # Copyright (C) 2015-2016 Caja Hide authors.
- #
-@@ -14,6 +17,9 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
-+from future import standard_library
-+standard_library.install_aliases()
-+from builtins import *
- import os
- from gi.repository import Caja, GObject
- from gettext import ngettext, locale, bindtextdomain, textdomain
diff --git a/mate-extra/caja-hide/metadata.xml b/mate-extra/caja-hide/metadata.xml
deleted file mode 100644
index 680b92d4f199..000000000000
--- a/mate-extra/caja-hide/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>mate@gentoo.org</email>
-		<name>Gentoo MATE Desktop</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Fred-Barclay/caja-hide</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 642ec07feba4..cfc081bce4aa 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 45674e9a6dd8..f01bfa096155 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,7 @@
 AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
+AUX krita-5.1.4-libraw-0.21.patch 1005 BLAKE2B e667bf866d00f3081f04be0cdddcc3fa291480c8a573a215c2e69ba1e0a823e7bf34ee65b37f1c662ffa0080dec2d588f37c1d9ccce1f609a2db1d3babdadeaf SHA512 9fd29dd0f05f8345f0ab01034808874c0938478f5aee4980ca65a6e09518f1e1b8e0d4a8a932d81b3fc4f7918f2eec0c3a8b1e3b45320ce8e4933286d8af5d83
 DIST krita-5.1.3.tar.xz 185166464 BLAKE2B 2fa93e06cd4b5b68016bc1af83464c3e44e1ece0e786734def030bf8e333086ed9d36b23d56dc8b742ceef85273b9d88d754286e85d2d1384ffc92a3592693fd SHA512 4025033cbbe48f2e0d52961320c08920691a3c5b48029c67560c3c28e699cec6a02432bc1ec706204b1f5f3199c7fc66e10c01607ce06b113211cae0194f5d88
 DIST krita-5.1.4.tar.xz 184969232 BLAKE2B 3452504c1ce973d0670508b143ee45d2a75fe72d87f1a3fdddd94a56c4b36f4a179e2a651a0663a04aab8e75484065a78140b3c8c51fda1215c14924a4895be5 SHA512 316b9333f416a4d8739a7201910069211d1da1b0f2eebfc48de08f6cf4736f3e7b8fa242bc97eebe8536e483c214cb584d459f26f8ce7bd10e36da467eb67446
 EBUILD krita-5.1.3-r3.ebuild 3499 BLAKE2B 1b5fd28250e8a81834b83e6437ecf5dd25cbcad0fb5390a4b47ce9cc07ca780f925a003d54c4c4b884b68f254f29b3601237344f063e3d65cb32b6df0c861b49 SHA512 714319672cb6ef5d9f03a18dda8d0cdff4249739d5a3292a2fedc98590570448e8d887a4d88def2bff9bb7f144a0ab5f694aff385b18867fea651a2c3fbd4616
-EBUILD krita-5.1.4-r1.ebuild 3473 BLAKE2B 92523c8760700b084a843a435ce206139d96545fc4cb01dd733e15a0c2c37a08c8d586805cdba399508029612634d92b284712a3e883515117493186b9a21241 SHA512 988e7790ca4ed649f4e7280e106cc6ae6a2eb63d82ffde4280bbd2cb5466a7de606f8f8ae681296d7039034ea2563950a5d43ee8248fade452266663a62e02ce
+EBUILD krita-5.1.4-r1.ebuild 3525 BLAKE2B 685760c68b9a85f162cee0bbcb41b0255843f5ce8ba10d181a01eef0846ed0a041aa1b14075f85141bde62ad23466080986b539be7ae7ddc2b805626ca24b675 SHA512 db8dc59540f24b4063d490c70e6c47d4a024e762d5bca2a71f530d5fd89bc7f7fee6597d499174496586c59d93d28b524e8ad5c71d549189cad7c2fdeb56843a
 MISC metadata.xml 836 BLAKE2B 65b987895464bd55fa59611396638b4826c858d3a0ad8cbe2f9b24dea7e32465b43974a967d2a766faa3128dd5ceb7a5b161a79ec3e179976d31478a2f52fbbb SHA512 a3b74e3f3de6500651308d4820e2d5e6504000085d634c561821bcd3f454aa1b89926a6ef9dac63378627e86d337b946e469af944dbd68e4a6349bfb8a76dc3a
diff --git a/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
new file mode 100644
index 000000000000..9cdd0a9f8161
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
@@ -0,0 +1,28 @@
+From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sun, 18 Dec 2022 16:28:38 +0100
+Subject: [PATCH] Fix build with libraw 0.21
+
+---
+ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+index dcaecc6fa7..71425f909c 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath, QByteArray& rawData, DcrawI
+     d->setProgress(0.3);
+ 
+     raw.imgdata.params.output_bps  = 16;
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++    raw.imgdata.rawparams.shot_select = shotSelect;
++#else
+     raw.imgdata.params.shot_select = shotSelect;
++#endif
+     ret                            = raw.unpack();
+ 
+     if (ret != LIBRAW_SUCCESS)
+-- 
+GitLab
+
diff --git a/media-gfx/krita/krita-5.1.4-r1.ebuild b/media-gfx/krita/krita-5.1.4-r1.ebuild
index abf1cf77bf49..86ce7588ec21 100644
--- a/media-gfx/krita/krita-5.1.4-r1.ebuild
+++ b/media-gfx/krita/krita-5.1.4-r1.ebuild
@@ -85,7 +85,10 @@ BDEPEND="
 	sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+	"${FILESDIR}"/${P}-libraw-0.21.patch # bug 887473
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/media-gfx/netpaint/Manifest b/media-gfx/netpaint/Manifest
deleted file mode 100644
index b9fcd2405eb4..000000000000
--- a/media-gfx/netpaint/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST netpaint-1.1.2.tar.gz 427241 BLAKE2B 7884dadf63849bf45caf84bc009da818bdf3277660411c486b32333bf0caf9e0e03ab6f56f77add68456896e4d16520b803c51e19c4dc6b01ef1227f0bd90a28 SHA512 f998714fe176c84074aaa710e2950c83d5c3ac0819e69c6bbbd93e19f6415a66f8ef21e0799d3112a7c468c1a99383a878ac1837157b079089aaf072c664ee53
-EBUILD netpaint-1.1.2.ebuild 711 BLAKE2B 7e4a5c5456c2124a8aa9738515711007a2a6ba9fce33afebccb5eac76aba85622067b575453a60ea576ded2f94c287640c80f8b11640b74f1329b8d334082f2e SHA512 83c1f6670c2a7f39ec7820421e7d78f56b4a884f1df1bbf03ffe29a2b2acb2dd1a412af1a183f1fa554d27077f405a8c74069c269e874b7234bff57358aa87ca
-MISC metadata.xml 414 BLAKE2B 3471f7a585441ffaa9cf1f78bbb557a04ba46d1704e77a0d387972963739e65a56ba08a521670ae009bc750523881f5b9c8f292a30aaad5e5a97da59315d81b6 SHA512 5bbeda40be60faa7d2409932dd62b1bd3f8b82c2944adfbf08b98685a863c40cf31867aad5083b58559e22a2289728d602488183ed3b05cc92e0a55bf43b158e
diff --git a/media-gfx/netpaint/metadata.xml b/media-gfx/netpaint/metadata.xml
deleted file mode 100644
index 65be4a236db7..000000000000
--- a/media-gfx/netpaint/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>monsieurp@gentoo.org</email>
-        <name>Patrice Clement</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>shell-tools@gentoo.org</email>
-        <name>Gentoo Shell Tools Project</name>
-    </maintainer>
-</pkgmetadata>
diff --git a/media-gfx/netpaint/netpaint-1.1.2.ebuild b/media-gfx/netpaint/netpaint-1.1.2.ebuild
deleted file mode 100644
index e44b6241f74d..000000000000
--- a/media-gfx/netpaint/netpaint-1.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="NetPaint"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="curses-based drawing tool"
-HOMEPAGE="https://github.com/SyntheticDreams/NetPaint"
-SRC_URI="https://github.com/SyntheticDreams/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	mv netpaint.py netpaint || die
-	sed -e 's#netpaint\.py#netpaint#g;' \
-		-i setup.py || die "can't patch setup.py"
-}
diff --git a/media-gfx/xzgv/Manifest b/media-gfx/xzgv/Manifest
deleted file mode 100644
index 0d23b6ce1b52..000000000000
--- a/media-gfx/xzgv/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xzgv-0.9-asneeded-and-cflags.patch 1002 BLAKE2B 7278103cadc14e2c52b9df5bddee761a757c363e7bfd46ebcfa83048b46ea0b0da19f8bba5380f535f92957b640ce977c207577db91fbf45104f012256608aea SHA512 b0afc6e73042bffc94f8fcdd83deff1dc182d5150a0b5da81ecead0ad5e2852c4aa4ce6be6e9334312ab9983df27af90fb9f81fc7529615a8e3d8c9de5ad47f9
-DIST xzgv-0.9.1.tar.gz 163419 BLAKE2B 6b97136a8e9b8228f849d5f905af6654a876b044e39dbacfeb01e89ac64d03920cd9f0bf17ff2e2ad4a59cb690d601db34488c72280fc0743799e7ed0c0288a0 SHA512 e57d0eb3f34bc63cb9f2d033856eefdeb6363ce55589b8bc52a8c253e211a4e36d3c0691b4559581d4052810fde445c6ec1832b964c40c5365c3869ce72f7361
-EBUILD xzgv-0.9.1.ebuild 677 BLAKE2B 7ffad5441432d8f944e23a2039656fdb21530537b8bf397aa8d14adb3290d23d91848748dc1991685eca45e51f7a756ec9031faf0c9673f1f6e7cae16c270de4 SHA512 e1d31ad4ad8ede88f11811fd3fb7f9099aec8b0e617cab925b95aee1d975bf4e13b76910023869713f2ef79c07ec0b9b3a7ac19a5755f3e9eb1e04d519873d62
-MISC metadata.xml 242 BLAKE2B 059aa8de0dc60bc8864b081011146b7171cc7508406cb9ff0c10a46b77fbdb1fdfb3261efaaf204faa28b9a702c23a0d109be0cbb13c724eb4e0f76d997bdf17 SHA512 af5bb53813e8dc456710169cffa1862c983978f09d950676a640bf961d3658d526a002586dc9546e714c86cafc5c10b1d494548577817f370c9d0601ba119c68
diff --git a/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch b/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch
deleted file mode 100644
index 344f283d7663..000000000000
--- a/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://bugs.gentoo.org/500692
-
---- a/config.mk
-+++ b/config.mk
-@@ -7,7 +7,7 @@
- # This is likely to be what you'll want for most systems:
- #
- CC=gcc
--CFLAGS=-O2 -Wall
-+CFLAGS+=-Wall
- 
- # Set the awk interpreter to use for a script used while compiling.
- # (This should be a `new' awk, such as gawk or mawk.)
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -9,8 +9,8 @@
- # This gets definitions for CC, CFLAGS, BINDIR etc.
- include ../config.mk
- 
--CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
--LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
-+CFLAGS+=`${PKG_CONFIG} --cflags gtk+-2.0` `${PKG_CONFIG} --cflags gdk-pixbuf-2.0` `${PKG_CONFIG} --cflags x11`
-+LIBS=`${PKG_CONFIG} --libs gtk+-2.0` `${PKG_CONFIG} --libs gdk-pixbuf-2.0` `${PKG_CONFIG} --libs x11` -lm
- 
- all: xzgv
- 
-@@ -23,7 +23,7 @@
- 	backend.o
- 
- xzgv: $(OBJS)
--	$(CC) $(LDFLAGS) -o xzgv $(OBJS)
-+	$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o xzgv
- 
- installdirs:
- 	/bin/sh ../mkinstalldirs $(BINDIR)
diff --git a/media-gfx/xzgv/metadata.xml b/media-gfx/xzgv/metadata.xml
deleted file mode 100644
index 2b146aacad21..000000000000
--- a/media-gfx/xzgv/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">xzgv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/xzgv/xzgv-0.9.1.ebuild b/media-gfx/xzgv/xzgv-0.9.1.ebuild
deleted file mode 100644
index 912f0a805616..000000000000
--- a/media-gfx/xzgv/xzgv-0.9.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Fast and simple GTK+ image viewer"
-HOMEPAGE="https://sourceforge.net/projects/xzgv"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P/.1}-asneeded-and-cflags.patch
-)
-
-src_compile() {
-	tc-export PKG_CONFIG
-
-	emake CC="$(tc-getCC)"
-	emake -C doc CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-	dodoc AUTHORS NEWS README TODO
-}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 3cd3225cc5d7..cf56520dcfab 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
deleted file mode 100644
index b8bba444da7a..000000000000
--- a/media-plugins/mythplugins/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mythplugins-31.0_p20210731.tar.gz 102637029 BLAKE2B 0ca6124d20d428c8b9999813c819c01a97c4806fbd2f70f5b50d698c5f9c3cafd3141ee1379b2b63510705e2083109d91362c3fcc6277f58d461f2138d1604fd SHA512 e262ce91fd8a523daa772d13675ff6639f95202f66be67b2a405e9ea9204d6663128621c5142752f2a889e25cbc8be6d92b3759508767e94207326343a91f092
-EBUILD mythplugins-31.0_p20210731-r2.ebuild 3779 BLAKE2B bca34b52a8c2c3d8da8512c057c204c78b7dda56da956facf077f59fe32c417d945de7f3b429908fcc66e98124ee566c8556196137545e67833750e53ebc02f3 SHA512 619ede18468bf3b0315d73b62e248084c51f65ba5125b9f971c689d804a0bbc85cd38f21031c066c23ecbb262d54b977749876e6cdfaf22ec8eadc2b0ef9d31a
-MISC metadata.xml 1394 BLAKE2B b9e35ba810b181c739e167acc988c8231b5dbe01e8fe5479604d45b1571a22b8c7afa47ae907100119c93b072076a4dffefa8a66b4353cec91ec901d3f140165 SHA512 631957ed05261e9285ffc3ba002614a5560c530db07d3d23285318eca34d85862d527fe96a5a7931fb338cb0f9d4e65c9c543b36d2fa9b300c80f703339abc5b
diff --git a/media-plugins/mythplugins/metadata.xml b/media-plugins/mythplugins/metadata.xml
deleted file mode 100644
index 42e09a229eae..000000000000
--- a/media-plugins/mythplugins/metadata.xml
+++ /dev/null
@@ -1,28 +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>thebitpit@austincustomerrands.com</email>
-		<name>Wilson Michaels</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="cdr">Allows MythMusic to burn CD-Rs</flag>
-		<flag name="exif">Allows MythGallery to read EXIF data from photos</flag>
-		<flag name="fftw">Adds visual effects to MythMusic when playing back music</flag>
-		<flag name="hls">HTTP Live Streaming support</flag>
-		<flag name="raw">Allows MythGallery to view photos saved in RAW format</flag>
-		<flag name="mytharchive">Allows you to archive recorded content to CD or DVD</flag>
-		<flag name="mythgame">Adds a frontend to various ROM emulators within MythTV</flag>
-		<flag name="mythnetvision">Adds the ability to view netvision devices within MythTV</flag>
-		<flag name="mythweather">Adds weather information within MythTV</flag>
-		<flag name="mythzmserver">Build mythzmserver daemon needed by zoneminder on LAN</flag>
-		<flag name="mythzoneminder">Adds support for zoneminder (requires active mythzmserver daemon on LAN).</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">MythTV/mythtv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-plugins/mythplugins/mythplugins-31.0_p20210731-r2.ebuild b/media-plugins/mythplugins/mythplugins-31.0_p20210731-r2.ebuild
deleted file mode 100644
index c6fd4bf6fa81..000000000000
--- a/media-plugins/mythplugins/mythplugins-31.0_p20210731-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-single-r1 readme.gentoo-r1
-
-# Grab only the major version number.
-MAJOR_PV=$(ver_cut 1)
-
-MY_COMMIT="5824c588db24b4e71a7d94e829e6419f71089297"
-
-DESCRIPTION="Official MythTV plugins"
-HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv"
-if [[ $(ver_cut 3) == "p" ]] ; then
-	SRC_URI="https://github.com/MythTV/mythtv/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-	# mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository
-	S="${WORKDIR}/mythtv-${MY_COMMIT}/mythplugins"
-else
-	SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	# mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository
-	SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/mythtv-${PV}/mythplugins"
-fi
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-MYTHPLUGINS="mytharchive mythgame mythnetvision \
-mythweather mythzmserver mythzoneminder"
-IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw +hls ieee1394 libass +opengl raw +theora +vorbis +xml xvid"
-
-# Mythnetvision temporarily disabled by upstream - should be fixed soon.
-REQUIRED_USE="
-	!mythnetvision
-	mytharchive? ( ${PYTHON_REQUIRED_USE} )
-	mythnetvision? ( ${PYTHON_REQUIRED_USE} )
-"
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/openssl:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtsql:5
-	media-libs/freetype:2
-	media-libs/libpng:=
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXv
-	x11-libs/libXxf86vm
-	alsa? ( media-libs/alsa-lib )
-	hls? (
-		media-libs/faac
-		media-libs/libvpx:=
-		media-libs/x264:=
-		media-sound/lame
-	)
-	ieee1394? (
-		media-libs/libiec61883
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	libass? ( media-libs/libass:= )
-	=media-tv/mythtv-${MAJOR_PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid]
-	mytharchive? (
-		${PYTHON_DEPS}
-		app-cdr/dvd+rw-tools
-		dev-python/pillow
-		dev-python/mysqlclient
-		=media-tv/mythtv-${MAJOR_PV}*[python]
-		media-video/dvdauthor
-		media-video/mjpegtools[png]
-		media-video/transcode
-		app-cdr/cdrtools
-	)
-	mythgame? (
-		sys-libs/zlib[minizip]
-		dev-perl/XML-Twig
-	)
-	mythnetvision? (
-		${PYTHON_DEPS}
-		dev-python/lxml
-		dev-python/pycurl
-		dev-python/urllib3
-		=media-tv/mythtv-${MAJOR_PV}*[python]
-	)
-	mythweather? (
-		dev-perl/Date-Manip
-		dev-perl/XML-Simple
-		dev-perl/XML-XPath
-		dev-perl/DateTime
-		dev-perl/Image-Size
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/SOAP-Lite
-		dev-perl/JSON
-		=media-tv/mythtv-${MAJOR_PV}*[perl]
-	)
-	mythzmserver? ( dev-db/mysql-connector-c:= )
-	theora? ( media-libs/libtheora )
-	xml? ( dev-libs/libxml2:= )
-	xvid? ( media-libs/xvid )
-"
-DEPEND=${RDEPEND}
-
-DOC_CONTENTS="
-Mythgallery code moved to mythtv and is no longer a plugin in version 31.0.
-As of 3/23/2020, MythNetVision is disabled, work in progress.
-
-No plugins are installed by default. Enable plugins individually with USE flags:
-mytharchive mythgame mythnetvision mythweather mythzmserver mythzoneminder
-"
-
-src_configure() {
-	econf \
-		--python=${EPYTHON} \
-		--extra-ldflags="${LDFLAGS}" \
-		--disable-mythbrowser \
-		$(use_enable cdda cdio) \
-		$(use_enable exif) \
-		$(use_enable exif new-exif) \
-		$(use_enable fftw) \
-		$(use_enable opengl) \
-		$(use_enable raw dcraw) \
-		$(use_enable mytharchive) \
-		$(use_enable mythgame) \
-		$(use_enable mythnetvision) \
-		$(use_enable mythweather) \
-		$(use_enable mythzmserver) \
-		$(use_enable mythzoneminder)
-}
-
-src_install() {
-	emake STRIP="true" INSTALL_ROOT="${D}" install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index dae9e4f62c43..6637e81fb0c1 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/marrie/Manifest b/media-sound/marrie/Manifest
deleted file mode 100644
index 23ce828191dd..000000000000
--- a/media-sound/marrie/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST marrie-0.4.tar.gz 7775 BLAKE2B 7b68fbdfe35c7e72fe111b44bbabf4e60eb9f6211867184d1f3f7bc7b1c067f99223eea2dd3c7809f041d0a7b5ac80be360d3c14808605f3145b8d39a0a9c7fd SHA512 9ed8677729e7575519f130c1866923e7223dabf07c9c24b9e3f6a70cd5e1e56da2a5d1a34011b73d65c8d8fa4c962f65709883b9444d078d6439769d4afb644b
-EBUILD marrie-0.4.ebuild 751 BLAKE2B 9e9fbb3e5de75847d714a0afa059ac5752e7dca7208c6d769ac665343d42dbc9bfd8b79456462310876151b5066568346f328373fa5506714af90172c91c9c46 SHA512 5531fd1469c0c05b5710aa403094b8011fe8df57e71c99dfa78cf80d6746bb49af2c534dbed0d165d60ac44e757ce029ff75b353b3e2a5460962dab309dd6809
-EBUILD marrie-9999.ebuild 751 BLAKE2B 9e9fbb3e5de75847d714a0afa059ac5752e7dca7208c6d769ac665343d42dbc9bfd8b79456462310876151b5066568346f328373fa5506714af90172c91c9c46 SHA512 5531fd1469c0c05b5710aa403094b8011fe8df57e71c99dfa78cf80d6746bb49af2c534dbed0d165d60ac44e757ce029ff75b353b3e2a5460962dab309dd6809
-MISC metadata.xml 480 BLAKE2B 3f4a1f38a5244e10a8b4798f12ec2c789b31cb77ea0aa894c593def6fb96d0acea07cd13f1ea4306f52e0eba9b76070c403662125d898554668488b29487c04f SHA512 1c64572582a5458b9473f86a925f9bec581d652564e7213a2af52eee6834e050e6ac62ee4617bb2aece28629e930a9c3f0dedada7f3e7be35640bfdaa5a73e35
diff --git a/media-sound/marrie/marrie-0.4.ebuild b/media-sound/marrie/marrie-0.4.ebuild
deleted file mode 100644
index a1e727f450c9..000000000000
--- a/media-sound/marrie/marrie-0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
-HOMEPAGE="https://github.com/rafaelmartins/marrie"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
-	elog
-	elog "You'll need a media player and a file downloader."
-	elog "Recommended packages: net-misc/wget and media-video/mpv"
-	elog
-}
diff --git a/media-sound/marrie/marrie-9999.ebuild b/media-sound/marrie/marrie-9999.ebuild
deleted file mode 100644
index a1e727f450c9..000000000000
--- a/media-sound/marrie/marrie-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
-HOMEPAGE="https://github.com/rafaelmartins/marrie"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
-	elog
-	elog "You'll need a media player and a file downloader."
-	elog "Recommended packages: net-misc/wget and media-video/mpv"
-	elog
-}
diff --git a/media-sound/marrie/metadata.xml b/media-sound/marrie/metadata.xml
deleted file mode 100644
index 108795d613aa..000000000000
--- a/media-sound/marrie/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer status="active">
-			<email>rafael@rafaelmartins.eng.br</email>
-			<name>Rafael G. Martins</name>
-		</maintainer>
-		<bugs-to>mailto:rafael@rafaelmartins.eng.br</bugs-to>
-		<remote-id type="pypi">marrie</remote-id>
-		<remote-id type="github">rafaelmartins/marrie</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/retrovol/Manifest b/media-sound/retrovol/Manifest
deleted file mode 100644
index 1b22d52d66dd..000000000000
--- a/media-sound/retrovol/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST retrovol-0.13.tar.gz 210929 BLAKE2B 72b59cbae3b290ef32ed07bd80bacbd512d6594fa859df576505d8257529af93bb5135a8a843998d47e7a935411dd9541ac1747cf6b072f33f612c823a07e00c SHA512 a2e21ae70b1be7c824061a7118b331558dd27f5d93861d509ac03fd85856661555880ad592eb1fb4750eebeac7f1930aebc3c1f64b31ce6983b993098b509ce4
-EBUILD retrovol-0.13.ebuild 744 BLAKE2B ba5317dc706e7e1aed99a2c3adfebe7d1aabf4cabe86c57187d30989264e28adf61714ef658f410463c88cc3b6d494d90dbf51e6c38d736b0bc322854aff5826 SHA512 a7dded999ea42b3ea5dc5c5969aeef24adb45f343a8741f932bad5782df822d13b1cd79506276e01d579eaaaaa509aacda2f475d8d122a66d27357867071633b
-MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-sound/retrovol/metadata.xml b/media-sound/retrovol/metadata.xml
deleted file mode 100644
index cd1cfc033621..000000000000
--- a/media-sound/retrovol/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>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/media-sound/retrovol/retrovol-0.13.ebuild b/media-sound/retrovol/retrovol-0.13.ebuild
deleted file mode 100644
index e1956bda5b8a..000000000000
--- a/media-sound/retrovol/retrovol-0.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Systemtray volume mixer applet from PuppyLinux"
-HOMEPAGE="http://puppylinux.org/wikka/Retrovol"
-SRC_URI="http://www.browserloadofcoolness.com/software/puppy/PETget/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-pkg_postinst() {
-	echo
-	elog "You can find a sample configuration file at"
-	elog "   ${EROOT}/usr/share/retrovol/dot.retrovolrc"
-	elog "To customize, copy it to ~/.retrovolrc and edit it as you like"
-	echo
-}
diff --git a/media-sound/umix/Manifest b/media-sound/umix/Manifest
deleted file mode 100644
index 91f61ec61f70..000000000000
--- a/media-sound/umix/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX umix-1.0.2-tinfo.patch 381 BLAKE2B b54721623167ae634b5e6e0243ffe9fb57c7af3f99236e23317163aa95926bf2c2a56b07eed1bdd228c7d92c21e0009dd5044e551e9d06bd3488bbb47a9666db SHA512 acd5f8c6a22ed857182fabba848b1718d1031cd6b7c15456e25f37387ed8cb6c354accd1e83781954c9beed88337889538dc1e38992a4ddadabc3077941c048e
-DIST umix-1.0.2.tar.gz 225866 BLAKE2B 8ab2b3246440fcab64edea366dafd5d8f734c42483fd78410a1f884c2b046a27fdb6959023d6c537900c64409ad0f606e7d2c2e91f23bdd03dda61940ba7d29b SHA512 9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468
-EBUILD umix-1.0.2-r1.ebuild 696 BLAKE2B b02e74f5fa273ec7079f48a5a444dfa0ec2ab25bcfe2374dd2200734ab8d68fa650216e0b9d31684a5ce6d10ec157b550667bf3b58d58b672f882fccc393aa64 SHA512 bcb80632c5e1a5995cc94dffefa936d8c5f2c8ee250a716d9953f008d5bc3df4450f1f9cb4632e0ffd415e9103cfc1d2e792947e0321405bf2f2c7ecd9e607c6
-MISC metadata.xml 328 BLAKE2B faedfc5b87c04ed01758d7e4b01fac7866cafcd7105a279b8ce0c249b5b0865ecb029d21107a26bac71370b5055749df9bed52ec14c69db175dc50e291a4dc96 SHA512 99160b436f67e9fc8a09efb53b30ca35f221d56fed48a0fb8bb7cec4c9b39c3ff9f2e458949d0532e21af546fca87dd5ce7ead743750d40e5bef156a1cd0998a
diff --git a/media-sound/umix/files/umix-1.0.2-tinfo.patch b/media-sound/umix/files/umix-1.0.2-tinfo.patch
deleted file mode 100644
index 65c0d7158375..000000000000
--- a/media-sound/umix/files/umix-1.0.2-tinfo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -89,6 +89,7 @@
- 	then
- 		AC_CHECK_LIB(curses, initscr, NCURSLIB="curses", NCURSLIB="")
- 	fi
-+	AC_SEARCH_LIBS(stdscr,tinfo)
- fi
- if test "x$NCURSLIB" != "x"
- then
-@@ -97,6 +98,7 @@
- 	AC_DEFINE(HAVE_NCURSES)
- 	LIBS="$LIBS -l$NCURSLIB"
- 	umix_CONDOBJS="$umix_CONDOBJS ui_ncurses.o"
-+	AC_SEARCH_LIBS(stdscr,tinfo)
- else
- 	have_ncurses="no"
- fi
diff --git a/media-sound/umix/metadata.xml b/media-sound/umix/metadata.xml
deleted file mode 100644
index 861c10998372..000000000000
--- a/media-sound/umix/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>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">umix</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/umix/umix-1.0.2-r1.ebuild b/media-sound/umix/umix-1.0.2-r1.ebuild
deleted file mode 100644
index dd633418564d..000000000000
--- a/media-sound/umix/umix-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Program for adjusting soundcard volumes"
-HOMEPAGE="http://umix.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="ncurses oss"
-
-DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use ncurses || myconf="--disable-ncurses"
-	use oss || myconf="${myconf} --disable-oss"
-	econf ${myconf}
-}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 0c7492bc9663..be1b09017479 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/tvnamer/Manifest b/media-tv/tvnamer/Manifest
deleted file mode 100644
index db2c93324d51..000000000000
--- a/media-tv/tvnamer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tvnamer-3.0.2.tar.gz 47662 BLAKE2B a6a472e6258563d0929a4abd678b161728efb84d1b072a9b7d5684e031a3dfb4c999a8252504ee8d9a6a94638dba5273eaabe4761ea979ff2e25781512c8b43d SHA512 c4ee5573b759450f65fa75d7a28f0cf1f44a8d794fc1565291b15272243bb157525a369e0067ca8c10860374209ad2ddfe54ad2c70dcfb570bf636da9357b383
-EBUILD tvnamer-3.0.2.ebuild 444 BLAKE2B 3dd003e6c0bae89c5a36365a13267874c69f82cfa9796654f762a0fc1c890e545ab3295739c5124ca373f5ba9e726d19bc37098f193099681c2330afed64b31a SHA512 030b69941f8e276f9194ae2221a36f7e57f6e5a47c8588af8d863e8fdf9aafe7ab7a30da3c0fdd4fa90d78b4b0f7f3e4e94390d7483f865a56f0233a8215289c
-MISC metadata.xml 296 BLAKE2B 4d1e1e79d36ede4f4109b89fbe4eb35f28e341692bfb812d69c5a2bd3e4dd65644544fb0b6fb5feb8f27e54cd033aab3b833507b87692c271db6ca3d86c27ef8 SHA512 75b8211378be35137c9d8c3694dd468ca990d2b377dbcca5d07b1ec1a38fc6958d83a7d27f06cb3cd7b4198612600984326a2a5ab0bd0ef685bf62066b56bedf
diff --git a/media-tv/tvnamer/metadata.xml b/media-tv/tvnamer/metadata.xml
deleted file mode 100644
index a7eb3b479283..000000000000
--- a/media-tv/tvnamer/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 -->
-  <upstream>
-    <remote-id type="pypi">tvnamer</remote-id>
-    <remote-id type="github">dbr/tvnamer</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-tv/tvnamer/tvnamer-3.0.2.ebuild b/media-tv/tvnamer/tvnamer-3.0.2.ebuild
deleted file mode 100644
index 290e26699e9a..000000000000
--- a/media-tv/tvnamer/tvnamer-3.0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"
-HOMEPAGE="https://github.com/dbr/tvnamer"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="=dev-python/tvdb_api-3*[${PYTHON_USEDEP}]"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 454f1a8346cc..95c4ea32bb52 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index af09a94b95dc..5ece73a1c728 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 20 Dec 2022 13:09:53 +0000
+Tue, 20 Dec 2022 19:10:01 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 8495097e1726..599751db85dd 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538471 BLAKE2B b7385901234c82cabfe7b6fe500f9a2de535ba832c5fe98f7b1adcf90342ab9ac009a4eefb2c71141609f93233148e5db41c6f760cbea8413d0a285b67c25f90 SHA512 8b561e583b67bc367b59eefc1d958442632b1001434a1d0874a9ae00334c80cc4a27278dac1813b0d7b255f214d060c5e60573b828bb87fc8e319dc9233f12aa
-TIMESTAMP 2022-12-20T13:09:56Z
+TIMESTAMP 2022-12-20T19:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOhtCRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOiCIxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA3ehAArIt1GbyCcyh+C2GhtYeYtLw7FAiNp4G5S+ub4QcBVJAVxwdeNVUuqHfZ
-A8tkQMA/EZe57XZ5tvhtrEI5lDF+4e+K1ZPYk5RV+wjTXr0YiSFm3ckzddtAHoJx
-bhZb7VN2QRUOkz/1am/XEhmXl++WTYM5jJBEA0e94S9Bz022WyT6lv3+PSfGIVp8
-TdRMwHgGgT2Z+dhNmqMS3mxMmaXOHAoBSfhmicm+T1wi+lXJAZpoKeU7nYGNP+73
-SDoinRTUah5/2FknEvbC218Z0YvDM2rhyy8OLAqpVOeIGo7GdLZF5RaVrTyLFIl6
-KGG1xVLj8+9rATNLT8QYYLnNM+3PER/AuO7C9zPpx8loq/kYseyRpCpHMGARr8iL
-s81ykQLJIMlp4tL5LbaILklevZgzehJLl52CQ13BrvFhwugXTa0grgVJ0XxC6D7Q
-qf8bgbUOMASDgDiS4oGHHafc6P45wHDOmxE1KVZxfjDwvqYFdRWpBEnk9Lsy1mq8
-sYhWPqRdiMPyNKxzRisyoluOOj7ptLGPvQgO2sdK4GMqYmicej6SrAZxbrqivF2t
-RuubyGNLYtgMJr+YLFJh57v7DukMB40x4avwLlHy75kt3zrA9ZP8xQTFgejUmqco
-g9AXlMp0zhH4309MkgwiGRIccSTMgIcvKWqV3xeedPOovUYM3ac=
-=2Tcv
+klChfBAAoFDP23mFcjBaOB1lp39HWTIwzuVR1fXC5LzRgtcCvG5OKeeKaftkuZ9s
+lkT5p+swdmVXAM5yV1UvcLyWoXcGFGtHyRN3UVjY7ZwftmwxILYsMymLMNwmYZun
+O0WpTzMn2Ut3zCdenoextrvQEi0KaPfaoOWYejTjfSwhhr12nceCEBLrSj+pDZ49
+4JMHYSkYkpmns08lq6AuGNj+nuBkByfOcb01alPbd7Cd2Xdbd+EOiNeGCm3yZlXD
+kP7EgsP+tQkNLA74gSCun+9n89PrKABvhL3MuNztmDdTaDMWYZDTqcEPYBwELm1N
+64GW2+1Jv801i8tarQe1c7tHRQmYdqbdEdte/UWLeuaG4FGZWq230XQbzSsSje8d
+3X72isQ9PYQgalK3XiwJPUIAENkTedW9GRRpNUt+1/irRp9ElWQNJ/TlcB34Yf59
+MsuarPP9ynmqjE1niI6THNOIJcKI8TVQXEvM65yfaBOUn2nq+JOamqvGpZeSCzrm
+P1qjUQY5oHuPqxGtrzBIPiChEfFGQRFgeFQNj9eM49qQxj8lYY2MnTxBWuppxMQO
+zQ8EaFmW93sYOwekCpu6jidnaR98XK8bBG/wiN5l/E8+cdWE+CRMdepx8o4GvsUf
+GAbN+mnBxyteK1kTBgASkgBFxlAa4O9t9bxS1ieQo23u31lsb/A=
+=mRqZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index af09a94b95dc..5ece73a1c728 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 20 Dec 2022 13:09:53 +0000
+Tue, 20 Dec 2022 19:10:01 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b17f35e2a0b5..f7047a7d1b31 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index eaa47e8d294a..935945a1fe79 100644
--- a/metadata/md5-cache/acct-group/Manifest.gz
+++ b/metadata/md5-cache/acct-group/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/cmd5checkpw-0-r1 b/metadata/md5-cache/acct-group/cmd5checkpw-0-r1
deleted file mode 100644
index c58c28ab3cf7..000000000000
--- a/metadata/md5-cache/acct-group/cmd5checkpw-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install preinst pretend
-DESCRIPTION=System group: cmd5checkpw
-EAPI=7
-INHERIT=acct-group
-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
-SLOT=0
-_eclasses_=acct-group	4ab6ca538789e73c2c796d01318ae2d7	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=647267b4ef545e9ca83b2605313d1a38
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index ca3aa3ef2817..9c34e867534f 100644
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/cmd5checkpw-0-r1 b/metadata/md5-cache/acct-user/cmd5checkpw-0-r1
deleted file mode 100644
index 235dda0f8c43..000000000000
--- a/metadata/md5-cache/acct-user/cmd5checkpw-0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=User for cmd5checkpw
-EAPI=7
-INHERIT=acct-user
-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
-RDEPEND=acct-group/nofiles
-SLOT=0
-_eclasses_=acct-user	e77a61bcd7cd4bed211eced74cad733e	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=02225d5f33cd543ce21808a68cc921cf
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index c11c7893a6a1..b8cffcd1cfde 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-cmdb-1.30-r1 b/metadata/md5-cache/app-admin/ansible-cmdb-1.30-r1
deleted file mode 100644
index f0fe45d98675..000000000000
--- a/metadata/md5-cache/app-admin/ansible-cmdb-1.30-r1
+++ /dev/null
@@ -1,15 +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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Ansible Configuration Management Database
-EAPI=8
-HOMEPAGE=https://github.com/fboender/ansible-cmdb
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonxs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-cmdb/ansible-cmdb-1.30.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=54da5c7a34a39de1ec493f4eb291ed2b
diff --git a/metadata/md5-cache/app-admin/prelude-manager-5.2.0-r1 b/metadata/md5-cache/app-admin/prelude-manager-5.2.0-r1
deleted file mode 100644
index 08ffc4af1edf..000000000000
--- a/metadata/md5-cache/app-admin/prelude-manager-5.2.0-r1
+++ /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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=net-libs/gnutls:= >=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 dbx? ( >=dev-libs/libpreludedb-5.2.0 <dev-libs/libpreludedb-6 ) geoip? ( dev-libs/libmaxminddb ) snmp? ( net-analyzer/net-snmp ) tcpd? ( sys-apps/tcp-wrappers ) xml? ( dev-libs/libxml2 )
-DESCRIPTION=Bus communication for all Prelude modules
-EAPI=7
-HOMEPAGE=https://www.prelude-siem.org
-INHERIT=autotools systemd tmpfiles
-IUSE=dbx geoip snmp tcpd xml
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=net-libs/gnutls:= >=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 dbx? ( >=dev-libs/libpreludedb-5.2.0 <dev-libs/libpreludedb-6 ) geoip? ( dev-libs/libmaxminddb ) snmp? ( net-analyzer/net-snmp ) tcpd? ( sys-apps/tcp-wrappers ) xml? ( dev-libs/libxml2 ) virtual/tmpfiles
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prelude-manager-5.2.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=fc187f980932d9ebd26af5742b05e29d
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index a9bf29fc408e..6c48b6125550 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/bloscpack-0.16.0 b/metadata/md5-cache/app-arch/bloscpack-0.16.0
deleted file mode 100644
index 99a35c952848..000000000000
--- a/metadata/md5-cache/app-arch/bloscpack-0.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/deprecated[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_python3_8(-)?,python_targets_python3_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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Blosc compression
-EAPI=7
-HOMEPAGE=https://github.com/Blosc/bloscpack
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/deprecated[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.16.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c7bd5f9dc0797605f42aebddd50a61c5
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 69f3771123ba..da3ea4579464 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2 b/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
deleted file mode 100644
index 8bd64cfaa878..000000000000
--- a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
+++ /dev/null
@@ -1,15 +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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Browser-based user interface for BorgBackup
-EAPI=7
-HOMEPAGE=https://pypi.org/project/borgweb/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-backup/borgbackup[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgweb/borgweb-0.2.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8567a58d439e664fd057e7505a466f9b
diff --git a/metadata/md5-cache/app-backup/borgweb-0.3.0 b/metadata/md5-cache/app-backup/borgweb-0.3.0
deleted file mode 100644
index ffa01c7e9933..000000000000
--- a/metadata/md5-cache/app-backup/borgweb-0.3.0
+++ /dev/null
@@ -1,15 +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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Browser-based user interface for BorgBackup
-EAPI=7
-HOMEPAGE=https://pypi.org/project/borgweb/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-backup/borgbackup[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgweb/borgweb-0.3.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8567a58d439e664fd057e7505a466f9b
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 533ed28adac1..797991db2716 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.41 b/metadata/md5-cache/app-crypt/gnupg-2.2.41
index ec41038c406f..78b811985015 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.41
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.41
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.41.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.2.41.tar.bz2.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source	6dc5829f04ddee3f91b9bb274a701fdb	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=3610d9d7eaddd57d70171557fb494b40
+_md5_=623b94f979f5a4e27da6c94d47e6b101
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.4.0 b/metadata/md5-cache/app-crypt/gnupg-2.4.0
index ce9fa6c829b1..4e62f93554a3 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.4.0
+++ b/metadata/md5-cache/app-crypt/gnupg-2.4.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source	6dc5829f04ddee3f91b9bb274a701fdb	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=152135f4d16f95a0133a9764b1b479c2
+_md5_=45d75804d32d33998850711db3d5bdca
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index b1814d788b23..7899e453748e 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/aqemu-0.9.2-r2 b/metadata/md5-cache/app-emulation/aqemu-0.9.2-r2
deleted file mode 100644
index 80781dff0e70..000000000000
--- a/metadata/md5-cache/app-emulation/aqemu-0.9.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-emulation/qemu dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 vnc? ( net-libs/libvncserver )
-DESCRIPTION=Graphical interface for QEMU and KVM emulators, using Qt5
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/aqemu
-INHERIT=cmake
-IUSE=vnc
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-emulation/qemu dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 vnc? ( net-libs/libvncserver )
-SLOT=0
-SRC_URI=https://github.com/tobimensch/aqemu/archive/v0.9.2.tar.gz -> aqemu-0.9.2.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=55e83074ef7103cf7770cc96dd77bfb7
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 774e816ee73c..3883582a0af0 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/ovaldi-5.10.1.7-r1 b/metadata/md5-cache/app-forensics/ovaldi-5.10.1.7-r1
deleted file mode 100644
index 362721026ba0..000000000000
--- a/metadata/md5-cache/app-forensics/ovaldi-5.10.1.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libgcrypt:= dev-libs/libpcre:= dev-libs/xalan-c:= dev-libs/xerces-c:= sys-apps/util-linux:= sys-libs/libcap acl? ( sys-apps/acl:= ) ldap? ( net-nds/openldap:= ) selinux? ( sys-libs/libselinux )
-DESCRIPTION=Free implementation of OVAL
-EAPI=7
-HOMEPAGE=http://oval.mitre.org/language/interpreter.html
-INHERIT=toolchain-funcs
-IUSE=acl ldap selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libgcrypt:= dev-libs/libpcre:= dev-libs/xalan-c:= dev-libs/xerces-c:= sys-apps/util-linux:= sys-libs/libcap acl? ( sys-apps/acl:= ) ldap? ( net-nds/openldap:= ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://sourceforge/ovaldi/ovaldi-5.10.1.7-src.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=858ce166a69a9d03af1205dffed9cec5
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index ac10e812fa52..4b30d94ce149 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
deleted file mode 100644
index ff23d654c4f3..000000000000
--- a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl
-DESCRIPTION=Chinese SunPinyin input method for Fcitx
-EAPI=7
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin
-INHERIT=cmake xdg-utils
-KEYWORDS=amd64 ppc ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl app-i18n/sunpinyin-data
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.tar.xz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0ab5cb9c5636de5fa032e109bbcce446
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
deleted file mode 100644
index 84965ff11ced..000000000000
--- a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl
-DESCRIPTION=Chinese SunPinyin input method for Fcitx
-EAPI=7
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin
-INHERIT=cmake xdg-utils git-r3
-LICENSE=GPL-2+
-PROPERTIES=live
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl app-i18n/sunpinyin-data
-SLOT=4
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2aece897e250136e095cfc3ac091cfb9
diff --git a/metadata/md5-cache/app-i18n/ibus-kkc-1.5.22_p20170607 b/metadata/md5-cache/app-i18n/ibus-kkc-1.5.22_p20170607
deleted file mode 100644
index 46579df0b11b..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-kkc-1.5.22_p20170607
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure prepare unpack
-DEPEND=app-i18n/ibus app-i18n/libkkc x11-libs/gtk+:3 nls? ( virtual/libintl )
-DESCRIPTION=Japanese Kana Kanji conversion engine for IBus
-EAPI=7
-HOMEPAGE=https://github.com/ueno/ibus-kkc
-INHERIT=autotools vala vcs-snapshot
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-i18n/ibus app-i18n/libkkc x11-libs/gtk+:3 nls? ( virtual/libintl ) app-i18n/skk-jisyo
-SLOT=0
-SRC_URI=https://github.com/ueno/ibus-kkc/archive/f7516ae20cb648cd8b0904aec5853d3a3d2611c4.tar.gz -> ibus-kkc-1.5.22_p20170607.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vala	160a8a30a6cb9aa601e5441c643a7c61	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0f4af3843a14f3e08a14bd1d860667a6
diff --git a/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733 b/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733
deleted file mode 100644
index 1b742461ccea..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig python_single_target_python3_8? ( >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) 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 )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=app-i18n/ibus ~app-i18n/sunpinyin-2.0.4_pre20200306162733 dev-libs/glib:2 virtual/libintl
-DESCRIPTION=Chinese SunPinyin engine for IBus
-EAPI=7
-HOMEPAGE=https://github.com/sunpinyin/sunpinyin
-INHERIT=python-single-r1 scons-utils toolchain-funcs
-IUSE=+gui python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( CDDL LGPL-2.1 )
-RDEPEND=app-i18n/ibus ~app-i18n/sunpinyin-2.0.4_pre20200306162733 dev-libs/glib:2 virtual/libintl app-i18n/sunpinyin-data gui? ( 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_8? ( app-i18n/ibus[introspection,python,python_targets_python3_8(-)] dev-python/pygobject[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[introspection,python,python_targets_python3_9(-)] dev-python/pygobject[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/f39c195db08661e894017507842991a1ef70bedf.tar.gz -> sunpinyin-2.0.4_pre20200306162733.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8e16ac8cf4119eeb03ef09735cce7786
diff --git a/metadata/md5-cache/app-i18n/libkkc-0.3.5_p20210928 b/metadata/md5-cache/app-i18n/libkkc-0.3.5_p20210928
deleted file mode 100644
index 1f2125c5b00d..000000000000
--- a/metadata/md5-cache/app-i18n/libkkc-0.3.5_p20210928
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.9:3.10 dev-libs/marisa[python,python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-libs/marisa[python,python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-libs/marisa[python,python_targets_python3_8(-)] ) ) || ( dev-lang/vala:0.56 ) dev-libs/gobject-introspection virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=app-i18n/libkkc-data dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
-DESCRIPTION=Japanese Kana Kanji conversion input method library
-EAPI=7
-HOMEPAGE=https://github.com/ueno/libkkc
-INHERIT=autotools python-any-r1 vala vcs-snapshot
-IUSE=nls static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=app-i18n/libkkc-data dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://github.com/ueno/libkkc/archive/cdcaf4dceaf273bfe7b018a4a651a92f786c6ec6.tar.gz -> libkkc-0.3.5_p20210928.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vala	160a8a30a6cb9aa601e5441c643a7c61	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1936aa1deb86dcb3ce6836ce9f3e32ab
diff --git a/metadata/md5-cache/app-i18n/libkkc-9999 b/metadata/md5-cache/app-i18n/libkkc-9999
deleted file mode 100644
index cfd8fcb15216..000000000000
--- a/metadata/md5-cache/app-i18n/libkkc-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.9:3.10 dev-libs/marisa[python,python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-libs/marisa[python,python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-libs/marisa[python,python_targets_python3_8(-)] ) ) || ( dev-lang/vala:0.56 ) dev-libs/gobject-introspection virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=app-i18n/linkkc-data dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
-DESCRIPTION=Japanese Kana Kanji conversion input method library
-EAPI=7
-HOMEPAGE=https://github.com/ueno/libkkc
-INHERIT=autotools python-any-r1 vala git-r3
-IUSE=nls static-libs
-LICENSE=GPL-3+
-PROPERTIES=live
-RDEPEND=app-i18n/linkkc-data dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
-SLOT=0
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2c0f563ca3f029b8231a0ad18d177707
diff --git a/metadata/md5-cache/app-i18n/libkkc-data-0.2.7 b/metadata/md5-cache/app-i18n/libkkc-data-0.2.7
deleted file mode 100644
index e917a6192dfb..000000000000
--- a/metadata/md5-cache/app-i18n/libkkc-data-0.2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.9.16:3.9 dev-libs/marisa[python,python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-libs/marisa[python,python_targets_python3_8(-)] ) )
-DEFINED_PHASES=setup
-DESCRIPTION=Language model data for libkkc
-EAPI=7
-HOMEPAGE=https://github.com/ueno/libkkc
-INHERIT=python-any-r1
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=https://github.com/ueno/libkkc/releases/download/v0.3.5/libkkc-data-0.2.7.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f5289cea7c2ea1a7fec3251621bee981
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
deleted file mode 100644
index efae1fedb897..000000000000
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig || ( ( >=dev-lang/python-3.9.16:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/sqlite:3 virtual/libiconv
-DESCRIPTION=Statistical Language Model (SLM) based Chinese input method library
-EAPI=7
-HOMEPAGE=https://github.com/sunpinyin/sunpinyin
-INHERIT=python-any-r1 scons-utils toolchain-funcs
-KEYWORDS=amd64 ppc ppc64 ~riscv x86
-LICENSE=|| ( CDDL LGPL-2.1 )
-RDEPEND=dev-db/sqlite:3 virtual/libiconv
-SLOT=0/3
-SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/f39c195db08661e894017507842991a1ef70bedf.tar.gz -> sunpinyin-2.0.4_pre20200306162733.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=918511d807ddff86379d8463de484909
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-data-20140820 b/metadata/md5-cache/app-i18n/sunpinyin-data-20140820
deleted file mode 100644
index c78d68330928..000000000000
--- a/metadata/md5-cache/app-i18n/sunpinyin-data-20140820
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-i18n/sunpinyin-2.0.4_pre20140819192400
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Data sets for SunPinyin
-EAPI=7
-HOMEPAGE=https://github.com/sunpinyin/open-gram
-INHERIT=edo
-KEYWORDS=amd64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/open-gram/dict.utf8-20131214.tar.bz2 mirror://sourceforge/open-gram/lm_sc.3gm.arpa-20140820.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3
-_md5_=1dc74a78e671cb5441e38a3d25ed9d2e
diff --git a/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20200306162733 b/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20200306162733
deleted file mode 100644
index 636de9e001d4..000000000000
--- a/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20200306162733
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.9.16:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=~app-i18n/sunpinyin-2.0.4_pre20200306162733 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
-DESCRIPTION=Standalone XIM server for SunPinyin
-EAPI=7
-HOMEPAGE=https://github.com/sunpinyin/sunpinyin
-INHERIT=python-any-r1 scons-utils toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( CDDL LGPL-2.1 )
-RDEPEND=~app-i18n/sunpinyin-2.0.4_pre20200306162733 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango app-i18n/sunpinyin-data
-SLOT=0
-SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/f39c195db08661e894017507842991a1ef70bedf.tar.gz -> sunpinyin-2.0.4_pre20200306162733.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a35027fff86f26c5abb142321208401a
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 1a70305525e0..52137f757c0f 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/glimpse-4.18.6-r1 b/metadata/md5-cache/app-misc/glimpse-4.18.6-r1
deleted file mode 100644
index 80f327beed88..000000000000
--- a/metadata/md5-cache/app-misc/glimpse-4.18.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=A index/query system to search a large set of files quickly
-EAPI=6
-HOMEPAGE=http://webglimpse.net/
-INHERIT=flag-o-matic toolchain-funcs
-IUSE=static
-KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=ISC
-RDEPEND=!dev-libs/tre !dev-ruby/amatch !app-text/agrep
-SLOT=0
-SRC_URI=http://webglimpse.net/trial/glimpse-4.18.6.tar.gz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bc07af56dc31a574f735eddd1798deac
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index db921f747028..f015f31d2eee 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/distpatch-0.1.2-r2 b/metadata/md5-cache/app-portage/distpatch-0.1.2-r2
deleted file mode 100644
index 1a20ec16de02..000000000000
--- a/metadata/md5-cache/app-portage/distpatch-0.1.2-r2
+++ /dev/null
@@ -1,15 +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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Distfile Patching Support for Gentoo Linux (tools)
-EAPI=7
-HOMEPAGE=https://github.com/rafaelmartins/distpatch
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-util/diffball-1.0.1 dev-python/snakeoil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/portage-2.1.8.3[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/rafaelmartins/distpatch/releases/download/v0.1.2/distpatch-0.1.2.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c00d543e68a8adc333d0660c79200a84
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 47e7f9354467..ce94b5a544c1 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/agrep-2.04-r2 b/metadata/md5-cache/app-text/agrep-2.04-r2
deleted file mode 100644
index e9c4f8ff9c5b..000000000000
--- a/metadata/md5-cache/app-text/agrep-2.04-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A tool for the fast searching of text allowing for errors in the search pattern
-EAPI=6
-HOMEPAGE=ftp://ftp.cs.arizona.edu/agrep/README
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris
-LICENSE=AGREP
-RDEPEND=!dev-libs/tre !dev-ruby/amatch !app-misc/glimpse
-SLOT=0
-SRC_URI=ftp://ftp.cs.arizona.edu/agrep/agrep-2.04.tar.Z
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=e563c99320577b823a280fe6059d5090
diff --git a/metadata/md5-cache/app-text/q-text-as-data-2.0.10 b/metadata/md5-cache/app-text/q-text-as-data-2.0.10
deleted file mode 100644
index 5df22d8a2bdd..000000000000
--- a/metadata/md5-cache/app-text/q-text-as-data-2.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=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] ) || ( ( >=dev-lang/python-3.9.16:3.9[sqlite] dev-python/six[python_targets_python3_9(-)] dev-python/flake8[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8[sqlite] dev-python/six[python_targets_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)] ) )
-DESCRIPTION=A CLI tool that allows direct execution of SQL-like queries on text
-EAPI=7
-HOMEPAGE=http://harelba.github.io/q/
-INHERIT=python-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-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] ) || ( ( >=dev-lang/python-3.9.16:3.9[sqlite] dev-python/six[python_targets_python3_9(-)] dev-python/flake8[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8[sqlite] dev-python/six[python_targets_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)] ) )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/harelba/q/archive/2.0.10.tar.gz -> q-2.0.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=e64646cf33edcfb62f1d38faf4538def
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index da4b17e40bfb..a346cf71cd99 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/pydiction-1.2.3-r2 b/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
deleted file mode 100644
index 39cdd872ed32..000000000000
--- a/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: tab-complete your Python code
-EAPI=7
-HOMEPAGE=https://rkulla.github.io/pydiction/
-INHERIT=vim-plugin python-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=vim
-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 ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=e0c0cac61d783747f4e46670a7c5a74d
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2 b/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
deleted file mode 100644
index a17fbcbff8ed..000000000000
--- a/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=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_8? ( dev-python/autopep8[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autopep8[python_targets_python3_9(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Vim plugin for easy and fast outlining
-EAPI=6
-HOMEPAGE=https://github.com/vimoutliner/vimoutliner
-INHERIT=python-single-r1 vim-plugin vcs-snapshot
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~ia64 ppc sparc x86
-LICENSE=GPL-3
-RDEPEND=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_8? ( dev-python/autopep8[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autopep8[python_targets_python3_9(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/4f12628247940d98eedd594961695dc504261058.tar.gz -> vimoutliner-0.4.0_p20180301.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	eqawarn	c9847c43b3253a276ae2eabddedab3d7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=069d8f366e21b60cfc3e4666f18a9bab
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index b0fc566768c0..d5807350f316 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.3.4 b/metadata/md5-cache/dev-cpp/muParser-2.3.4
new file mode 100644
index 000000000000..8322b581b6e8
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/muParser-2.3.4
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for parsing mathematical expressions
+EAPI=8
+HOMEPAGE=https://beltoforion.de/en/muparser/
+INHERIT=cmake
+IUSE=doc openmp test wchar
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/beltoforion/muparser/archive/refs/tags/v2.3.4.tar.gz -> muParser-2.3.4.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=61e89bc2e61d85398385620a40da633d
diff --git a/metadata/md5-cache/dev-cpp/pstreams-1.0.1 b/metadata/md5-cache/dev-cpp/pstreams-1.0.1
deleted file mode 100644
index 43d4d0b475ac..000000000000
--- a/metadata/md5-cache/dev-cpp/pstreams-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile install test
-DESCRIPTION=C++ wrapper for the POSIX.2 functions popen(3) and pclose(3)
-EAPI=7
-HOMEPAGE=http://pstreams.sourceforge.net/
-INHERIT=toolchain-funcs
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/pstreams/pstreams-1.0.1.tar.gz doc? ( mirror://sourceforge/pstreams/pstreams-docs-1.0.1.tar.gz )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=6e707debe8aad2579d453f3a6091abdc
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index ce3914ef3686..c0a3ff584db7 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/cpp-driver-2.11.0 b/metadata/md5-cache/dev-db/cpp-driver-2.11.0
deleted file mode 100644
index 69bab3c63fcb..000000000000
--- a/metadata/md5-cache/dev-db/cpp-driver-2.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libuv:= ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=DataStax C/C++ Driver for Cassandra
-EAPI=7
-HOMEPAGE=https://datastax.github.io/cpp-driver/
-INHERIT=cmake
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/libuv:= ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=https://github.com/datastax/cpp-driver/archive/2.11.0.tar.gz -> cpp-driver-2.11.0.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d8727f5eaf70c53bff18623135483678
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index 09f9994a2f88..c15bb6b4f2b4 100644
--- a/metadata/md5-cache/dev-erlang/Manifest.gz
+++ b/metadata/md5-cache/dev-erlang/Manifest.gz
diff --git a/metadata/md5-cache/dev-erlang/riakc-2.4.2 b/metadata/md5-cache/dev-erlang/riakc-2.4.2
deleted file mode 100644
index 20d2a075ad13..000000000000
--- a/metadata/md5-cache/dev-erlang/riakc-2.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/riak_pb-2.1.4.2 >=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar:0 >=sys-apps/gawk-4.1
-DESCRIPTION=Erlang clients for Riak
-EAPI=6
-HOMEPAGE=https://github.com/basho/riak-erlang-client
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/riak_pb-2.1.4.2 >=dev-lang/erlang-17.1 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/basho/riak-erlang-client/archive/2.4.2.tar.gz -> riakc-2.4.2.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=e15dcb3182dd38a75b5cfad42013f367
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 954a17eedb54..b2673ecb7e30 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/aws-sdk-cpp-1.8.105 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.105
deleted file mode 100644
index be3a1d42d9aa..000000000000
--- a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.105
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( dev-libs/openssl:0= ) >=dev-libs/aws-c-common-0.4.62:=[static-libs=] >=dev-libs/aws-c-event-stream-0.2.5:=[static-libs=] >=dev-libs/aws-checksums-0.1.10:=[static-libs=] sys-libs/zlib
-DESCRIPTION=AWS SDK for C++
-EAPI=7
-HOMEPAGE=https://aws.amazon.com/sdk-for-cpp/
-INHERIT=cmake python-single-r1
-IUSE=+http pulseaudio +rtti +ssl static-libs test unity-build access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events forecast frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail lookoutvision machinelearning macie managedblockchain marketplace mwaa networkmanager opsworks organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract timestream transcribe translate waf python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( dev-libs/openssl:0= ) >=dev-libs/aws-c-common-0.4.62:=[static-libs=] >=dev-libs/aws-c-event-stream-0.2.5:=[static-libs=] >=dev-libs/aws-checksums-0.1.10:=[static-libs=] sys-libs/zlib 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 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.8.105.tar.gz -> aws-sdk-cpp-1.8.105.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9ffe8a831a43298b4244c9f028359f5d
diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.160 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.160
deleted file mode 100644
index 0d4c385da143..000000000000
--- a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.160
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( dev-libs/openssl:0= ) >=dev-libs/aws-c-common-0.5.2:=[static-libs=] >=dev-libs/aws-c-event-stream-0.2.7:=[static-libs=] >=dev-libs/aws-checksums-0.1.10:=[static-libs=] sys-libs/zlib
-DESCRIPTION=AWS SDK for C++
-EAPI=7
-HOMEPAGE=https://aws.amazon.com/sdk-for-cpp/
-INHERIT=cmake python-single-r1
-IUSE=+http pulseaudio +rtti +ssl static-libs test unity-build access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events forecast frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail lookoutvision machinelearning macie managedblockchain marketplace mwaa networkmanager opsworks organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract timestream transcribe translate waf wellarchitected python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( dev-libs/openssl:0= ) >=dev-libs/aws-c-common-0.5.2:=[static-libs=] >=dev-libs/aws-c-event-stream-0.2.7:=[static-libs=] >=dev-libs/aws-checksums-0.1.10:=[static-libs=] sys-libs/zlib 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 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.8.160.tar.gz -> aws-sdk-cpp-1.8.160.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=145acad26bbb236eb5eb3e76fa630b9f
diff --git a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10 b/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
deleted file mode 100644
index 7ad5bdbda86d..000000000000
--- a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) python? ( 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 ) ) ruby? ( || ( dev-lang/ruby:2.7 ) virtual/rubygems ) virtual/pkgconfig app-alternatives/yacc 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 setup
-DEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= ) python? ( 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 ) ) ruby? ( || ( dev-lang/ruby:2.7 ) virtual/rubygems )
-DESCRIPTION=Prelude-SIEM Framework Library
-EAPI=7
-HOMEPAGE=https://www.prelude-siem.org
-INHERIT=autotools distutils-r1 lua-single ruby-single
-IUSE=lua perl python ruby python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) perl? ( dev-lang/perl:= ) python? ( 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 ) ) ruby? ( || ( dev-lang/ruby:2.7 ) virtual/rubygems )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libprelude-5.2.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a426232ad07e5a78ae3f0723d23c5e03
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0 b/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
deleted file mode 100644
index 603334310144..000000000000
--- a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex virtual/pkgconfig app-alternatives/yacc python? ( 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 ) ) 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=>=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( 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 ) ) sqlite? ( dev-db/sqlite:3 )
-DESCRIPTION=Framework to easy access to the Prelude database
-EAPI=7
-HOMEPAGE=https://www.prelude-siem.org
-INHERIT=autotools distutils-r1
-IUSE=mysql postgres python sqlite python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( 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 ) ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libpreludedb-5.2.0.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7fa9989828d67b5799ff5cd4aeae787a
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
index 89d7a8bd897a..70bd94a26da3 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-bash-0.19.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter-bash
 INHERIT=tree-sitter-grammar
 IUSE=test
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter-bash/archive/v0.19.0.tar.gz -> tree-sitter-bash-0.19.0.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	tree-sitter-grammar	906809fa94608a0cfa55f9bfd82c04a4
-_md5_=b71c11fad7c0cab874bae70021a85ec8
+_md5_=744eddeb67559e8679fc07afec502a87
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.72 b/metadata/md5-cache/dev-libs/zziplib-0.13.72
deleted file mode 100644
index 1873ac9cde1c..000000000000
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.72
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
-DESCRIPTION=Lightweight library for extracting data from files archived in a single zip file
-EAPI=7
-HOMEPAGE=https://github.com/gdraheim/zziplib https://zziplib.sourceforge.net
-INHERIT=cmake flag-o-matic python-any-r1
-IUSE=sdl static-libs
-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=|| ( LGPL-2.1 MPL-1.1 )
-RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
-SLOT=0/13
-SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.72.tar.gz -> zziplib-0.13.72.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3331a62a4d38bfe6b87a465e893b0914
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.72-r1 b/metadata/md5-cache/dev-libs/zziplib-0.13.72-r1
deleted file mode 100644
index 7c3618900045..000000000000
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.72-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
-DESCRIPTION=Lightweight library for extracting data from files archived in a single zip file
-EAPI=8
-HOMEPAGE=https://github.com/gdraheim/zziplib https://zziplib.sourceforge.net
-INHERIT=cmake flag-o-matic python-any-r1
-IUSE=sdl static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( LGPL-2.1 MPL-1.1 )
-RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
-SLOT=0/13
-SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.72.tar.gz -> zziplib-0.13.72.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7fae9f9394d30542f98f7d7b287ad953
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 8de42e6c7a0a..ca9ecaeffd73 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager-1.7.2-r2 b/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager-1.7.2-r2
deleted file mode 100644
index a142a1e1f060..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager-1.7.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Updates an existing package.xml file with a new filelist and changelog
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/PEAR_PackageFileManager
-INHERIT=php-pear-r2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-lang/php-5.3:* >=dev-php/PEAR-PEAR-1.10.1 dev-php/PEAR-PEAR_PackageFileManager2 dev-php/PEAR-PEAR_PackageFileManager_Plugins >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/PEAR_PackageFileManager-1.7.2.tgz
-_eclasses_=php-pear-r2	64a0c48972c51aa882f41e6b59374bcb
-_md5_=4783443f90a280114bafe9e01b295b07
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager2-1.0.4-r2 b/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager2-1.0.4-r2
deleted file mode 100644
index 34fb61150f45..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager2-1.0.4-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Updates an existing package.xml file with a new filelist and changelog
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/PEAR_PackageFileManager2
-INHERIT=php-pear-r2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-lang/php-5.3:* >=dev-php/PEAR-PEAR-1.10.1 dev-php/PEAR-PEAR_PackageFileManager_Plugins >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/PEAR_PackageFileManager2-1.0.4.tgz
-_eclasses_=php-pear-r2	64a0c48972c51aa882f41e6b59374bcb
-_md5_=3fa3b2acb3435f9be7be08da18982651
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1 b/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1
deleted file mode 100644
index a822be4ad8a5..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Various methods to check files to update an existing package.xml file
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/PEAR_PackageFileManager_Plugins
-INHERIT=php-pear-r2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/PEAR-XML_Serializer-0.19.0 >=dev-lang/php-5.3:*[xml,simplexml] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/PEAR_PackageFileManager_Plugins-1.0.4.tgz
-_eclasses_=php-pear-r2	64a0c48972c51aa882f41e6b59374bcb
-_md5_=71317eba4096a569fd3ce878bd6351a1
diff --git a/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2-r1 b/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2-r1
deleted file mode 100644
index d3e437cbf8c6..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=Simple OO wrapper interface for the Subversion command-line client
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/VersionControl_SVN
-INHERIT=php-pear-r2
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/VersionControl_SVN-0.5.2.tgz
-_eclasses_=php-pear-r2	64a0c48972c51aa882f41e6b59374bcb
-_md5_=21e64be16a43d80fce2383d335e333cc
diff --git a/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314 b/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314
deleted file mode 100644
index b64b83101fa0..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare test unpack
-DEPEND=test? ( dev-vcs/subversion <dev-php/phpunit-6 )
-DESCRIPTION=Simple OO wrapper interface for the Subversion command-line client
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/VersionControl_SVN
-INHERIT=php-pear-r2 vcs-snapshot
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pear/VersionControl_SVN/archive/6c9580df92f0cc77a6eb6fcc216c56913bf308e7.tar.gz -> PEAR-VersionControl_SVN-0.5.2_p20180314.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	php-pear-r2	64a0c48972c51aa882f41e6b59374bcb	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=8eac8158352c469789766acf0a23c1b6
diff --git a/metadata/md5-cache/dev-php/agavi-1.0.8 b/metadata/md5-cache/dev-php/agavi-1.0.8
deleted file mode 100644
index 7802e05d48c9..000000000000
--- a/metadata/md5-cache/dev-php/agavi-1.0.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP MVC application framework
-EAPI=6
-HOMEPAGE=http://www.agavi.org/
-IUSE=examples +executable iconv session soap xmlrpc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD LGPL-2.1+ icu unicode public-domain
-RDEPEND=dev-lang/php[iconv?,session?,soap?,xml,xmlrpc(-)?] executable? ( dev-php/phing )
-SLOT=0
-SRC_URI=http://www.agavi.org/download/1.0.8.tgz -> agavi-1.0.8.tgz
-_md5_=f6bea433e42f77d2d984761cfde605cb
diff --git a/metadata/md5-cache/dev-php/phing-2.16.1 b/metadata/md5-cache/dev-php/phing-2.16.1
deleted file mode 100644
index dccefc4528aa..000000000000
--- a/metadata/md5-cache/dev-php/phing-2.16.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP project build system based on Apache Ant
-EAPI=6
-HOMEPAGE=https://www.phing.info/
-IUSE=doc examples minimal zip
-KEYWORDS=~amd64 ~x86
-LICENSE=FDL-1.3 LGPL-2.1
-RDEPEND=dev-lang/php:*[cli,xml,xslt,zip?] dev-php/symfony-yaml !minimal? ( dev-php/PEAR-HTTP_Request2 dev-php/PEAR-PEAR_PackageFileManager dev-php/PEAR-VersionControl_SVN dev-php/PHP_CodeCoverage dev-php/phpDocumentor dev-php/phpmd dev-php/phpunit dev-php/simpletest dev-php/xdebug )
-SLOT=0
-SRC_URI=https://www.phing.info/get/phing-2.16.1.tgz
-_md5_=4b1969ef12d00a035e0c35280860d299
diff --git a/metadata/md5-cache/dev-php/phing-2.16.3 b/metadata/md5-cache/dev-php/phing-2.16.3
deleted file mode 100644
index cee94775ebf0..000000000000
--- a/metadata/md5-cache/dev-php/phing-2.16.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP project build system based on Apache Ant
-EAPI=7
-HOMEPAGE=https://www.phing.info/
-IUSE=doc examples minimal zip
-KEYWORDS=~amd64 ~x86
-LICENSE=FDL-1.3 LGPL-2.1
-RDEPEND=dev-lang/php:*[cli,xml,xslt,zip?] dev-php/symfony-yaml !minimal? ( dev-php/PEAR-HTTP_Request2 dev-php/PEAR-PEAR_PackageFileManager dev-php/PEAR-VersionControl_SVN dev-php/PHP_CodeCoverage dev-php/phpDocumentor dev-php/phpmd dev-php/phpunit dev-php/simpletest dev-php/xdebug )
-SLOT=0
-SRC_URI=https://www.phing.info/get/phing-2.16.3.tgz
-_md5_=cabb1345088c669a8d54f4f2f0d69b62
diff --git a/metadata/md5-cache/dev-php/phing-2.16.4 b/metadata/md5-cache/dev-php/phing-2.16.4
deleted file mode 100644
index 61e41b7c6843..000000000000
--- a/metadata/md5-cache/dev-php/phing-2.16.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP project build system based on Apache Ant
-EAPI=7
-HOMEPAGE=https://www.phing.info/
-IUSE=doc examples minimal zip
-KEYWORDS=~amd64 ~x86
-LICENSE=FDL-1.3 LGPL-2.1
-RDEPEND=dev-lang/php:*[cli,xml,xslt,zip?] dev-php/symfony-yaml !minimal? ( dev-php/PEAR-HTTP_Request2 dev-php/PEAR-PEAR_PackageFileManager dev-php/PEAR-VersionControl_SVN dev-php/PHP_CodeCoverage dev-php/phpDocumentor dev-php/phpmd dev-php/phpunit dev-php/simpletest dev-php/xdebug )
-SLOT=0
-SRC_URI=https://www.phing.info/get/phing-2.16.4.tgz
-_md5_=d1a329a8402fe179bc004ec1900effb5
diff --git a/metadata/md5-cache/dev-php/phpmd-2.6.0 b/metadata/md5-cache/dev-php/phpmd-2.6.0
deleted file mode 100644
index 959639b4c9c0..000000000000
--- a/metadata/md5-cache/dev-php/phpmd-2.6.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP mess detector
-EAPI=6
-HOMEPAGE=http://www.phpmd.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/php[xml] dev-php/phpdepend
-SLOT=0
-SRC_URI=https://github.com/phpmd/phpmd/archive/2.6.0.tar.gz -> phpmd-2.6.0.tar.gz
-_md5_=92e96440b0f407f0928eac1af09981dc
diff --git a/metadata/md5-cache/dev-php/phpmd-2.8.2 b/metadata/md5-cache/dev-php/phpmd-2.8.2
deleted file mode 100644
index ae7a60d843e6..000000000000
--- a/metadata/md5-cache/dev-php/phpmd-2.8.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP mess detector
-EAPI=7
-HOMEPAGE=http://www.phpmd.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/php[xml] dev-php/phpdepend
-SLOT=0
-SRC_URI=https://github.com/phpmd/phpmd/archive/2.8.2.tar.gz -> phpmd-2.8.2.tar.gz
-_md5_=f5bb905d0feb67812f62a997e7378d7b
diff --git a/metadata/md5-cache/dev-php/simpletest-1.1.7 b/metadata/md5-cache/dev-php/simpletest-1.1.7
deleted file mode 100644
index 1c97f7c27290..000000000000
--- a/metadata/md5-cache/dev-php/simpletest-1.1.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A PHP testing framework
-EAPI=6
-HOMEPAGE=http://www.simpletest.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/simpletest/simpletest/archive/v1.1.7.tar.gz -> simpletest-1.1.7.tar.gz
-_md5_=02489d2dcbba09f3135b9a4d8d0999b6
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 89eb075aa17f..0b8a936056ec 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/Rx-3.2.0 b/metadata/md5-cache/dev-python/Rx-3.2.0
deleted file mode 100644
index de0a7e79be08..000000000000
--- a/metadata/md5-cache/dev-python/Rx-3.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Reactive Extensions for Python
-EAPI=7
-HOMEPAGE=http://reactivex.io/
-INHERIT=distutils-r1 virtualx
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ReactiveX/RxPY/archive/v3.2.0.tar.gz -> RxPY-3.2.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=c928f24f8552781996db24552edcbd59
diff --git a/metadata/md5-cache/dev-python/bert-2.2.0-r1 b/metadata/md5-cache/dev-python/bert-2.2.0-r1
deleted file mode 100644
index 83daf81088bf..000000000000
--- a/metadata/md5-cache/dev-python/bert-2.2.0-r1
+++ /dev/null
@@ -1,15 +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 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BERT Serialization Library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/bert/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/basho-erlastic[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bert/bert-2.2.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d461c2aeebf7e9f7fb006374559cab65
diff --git a/metadata/md5-cache/dev-python/flask-assets-0.12 b/metadata/md5-cache/dev-python/flask-assets-0.12
deleted file mode 100644
index d603166b036c..000000000000
--- a/metadata/md5-cache/dev-python/flask-assets-0.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/flask-0.8 dev-python/webassets 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
-DESCRIPTION=Flask webassets integration
-EAPI=7
-HOMEPAGE=https://github.com/miracle2k/flask-assets
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.8 dev-python/webassets 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=https://github.com/miracle2k/flask-assets/archive/0.12.tar.gz -> flask-assets-0.12.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=80b32589b670ab2e8ea68c1f80cef8ae
diff --git a/metadata/md5-cache/dev-python/gevent-21.12.0-r1 b/metadata/md5-cache/dev-python/gevent-21.12.0-r1
deleted file mode 100644
index 015e4c230042..000000000000
--- a/metadata/md5-cache/dev-python/gevent-21.12.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-libs/libev-4.31:= dev-libs/libuv:= <dev-python/greenlet-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=net-dns/c-ares-1.12:= dev-python/zope-event[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dnspython[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(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.9:3.10[ssl(+),threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9[ssl(+),threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8[ssl(+),threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl(+),threads(+)] ) >=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-libs/libev-4.31:= dev-libs/libuv:= <dev-python/greenlet-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=net-dns/c-ares-1.12:=
-DESCRIPTION=Coroutine-based network library
-EAPI=7
-HOMEPAGE=https://www.gevent.org/ https://pypi.org/project/gevent/
-INHERIT=distutils-r1 flag-o-matic
-IUSE=doc examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= <dev-python/greenlet-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=net-dns/c-ares-1.12:= dev-python/zope-event[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl(+),threads(+)] ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/gevent/gevent-21.12.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=de39dc3fefa52cb66b3267c175f1a411
diff --git a/metadata/md5-cache/dev-python/gevent-22.10.1-r1 b/metadata/md5-cache/dev-python/gevent-22.10.1-r1
deleted file mode 100644
index f50d4e8fa0a9..000000000000
--- a/metadata/md5-cache/dev-python/gevent-22.10.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-libs/libev-4.31:= dev-libs/libuv:= <dev-python/greenlet-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=net-dns/c-ares-1.12:= dev-python/zope-event[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11[ssl(+),threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10[ssl(+),threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9[ssl(+),threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8[ssl(+),threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[ssl(+),threads(+)] ) >=dev-python/setuptools-65.5.1[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/libev-4.31:= dev-libs/libuv:= <dev-python/greenlet-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=net-dns/c-ares-1.12:=
-DESCRIPTION=Coroutine-based network library
-EAPI=8
-HOMEPAGE=https://www.gevent.org/ https://github.com/gevent/gevent/ https://pypi.org/project/gevent/
-INHERIT=distutils-r1
-IUSE=doc examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= <dev-python/greenlet-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=net-dns/c-ares-1.12:= dev-python/zope-event[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[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[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[ssl(+),threads(+)] ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_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/g/gevent/gevent-22.10.1.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=b32c21f63167f9620695cdc6673d1709
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-2.0.2 b/metadata/md5-cache/dev-python/geventhttpclient-2.0.2
deleted file mode 100644
index a3b077a64f55..000000000000
--- a/metadata/md5-cache/dev-python/geventhttpclient-2.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[events(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[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 configure install prepare test
-DESCRIPTION=A high performance, concurrent HTTP client library for Python using gevent
-EAPI=8
-HOMEPAGE=https://github.com/geventhttpclient/geventhttpclient/ https://pypi.org/project/geventhttpclient/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[events(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-2.0.2.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a7ba4faa62b8635e584b5485d90d5097
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-2.0.7 b/metadata/md5-cache/dev-python/geventhttpclient-2.0.7
deleted file mode 100644
index a8a4d856160c..000000000000
--- a/metadata/md5-cache/dev-python/geventhttpclient-2.0.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[events(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[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 configure install prepare test
-DESCRIPTION=A high performance, concurrent HTTP client library for Python using gevent
-EAPI=8
-HOMEPAGE=https://github.com/geventhttpclient/geventhttpclient/ https://pypi.org/project/geventhttpclient/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[events(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-2.0.7.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a8d0ded998425e60cf7cd1e6674e0a01
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-2.0.8 b/metadata/md5-cache/dev-python/geventhttpclient-2.0.8
deleted file mode 100644
index fd527b1c2f2d..000000000000
--- a/metadata/md5-cache/dev-python/geventhttpclient-2.0.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/gevent[events(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[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(-)?] ) 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
-DESCRIPTION=A high performance, concurrent HTTP client library for Python using gevent
-EAPI=8
-HOMEPAGE=https://github.com/geventhttpclient/geventhttpclient/ https://pypi.org/project/geventhttpclient/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/gevent[events(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[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/g/geventhttpclient/geventhttpclient-2.0.8.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=889eebd615f47307056fabc7ea09a68f
diff --git a/metadata/md5-cache/dev-python/libpy_simdjson-0.4.0 b/metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
deleted file mode 100644
index 56e4a6dbf5bc..000000000000
--- a/metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-cpp/range-v3:= dev-libs/simdjson:= dev-libs/libpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-cpp/range-v3:= dev-libs/simdjson:= dev-libs/libpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/range-v3:= dev-libs/simdjson:= dev-libs/libpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Python bindings for simdjson using libpy
-EAPI=7
-HOMEPAGE=https://github.com/gerrymanoim/libpy_simdjson
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-cpp/range-v3:= dev-libs/simdjson:= dev-libs/libpy[python_targets_python3_8(-)?,python_targets_python3_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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gerrymanoim/libpy_simdjson/archive/0.4.0.tar.gz -> libpy_simdjson-0.4.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7496bead4e82499922f333543c729b0c
diff --git a/metadata/md5-cache/dev-python/pytest-html-3.1.1 b/metadata/md5-cache/dev-python/pytest-html-3.1.1
deleted file mode 100644
index 701b1a840411..000000000000
--- a/metadata/md5-cache/dev-python/pytest-html-3.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=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 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DESCRIPTION=Plugin for generating HTML reports for py.test results
-EAPI=7
-HOMEPAGE=https://github.com/pytest-dev/pytest-html/
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MPL-2.0
-RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-html/pytest-html-3.1.1.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=2d045cf3d54c45a374f523ff1a997873
diff --git a/metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3 b/metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3
deleted file mode 100644
index b67fe8c4478a..000000000000
--- a/metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( app-admin/salt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=PyTest Salt Plugin
-EAPI=7
-HOMEPAGE=https://github.com/saltstack/pytest-salt
-INHERIT=distutils-r1
-IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( app-admin/salt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tornado[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/saltstack/pytest-salt/archive/v2020.1.27.tar.gz -> pytest-salt-2020.1.27.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=5d5b7246b61d801075e97ba7ed7079c5
diff --git a/metadata/md5-cache/dev-python/requests_pkcs12-1.14 b/metadata/md5-cache/dev-python/requests_pkcs12-1.14
deleted file mode 100644
index 60ce1ee801de..000000000000
--- a/metadata/md5-cache/dev-python/requests_pkcs12-1.14
+++ /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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Adds PKCS#12 support to the Python requests library in a clean way
-EAPI=7
-HOMEPAGE=https://github.com/m-click/requests_pkcs12
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=ISC
-RDEPEND=dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/requests_pkcs12/requests_pkcs12-1.14.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=dba2b37c2ac49ee6d4fbc9799ccaa7f0
diff --git a/metadata/md5-cache/dev-python/rpyc-5.2.3-r3 b/metadata/md5-cache/dev-python/rpyc-5.2.3-r3
index 100f1ef51379..84c0c53ea9f4 100644
--- a/metadata/md5-cache/dev-python/rpyc-5.2.3-r3
+++ b/metadata/md5-cache/dev-python/rpyc-5.2.3-r3
@@ -1,17 +1,17 @@
 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/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gevent? ( dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gdb? ( sys-devel/gdb ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gdb? ( sys-devel/gdb ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Remote Python Call (RPyC), a transparent and symmetric RPC library
 EAPI=8
 HOMEPAGE=https://rpyc.readthedocs.io/en/latest/ https://pypi.org/project/rpyc/ https://github.com/tomerfiliba-org/rpyc
 INHERIT=distutils-r1
-IUSE=test numpy gdb gevent python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test numpy gdb python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gevent? ( dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gdb? ( sys-devel/gdb ) dev-python/plumbum[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 )
+RDEPEND=numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gdb? ( sys-devel/gdb ) dev-python/plumbum[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 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rpyc/rpyc-5.2.3.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=68d55aed27461e72b8dcead93e9fe622
+_md5_=71a796443fa0edc53d7adea32f2ea4e1
diff --git a/metadata/md5-cache/dev-python/slackclient-2.5.0 b/metadata/md5-cache/dev-python/slackclient-2.5.0
deleted file mode 100644
index a0cb4011e2e6..000000000000
--- a/metadata/md5-cache/dev-python/slackclient-2.5.0
+++ /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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Client for Slack supporting the Slack Web and Real Time Messaging API
-EAPI=7
-HOMEPAGE=https://github.com/slackapi/python-slackclient
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/s/slackclient/slackclient-2.5.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f1b8f96bbcbd1267abc4cab7d157eb15
diff --git a/metadata/md5-cache/dev-python/tvdb_api-3.0.2 b/metadata/md5-cache/dev-python/tvdb_api-3.0.2
deleted file mode 100644
index 8444ca447804..000000000000
--- a/metadata/md5-cache/dev-python/tvdb_api-3.0.2
+++ /dev/null
@@ -1,15 +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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python interface to thetvdb.com API
-EAPI=7
-HOMEPAGE=https://github.com/dbr/tvdb_api
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-cache[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tvdb_api/tvdb_api-3.0.2.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3811e20c43ee9a9b369fc057bc39f923
diff --git a/metadata/md5-cache/dev-python/webassets-2.0 b/metadata/md5-cache/dev-python/webassets-2.0
deleted file mode 100644
index 405ab3e8c0f1..000000000000
--- a/metadata/md5-cache/dev-python/webassets-2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !!dev-ruby/sass ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Asset management for Python web development
-EAPI=7
-HOMEPAGE=https://github.com/miracle2k/webassets
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=BSD-2
-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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/miracle2k/webassets/archive/2.0.tar.gz -> webassets-2.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c78f72a8216d27cf913850e1d81bee24
diff --git a/metadata/md5-cache/dev-python/ws4py-0.5.1-r1 b/metadata/md5-cache/dev-python/ws4py-0.5.1-r1
deleted file mode 100644
index 0d90305c2d28..000000000000
--- a/metadata/md5-cache/dev-python/ws4py-0.5.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)?] ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cherrypy-3.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=WebSocket client and server library for Python 2 and 3 as well as PyPy
-EAPI=7
-HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
-INHERIT=distutils-r1
-IUSE=+client +server test +threads python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm x86
-LICENSE=BSD
-RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cython-0.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] client? ( >=dev-python/tornado-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) server? ( >=dev-python/cherrypy-3.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)?] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/0.5.1.tar.gz -> ws4py-0.5.1.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9aed98099a80b2070d66b5a7daf85328
diff --git a/metadata/md5-cache/dev-python/ws4py-9999 b/metadata/md5-cache/dev-python/ws4py-9999
deleted file mode 100644
index 0539e54b8bab..000000000000
--- a/metadata/md5-cache/dev-python/ws4py-9999
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)?] ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-python/cherrypy-3.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=WebSocket client and server library for Python 2 and 3 as well as PyPy
-EAPI=7
-HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
-INHERIT=distutils-r1 git-r3
-IUSE=+client +server test +threads python_targets_python3_8 python_targets_python3_9
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cython-0.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] client? ( >=dev-python/tornado-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) server? ( >=dev-python/cherrypy-3.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)?] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7efb760093f7ab5a49d8baf51e94bcb6
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c6f3a430e814..b770dba88a3b 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/comparator-2.12 b/metadata/md5-cache/dev-util/comparator-2.12
deleted file mode 100644
index 1790cb2296cc..000000000000
--- a/metadata/md5-cache/dev-util/comparator-2.12
+++ /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 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==app-text/docbook-xml-dtd-4.1.2* app-text/xmlto
-DESCRIPTION=ESR's utility for making fast comparisons among large source trees
-EAPI=7
-HOMEPAGE=http://www.catb.org/~esr/comparator/ https://gitlab.com/esr/comparator
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
-LICENSE=BSD-2
-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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/comparator/comparator-2.12.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=481d8e5017e265ba7a324ec6f828bd5e
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1 b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1
deleted file mode 100644
index 494e6de250ee..000000000000
--- a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1
+++ /dev/null
@@ -1,17 +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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rosdistro-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rospkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Generates rosinstall metadata about repositories with ROS packages/stacks
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rosinstall_generator
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rosdistro-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rospkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-infrastructure/rosinstall_generator/archive/0.1.22.tar.gz -> rosinstall_generator-0.1.22.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=0882f2d163154de0c99676fabf1c4e23
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-9999 b/metadata/md5-cache/dev-util/rosinstall_generator-9999
deleted file mode 100644
index 16244e14eba2..000000000000
--- a/metadata/md5-cache/dev-util/rosinstall_generator-9999
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rosdistro-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rospkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Generates rosinstall metadata about repositories with ROS packages/stacks
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rosinstall_generator
-INHERIT=git-r3 distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rosdistro-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rospkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=0882f2d163154de0c99676fabf1c4e23
diff --git a/metadata/md5-cache/dev-util/stubgen-2.08 b/metadata/md5-cache/dev-util/stubgen-2.08
deleted file mode 100644
index e9524d2f53cb..000000000000
--- a/metadata/md5-cache/dev-util/stubgen-2.08
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A member function stub generator for C++
-EAPI=7
-HOMEPAGE=http://www.radwin.org/michael/projects/stubgen/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.radwin.org/michael/projects/stubgen/dist/stubgen-2.08.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a6ded097abd8f29b3c877da05d02965a
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index e9ea0b7050ba..1fdc3806e244 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/pyfa-2.43.0 b/metadata/md5-cache/games-util/pyfa-2.43.0
deleted file mode 100644
index eaebd17434b2..000000000000
--- a/metadata/md5-cache/games-util/pyfa-2.43.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/zip
-DEFINED_PHASES=install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.23[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.23[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] )
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=8
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop edos2unix python-single-r1 xdg
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ all-rights-reserved
-RDEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.23[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.23[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_8? ( >=dev-python/beautifulsoup4-4.6.0[python_targets_python3_8(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_8(-)] >=dev-python/numpy-1.19.2[python_targets_python3_8(-)] >=dev-python/packaging-16.8[python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] >=dev-python/python-jose-3.0.1[python_targets_python3_8(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)] >=dev-python/requests-cache-0.8.1[python_targets_python3_8(-)] >=dev-python/roman-2.0.0[python_targets_python3_8(-)] >=dev-python/matplotlib-3.2.2[wxwidgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/beautifulsoup4-4.6.0[python_targets_python3_9(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_9(-)] >=dev-python/numpy-1.19.2[python_targets_python3_9(-)] >=dev-python/packaging-16.8[python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] >=dev-python/python-jose-3.0.1[python_targets_python3_9(-)] >=dev-python/requests-2.0.0[python_targets_python3_9(-)] >=dev-python/requests-cache-0.8.1[python_targets_python3_9(-)] >=dev-python/roman-2.0.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.2.2[wxwidgets,python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.43.0.tar.gz -> pyfa-2.43.0.tar.gz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=29b64475daf5a1e3a25656419e79f02e
diff --git a/metadata/md5-cache/games-util/pyfa-9999 b/metadata/md5-cache/games-util/pyfa-9999
deleted file mode 100644
index 39d414ae864b..000000000000
--- a/metadata/md5-cache/games-util/pyfa-9999
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/zip >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=7
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-INHERIT=desktop edos2unix python-single-r1 xdg git-r3
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-LICENSE=GPL-3+ all-rights-reserved
-PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_8? ( >=dev-python/beautifulsoup4-4.6.0[python_targets_python3_8(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_8(-)] >=dev-python/numpy-1.19.2[python_targets_python3_8(-)] >=dev-python/packaging-16.8[python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)] >=dev-python/roman-2.0.0[python_targets_python3_8(-)] >=dev-python/matplotlib-3.1.2[wxwidgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/beautifulsoup4-4.6.0[python_targets_python3_9(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_9(-)] >=dev-python/numpy-1.19.2[python_targets_python3_9(-)] >=dev-python/packaging-16.8[python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] >=dev-python/requests-2.0.0[python_targets_python3_9(-)] >=dev-python/roman-2.0.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.1.2[wxwidgets,python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=mirror bindist
-SLOT=0
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0d35ffa0e6e142436044308aee1d66b1
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 6a5f463f331a..558144ecd877 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-43.2 b/metadata/md5-cache/gnome-base/gnome-shell-43.2-r1
index c2aaf6d3bf03..855dbc7f37f5 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-43.2
+++ b/metadata/md5-cache/gnome-base/gnome-shell-43.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( x11-wm/mutter[test] ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.90.0:4=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.73.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-43.0:0/11[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-core-2.46:2[introspection] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] 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_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/libglvnd[X]
+DEPEND=>=gnome-extra/evolution-data-server-3.46.0:= >=app-crypt/gcr-3.90.0:4=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.73.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-43.0:0/11[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-core-2.46:2[introspection] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] 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_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/libglvnd[X]
 DESCRIPTION=Provides core UI functions for the GNOME desktop
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell
@@ -10,10 +10,10 @@ IUSE=elogind gtk-doc +ibus +networkmanager systemd test python_single_target_pyt
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
-RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.90.0:4=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.73.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-43.0:0/11[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-core-2.46:2[introspection] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] 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_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/libglvnd[X] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] x11-libs/pango[introspection] net-libs/libsoup:3.0[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) media-fonts/cantarell sys-apps/xdg-desktop-portal-gnome
+RDEPEND=>=gnome-extra/evolution-data-server-3.46.0:= >=app-crypt/gcr-3.90.0:4=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.73.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-43.0:0/11[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-core-2.46:2[introspection] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] 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_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/libglvnd[X] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] x11-libs/pango[introspection] net-libs/libsoup:3.0[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) media-fonts/cantarell sys-apps/xdg-desktop-portal-gnome
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ?? ( elogind systemd )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/43/gnome-shell-43.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=24180eaa7895bfb0931a4299d461dbb9
+_md5_=b0a80153d793574d68866ca29edded58
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index ced0539b891d..6ef34d0f3b1a 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-22.12.0 b/metadata/md5-cache/kde-apps/libkdcraw-22.12.0
index fc2a5a4ce3b6..ae6a7a20019d 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-22.12.0
+++ b/metadata/md5-cache/kde-apps/libkdcraw-22.12.0
@@ -13,4 +13,4 @@ RDEPEND=>=dev-qt/qtgui-5.15.5:5 >=media-libs/libraw-0.16:= || ( kde-frameworks/b
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.12.0/src/libkdcraw-22.12.0.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	ecm	34ee807e2538bb1eb631b099fc007b63	flag-o-matic	69394e25812406faa1f90edaf4969395	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ba7f35ad05ec9d33849b5c59d916189d
+_md5_=49fdc1770f952b8a94450619e12bff7a
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 7aea8e68063f..87f1c6699586 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/pyzor-1.0.0_p20200523 b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
index cfc61b0cb57e..8e8b02ec525a 100644
--- a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
+++ b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
@@ -5,13 +5,13 @@ DESCRIPTION=A distributed, collaborative spam detection and filtering network
 EAPI=7
 HOMEPAGE=https://github.com/SpamExperts/pyzor
 INHERIT=distutils-r1
-IUSE=doc gdbm gevent mysql pyzord redis test doc python_targets_python3_8 python_targets_python3_9
+IUSE=doc gdbm mysql pyzord redis test doc python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=pyzord? ( gdbm? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[gdbm] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[gdbm] ) ) gevent? ( dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mysql? ( dev-python/mysqlclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_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 )
+RDEPEND=pyzord? ( gdbm? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[gdbm] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[gdbm] ) ) mysql? ( dev-python/mysqlclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_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 )
 REQUIRED_USE=pyzord? ( || ( gdbm redis ) ) test? ( gdbm redis ) || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/f46159bd6519cebcebf59e9334a7920371111d75.tar.gz -> pyzor-1.0.0_p20200523.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=4a7cd3229443d23cd3d7bd9508487f36
+_md5_=e8b448856c6b017aa34744790de81f16
diff --git a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223 b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223
index d285b6ecc07f..9a8286f51058 100644
--- a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223
+++ b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223
@@ -5,13 +5,13 @@ DESCRIPTION=A distributed, collaborative spam detection and filtering network
 EAPI=8
 HOMEPAGE=https://github.com/SpamExperts/pyzor
 INHERIT=distutils-r1
-IUSE=doc gdbm gevent mysql pyzord redis test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=doc gdbm mysql pyzord redis test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=pyzord? ( gdbm? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[gdbm] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[gdbm] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[gdbm] ) ) gevent? ( dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) mysql? ( dev-python/mysqlclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) redis? ( dev-python/redis-py[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 )
+RDEPEND=pyzord? ( gdbm? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[gdbm] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[gdbm] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[gdbm] ) ) mysql? ( dev-python/mysqlclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) redis? ( dev-python/redis-py[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 )
 REQUIRED_USE=pyzord? ( || ( gdbm redis ) ) test? ( gdbm redis ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/2dbe627c1ec245db206cdc73bf1f9d785f1512d8.tar.gz -> pyzor-1.0.0_p20211223.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=55495609c078f8b40fed8e192cd9f884
+_md5_=e04bc1732b14f2d8f30df14df7839656
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 243295469539..7ccf0f827655 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/notqmail-1.08-r5 b/metadata/md5-cache/mail-mta/notqmail-1.08-r5
index 3c508f5eef86..a98370bad94c 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=authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla
+IUSE=gencertdaily highvolume pop3 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 authcram? ( >=net-mail/cmd5checkpw-0.30 ) 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]
-REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )
+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]
+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	64280dc99a248daf87f54f3b72d5bf1d	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=2fe6aaa7b2c2491a8b37e61a48092291
+_md5_=55422db32a2fe1a894f8c9b0b9e34fba
diff --git a/metadata/md5-cache/mail-mta/notqmail-1.08-r6 b/metadata/md5-cache/mail-mta/notqmail-1.08-r6
index 68bede0ff943..70b13cacd48a 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=authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla verify-sig
+IUSE=gencertdaily highvolume pop3 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 authcram? ( >=net-mail/cmd5checkpw-0.30 ) 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]
-REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )
+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]
+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	64280dc99a248daf87f54f3b72d5bf1d	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=151a0ebd3bc5cc8c06e32574b3493b78
+_md5_=3fbd531aaaaf28b4d9b4b618ffca3a85
diff --git a/metadata/md5-cache/mail-mta/notqmail-9999 b/metadata/md5-cache/mail-mta/notqmail-9999
index 813293ad2465..d08b43b34a27 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=authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla
+IUSE=gencertdaily highvolume pop3 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 authcram? ( >=net-mail/cmd5checkpw-0.30 ) 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]
-REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )
+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]
+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	64280dc99a248daf87f54f3b72d5bf1d	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=83e409859bfda35a09759d514d307fd6
+_md5_=8471bdf7ad2a0ed77b35a8e902ad8428
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index e21fe9d881ad..1860fad683b5 100644
--- a/metadata/md5-cache/mate-extra/Manifest.gz
+++ b/metadata/md5-cache/mate-extra/Manifest.gz
diff --git a/metadata/md5-cache/mate-extra/caja-hide-0.9.0 b/metadata/md5-cache/mate-extra/caja-hide-0.9.0
deleted file mode 100644
index 881d2ec67f07..000000000000
--- a/metadata/md5-cache/mate-extra/caja-hide-0.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=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_11? ( >=dev-lang/python-3.11.1:3.11 )
-DESCRIPTION=Hide files without renaming them in MATE's Caja
-EAPI=7
-HOMEPAGE=https://github.com/Fred-Barclay/Caja-hide
-INHERIT=python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=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_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/future[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/future[python_targets_python3_11(-)] ) dev-python/python-caja[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] x11-misc/xautomation
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/Fred-Barclay/Caja-hide/archive/v0.9.0.tar.gz -> caja-hide-0.9.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3fc304e62635f16121c1483f116076a7
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 862db6f7a1d3..199cddc3f994 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/krita-5.1.4-r1 b/metadata/md5-cache/media-gfx/krita-5.1.4-r1
index 9b8390bb7e68..e5f7f7adf46a 100644
--- a/metadata/md5-cache/media-gfx/krita-5.1.4-r1
+++ b/metadata/md5-cache/media-gfx/krita-5.1.4-r1
@@ -15,4 +15,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/5.1.4/krita-5.1.4.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	ecm	34ee807e2538bb1eb631b099fc007b63	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7c8e24c9cc2dc160ca35840acdd8a86e
+_md5_=67ae9abc48e94fe46b2623dae26c8c8f
diff --git a/metadata/md5-cache/media-gfx/netpaint-1.1.2 b/metadata/md5-cache/media-gfx/netpaint-1.1.2
deleted file mode 100644
index 02fc1f5fbd46..000000000000
--- a/metadata/md5-cache/media-gfx/netpaint-1.1.2
+++ /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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=curses-based drawing tool
-EAPI=7
-HOMEPAGE=https://github.com/SyntheticDreams/NetPaint
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/SyntheticDreams/netpaint/archive/v1.1.2.tar.gz -> netpaint-1.1.2.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7bae2ec74cdf99393ab8df834fb0bf3b
diff --git a/metadata/md5-cache/media-gfx/xzgv-0.9.1 b/metadata/md5-cache/media-gfx/xzgv-0.9.1
deleted file mode 100644
index f6138045efaf..000000000000
--- a/metadata/md5-cache/media-gfx/xzgv-0.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/gtk+:2
-DESCRIPTION=Fast and simple GTK+ image viewer
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/xzgv
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/xzgv/xzgv-0.9.1.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ba0086f12630492bd0402c296212c716
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 767d21fe3894..47e91b03bf1b 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/mythplugins-31.0_p20210731-r2 b/metadata/md5-cache/media-plugins/mythplugins-31.0_p20210731-r2
deleted file mode 100644
index 708f34aeca7d..000000000000
--- a/metadata/md5-cache/media-plugins/mythplugins-31.0_p20210731-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=dev-libs/glib:2 dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:= virtual/libudev:= x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) hls? ( media-libs/faac media-libs/libvpx:= media-libs/x264:= media-sound/lame ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) libass? ( media-libs/libass:= ) =media-tv/mythtv-31*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid] mytharchive? ( 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 ) app-cdr/dvd+rw-tools dev-python/pillow dev-python/mysqlclient =media-tv/mythtv-31*[python] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode app-cdr/cdrtools ) mythgame? ( sys-libs/zlib[minizip] dev-perl/XML-Twig ) mythnetvision? ( 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 ) dev-python/lxml dev-python/pycurl dev-python/urllib3 =media-tv/mythtv-31*[python] ) mythweather? ( dev-perl/Date-Manip dev-perl/XML-Simple dev-perl/XML-XPath dev-perl/DateTime dev-perl/Image-Size dev-perl/DateTime-Format-ISO8601 dev-perl/SOAP-Lite dev-perl/JSON =media-tv/mythtv-31*[perl] ) mythzmserver? ( dev-db/mysql-connector-c:= ) theora? ( media-libs/libtheora ) xml? ( dev-libs/libxml2:= ) xvid? ( media-libs/xvid )
-DESCRIPTION=Official MythTV plugins
-EAPI=7
-HOMEPAGE=https://www.mythtv.org https://github.com/MythTV/mythtv
-INHERIT=python-single-r1 readme.gentoo-r1
-IUSE=mytharchive mythgame mythnetvision mythweather mythzmserver mythzoneminder alsa cdda cdr exif fftw +hls ieee1394 libass +opengl raw +theora +vorbis +xml xvid python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:= virtual/libudev:= x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) hls? ( media-libs/faac media-libs/libvpx:= media-libs/x264:= media-sound/lame ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) libass? ( media-libs/libass:= ) =media-tv/mythtv-31*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid] mytharchive? ( 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 ) app-cdr/dvd+rw-tools dev-python/pillow dev-python/mysqlclient =media-tv/mythtv-31*[python] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode app-cdr/cdrtools ) mythgame? ( sys-libs/zlib[minizip] dev-perl/XML-Twig ) mythnetvision? ( 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 ) dev-python/lxml dev-python/pycurl dev-python/urllib3 =media-tv/mythtv-31*[python] ) mythweather? ( dev-perl/Date-Manip dev-perl/XML-Simple dev-perl/XML-XPath dev-perl/DateTime dev-perl/Image-Size dev-perl/DateTime-Format-ISO8601 dev-perl/SOAP-Lite dev-perl/JSON =media-tv/mythtv-31*[perl] ) mythzmserver? ( dev-db/mysql-connector-c:= ) theora? ( media-libs/libtheora ) xml? ( dev-libs/libxml2:= ) xvid? ( media-libs/xvid )
-REQUIRED_USE=!mythnetvision mytharchive? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) mythnetvision? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=https://github.com/MythTV/mythtv/archive/5824c588db24b4e71a7d94e829e6419f71089297.tar.gz -> mythplugins-31.0_p20210731.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=64bd03dfab3f1a248ef1287af641c6f1
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 9ed4cac129d0..6b839a718c00 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/marrie-0.4 b/metadata/md5-cache/media-sound/marrie-0.4
deleted file mode 100644
index 60af9d59a510..000000000000
--- a/metadata/md5-cache/media-sound/marrie-0.4
+++ /dev/null
@@ -1,15 +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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A simple podcast client that runs on the Command Line Interface
-EAPI=7
-HOMEPAGE=https://github.com/rafaelmartins/marrie
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python3_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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/m/marrie/marrie-0.4.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a65a5d88bb2bd377316a18c361b04307
diff --git a/metadata/md5-cache/media-sound/marrie-9999 b/metadata/md5-cache/media-sound/marrie-9999
deleted file mode 100644
index d77c5565fdd1..000000000000
--- a/metadata/md5-cache/media-sound/marrie-9999
+++ /dev/null
@@ -1,14 +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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DESCRIPTION=A simple podcast client that runs on the Command Line Interface
-EAPI=7
-HOMEPAGE=https://github.com/rafaelmartins/marrie
-INHERIT=distutils-r1 git-r3
-IUSE=python_targets_python3_8 python_targets_python3_9
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python3_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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a65a5d88bb2bd377316a18c361b04307
diff --git a/metadata/md5-cache/media-sound/retrovol-0.13 b/metadata/md5-cache/media-sound/retrovol-0.13
deleted file mode 100644
index 5806027402ab..000000000000
--- a/metadata/md5-cache/media-sound/retrovol-0.13
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure postinst
-DEPEND=x11-libs/gtk+:2
-DESCRIPTION=Systemtray volume mixer applet from PuppyLinux
-EAPI=7
-HOMEPAGE=http://puppylinux.org/wikka/Retrovol
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 LGPL-3 public-domain
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://www.browserloadofcoolness.com/software/puppy/PETget/retrovol-0.13.tar.gz
-_md5_=4f3afb943d9728134d190d8f3da17946
diff --git a/metadata/md5-cache/media-sound/umix-1.0.2-r1 b/metadata/md5-cache/media-sound/umix-1.0.2-r1
deleted file mode 100644
index 74b12a181525..000000000000
--- a/metadata/md5-cache/media-sound/umix-1.0.2-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=configure prepare
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= )
-DESCRIPTION=Program for adjusting soundcard volumes
-EAPI=7
-HOMEPAGE=http://umix.sourceforge.net/
-INHERIT=autotools
-IUSE=ncurses oss
-KEYWORDS=~alpha amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= )
-SLOT=0
-SRC_URI=mirror://sourceforge/umix/umix-1.0.2.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=535fbc0a8ee6d4eabbb6e71a3926a076
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index e74ab999a742..52fb8d8ddae8 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/tvnamer-3.0.2 b/metadata/md5-cache/media-tv/tvnamer-3.0.2
deleted file mode 100644
index 438636d9b0a6..000000000000
--- a/metadata/md5-cache/media-tv/tvnamer-3.0.2
+++ /dev/null
@@ -1,15 +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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Automatic TV episode file renamer, data from thetvdb.com
-EAPI=7
-HOMEPAGE=https://github.com/dbr/tvnamer
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND==dev-python/tvdb_api-3*[python_targets_python3_8(-)?,python_targets_python3_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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tvnamer/tvnamer-3.0.2.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c8d6983ca3bda366e3231b1ac3b1c4c7
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 372bf355ba93..493373a8e472 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/angst-0.4b-r3 b/metadata/md5-cache/net-analyzer/angst-0.4b-r3
deleted file mode 100644
index 2660268ff4b0..000000000000
--- a/metadata/md5-cache/net-analyzer/angst-0.4b-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=net-libs/libpcap net-libs/libnet:1.0
-DESCRIPTION=an active sniffer that provides methods for aggressive sniffing on switched LANs
-EAPI=7
-HOMEPAGE=http://angst.sourceforge.net/
-INHERIT=flag-o-matic toolchain-funcs
-IUSE=debug
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=BSD
-RDEPEND=net-libs/libpcap net-libs/libnet:1.0
-SLOT=0
-SRC_URI=http://angst.sourceforge.net/angst-0.4b.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=17991e1783fb265237cb2479230a6774
diff --git a/metadata/md5-cache/net-analyzer/carl-0.9-r5 b/metadata/md5-cache/net-analyzer/carl-0.9-r5
deleted file mode 100644
index 0ce7bb776de5..000000000000
--- a/metadata/md5-cache/net-analyzer/carl-0.9-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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 )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An rsync logfile analyzer
-EAPI=7
-HOMEPAGE=https://www.schwarzvogel.de/software/misc/
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 x86
-LICENSE=GPL-2
-RDEPEND=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 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://www.schwarzvogel.de/pkgs/carl-0.9.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a6daecf35865c74a976e1e1659c56f25
diff --git a/metadata/md5-cache/net-analyzer/egressor-1.0-r2 b/metadata/md5-cache/net-analyzer/egressor-1.0-r2
deleted file mode 100644
index c95ee2cd1e4c..000000000000
--- a/metadata/md5-cache/net-analyzer/egressor-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=<net-libs/libnet-1.1 >=net-libs/libnet-1.0.2a-r3
-DESCRIPTION=tool for checking router configuration
-EAPI=7
-HOMEPAGE=http://packetfactory.openwall.net/projects/egressor/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 ppc x86
-LICENSE=egressor
-RDEPEND=net-libs/libpcap dev-perl/Net-RawIP dev-lang/perl
-SLOT=0
-SRC_URI=http://packetfactory.openwall.net/projects/egressor/egressor_release1.0.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a1f64a241facb7acdc25dedd38af84c3
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.35.1 b/metadata/md5-cache/net-analyzer/netdata-1.35.1
index d8a438702247..1af36c6fd1d6 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.35.1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.35.1
@@ -1,17 +1,17 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.35.1/netdata-v1.35.1.tar.gz -> netdata-1.35.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=df5b63429ea01bb2e07bece792373b00
+_md5_=7f2b81adf686d886a7c59ae23db0f904
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.36.0 b/metadata/md5-cache/net-analyzer/netdata-1.36.0
index 6d727c595688..e459d2bd36b3 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.36.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.36.0
@@ -1,17 +1,17 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.36.0/netdata-v1.36.0.tar.gz -> netdata-1.36.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=df5b63429ea01bb2e07bece792373b00
+_md5_=7f2b81adf686d886a7c59ae23db0f904
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.36.1-r1 b/metadata/md5-cache/net-analyzer/netdata-1.36.1-r1
index 8fc3bc2d8cbe..c505c8594f84 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.36.1-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.36.1-r1
@@ -1,17 +1,17 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.36.1/netdata-v1.36.1.tar.gz -> netdata-1.36.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=204163f03abdde49c440f7d4faecdfa3
+_md5_=c507d1d95da63a5e3cddd5092aa8dec0
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.37.0 b/metadata/md5-cache/net-analyzer/netdata-1.37.0
index 50bf9f348f98..f37f90c48e2b 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.37.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.37.0
@@ -1,17 +1,17 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.37.0/netdata-v1.37.0.tar.gz -> netdata-1.37.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=204163f03abdde49c440f7d4faecdfa3
+_md5_=c507d1d95da63a5e3cddd5092aa8dec0
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.37.1 b/metadata/md5-cache/net-analyzer/netdata-1.37.1
index 2cad835d36e9..16ca9b8d3faa 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.37.1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.37.1
@@ -1,17 +1,17 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.37.1/netdata-v1.37.1.tar.gz -> netdata-1.37.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=204163f03abdde49c440f7d4faecdfa3
+_md5_=c507d1d95da63a5e3cddd5092aa8dec0
diff --git a/metadata/md5-cache/net-analyzer/netdata-9999 b/metadata/md5-cache/net-analyzer/netdata-9999
index 82844606c2de..fcbe3e282b61 100644
--- a/metadata/md5-cache/net-analyzer/netdata-9999
+++ b/metadata/md5-cache/net-analyzer/netdata-9999
@@ -1,16 +1,16 @@
 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 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs git-r3
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-3+ MIT BSD
 PROPERTIES=live
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) 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/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9b9421d13e44cf0a2a3db74dfab20a0a
+_md5_=31ff665a8fbf4e9c1af3be2e68cf2774
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0 b/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
deleted file mode 100644
index f126bfc3098e..000000000000
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
+++ /dev/null
@@ -1,15 +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(-)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Real time correlator of events received by Prelude Manager
-EAPI=7
-HOMEPAGE=https://www.prelude-siem.org
-INHERIT=distutils-r1 systemd tmpfiles
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-libs/libprelude-6[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netaddr[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 ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prelude-correlator-5.2.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7403232c0b363011cc972dcae55ee007
diff --git a/metadata/md5-cache/net-analyzer/prelude-lml-5.2.0 b/metadata/md5-cache/net-analyzer/prelude-lml-5.2.0
deleted file mode 100644
index dcfcab09e2d9..000000000000
--- a/metadata/md5-cache/net-analyzer/prelude-lml-5.2.0
+++ /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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/libpcre >=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 icu? ( dev-libs/icu:= ) ssl? ( net-libs/gnutls:= )
-DESCRIPTION=The prelude log analyzer
-EAPI=7
-HOMEPAGE=https://www.prelude-siem.org
-INHERIT=autotools systemd tmpfiles
-IUSE=icu ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libpcre >=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 icu? ( dev-libs/icu:= ) ssl? ( net-libs/gnutls:= ) virtual/tmpfiles
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prelude-lml-5.2.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=46831080b10ef2f2e0d06054e32e77a5
diff --git a/metadata/md5-cache/net-analyzer/prelude-lml-rules-5.2.0 b/metadata/md5-cache/net-analyzer/prelude-lml-rules-5.2.0
deleted file mode 100644
index b6be1bfb449b..000000000000
--- a/metadata/md5-cache/net-analyzer/prelude-lml-rules-5.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=~net-analyzer/prelude-lml-5.2.0
-DESCRIPTION=Prelude LML community ruleset
-EAPI=7
-HOMEPAGE=https://www.prelude-siem.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=~net-analyzer/prelude-lml-5.2.0
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prelude-lml-rules-5.2.0.tar.gz
-_md5_=383bdafe2c4ede35d93d3f8b209e0fe8
diff --git a/metadata/md5-cache/net-analyzer/thcrut-1.2.5-r2 b/metadata/md5-cache/net-analyzer/thcrut-1.2.5-r2
deleted file mode 100644
index cc7067d0794e..000000000000
--- a/metadata/md5-cache/net-analyzer/thcrut-1.2.5-r2
+++ /dev/null
@@ -1,14 +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=prepare
-DEPEND=dev-libs/libpcre net-libs/libnet:1.0 net-libs/libpcap
-DESCRIPTION=Network discovery and fingerprinting tool
-EAPI=7
-HOMEPAGE=http://www.thc.org/thc-rut/
-INHERIT=autotools
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=free-noncomm PCRE GPL-1+
-RDEPEND=dev-libs/libpcre net-libs/libnet:1.0 net-libs/libpcap
-SLOT=0
-SRC_URI=https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/thcrut-1.2.5.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9a192e1a7f70337d6a0eb41ad8f48c06
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 934eef2a635d..31cb0f0b9987 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/dnshijacker-1.3-r2 b/metadata/md5-cache/net-dns/dnshijacker-1.3-r2
deleted file mode 100644
index 75367a6498d9..000000000000
--- a/metadata/md5-cache/net-dns/dnshijacker-1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=net-libs/libnet-1.0.2a-r3:1.0 net-libs/libpcap
-DESCRIPTION=a libnet/libpcap based packet sniffer and spoofer
-EAPI=7
-HOMEPAGE=http://pedram.redhive.com/code/dns_hijacker/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libnet-1.0.2a-r3:1.0 net-libs/libpcap
-SLOT=0
-SRC_URI=http://pedram.redhive.com/downloads/dnshijacker-1.3.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=68e39891e946b09bbe22d8c8148ec86c
diff --git a/metadata/md5-cache/net-dns/dnssec-check-2.2 b/metadata/md5-cache/net-dns/dnssec-check-2.2
deleted file mode 100644
index 78ecbaad35dc..000000000000
--- a/metadata/md5-cache/net-dns/dnssec-check-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtdeclarative:5 net-dns/dnssec-validator[threads]
-DESCRIPTION=Tests local resolver for support of DNSSEC validation
-EAPI=7
-HOMEPAGE=https://www.dnssec-tools.org
-INHERIT=desktop qmake-utils
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-qt/qtdeclarative:5 net-dns/dnssec-validator[threads]
-SLOT=0
-SRC_URI=https://www.dnssec-tools.org/download/dnssec-check-2.2.tar.gz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=5cc873d91f63211b4ada3433b81dab42
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 18b0d86c417c..dd1f76a6fda1 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/nufw-2.2.22-r4 b/metadata/md5-cache/net-firewall/nufw-2.2.22-r4
index 197e3412e431..97485511878f 100644
--- a/metadata/md5-cache/net-firewall/nufw-2.2.22-r4
+++ b/metadata/md5-cache/net-firewall/nufw-2.2.22-r4
@@ -1,16 +1,16 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:= dev-python/IPy net-firewall/iptables net-libs/gnutls:= ldap? ( >=net-nds/openldap-2:= ) mysql? ( dev-db/mysql-connector-c:= ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql:*[server] ) prelude? ( dev-libs/libprelude ) 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 dev-libs/openssl:0
+DEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:= dev-python/IPy net-firewall/iptables net-libs/gnutls:= ldap? ( >=net-nds/openldap-2:= ) mysql? ( dev-db/mysql-connector-c:= ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql:*[server] ) 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 dev-libs/openssl:0
 DESCRIPTION=An enterprise grade authenticating firewall based on netfilter
 EAPI=6
 HOMEPAGE=http://www.nufw.org/
 INHERIT=autotools flag-o-matic pam ssl-cert
-IUSE=debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test
+IUSE=debug ldap mysql pam pam_nuauth plaintext postgres unicode nfqueue nfconntrack static syslog test
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:= dev-python/IPy net-firewall/iptables net-libs/gnutls:= ldap? ( >=net-nds/openldap-2:= ) mysql? ( dev-db/mysql-connector-c:= ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql:*[server] ) prelude? ( dev-libs/libprelude )
+RDEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:= dev-python/IPy net-firewall/iptables net-libs/gnutls:= ldap? ( >=net-nds/openldap-2:= ) mysql? ( dev-db/mysql-connector-c:= ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql:*[server] )
 REQUIRED_USE=pam_nuauth? ( plaintext )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nufw.org/attachments/download/39/nufw-2.2.22.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c1386ef83fd655b95a17c242777f38b5
+_md5_=489c9e09d90b729946dbd4e6c14a3e9c
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 1b57374a8100..68ddc20d4136 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r3 b/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r3
deleted file mode 100644
index aa1f81530cf5..000000000000
--- a/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext 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=install postinst prepare
-DEPEND=>=dev-libs/atk-1.0 >=media-libs/freetype-2.0 >=x11-libs/pango-1.0 dev-libs/glib:2 virtual/libcrypt:= virtual/libiconv x11-libs/gtk+:2
-DESCRIPTION=GTK frontend to proftpd
-EAPI=7
-HOMEPAGE=https://mange.dynalias.org/linux/gproftpd
-INHERIT=autotools
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/atk-1.0 >=media-libs/freetype-2.0 >=x11-libs/pango-1.0 dev-libs/glib:2 virtual/libcrypt:= virtual/libiconv x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://mange.dynup.net/linux/gproftpd/gproftpd-8.3.2.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8a5d9027b8edec0d07ce1db43e26be6b
diff --git a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r4 b/metadata/md5-cache/net-ftp/ncftp-3.2.6-r4
deleted file mode 100644
index a47561f24f27..000000000000
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r4
+++ /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=configure install prepare
-DEPEND=sys-libs/ncurses:=
-DESCRIPTION=An extremely configurable ftp client
-EAPI=8
-HOMEPAGE=https://www.ncftp.com/
-INHERIT=autotools toolchain-funcs
-IUSE=pch
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=Clarified-Artistic
-RDEPEND=sys-libs/ncurses:=
-SLOT=0
-SRC_URI=https://ftp.mirrorservice.org/sites/ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=6394b339feb7b591d1350d8a180fd295
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 9e1d7662a43f..12b20986b123 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011 b/metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011
deleted file mode 100644
index b6e2e8821861..000000000000
--- a/metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DESCRIPTION=Mocked systemd dbus interface for skype 8.30+
-EAPI=7
-HOMEPAGE=https://github.com/maelnor/skype-dbus-mock
-INHERIT=python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=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_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) >=net-im/skypeforlinux-8.30 !sys-apps/systemd !sys-auth/elogind
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/maelnor/skype-dbus-mock/archive/3a9e2882ac5c0ad6be3c5cb5c7da008b4cfa51da.tar.gz -> skype-dbus-mock-0_pre20181011.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ff0385e2810cbfe2a27a97f1d44dc887
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 87229d21c828..a56257820ba9 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/dleyna-0.8.2 b/metadata/md5-cache/net-libs/dleyna-0.8.2
new file mode 100644
index 000000000000..c59190fe6848
--- /dev/null
+++ b/metadata/md5-cache/net-libs/dleyna-0.8.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/docutils virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=dev-libs/glib-2.28:2 >=net-libs/gssdp-1.6.0:1.6= >=net-libs/gupnp-1.6.0:1.6= >=net-libs/gupnp-av-0.12.9:0= >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3.0:3.0 dev-libs/libxml2 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_11? ( >=dev-lang/python-3.11.1:3.11 ) !net-libs/dleyna-connector-dbus !net-libs/dleyna-core !net-libs/dleyna-renderer !net-misc/dleyna-server
+DESCRIPTION=A set of services and D-Bus APIs to simplify access to UPnP/DLNA media devices
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/World/dLeyna
+INHERIT=meson python-single-r1
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.28:2 >=net-libs/gssdp-1.6.0:1.6= >=net-libs/gupnp-1.6.0:1.6= >=net-libs/gupnp-av-0.12.9:0= >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3.0:3.0 dev-libs/libxml2 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_11? ( >=dev-lang/python-3.11.1:3.11 ) !net-libs/dleyna-connector-dbus !net-libs/dleyna-core !net-libs/dleyna-renderer !net-misc/dleyna-server
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=1.0/6
+SRC_URI=https://gitlab.gnome.org/World/dLeyna/-/archive/v0.8.2/dLeyna-v0.8.2.tar.bz2
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=3614abb908508c70e0b0af4e82716c55
diff --git a/metadata/md5-cache/net-libs/libnet-1.0.2a-r7 b/metadata/md5-cache/net-libs/libnet-1.0.2a-r7
deleted file mode 100644
index d6a825f7acc1..000000000000
--- a/metadata/md5-cache/net-libs/libnet-1.0.2a-r7
+++ /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=install prepare test
-DESCRIPTION=library providing an API for commonly used low-level network functions
-EAPI=7
-HOMEPAGE=http://www.packetfactory.net/libnet/
-INHERIT=autotools toolchain-funcs
-KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 sparc x86
-LICENSE=BSD BSD-2 HPND
-SLOT=1.0
-SRC_URI=http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=534d78bc513f39724eb129b9b8bc106e
diff --git a/metadata/md5-cache/net-libs/libupnp-1.14.15 b/metadata/md5-cache/net-libs/libupnp-1.14.15
index 761d5f861025..7bb4f3a15d91 100644
--- a/metadata/md5-cache/net-libs/libupnp-1.14.15
+++ b/metadata/md5-cache/net-libs/libupnp-1.14.15
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://pupnp.sourceforge.net/
 INHERIT=autotools
 IUSE=blocking-tcp debug doc +reuseaddr samples +ssl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0/17
 SRC_URI=https://github.com/pupnp/pupnp/archive/release-1.14.15.tar.gz -> libupnp-1.14.15.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=362c786a863f8862ee63169a30403a87
+_md5_=efc8e6546a53b7efe118acad8bb35c19
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index c7f116b02697..8dbb93e77017 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/cmd5checkpw-0.30-r2 b/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r2
deleted file mode 100644
index 63b0bad79382..000000000000
--- a/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=acct-user/cmd5checkpw
-DESCRIPTION=A checkpassword compatible authentication program using CRAM-MD5
-EAPI=7
-HOMEPAGE=https://www.fehcom.de/qmail/smtpauth.html
-INHERIT=fixheadtails
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=public-domain RSA
-RDEPEND=acct-user/cmd5checkpw
-SLOT=0
-SRC_URI=https://www.fehcom.de/qmail/auth/cmd5checkpw-030_tgz.bin -> cmd5checkpw-0.30.tar.gz
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef
-_md5_=58db91889a0c8db61b8c106bc62b9f55
diff --git a/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r3 b/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r3
deleted file mode 100644
index f222ffd94958..000000000000
--- a/metadata/md5-cache/net-mail/cmd5checkpw-0.30-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=acct-group/cmd5checkpw
-DESCRIPTION=A checkpassword compatible authentication program using CRAM-MD5
-EAPI=7
-HOMEPAGE=https://www.fehcom.de/qmail/smtpauth.html
-INHERIT=fixheadtails
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=public-domain RSA
-RDEPEND=acct-group/cmd5checkpw
-SLOT=0
-SRC_URI=https://www.fehcom.de/qmail/auth/cmd5checkpw-030_tgz.bin -> cmd5checkpw-0.30.tar.gz
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef
-_md5_=f427586354b86cca1e415ff112ba875e
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 392558383ae4..6cffe09e56be 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/adjtimex-1.29-r2 b/metadata/md5-cache/net-misc/adjtimex-1.29-r3
index 82a5c9c18373..5b452ab36e78 100644
--- a/metadata/md5-cache/net-misc/adjtimex-1.29-r2
+++ b/metadata/md5-cache/net-misc/adjtimex-1.29-r3
@@ -5,7 +5,8 @@ HOMEPAGE=https://www.ibiblio.org/pub/Linux/system/admin/time/adjtimex.lsm https:
 INHERIT=fixheadtails toolchain-funcs
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=GPL-2
+RDEPEND=!net-misc/sntpd[adjtimex]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/adjtimex/adjtimex_1.29-10.debian.tar.xz mirror://debian/pool/main/a/adjtimex/adjtimex_1.29.orig.tar.gz
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=2708acc24e0a60c7eb293eef58862b85
+_md5_=7728da699b251ee04783e73f7c7885b8
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2 b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
deleted file mode 100644
index 5f0ec7355e4d..000000000000
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
+++ /dev/null
@@ -1,15 +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
-DESCRIPTION=X2Go command line client
-EAPI=8
-HOMEPAGE=http://www.x2go.org
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=AGPL-3+
-RDEPEND=dev-python/setproctitle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=net-misc/python-x2go-0.6.1.1[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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.6.1.2.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=16d434d63cca7b6b6d8f6b11754cc549
diff --git a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1 b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
deleted file mode 100644
index 2daf3fe62ce3..000000000000
--- a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/python-distutils-extra[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/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=X2Go graphical client applet
-EAPI=8
-HOMEPAGE=http://www.x2go.org
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=dev-python/pycups[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setproctitle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wxpython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=net-misc/python-x2go-0.6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/libnotify 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=http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-0.6.1.1.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=6a503132dee313e20945362c3e953b59
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.6.1.3 b/metadata/md5-cache/net-misc/python-x2go-0.6.1.3
deleted file mode 100644
index 3c22f1e738ab..000000000000
--- a/metadata/md5-cache/net-misc/python-x2go-0.6.1.3
+++ /dev/null
@@ -1,15 +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
-DESCRIPTION=X2Go client-side Python API
-EAPI=8
-HOMEPAGE=http://www.x2go.org
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-xlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/nx 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=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.6.1.3.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=848310a9dae5959a23c82889dade7174
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.27 b/metadata/md5-cache/net-misc/remmina-1.4.27
index 604edf5d2b20..25b96c063251 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.27
+++ b/metadata/md5-cache/net-misc/remmina-1.4.27
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup:2.4 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( 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_11? ( >=dev-lang/python-3.11.1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) x2go? ( net-misc/pyhoca-cli ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) spice? ( app-emulation/spice-protocol ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup:2.4 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( 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_11? ( >=dev-lang/python-3.11.1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) spice? ( app-emulation/spice-protocol ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A GTK+ RDP, SPICE, VNC and SSH client
 EAPI=7
 HOMEPAGE=https://remmina.org/
 INHERIT=cmake optfeature python-single-r1 xdg
-IUSE=+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc webkit x2go zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+IUSE=+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc webkit zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup:2.4 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( 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_11? ( >=dev-lang/python-3.11.1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) x2go? ( net-misc/pyhoca-cli ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup:2.4 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( 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_11? ( >=dev-lang/python-3.11.1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.27/Remmina-v1.4.27.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ee3ca33345e04f550523ee4ea7a2df4b
+_md5_=abc1b15d7a24a259e0ac9999907e9ad4
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.28 b/metadata/md5-cache/net-misc/remmina-1.4.28
index 70e8c7dde69d..e8af2b865b63 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.28
+++ b/metadata/md5-cache/net-misc/remmina-1.4.28
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( 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_11? ( >=dev-lang/python-3.11.1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) x2go? ( net-misc/pyhoca-cli ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) spice? ( app-emulation/spice-protocol ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( 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_11? ( >=dev-lang/python-3.11.1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) spice? ( app-emulation/spice-protocol ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A GTK+ RDP, SPICE, VNC and SSH client
 EAPI=7
 HOMEPAGE=https://remmina.org/
 INHERIT=cmake optfeature python-single-r1 xdg
-IUSE=+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit x2go zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+IUSE=+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( 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_11? ( >=dev-lang/python-3.11.1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) x2go? ( net-misc/pyhoca-cli ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( 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_11? ( >=dev-lang/python-3.11.1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.28/Remmina-v1.4.28.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=20e1b6d55d0b0506c8ef0c4385f909b3
+_md5_=7b6b5a51c7965d0f71159adabc0f75bd
diff --git a/metadata/md5-cache/net-misc/selfdhcp-0.2a-r2 b/metadata/md5-cache/net-misc/selfdhcp-0.2a-r2
deleted file mode 100644
index faadd719ee23..000000000000
--- a/metadata/md5-cache/net-misc/selfdhcp-0.2a-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/popt dev-libs/libxml2:2= >=net-libs/libnet-1.0.2:1.0 net-libs/libpcap
-DESCRIPTION=Small stealth network autoconfigure software
-EAPI=7
-HOMEPAGE=http://selfdhcp.sourceforge.net
-KEYWORDS=~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/popt dev-libs/libxml2:2= >=net-libs/libnet-1.0.2:1.0 net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://sourceforge/selfdhcp/selfdhcp-0.2a.tar.bz2
-_md5_=7545eb93b98dd82af3ee025aa466490f
diff --git a/metadata/md5-cache/net-misc/sntpd-3.1 b/metadata/md5-cache/net-misc/sntpd-3.1-r1
index 89e1c9c2eaeb..8136a055e0fe 100644
--- a/metadata/md5-cache/net-misc/sntpd-3.1
+++ b/metadata/md5-cache/net-misc/sntpd-3.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=systemd? ( sys-apps/systemd )
+DEPEND=adjtimex? ( !net-misc/adjtimex ) systemd? ( sys-apps/systemd )
 DESCRIPTION=A NTP (RFC-1305 and RFC-4330) client and server for unix-alike systems
 EAPI=8
 HOMEPAGE=https://github.com/troglobit/sntpd
@@ -8,8 +8,8 @@ INHERIT=systemd
 IUSE=adjtimex systemd
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=systemd? ( sys-apps/systemd )
+RDEPEND=adjtimex? ( !net-misc/adjtimex ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/troglobit/sntpd/releases/download/v3.1/sntpd-3.1.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=4673739d232fca502e60639c973c9e69
+_md5_=4c10a45eb2f90e756cd5a5a1df38d558
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.41-r1 b/metadata/md5-cache/net-misc/spice-gtk-0.41-r1
index 58f7fa147d50..6ca674824f09 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.41-r1
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.41-r1
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gt
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 IUSE=+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/acl virtual/libusb:1 policykit? ( >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:3.0 net-libs/libsoup:3.0 ) amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.41.tar.xz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0efe76ba88c16bbcf1814b1b1b094fbb
+_md5_=8f5104aff357966d762d74e74c374cee
diff --git a/metadata/md5-cache/net-misc/ytfzf-2.5.3 b/metadata/md5-cache/net-misc/ytfzf-2.5.3
index abd1cdbacbd2..c28054b36549 100644
--- a/metadata/md5-cache/net-misc/ytfzf-2.5.3
+++ b/metadata/md5-cache/net-misc/ytfzf-2.5.3
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://github.com/pystardust/ytfzf/
 INHERIT=optfeature
 IUSE=X minimal
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=app-misc/jq net-misc/curl[ssl] app-alternatives/awk !minimal? ( X? ( media-gfx/ueberzug ) app-shells/fzf media-video/mpv[lua] net-misc/yt-dlp )
 SLOT=0
 SRC_URI=https://github.com/pystardust/ytfzf/archive/refs/tags/v2.5.3.tar.gz -> ytfzf-2.5.3.tar.gz
 _eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=1eeb403dc7fb225fef4ccb909f681758
+_md5_=791f944a00568e1789209e625f31fc5e
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 6a62e5a34e82..95ed11044ab3 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/yp-tools-4.2.3-r1 b/metadata/md5-cache/net-nds/yp-tools-4.2.3-r1
index 52bef8328a72..d2ca5f3877b6 100644
--- a/metadata/md5-cache/net-nds/yp-tools-4.2.3-r1
+++ b/metadata/md5-cache/net-nds/yp-tools-4.2.3-r1
@@ -8,8 +8,8 @@ INHERIT=autotools systemd
 IUSE=nls
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
-RDEPEND=net-libs/libtirpc:= >=net-libs/libnsl-1.2.0:0= virtual/libcrypt:= nls? ( virtual/libintl )
+RDEPEND=net-libs/libtirpc:= >=net-libs/libnsl-1.2.0:0= virtual/libcrypt:= nls? ( virtual/libintl ) !sys-apps/net-tools[nis(-)]
 SLOT=0
 SRC_URI=https://github.com/thkukuk/yp-tools/archive/v4.2.3.tar.gz -> yp-tools-4.2.3.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7ff3181994595e28ff3e03b8ace50f1c
+_md5_=207631c95215540c470f7e3382502ba2
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index e067e22f46a2..8046e1f6574d 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.4-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2020.4-r1
index a2238ab4aad6..be7aa6cbb117 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.4-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.4-r1
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
@@ -7,10 +7,10 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/2020.4
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2020.4.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2020.4.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2020.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a9d58ceefb0bc663f763b817d2cd1717
+_md5_=07bad0642c3d9dc07f1e3e13abc97082
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.7 b/metadata/md5-cache/sci-chemistry/gromacs-2020.7
index e4a8dd6fde36..dbeaf01a4a74 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.7
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.7
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/2020.7
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2020.7.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2020.7.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2020.7.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a9dec67c45cdabcd7dd00665d56788ef
+_md5_=45e1a1e67a45fd5f3ef7fa0499fae879
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.3-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2021.3-r1
index 8b3c86876f20..b5104440fa1a 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.3-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/2021.3
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.3.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.3.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.3.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=98427c2d71209dc2b36430f4e63099a7
+_md5_=a85d03bd705a5907b059622fc7eb1159
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.5 b/metadata/md5-cache/sci-chemistry/gromacs-2021.5
index 41fd1bee5d22..00255aa637e6 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.5
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.5
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/2021.5
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.5.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.5.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.5.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2b77d90efe779b2dc01a0b4a2a4fc950
+_md5_=33a5b368799c22670f538fcbff33a99c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.6 b/metadata/md5-cache/sci-chemistry/gromacs-2021.6
index 22688097ff75..7479bd77fc3f 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.6
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.6
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/2021.6
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.6.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.6.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.6.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2b77d90efe779b2dc01a0b4a2a4fc950
+_md5_=33a5b368799c22670f538fcbff33a99c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
index 457537cfdec7..f86a38082be3 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
@@ -1,4 +1,4 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=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 postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/2021.9999
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=37783db6fed45127d7398fa432dec03d
+_md5_=bb8bd88cce4075e30ad5276a98238556
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2022.3 b/metadata/md5-cache/sci-chemistry/gromacs-2022.3
index 0a4b6a3d45f6..7fbcc2ffa46c 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2022.3
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2022.3
@@ -1,4 +1,4 @@
-BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=blas clang clang-cuda cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) <sci-chemistry/dssp-4 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_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) <sci-chemistry/dssp-4
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/2022.3
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2022.3.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2022.3.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2022.3.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6017ac56695990e60fa079e1286c7ba4
+_md5_=c4f0a589fbf52e2f0caa0897259a83f9
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2022.2 b/metadata/md5-cache/sci-chemistry/gromacs-2022.4
index 3fa447598932..129edd483bb4 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2022.2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2022.4
@@ -1,4 +1,4 @@
-BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig clang? ( >=sys-devel/clang-6:* ) build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=blas clang clang-cuda cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 -arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) <sci-chemistry/dssp-4 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_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) <sci-chemistry/dssp-4
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) clang-cuda? ( clang cuda ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
-SLOT=0/2022.2
-SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2022.2.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2022.2.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2022.2.tar.gz )
+SLOT=0/2022.4
+SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2022.4.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2022.4.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2022.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6017ac56695990e60fa079e1286c7ba4
+_md5_=c4f0a589fbf52e2f0caa0897259a83f9
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2022.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2022.9999
index db3bdaabf899..b4be486c4cf8 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2022.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2022.9999
@@ -1,4 +1,4 @@
-BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=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 postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) <sci-chemistry/dssp-4 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_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) <sci-chemistry/dssp-4
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/2022.9999
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=763d089738fde7ef4f9fa28e4e523094
+_md5_=09de248b7cd1a170c5f0de3b80716b99
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2023.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2023.9999
new file mode 100644
index 000000000000..5286bee15b76
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2023.9999
@@ -0,0 +1,15 @@
+BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3.4:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=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 postinst prepare pretend setup test unpack
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=8
+HOMEPAGE=http://www.gromacs.org/
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils git-r3
+IUSE=blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+PROPERTIES=live
+RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3.4:= 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0/2023.9999
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=03d4d9bb604e957adfbb57c51103cbde
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2023_rc1 b/metadata/md5-cache/sci-chemistry/gromacs-2023_rc1
new file mode 100644
index 000000000000..e36108b728ad
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2023_rc1
@@ -0,0 +1,16 @@
+BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3.4:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=8
+HOMEPAGE=http://www.gromacs.org/
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
+IUSE=blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 -arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3.4:= 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0/2023_rc1
+SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2023-rc1.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2023-rc1.pdf -> manual-2023_rc1.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2023-rc1.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=03d4d9bb604e957adfbb57c51103cbde
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index bc156e5c1fe0..90e02d7b3e32 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -1,4 +1,4 @@
-BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3.4:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) virtual/pkgconfig build-manual? ( app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) >=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 postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1
 IUSE=blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3:= 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_11? ( >=dev-lang/python-3.11.1:3.11 ) <sci-chemistry/dssp-4 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_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi[cxx] ) sci-libs/lmfit:= >=dev-cpp/muParser-2.3.4:= 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_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=763d089738fde7ef4f9fa28e4e523094
+_md5_=03d4d9bb604e957adfbb57c51103cbde
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index c3e7f22753cd..fde57c4e0387 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/bmrblib-1.0.4 b/metadata/md5-cache/sci-libs/bmrblib-1.0.4
deleted file mode 100644
index 2f3c4580ef9f..000000000000
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.4
+++ /dev/null
@@ -1,15 +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 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=API abstracting the BioMagResBank (BMRB) NMR-STAR format
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/bmrblib
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://sourceforge/bmrblib/bmrblib-1.0.4.tar.bz2
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=0d062e5eabca6077450c44fb9e2e931a
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index c98e44b94da2..f7ccd700c4b1 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/octave-7.2.0-r1 b/metadata/md5-cache/sci-mathematics/octave-7.2.0-r1
deleted file mode 100644
index 9cbaabb8a9ce..000000000000
--- a/metadata/md5-cache/sci-mathematics/octave-7.2.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gperf virtual/imagemagick-tools virtual/pkgconfig doc? ( dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric dev-texlive/texlive-metapost virtual/latex-base ) java? ( >=virtual/jdk-1.8:* ) gui? ( dev-qt/linguist-tools:5 ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) 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 virtual/fortran
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:= sys-libs/ncurses:= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:= ) java? ( >=virtual/jre-1.8:* ) json? ( dev-libs/rapidjson ) opengl? ( media-libs/freetype:= media-libs/fontconfig:= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:= ) qrupdate? ( sci-libs/qrupdate:= ) readline? ( sys-libs/readline:= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:= sci-libs/camd:= sci-libs/ccolamd:= sci-libs/cholmod:= sci-libs/colamd:= sci-libs/cxsparse:= sci-libs/umfpack:= ) ssl? ( dev-libs/openssl:= ) sundials? ( >=sci-libs/sundials-4:= ) X? ( x11-libs/libX11:= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=High-level interactive language for numerical computations
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/octave/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
-IUSE=curl doc fftw +glpk gnuplot gui hdf5 java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib java
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:= sys-libs/ncurses:= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:= ) java? ( >=virtual/jre-1.8:* ) json? ( dev-libs/rapidjson ) opengl? ( media-libs/freetype:= media-libs/fontconfig:= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:= ) qrupdate? ( sci-libs/qrupdate:= ) readline? ( sys-libs/readline:= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:= sci-libs/camd:= sci-libs/ccolamd:= sci-libs/cholmod:= sci-libs/colamd:= sci-libs/cxsparse:= sci-libs/umfpack:= ) ssl? ( dev-libs/openssl:= ) sundials? ( >=sci-libs/sundials-4:= ) X? ( x11-libs/libX11:= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/7.2.0
-SRC_URI=mirror://gnu/octave/octave-7.2.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a4bd0ca0dcb4f984acd902c1cc899f42
diff --git a/metadata/md5-cache/sci-mathematics/relational-2.5-r2 b/metadata/md5-cache/sci-mathematics/relational-2.5-r2
deleted file mode 100644
index edc177f7e9b8..000000000000
--- a/metadata/md5-cache/sci-mathematics/relational-2.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=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_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] )
-DESCRIPTION=Educational tool for relational algebra
-EAPI=7
-HOMEPAGE=https://ltworf.github.io/relational/
-INHERIT=python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=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_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/ltworf/relational/releases/download/2.5/relational_2.5.orig.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=e3f855a4b1eb10a390eb93909616c269
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index e01cf0c3aa3e..24a589191afd 100644
--- a/metadata/md5-cache/sec-policy/Manifest.gz
+++ b/metadata/md5-cache/sec-policy/Manifest.gz
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20220520-r1 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20220520-r1
deleted file mode 100644
index 375cf6bcc503..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20220520-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20220520-r1
-DESCRIPTION=SELinux policy for prelude
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-INHERIT=selinux-policy-2
-KEYWORDS=amd64 arm arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20220520-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20220520/refpolicy-2.20220520.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20220520-r1.tar.bz2
-_eclasses_=selinux-policy-2	ac37c8988fd6d9a7ef5ebc5fcb8b4062
-_md5_=c2657bf3b9b1502e95915680e2ba3208
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20221101-r2 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20221101-r2
deleted file mode 100644
index 6470a31db642..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20221101-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20221101-r2
-DESCRIPTION=SELinux policy for prelude
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-INHERIT=selinux-policy-2
-KEYWORDS=amd64 arm arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20221101-r2
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20221101/refpolicy-2.20221101.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20221101-r2.tar.bz2
-_eclasses_=selinux-policy-2	ac37c8988fd6d9a7ef5ebc5fcb8b4062
-_md5_=c2657bf3b9b1502e95915680e2ba3208
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20221101-r3 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20221101-r3
deleted file mode 100644
index 6c4e3a4aa015..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20221101-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20221101-r3
-DESCRIPTION=SELinux policy for prelude
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-INHERIT=selinux-policy-2
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20221101-r3
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20221101/refpolicy-2.20221101.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20221101-r3.tar.bz2
-_eclasses_=selinux-policy-2	ac37c8988fd6d9a7ef5ebc5fcb8b4062
-_md5_=73d6a5bfb72f2e7172d66c0b2704fae5
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-9999 b/metadata/md5-cache/sec-policy/selinux-prelude-9999
deleted file mode 100644
index e67d241cc8d0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-DESCRIPTION=SELinux policy for prelude
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-INHERIT=selinux-policy-2
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	selinux-policy-2	ac37c8988fd6d9a7ef5ebc5fcb8b4062
-_md5_=fe8794f424749a47636fbdcd57f7060e
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index f9874f506b3e..6333fd053dfc 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/intel-performance-counter-monitor-2.10 b/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.10
deleted file mode 100644
index 01384d8b09e8..000000000000
--- a/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=>=sys-devel/gcc-4:*
-DESCRIPTION=Intel Performance Counter Monitor - A better way to measure CPU utilization
-EAPI=8
-HOMEPAGE=https://software.intel.com/en-us/articles/intel-performance-counter-monitor-a-better-way-to-measure-cpu-utilization
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=fcaps
-IUSE=+filecaps
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=sys-devel/gcc-4:*
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~idella4/distfiles/IntelPerformanceCounterMonitor-PCM-V2.10.zip
-_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a
-_md5_=e1f2cce024b4ebc3c75b1b072a927cd6
diff --git a/metadata/md5-cache/sys-apps/net-tools-2.10 b/metadata/md5-cache/sys-apps/net-tools-2.10
index ac9954deea9f..5b4d1f1717f8 100644
--- a/metadata/md5-cache/sys-apps/net-tools-2.10
+++ b/metadata/md5-cache/sys-apps/net-tools-2.10
@@ -8,9 +8,9 @@ INHERIT=flag-o-matic toolchain-funcs
 IUSE=+arp +hostname ipv6 nis nls plipconfig selinux slattach static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=selinux? ( sys-libs/libselinux ) hostname? ( !sys-apps/coreutils[hostname] )
+RDEPEND=selinux? ( sys-libs/libselinux ) hostname? ( !sys-apps/coreutils[hostname] ) nis? ( !net-nds/yp-tools )
 REQUIRED_USE=nis? ( hostname )
 SLOT=0
 SRC_URI=mirror://sourceforge/net-tools/net-tools-2.10.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=eee5ed0720a3e4450a9465faa7136137
+_md5_=6b2447dcdf0cf8e83818c864e19ac7b2
diff --git a/metadata/md5-cache/sys-apps/net-tools-9999 b/metadata/md5-cache/sys-apps/net-tools-9999
index 51b446687648..5acab6374d82 100644
--- a/metadata/md5-cache/sys-apps/net-tools-9999
+++ b/metadata/md5-cache/sys-apps/net-tools-9999
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic toolchain-funcs git-r3
 IUSE=+arp +hostname ipv6 nis nls plipconfig selinux slattach static
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=selinux? ( sys-libs/libselinux ) hostname? ( !sys-apps/coreutils[hostname] )
+RDEPEND=selinux? ( sys-libs/libselinux ) hostname? ( !sys-apps/coreutils[hostname] ) nis? ( !net-nds/yp-tools )
 REQUIRED_USE=nis? ( hostname )
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=56d272ac7c35e9c31b55feba0ff405d7
+_md5_=2fa7008130f9b371c81591729e08c65d
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 2faf033ea653..0698a59e2aa9 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/grub-2.06-r3 b/metadata/md5-cache/sys-boot/grub-2.06-r3
deleted file mode 100644
index 4eadd64caa4a..000000000000
--- a/metadata/md5-cache/sys-boot/grub-2.06-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-DESCRIPTION=GNU GRUB boot loader
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/grub/
-INHERIT=autotools bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
-IUSE=device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_emu grub_platforms_ieee1275 grub_platforms_loongson grub_platforms_multiboot grub_platforms_qemu grub_platforms_qemu-mips grub_platforms_pc grub_platforms_uboot grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )
-RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
-REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
-RESTRICT=!test? ( test )
-SLOT=2/2.06-r3
-SRC_URI=mirror://gnu/grub/grub-2.06.tar.xz https://dev.gentoo.org/~floppym/dist/grub-2.06-backports-r1.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a0e1176ff683394844f56a6a8180b1b2
diff --git a/metadata/md5-cache/sys-boot/grub-2.06-r4 b/metadata/md5-cache/sys-boot/grub-2.06-r4
index 81523d683e28..33b0a61de49b 100644
--- a/metadata/md5-cache/sys-boot/grub-2.06-r4
+++ b/metadata/md5-cache/sys-boot/grub-2.06-r4
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5
+BDEPEND=>=sys-devel/flex-2.5.35 sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
 DESCRIPTION=GNU GRUB boot loader
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2/2.06-r4
 SRC_URI=mirror://gnu/grub/grub-2.06.tar.xz https://dev.gentoo.org/~floppym/dist/grub-2.06-backports-r2.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b44443adda1f35386cf5926bfece4094
+_md5_=c2aee96db3658183a9425b8ab4929abb
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index dcef5f3b82ef..c86cb43715fb 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) >=sys-devel/flex-2.5.35 sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
 DESCRIPTION=GNU GRUB boot loader
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2/9999
 SRC_URI=fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=853ca264a71bf76fe7a7c6cda675b393
+_md5_=af8e63dcef4fe474b40fa52609db25b9
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 7ef8a5e5d99a..17d3b844931b 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/prewikka-5.2.0 b/metadata/md5-cache/www-apps/prewikka-5.2.0
deleted file mode 100644
index fa0c410df9a9..000000000000
--- a/metadata/md5-cache/www-apps/prewikka-5.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/lesscpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[ssl] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl] ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-libs/libprelude-6[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-libs/libpreludedb-5.2.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-libs/libpreludedb-6[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/croniter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lark[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[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-python/voluptuous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/font-xfree86-type1
-DESCRIPTION=Graphical front-end analysis console for the Prelude Framework
-EAPI=7
-HOMEPAGE=https://www.prelude-siem.org
-INHERIT=distutils-r1 optfeature
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-libs/libprelude-6[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-libs/libpreludedb-5.2.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-libs/libpreludedb-6[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/croniter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lark[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[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-python/voluptuous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/font-xfree86-type1 python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[ssl] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prewikka-5.2.0.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=cab785777ae49e91d61efa634d90b7c1
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 396532dd87dc..1d581f70e4ee 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/gunicorn-20.1.0-r1 b/metadata/md5-cache/www-servers/gunicorn-20.1.0-r1
index 65e182a366ae..92f1c3f73951 100644
--- a/metadata/md5-cache/www-servers/gunicorn-20.1.0-r1
+++ b/metadata/md5-cache/www-servers/gunicorn-20.1.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/benoitc/gunicorn/archive/20.1.0.tar.gz -> gunicorn-20.1.0.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=fcc6b0ab7ba25f3ad4c843f305eb0254
+_md5_=f54a92cd03705f4b721b7461e43e868d
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
index e8759d6c6756..f199aae43e33 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
@@ -1,16 +1,16 @@
 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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap:= ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ruby? ( ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap:= ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ruby? ( ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=7
 HOMEPAGE=https://projects.unbit.it/uwsgi/
 INHERIT=lua-single pax-utils php-ext-source-r3 python-r1 ruby-ng
-IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio python-gevent ruby +lua_single_target_lua5-1 php_targets_php7-3 php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ruby_targets_ruby27 ruby_targets_ruby30
+IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio ruby +lua_single_target_lua5-1 php_targets_php7-3 php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ruby_targets_ruby27 ruby_targets_ruby30
 KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap:= ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ruby? ( ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
-REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python-asyncio? ( python ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
+RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap:= ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ruby? ( ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python-asyncio? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=268606ac3613ce637a5a208ea8558cf2
+_md5_=dc1be7a032b206e29a8aa1ebf8219906
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 77c924bd7290..d2572c413c9a 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.7 b/metadata/md5-cache/x11-base/xwayland-22.1.7
new file mode 100644
index 000000000000..2fcf4989331c
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xwayland-22.1.7
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
+DESCRIPTION=Standalone X server running under Wayland
+EAPI=8
+HOMEPAGE=https://wayland.freedesktop.org/xserver.html
+INHERIT=meson
+IUSE=selinux video_cards_nvidia unwind xcsecurity
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
+SLOT=0
+SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.7.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=eef35da6e842e56a006c53a8511bc9ff
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 626bd9429920..316308c87edd 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/py3status-3.47 b/metadata/md5-cache/x11-misc/py3status-3.47
index e345a466af43..f25bc8d2e632 100644
--- a/metadata/md5-cache/x11-misc/py3status-3.47
+++ b/metadata/md5-cache/x11-misc/py3status-3.47
@@ -1,17 +1,17 @@
 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=!minimal? ( x11-misc/i3status ) gevent? ( >=dev-python/gevent-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) udev? ( >=dev-python/pyudev-0.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=!minimal? ( x11-misc/i3status ) udev? ( >=dev-python/pyudev-0.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=py3status is an extensible i3status wrapper written in python
 EAPI=7
 HOMEPAGE=https://github.com/ultrabug/py3status
 INHERIT=distutils-r1
-IUSE=gevent minimal +udev python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=minimal +udev python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=!minimal? ( x11-misc/i3status ) gevent? ( >=dev-python/gevent-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) udev? ( >=dev-python/pyudev-0.21.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 ) 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(-)?]
+RDEPEND=!minimal? ( x11-misc/i3status ) udev? ( >=dev-python/pyudev-0.21.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 ) 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(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ultrabug/py3status/archive/3.47.tar.gz -> py3status-3.47.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=b1aa16aaef05caaa89eed5b2211712a6
+_md5_=b15852553adae73505bcbc8227de1186
diff --git a/metadata/md5-cache/x11-misc/xflux-gui-2.0 b/metadata/md5-cache/x11-misc/xflux-gui-2.0-r1
index a0a6dcefe8d4..f80c58a3d76f 100644
--- a/metadata/md5-cache/x11-misc/xflux-gui-2.0
+++ b/metadata/md5-cache/x11-misc/xflux-gui-2.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/xflux-gui/fluxgui/
 INHERIT=distutils-r1 gnome2-utils xdg-utils
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=-* amd64 x86
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/libappindicator:3 dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/libXxf86vm x11-misc/xflux 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 )
+RDEPEND=dev-libs/libayatana-appindicator dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/libXxf86vm x11-misc/xflux 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 )
 SLOT=0
 SRC_URI=https://github.com/xflux-gui/fluxgui/archive/refs/tags/v2.0.tar.gz -> xflux-gui-2.0.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e7d0011fe4ed7a86e351d54cabd246a0
+_md5_=535d88548a06ded132dcc59c89e1322a
diff --git a/metadata/md5-cache/x11-misc/xsnow-3.5.3 b/metadata/md5-cache/x11-misc/xsnow-3.5.3-r1
index b170c660aef9..a0c4ef8a41f5 100644
--- a/metadata/md5-cache/x11-misc/xsnow-3.5.3
+++ b/metadata/md5-cache/x11-misc/xsnow-3.5.3-r1
@@ -1,6 +1,6 @@
 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=postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm x11-base/xorg-proto
+DEPEND=dev-libs/glib:2 sci-libs/gsl:= sys-apps/dbus x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=let it snow on your desktop and windows
 EAPI=8
 HOMEPAGE=https://www.ratrabbit.nl/ratrabbit/xsnow/
@@ -8,8 +8,8 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools xdg
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=freedist
-RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm
+RDEPEND=dev-libs/glib:2 sci-libs/gsl:= sys-apps/dbus x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.ratrabbit.nl/downloads/xsnow/xsnow-3.5.3.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3aeddb4aa78c6ccb5a1914a8579163bb
+_md5_=68d5de3649583679664bc59a8b92a342
diff --git a/metadata/md5-cache/x11-misc/xsnow-3.6.0 b/metadata/md5-cache/x11-misc/xsnow-3.6.0
new file mode 100644
index 000000000000..94bee677e501
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xsnow-3.6.0
@@ -0,0 +1,15 @@
+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=postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 sci-libs/gsl:= sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm x11-libs/libXtst x11-libs/libxkbcommon x11-base/xorg-proto
+DESCRIPTION=let it snow on your desktop and windows
+EAPI=8
+HOMEPAGE=https://www.ratrabbit.nl/ratrabbit/xsnow/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools xdg
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=freedist
+RDEPEND=dev-libs/glib:2 sci-libs/gsl:= sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm x11-libs/libXtst x11-libs/libxkbcommon
+SLOT=0
+SRC_URI=https://www.ratrabbit.nl/downloads/xsnow/xsnow-3.6.0.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=bd296b0f5313887b8a183caa02207e5b
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index f66829036c66..17e8ae5c5ec4 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14601 BLAKE2B b2b03f784771869c2af8238b7eb177f68542d9936c68fb72d5570f7586fc5bfa6ebef91d68006df82de3cb72959aeb4bab278be90309ec4475d99a0a7c116698 SHA512 63ddd1056929f887c0a4815b7d7a2bf2cee40e7678885b8dae9d5f1bfc4b69ae36456367dc791d7e3ada9047919456bd6d6dbfc92df0cef91b9e64733254a40c
-TIMESTAMP 2022-12-20T13:09:56Z
+TIMESTAMP 2022-12-20T19:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOhtCVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOiCIxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDIYw//bFFfVjv2jTEJjKfOYJ42r6dcnEKIUr6mEwf7d/pK62Po9Yf1oZTWz3qv
-yUqYBCIylxkvsTEsDWWESFjzfFFYyFySyBiX51ZWnxnKo2NXvybzV3WXKVIUAZJk
-Rnawym47AbPhgNoJBDk7y9AYM+R4G4nAcBoeoy8J+ccnf38DV3omYnlIq5drcyvp
-LW2YClYup77i9buHsaciwws/KNlgrQC4x3XP0sfXCtU81Dl0NxcWnACsgL9d0hfN
-6vibPMMh9SwmW/Uz/K81dGd7HDKRSMQHd3opxEOKFHHOwYlug41DfYOJk2017RNh
-gLd0kBZ37Blikh61afN35Tma425XRGBQh5RQHB7mL2G2gMrWIPSMAiFNxd+gVlxw
-5JwXldry7v/p69PFAbEWMUVXTd52nZPxiLwtvnemzgq9XyWv1E+VSiqzUebIgxYM
-F6G7dGLIDYJhth0ZSFDqxylfzuQjp5mpt8/YCWHHu5XE15HyMiIQbeIdCotW3TBs
-tJfRNgWM1JYBvqmxCFU2CgLko6gg8cLsee1mV4l1xqDLVT72Fx5XRMwf7PqSfbUd
-38hh2xZPgOc/U2RxDeu5bNLenXSmaKnGXmSXbFPGKgQuSu3qzNbWYXkiB5ioEZpv
-YfUZiNdLLb8LsEfj9gK8rJV7Gjw848fbVVq4xTKrbbp+Hoama0g=
-=JaY4
+klD4MBAAoLa7803G3amfbrsXC0TrjmYXfoPf223Zpth89Kz5zbcVHOLeoEjOy0R9
+0eBRBSoLObMmak3zMSbyAkwFrCM49HhmhixfgvAh7d+cMbXxaRm1sSh8jKDglIfK
+ZaPQZZpHVCm4NC3Wc02SDFKVc1drrRsXeW+mHYtnqnZHxAJV5iYTQ7S1HHL4yiC/
+SCDcYWsqSwRnQGE1dAZsG2Su6/2UHHYmjGZLpSrR1Ag09skRFQMf44aDkwIWERp0
+33rKDEs2CltYa3NDy7UXiHXv1MnuYMteWaOXnI6/NTPWQBYw7i06C/R1iKuHpnjn
+wmzDQ56/G/HqFY8m14VRXynsjF+np9SKHqHqyUVM8981s/FNgrecx/nHd1yrTzIu
+uRUtviuchYn+9uKTvvz93odt3F5hchhxJoJ7byn+KElRkgaNnFHLYC60HmW71W7g
+HygmGpHQSI/Xh4/Osk3z4PM3XcF3phL9n0nSVp28ET5jixdPXoqJgitq8V4BE3mz
+CfvAditTxH8YaCWhoi+yZcdcd/tUpehqdbHM5PMvZmqMQPwCN96x05SyNGNMgR4v
+R2fZT4/lhiyoP2rWkRTEfX+H9+Nej4w82gUppKEs/xQItvZfaAM2332jYXG0yJIV
+li1DjLh6mqCDtzt4wrX63UKzFHRwiUlT5UqB0eLZ5fcXuS2bJmM=
+=CsFG
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index af09a94b95dc..a7e61d23ef57 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 20 Dec 2022 13:09:53 +0000
+Tue, 20 Dec 2022 19:10:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7c9fb9587b36..dcc94cf5c80d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Dec 20 01:09:53 PM UTC 2022
+Tue Dec 20 07:10:01 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0c7671f3bf79..7d5b8b6570dd 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 20 Dec 2022 13:15:01 +0000
+Tue, 20 Dec 2022 19:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index a21d67581ccb..3d3e9964bd65 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f2aa88aebe0fccb4875448d2da1410980cf436a4 1671541315 2022-12-20T13:01:55+00:00
+d9fb1c7476b0bc902c7a67727c104eadd39afe9a 1671562885 2022-12-20T19:01:25+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d0282405f116..018762b78bd5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1671541801 Tue 20 Dec 2022 01:10:01 PM UTC
+1671563401 Tue 20 Dec 2022 07:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index af09a94b95dc..5ece73a1c728 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 20 Dec 2022 13:09:53 +0000
+Tue, 20 Dec 2022 19:10:01 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6495b4ad90fd..8eaf2dc4c916 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/angst/Manifest b/net-analyzer/angst/Manifest
deleted file mode 100644
index 1c74418f8736..000000000000
--- a/net-analyzer/angst/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0.4b-flags.patch 551 BLAKE2B f8abf1a56addf80157155dfdf1cad5f2fc49d9b554c1e65baf69a64ef90c5337522635878704fe867f51e9dcca4b46b45a9e2a6a16c36a6bf92709d32c4f3494 SHA512 4552e16344bfa8fab9952c55891ea1ecbaaeec38df4fa459959f7db54b7197282b8d6436f250002c05db5abcc75c640f87bdff66261812afa82ef8f2b6e96965
-AUX 0.4b-libnet-1.0.patch 372 BLAKE2B 56df2ea477503005c28c32bf852675fe428beb07334bce78d467fbe3977c1aec82fee34935157160fbb9563fb2a1b385e93b28e76a030496e07c86b052ef4d81 SHA512 aa135c5e1e0daf54a2ff72eff465f0f3f26e06bf7da76fca48ffb145ebfc10e09d29fa45ae0c84009ee2535a06d093e0fc0936993ab9034025e1c68136168b25
-AUX 0.4b-sysctl.h.patch 183 BLAKE2B a8eaa002d49b9072fb48f7fbea3738d94aacff831daab7f22163f8e7427d25521183123f512bc218508f63518f7ee0271520aa48b0ceb230214fc22abcb7cd96 SHA512 dbee5d362e55c8ef2cf5ec76c10bb2b305d7aeb733cd882cec9ea6ad7438a0c0fc6b025e4536e17d0962b3332e189c965c37c7df859553e476f6a77b805a0f10
-DIST angst-0.4b.tar.gz 13909 BLAKE2B f08b9e489eaec5e2006ad8d84dc7586c6fb57c3d8585fb5cd769591ed56f4e5a4c2e0bdaf0ba02b40370ea99146ebfa02611d64b043949b27f6dfcbbdd2b16e5 SHA512 5584b1dd01d781cd34b594fcc8970764874599a1f15b1185066ee21c11cde23af148270c178d6a0b3436d71955aaf1cd904703f9dfb0c75d0b70c04d394fb449
-EBUILD angst-0.4b-r3.ebuild 871 BLAKE2B 430b694b8c5093eb52934193775cb46ec0e57f9939eb201220db2649ba9fee9541fd2b1c11176a5ba62b085e92a48a275dbf3d674777ad1a5360478d1b5ccb7b SHA512 f0a337e986c893e064a064818a2a6b1644135615fce53a0572fb23dd1fb10b067c19bec37a5913553c08079f315f208f68179455942f09b153a2a693ed45a7b2
-MISC metadata.xml 356 BLAKE2B b926dc98ea0de85f7d35c7a72e9eb43250de12a8e0eede9bb9dd82fd1048b7b039bbce513f66ca1ea419d80d1c733801babddf77974f737617fa2a4d40ee7a2a SHA512 dbd36437e09dac5274aedb169d081d79d03d1e22b8a565454151d402541d8e03cbf30ed6bc1adb8e15e179b0e58e275e9e3a37277cc2f7bb4844515900ceadb3
diff --git a/net-analyzer/angst/angst-0.4b-r3.ebuild b/net-analyzer/angst/angst-0.4b-r3.ebuild
deleted file mode 100644
index 42a093440109..000000000000
--- a/net-analyzer/angst/angst-0.4b-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="an active sniffer that provides methods for aggressive sniffing on switched LANs"
-HOMEPAGE="http://angst.sourceforge.net/"
-SRC_URI="http://angst.sourceforge.net/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="debug"
-
-DEPEND="
-	net-libs/libpcap
-	net-libs/libnet:1.0
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PV}-flags.patch
-	"${FILESDIR}"/${PV}-libnet-1.0.patch
-	"${FILESDIR}"/${PV}-sysctl.h.patch
-)
-
-src_configure() {
-	append-cflags -fcommon
-	use debug && append-cppflags -DDEBUG
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		-f Makefile.linux
-}
-
-src_install() {
-	dosbin angst
-	doman angst.8
-	dodoc README TODO ChangeLog
-}
diff --git a/net-analyzer/angst/files/0.4b-flags.patch b/net-analyzer/angst/files/0.4b-flags.patch
deleted file mode 100644
index 1021faa5b539..000000000000
--- a/net-analyzer/angst/files/0.4b-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -5,7 +5,7 @@
- #
- # $Id: Makefile.linux,v 1.6 2001/02/08 13:44:12 argp Exp $
- 
--CC = gcc
-+CC ?= gcc
- INSTALL_DIR = /usr/bin/install -c -o root -g bin
- INSTALL_SBIN = /usr/bin/install -c -s -o root -g bin -m 555
- INSTALL_MAN = /usr/bin/install -c -o root -g bin -m 444
-@@ -21,7 +21,7 @@
- all:	angst
- 
- angst:	$(OBJS)
--	$(CC) $(CFLAGS) -o angst $(DEFINE) $(OBJS) $(INCLUDE) $(LIBS)
-+	$(CC) $(CFLAGS) -o angst $(DEFINE) $(LDFLAGS) $(OBJS) $(INCLUDE) $(LIBS)
- 
- clean:
- 	rm -f angst *.o missing/*.o *.core core
diff --git a/net-analyzer/angst/files/0.4b-libnet-1.0.patch b/net-analyzer/angst/files/0.4b-libnet-1.0.patch
deleted file mode 100644
index a2bcf1a18696..000000000000
--- a/net-analyzer/angst/files/0.4b-libnet-1.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -14,2 +14,2 @@
--LIBS = -L/usr/local/lib `libnet-config --libs` -lpcap
--DEFINE = `libnet-config --defines` -DLINUX #-DDEBUG
-+LIBS = -L/usr/local/lib `libnet-1.0-config --libs` -lpcap
-+DEFINE = `libnet-1.0-config --defines` -DLINUX #-DDEBUG
---- a/angst.h
-+++ b/angst.h
-@@ -12 +12 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-analyzer/angst/files/0.4b-sysctl.h.patch b/net-analyzer/angst/files/0.4b-sysctl.h.patch
deleted file mode 100644
index 16d8b53b6a3f..000000000000
--- a/net-analyzer/angst/files/0.4b-sysctl.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- angst.h
-+++ b/angst.h
-@@ -8,7 +8,9 @@
- 
- #include <stdarg.h>
- #include <sys/param.h>
-+#ifndef LINUX
- #include <sys/sysctl.h>
-+#endif
- #include <libnet-1.0.h>
- #include <pcap.h>
- 
diff --git a/net-analyzer/angst/metadata.xml b/net-analyzer/angst/metadata.xml
deleted file mode 100644
index f36942917258..000000000000
--- a/net-analyzer/angst/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>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">angst</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest
deleted file mode 100644
index 61888bd0204d..000000000000
--- a/net-analyzer/carl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e
-EBUILD carl-0.9-r5.ebuild 506 BLAKE2B 944d5dec096f0bd2bd5e1d34286a675dd021ee566bfb947e56a38b78d01a19494bbaf14974697a322eecbd6727ccbc5d6db4b7046f3652283ad1e3d6e9b427fc SHA512 1950f4688fc00e44bcd405b24882054b84f51384847689d5543b42020d09f1adb51831647bcad9a4819092f664b02a9479a43b1743ca7a4eba73f5c3c9102a23
-MISC metadata.xml 279 BLAKE2B f6f6aa89e1006ff0d57c3894fde1d9837a8b19286a8299ee3878431d45b789280e3d818dcf4ec22a013f6ef23c6da793158eefa92d058fdb0547f6a62de9a4b3 SHA512 49337b6016288844d78dbbc7c34d92e3665e3ff737782187b656784d5c1af0b5fdc0778f319dc5b1d888deb27e6d1377370f4c4bc6aa457fefabf514ea6a22e0
diff --git a/net-analyzer/carl/carl-0.9-r5.ebuild b/net-analyzer/carl/carl-0.9-r5.ebuild
deleted file mode 100644
index a8d33e657707..000000000000
--- a/net-analyzer/carl/carl-0.9-r5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="An rsync logfile analyzer"
-HOMEPAGE="https://www.schwarzvogel.de/software/misc/"
-SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 x86"
-
-DOCS="README"
-
-src_prepare() {
-	sed -i -e "s|(__version__)|\"${PVR}\"|g" setup.py || die
-	default
-}
diff --git a/net-analyzer/carl/metadata.xml b/net-analyzer/carl/metadata.xml
deleted file mode 100644
index e48a5ab0e03c..000000000000
--- a/net-analyzer/carl/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/egressor/Manifest b/net-analyzer/egressor/Manifest
deleted file mode 100644
index 7f6881364b9b..000000000000
--- a/net-analyzer/egressor/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 1.0-flags.patch 578 BLAKE2B 18df2e1acd88224555288e23f1c21dbab799b92f442a66b5f879668a10a93c42854573bba136718586a4bc5d7cdcc8fc6ba53b34a2117bb87016c9e5d1b57f51 SHA512 aecc7970d9a9e877adf750e29813ad6a685370dc9ea72f34b86a5ddbafcf616db0636b4173e4ba445ac9c3d6a21e2aae26cce1889ba901ac9dea6af79243657a
-AUX 1.0-libnet-1.0.patch 250 BLAKE2B e7790e2d6a92517e2a3ffee68aa98b894a965458f065fb5854f4b7b018c759f444c2590cd227bc139816f891d5c731409f49cc68489f9f2258a62df131ba0a01 SHA512 eff978e5c4a9a99073b1280aa5369ecbb6100364332cb810bacb3bc4ddd316638ff6a8968923b51e4f72a79ddd994646d03000b3fa3f576ad8d898eea493e089
-DIST egressor_release1.0.tar.gz 28746 BLAKE2B 224ffd1fb56d9088a66367bbd88ecaab83c2316b2614a2b5211e03c4ff07683f8584c46d6ab7f0b26cbcb87a3321d0d3789a22cfee994aca3df8c488c9a297e5 SHA512 dfb1ee553ccfb92429fe68df06db031e5cbca41fe4fda36961ba8121d79de03a7dc36febc5a58561c3de9b1412cc90811f5ddc8b156aab8282b0dc3c14cd7aec
-EBUILD egressor-1.0-r2.ebuild 797 BLAKE2B 715267f9afc94103661f8172f1575f97d1a5c9d8f07afa8a15772979d88ab72bf8c9c2b76bbc7d2c8590d9f8d09b672e4095a5a452a4e4fc5a577ba996d21d6a SHA512 fc85611405cec5c27a23986c108cd5e3a991f55bf100f1be263dce4013cb085b2d2b5bff05373cebe9459cf376a2b7e94907dce69211b7308a22c4bf645fccd6
-MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/egressor/egressor-1.0-r2.ebuild b/net-analyzer/egressor/egressor-1.0-r2.ebuild
deleted file mode 100644
index 6a3ea8056e36..000000000000
--- a/net-analyzer/egressor/egressor-1.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="tool for checking router configuration"
-HOMEPAGE="http://packetfactory.openwall.net/projects/egressor/"
-SRC_URI="http://packetfactory.openwall.net/projects/egressor/${PN}_release${PV}.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="egressor"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="
-	<net-libs/libnet-1.1
-	>=net-libs/libnet-1.0.2a-r3
-"
-RDEPEND="
-	net-libs/libpcap
-	dev-perl/Net-RawIP
-	dev-lang/perl
-"
-PATCHES=(
-	"${FILESDIR}"/${PV}-libnet-1.0.patch
-	"${FILESDIR}"/${PV}-flags.patch
-)
-
-src_compile() {
-	tc-export CC
-	emake -C client
-}
-
-src_install() {
-	dobin client/egressor server/egressor_server.pl
-	dodoc README client/README-CLIENT server/README-SERVER
-}
diff --git a/net-analyzer/egressor/files/1.0-flags.patch b/net-analyzer/egressor/files/1.0-flags.patch
deleted file mode 100644
index 03368b05dbaa..000000000000
--- a/net-analyzer/egressor/files/1.0-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/client/Makefile
-+++ b/client/Makefile
-@@ -5,8 +5,8 @@
- #----------------------------------------------------------------------
- 
- 
--CC          =   gcc
--CFLAGS      =   -O3 -funroll-loops -fomit-frame-pointer -Wall -DMD=5
-+CC          ?=   gcc
-+CFLAGS      +=   -Wall -DMD=5
- #CFLAGS2	    =   -O -DMD=5
- OBJECTS     =   egressor.o md5c.o      \
-                 
-@@ -21,7 +21,7 @@
- 
- 
- egressor:  egressor.o md5c.o
--	$(CC) egressor.o $(LIBS) -o ./egressor
-+	$(CC) $(CFLAGS) $(LDFLAGS) egressor.o $(LIBS) -o ./egressor
- 
- md5c.o: global.h md5.h
- 	$(CC) -c $(CFLAGS) md5c.c
diff --git a/net-analyzer/egressor/files/1.0-libnet-1.0.patch b/net-analyzer/egressor/files/1.0-libnet-1.0.patch
deleted file mode 100644
index be7cb4f15c6f..000000000000
--- a/net-analyzer/egressor/files/1.0-libnet-1.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/client/Makefile
-+++ b/client/Makefile
-@@ -15 +15 @@
--LIBS        =   -L../../lib/ -lnet 
-+LIBS        =   -L../../lib/ -lnet-1.0 
---- a/client/libnet_test.h
-+++ b/client/libnet_test.h
-@@ -36 +36 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-analyzer/egressor/metadata.xml b/net-analyzer/egressor/metadata.xml
deleted file mode 100644
index dce3f3be66c0..000000000000
--- a/net-analyzer/egressor/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/netdata/Manifest b/net-analyzer/netdata/Manifest
index 658cfcf22cfb..7140f028ea42 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -3,10 +3,10 @@ DIST netdata-1.36.0.tar.gz 24794657 BLAKE2B f3230f5c279a5a203f9245a1d74f254961ca
 DIST netdata-1.36.1.tar.gz 24795841 BLAKE2B e58ca0a4ffb48169833a412ca234e6d1771f5bc179010bd4ee5f597768e63c147e1d0dfd65f52579901ad42760a98de74be9417d6cf6b3a150683551399927ab SHA512 2ff01c816dbdd975450a7cebd292d9a1c6bf1822aa6efb56b846a90e5a01d1faac898e1a87b155fd6fa20f26d098e1d80042b12c0ff22b05260e14f3f552546d
 DIST netdata-1.37.0.tar.gz 25151327 BLAKE2B 7e83df21e50d721d7e8a226fbc4470972393ab086fa575298b36f5699dfa4fffa406ce8a532661b1adfb7b5755e69c227f85f7c36e96f3cc585004082c25eda2 SHA512 7234d8b414df6674e612718085f446b1321833772d2d28e01da13f1d296b772e5dc73bf39495ab9a8db7f3118f3053000c16d6b17fe2a28e8340cef0d208d4bf
 DIST netdata-1.37.1.tar.gz 25160143 BLAKE2B 9efd0edeb6d2d76338c98c794c4e81a00a951e40e9fe4682030f04c28b1a9895bac0c06a695b055ce94cbf1fb55c516364daec026759134a590e645a2c380ca6 SHA512 fa60f11b79c89fb8b1d825c7d395b294f291e6b72acb1c9b47212c145ca2e6c28b9370ebdbb1c8666884e2b714e2fd8ba498ffc6b428361b93471e4d555cdfa7
-EBUILD netdata-1.35.1.ebuild 3924 BLAKE2B 7a340e74ad2ac97b477b8c851f9f1bb6f7b069be2a00d781e57e3f491f9153643315c0ec41357adb2dae651f7d1742b937e715f6e02a442665aef0ff6e98ce8b SHA512 4ebb2128f67c80d513d4063fd1d170926340a3b1052467a6d3eff39494fa15794a0b7addcfc6d7c967b3a84a548fd23cbc08726ec14d9dddacbe6e2417cfe4f2
-EBUILD netdata-1.36.0.ebuild 3924 BLAKE2B 7a340e74ad2ac97b477b8c851f9f1bb6f7b069be2a00d781e57e3f491f9153643315c0ec41357adb2dae651f7d1742b937e715f6e02a442665aef0ff6e98ce8b SHA512 4ebb2128f67c80d513d4063fd1d170926340a3b1052467a6d3eff39494fa15794a0b7addcfc6d7c967b3a84a548fd23cbc08726ec14d9dddacbe6e2417cfe4f2
-EBUILD netdata-1.36.1-r1.ebuild 3939 BLAKE2B 4af0fc9e27b1964c76d670a3623a98c35ddb6e073a4f8dc5e4021a212ffa08222b36091a93428f6b81c8bfe2b8a759643726abe0cfc9c31cfea6182b977fe245 SHA512 3ecdacf1f79a73d4da07c409dfd739731dfacf5b05138a44c88a866fcbe6e0a286e7bd8b5c000b966fa5dac023beb0f79ed7a99afef8ea02b0728f24d9212496
-EBUILD netdata-1.37.0.ebuild 3939 BLAKE2B 4af0fc9e27b1964c76d670a3623a98c35ddb6e073a4f8dc5e4021a212ffa08222b36091a93428f6b81c8bfe2b8a759643726abe0cfc9c31cfea6182b977fe245 SHA512 3ecdacf1f79a73d4da07c409dfd739731dfacf5b05138a44c88a866fcbe6e0a286e7bd8b5c000b966fa5dac023beb0f79ed7a99afef8ea02b0728f24d9212496
-EBUILD netdata-1.37.1.ebuild 3939 BLAKE2B 4af0fc9e27b1964c76d670a3623a98c35ddb6e073a4f8dc5e4021a212ffa08222b36091a93428f6b81c8bfe2b8a759643726abe0cfc9c31cfea6182b977fe245 SHA512 3ecdacf1f79a73d4da07c409dfd739731dfacf5b05138a44c88a866fcbe6e0a286e7bd8b5c000b966fa5dac023beb0f79ed7a99afef8ea02b0728f24d9212496
-EBUILD netdata-9999.ebuild 3932 BLAKE2B e826718e33e68458671e0e53fc0caee4d2f3c9d43f40b93c5db545e20980b7666daae00d855bdd9dc5d9fc4896fabf27c5ced0b3f16b6a4561be643abfb5aaf7 SHA512 6a60a4bd493efd848f0351d1b554690873e53552c473d3ce7362f4f549d1ea051a1ae04c1728c808be5cb8365c6a170768db7edcae0a876102290a71799ed94d
-MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484
+EBUILD netdata-1.35.1.ebuild 3860 BLAKE2B 459b712cae1d92d4d1c8ca685517bd62f8958b2193ed627a54c7caa416470fb941849ce7d5d445f1c94b7a83e921e58e8d3047d486229f682cb1475192067cdd SHA512 902fe41e227c5a1e67ba7feb9aeb9ad71384a4cafa6de3fc47a0cea8e0992e93bfdbb3edf698cd196acf25695cc9877641bd021c83094516931d06106b310fbd
+EBUILD netdata-1.36.0.ebuild 3860 BLAKE2B 459b712cae1d92d4d1c8ca685517bd62f8958b2193ed627a54c7caa416470fb941849ce7d5d445f1c94b7a83e921e58e8d3047d486229f682cb1475192067cdd SHA512 902fe41e227c5a1e67ba7feb9aeb9ad71384a4cafa6de3fc47a0cea8e0992e93bfdbb3edf698cd196acf25695cc9877641bd021c83094516931d06106b310fbd
+EBUILD netdata-1.36.1-r1.ebuild 3875 BLAKE2B e72f4246abb68b3aed5d82961a5f2b1361ba70da9c43dd35ec42e504613fd5e878e45dafeccc1d10d9447ec053658d020c2c8e1f84f4dcd25be513fbcd8b896a SHA512 91d112b95a78c33bf564d75c728c9f0b72f7c052a5f0132a9ecbb7f450e9f61fcf132fb6dbe3de79f2cddde08b0c0cfc69c1b42eef52fcfa5782e92f9c4bc787
+EBUILD netdata-1.37.0.ebuild 3875 BLAKE2B e72f4246abb68b3aed5d82961a5f2b1361ba70da9c43dd35ec42e504613fd5e878e45dafeccc1d10d9447ec053658d020c2c8e1f84f4dcd25be513fbcd8b896a SHA512 91d112b95a78c33bf564d75c728c9f0b72f7c052a5f0132a9ecbb7f450e9f61fcf132fb6dbe3de79f2cddde08b0c0cfc69c1b42eef52fcfa5782e92f9c4bc787
+EBUILD netdata-1.37.1.ebuild 3875 BLAKE2B e72f4246abb68b3aed5d82961a5f2b1361ba70da9c43dd35ec42e504613fd5e878e45dafeccc1d10d9447ec053658d020c2c8e1f84f4dcd25be513fbcd8b896a SHA512 91d112b95a78c33bf564d75c728c9f0b72f7c052a5f0132a9ecbb7f450e9f61fcf132fb6dbe3de79f2cddde08b0c0cfc69c1b42eef52fcfa5782e92f9c4bc787
+EBUILD netdata-9999.ebuild 3868 BLAKE2B a6ebb3447cd87efb356a9103ea0e9367e1ee06b99e2de5c7f6f1ec6b8eb5d9a068902812b6bb019b3086153c4aef52611ae61e843f116679a0a2421f83a504b7 SHA512 ef2721a10c28e3d65862c0479d412860fa13126a6b7e2fc700ed5ece46ec94920d8a7983e0bfdbbbfad24c18298c13f5f0e6d6935ad439981a7e43a09d429673
+MISC metadata.xml 1210 BLAKE2B ac344469cba5d26dea18c43f9387c4e8de92d39dae04d70e80de49584bcfad11f01287ed6634fafb85d73acc08942a4bd250105fe0abe11ddb45da826f4f21db SHA512 ecb8c9976479a31a90789b2f6d336b533d7fe16b0995634fa3eb015e3bfbc57eeeafa91dc13c943a1cde41fd73679c55f16bd3ce749bf0f82d23899531544f3e
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
index 666206a17892..e43c89607178 100644
--- a/net-analyzer/netdata/metadata.xml
+++ b/net-analyzer/netdata/metadata.xml
@@ -11,7 +11,6 @@
     <flag name="dbengine">Enable the Netdata database engine</flag>
     <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag>
     <flag name="jsonc">Enable optimization of JSON using <pkg>dev-libs/json-c</pkg></flag>
-    <flag name="kinesis">Enable support for Amazon Kenesis as a backend</flag>
     <flag name="lto">Build with Link Time Optimization (LTO)</flag>
     <flag name="mongodb">Enable support for the mongodb backend</flag>
     <flag name="nfacct">Enable the nfacct plugin</flag>
diff --git a/net-analyzer/netdata/netdata-1.35.1.ebuild b/net-analyzer/netdata/netdata-1.35.1.ebuild
index d4f2ab18da89..e18bd1cca21c 100644
--- a/net-analyzer/netdata/netdata-1.35.1.ebuild
+++ b/net-analyzer/netdata/netdata-1.35.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.36.0.ebuild b/net-analyzer/netdata/netdata-1.36.0.ebuild
index d4f2ab18da89..e18bd1cca21c 100644
--- a/net-analyzer/netdata/netdata-1.36.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.36.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
index e4af7059cb02..0f5d872e78b0 100644
--- a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.37.0.ebuild b/net-analyzer/netdata/netdata-1.37.0.ebuild
index e4af7059cb02..0f5d872e78b0 100644
--- a/net-analyzer/netdata/netdata-1.37.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.37.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-1.37.1.ebuild b/net-analyzer/netdata/netdata-1.37.1.ebuild
index e4af7059cb02..0f5d872e78b0 100644
--- a/net-analyzer/netdata/netdata-1.37.1.ebuild
+++ b/net-analyzer/netdata/netdata-1.37.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 1c367c2b30c4..e674facfb747 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -53,7 +53,6 @@ RDEPEND="
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
 	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
@@ -109,7 +108,7 @@ src_configure() {
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis exporting-kinesis) \
+		--disable-exporting-kinesis \
 		$(use_enable lto lto) \
 		$(use_enable mongodb exporting-mongodb) \
 		$(use_enable prometheus exporting-prometheus-remote-write) \
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
deleted file mode 100644
index d9ca3990be18..000000000000
--- a/net-analyzer/prelude-correlator/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX prelude-correlator-5.2.0-fix_siteconfig.patch 333 BLAKE2B 8146762e1e277cab3ffe4517967a938083ddbda2a43f0e97c09e783094f025961a69e426adae2e0454d0a662215f3bc509d9f609995b06f13a408f4cb23964a4 SHA512 e423c37424ce80df6e448d04dd084eb40b90741a8acc35b91a1470f88d04531fedd8b8ccdbdbef3756ce5e7d285303608f8c794f2d60a00ab550b0a0f49134f8
-AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c6f46e613f2a500fb3deffa3d62861ffb41fb1dbed30126cc3cb1a7afd381632c229cc33732d6e6a627ef08ef6 SHA512 15be6f991499d6d2b72bd11cd91343a1be164c13454c702b6f42f55b69dbfdda4a380cc6f24aecbf0e9d6a2b3f21b1a947838038ad95e7d7377c3d36118f12e5
-AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51
-AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68
-DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B 9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5 SHA512 96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43
-EBUILD prelude-correlator-5.2.0.ebuild 929 BLAKE2B 6e537c11c71d2d517b166fa3b6d57bd6c46e1f46e4d4e9c270b3b8e11b637d6c538b4c81802d0ee4eac0f3c5d6d59c02962f1068f3087d3c222ee1131af6eea7 SHA512 36d0ab00c987b09563d6e3a8168a3f4a14fff004a3d1e00942a9c5772ad555ba8d7ea8fd1364649d075a26a615d34b0b1c4147288b261bcf7acbef69ac994636
-MISC metadata.xml 619 BLAKE2B 397a3f2ab9a78d9d8f0b343567ab6b1da5a955605526ce8f3adb3a4a892ff58032dfca025d198e6be08395af3865a2d09e08fed3a503747b2a9cebe05838c56c SHA512 c50ad9083696ecf370f1a8a03ca5021131c6f8942ca04654160c97248f2253a5cd934ba1d76e84a0cb4214cfc80e627a202382e09546d8bbebfee74c3ec0958a
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch b/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch
deleted file mode 100644
index cdb55dfbac95..000000000000
--- a/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py	2020-09-29 00:30:57.407653336 +0200
-+++ b/setup.py	2020-09-29 00:41:37.813997273 +0200
-@@ -67,6 +67,7 @@
- 
- class my_install(install):
-     def run(self):
-+        self.skip_build = 0
-         for dirname, flist in self.distribution.data_files:
-             prefix = self.prefix
-             if self.prefix == "/usr":
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.initd b/net-analyzer/prelude-correlator/files/prelude-correlator.initd
deleted file mode 100644
index 6e75689ca03c..000000000000
--- a/net-analyzer/prelude-correlator/files/prelude-correlator.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BIN_CORRELATOR=/usr/bin/prelude-correlator
-PID_CORRELATOR=/run/prelude-correlator/prelude-correlator.pid
-
-depend() {
-  need net
-  after prelude-manager
-}
-
-start() {
-  ebegin "Starting prelude-correlator"
-  checkpath -d -m 0755 -o root:root /run/prelude-correlator
-  start-stop-daemon --start --exec $BIN_CORRELATOR \
-    --pidfile $PID_CORRELATOR -- -d -P $PID_CORRELATOR
-  eend $?
-}
-
-stop() {
-  ebegin "Stopping prelude-correlator"
-  start-stop-daemon --stop --exec $BIN_CORRELATOR \
-    --pidfile $PID_CORRELATOR
-  eend $?
-}
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.run b/net-analyzer/prelude-correlator/files/prelude-correlator.run
deleted file mode 100644
index 8bec03f78704..000000000000
--- a/net-analyzer/prelude-correlator/files/prelude-correlator.run
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configuration to create /run/prelude-correlator directory
-# Used as part of systemd's tmpfiles
-
-d /run/prelude-correlator 0755 root root
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.service b/net-analyzer/prelude-correlator/files/prelude-correlator.service
deleted file mode 100644
index 7b763c30c13a..000000000000
--- a/net-analyzer/prelude-correlator/files/prelude-correlator.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Prelude-Correlator service
-DefaultDependencies=no
-After=remote_fs.target prelude-manager.service
-
-[Service]
-ExecStart=/usr/bin/prelude-correlator -d -P /run/prelude-correlator/prelude-correlator.pid
-Type=forking
-PIDFile=/run/prelude-correlator/prelude-correlator.pid
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/prelude-correlator/metadata.xml b/net-analyzer/prelude-correlator/metadata.xml
deleted file mode 100644
index e5b33cb13b41..000000000000
--- a/net-analyzer/prelude-correlator/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Prelude-Correlator allows conducting multi-stream correlations
-		thanks to a powerful programming language for writing correlation
-		rules. With any type of alert able to be correlated, event
-		analysis becomes simpler, quicker and more incisive. This
-		correlation alert then appears within the Prewikka interface
-		and indicates the potential target information via the set of
-		correlation rules.
-	</longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
deleted file mode 100644
index e317719f5e8f..000000000000
--- a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 systemd tmpfiles
-
-DESCRIPTION="Real time correlator of events received by Prelude Manager"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/libprelude-5.2.0[python,${PYTHON_USEDEP}]
-	<dev-libs/libprelude-6[python,${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.2.0-fix_siteconfig.patch"
-)
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/${PN}
-	keepdir /var/spool/prelude/prelude-correlator
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest
deleted file mode 100644
index 3e8d74906dfa..000000000000
--- a/net-analyzer/prelude-lml-rules/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST prelude-lml-rules-5.2.0.tar.gz 117046 BLAKE2B e0c8e6477497304dfc36c8abf93bd0bea7b86920652786ebfe84df391129b9a4ba76fc8c9fcf3ac817a805924a6626afa6f115c602f73519fc3271ed405ef4bf SHA512 d15a9e90e15cf484d4f2bf53005fe8b37bbf582d6b65f30a010e77290a56c0439b24322be948f7d096b92d1a5cf72a6dc3a0ee1495486840fa0bab603bbeeeeb
-EBUILD prelude-lml-rules-5.2.0.ebuild 454 BLAKE2B 75c99496782211e32b39a5e4a9f7e59250a6a256bc5b7d6a4b11e8a761bbdfdc6df8b94a85996d6e2a739097ca6071f01e9d24d2869b4c94919c75d16e2debd7 SHA512 c51f4cb871fcbbeabf8835d4661c0450b21fdf1ff55f68b47f94f36bcef114d9d0a26abb5068ad12c7f58d373264decec5cc9d544b7386b522cc3e518580b038
-MISC metadata.xml 169 BLAKE2B f97e770609744c72ba2fc05bac60582959f25c4cf8dd7b0f65208fc7078770bbab6cc11db8894b6aa4362c1f2b6ab54ffd925ced1dc796cd02d8528882f9d454 SHA512 7a46ba961797f936df2f35f0796a6d474ad8bc992faae5be38f0050b22a6fde87decb42a148c235e0803b99a6f0b3c390aa21b6c2463f6b5fdaa91f9f76ebd60
diff --git a/net-analyzer/prelude-lml-rules/metadata.xml b/net-analyzer/prelude-lml-rules/metadata.xml
deleted file mode 100644
index fcf1cd64f680..000000000000
--- a/net-analyzer/prelude-lml-rules/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-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild
deleted file mode 100644
index e93bb67f9786..000000000000
--- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Prelude LML community ruleset"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~net-analyzer/prelude-lml-${PV}"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto "/etc/prelude-lml/ruleset"
-	doins ruleset/*.rules
-}
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
deleted file mode 100644
index c63517de92bf..000000000000
--- a/net-analyzer/prelude-lml/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX prelude-lml-3.0.0-conf.patch 716 BLAKE2B 0d25e6d9bd4a884be7b3143fbe4207e7fb8ef4ced40d0a145108cdbeb132a4c8453df17ab0de029e007f77b041c8c1c80422a64111ac17ae48484e17e2656acb SHA512 6394d55bcbc68971ec35161618bb6c7ccde0aa1e9ae2149b38f41117ddd2559ce5992803be7209d34ac20e2c5c30970bd34d39b1e510ed34655d345a3bf0c6e5
-AUX prelude-lml-3.1.0-run.patch 551 BLAKE2B 53ab37798c7d3efef60d3186ba8183a2b5fb9fc67ae7a0d1316359615838ae0e4e632a4f00a2dfd149dadb4b827c2b2ad7f32597ba8e0169de3ff96871e4f7e7 SHA512 20614c83925ec233d2fc5bf1c30df8b17031eb0448ef39095de6bce0c1ea489c82c542eb6b684afd26f05d6bc8f68ff5b6c0d04030de60036ef8bd2ed24a91d0
-AUX prelude-lml.initd 563 BLAKE2B 3a914e5cb52d2f137e6dbbd4a66e8de280ebad362b80e1dafb3c7df3d9cff1798421fec2d62b65c5324a4fa810616d69225b4b512ea2b9209a81e79f20c90c55 SHA512 b49cac24757000932e0d0ef8b98ab543d12b3efef0944f57f6c6bb23c04473d2a1cfbeccaaffb456e4d5306c12b412a1809aacae00edf535a7f3d944dcef10ec
-AUX prelude-lml.run 125 BLAKE2B 79cab33e4b7f2508d621cef7342d34042e5841a73c2e75aae447870eb8ca8c7b8acd21e0664753511f7d659eb70d4f5ae80e20dcbed7addefd5d97967265fd3d SHA512 876f3c9c2c005cf146590e3c8718ae4fc04f80594ad2f279f6794e035a8ebed6b6499c6d8ac8268e8c953e615a79743eb24bf992a9857a743f75ca253aab95ad
-AUX prelude-lml.service 297 BLAKE2B c1ecbb3f69c21ccd82f7c985598a3cfcf5313d9004d9bc1b9f7dc911b54a51ae1aa0870c5fe236ef1473254196aec34391b838d928bb3c0d1e7ee92f131abcd5 SHA512 0faa91b3736fe111b08fdd3f03829c35a81133cfc54e677ebc423d4d9a29113744253fbee12f9b531494f2f39b549df54eec4cc5c7363375443113277fead87a
-DIST prelude-lml-5.2.0.tar.gz 1584414 BLAKE2B c97a730e366cdf0663ad6393acc0125d01995bd1339f4538a1dd62c2aa85e46dd78e3e279067a2bac328db675b5de59cebb8474bdafbe00d745320d360124535 SHA512 45de2dea196941086a690b3081b98253a3d9685552a25f39cf3b92d3b223c5a9d98057f855da1f23fff7aa425fd832e6021050d2d7fe58322c4f3f48c34394b5
-EBUILD prelude-lml-5.2.0.ebuild 1166 BLAKE2B 5efaa9bc573a8af072bb2727886c9e49fa10e222fd5b1793d4d884b4c51fa5629396c6e95fc2681a85e4c6a74ea09f61a9caeb19824be7e570af5781da5163e1 SHA512 be81fec712f3076160d5d584173f0f1edbe564b755523985e5236d2c04316ec1e6e6ab8a77d3f75346dec1a1f89809a07af5c9b4459af00b71e57ae4378c92f1
-MISC metadata.xml 530 BLAKE2B b6ffadec6e37f5d7699b1906a79b4eb7597b72ff5e0e55435ec8b32c8786f645129abfe3e4277b814c0b4be9f2351fcc64d601d30f99c4602abae50e8bbd4eb5 SHA512 24f7464944a7ace53050d99d83663aaed86eb449026311ea8dab2ee9385d2cfa96c3bfac48446ec6917a637d439d8455679f5ff30a5ff1d54913fc8312d18b91
diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch
deleted file mode 100644
index dab4ea8a6bb1..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/prelude-lml.conf
-+++ b/prelude-lml.conf
-@@ -92,7 +92,7 @@
- time-format = "%b %d %H:%M:%S"
- prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?"
- file = /var/log/messages
--file = /var/log/secure
-+file = /var/log/auth.log
- # udp-server = 0.0.0.0
- # tcp-server = 0.0.0.0
- # tcp-tls-server = 0.0.0.0
---- a/prelude-lml.conf.in
-+++ b/prelude-lml.conf.in
-@@ -92,7 +92,7 @@
- time-format = "%b %d %H:%M:%S"
- prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?"
- file = /var/log/messages
--file = /var/log/secure
-+file = /var/log/auth.log
- # udp-server = 0.0.0.0
- # tcp-server = 0.0.0.0
- # tcp-tls-server = 0.0.0.0
diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch
deleted file mode 100644
index a9eba7760d36..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -209,9 +209,9 @@
- configdir=$SYSCONFDIR/prelude-lml
- prelude_lml_conf=$configdir/prelude-lml.conf
- regex_conf=$configdir/plugins.rules
--metadata_dir=$LOCALSTATEDIR/lib/prelude-lml
-+metadata_dir=$LOCALSTATEDIR/prelude-lml
- plugindir=$LIBDIR/prelude-lml
--lml_run_dir=$LOCALSTATEDIR/run/prelude-lml
-+lml_run_dir=/run/prelude-lml
- 
- AC_DEFINE_UNQUOTED(PRELUDE_LML_CONF, "$prelude_lml_conf", Path to the LML configuration file)
- AC_DEFINE_UNQUOTED(LOG_PLUGIN_DIR, "$plugindir", Prelude-LML report plugin directory)
diff --git a/net-analyzer/prelude-lml/files/prelude-lml.initd b/net-analyzer/prelude-lml/files/prelude-lml.initd
deleted file mode 100644
index 0e1dd2e0f4fc..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BIN_LML=/usr/bin/prelude-lml
-PID_LML=/run/prelude-lml/prelude-lml.pid
-
-depend() {
-  need net
-  after prelude-manager
-}
-
-start() {
-  ebegin "Starting prelude-lml"
-  checkpath -d -m 0755 -o root:root /run/prelude-lml
-  start-stop-daemon --start --exec $BIN_LML \
-    --pidfile $PID_LML -- -d -P $PID_LML
-  eend $?
-}
-
-stop() {
-  ebegin "Stopping prelude-lml"
-  start-stop-daemon --stop --exec $BIN_LML \
-    --pidfile $PID_LML
-  eend $?
-}
diff --git a/net-analyzer/prelude-lml/files/prelude-lml.run b/net-analyzer/prelude-lml/files/prelude-lml.run
deleted file mode 100644
index 75f2ef89adda..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml.run
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configuration to create /run/prelude-lml directory
-# Used as part of systemd's tmpfiles
-
-d /run/prelude-lml 0755 root root
diff --git a/net-analyzer/prelude-lml/files/prelude-lml.service b/net-analyzer/prelude-lml/files/prelude-lml.service
deleted file mode 100644
index 9d9230c6ff4c..000000000000
--- a/net-analyzer/prelude-lml/files/prelude-lml.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Prelude-LML service
-DefaultDependencies=no
-After=remote_fs.target prelude-manager.service
-
-[Service]
-ExecStart=/usr/bin/prelude-lml -d -P /run/prelude-lml/prelude-lml.pid
-Type=forking
-PIDFile=/run/prelude-lml/prelude-lml.pid
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/prelude-lml/metadata.xml b/net-analyzer/prelude-lml/metadata.xml
deleted file mode 100644
index 60708d8389e8..000000000000
--- a/net-analyzer/prelude-lml/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Prelude-LML is a log analyser that allows Prelude to collect and
-		analyze information from all kind of applications emitting logs or
-		syslog messages in order to detect suspicious activities and transform
-		them into Prelude-IDMEF alerts. Prelude-LML handles events generated
-		by a large set of applications
-	</longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild
deleted file mode 100644
index 554623ae6606..000000000000
--- a/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="The prelude log analyzer"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="icu ssl"
-
-RDEPEND="dev-libs/libpcre
-	>=dev-libs/libprelude-5.2.0
-	<dev-libs/libprelude-6
-	icu? ( dev-libs/icu:= )
-	ssl? ( net-libs/gnutls:= )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-run.patch"
-	"${FILESDIR}/${PN}-3.0.0-conf.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		$(use_with ssl libgnutls-prefix)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	rm -rv "${ED}/run" || die "rm failed"
-	keepdir /var/${PN}
-	keepdir /var/spool/prelude/prelude-lml
-
-	find "${D}" -name '*.la' -delete || die
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-}
diff --git a/net-analyzer/thcrut/Manifest b/net-analyzer/thcrut/Manifest
deleted file mode 100644
index 20ed95dc7c06..000000000000
--- a/net-analyzer/thcrut/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX thcrut-1.2.5-configure.patch 2088 BLAKE2B 413e67d125ac4dcf086b06a63519d79d4d049ee6d94455f20a74c02a1ef9a2c8c9be99a268febe14ae2eab6c7a7c4d61a9861d2b6c4cd71f4ba5067ffb4b9c1e SHA512 0d3e77959f534d3231037c0cb71e602842f19dbbf33864100b854931ceb3b47c95017dc84f5f6b557562c338864f8809e20f96ff7f7fa88dafb930a443056d3a
-AUX thcrut-1.2.5-flags.patch 246 BLAKE2B ab0cc5cc76bc4635e68d0c7ca5f4d1f9595c308fee387d0579107be9a295c88e100f6a2157b9503dff5185ac1a2d270cc116230645491535436fbd94d3e337f2 SHA512 4ebfafb9f9d9610b1ed695ca471f5a5284d06069db7a9635bdf29a72032c052f8e60688853048ee7ef90c2c99c3e34a4dcce0b88d2f1e1716a1a4ec3411578d6
-AUX thcrut-1.2.5-fno-common.patch 480 BLAKE2B 745161f671fa666661064b5ad62808ed561be1e4d0ba3d533ee3f67d0d27c8bba821ff966d2fdb5d37e4ea1a4a059b437f99b09be5e5a792ec2937ab99bb67a0 SHA512 c238316e56a225633a5665199c392916dfb6fedbe53f3d1bb763d39c318db753a16b6b91250ff0a93041f4f0e7b55669095431f852c97b7a90cfb65bb4dafe17
-AUX thcrut-1.2.5-libnet.patch 1344 BLAKE2B 1b996af83b2db43dbf1528e3de7fcfc20397b4a1d5f4a033e506e5567c40d639fb0734f86d5cf26cca59ca833d85174b58bd8ff893635c76345e217f0b92773f SHA512 412f925820c3aab4333ee56d7a0d697ebd278225cd90cf0e7abe5edae363faa95c3ff450b5311ddb05e12b2839b99a850a4a7f1a0cc7ce51c6c53c1c56874b07
-DIST thcrut-1.2.5.tar.gz 667929 BLAKE2B c7b5f252006ab06a6886efe82a6d9438df3fe3c61b277bc725f2d8a7ba7f86488b89e0254dfa53f16b5f14f9e0f58bb247e6697db10f1e5e87625322ae633ae4 SHA512 cbef051f0e668e57e13cd3435c109c01aac66a31d5c7a6a1b60a7767fb740d50489c9caefeb8a188d803d5ee3a22e5b7cedf425462a9424ace2dbc2dfe0dda39
-EBUILD thcrut-1.2.5-r2.ebuild 757 BLAKE2B 11c2b66b4f194b53ce010771bb41bbeb04f7c10c3c0e44bf5bf46702ce62ae8ff7f999f80cdd7a6ded964e2365b71cde05fcd8c5d5763f12689aab657969e095 SHA512 a3f96c49d51cf08008317668cd509b6ac424ce022337a891cdab515b9b1a2dbf96df9321897bac4efd6e59a4f0c36a39a71aeedaa63fad766f789ece0f9cdca7
-MISC metadata.xml 367 BLAKE2B 0c4e99f47a17490bed90f97d4e81750952fe079f3cbdca4b0aae7a34e40a255949eac94b7d0a1cb848cea8c80a05a1477230dea2fd2091d2af94887c352a5946 SHA512 98e4882394c8b9e1cba204dfefac51c9069e790d7a516c29097a050eada6ce265d1aa3ef34a3e1e7743d4fb288a57eb6e8b7117459efac4cd091016e090f43ec
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch
deleted file mode 100644
index daa069e22afd..000000000000
--- a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -153,10 +153,8 @@
- dnl libnet_init_packet only available in < libnet-1.1.x
- dnl AC_CHECK_LIB(net, libnet_init_packet,, AC_MSG_ERROR(We need libnet.
- dnl Get libnet from http://www.packetfactory.net or try --with-[[libs,includes]]=DIR))
--AC_CHECK_LIB(net, libnet_init_packet, [NET=yes], [NET=no])
-+AC_CHECK_LIB(net-1.0, libnet_init_packet, [NET=yes], [NET=no])
- if test x"$NET" = x"no" -o x"$DIST" = x"yes"; then
--	AC_CONFIG_SUBDIRS(Libnet-1.0.2a)
--	THCRUT_SUBDIRS="$THCRUT_SUBDIRS Libnet-1.0.2a"
- 	CPPFLAGS="-I../Libnet-1.0.2a/include ${CPPFLAGS}"
- 	LDFLAGS="-L../Libnet-1.0.2a/src ${LDFLAGS}"
- 	PRG_LIBNET_CONFIG_CFLAGS="../Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '"
-@@ -164,14 +162,12 @@
- 	dnl CFLAGS="`${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
- 	dnl LIBS="`${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS"
- else
--	CFLAGS="`libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
--	LIBS="`libnet-config --libs` $LIBS"
-+	CFLAGS="`libnet-1.0-config --cflags --defines | tr '\n' ' '` $CFLAGS"
-+	LIBS="`libnet-1.0-config --libs` $LIBS"
- fi
- 
- AC_CHECK_LIB(pcre, pcre_compile, [PCRE=yes], [PCRE=no])
- if test x"$PCRE" = x"no" -o x"$DIST" = x"yes"; then
--	AC_CONFIG_SUBDIRS(pcre-3.9)
--	THCRUT_SUBDIRS="$THCRUT_SUBDIRS pcre-3.9"
- 	CPPFLAGS="-I../pcre-3.9 ${CPPFLAGS}"
- 	LDFLAGS="-L../pcre-3.9 ${LDFLAGS}"
- 	PRG_PCRE_CONFIG_CFLAGS="../pcre-3.9/pcre-config --cflags"
-@@ -199,8 +195,8 @@
- AC_OUTPUT(Makefile src/Makefile)
- 
- dnl Just to show the correct values...
--CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
--LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS"
-+CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS"
-+LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `libnet-config --libs` $LIBS"
- 
- echo "THCrut has been configured with the following options:"
- echo "                 User binaries: $B"
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch
deleted file mode 100644
index 0a6bcaf4ebce..000000000000
--- a/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -23,7 +23,7 @@
- dnl
- dnl Use these compiler flags if we have gcc.
- dnl
--if test $ac_cv_prog_gcc = yes; then
-+if test $ac_cv_prog_gcc_not_on_gentoo = yes; then
-   CCOPTS='-O2 -Wall'
-   CFLAGS="$CCOPTS"
- fi
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch
deleted file mode 100644
index a934048f341e..000000000000
--- a/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/discover_dispatch.c
-+++ b/src/discover_dispatch.c
-@@ -81,7 +81,6 @@
- 
- unsigned short ip_tcp_sync_chksum;
- unsigned short ip_tcp_fp_chksum;
--struct sockaddr_in ip_tcp_sync_addr;
- static dispatch_func_recv_t dispatch_funcs[] = {
- 	dis_recvdummy,
- 	dis_recv,
---- a/src/discover_main.c
-+++ b/src/discover_main.c
-@@ -22,7 +22,6 @@
- extern struct _opt opt;
- extern char ip_tcp_sync[];
- 
--struct sockaddr_in ip_tcp_sync_addr;
- int rawsox;
- 
- #define DFL_HOSTS_PARALLEL	(5000)
diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch
deleted file mode 100644
index 87488c8c5196..000000000000
--- a/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/src/arp_main.c
-+++ b/src/arp_main.c
-@@ -18 +18 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/arpg.c
-+++ b/src/arpg.c
-@@ -12 +12 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/dhcp_main.c
-+++ b/src/dhcp_main.c
-@@ -14 +14 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/discover_dispatch.c
-+++ b/src/discover_dispatch.c
-@@ -10 +10 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/discover_main.c
-+++ b/src/discover_main.c
-@@ -8 +8 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/fp.h
-+++ b/src/fp.h
-@@ -10 +10 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/icmp_main.c
-+++ b/src/icmp_main.c
-@@ -14 +14 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/network_raw.c
-+++ b/src/network_raw.c
-@@ -10 +10 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/packets.c
-+++ b/src/packets.c
-@@ -6 +6 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/thcrut.c
-+++ b/src/thcrut.c
-@@ -87 +87 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/thcrut.h
-+++ b/src/thcrut.h
-@@ -7 +7 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/thcrut_libnet.c
-+++ b/src/thcrut_libnet.c
-@@ -5 +5 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/thcrut_libnet.h
-+++ b/src/thcrut_libnet.h
-@@ -5 +5 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-analyzer/thcrut/metadata.xml b/net-analyzer/thcrut/metadata.xml
deleted file mode 100644
index 1e77e950754e..000000000000
--- a/net-analyzer/thcrut/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>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">hackerschoice/thc-rut</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
deleted file mode 100644
index 0e41e8ac8281..000000000000
--- a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Network discovery and fingerprinting tool"
-HOMEPAGE="http://www.thc.org/thc-rut/"
-SRC_URI="https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/${P}.tar.gz"
-
-LICENSE="free-noncomm PCRE GPL-1+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-DEPEND="
-	dev-libs/libpcre
-	net-libs/libnet:1.0
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-DOCS=( ChangeLog FAQ README TODO thcrutlogo.txt )
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-libnet.patch
-)
-
-src_prepare() {
-	rm -r Libnet-1.0.2a pcre-3.9 || die
-	default
-	eautoreconf
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index dc1344fc7286..285d199fce01 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnshijacker/Manifest b/net-dns/dnshijacker/Manifest
deleted file mode 100644
index f08097f69530..000000000000
--- a/net-dns/dnshijacker/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dnshijacker-1.3-gentoo.patch 1697 BLAKE2B 43fab06def7ae88def968fd2848f2905ba19a85cfa078917af6f3b64e2e414c89880f43a9c4b28ee9c1df9b1df7c127cf65cb91472799307669b6a9bc17ebf0d SHA512 37fb70e9616690b5da2edd111230647787b5e011a564cc34411bf65e7d198225028a7406fdb885aa092f533b64d038c40db412a9979c47eed491a93fa421b339
-DIST dnshijacker-1.3.tar.gz 23569 BLAKE2B cd7631f94b5048ab6bbf8afe8fa27f0c2eb0b4295e7d4cbcf43907f32155a0c32a9ac589a75e9ddadc00f4a879239e16ef90289caaacd3f2a7a41e94366685a9 SHA512 628d545f1b6345e641254519cbb696ae2a38e218a5129558dae404d0ef374afdabf06c63775d5bc5d2d020de3bf339342c7e1a1b10beed4beadb703ff63c693d
-EBUILD dnshijacker-1.3-r2.ebuild 641 BLAKE2B 118f10ba8983c983fc3c3838eb56ca38efd6d8394faeaa070a851a2f4ea25e1d06c867ff5f75a6594ed9094dce6a068cb7cbebdc3a1fad408cb2d39ba53c96a5 SHA512 f99b784e04afcc43a268bec052e13e02ee3d59676dd95bf9687d7f6e762ea64034c753a352bb1c9af12f5a8670aaba9e08d766b0ef4aa46346873a2309176af4
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild b/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
deleted file mode 100644
index 9d14969ff47d..000000000000
--- a/net-dns/dnshijacker/dnshijacker-1.3-r2.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="a libnet/libpcap based packet sniffer and spoofer"
-HOMEPAGE="http://pedram.redhive.com/code/dns_hijacker/"
-SRC_URI="http://pedram.redhive.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-DEPEND="
-	>=net-libs/libnet-1.0.2a-r3:1.0
-	net-libs/libpcap
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dosbin dnshijacker ask_dns answer_dns
-
-	insinto /etc/dnshijacker
-	doins ftable
-
-	einstalldocs
-}
diff --git a/net-dns/dnshijacker/files/dnshijacker-1.3-gentoo.patch b/net-dns/dnshijacker/files/dnshijacker-1.3-gentoo.patch
deleted file mode 100644
index 9af952067618..000000000000
--- a/net-dns/dnshijacker/files/dnshijacker-1.3-gentoo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/answer_dns.c	2002-10-28 02:58:37.000000000 +0100
-+++ b/answer_dns.c	2010-09-19 01:16:28.000000000 +0200
-@@ -5 +5 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/ask_dns.c	2002-10-28 02:58:34.000000000 +0100
-+++ b/ask_dns.c	2010-09-19 01:16:28.000000000 +0200
-@@ -5 +5 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/dnshijacker.h	2002-11-18 05:21:48.000000000 +0100
-+++ b/dnshijacker.h	2010-09-19 01:16:28.000000000 +0200
-@@ -10 +10 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
-@@ -12 +12 @@
--
-+#include <resolv.h>
---- a/Makefile	2002-12-02 01:51:09.000000000 +0100
-+++ b/Makefile	2010-09-19 01:16:28.000000000 +0200
-@@ -4 +4 @@
--	gcc ask_dns.c -lnet `libnet-config --defines` -o ask_dns
-+	$(CC) $(CFLAGS) $(LDFLAGS) ask_dns.c -lnet-1.0 `libnet-1.0-config --defines` -o ask_dns
-@@ -7 +7 @@
--	gcc answer_dns.c -lnet `libnet-config --defines` -o answer_dns
-+	$(CC) $(CFLAGS) $(LDFLAGS) answer_dns.c -lnet-1.0 `libnet-1.0-config --defines` -o answer_dns
-@@ -10 +10 @@
--	gcc dnshijacker.c -lpcap -lnet -lresolv `libnet-config --defines` -o dnshijacker
-+	$(CC) $(CFLAGS) $(LDFLAGS) dnshijacker.c -lpcap -lnet-1.0 -lresolv `libnet-1.0-config --defines` -o dnshijacker
-@@ -13 +13 @@
--	gcc dnshijacker.c -lpcap -lnet -lresolv `libnet-config --defines` -o dnshijacker -DDEBUG -ggdb
-+	$(CC) $(CFLAGS) $(LDFLAGS) dnshijacker.c -lpcap -lnet-1.0 -lresolv `libnet-1.0-config --defines` -o dnshijacker -DDEBUG -ggdb
---- a/README	2002-10-30 06:12:09.000000000 +0100
-+++ b/README	2010-09-19 01:16:28.000000000 +0200
-@@ -61 +61 @@
--	gcc dnshijacker.c -lpcap -lnet `libnet-config --defines` -o dnshijacker
-+	gcc dnshijacker.c -lpcap -lnet-1.0 `libnet-1.0-config --defines` -o dnshijacker
diff --git a/net-dns/dnshijacker/metadata.xml b/net-dns/dnshijacker/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-dns/dnshijacker/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-dns/dnssec-check/Manifest b/net-dns/dnssec-check/Manifest
deleted file mode 100644
index 62069ca8c313..000000000000
--- a/net-dns/dnssec-check/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dnssec-check-2.2.tar.gz 174081 BLAKE2B ba150154448e2ac93e1a334165406c78d83bf1e9df53617161dc39fa6d5524bbd18e02659241cffa38a98ca76fb7ac2bad3c71c3896e2eb4f6cc86dd0f9b741c SHA512 8c417d2ee04e4f05b0a8978560ada0167e8d7cd0ae3bc365e83adb4ff06bd0526a25a971c7663651b38b53c4982f4406afddb0310bde10cc8c83dbc8da14aca5
-EBUILD dnssec-check-2.2.ebuild 674 BLAKE2B 7a0a3ae463ecd7209153fc5399f050a8f37242637fd67506d9380d9d0006f21fb4f9e62c204f723a0da710f02759e5d5d8a167e04058f6ae874fe738359fe997 SHA512 38b96f5478edd3c8c0ec61bf2fc5a3cd9e181634871be0aeafe7caded1c78c096df92bd4bd4c1ad1700fc85f2ab63cd2ffc1affd59f5d9e46d35fc95016246f9
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-dns/dnssec-check/dnssec-check-2.2.ebuild b/net-dns/dnssec-check/dnssec-check-2.2.ebuild
deleted file mode 100644
index d5e58b4805f9..000000000000
--- a/net-dns/dnssec-check/dnssec-check-2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-
-DESCRIPTION="Tests local resolver for support of DNSSEC validation"
-HOMEPAGE="https://www.dnssec-tools.org"
-SRC_URI="https://www.dnssec-tools.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtdeclarative:5
-	net-dns/dnssec-validator[threads]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e '/Exec=/s:/opt::' -i ${PN}.desktop || die
-}
-
-src_configure() {
-	eqmake5 ${PN}.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}/usr" install
-
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-}
diff --git a/net-dns/dnssec-check/metadata.xml b/net-dns/dnssec-check/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-dns/dnssec-check/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-firewall/Manifest.gz b/net-firewall/Manifest.gz
index ad03ffca4a47..251f8f204b06 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/nufw/Manifest b/net-firewall/nufw/Manifest
index 797f5e59ca2c..c69a72b57ce9 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -5,5 +5,5 @@ AUX nufw-2.2.22-var-run.patch 1438 BLAKE2B 259d96d3a7386ac30f4ca7a88ecb0a4714b04
 AUX nufw-conf.d 122 BLAKE2B 3263b28a9a783f35920a30cb022fe86b8a0fdc05b45c5a191e53c0b201ca38da9fe9eeda82866cf69dc760e0ff2fcd0264ee17f53f03a6077b63d9fcbd2dd1f0 SHA512 df48fc1843bf07e7ccfacd647caafc43752fdfa76da09a89d9ec0d76b79746c60c70f68c004c7e37899f195ae63adefc7d1c1b2c7b41da27911eb4cdc54212fb
 AUX nufw-init.d 273 BLAKE2B 00827d4cf93b484c6563b7bccc4020e9de0e8f2652eb29f9b1a64dfb4333b7e04b370f977a43a8f9af4b680d62e658a7779822c6671059e83a5ceea7f1872f5e SHA512 7f8b16532ae74b6aae8a9c7ef4a7509b66253f03a47c8ee521163a35db525e8c25b091289e10337307906a27e0aba558bd2a28dc0b91cbc09ce17ba78002d0e1
 DIST nufw-2.2.22.tar.bz2 597491 BLAKE2B 4c3092aeaced237ceb9faa16cff275938de23cdca31d2d6f6406238a0fe75ad15468f91a80b1d6e0bfc6dac520b6331ee19a1d95a006d591b891b91aad6caa8b SHA512 cc9f43b9ebf6aabbab4c83799ca1735fc456c085959cfb24d17571302c71518660424195b2cc62ed615f811bd6b3c45e1b99db99138d1caa6a744370775acaee
-EBUILD nufw-2.2.22-r4.ebuild 2698 BLAKE2B f399cc468ab34cbf150701531c82e8eecf4f0a38e32be3ba35b2849e731d32fdc43219d2fe82637102cc9a0ee81f470d62581b16a9674658c402622997511cc5 SHA512 c3b29e62f96875483943227b118fbbbf4532403d991807b47368f3e49768f92d674c8f95fd226bc3deb8f4929f2b8d27fdb54a2ea1e4d081eb6327cc5f59206a
-MISC metadata.xml 640 BLAKE2B c06edc5ba48c7b4447ff1c823f54dcea87f56a727a11d77c33e348a516d904a3d08cb2657090a8acfee0f985b45898c4469db865dec5ae5faa39738e4c7106c1 SHA512 0db8eb5af7d4b1fb42189b30b303314cdc0beedb7a85962f3539a446751e8f6d2c298bfc2e33d6bf806b2543e1ef0631b98c1f447cca42302845376324828fef
+EBUILD nufw-2.2.22-r4.ebuild 2646 BLAKE2B 2555810578bd2e1240681c1cb3b6488e477d9b1c05d9c9a1cbc978dc25fa8d7c4c003a17612fff327960ac6d7acc6b939f954a1385cacb7de6be0cb912ddf733 SHA512 e2c730ca003430d382c20cbe46676b933970f66d30e031b4bb4f0542058f6ccf93d58954f333f72892ad6291670f43cd9dff8a39a05293c0cdcf3861d8963e3c
+MISC metadata.xml 548 BLAKE2B 5aedb4f7abd13f6eba1a5066c2e8f285b19485a374a1bd2a7f5500f0fa5da663d0db1409fcbda1a82980c55f116e08cbd35fed8761f9a7bd97f8124d80838df1 SHA512 90887060aa87fc5e623e92eef107ec30f7249996d5283de0c638cba717d709c23859b1cf2e08b1565add6b7e2a9ecd4d0e3071d72577a0b9bc812d4602fe0801
diff --git a/net-firewall/nufw/metadata.xml b/net-firewall/nufw/metadata.xml
index d73e95444909..2187d537f3cb 100644
--- a/net-firewall/nufw/metadata.xml
+++ b/net-firewall/nufw/metadata.xml
@@ -10,6 +10,5 @@
 <flag name="nfqueue">Use NFQUEUE instead of QUEUE</flag>
 <flag name="pam_nuauth">Add support for pam nufw from PAM</flag>
 <flag name="plaintext">Add support for authentication with plaintext files</flag>
-<flag name="prelude">Add support/bindings for the Prelude Intrusion Detection System</flag>
 </use>
 </pkgmetadata>
diff --git a/net-firewall/nufw/nufw-2.2.22-r4.ebuild b/net-firewall/nufw/nufw-2.2.22-r4.ebuild
index 2e174388eae4..d5607a7b2b80 100644
--- a/net-firewall/nufw/nufw-2.2.22-r4.ebuild
+++ b/net-firewall/nufw/nufw-2.2.22-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.nufw.org/attachments/download/39/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test"
+IUSE="debug ldap mysql pam pam_nuauth plaintext postgres unicode nfqueue nfconntrack static syslog test"
 
 REQUIRED_USE="pam_nuauth? ( plaintext )"
 DEPEND="
@@ -30,7 +30,6 @@ DEPEND="
 	pam? ( sys-libs/pam )
 	pam_nuauth? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:*[server] )
-	prelude? ( dev-libs/libprelude )
 "
 RDEPEND=${DEPEND}
 
@@ -67,9 +66,9 @@ src_configure() {
 		$(use_with pam system-auth) \
 		$(use_with plaintext plaintext-auth) \
 		$(use_with postgres pgsql-log) \
-		$(use_with prelude prelude-log) \
 		$(use_with syslog syslog-log) \
 		$(use_with unicode utf8) \
+		--without-prelude-log \
 		--enable-shared \
 		--includedir="/usr/include/nufw" \
 		--localstatedir="/var" \
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index eec20df71901..4a5f2926ef50 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/gproftpd/Manifest b/net-ftp/gproftpd/Manifest
deleted file mode 100644
index 40c0bd14a45b..000000000000
--- a/net-ftp/gproftpd/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gproftpd-8.3.2-desktop.patch 327 BLAKE2B 3c1f56cc44eb3c4f737385bce30df9071bffd489e8bff4f19a2caeb4b946559b6d316734d2dafc5408d2e9b795534d23311df313a3482d0348efd17963377073 SHA512 690f08d9ba4bdfbe1a4ba7090644e9081811a49df6c42a78a6f02900d3feef60a9b5ac73e83bc74b097f09a77e502185ac18d52017339a7fe35dc8a5b4bdbf5a
-AUX gproftpd-8.3.2-fno-common.patch 509 BLAKE2B d4dff154f0f15426e3f6c7cf610626c1850f40a55b84174e0bda30d792b38ec3e355a637c32d0975856bb5e9dc648a7f34584ab17cf3ba3e30de5ab4ad7f5af3 SHA512 24f23e7b717c58be4c5dec1595deabcff8e55a3a719d60221858b9f2ef34091c6d949349a29c3d28463359c2633737f469f322218fee6385fe851d83264bb7b1
-AUX gproftpd-8.3.2-install.patch 1791 BLAKE2B 8d2b3ef4e3f3a70a0ed887cd384e8f58a8b02886aee541f850451317fc09100c49154cb73d1b5f586d4c3d8736fccab2218b85fb8864ddf7e9e8344e93de6868 SHA512 bd19623a3ac000a9055d3d79078d3e9fe142d0da342cb30cf53cb04ff5ec849ca040787f0f3271526b7af12bf9b48466eedcdd48dee5b114c9113bf8e43ca18c
-DIST gproftpd-8.3.2.tar.gz 605797 BLAKE2B 76d15fb01fb73ebbb639e4ecc6ddf8399ef5bc2b904fb5d2ae433aa14c40db49d9b352ffdf558d45aa784b21e5248dfc453d2f87863c3c886dc2cd6c746d6109 SHA512 71a3b80b2bf18ec17719b1484d45fb6110764d28492edafcd97538ad99ad7cc182ed25723b721226329b61f29e511b48e0153cf01f90c3c7f5ce939f7b233f59
-EBUILD gproftpd-8.3.2-r3.ebuild 1091 BLAKE2B 29730b294cedab715ed4db65161368c68ba274f205de7a6fad56ffafec7fb29dc0ea75f9a67ce7df8dff950db74e411314c91118a062e62dcade5fff0261f67c SHA512 fca3ededc647856a1caa4d22ce67192655d8d9b2fcb97b9d44f40a4c3c27e7970dd0638b91c033e86365ea70ec2494d24f71f66a37a3e99fdd5f49abb4ca8d09
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch b/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch
deleted file mode 100644
index a7ac93e0c4af..000000000000
--- a/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/desktop/net-gproftpd.desktop
-+++ b/desktop/net-gproftpd.desktop
-@@ -16,7 +16,7 @@
- GenericName=GPROFTPD
- Comment=Proftpd FTP server administration
- Exec=gproftpd
--Icon=gproftpd.png
-+Icon=gproftpd
- Terminal=false
- Type=Application
--Categories=Application;Network;X-Red-Hat-ServerConfig;X-Red-Hat-Base;
-+Categories=Network
diff --git a/net-ftp/gproftpd/files/gproftpd-8.3.2-fno-common.patch b/net-ftp/gproftpd/files/gproftpd-8.3.2-fno-common.patch
deleted file mode 100644
index af3b579d77f7..000000000000
--- a/net-ftp/gproftpd/files/gproftpd-8.3.2-fno-common.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/apply_user.c
-+++ b/src/apply_user.c
-@@ -52,11 +52,6 @@
- //gchar *dir; // ???
- extern gchar *homedir;
- 
--/* The 18 checkbox values */
--gchar *dir_val[19]; // ???
--
--char *user_profile; // ???
--
- extern long num_rows;
- extern int row_pos;
- 
---- a/src/dir_treeview_funcs.h
-+++ b/src/dir_treeview_funcs.h
-@@ -18,6 +18,8 @@
-  *
-  */
- 
-+extern gchar *dir_val[19];
-+extern char *user_profile;
- 
- gboolean dirs_foreach(GtkTreeModel *model, GtkTreePath *path,
- 		      GtkTreeIter *iter, struct w *widgets);
diff --git a/net-ftp/gproftpd/files/gproftpd-8.3.2-install.patch b/net-ftp/gproftpd/files/gproftpd-8.3.2-install.patch
deleted file mode 100644
index 3db967d01a1d..000000000000
--- a/net-ftp/gproftpd/files/gproftpd-8.3.2-install.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,26 +19,28 @@
- 	     fi \
- 	   done \
- 	fi;
--	if test -d $(DESTDIR)$(datadir)/pixmaps; then \
-+	if test -d $(datadir)/pixmaps; then \
- 	   cp pixmaps/gproftpd.png $(DESTDIR)$(datadir)/pixmaps/; \
- 	fi;
--	if test -f $(DESTDIR)$(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gproftpd; then \
-+	if test -f $(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gproftpd; then \
- 	   ln -s $(DESTDIR)$(bindir)/consolehelper $(DESTDIR)$(bindir)/gproftpd; \
- 	fi;
- 	@echo "Failsafe for a mixed environment"
- 	if test -f $(DESTDIR)/usr/local/bin/consolehelper && test ! -f $(DESTDIR)/usr/local/bin/gproftpd; then \
- 	   ln -s $(DESTDIR)/usr/local/bin/consolehelper $(DESTDIR)/usr/local/bin/gproftpd; \
- 	fi;
--	if test -d $(DESTDIR)$(sysconfdir)/pam.d; then \
-+	if test -d $(sysconfdir)/pam.d; then \
-+	   $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pam.d; \
- 	   cp etc/pam.d/gproftpd $(DESTDIR)$(sysconfdir)/pam.d/; \
- 	fi;
--	if test -d $(DESTDIR)$(sysconfdir)/security/console.apps; then \
-+	if test -d $(sysconfdir)/security/console.apps; then \
- 	   cp etc/security/console.apps/gproftpd $(DESTDIR)$(sysconfdir)/security/console.apps/; \
--	fi;   
--	if test -d $(DESTDIR)$(datadir)/applications; then \
--	   cp desktop/net-gproftpd.desktop $(DESTDIR)$(datadir)/applications/; \
- 	fi;
--	if test -d $(DESTDIR)$(datadir)/gnome/apps/Internet; then \
-+	if test -d $(datadir)/applications; then \
-+	   $(mkinstalldirs) $(DESTDIR)$(datadir)/applications/; \
-+	   cp desktop/net-gproftpd.desktop $(DESTDIR)$(datadir)/applications/gproftpd.desktop; \
-+	fi;
-+	if test -d $(datadir)/gnome/apps/Internet; then \
- 	   cp desktop/net-gproftpd.desktop $(DESTDIR)$(datadir)/gnome/apps/Internet/; \
- 	fi;
- 	if test ! -d $(DESTDIR)$(datadir)/doc/gproftpd; then \
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild
deleted file mode 100644
index 155984d3f6f3..000000000000
--- a/net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="GTK frontend to proftpd"
-HOMEPAGE="https://mange.dynalias.org/linux/gproftpd"
-SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-RDEPEND="
-	>=dev-libs/atk-1.0
-	>=media-libs/freetype-2.0
-	>=x11-libs/pango-1.0
-	dev-libs/glib:2
-	virtual/libcrypt:=
-	virtual/libiconv
-	x11-libs/gtk+:2
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-install.patch
-)
-DOCS="AUTHORS ChangeLog README"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	rm -r "${D}/usr/share/doc/gproftpd" || die
-}
-
-pkg_postinst() {
-	elog "gproftpd looks for your proftpd.conf file in /etc/proftpd"
-	elog "run gproftpd with the option -c to specify an alternate location"
-	elog "ex: gproftpd -c /etc/proftpd.conf"
-	elog "Do NOT edit /etc/conf.d/proftpd with this program"
-}
diff --git a/net-ftp/gproftpd/metadata.xml b/net-ftp/gproftpd/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-ftp/gproftpd/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-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index ba63cd95bba9..bec1c88a0e3e 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,6 +1,5 @@
 AUX ncftp-3.2.6-fix-clang.patch 7325 BLAKE2B 47fd1c348e5b4190ccf6e6d73806230a8c8de59873b5b31623789abe5f758467e19755f9e206a1fc92a89a0dea3611530f86261f2d25365347e6e418def6d13f SHA512 0fdc7554e990a684c447be6d0d613849ea1c1117faa3f287722d5a0c6beae175f51209f10d5b384f1e28f7cf375c075a239dc2e688be2584c3344995762c1cb7
 AUX ncftp-3.2.6-fno-common.patch 1818 BLAKE2B 620e3fbc7e297d3186fe9eef8855e2a663a5abcd680269101d5547ab9f6b9addcfe6040ba35e16e8e540784796e34304a9377b1149f7ac00fe0859627a141200 SHA512 c6bf0cc4324583d9aae3f3a57c900437a78d30138d0b9da06fea66cd5fbf57a79ea420afe33536a5bbcf2ace61aaca30ea04155df638daeae125ed9ca90b1c25
 DIST ncftp-3.2.6-src.tar.xz 420564 BLAKE2B ce6d8d2bf06761f884e9edfe6d0bb0230f5d515078a787c4e6faf7716b760166acdd0accf3de1e1f5f3d892c8c86348cdbbefeac6be05e6806011a3e8f4c9b02 SHA512 8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382
-EBUILD ncftp-3.2.6-r4.ebuild 1137 BLAKE2B 122bbe66f3611d353bd9f0d3786953f55a1a7be641d746f121fbf6cb8c8da0f9e7ffb5c10aa46547f85ea61e1d50a4c83bc082b2c3dca1769ae1f4253ad36a33 SHA512 a744fd7ac84b8e5cdbaf10cca9955ed19c52318cb1c4cf22bc38476cb06b22098b47e68868c3d53edc66313460398bcbdd65eab1d4abdf230443f9a535a805c2
 EBUILD ncftp-3.2.6-r5.ebuild 1192 BLAKE2B 5a55f154aa27723cb22b297e9d273a340e8daf9cb642835fe880298aab05c79049675adf640e2d132995cf6d7d1cdbf9edff76f45590ed43062eaea0671bd700 SHA512 ec3c1e8375c9f1a7d3cb1420ab91bdd9889af364a02509b2bbb196f3116004425786ab2de960ab3202200192fde48f2fc996356923726fa4d3b81bc676775e06
 MISC metadata.xml 747 BLAKE2B eb28ac0c7249544d1519dc534092dc0f8575c3f68cd24d9dc1654e0d9ffaabf8359fd64ee7ec321878b31e4e65a1c3767528a9f91301809e07f187867f52f09a SHA512 2d672c6901cf721df89f79f420f61ad709d3570fa0d762cae4becbb7f2426abf7a2812d9899fdee75daab20aab80fa80f796295dd3bbae588fe4eac93204b1f7
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r4.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r4.ebuild
deleted file mode 100644
index 29fce062b84f..000000000000
--- a/net-ftp/ncftp/ncftp-3.2.6-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An extremely configurable ftp client"
-HOMEPAGE="https://www.ncftp.com/"
-SRC_URI="
-	https://ftp.mirrorservice.org/sites/ftp.${PN}.com/${PN}/${P}-src.tar.xz
-"
-
-LICENSE="Clarified-Artistic"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="pch"
-
-DEPEND="
-	sys-libs/ncurses:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.6-fno-common.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/^AR=/d' autoconf_local/aclocal.m4 || die
-	# 727774
-	sed -i -e 's/STRIP=".*"/STRIP=":"/' autoconf_local/aclocal.m4 || die
-
-	AT_M4DIR=autoconf_local/ eautoreconf
-}
-
-src_configure() {
-	tc-export AR CC
-	LC_ALL="C" \
-	LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
-		econf \
-		$(use_enable pch precomp) \
-		--disable-ccdv \
-		--disable-universal
-}
-
-src_install() {
-	default
-	dodoc README.txt doc/*.txt
-	docinto html
-	dodoc doc/html/*.html
-}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 04c0fc20ae68..c964e4fef697 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/skype-dbus-mock/Manifest b/net-im/skype-dbus-mock/Manifest
deleted file mode 100644
index 6ce3db135a68..000000000000
--- a/net-im/skype-dbus-mock/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST skype-dbus-mock-0_pre20181011.tar.gz 2851 BLAKE2B fbb2d476d6a0402ea6ac70198d0aac87c24d7c9815fe27b03631625df10f24c71634f7f22eec2256869746cbf9d308ab3275380a755455ebbbb23ad2adcdd5a2 SHA512 d566a91cb279fe07626744e6196e3dcf7b36a5535bb8fe3cd7e6245d874bdf82f7948bd7f476f73c72f972894ee250d89a9eb055fdf55af9cbe97b1b05e39e16
-EBUILD skype-dbus-mock-0_pre20181011.ebuild 969 BLAKE2B 19f5cd997f4c3c1f45b01e4d018b8b029983fc3229afcab3aec6909b9c541b561265110b7cec7efe03dc2e69d56856572eb9a4d564cb75a960e793edcd2a7a7b SHA512 d1dc5d5540b3807fd7a6ef08ae4259cf1245c2ee76296a336d3320c46816732549a0ca3e001bef4d863678f66ce615fb005923f30f82564ca43a62fb139fe7ef
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-im/skype-dbus-mock/metadata.xml b/net-im/skype-dbus-mock/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/net-im/skype-dbus-mock/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-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild b/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
deleted file mode 100644
index 10a65d6831c3..000000000000
--- a/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.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=( python3_{7..9} )
-inherit python-single-r1
-
-GIT_COMMIT="3a9e2882ac5c0ad6be3c5cb5c7da008b4cfa51da"
-DESCRIPTION="Mocked systemd dbus interface for skype 8.30+"
-HOMEPAGE="https://github.com/maelnor/skype-dbus-mock"
-S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-SRC_URI="https://github.com/maelnor/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]')
-	>=net-im/skypeforlinux-8.30
-	!sys-apps/systemd
-	!sys-auth/elogind"
-
-src_install() {
-	python_doscript skype-dbus-mock.py
-	insinto /usr/share/dbus-1/system-services
-	doins org.freedesktop.login1.service
-	insinto /usr/share/dbus-1/system.d
-	doins skype-dbus-mock.conf
-}
-
-pkg_postinst() {
-	ewarn "Restart dbus service to apply changes"
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 2bc3b4593663..7ceb2ba66eeb 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/dleyna/Manifest b/net-libs/dleyna/Manifest
index e57d64ed433b..c5fddf6c3d74 100644
--- a/net-libs/dleyna/Manifest
+++ b/net-libs/dleyna/Manifest
@@ -1,3 +1,5 @@
 DIST dLeyna-v0.8.1.tar.bz2 146410 BLAKE2B a26ebc01df4a8d5cefeb900001e06605d4dffe6beebd6df650e9425048b787edb7dd144399fd66916dee360bc6bb3cf1071e24464ec52d0cdce36e5440272e41 SHA512 9b93ddb0b1a7a29d99da875aba1ae0e3e9c61d003353e4705cbf4274449af6c4ca454e68fe4d618749b7ff7cd215ad3361b07575494dadd8be34c589b8e48641
+DIST dLeyna-v0.8.2.tar.bz2 149691 BLAKE2B c9837da15c18b25c0e9021776cabdcffe52acfaac0f2858ab004b554d9a212ca45cc08f2893383248c5bb5ce57df854d79c329f80511b9f098663326f1badecc SHA512 25a62ad6b623a8d67d90af608d0fa68e4dcef916c5b44f51eb927f6e276555b978414c95f59a680c5938c7b67abe0cc09afa4e58d068f115d73ce6cb40959144
 EBUILD dleyna-0.8.1.ebuild 1015 BLAKE2B 8d826080b76aa14b065258fc6ac9af7a6c06059f9ea0c695daf23780eb4b165f45eb515e6b1ae81587baae3efabff9fc64353f8f5a563cc217d3b6475dc56e08 SHA512 211bd09a4229011661249ee6921739c5686ff0ba4bc3821c4a0cc5a72590f28752f38c931205ba9754fbe588b736c7edc922405512249c5f56f25c14f7292727
+EBUILD dleyna-0.8.2.ebuild 1176 BLAKE2B 9df1ebfb7a9320e6ec025bcda8c12581356093c0f533a919fd755b52da076a2d82692b369e6256d7fa4f9e4964401363281740c602069c52b5f63aa84218a62d SHA512 18ea1dde032bdb6d38e28b432350bce50a5ed944cbd579ec53e88281cef91aa3df6148532b89e9b533badd081bd99f428b178402f2c1fa7389ec09d4ffa531bc
 MISC metadata.xml 347 BLAKE2B f530e4051daea6e7c842e14aab33cd08680f7414dd5bb06fb0c4e7aafc9c851daff77752e77e1f12b333e992854ae97217f78d30a2be2b601ea3465b4e0ff31e SHA512 e5d55300134824082f76ed5fd0a9e5753ef74e98796b17da4c47e7b5e0e5480e82b3e6db6d4880e2ca00b12e01c1514736a41ae0967226283d329f576ab497a3
diff --git a/net-libs/dleyna/dleyna-0.8.2.ebuild b/net-libs/dleyna/dleyna-0.8.2.ebuild
new file mode 100644
index 000000000000..7aa0b52432f2
--- /dev/null
+++ b/net-libs/dleyna/dleyna-0.8.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="A set of services and D-Bus APIs to simplify access to UPnP/DLNA media devices"
+HOMEPAGE="https://gitlab.gnome.org/World/dLeyna"
+SRC_URI="https://gitlab.gnome.org/World/dLeyna/-/archive/v${PV}/dLeyna-v${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0/6" # soname of libdleyna-core-1.0.so
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=net-libs/gssdp-1.6.0:1.6=
+	>=net-libs/gupnp-1.6.0:1.6=
+	>=net-libs/gupnp-av-0.12.9:0=
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
+	>=net-libs/libsoup-3.0:3.0
+	dev-libs/libxml2
+
+	${PYTHON_DEPS}
+
+	!net-libs/dleyna-connector-dbus
+	!net-libs/dleyna-core
+	!net-libs/dleyna-renderer
+	!net-misc/dleyna-server
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}"/dLeyna-v${PV}
+
+src_configure() {
+	local emesonargs=(
+		-Ddbus_service_dir="${EPREFIX}/usr/share/dbus-1/services"
+		-Dman_pages=true
+		-Ddocs=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+}
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 94071ea5c139..84701b6b253e 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -5,9 +5,7 @@ AUX libnet-1.0.2a-gcc33-fix.patch 462 BLAKE2B 04fc43b82605a6200aac4edc5de509bf54
 AUX libnet-1.0.2a-slot.patch 6244 BLAKE2B 61f4131eca23d9dc20922058e0382c38ebba480df267472bbaa88481857511c3fa2ae5ad4e6203425475d7a2c3a1421873c3d03b00a5e5cc311bec7f64b8107e SHA512 6f800d91cb16077df967227feed58ee61b60ab1d248eda5fe788c21ba2cd7c404647213f3721f19bdbe80be0c45d571234dd82f010fe9fc70c4c270c97e138b5
 AUX libnet-1.0.2a-test.patch 1172 BLAKE2B 105a23a904da361216f370b005016d205ea971855a064d45b1282faabdb11878cbc2568ffe311074eb437677e03d604497727c58273711826af125a1cc3f11a6 SHA512 3ab6e667798362d605c2a1a5b8c172c80a99d2569d4418cb47b7bb8f69ea424e718b2947ea22b43d882c556f65470bec04451d9356070b8a4fe10f6505122bf7
 AUX libnet-1.2-int64_t.patch 569 BLAKE2B 8b07c6dee008102d4d1ab8863606c78219f8811a0153f341709f96347dc62c8cb207ef61f37aca5a3e440fac5def11b11a032f8e09944a86da9aff1a2e9f19cf SHA512 c3e42efd4b2621a4a068764ba9072e2dfb6506940c0dd48d6e66ec7392a60c0a53178d6e75e28d4e800b69e2342abc82b8102cc3add1edd339a5581a233be35d
-DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95
 DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
-EBUILD libnet-1.0.2a-r7.ebuild 1409 BLAKE2B f1906501d9d776e35207b85e259bcc66058b64dc7b025fdb0aa1f7b580ed8066e65c17a8686173c264dc0fe51086b73259ca1d7c6583bb9c0de53ce63cb7b6b9 SHA512 7b44ebfe6aee06809dd721aeed50dbf443a27a531a99ee24abd31f535acf3454374bafbd2d79af0c0b95f8b51400ed1e10dd93207e98b0cff215553419098e3b
 EBUILD libnet-1.2.9999.ebuild 682 BLAKE2B f4de78e01f11b24255ab6713c484ab9954ed6cd4be54d7da340c780ee5813291157ae2fe881141faeea2d0b2df67af71ab06a11949c57d8db4a5f3f28533cd30 SHA512 4d899c428e510ad9ed76eb0b573fcac4903f3d8782398890984c0eb85186bc0e84326c35c04ec04dfc78891f8f48d7a3b47c19d4715d695edb7facc573859d73
 EBUILD libnet-1.2.ebuild 904 BLAKE2B 18e30802c5cd41fe8c8e9a5414e69d6d1d4050e7239a3df68a935d9b48ddc8bebfe3b47976293ec591cb63aad30483539edfed7a5c1ca6ef44da88ba543a6140 SHA512 de9a422ac93465a16c75619c4af4ad87b78cb779a3d87af68fc3d3642f636cfa3a6a44c0921fe19861566bc7604ead2fbf037c75d04702a1b728c7267ff24a46
 MISC metadata.xml 1344 BLAKE2B a4798ed5db1e0a20c9a97794e6c7ba98a473e283799cb51ca39e072437508933e1b6656fe558f47600ef6da2a59966c7235e82a6d64cc89b261f3106d8df2399 SHA512 a846b017e37680462b7a4b66a883d77eccb72f7aaa2ef0bf854e507adaa30c94042effd22bacf5756bffe575932fc014cf7c5393e933f9b59de8da43f849060d
diff --git a/net-libs/libnet/libnet-1.0.2a-r7.ebuild b/net-libs/libnet/libnet-1.0.2a-r7.ebuild
deleted file mode 100644
index c07ef94b90a0..000000000000
--- a/net-libs/libnet/libnet-1.0.2a-r7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="library providing an API for commonly used low-level network functions"
-HOMEPAGE="http://www.packetfactory.net/libnet/"
-SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
-S="${WORKDIR}"/Libnet-${PV}
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch
-	"${FILESDIR}"/${PN}-1.0.2a-slot.patch
-	"${FILESDIR}"/${PN}-1.0.2a-endian.patch
-	"${FILESDIR}"/${PN}-1.0.2a-_SOURCE.patch
-	"${FILESDIR}"/${PN}-1.0.2a-funroll.patch
-	"${FILESDIR}"/${PN}-1.0.2a-test.patch
-
-)
-
-src_prepare() {
-	default
-
-	cd "${S}" || die
-	mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
-
-	cd "${S}"/include || die
-	ln -s libnet.h libnet-${SLOT}.h || die
-
-	cd libnet || die
-	for f in *.h ; do
-		ln -s ${f} ${f/-/-${SLOT}-} || die
-	done
-
-	cd "${S}"/doc || die
-	ln -s libnet.3 libnet-${SLOT}.3 || die
-
-	cd "${S}" || die
-
-	eautoreconf
-	tc-export AR RANLIB
-}
-
-src_test() {
-	emake -C test
-}
-
-src_install() {
-	default
-	doman "${ED}"/usr/man/man3/libnet-1.0.3
-	rm -r "${ED}"/usr/man || die
-
-	dodoc VERSION doc/{README,TODO*,CHANGELOG*}
-	newdoc README README.1st
-
-	docinto example
-	dodoc example/libnet*
-
-	docinto Ancillary
-	dodoc doc/Ancillary/*
-}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 4e0b37fa94ef..3511d95af98d 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -2,5 +2,5 @@ AUX libupnp-1.14.12-disable-network-tests.patch 416 BLAKE2B d1fea0b8e0abba960cd5
 DIST libupnp-1.14.14.tar.gz 808851 BLAKE2B e1f69df386e2781cf17248733bf720c7e88c0d818ef8589648cdb4ec800c3a0cf381aa44fadcfdabcac31bf5d44091b8f421a1d53310046fb6a6c87e6035245f SHA512 bf134e87981ceb051e101b104f143672711de19a1b35cfc89a49e18f3a289fab443fbdef4a918e1f8a464de38a1eccbeee9c847c243e35f73a92373473b2465f
 DIST libupnp-1.14.15.tar.gz 809246 BLAKE2B 5918f41b64fe5e4a0209058f4706d724d0fcad74c8e3bfc2a54d6d5a1af253d4461ec43b0c896f1da14dcb3fb0925cbae3bc6eb015380e1cd23a3d88e6ed656f SHA512 dde2563eaacdd288066012f001b819ec25ab51bc36aef23db71d2eb67eef778b6b2b10b35a2f6b3041ecef20167e873e1c54e17fc4a26e8d1d9f408e2050279d
 EBUILD libupnp-1.14.14.ebuild 1107 BLAKE2B f95ac67d241bb4ffb929dd9cfaa68a0515b272344927dc0069932110ef7cf096002abb7188ec341967bb7778dbf6de09c20c617867ead99cba4aa7d8ac8565a1 SHA512 1655ddd2e8ea0cc62adf010d1780b7ff9ac014dd5a4e4d583da9342826619427d6675ec43fc040eae10e38ee91fac3a41c408750aecaedce9481f1457d1a3f49
-EBUILD libupnp-1.14.15.ebuild 1114 BLAKE2B b0bf8eabcb22e160fe606cdd987a98aaddba832f9826e2f4ade33df7b61ba5c4511b102145d4b8b7d15d51af89b08fa80ce5ecf088b1b698aca3afa15a57634d SHA512 aeb01cf00d5350a1c4b5f9fd40ae6ff474076c2cbc6639ec149c6e35e86ed7473ca121e9f01da8415f90b2c7da8c9df4f94ef82a9fc4d90b501c789d7ece3061
+EBUILD libupnp-1.14.15.ebuild 1107 BLAKE2B f95ac67d241bb4ffb929dd9cfaa68a0515b272344927dc0069932110ef7cf096002abb7188ec341967bb7778dbf6de09c20c617867ead99cba4aa7d8ac8565a1 SHA512 1655ddd2e8ea0cc62adf010d1780b7ff9ac014dd5a4e4d583da9342826619427d6675ec43fc040eae10e38ee91fac3a41c408750aecaedce9481f1457d1a3f49
 MISC metadata.xml 676 BLAKE2B a5aa120c6aef01b436d44e14c0d3d9014b4d3392c75322c5269bb56c6c143ad184d409def0adec6a02a4158b67c71e0cb009eb83d023a0346937337ce171dd6a SHA512 507660834175c3675b9ca6aeb4f5cdae1a017f54ba46e25d1a3235f05c897548b18ca294c328c167d35c8babb3aa71838880965bf34269559aac02a831addd17
diff --git a/net-libs/libupnp/libupnp-1.14.15.ebuild b/net-libs/libupnp/libupnp-1.14.15.ebuild
index bbac11e95b48..24f5f843803a 100644
--- a/net-libs/libupnp/libupnp-1.14.15.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.15.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc +reuseaddr samples +ssl static-libs"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 332ee1e40418..0bc86c6fce53 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
deleted file mode 100644
index 4a4f1c9c4457..000000000000
--- a/net-mail/cmd5checkpw/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX euid_030.diff 1107 BLAKE2B 558ad9c23f2e4c48b22b0ccf520537a6eaad28592105ede409b691bc8078645f2b7028730d1267e0951b1df54b35cf644ffe8655105ba7779cdd8274c2fea7a6 SHA512 648ded406e4818ba50597b010cedfae6436e3bbcf0c0e9a982b9656211fea7533dbc759434bade78f4df63e64231529ce4713bdf504244f3fe2e93c8bb5f995f
-AUX poppasswd 84 BLAKE2B 0388cd039e50beb308e8791c3b490ca305bb6288f5971ed624fea1d80a8be916aeb1f99059b42aaeb948a7a4614a7746a74e7904703a9eb7824e3e98c1a4c05e SHA512 74eb9764b4c9fd251e9bb408d3ace9bcc30f9d638963cd5f385ee6c2c839f1de51b7f55c81d5e0111b568a308eea08185c8bcc965decf36a963b78bf4aea8671
-AUX reloc.diff 2330 BLAKE2B bee7735ac6f8d5039bd0c87056ae3fbaf100118d3292297dce311faff1fb0555d5b08543a9ce79347f953bfeef5c6b6585edd5474c538a2323d3e47048444b26 SHA512 e18cab4bb02b2bac945d1857f70d6f5faa2296205f09c228d87d16dffb43de129a59ef0054dd6c54f1db7448b47f46a385dc81ffe769dc87d182d81031920369
-DIST cmd5checkpw-0.30.tar.gz 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
-EBUILD cmd5checkpw-0.30-r2.ebuild 1446 BLAKE2B cc24f45f8b57983a378ad18e2535faedcc22b0791fb6f925e690b46c4172c5e6f2bade03be05be3b59edbae39579ab2f86b65eca229fe316764912ba5a87a572 SHA512 1382125374d7ef94865a3cab834cbee93c3412614cdd28ac9dca30187b474a9c62b95ffbe190403a0ec9168f340f546887859b9ddfffa6a53272626cfeb30498
-EBUILD cmd5checkpw-0.30-r3.ebuild 1474 BLAKE2B ce638f866ed770bdd8444ba4773137649563ec73d108d619c4496dfa8611daed000afe0e94a5edb618a2d1694a038e0123f168973eb9b5d0e11d6c2a9b399356 SHA512 1d0985f7861d2f368a159b9a318769bf1ae793fe4413fb1a0b6db8ad2692f2f08e7d28eca9490833957c7ca2ee603cdf8a0812c250a519ce127816feed0c5bb3
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
deleted file mode 100644
index 7aa8dc27595f..000000000000
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fixheadtails
-
-MY_VER=$(ver_rs 1- "")
-
-DESCRIPTION="A checkpassword compatible authentication program using CRAM-MD5"
-SRC_URI="https://www.fehcom.de/qmail/auth/${PN}-${MY_VER}_tgz.bin -> ${P}.tar.gz"
-HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
-
-LICENSE="public-domain RSA"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-DEPEND="acct-user/cmd5checkpw"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if has_version "<net-mail/cmd5checkpw-0.30"; then
-		ewarn
-		ewarn "this version is in NO WAY COMPATIBLE with cmd5checkpw-0.2x"
-		ewarn "it actually receives the authentication credentials"
-		ewarn "in a different order then the old implementation"
-		ewarn "see bug #100693 for details"
-		ewarn "this version IS needed by >=qmail-1.03-r16"
-		ewarn
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/euid_${MY_VER}.diff
-	"${FILESDIR}"/reloc.diff
-)
-
-src_prepare() {
-	default
-
-	ht_fix_file Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -o cmd5checkpw"
-}
-
-src_install() {
-	insinto /etc
-	insopts -m 400 -o cmd5checkpw
-	doins "${FILESDIR}"/poppasswd
-
-	exeinto /usr/bin
-	exeopts -o cmd5checkpw -m 4755
-	doexe cmd5checkpw
-
-	doman cmd5checkpw.8
-	einstalldocs
-}
-
-pkg_postinst() {
-	chmod 400 "${EROOT}"/etc/poppasswd || die
-	chown cmd5checkpw "${EROOT}"/etc/poppasswd || die
-}
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild
deleted file mode 100644
index 0f5fcfd4c0dc..000000000000
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fixheadtails
-
-MY_VER=$(ver_rs 1- "")
-
-DESCRIPTION="A checkpassword compatible authentication program using CRAM-MD5"
-SRC_URI="https://www.fehcom.de/qmail/auth/${PN}-${MY_VER}_tgz.bin -> ${P}.tar.gz"
-HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
-
-LICENSE="public-domain RSA"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="acct-group/cmd5checkpw"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if has_version "<net-mail/cmd5checkpw-0.30"; then
-		ewarn
-		ewarn "this version is in NO WAY COMPATIBLE with cmd5checkpw-0.2x"
-		ewarn "it actually receives the authentication credentials"
-		ewarn "in a different order then the old implementation"
-		ewarn "see bug #100693 for details"
-		ewarn "this version IS needed by >=qmail-1.03-r16"
-		ewarn
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/euid_${MY_VER}.diff
-	"${FILESDIR}"/reloc.diff
-)
-
-src_prepare() {
-	default
-
-	ht_fix_file Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -o cmd5checkpw"
-}
-
-src_install() {
-	insinto /etc
-	insopts -m 640 -o root -g cmd5checkpw
-	doins "${FILESDIR}"/poppasswd
-
-	exeinto /usr/bin
-	exeopts -o root -g cmd5checkpw -m 2755
-	doexe cmd5checkpw
-
-	doman cmd5checkpw.8
-	einstalldocs
-}
-
-pkg_postinst() {
-	chmod 640 "${EROOT}"/etc/poppasswd || die
-	chown root:cmd5checkpw "${EROOT}"/etc/poppasswd || die
-}
diff --git a/net-mail/cmd5checkpw/files/euid_030.diff b/net-mail/cmd5checkpw/files/euid_030.diff
deleted file mode 100644
index 12fa9ecc2e5d..000000000000
--- a/net-mail/cmd5checkpw/files/euid_030.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -upr cmd5checkpw-0.30.orig/main.c cmd5checkpw-0.30/main.c
---- cmd5checkpw-0.30.orig/main.c	2003-09-18 16:34:01.000000000 +0300
-+++ cmd5checkpw-0.30/main.c	2005-07-31 13:19:25.000000000 +0300
-@@ -5,6 +5,7 @@
- #include <pwd.h>
- #include <stdio.h>
- #include <unistd.h>
-+#include <sys/types.h>
- 
- #define LINE_MAX 256
- #define SASLUSERFILE "/var/qmail/users/authuser"
-@@ -23,10 +24,26 @@ int doit(unsigned char *testlogin, unsig
-    unsigned char h;
-    FILE *fp;
-    int j;
--
-+   uid_t uid;
-+   gid_t gid;
-    char *linepnt;
- 
-    if ((fp = fopen(SASLUSERFILE, READONLY)) == NULL) _exit(2);
-+
-+   uid = getuid();
-+   gid = getgid();
-+
-+   if (gid != getegid()) {
-+       if (setegid(gid))
-+       _exit(2);
-+   }
-+
-+
-+   if (uid && (uid != geteuid())) {
-+       if (seteuid(uid))
-+       _exit(2);
-+   }
-+
-    while (fgets(line, LINE_MAX, fp) != NULL) {
-          if ((linepnt = strchr(line, '\n')) != NULL) {
- 	 *linepnt = 0;
-@@ -39,7 +56,8 @@ int doit(unsigned char *testlogin, unsig
- 	 break;
-       }
-    }   
--   fclose(fp);
-+
-+   if (EOF == fclose(fp)) _exit(2);
- 
-    if (!found_user) return(1);
- 
diff --git a/net-mail/cmd5checkpw/files/poppasswd b/net-mail/cmd5checkpw/files/poppasswd
deleted file mode 100644
index 8fc1d4275ecd..000000000000
--- a/net-mail/cmd5checkpw/files/poppasswd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Format of this file is one user:pass per line
-# Like so...
-# joedogger:sm311yf33t
diff --git a/net-mail/cmd5checkpw/files/reloc.diff b/net-mail/cmd5checkpw/files/reloc.diff
deleted file mode 100644
index 7472436bf469..000000000000
--- a/net-mail/cmd5checkpw/files/reloc.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -upr cmd5checkpw-0.30.orig/Makefile cmd5checkpw-0.30/Makefile
---- cmd5checkpw-0.30.orig/Makefile	2003-09-18 16:34:01.000000000 +0300
-+++ cmd5checkpw-0.30/Makefile	2005-07-31 14:41:16.000000000 +0300
-@@ -14,7 +14,7 @@ CFLAGS=-c -g -Wall -O3
- LD=gcc
- LDFLAGS=-g -o ${TARGET}
- 
--default: main man cmd5checkpw
-+default: cmd5checkpw
- 
- main: cmd5checkpw.c conf-qmail
- 	sed s}QMAILHOME}"`head -1 conf-qmail`"}g cmd5checkpw.c > main.c
-diff -upr cmd5checkpw-0.30.orig/cmd5checkpw.8 cmd5checkpw-0.30/cmd5checkpw.8
---- cmd5checkpw-0.30.orig/cmd5checkpw.8	2003-09-18 16:34:01.000000000 +0300
-+++ cmd5checkpw-0.30/cmd5checkpw.8	2005-07-31 14:43:20.000000000 +0300
-@@ -26,7 +26,7 @@ and a cram-md5 challenge terminated by \
- .B cmd5checkpw
- recalcuates a MD5 digest using the provided plain challenge
- and the passwords from
--.IR /var/qmail/users/authuser 
-+.IR /etc/poppasswd 
- and compares it with response (2nd parameter). If they are the same
- then
- .B cmd5checkpw
-@@ -50,7 +50,7 @@ exits 111.
- 
- .B cmd5checkpw 
- additionally compares the supplied password with the password in the 
--.IR /var/qmail/user/authuser 
-+.IR /etc/poppasswd 
- file. Thus it can be used as a plain-text checkpassword
- for PLAIN & LOGIN authtype (but we recommend using a crypted version for
- security reasons). To use it, simply provide it with clear text password
-@@ -68,7 +68,7 @@ interface.
- Before invoking
- .BR subprogram ,
- .B cmd5checkpw
--does not set up anything. Just because users from  /var/qmail/user/authuser does not
-+does not set up anything. Just because users from /etc/poppasswd does not
- have to exist in the system so setting their uid,gid etc is not possible.
- 
- Other
-@@ -78,7 +78,7 @@ These effects must be documented;
- applications will differ in their requirements.
- 
- .SH "FILES"
--.IR /var/qmail/users/authuser 
-+.IR /etc/poppasswd 
- - this file contains pairs of logins and clear text passwords
- separated by ":". It looks like this:
- 
-diff -upr cmd5checkpw-0.30.orig/main.c cmd5checkpw-0.30/main.c
---- cmd5checkpw-0.30.orig/main.c	2003-09-18 16:34:01.000000000 +0300
-+++ cmd5checkpw-0.30/main.c	2005-07-31 14:43:36.000000000 +0300
-@@ -7,7 +7,7 @@
- #include <unistd.h>
- 
- #define LINE_MAX 256
--#define SASLUSERFILE "/var/qmail/users/authuser"
-+#define SASLUSERFILE "/etc/poppasswd"
- #define READONLY "r"
- char up[513];
- int uplen;
diff --git a/net-mail/cmd5checkpw/metadata.xml b/net-mail/cmd5checkpw/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/net-mail/cmd5checkpw/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-misc/Manifest.gz b/net-misc/Manifest.gz
index f091fdb46c96..df915d082c48 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index abf2305f627b..a62e6b0f8fdf 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -2,5 +2,5 @@ AUX adjtimex-1.29-r2-gentoo-utc.patch 1011 BLAKE2B c4e7f951ef316917630cfa122058e
 AUX adjtimex.init 638 BLAKE2B 652bc1dd50a59bec204b669bb72ba3ca68ae65bc450d4ff662ba2af5f7d5f784f184a3cf7156439fdb72608ef46042d606fc4f1e9abb969ff3ce500f3db9cf6f SHA512 4d8caa72076ac8ba2c0f6cabb31a28254e609d2215cc8f830921e729013144fc10cb6a8796fff80ecc4bf1dc611652e81830e46e59c1726d3147cc1680017041
 DIST adjtimex_1.29-10.debian.tar.xz 33008 BLAKE2B b1da53008ef2373d9b450228bdb7f3378516880bf5b0d9b6d2c8aaa25880eea05954923e18497c42bf4e0f541dfa6c119c558b2712c5ed096a9c3e32dd3407c0 SHA512 4be30bdc63446259fe246e4d7fc0cb78fa40f40e9eb1a0b3a9d523d19ba0664be5e04f1803235a268eaae41cf4d88adfdbc6ecec86f8bd03703aca6c25ba9b8b
 DIST adjtimex_1.29.orig.tar.gz 85551 BLAKE2B 4e7784c3d3efa1f6ea226a7822de675a27c5be5d048664f8ff215eebe65b493e6dc0d004cc955c2e3b4e314e6283eafd628e92b611504b6ea92f4e5fe7d1a8c7 SHA512 5a48cdc538866c06562f62e369c08d60978c791ed91565262c0179c6fa25dd343963992d00e10f32475fdc00b458f81cf9c61adbfa9e1b7a8d4981ebeeff5649
-EBUILD adjtimex-1.29-r2.ebuild 1655 BLAKE2B cbbd2ea4d74d096767c6efdcc10385f71cd031e31c370a873d457ba07dec1165c337bfc70ee9e88ce5a5b796d4a4f6a6ec5fb620c365fbc153a00420561014ed SHA512 44cd2c491c99b057ca4a65703edd8c03efd09e5b128d9345d0746ffb284c923b87311430d51a9fe1933329c7208071a8ab53d3226c2ef09174b05793490f4e44
+EBUILD adjtimex-1.29-r3.ebuild 1693 BLAKE2B 7b51933ffa9578bb5df0c63234518b03ad32fdbac5c10748e334e1f5099c562144e9d6200c46e9fa069c2daed785005e46c1fae828fd8715dbc094ecb425eec0 SHA512 60cdb05e3167708edb748201acbe1743db85fa4535197005a455aca6ff8cdae1e288112801602dd07ba5c3085076400b5b0ae8d73cd5cb7aeec981f4d456fdd0
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild b/net-misc/adjtimex/adjtimex-1.29-r3.ebuild
index 5ac80ba347a5..519a776f5a9d 100644
--- a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
+++ b/net-misc/adjtimex/adjtimex-1.29-r3.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,6 +10,7 @@ MY_P="${P/-/_}"
 DEBIAN_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
 DEBIAN_PATCH="${MY_P}-${DEBIAN_PV}.debian.tar.xz"
 DEBIAN_SRC="${MY_P}.orig.tar.gz"
+
 DESCRIPTION="Display or set the kernel time variables"
 HOMEPAGE="https://www.ibiblio.org/pub/Linux/system/admin/time/adjtimex.lsm https://github.com/rogers0/adjtimex"
 SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH}
@@ -19,6 +20,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc x86"
 
+RDEPEND="!net-misc/sntpd[adjtimex]"
+
 src_unpack() {
 	unpack "${DEBIAN_SRC}"
 	cd "${S}" || die "Failed to cd ${S}"
diff --git a/net-misc/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest
deleted file mode 100644
index 485a1349edde..000000000000
--- a/net-misc/pyhoca-cli/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyhoca-cli-0.6.1.2.tar.gz 41891 BLAKE2B a3183acc8b4a809e5b3894bbcb276972f3bf0178f2a9f596e697866db4217ca4e04d6b3d698b202e124a2e42a3b1f9b2f0fbd595bf0483f55dd7dbe9ea108ef3 SHA512 02bb6a0dcb72bc67e8b8109e554f04fa57d5b2da2682b50a081b60e19c257842ae31aabb7faa945579fb23d0e922befd0678c413b31393d368b4173e0d4315f6
-EBUILD pyhoca-cli-0.6.1.2.ebuild 815 BLAKE2B 7cd3f6aa9ca78a4d17be556cdefd30ef6caadb07ed24e529f11dbe9a510f012e73f389805d10e97057f21b3604dd09eab85befc89c188831570bee4bca61c4e1 SHA512 527edf4a33743bd2359b64beab04eea34a1ef3a162054e84dae0228b2605fd0d9cd53b18c0775754bae8d1fd212551a32792ae539841488bf2cfaf1029dbc305
-MISC metadata.xml 546 BLAKE2B cd794b3e556403990294a943ea4705813b33867c68f6a2729bf258d52b0ffca085b117bea7f26db21044cce96cc2bbff065c28f3ade8a270675898c74974d38d SHA512 63514d5f49ad45472c271a64b994c2c9ced6a15eb7d01660724392fce52be26b8ae5efb1e0ecce8b2e31128513461ef36d31aefd26a3a8e260e849eb63b26904
diff --git a/net-misc/pyhoca-cli/metadata.xml b/net-misc/pyhoca-cli/metadata.xml
deleted file mode 100644
index 16a79c44fca7..000000000000
--- a/net-misc/pyhoca-cli/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-PyHoca-CLI is a client implementation for X2Go using the project's Python API (Python module). PyHoca-CLI can be operated completely from the command line and the goal is to reflect the full functionality spectrum of Python X2Go.
-	</longdescription>
-</pkgmetadata>
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
deleted file mode 100644
index b07a8be289e3..000000000000
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="X2Go command line client"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	>=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# we don't need setuptools at runtime
-	sed -i -e '/install_requires/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/man1/*
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest
deleted file mode 100644
index 306d657844f8..000000000000
--- a/net-misc/pyhoca-gui/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyhoca-gui-0.6.1.1.tar.gz 2099727 BLAKE2B 944ee3cd743d502ce320759b9200c74de13802e23aabc2a5fe5659e123e2bbc368bf8a216c73de2c2ed22408d8fe50b4b945cc0714d05e1cb0faa1e5617dd4b0 SHA512 e7e24d60c1e4ecca2201c2a25bfc8c5552e54e30a5f744c5bc9c36ba4050a64cbb8616ab2e035b34cd14c62702ff88e32c863cac8aef0f8f4cb18db1d2e737b6
-EBUILD pyhoca-gui-0.6.1.1.ebuild 963 BLAKE2B f527244e3fbda395fd88a11176cd5c1aa71fb7148a48ac0573a0635cfa089b757bdee426965acbf0f9766d57ffa79432816ae84f2e3fa1a90972c968f01aa6c4 SHA512 579dc2310b107b28b1265f478fa14970f7ff1b49211895fff62588f23753d022d1f781f41461f6371c356c11e8a0fb07bdf7785ada4c09cf5859a5a168e797ba
-MISC metadata.xml 816 BLAKE2B de70719c61f4ed3ad3f95fe888283ec0983fa8d722b189370cf7337496727958f80d467bd43292544995fa6a563356148ee296f466c876a056ecfa60068b9340 SHA512 6290306e99d6609e9f71aee494c6de1bf7f7a02b3a89375fb24b2544b96d2c48ebf14f8e99df50cda107a973c30e38b84537524f753e59e8318125d67b4046cf
diff --git a/net-misc/pyhoca-gui/metadata.xml b/net-misc/pyhoca-gui/metadata.xml
deleted file mode 100644
index 4c89615fa22e..000000000000
--- a/net-misc/pyhoca-gui/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-PyHoca-GUI is a client implementation for X2Go using the project's Python X2Go client API (a Python module). PyHoca-GUI uses wxPython for rendering graphical desktop elements (menus, dialog boxes etc.).
-
-PyHoca-GUI is designed as a very minimal GUI that behaves very similar to GNOME's network manager applet (nm-applet). It appears as a small Phoca icon (a little seal) that docks to your systray panel (also called notification area) and allows you to manage multiple X2go sessions simultaneously.
-	</longdescription>
-</pkgmetadata>
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
deleted file mode 100644
index 3705cbbe5314..000000000000
--- a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="X2Go graphical client applet"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pycups[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/wxpython[${PYTHON_USEDEP}]
-	>=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]
-	x11-libs/libnotify"
-BDEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# we don't need setuptools at runtime
-	sed -i -e '/install_requires/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/man1/*
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/net-misc/python-x2go/Manifest b/net-misc/python-x2go/Manifest
deleted file mode 100644
index b2dc7f78dbc7..000000000000
--- a/net-misc/python-x2go/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-x2go-0.6.1.3.tar.gz 247754 BLAKE2B 9c5705da9c1656a29ae7382dfaedb1798d8728006dbfcb0ec47441bba63a1c85f9ee60f0d8e5cb040dfec177ab72381518e0756ca5a9374e3ea7f1ab29d54dfb SHA512 3933ad8ee7debd6d643ce12ce06a6a98c7c97fae5a30f99ca147ce57ac7fa8e1b2fd97439a8c3b39ac5c5d0c7cecf4f3571193092e057db536d061f0d1d4accc
-EBUILD python-x2go-0.6.1.3.ebuild 583 BLAKE2B 507345b4135ca7593e709c2bf0fb16b9efe67c67f198b15cbbee2afc3cd2e70cb1a39e115caa69231dc579f38527d31f14553b2803d2979b1dd2306469bd7b78 SHA512 c4c9f71efe8058556b564dba3158d611656d30e3374a40c91782314e440aff62737704f1df267ec26ea39500f1aaecb0106e8d537ae6def0fdd9dd1e0ef2fa88
-MISC metadata.xml 508 BLAKE2B a44f0a85d8f456b9a428dd9c38d3359c681ba6b327f5c612549f9fafd7bce14671c0bbe8b8cd518a1c6c13f310a356a77b5578c3413282b7f8381f9a3802548a SHA512 c37de00993e2555dac8973c7a334c26dd756d03abc555e39482a25880983a1babdcc8733d83c80498bab9b1940a5695da4b9f50d8de2c513dd720c70b79b6b2c
diff --git a/net-misc/python-x2go/metadata.xml b/net-misc/python-x2go/metadata.xml
deleted file mode 100644
index 842c118f5ebe..000000000000
--- a/net-misc/python-x2go/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>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-The Python X2Go module integrates X2Go client support into your python programmes.
-Python X2Go is used in the headless X2Go client "pyhoca-cli" and by the tiny systray GUI applet "pyhoca-gui"
-	</longdescription>
-</pkgmetadata>
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
deleted file mode 100644
index 8803f05a4b7a..000000000000
--- a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="X2Go client-side Python API"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-# TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
-RDEPEND="
-	dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	net-misc/nx"
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index bdb675ac4da1..f0522a73d8a0 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,6 +1,6 @@
 AUX remmina-1.4.27_p20221128-missing-gdk-include.patch 267 BLAKE2B 7f3ed8dfd31a3301be46cb18c7162471fa02540527f1ef9dbfebc07140698eefe32823df90dd875612fe722977ba59c7d2a1170e24d45e2669fd2ecfa192ea7d SHA512 5bb47bbfbd886f1532fda24d6a1ccb87d8e5b6deb9a26afcea50fa7369d8a1bb0494a44f75e36f700e87d111f28c1b7a9b47a5d82417e692df9314ece848e4f6
 DIST Remmina-v1.4.27.tar.gz 3479987 BLAKE2B 96d4df06558a267db8605dc03de729061e303f9cebec84369ec3bdeeb19d4a377accaf224603ff9ba79bb9f1cecfa66519e6e02e328f42d24c46bdf3e1fabfa6 SHA512 2fff81a1a721b8ca87698697952bb1080cde6affc86c324f6fc30cc329ead57f0e617c39efeeee30890ad4812e719cee22a0b84df43aa1bc7db571607f208bfd
 DIST Remmina-v1.4.28.tar.gz 3553916 BLAKE2B d27598c57e1d68c6c8e4da0a4d2f2cf056cbb2f532297ef01881e87a1c11861ac2dc0e0ee490da4ace18140dcb1d04650bb54635a959bfe828de363b64f98558 SHA512 58f84044a5285edfe739b0f6f60cffe05c79e57453d39173d6c17ba9e5e63e9938a19ce69564cf2a6c254d9f2b6bb426d7518def5c961b3c296f2897509fc931
-EBUILD remmina-1.4.27.ebuild 2746 BLAKE2B bbf6f8851f047ca43d128908ea18dcd7142b1e4e303ed132c756d49dc5da374d2ea0ce8ca02f9f176f035954c75dea5aafccaa43a7575285bda5e33062f0886d SHA512 db6e134e3c1a8f3001d90330fc5b643026d2348600cf8a4ad274da6e92cc86fc45bc2d33e6ebce3d2a48b715583b8aa373747d30d42daffb6fc88d1356058bf9
-EBUILD remmina-1.4.28.ebuild 2744 BLAKE2B 40a07fba0cc6ff5fd885fa38354afe9c2bdb68527b7c11a5344e4d3cd9b015dd425b5a1d394c7386554b6271ca6e82fc5ed674efd964d55c0ff12a2850c7e4e4 SHA512 1bdce91d2a57dc23c880f616645a8a2eb9db6461e62e09fc3aad4c1c66f7d6e2188e348bdcb27e8e2b2696de8bffe0ba65d5272c2d18ec6053522974f305989a
-MISC metadata.xml 1174 BLAKE2B 03a647f7a881a228a2123e269567394dcf5d8e908d223dcc30b87f11e7447ffbadcda0e4a29d9126b6d15c35ddb07a7a4b9b49631156d8efc2de3f460d202bf8 SHA512 fd1632f13bffe28ca6b2349dcd32641393c0fa9fe1dd6b629b2e6d8b88a3f7f1adce8f4dfe0adce7243e5fe485da9eeaf6042ea4f532e086c97cf5d21f34a91b
+EBUILD remmina-1.4.27.ebuild 2701 BLAKE2B 8f84e03772910389d20788ddf71596c1d56f9793004f4164f486070eb32b480475065c9763deb043f1b7709d373e50db0d195c0c7fc71a0b60d39c29c8e4c853 SHA512 79302769e75238fe57a7c1b27e68b3acc388dff06d22eb9c4c2fc6b7b38120677787e81a85e01f04100c2a116e4159ee51c08a18982c98f5adf45ee83d0f7453
+EBUILD remmina-1.4.28.ebuild 2699 BLAKE2B e76606d74a5c57116b2085a6be50a2026582755f1b4cb6e93cd968f6159544cbcd7a5b8c5ad801e8c4b5406938f3c66bdf4173fb276a36ea1785291bf29af9b9 SHA512 fd6a1bda4b6adea53dc9e28fe15221530bafa8819252fb9ca9ae1111abd35b2c94ea8bfcf6650077f6ccecfaa6ebee299deca9ce02770b1f1d7afecc0ea2a097
+MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml
index 78554c55848c..2aa71df8ae84 100644
--- a/net-misc/remmina/metadata.xml
+++ b/net-misc/remmina/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name="kwallet">Enable KDE Wallet plugin</flag>
 		<flag name="spice">Support connecting to SPICE-enabled virtual machines</flag>
 		<flag name="ssh">Enable support for SSH/SFTP protocol</flag>
-		<flag name="x2go">Enable support for X2Go</flag>
 	</use>
 	<upstream>
 		<remote-id type="gitlab">Remmina/Remmina</remote-id>
diff --git a/net-misc/remmina/remmina-1.4.27.ebuild b/net-misc/remmina/remmina-1.4.27.ebuild
index 59ff7d45ff1b..616bcb36c273 100644
--- a/net-misc/remmina/remmina-1.4.27.ebuild
+++ b/net-misc/remmina/remmina-1.4.27.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc webkit x2go zeroconf"
+IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc webkit zeroconf"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -45,7 +45,6 @@ COMMON_DEPEND="
 		x11-libs/vte:2.91 )
 	vnc? ( net-libs/libvncserver[jpeg] )
 	webkit? ( net-libs/webkit-gtk:4 )
-	x2go? ( net-misc/pyhoca-cli )
 	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
 "
 
@@ -99,7 +98,7 @@ src_configure() {
 		-DWITH_UPDATE_DESKTOP_DB=OFF
 		-DWITH_VTE=$(usex ssh)
 		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=$(usex x2go)
+		-DWITH_X2GO=OFF
 		# when this feature is stable, add python eclass usage to optionally enable
 		-DWITH_PYTHON=OFF
 	)
diff --git a/net-misc/remmina/remmina-1.4.28.ebuild b/net-misc/remmina/remmina-1.4.28.ebuild
index e58073c34c82..988d70ef89aa 100644
--- a/net-misc/remmina/remmina-1.4.28.ebuild
+++ b/net-misc/remmina/remmina-1.4.28.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit x2go zeroconf"
+IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit zeroconf"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -44,7 +44,6 @@ COMMON_DEPEND="
 		x11-libs/vte:2.91 )
 	vnc? ( net-libs/libvncserver[jpeg] )
 	webkit? ( net-libs/webkit-gtk:4 )
-	x2go? ( net-misc/pyhoca-cli )
 	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
 "
 
@@ -98,7 +97,7 @@ src_configure() {
 		-DWITH_UPDATE_DESKTOP_DB=OFF
 		-DWITH_VTE=$(usex ssh)
 		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=$(usex x2go)
+		-DWITH_X2GO=OFF
 		# when this feature is stable, add python eclass usage to optionally enable
 		-DWITH_PYTHON=OFF
 	)
diff --git a/net-misc/selfdhcp/Manifest b/net-misc/selfdhcp/Manifest
deleted file mode 100644
index 0b317ef1796f..000000000000
--- a/net-misc/selfdhcp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX selfdhcp-0.2a-buffer-overflow.patch 576 BLAKE2B 7b6d4193ca2e514b5f05e6594937d080c2d7d1c6a824dc976e6ee4481aa7a67fdf7188b159bf546c1c798c624b9a1ffbb8dd9a9bf269f5b6274fedfc4f37db19 SHA512 c0e6315d316d4cfca150c31edc7bfa613b0089580bba5ae67c3023b501558b943b68cccb24e95aece9b6b2fe26b4c63bcce75d9e743fc19f5c90b2fade7004b4
-DIST selfdhcp-0.2a.tar.bz2 162803 BLAKE2B 694719fa4da516afe7ff1b9712b78c05edff51e3c0dcdf67ca0950d1f0ff05e8f8ed70e439c5a9d72ad3cfb9bffb6c723a98c9bbb7141d2c73fd885baccdf098 SHA512 3ffb8a6115502c201b37a6c4179f498d4847d469f5d271dd9408d7fe5714d1ebe10428c890d8ab943a6753f3fbc650730139a78b1f71c9972739ea4b886a53bf
-EBUILD selfdhcp-0.2a-r2.ebuild 579 BLAKE2B 2e6c059bd9018cc98b7893be564547213f8a17558da1e6b1b6ab559cff4a6fa8facc04b627494e794a2b01303803e62ea4c6fe20351c8408e0bb8a37a1ecc47a SHA512 f3e7c5f6235fd30c810da36a7a570e19dfefa40eb04284fcf4adb73fe2530c927a766f6a9dc07d91d4d0419a59d1973a8afc4e64d3cfa75d1b89e7416bf0c6a3
-MISC metadata.xml 246 BLAKE2B 24a57707d6b4081dea5624b1bd703647beec65fc4c1a80592cbb5168f6518383bbbff6e5e8e7314709e850bfb9a4b16fb805389ca4f46802cf4a47fa557576a2 SHA512 f5bb89caf57e57663ffd4503e8183f20da49789c22f7e1c94d5ab0e3d9ee062bd4234507364405d65f71ad011d54486c4b01ba414038a19605e2d1a93c67a92e
diff --git a/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch b/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch
deleted file mode 100644
index 6f99f7dea895..000000000000
--- a/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- selfdhcp-0.2a.orig/src/selfdhcp_profiles.c	2004-08-02 18:10:36.000000000 -0400
-+++ selfdhcp-0.2a/src/selfdhcp_profiles.c	2011-01-29 11:54:29.132199679 -0500
-@@ -345,7 +345,7 @@
- 	{
- 	  key = xmlNodeListGetString (doc, cur->xmlChildrenNode, 1);
- 	  err_msg (DBG_PROG, "xml element \"%s\"", (char *) key);
--	  strncpy (netconf_buff.domainname, (char *) key, 49);
-+	  strncpy (netconf_buff.domainname, (char *) key, sizeof(netconf_buff.domainname)-1);
- 	  netconf_buff.what_is_set &= NETADDR;
- 	  err_msg (DBG_INFO, "read domain name \"%s\"",
- 		   netconf_buff.domainname);
diff --git a/net-misc/selfdhcp/metadata.xml b/net-misc/selfdhcp/metadata.xml
deleted file mode 100644
index 1bb5d2d43990..000000000000
--- a/net-misc/selfdhcp/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">selfdhcp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/selfdhcp/selfdhcp-0.2a-r2.ebuild b/net-misc/selfdhcp/selfdhcp-0.2a-r2.ebuild
deleted file mode 100644
index 2360e41ade5b..000000000000
--- a/net-misc/selfdhcp/selfdhcp-0.2a-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Small stealth network autoconfigure software"
-HOMEPAGE="http://selfdhcp.sourceforge.net"
-SRC_URI="mirror://sourceforge/selfdhcp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
-
-DEPEND="
-	dev-libs/popt
-	dev-libs/libxml2:2=
-	>=net-libs/libnet-1.0.2:1.0
-	net-libs/libpcap
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-buffer-overflow.patch"
-)
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/net-misc/sntpd/Manifest b/net-misc/sntpd/Manifest
index b8694bf28e14..abab4a151a93 100644
--- a/net-misc/sntpd/Manifest
+++ b/net-misc/sntpd/Manifest
@@ -1,5 +1,5 @@
 AUX sntpd.confd 243 BLAKE2B fc2d82b48e8b57e346ebe5fc65750368b09dce96dadbc159033d7181e9bf0a71794969b24310975b72d10faa22753ca3cc751c03b3f0775aa085f39d87f695f0 SHA512 b2ecb3e96418d36504c8ceab5ec88f7415e7fc32c00bd9fee0eb6fb643f207b5c0e481427e1fdb7a3e52a5bc2619b67363e7c27dd48e67eab61910906b86df3f
 AUX sntpd.initd-r1 281 BLAKE2B e16573772a24d6c6380dcb769a2f87f73249aff34c4bc6ffa67700374ede21ba318d0d5c0c444f304cbea5feb613a2eb70d07e8aebf5fe291f3da0358becc487 SHA512 38d3950d774132114fe7270c8c39a44428e89372bcdb7833cef75e5775579dc88679b9f167ed29e3e7e620927a0365d2de7c94fb263b414439deb061a8c1db9d
 DIST sntpd-3.1.tar.gz 157608 BLAKE2B 3a793e50bc2ee4e5540e10b134ab945bc0993a81342735c3046798738ee14206cdcbaa4d3a316031bd39aaee3ed4c702db2cf85b8ad64ac5d90e19d35c467abf SHA512 6d7693ecf0167aba59a1947c707894896e2b3caaef75354a5794341fce61062562c1c5521b60ddc6154af73837360e3946121c82e3414bb96663747cfc2ea487
-EBUILD sntpd-3.1.ebuild 821 BLAKE2B 30e7f09a477c5c32f17c41b716cee4ac37ff8bf4ff80300ce20bb5bce34c940386765f637a0043654aba1b4b0c9aeb198e4b6bb8fd49cc4cf8e5b09a673a8b7b SHA512 1b42c5cb63c5ca2c539e8a39a02c6bdba8b03ddb26242bcf0eadbec3679cbc394571494d6d6152d5720a04dd5024a263ce096fde1b97eb10bc0b53d2049e4f6b
+EBUILD sntpd-3.1-r1.ebuild 858 BLAKE2B 0d3f39f8d2feaf49ad28704c56e9e4b557b5d6c00804f88f53cd4121efac984435e639eb72c2314025ad30aedee39a40f93ba6fd3480e26903797d932492c19d SHA512 09d2cdbeec1e63ad24e29421997fb4b52df3f78202080489b99a5d427f8c889d6b2a722bd30bfa57a9d1de1cb87af42a4134a56b8ef2fdd4713e509a177015a7
 MISC metadata.xml 864 BLAKE2B 792f0d4f6bf3a453966216cab177d3153b4c270817105e10c3e6340293d73320f00871e5efac9344932fbc5e98b85ed50ddf9dbdc0297f3fccca5b53e842de20 SHA512 49614bcd58a7a2d0e596d4ab489f7a9f23be574e4aec3f7911b61cd7a6ac417ac39241c594f2a1111af9a9fe542bd4c24a303009ad9cd9726f4800f09bcc1a77
diff --git a/net-misc/sntpd/sntpd-3.1.ebuild b/net-misc/sntpd/sntpd-3.1-r1.ebuild
index f7b2bb80a6a1..97c84bd647d9 100644
--- a/net-misc/sntpd/sntpd-3.1.ebuild
+++ b/net-misc/sntpd/sntpd-3.1-r1.ebuild
@@ -14,7 +14,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="adjtimex systemd"
 
-RDEPEND="systemd? ( sys-apps/systemd )"
+RDEPEND="
+	adjtimex? ( !net-misc/adjtimex )
+	systemd? ( sys-apps/systemd )
+"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 73e940577b44..326c5d47d880 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -3,7 +3,7 @@ DIST spice-gtk-0.40-meson-0.63.patch.xz 5932 BLAKE2B 5188e4623602457554312522640
 DIST spice-gtk-0.40.tar.xz 848688 BLAKE2B 1046361ca40037bca826759bd7dc86f522640d39c08b1579f8e25bc2a2510665034445f7421d4de0485df9ef868e19779000c643035842f18e16555e3a1936b3 SHA512 b6db8b56c5c36158d97b3f7690d18883c4d6076e4ed1de1763fc704f9a2397b60d6170b70882d7d0a977b32be334756b7a27d66849f53e4d3b82abb8a54a0892
 DIST spice-gtk-0.41.tar.xz 827320 BLAKE2B bed8e62647ca9fde8a3b534a3d9720dee829f222442edb589e6ff569ce9a49f16e3c99bad4798a22e8a551d0d89875043c2335e2b08a80901483ace6a1948d6d SHA512 bfd97c98c8bdbc29da0f26c38dfcf75d9f17e5358d4c7fa9c36e4974d0df3ce92409ca568dfc790d43f581d00b94090d9e60154e83220a719d678b596c87fcef
 EBUILD spice-gtk-0.40-r1.ebuild 3889 BLAKE2B 7c07c418da5ba8843fa99bc4db763d76b018f40f08a9fca5b44c43735339ec450a32fa40986c2eebf321ed1a4df573c0abb80e121b3e6ef013e342d609cc89cd SHA512 021636c851a432aea5cc199c7e51c902f4c5f56cb07e8f5e2536e0c9f060a67abf888cd16d9764e0e41380cf35f6fa66b4af3e6c74a3fac5ad4c05cec3bb5495
-EBUILD spice-gtk-0.41-r1.ebuild 3737 BLAKE2B 5240c3bd92556bc95249c8eb12457344a98134da51cd7b0999526740545f160e2098238efd043f4f12d18c5a655322a9a188e9eaf48f6061542a5cac4680a45a SHA512 cd612eb2ad03f5661b7192dbc532377c95b6bcfec7c2f534c9b1fb2ebb748461303d81ab364e0c551ca0da94082a36c8abe9e847c61dbb642a1f62cfa2b8eec0
+EBUILD spice-gtk-0.41-r1.ebuild 3735 BLAKE2B 7cd2fd0686a581df6876ed7cc689d05ee148981cba95dedd5c95d7b37c31e15d1251accfd50259103ca3632a315e43be2ebd0c9aea6bb4e1210db7c882bc0432 SHA512 84b4445a37e9ef79f26f02b4290023e61dcfe91eb2148abb46a2396da373678b5d86d56578a8f5a254c46bb354481b3b9c8ade9bc5886bd3cb32ee88e5e4279c
 EBUILD spice-gtk-0.41.ebuild 3751 BLAKE2B 476ca6d3b3e6b888ddfb114db3b38af66967c10b43bbe6de002a22c6186609556197cf6e422a6bcfc7bc23d1ec8886ba6730372a546c125e9e89deff24a53d10 SHA512 eba4387655296ae12ef9acfec3ad268746a03aa2120ad70ffc655391655de3cf4f5a514e4a24e93db61e68e80bc52a458d81ed938402c298122522a28b5b4aec
 EBUILD spice-gtk-9999.ebuild 3737 BLAKE2B 5240c3bd92556bc95249c8eb12457344a98134da51cd7b0999526740545f160e2098238efd043f4f12d18c5a655322a9a188e9eaf48f6061542a5cac4680a45a SHA512 cd612eb2ad03f5661b7192dbc532377c95b6bcfec7c2f534c9b1fb2ebb748461303d81ab364e0c551ca0da94082a36c8abe9e847c61dbb642a1f62cfa2b8eec0
 MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa
diff --git a/net-misc/spice-gtk/spice-gtk-0.41-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.41-r1.ebuild
index 1485ff5c48c7..65c82da82c83 100644
--- a/net-misc/spice-gtk/spice-gtk-0.41-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.41-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SPICE_PROTOCOL_VER=9999
 else
 	SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 	SPICE_PROTOCOL_VER=0.14.3
 fi
diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index 81900aa15c17..f3a17fb798ab 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,5 +1,5 @@
 DIST ytfzf-2.5.2.tar.gz 3263326 BLAKE2B aa0e6b01ba90217df1e488cfbe74f44baadee0fa5f6e29f45ef79af9a0d9587ef394b345ddf6b8a86282f57f097c6728adccba2e444eda38d1746ae95438900f SHA512 aa87d2f3c50bfed3c49d363b23bdf17c6c5307116648f3042148d828d204cc9f1ce61888a82fade26e46dc46991cb2c8f559f5f9aa671d8bcf425d343fdff389
 DIST ytfzf-2.5.3.tar.gz 3265442 BLAKE2B e920bf60a567741cc84739d20f282c27036eafaa823ea273439e49f9b855798a11f611ee8b4893490538d24c3039f2780451272f82ead73c45fb0f2124e05417 SHA512 fcc9e6064fe381972f30a94fd418ba9a497fed4be891f40b75e608a4c095f7b311000ae104d8e877b52622defa4ff57cb0ec1ace4d034ba08f0ff3985438d58d
 EBUILD ytfzf-2.5.2.ebuild 1428 BLAKE2B e2eddcee03517c5a01ceac852c4e4945f3da15d3fcb96f9fa028dafd4a0d52884e5b19e1ed0660ad49d4155b4171b88f731e16599ef26ff1f4c582ed77bb7992 SHA512 07d64edc61bb5ecd11ea4f88622da466999f353fb0b25cd86a3c9cd386739ec61e9f641ad082cb8113f4fd555a8e7d00347516f5153925173027ca6821ccff3a
-EBUILD ytfzf-2.5.3.ebuild 1430 BLAKE2B f8b722defcf794c1b277ac83848a1e66bd7c8d8f7abfd1c42f30cf5e52240fbb456d0cb6c98d5ea52ba7b64ccfe0dcfee1cefa705172f3f77f3afa7196c94478 SHA512 02ceb6563b21541e37c6891a36dcea7f419185a50cd833b9e67d94723ab730d0c0b5be85948b36b9d25d73d1691f5e2b7b32f8eb497411a811e5015e7c3c988f
+EBUILD ytfzf-2.5.3.ebuild 1428 BLAKE2B e2eddcee03517c5a01ceac852c4e4945f3da15d3fcb96f9fa028dafd4a0d52884e5b19e1ed0660ad49d4155b4171b88f731e16599ef26ff1f4c582ed77bb7992 SHA512 07d64edc61bb5ecd11ea4f88622da466999f353fb0b25cd86a3c9cd386739ec61e9f641ad082cb8113f4fd555a8e7d00347516f5153925173027ca6821ccff3a
 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/ytfzf-2.5.3.ebuild b/net-misc/ytfzf/ytfzf-2.5.3.ebuild
index 13c448f9f13f..5be910b165b7 100644
--- a/net-misc/ytfzf/ytfzf-2.5.3.ebuild
+++ b/net-misc/ytfzf/ytfzf-2.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X minimal"
 
 RDEPEND="
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index d6d9b3cf7b28..e09b2a064cf9 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/yp-tools/Manifest b/net-nds/yp-tools/Manifest
index fe73965c4eeb..de21599a5c2c 100644
--- a/net-nds/yp-tools/Manifest
+++ b/net-nds/yp-tools/Manifest
@@ -1,5 +1,5 @@
 AUX domainname.service 165 BLAKE2B b36bb4877585f69503c319743a2e78f62f419852f235498791b007c4477d8622934263e3690cc2ba619d1c8ba925ca682b379720126915e5057210d893027105 SHA512 dc6cc79a1e6636f31706901bec45adc479231c883e149748989c038d4a9e2d3b1e15e3ba45ca7276700c68600cf6489b92bc4ada0c8ba630921a6d8cb8368de6
 AUX domainname.service.conf 89 BLAKE2B 22b81d78eb5df449658413dd2b23ceab02376fca3c061e328a3db36f88b3840296db961748679c8df9719dfb6cf3f4fd100ad6ed79916585aa79edbcf27c7577 SHA512 529f85f41e8204cc3dda72eb3c94c81443b8aa9f5af1ce4cab4510cbc42da79a4554d223893f0a968afb4476898b8a74ea061f8e9f40518b3066584ea9c7ad6c
 DIST yp-tools-4.2.3.tar.gz 195247 BLAKE2B 5e068f6856876dbf55c25030730195222fd331a06b8d57aa8a797a42c90538289a61ea8de1a2fee2d173e3444f76f82d111fc1120c287f90b7dbad1a2be23313 SHA512 2fcdaaeb8af4c3f62aa571a488c04561356681fc18b919ef728cfc1941578870cce74b136959f49e4ab04f988a79252163c1abe30b357788cb0b5faca7b5d147
-EBUILD yp-tools-4.2.3-r1.ebuild 963 BLAKE2B 2ab58ae28b3523fd161ee3dd79f90e6dcdb1051925044f246d813a3559d17c286be0938ddb39cc34756038a160ec78f43c3df0f754d904fe48015fd77671fe36 SHA512 95fa5580310bfab02e52cb0caf808fcba951d50fcd73747df63efe5c810cf895fda67ade8626d6f57086b44ec95d3cbf37dfaf7af1e9be30b4bad0fbf526523b
+EBUILD yp-tools-4.2.3-r1.ebuild 992 BLAKE2B 2c52a7ed401b71e976c99756f6f23a56f8014a8c797c3b80f9754451fec6431c91f2db5d2090f864c87e83b83ae425a5df291cdbc0960ffc982de2d0c644d6d0 SHA512 37e65030c6ea4f7eac58a2ea14c4cd4853d01d575c9ec9fb3ce4abf95e89a7a9130413cdf6882accb23b865efa22a0c9e681113a65ea9443a53293fcfd9afabf
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-nds/yp-tools/yp-tools-4.2.3-r1.ebuild b/net-nds/yp-tools/yp-tools-4.2.3-r1.ebuild
index ad99f5637bd4..b3b55f59117f 100644
--- a/net-nds/yp-tools/yp-tools-4.2.3-r1.ebuild
+++ b/net-nds/yp-tools/yp-tools-4.2.3-r1.ebuild
@@ -20,7 +20,8 @@ DEPEND="
 	>=net-libs/libnsl-1.2.0:0=
 	virtual/libcrypt:=
 	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!sys-apps/net-tools[nis(-)]"
 BDEPEND="virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a0d5948424d9..f383670d5701 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 06697fc1a8ab..9ed88dd6ea08 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -154,7 +154,6 @@ app-metrics/ceph_exporter
 # Broken multilib dependencies.
 net-im/mattermost-desktop-bin
 net-im/skypeforlinux
-net-im/skype-dbus-mock
 net-im/slack
 
 # Pawel Hajdan jr <phajdan.jr@gentoo.org> (2012-10-07)
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index a7391b3a0165..761e902c8763 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -315,11 +315,6 @@ net-analyzer/rrdtool rados
 # (bug #544378)
 dev-db/mariadb galera
 
-# Jeroen Roovers <jer@gentoo.org> (2015-02-02)
-# dev-python/gevent requires dev-python/greenlet which has not been ported to
-# HPPA (bug #538510)
-mail-filter/pyzor gevent
-
 # Jeroen Roovers <jer@gentoo.org> (2014-10-19)
 # requires dev-python/restkit which requires
 # dev-python/socketpool which requires dev-python/gevent which requires
diff --git a/profiles/arch/ia64/package.mask b/profiles/arch/ia64/package.mask
index 306248001cef..9561824f89ba 100644
--- a/profiles/arch/ia64/package.mask
+++ b/profiles/arch/ia64/package.mask
@@ -1,9 +1,7 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-05-02)
 # greenlet needs arch-specific stack switching code. There is no ia64 port.
-dev-python/gevent
-dev-python/geventhttpclient
 dev-python/greenlet
 virtual/python-greenlet
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 7bc44f63108e..5908600be6d3 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -296,11 +296,6 @@ sci-libs/gdal armadillo
 # Pulls in dev-db/redis which is not keyworded on ia64.
 mail-filter/pyzor test
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2017-06-17)
-# dev-python/gevent requires dev-python/greenlet which has not been ported to
-# ia64 (bug #538510)
-mail-filter/pyzor gevent
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2017-06-10)
 # media-libs/libilbc has not been ported to ia64, bug #610546
 media-video/ffmpeg libilbc
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 76b00c18fc43..56637cb12e02 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (2022-12-20)
+# sys-cluster/ganglia is masked for removal.
+app-metrics/collectd collectd_plugins_gmond
+
 # Sam James <sam@gentoo.org> (2022-12-17)
 # Broken when trying to use sys-libs/binutils-libs header, bug #879067
 >=x11-libs/cairo-1.17.6 debug
@@ -56,17 +60,6 @@ mail-mta/notqmail authcram
 # Require packages masked for removal.
 net-analyzer/netdata kinesis
 
-# Michał Górny <mgorny@gentoo.org> (2022-11-17)
-# Requires dev-python/gevent that is masked for removal.
-x11-misc/py3status gevent
-dev-python/rpyc gevent
-mail-filter/pyzor gevent
-www-servers/uwsgi python-gevent
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-17)
-# Requires net-misc/pyhoca-cli that is masked for removal.
-net-misc/remmina x2go
-
 # Matt Turner <mattst88@gentoo.org> (2022-11-16)
 # gnome-music and gnome-photos have not been ported to libsoup:3.0, while
 # other non-slotted dependencies have been.
@@ -395,7 +388,6 @@ www-servers/apache apache2_modules_lua
 # Old phpunit does not work with new PHP and last is vulnerable
 <dev-php/PEAR-Crypt_GPG-1.6.4 test
 dev-php/PEAR-Text_Wiki_Mediawiki test
-dev-php/PEAR-VersionControl_SVN test
 dev-php/PHP_CodeSniffer test
 dev-php/php-redmine-api test
 dev-php/phptal test
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 50bc29cfdf2a..ad0cbabe6125 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -209,7 +209,6 @@ net-im/gitter-bin
 net-im/mattermost-desktop-bin
 net-im/rocketchat-desktop-bin
 net-im/skypeforlinux
-net-im/skype-dbus-mock
 net-im/slack
 net-im/teams
 net-im/telegram-desktop-bin
diff --git a/profiles/package.mask b/profiles/package.mask
index b577dee4ac53..efed1ef727f1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,29 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2022-12-20)
+# Pending version bump since 2015.  No new upstream releases since.
+# Removal on 2023-01-19.  Bug #887489.
+sys-cluster/ganglia
+
+# Michał Górny <mgorny@gentoo.org> (2022-12-20)
+# Unmaintained.  Pending version bump since 2019.  Even then, the newest
+# upstream release has known vulnerabilities.
+# Removal on 2023-01-19.  Bug #696480.
+sys-cluster/ganglia-web
+
+# Michał Górny <mgorny@gentoo.org> (2022-12-20)
+# Proprietary MPEG library that is no longer fetchable.  No reverse
+# dependencies.
+# Removal on 2023-01-19.  Bug #759190.
+media-video/mpeg2vidcodec
+
+# Michał Górny <mgorny@gentoo.org> (2022-12-20)
+# An unmaintained library that was "quickly whipped up for some demos".
+# Last bumped in 2011.  No reverse dependencies.
+# Removal on 2023-01-19.  Bug #847406.
+media-libs/guilib
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-12-19)
 # This version currently is not compatible with kernel build (yet)
 ~dev-util/bindgen-0.63.0
@@ -525,165 +548,6 @@ net-misc/gnome-online-miners
 # Removal: 2022-12-21.
 dev-python/glob2
 
-# David Seifert <soap@gentoo.org> (2022-11-21)
-# Release more than 30 years (!) old, K&R C, full of implicit function
-# declarations, EAPI 6, problematic license. Bug #729536, #854879, #870736.
-# Removal on 2022-12-21.
-app-text/agrep
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-19)
-# Fails to build.  Last bumped in 2017.  Library with no revdeps.
-# Removal on 2022-12-19.  Bug #630396.
-dev-cpp/pstreams
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-19)
-# Packages with no maintainer and major bugs reported.  They are either
-# inactive upstream, or have not been bumped for a long time.
-#
-# app-emulation/aqemu: bug #806421, last bumped in 2016
-# app-forensics/ovaldi: revdep of dev-libs/xalan-c, last bumped in 2017
-# app-misc/glimpse: bug #684096, last bumped in 2013
-# dev-db/cpp-driver: bug #685936, last bumped in 2019
-# dev-erlang/riakc: bug #722688, last bumped in 2016
-# dev-util/stubgen: bug #839927, last bumped in 2011
-# media-gfx/xzgv: bug #831252, last bumped in 2009
-# net-dns/dnssec-check: bug #571350, last bumped in 2016
-# net-mail/cmd5checkpw: bug #833292, last bumped in 2005
-# net-ftp/gproftpd: bug #550524, last bumped in 2007
-# sys-apps/intel-performance-counter-monitor: bug #728564,
-#                                             last bumped in 2016
-#
-# Removal on 2022-12-19.
-acct-group/cmd5checkpw
-acct-user/cmd5checkpw
-app-emulation/aqemu
-app-forensics/ovaldi
-app-misc/glimpse
-dev-db/cpp-driver
-dev-erlang/riakc
-dev-util/stubgen
-media-gfx/xzgv
-net-dns/dnssec-check
-net-mail/cmd5checkpw
-net-ftp/gproftpd
-sys-apps/intel-performance-counter-monitor
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-19)
-# Packages with reported failures and no maintainer activity.
-#
-# media-sound/retrovol: bug #624136, last bumped in 2013, homepage dead
-# media-sound/umix: bug #726076, last release in 2003 (!)
-#
-# Removal on 2022-12-19.
-media-sound/retrovol
-media-sound/umix
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-19)
-# Agavi and its dependencies that are unmaintained and have no other
-# reverse dependencies.  It has received no activity since 2016,
-# and at least PEAR-VersionControl_SVN has reported test failures.
-# Removal on 2022-12-19.  Bug #737854.
-dev-php/agavi
-dev-php/phing
-dev-php/PEAR-PEAR_PackageFileManager
-dev-php/PEAR-PEAR_PackageFileManager2
-dev-php/PEAR-PEAR_PackageFileManager_Plugins
-dev-php/PEAR-VersionControl_SVN
-dev-php/phpmd
-dev-php/simpletest
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-18)
-# These packages still lack support for Python 3.10.  In general, they
-# did not see any activity recently and either have no maintainer
-# or their respective maintainers did not reply to the bug.  Many
-# of them do not have tests enabled or have unresolved test failures.
-# Removal on 2022-12-18.  Tracker bug #823185.
-app-admin/ansible-cmdb
-app-arch/bloscpack
-app-backup/borgweb
-app-i18n/fcitx-sunpinyin
-app-i18n/ibus-kkc
-app-i18n/ibus-sunpinyin
-app-i18n/libkkc
-app-i18n/libkkc-data
-app-i18n/sunpinyin
-app-i18n/sunpinyin-data
-app-i18n/xsunpinyin
-app-portage/distpatch
-app-text/q-text-as-data
-app-vim/pydiction
-app-vim/vimoutliner
-dev-libs/aws-sdk-cpp
-dev-python/Rx
-dev-python/bert
-dev-python/flask-assets
-dev-python/libpy_simdjson
-dev-python/pytest-salt
-dev-python/requests_pkcs12
-dev-python/slackclient
-dev-python/tvdb_api
-dev-python/webassets
-dev-python/ws4py
-dev-util/comparator
-dev-util/rosinstall_generator
-games-util/pyfa
-mate-extra/caja-hide
-media-gfx/netpaint
-media-plugins/mythplugins
-media-sound/marrie
-media-tv/tvnamer
-net-analyzer/carl
-net-im/skype-dbus-mock
-sci-libs/bmrblib
-sci-mathematics/relational
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-17)
-# Rarely used package with very high maintenance cost.  Hacky, requires
-# explicit support code for every architecture, effectively preventing
-# it from being keyworded on some of the Gentoo architectures.  The test
-# suite is problematic.  The current release blocks dev-python/greenlet
-# upgrade, the new release fails many tests again.
-# Removal on 2022-12-17.  Bug #879011.
-dev-python/gevent
-dev-python/geventhttpclient
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-17)
-# Requires dev-python/gevent that is going to be masked for removal.
-# net-misc/x2goclient remains as a replacement.
-# Removal on 2022-12-17.  Bug #879011.
-net-misc/pyhoca-cli
-net-misc/pyhoca-gui
-net-misc/python-x2go
-
-# Matthew Smith <matthew@gentoo.org> (2022-11-17)
-# libnet:1.0's remaining rdeps. Dead upstreams.
-# Removal on 2022-12-17. Bug #881677
-net-libs/libnet:1.0
-net-analyzer/angst
-net-analyzer/egressor
-net-analyzer/thcrut
-net-dns/dnshijacker
-net-misc/selfdhcp
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-17)
-# No maintainer.  No upstream activity since 2020.  Multiple bugs
-# reported.
-# Removal on 2022-12-17.  Bug #881673.
-app-admin/prelude-manager
-dev-libs/libprelude
-dev-libs/libpreludedb
-net-analyzer/prelude-correlator
-net-analyzer/prelude-lml-rules
-net-analyzer/prelude-lml
-sec-policy/selinux-prelude
-www-apps/prewikka
-
-# Michał Górny <mgorny@gentoo.org> (2022-11-15)
-# Test-restricted since its introduction in 2016.  Not receiving package
-# maintainer's attention.  No revdeps left.
-# Removal on 2022-12-15.  Bug #759931.
-dev-python/pytest-html
-
 # Jonas Stein <jstein@gentoo.org> (2022-11-13)
 # Dead upstream
 # Removal after 2023-01-01.  Bug #881249.
diff --git a/profiles/updates/3Q-2017 b/profiles/updates/3Q-2017
index e33c4396852c..86a00c423c04 100644
--- a/profiles/updates/3Q-2017
+++ b/profiles/updates/3Q-2017
@@ -16,7 +16,6 @@ slotmove app-i18n/fcitx-m17n 0 4
 slotmove app-i18n/fcitx-qt5 0 4
 slotmove app-i18n/fcitx-rime 0 4
 slotmove app-i18n/fcitx-sayura 0 4
-slotmove app-i18n/fcitx-sunpinyin 0 4
 slotmove app-i18n/fcitx-table-extra 0 4
 slotmove app-i18n/fcitx-unikey 0 4
 slotmove app-i18n/kcm-fcitx 4 4-plasma4
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 591639ebe414..75067c9f3876 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -95,7 +95,6 @@ app-admin/pass-otp:qrcode - Add support for qrcodes using media-gfx/qrencode
 app-admin/passwordsafe:qr - Enable QR code password display
 app-admin/passwordsafe:xml - Enable XML import support
 app-admin/passwordsafe:yubikey - Enable support for Yubikey
-app-admin/prelude-manager:dbx - Enables Prelude Manager storing Prelude alerts into database through dev-libs/libpreludedb
 app-admin/puppet:augeas - Enable augeas support
 app-admin/puppet:diff - Enable diff support
 app-admin/puppet:rrdtool - Enable rrdtool support
@@ -777,7 +776,6 @@ app-i18n/ibus-handwrite:zinnia - Enable support for app-i18n/zinnia
 app-i18n/ibus-libpinyin:boost - Compile against dev-libs/boost libraries
 app-i18n/ibus-libpinyin:opencc - Enable support for app-i18n/opencc
 app-i18n/ibus-pinyin:boost - Enable support for dev-libs/boost
-app-i18n/ibus-sunpinyin:gui - Install graphical user interface tool (ibus-setup-sunpinyin)
 app-i18n/im-chooser:xfce - Enable support for XFCE panel
 app-i18n/imsettings:xfconf - Enable support for xfce-base/xfconf
 app-i18n/librime:debug - Enable debugging (including logging of input of RIME input methods)
@@ -1811,86 +1809,6 @@ dev-libs/apr:urandom - Use /dev/urandom instead of /dev/random
 dev-libs/apr-util:nss - Install apr_crypto_nss module
 dev-libs/apr-util:openssl - Install apr_crypto_openssl module
 dev-libs/atcore:gui - Build test GUI
-dev-libs/aws-sdk-cpp:access-management - AWS Access Management, a meta-flag that enables: AWS Certificate Manager (ACM): Provision, manage, and deploy SSL/TLS certificates on AWS managed resources. AWS Data Exchange : A service that makes it easy for customers to find, subscribe to, and use third-party data in the AWS Cloud. AWS IAM Access Analyzer : Identify any policies that grant access to an external principal. Identity and Access Management (IAM): A web service for securely controlling access to AWS services. Resource Access Manager (RAM): Customers who operate multiple accounts can create resources centrally and use AWS RAM to share them with all of their accounts to reduce operational overhead. SSO : AWS Single Sign-On (SSO) makes it easy to centrally manage access to multiple AWS accounts and business applications and provide users with single sign-on access to all their assigned accounts and applications from one place. Also enables acm-pca, identity-management, identitystore, sso-admin, sso-oidc and sts (Security Token Service).
-dev-libs/aws-sdk-cpp:apigateway - Create and deploy your own REST and WebSocket APIs at any scale. Also enables apigatewaymanagementapi and apigatewayv2.
-dev-libs/aws-sdk-cpp:appconfig - Quickly deploy application configurations to applications of any size.
-dev-libs/aws-sdk-cpp:backup - AWS Backup is a fully managed backup service
-dev-libs/aws-sdk-cpp:batch - Run batch computing workloads on the AWS Cloud
-dev-libs/aws-sdk-cpp:budgets - Use AWS Budgets to plan service usage, service costs, and instance reservations. Also enables the following related modules: AWS Cost Explorer (CE) : Programmatically query cost and usage data. Cost and Usage Report (CUR): Programmatically create, query, and delete AWS Cost and Usage report definitions.
-dev-libs/aws-sdk-cpp:chime - Amazon Chime, a secure, real-time, unified communications service.
-dev-libs/aws-sdk-cpp:cloud-desktop - AWS end user computing services. AppStream 2.0: Fully managed, secure application streaming service. WorkDocs : Fully managed, secure enterprise storage and sharing service. WorkLink : Fully managed, cloud-based service that enables secure, one-click access to internal websites and web apps from mobile devices. WorkMail : Managed email and calendaring service. WorkSpaces : Cloud-based desktop experience for end users. Also enabled workmailmessageflow.
-dev-libs/aws-sdk-cpp:cloud-dev - Enables in-cloud developer tools: Cloud9 : Cloud-based integrated development environment IDE to write, run, and debug code. CodeArtifact: Secure and scalable artifact management service for software development. CodeBuild : Managed build service that compiles, runs unit tests and produces artifacts. CodeCommit : Privately store and manage Git repositories in the AWS cloud. CodeDeploy : Automate the deployment and updating of applications. CodeGuru : Provides intelligent recommendations for improving application performance, efficiency, and code quality in your Java applications. CodePipeline: Continuous delivery service to model, visualize, and automate the steps required to release software. CodeStar : Quickly develop, build, and deploy applications on AWS. Also enables codestar-connections and codestar-notifications. Honey Code : Fully managed service to quickly build mobile and web apps for teams. Queues : Simple queue class. Allows standard queue operations top, delete, and push. Also has higher level, asynchronous interface with callbacks. X-Ray : Provides request tracing, exception collection, and profiling capabilities.
-dev-libs/aws-sdk-cpp:cloud-media - AWS Media modules for transforming, converting, delivering and streaming media. Elastic Transcoder : Convert media files stored in Amazon S3 into media files in the formats required by consumer playback devices. Elemental Media Connect: Secure and flexible transport service for live video. Elemental Media Convert: Format and compress offline video content for delivery to televisions or connected devices. Elemental Media Live : Video service that allows easy and reliable creation of live outputs for broadcast and streaming delivery. Elemental Media Package: Just-in-time video packaging and origination service. (Includes mediapackage-vod) Elemental Media Store : Video origination and storage service.Manage video assets as objects in containers to build dependable, cloud-based media workflows. (Includes mediastore-data) Elemental Media Tailor : Personalization and monetization service that allows scalable server- side ad insertion.
-dev-libs/aws-sdk-cpp:cloud-mobile - AWS Mobile modules for handling mobile application management and delivery. Amplify : Comprehensive set of SDKs, libraries, tools, and documentation for client app development. AppSync : Enterprise level, fully managed GraphQL service with real-time data synchronization and offline programming features. Device Farm: Test iOS, Android and Fire OS apps on real, physical phones and tablets that are hosted by AWS. PinPoint : Engage customers by sending them email, SMS and voice messages, and push notifications. (Includes pinpoint-email and sms-voice) SNS : Amazon Simple Notification Service, see USE flag sns. Also enables mobile and mobileanalytics.
-dev-libs/aws-sdk-cpp:cloudformation - Create and provision AWS infrastructure deployments predictably and repeatedly. Use a template file to create and delete a collection of resources together as a single unit (a stack).
-dev-libs/aws-sdk-cpp:cloudfront - Delivers static and dynamic web content through a worldwide network of edge locations that provide low latency and high performance.
-dev-libs/aws-sdk-cpp:cloudhsm - Secure cryptographic key storage by providing managed hardware security modules in the AWS Cloud. Also enables cloudhsmv2.
-dev-libs/aws-sdk-cpp:cloudsearch - Fully managed service in the cloud to set up, manage, and scale a search solution for websites. Also enables cloudsearchdomain.
-dev-libs/aws-sdk-cpp:cloudwatch - Amazon CloudWatch monitors Amazon Web Services (AWS) resources and the applications run on AWS in real time. The following modules besides monitoring are also enabled: Application Insights: Monitor .NET and SQL Server applications. App Mesh : Monitor and control microservices running on AWS. Audit Manager : Helps to continuously audit your AWS usage to simplify how you manage risk and compliance with regulations and industry standards. CloudTrail : Monitor AWS deployments in the cloud by getting a history of AWS API calls, including API calls made via the AWS Management Console, the AWS SDKs, the command line tools, and higher-level AWS services. Compute Optimizer : Recommends optimal AWS compute resources for your workloads. Detective : Analyze, investigate, and identify the root cause of security findings or suspicious activities. DevOps Guru : Generates operational insights using machine learning to help to improve the performance of operational applications. GuardDuty : Continuous security monitoring service. Health : Provides personalized information about events that can affect the AWS infrastructure, guides through scheduled changes, and accelerates the troubleshooting of issues that affect AWS resources and accounts. Inspector : A security vulnerability assessment service that helps improve the security and compliance of AWS resources. Logs : Monitor, store, and access log files from Amazon EC2 instances, AWS CloudTrail, or other sources. Synthetics : Create canaries, configurable scripts that run on a schedule, to monitor your endpoints and APIs.
-dev-libs/aws-sdk-cpp:cognito - Create unique identities, authenticate these identities with identity providers and save mobile user data in the AWS Cloud. Enables cognito-identity, cognito-idp and cognito-sync
-dev-libs/aws-sdk-cpp:config - Provides a detailed view of the resources associated with your AWS account, including how they are configured, how they are related to one another, and how the configurations and their relationships have changed over time.
-dev-libs/aws-sdk-cpp:dlm - Amazon Data Lifecycle Manager (DLM): Manage the lifecycle of AWS resources. Create lifecycle policies to automate operations on specified resources.
-dev-libs/aws-sdk-cpp:ebs - Amazon Elastic Block Store (Amazon EBS) is a web service that provides block level storage volumes for use with EC2 instances. EBS volumes are highly available and reliable storage volumes that can be attached to any running instance and used like a hard drive.
-dev-libs/aws-sdk-cpp:ec2 - Amazon Elastic Compute Cloud (EC2) is a web service that provides resizeable computing capacity. This flag also enables the following modules: Auto Scaling : Set up dynamic and predictive scaling for scalable AWS resources. Also enables autoscaling-plans and application-autoscaling. EC2 Image Builder : Fully-managed AWS service that makes it easier to automate the creation, management, and deployment of customized, secure, and up-to-date “golden” server images that are pre-installed and pre-configured with software and settings to meet specific IT standards. Elastic File System: EFS provides file storage for Amazon EC2 instances. Savings Plan : Flexible pricing model that helps you save a significant percentage on Amazon EC2 and Fargate usage.
-dev-libs/aws-sdk-cpp:ecr - Amazon Elastic Container Registry (ECR) is a fully managed Docker container registry. Also enables Amazon ECR Public.
-dev-libs/aws-sdk-cpp:ecs - Amazon Elastic Container Service (ECS) is a highly scalable, fast, container management service.
-dev-libs/aws-sdk-cpp:eks - Amazon Elastic Kubernetes Service (EKS) is a managed service to run Kubernetes on AWS without own Kubernetes clusters. Also enables Amazon EMR on EKS.
-dev-libs/aws-sdk-cpp:elastic-inference - Amazon Elastic Inference is a service that allows you to attach low-cost GPU-powered acceleration to many Amazon machine instances in order to reduce the cost of running deep learning inference by up to 75%. Amazon Elastic Inference supports TensorFlow, Apache MXNet, and ONNX models through MXNet.
-dev-libs/aws-sdk-cpp:elasticache - Set up, manage, and scale distributed in-memory cache environments in the AWS Cloud
-dev-libs/aws-sdk-cpp:elasticbeanstalk - Quickly deploy and manage applications in the AWS Cloud.
-dev-libs/aws-sdk-cpp:elasticloadbalancing - Automatically distribute incoming application traffic across multiple targets, such as EC2 instances. Also enables elasticloadbalancingv2.
-dev-libs/aws-sdk-cpp:elasticmapreduce - Amazon Elastic MapReduce (EMR) processes large amounts of data efficiently using Hadoop processing combined with several AWS products.
-dev-libs/aws-sdk-cpp:email - Amazon Simple Email Service (Amazon SES): An email platform to send and receive email using ones own email addresses and domains. See: https://docs.aws.amazon.com/ses/latest/DeveloperGuide/Welcome.html Also enables sesv2
-dev-libs/aws-sdk-cpp:es - Amazon Elasticsearch Configuration Service (ES) is an API to create, configure, and manage Elasticsearch domains.
-dev-libs/aws-sdk-cpp:events - Serverless event bus service to connect applications with data from a variety of sources. Also enables eventbridge.
-dev-libs/aws-sdk-cpp:forecast - Amazon Forecast is a fully managed deep learning service for time-series forecasting. Time- series forecasting is useful in multiple domains, including retail, financial planning, supply chain, and healthcare. Also enables the forecastquery module.
-dev-libs/aws-sdk-cpp:frauddetector - Amazon Fraud Detector is a fully managed service that helps you detect suspicious online activities such as the creation of fake accounts and online payment fraud. With Amazon Fraud Detector, you can create a fraud detection ML model with just a few clicks and use it to evaluate online activities in milliseconds.
-dev-libs/aws-sdk-cpp:fsx - Amazon FSx is a fully managed service to launch and use shared file storage.
-dev-libs/aws-sdk-cpp:globalaccelerator - AWS Global Accelerator is a network layer service for accelerators to improve availability and performance for internet applications used by a global audience.
-dev-libs/aws-sdk-cpp:http - Enable http support via net-misc/curl
-dev-libs/aws-sdk-cpp:iot - AWS IoT This is a meta-flag for all Internet of Things modules provided by the SDK: iot : enables secure, bi-directional communication between Internet-connected things (such as sensors, actuators, embedded devices, or smart appliances) and the AWS Cloud over MQTT and HTTP. greengrass : Extends AWS onto physical devices so they can act locally on the data they generate. Installed are both Version 1 and Version 2. iot1click : A service for simple devices to trigger AWS Lambda functions that execute a specific action. iotanalytics : Provides advanced data analysis for AWS IoT. iotevents : Monitor equipment or device fleets for failures or changes in operation, and trigger actions when such events occur. iotsitewise : Easily collect, organize, and analyze data from industrial equipment at scale. iotthingsgraph: Integrated set of tools that enable developers to build IoT applications using devices and services that use different data representation standards and communication protocols. Also enables iot1click-devices, iot1click-projects, iotdeviceadvisor, iot-data, iotevents-data, iotfleethub, iot-jobs-data, iotsecuretunneling and iotwireless.
-dev-libs/aws-sdk-cpp:kendra - Amazon Kendra is a search service, powered by machine learning, that enables users to search unstructured text using natural language.
-dev-libs/aws-sdk-cpp:kinesis - Amazon Kinesis Collect, process, and analyze video and data streams in real time. The following modules besides kinesis are enabled: firehose : Load data streams into AWS data stores. ivs : Managed live streaming solution for creating interactive video experiences. kinesisanalytics: Process and analyze streaming data using SQL or Java. (Also enables kinesisanalyticsv2) kinesisvideo : Capture, process, and store video streams for analytics and machine learning. Additionally kinesis-video-archived-media, kinesis-video-media and kinesis-video-signaling are enabled.
-dev-libs/aws-sdk-cpp:kms - AWS Key Management Service (KMS) An encryption and key management service scaled for the cloud.
-dev-libs/aws-sdk-cpp:lambda - AWS Lambda: Run code without provisioning or managing servers.
-dev-libs/aws-sdk-cpp:lex - Amazon Lex is an AWS service for building conversational interfaces into applications using voice and text. Installed are both Version1 and Version 2. Also enables lex-models.
-dev-libs/aws-sdk-cpp:license-manager - Streamlines the process of bringing software vendor licenses to the cloud.
-dev-libs/aws-sdk-cpp:lightsail - The easiest way to get started with AWS for developers who just need virtual private servers
-dev-libs/aws-sdk-cpp:lookoutvision - Amazon Lookout for Vision enables you to find visual defects in industrial products, accurately and at scale.
-dev-libs/aws-sdk-cpp:machinelearning - The algorithms of Amazon Machine Learning create machine learning (ML) models by finding patterns in existing data. The service uses these models to process new data and generate predictions for application.
-dev-libs/aws-sdk-cpp:macie - A security service that uses machine learning to automatically discover, classify, and protect sensitive data in AWS. Also enables macie2
-dev-libs/aws-sdk-cpp:managedblockchain - Create and manage scalable blockchain networks using popular open source frameworks. Currently, Managed Blockchain supports the Hyperledger Fabric open source framework.
-dev-libs/aws-sdk-cpp:marketplace - AWS Marketplace is an online store where you can buy or sell software that runs on Amazon Web Services (AWS). Marketplace support consists of the marketplacecommerceanalytics module plus: Marketplace Entitlement Service: A contract verification feature that AWS Marketplace sellers can use to verify the amount of the sellers product (for example, end user licenses or storage, data, or compute capacity) the customer has purchased. Marketplace Metering Service : A pricing and metering feature that AWS Marketplace sellers can use to directly charge for their software along one of four dimensions: users, data, bandwidth, or hosts. Also enables marketplace-catalog, pricing and servicecatalog-appregistry.
-dev-libs/aws-sdk-cpp:mwaa - Amazon Managed Workflows for Apache Airflow (Amazon MWAA) is a managed service for Apache Airflow that makes it easy for you to build and manage your workflows in the cloud.
-dev-libs/aws-sdk-cpp:networkmanager - Transit Gateway Network Manager (Network Manager) enables you to create a global network, in which you can monitor your AWS and on-premises networks that are built around transit gateways.
-dev-libs/aws-sdk-cpp:opsworks - AWS OpsWorks is a simple and flexible way to create and manage stacks and applications. Also enables opsworkscm.
-dev-libs/aws-sdk-cpp:organizations - Account management service that to consolidate multiple AWS accounts into an organization to be centrally managed.
-dev-libs/aws-sdk-cpp:other - This is a meta-flag for rarely needed modules that in themselves need not much build time. If you would like to have any of the following modules to have their own USE flag, please open a bug report and it will most probably get one. The modules are: AWSMigrationHub, alexaforbusiness, appflow, appintegrations, braket, clouddirectory, comprehend, comprehendmedical, connect, connect-contact-lens, customer-profiles, datapipeline, databrew, datasync, directconnect, discovery, dms, docdb, ds, dynamodb, gamelift, glue, groundstation, healthlake, importexport, kafka, lakeformation, migrationhub-config, mq, mturk-requester, neptune, quicksight, redshift, robomaker, sdb, schemas, service-quotas, servicecatalog, servicediscovery, signer, sms, snowball, ssm, states, storagegateway, support and swf.
-dev-libs/aws-sdk-cpp:outposts - AWS Outposts brings native AWS services, infrastructure, and operating models to virtually any data center, co-location space, or on-premises facility. You can use the same services, tools, and partner solutions to develop for the cloud and on premises. Also enables s3outposts.
-dev-libs/aws-sdk-cpp:personalize - Real-time personalization and recommendations, based on the same technology used at Amazon.com. Also enables personalize-events and personalize-runtime.
-dev-libs/aws-sdk-cpp:polly - Amazon Polly A Text-to-Speech (TTS) cloud service that converts text into lifelike speech. Also enables text-to-speech, which needs you to enable pulseaudio support to work.
-dev-libs/aws-sdk-cpp:qldb - Amazon Quantum Ledger Database (Amazon QLDB) is a fully managed ledger database that provides a transparent, immutable, and cryptographically verifiable transaction log owned by a central trusted authority. You can use Amazon QLDB to track all application data changes, and maintain a complete and verifiable history of changes over time. Also enables qldb-session.
-dev-libs/aws-sdk-cpp:queues - AWS Queues is a simple queue class. Allows standard queue operations top, delete, and push. Also has higher level, asynchronous interface with callbacks.
-dev-libs/aws-sdk-cpp:rds - Amazon Relational Database Service (RDS) is a web service to set up, operate, and scale a relational database in the cloud. Also enables pi (Performance Insights) and rds-data.
-dev-libs/aws-sdk-cpp:rekognition - Add image and video analysis to applications.
-dev-libs/aws-sdk-cpp:resource-groups - AWS Resource Groups and Tag Editor Organize AWS resources into groups, tag resources using virtually any criteria, and manage, monitor, and automate tasks on grouped resources. Also enables resourcegroupstaggingapi. (Resource Groups Tagging API)
-dev-libs/aws-sdk-cpp:route53 - AWS Route 53 is a highly available and scalable Domain Name System (DNS) web service. Also enables route53domains and route53resolver.
-dev-libs/aws-sdk-cpp:rtti - Flag to enable/disable rtti within the library
-dev-libs/aws-sdk-cpp:s3 - Amazon Simple Storage Service Storage for the internet. Additionally to the s3 module, the following modules are activated: Athena : Interactive query service to analyze data in Amazon S3 using standard SQL. Glacier : Storage solution for cold data. Transfer for SFTP: Transfer files directly into and out of Amazon S3 using SFTP. Also enables s3-encryption, s3control and transfer.
-dev-libs/aws-sdk-cpp:sagemaker - Amazon SageMaker Fully managed machine learning service. With Amazon SageMaker, data scientists and developers can quickly and easily build and train machine learning models, and then directly deploy them into a production-ready hosted environment. Also enables sagemaker-a2i-runtime, sagemaker-edge, sagemaker-featurestore-runtime and sagemaker-runtime.
-dev-libs/aws-sdk-cpp:secretsmanager - Encrypt, store, and retrieve credentials for databases and other services.
-dev-libs/aws-sdk-cpp:securityhub - Provides a comprehensive view of the security state of AWS resources.
-dev-libs/aws-sdk-cpp:serverlessrepo - AWS Serverless Application Repository Enables teams, organizations, and individual developers to find, deploy, publish, share, store, and easily assemble serverless architectures.
-dev-libs/aws-sdk-cpp:shield - AWS Shield, protection against DDoS attacks
-dev-libs/aws-sdk-cpp:sns - Amazon Simple Notification Service (SNS) is a web service that enables applications, end-users, and devices to instantly send and receive notifications from the cloud.
-dev-libs/aws-sdk-cpp:sqs - Amazon Simple Queue Service (SQS): Fully managed message queuing service that makes it easy to decouple and scale microservices, distributed systems, and serverless applications.
-dev-libs/aws-sdk-cpp:textract - Amazon Textract to add document text detection and analysis to applications.
-dev-libs/aws-sdk-cpp:timestream - Store and analyze sensor data for IoT applications, metrics for DevOps use cases, and telemetry for application monitoring scenarios such as clickstream data analysis. Note: The two modules enabled are timestream-query and timestream-write.
-dev-libs/aws-sdk-cpp:transcribe - A transcription services for audio files. It uses advanced machine learning technologies to recognize spoken words and transcribe them into text. Also enables transcribestreaming.
-dev-libs/aws-sdk-cpp:translate - A neural machine translation service for translating text to and from English across a breadth of supported languages.
-dev-libs/aws-sdk-cpp:unity-build - Build using a single unified .cpp file for each service library. Reduces the size of static library binaries
-dev-libs/aws-sdk-cpp:waf - The Web Application Firewall (WAF) can monitor web requests that are forwarded to Amazon CloudFront distributions or an Application Load Balancer. Can also be used to block or allow requests based on conditions such as the IP addresses that requests originate from or values in the requests. Also enables fms, network-firewall, waf-regional and wafv2
-dev-libs/aws-sdk-cpp:wellarchitected - Use the AWS Well-Architected Tool to review your workloads against current AWS architectural best practices. The AWS Well-Architected Tool measures the workload and provides recommendations on how to improve your architecture.
 dev-libs/bitset:tcmalloc - Use tcmalloc from dev-util/google-perftools for allocations
 dev-libs/boehm-gc:large - optimize for large heap size (also increases max root sets)
 dev-libs/boost:context - Build and install the Boost.Context (and Boost.Fiber) library and all other Boost libraries that depend on it
@@ -2317,7 +2235,6 @@ dev-php/PEAR-HTTP_Request2:fileinfo - Force dev-lang/php to be compiled with fil
 dev-php/PEAR-HTTP_Request2:ssl - Force dev-lang/php to be compiled with ssl extension
 dev-php/PEAR-HTTP_Request2:zlib - Force dev-lang/php to be compiled with zlib extension
 dev-php/PEAR-PHP_Beautifier:cli - Require dev-lang/php to be built with the "cli" SAPI and install the php_beautifier script.
-dev-php/agavi:executable - Install the "agavi" executable used to manage projects. This requires dev-php/phing, and may be omitted if you are (for example) deploying an existing site to a production server.
 dev-php/maxmind-db-reader:extension - Build the C extension that uses dev-libs/libmaxminddb
 dev-php/pecl-apcu:lock-pthreadmutex - Enable pthread mutex locking
 dev-php/pecl-apcu:lock-pthreadrw - Enable pthread read/write locking
@@ -2328,7 +2245,6 @@ dev-php/pecl-memcached:igbinary - Enable support for the igbinary serializer
 dev-php/pecl-memcached:json - Enable support for json serialization
 dev-php/pecl-redis:igbinary - Enables igbinary serialisation support
 dev-php/pecl-redis:json - Enables json serializer support
-dev-php/phing:zip - Support zip archives by requiring said support in dev-lang/php.
 dev-php/swoole:http2 - Add support for HTTP/2 protocol via net-libs/nghttp2
 dev-python/PyQt5:bluetooth - Build bindings for the QtBluetooth module
 dev-python/PyQt5:dbus - Build bindings for the QtDBus module
@@ -2508,7 +2424,6 @@ dev-python/qiskit-terra:visualization - Enable visualization modules
 dev-python/rarfile:compressed - Enables the module to support compressed v3 archives by calling the app-arch/unrar.
 dev-python/rfc3986:idna - enable support for the IDNA specification (RFC 5891)
 dev-python/rpyc:gdb - Run tests depending on sys-devel/gdb
-dev-python/rpyc:gevent - Use dev-python/gevent for GeventServer
 dev-python/rpyc:numpy - Run tests depending on dev-python/numpy, dev-python/pandas
 dev-python/scipy:pythran - Use dev-python/pythran to accelerate runtime
 dev-python/scipy:sparse - Adds support for sparse solving with sci-libs/umfpack
@@ -2536,8 +2451,6 @@ dev-python/twisted:conch - include Twisted SSHv2 implementation
 dev-python/twisted:http2 - include http2 support
 dev-python/twisted:serial - include serial port support
 dev-python/urllib3:brotli - Enable support for brotli compression
-dev-python/ws4py:client - Install client modules
-dev-python/ws4py:server - Install server modules
 dev-python/zeep:async - Add async support
 dev-qt/designer:declarative - Build the qdeclarativeview plugin
 dev-qt/linguist-tools:qml - Enable QML support in lupdate
@@ -3821,7 +3734,6 @@ mail-filter/opendkim:unbound - Use the unbound dnssec library to perform DKIM DN
 mail-filter/opendmarc:reports - Install the reports binaries: expire, import, reports, params
 mail-filter/opendmarc:spf - Use the mail-filter/libspf2 for Sender Policy Framework checking
 mail-filter/pyzor:gdbm - Enables the Gdbm back-end database engine for pyzord
-mail-filter/pyzor:gevent - Use dev-python/gevent to enable asynchronous operation
 mail-filter/pyzor:mysql - Enables the MySQL back-end database engine for pyzord through dev-python/mysqlclient.
 mail-filter/pyzor:pyzord - Enable the pyzord server daemon
 mail-filter/pyzor:redis - Enables the redis back-end database engine for pyzord through dev-python/redis-py
@@ -3861,7 +3773,6 @@ mail-mta/netqmail:authcram - Enable AUTHCRAM support
 mail-mta/netqmail:gencertdaily - Generate SSL certificates daily instead of hourly
 mail-mta/netqmail:highvolume - Prepare netqmail for high volume servers
 mail-mta/netqmail:pop3 - Include POP3 server
-mail-mta/notqmail:authcram - Enable AUTHCRAM support
 mail-mta/notqmail:gencertdaily - Generate SSL certificates daily instead of hourly
 mail-mta/notqmail:highvolume - Prepare notqmail for high volume servers
 mail-mta/notqmail:pop3 - Include POP3 server
@@ -4517,17 +4428,6 @@ media-plugins/gst-plugins-vaapi:gles2 - Enable GLESv2 and GLESv3 support
 media-plugins/imlib2_loaders:eet - Enable Eet image loader
 media-plugins/imlib2_loaders:xcf - Enable XCF image loader
 media-plugins/ir_lv2:tools - Build convert4chan tool
-media-plugins/mythplugins:cdr - Allows MythMusic to burn CD-Rs
-media-plugins/mythplugins:exif - Allows MythGallery to read EXIF data from photos
-media-plugins/mythplugins:fftw - Adds visual effects to MythMusic when playing back music
-media-plugins/mythplugins:hls - HTTP Live Streaming support
-media-plugins/mythplugins:mytharchive - Allows you to archive recorded content to CD or DVD
-media-plugins/mythplugins:mythgame - Adds a frontend to various ROM emulators within MythTV
-media-plugins/mythplugins:mythnetvision - Adds the ability to view netvision devices within MythTV
-media-plugins/mythplugins:mythweather - Adds weather information within MythTV
-media-plugins/mythplugins:mythzmserver - Build mythzmserver daemon needed by zoneminder on LAN
-media-plugins/mythplugins:mythzoneminder - Adds support for zoneminder (requires active mythzmserver daemon on LAN).
-media-plugins/mythplugins:raw - Allows MythGallery to view photos saved in RAW format
 media-plugins/vdr-burn:dvdarchive - DMH DVD - Archive
 media-plugins/vdr-cdplayer:cdparanoia - Enable cdparanoia (audio CD ripper) support
 media-plugins/vdr-dvbapi:dvbcsa - use media-libs/libdvbcsa free implementation of the DVB Common Scrambling Algorithm
@@ -5372,7 +5272,6 @@ net-analyzer/netdata:compression - Enable compression via zlib
 net-analyzer/netdata:dbengine - Enable the Netdata database engine
 net-analyzer/netdata:ipmi - Install sys-apps/ipmitool required for monitoring IPMI sensors.
 net-analyzer/netdata:jsonc - Enable optimization of JSON using dev-libs/json-c
-net-analyzer/netdata:kinesis - Enable support for Amazon Kenesis as a backend
 net-analyzer/netdata:lto - Build with Link Time Optimization (LTO)
 net-analyzer/netdata:mongodb - Enable support for the mongodb backend
 net-analyzer/netdata:nfacct - Enable the nfacct plugin
@@ -5688,7 +5587,6 @@ net-firewall/nufw:nfconntrack - Use netfilter_conntrack
 net-firewall/nufw:nfqueue - Use NFQUEUE instead of QUEUE
 net-firewall/nufw:pam_nuauth - Add support for pam nufw from PAM
 net-firewall/nufw:plaintext - Add support for authentication with plaintext files
-net-firewall/nufw:prelude - Add support/bindings for the Prelude Intrusion Detection System
 net-firewall/pglinux:cron - Install cron script
 net-firewall/shorewall:init - Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces
 net-firewall/shorewall:ipv4 - Installs everything needed to create a full IPv4 firewall
@@ -6655,7 +6553,6 @@ net-misc/remmina:gvnc - Enable GVNC plugin using gtk-vnc, suitable for KVM and V
 net-misc/remmina:kwallet - Enable KDE Wallet plugin
 net-misc/remmina:spice - Support connecting to SPICE-enabled virtual machines
 net-misc/remmina:ssh - Enable support for SSH/SFTP protocol
-net-misc/remmina:x2go - Enable support for X2Go
 net-misc/rsync:rrsync - Install rrsync script to setup restricted rsync users via ssh logins
 net-misc/rsync:stunnel - Provide helper scripts for using rsync via >=net-misc/stunnel-4
 net-misc/rsync:system-zlib - Use system zlib instead of bundled one. This is incompatible with older rsync releases!
@@ -8849,7 +8746,6 @@ www-servers/uwsgi:embedded - Embed plugins instead of building them as real plug
 www-servers/uwsgi:go - Build the gccgo plugin to run Go applications.
 www-servers/uwsgi:json - Support json as a configuration file format.
 www-servers/uwsgi:python-asyncio - Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).
-www-servers/uwsgi:python-gevent - Use dev-python/gevent for async request dispatching and as LoopEngine (see http://projects.unbit.it/uwsgi/wiki/Gevent).
 www-servers/uwsgi:routing - Enable routing support
 www-servers/uwsgi:yajl - Use dev-libs/yajl instead of dev-libs/jansson for parsing JSON configuration files (if USe=json is set)
 www-servers/uwsgi:yaml - Support yaml as a configuration file format.
@@ -8971,7 +8867,6 @@ x11-misc/polybar:ipc - Add support for Inter-Process Messaging
 x11-misc/polybar:mpd - Add support for Music Player Daemon
 x11-misc/polybar:network - Enable network support
 x11-misc/primus:libglvnd - Use media-libs/libglvnd for dispatch
-x11-misc/py3status:gevent - Install extra requirement dev-python/gevent to enable green threads.
 x11-misc/py3status:minimal - Don't depend on x11-misc/i3status if you don't plan to use any of its built-in modules.
 x11-misc/py3status:udev - Install extra requirement dev-python/pyudev to enable udev events monitoring on modules.
 x11-misc/qtfm:dbus - Install the qtfm-tray removable device manager
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index c7c7e0ee0ba9..27bad25fcb66 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index fd221f9c148e..4bda80af8443 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -8,8 +8,9 @@ DIST gromacs-2020.7.tar.gz 29175554 BLAKE2B 98f1aa415946f8eb113febc81105f0c1b091
 DIST gromacs-2021.3.tar.gz 37987972 BLAKE2B d71995c7d5a34978246e33dc637ac3d273e547afcf72d1a107026650f03286ecdf27e4b9a70113b3c3a01af59ad49ac5c813aa6e5d2e8eb29fd05582a7a28d34 SHA512 da420917d06de2e192dfbb4e1b9f46989ed05b5c7e641c657104ed8f2bd8b22509bffd1ecfd7c965c80544eafa6af12d6d0aba7e1e7d9d14a4a88fb3fbf394a5
 DIST gromacs-2021.5.tar.gz 38023772 BLAKE2B 45e1f080b86626423e471f06b48b615db1913048f9f6998da8ce45408339b32f829d33dd2af57297a7d307fcffd556c333a58c309ee0f2adb021ca3755619b05 SHA512 56c1b312fc8e52ec6f86e445d2fa2d07107c461b35d4dc8cdf95580f05fd8e6c5fd671d0e72b2b9e74e3232bc8c41db496fe4bcaf2b9a3ae3c2cfa93489a31c5
 DIST gromacs-2021.6.tar.gz 38012702 BLAKE2B 023ae37dc53643758afa050fd179cd66f3c6d6266f6afceee5eb35c890a3ae284956f2bc2409156d6e1fa03a7f23f7b04c27e1820547fd5f147b344d94da7d40 SHA512 65d7874e5cd838ce4f29d033c66304738ccc30f1987f9f8541725058b2fc4551302a399f6ce773e81ac9485963187c48feaf92c71789f4c345c82bd335f806a7
-DIST gromacs-2022.2.tar.gz 40350604 BLAKE2B 789c8abc13b5c64af6b9d66efcf70449330b7e6a4bc127ba299e36eea925e9485809c11480ffd857805d9b453df363ce9bb05bc54b439801334767651defc0ef SHA512 9f33518d2035afb37fc40377e575d497ff32bef2adb702669b35b1b51b1694b1113c5634fa6febd41955b6dfbfd055e7d523e1919bda1bf169a6d0c25700cef7
 DIST gromacs-2022.3.tar.gz 40359623 BLAKE2B 23beacf7208df89aea6c3effe483361451a9ff20428fe79ec163a5eee4dc0db0bb00a2bee84bc9377ad272f216fd372eab1b77e8542ce231ac785b41b582fa15 SHA512 1a6a1674ed17dfd93dcd51537cd13c9df5bb9bd91c3a26601032f83b788a93689bac8070eb8e495a786d41cc9d474885538cbaffa4229da70dfa640ee42b7c60
+DIST gromacs-2022.4.tar.gz 40352282 BLAKE2B 616ba05a70a483d7d8fadefb383ac9fc8825ac09ea92f55a0222c57ac91e4a045fb55405ec963303d8dbabb04b3d1f8c73062785b3812b3c6b7582e002dc5538 SHA512 15c642f2b63c1731a01a3b58c13d454f57c29607554a6693c2e62f38da574c6d596c5cb6f361e0feb5e1069b3b19bb49ceaa432c030da91f48e41654e3e6a62f
+DIST gromacs-2023-rc1.tar.gz 41863824 BLAKE2B c365ccd83b8f271be8f1a515f4dc0ebd729ce43023e979a52046fc827e786f84f09de894af9b8da4f7ce6e06a1ae050e8ff387892f76787857327ce2bc397042 SHA512 7ab8158624e0c93c0f06bd7023b97012d80afa5e068cb4489e7e9700171a5a8f69ae042bf0256c78aaec527d9a1b88f5f2dce6c8c7d4f46a457b6a9568b70f45
 DIST manual-2018.8.pdf 10025023 BLAKE2B afb0a6e6a72d78df743fcb57e7c1716848589e571dd35167b957a9b407ca27978ccfb6cb9e0df9c9439b888f352501a00ba32281ed1e0b4193bd606f1d77152e SHA512 b1972f7ce965bfc9377542993c5943ea4868a8ed23a969d4203264746d6bea3a7a65c6379196ece37fd6d68ec7ec80f827bde87d1049284af7082759a124f1d5
 DIST manual-2019.6.pdf 12702376 BLAKE2B c350127bc06a9eb3dee73da39037c84daeb89500e23cb131bd19a150bf60602d4dde7611e0c6f0f344af4093e96a899303dac71b4df56fd0c44c3a48a56606b7 SHA512 dfdff67c2c1c9ce1f1c236b7686c5331b0fe86951da6c98eddd6a3e748815e0be0a9653ae4318469fcdd913c4e7c355d64a997cc80b9d9fbe6282ef6d98e61eb
 DIST manual-2020.4.pdf 11851608 BLAKE2B 7b7bdf08e8946fcc448543b08391b94a67fee60a8c810597c1f09f70443f9d7db817c99622dd0c21c6317f5fdcd6c4a88589ecac57055cb0cd8597d6021026e7 SHA512 928555663c77de36393e625c29d388d4e1c8c1298e7a993d871839e0d4d8d18d190221ad8f1d975bd072bdd6a061e9ea5b9295f2ecf45f24b6523ea5ea290fed
@@ -17,8 +18,9 @@ DIST manual-2020.7.pdf 11850780 BLAKE2B 38594e87993badfbbcf47d6010a7f67d3c3426da
 DIST manual-2021.3.pdf 12255076 BLAKE2B 6ca516b6832507c9d4100679d1f9bc9e3ab17d226849b050764b0d0626247dc57ce49985f9a7fc0061f3df278923a83faa367ca8ab91c37e5624dc584a51a822 SHA512 5d53798f30ea00fcb4e1b35f7eaa4bebfc05dafa4f2d0c197dcf2b57a624ad3a98b74fd90722e40d0ac13a6fff4ca231f9d6340f52ba94659c827c53c2f1cb16
 DIST manual-2021.5.pdf 12253641 BLAKE2B 8850715a2bb21345e1c9735aca1a5dd2ad916e5a18881e7c9f3dda6f055ca12d9d379b74218138999ce50769efd8b9dd6447afbf70bbbefa2564dfb9fb276b91 SHA512 7635108c935e4953d722df6a16ee43edf97eef7e49f047218728f68f61f8f185192ff1d8b13a573b643b040955af211355a7b560c8a894c858d7f71249d41296
 DIST manual-2021.6.pdf 12256595 BLAKE2B 5d808e38571b38c1f6e0d115f6e604238206cc001f59d05ed855e80c324c0e6fd7767adb723b3d0edd1267ae5973a3b83b76bd04d2dc99769e6440600d8e2146 SHA512 64fe56422d7417f6f61b10346c99e24c3f423f0cedc3794e0809250282bc87ef692b47ae6c3f95ad7994aa3860ed82035cbacc76eb78a2f54a29052a05260af2
-DIST manual-2022.2.pdf 13075063 BLAKE2B 1c9e525d45f1b9955f1aa2c4afa8c958b8ea62c51c28fafdebe302e3e5f6e04c97d1852e4ab2ba18149778d62959d9e7e42be9e4cd98f8187029cc590b1dfd9a SHA512 9b4d9b13547e0210b633394e0c9cba183a827409b08d3b2995a4b64df7b7e7aef0441af240bf4cfcb2e24594ade27c25fee454b9fcf4bb5df0ded464c4f6368d
 DIST manual-2022.3.pdf 13080874 BLAKE2B 3e70da8f70281c78084f5f9af86cdcda187c7b3085f08d95487992a65e31b7dae0b3e66d914dc0bccaf1bfe4c672d2018f38d0bde679759545aca55d1df1f554 SHA512 f634eac722d4a6f77820ef46024d9209de97fb6afb52333f200c2717049d8d09e31f0ef7bac8f154d79ae43fa31541ed6c3d839dd088433222ebdace298b5fae
+DIST manual-2022.4.pdf 13080976 BLAKE2B 45685fa1d727aa30425e946ac72e0bd723528032e3fb45525d3c025316ee2682ea3c9cc2fd75b5cd4e900adbc6e7f577e3368d9e0681294fd1515df3d2e5d840 SHA512 a7ac3a80a90f14b6917e15633d77230d24cdcf19ade38d14b35c6451074848a7754b33c612e2a26a657f2edd3d6710e5a8130cacb107d4085d1bd934267ad623
+DIST manual-2023_rc1.pdf 13506754 BLAKE2B 9487753e788fa5b2d01255717769e0b01cf7adcb4ae99a1f37f4ad0f8acccfbf4eff0a4c76add63bc82bffdf844cf8dd1d858d15a6bacd6635ec3a3474e10f6f SHA512 f26df914402793c656a798847524c0b9207a4163bb36d6cb90740a699418719f7b124343b4886e50d92023c14f8c1e61e950c12b8e1e4702007e34677cd17ef2
 DIST regressiontests-2018.8.tar.gz 67855469 BLAKE2B 34c9b339f6229f483afbb5192ee6ba8b8f72d5c26907a853af9c53dfece0d88739e48f6b44b78d1c010f988f9385d077285300522164f533a5861e9dda879275 SHA512 3642389d27bd1942cd0f091c940ae97b197b94856a387fe581dc516b0d4169480f16551d4ba357f9282b3337d605c286d51dd38112ac87c826dda634904836bb
 DIST regressiontests-2019.6.tar.gz 67643195 BLAKE2B 1e054e24b187946f7ea28090d4f20cf8e1d79a26253f57ba07d130e0773d8541b8a1552a38023d31a68ce8bc62d8e0af1d98609234bb3e7d3e6d567307ebb386 SHA512 eacf1c55b982515a305c29459fe80a7cd558a8481e5689962aa956148af542568b1d1ce59c6784ecb0afd4768c2b664afa21e12af2d89ae2b06b1ba61ad72036
 DIST regressiontests-2020.4.tar.gz 48542144 BLAKE2B 1dcde67525d40ababa74d9e8ba2dd3fdef1de7d1018491e102edd71d3a622925f213b5a0812e5448882b4cb5fb578317e8e5029bdc4bd53008aa8441a3d9dea1 SHA512 7c71f36a1cef22562f14dcd233e90ad2fe370ae1a7d3b5268727259b374e12d4754253735ac8745d3738bdbc1cc2067780fda5e393be2ff264f632fe4e0c1978
@@ -26,19 +28,22 @@ DIST regressiontests-2020.7.tar.gz 48541487 BLAKE2B 255608b52158c6c01e7c7c4dcf07
 DIST regressiontests-2021.3.tar.gz 48515038 BLAKE2B ee79d8adddc9c68f7d59d9e568b12bf4d1fe0e44c2810fee846ad6f689bbcacf60f5c266433946329e64e3127bc2d37a3f81f69c070c636b411b38067650c2cf SHA512 e14baa22ef2902a23125bbd9143ae7a9a4810498b321794ff1989f8d044d47db5db41d5225798fda08016c05e5f7f315178b5a6e35cdf01e3b6604670a8ce7a2
 DIST regressiontests-2021.5.tar.gz 48537298 BLAKE2B 860ac34aa8706ecdafab4472162775ce12726d93839079ebf9b7df8c2c6a1b47baa8a635c24cf4cb4551a32237c3de7da3197ec136b5bbf48663edc3943720ad SHA512 3605d04b2602339fb7d33e2776da2ada337ca58a3802472d47f490d4e8dd04249a950bf34608a498eedebf69f344c0311bac8f7fcb58ce0ebbb6d608ee39aa2e
 DIST regressiontests-2021.6.tar.gz 48537070 BLAKE2B 982fad6b23da5c1e6d32009f9f08772419c08f15549aea85ec0cd144c7faf5b48ed9b49a2cae662c28008514911cc18e0b39b994854d95f4f206e728b76f3fe5 SHA512 9c0ca29df822bc13005fd35bdb85cc075ea667112ae1670af0d8306cdd2bd348a9f9904bd10da6db458d9c11f4d44860e1fc62e9686d2c6e396e265d18768ba4
-DIST regressiontests-2022.2.tar.gz 48614810 BLAKE2B d39a9b29a023fa2462918206457bb222bf56f0c530b311a1e5572e8af6c561a9ba5cf7a445425a36f89804d120a5d05cb778998818ba11357ec67bfb05297de3 SHA512 6cd4b59515648aa5f9deec130454b4d667cce20a95d389b46883865d39a164ec23da303a52afb4459dda3c6b6a7804d0763c05424ea512e6c0725ce1ca684dc2
 DIST regressiontests-2022.3.tar.gz 48615675 BLAKE2B 731d9a210dcd481df937182a9a8239087549abd118d1386175ef68979e139ae33089cfc304e0389670ad15a196008c282ddf62968a7e8bfccac22c0a96add276 SHA512 98888ad908705ac29ae958591368e994b091a1619782b49601e41f576c821eb3c96a713449151b8db59d46bc6dd3bcb363f5d0cda354ce6b39a9bb93ba31f913
+DIST regressiontests-2022.4.tar.gz 48614599 BLAKE2B d41d59d4336455c87f3877be48ec49b2cdc989548c51ef9c8277b05bb6cf3dc05ebfa91a0248cc113c130a0ed19aae2c8316184caf37b72aa612b211fe41b144 SHA512 6495a286b201774ea2a922376ff5c0abaae7aaef1dfd28a1a61c817b5c6ac83db99300d43cc019745ca32a025e1f8a7f538342af539d9d753e494c550b429706
+DIST regressiontests-2023-rc1.tar.gz 48611523 BLAKE2B 4ef09171007c45f38239c8e966d0c9a611ee9b133c91fb51fc5d25a7f67eab01e32b1ef89c12b42eb140b5e189834697e4116ad6c9c302ab33d15cf871ac61d6 SHA512 f5c2a486f8b416140b69841c42df8bb1e38fc0d7b58badc4370a59ca543c48c7875a877eab828ee03f87e55501f4e8fcdd18103939825f8b57f681f99b108f42
 EBUILD gromacs-2018.8-r1.ebuild 6889 BLAKE2B 977f6f9f9e2bf41f4085c5eee585689285383f9227a3876b265e0443a368ce028e6a1c1fa988133b73cfe930bd6ae778550b0e3e51bd34e63b6eef2e0763f2a9 SHA512 cb8a8cbe6430fa3eb9b829dbb2c8c5a96501e683433c3da2d5cebb40ddacb00928ae46de9244c862dcf71764a4ef01678a274701c975f14b7a3f9d008e4b8b4a
 EBUILD gromacs-2019.6-r1.ebuild 7212 BLAKE2B deaaca94bc0c306800989796f723370b44da365228d0af5c74c815f488118f0ed9d6a67e16e8efe2bba229ed157ea5b3527e1b842527ff926c4cf7ca3aae13ab SHA512 39fd71dd0a31e74a96d5a0506718821fd4a53c191238e574f5adf1e12c4534f78953c2ffd573d1ecde3b214fba3f1da71b9241a54ae0ebb397cfee44e7cc2020
 EBUILD gromacs-2019.6-r2.ebuild 7269 BLAKE2B a9045a4f746be59b3ef435e78377104380d2028b5cd8cd0efb716aa495a7c8276a03c1c22fadfa9835bfd1e32bb24486dba7fafb6cf0408ebd6ab5a6d7c59c39 SHA512 ad2463f99690b05c06d0d80787be1a157def7a1e5ad838ab696c9ee2e4e5688da0fd8cf85a4f10994a1df433ad287a7038a05b01b7d00b5d80a6c375ff888801
-EBUILD gromacs-2020.4-r1.ebuild 10044 BLAKE2B 147506e84fc25a03c10375edba56d996f0f676af45a4d4f59cf1754a363e4bef0c2d2dd25022500099ea0d82f930ca60cd743b5221cd8c9604a3211eb27ff66d SHA512 1fc9752c929f82ba4233535d407d2af69ad18a0f0a8514e42d25a30c97f329962fb9bb46ea1907b2fa66eb75da42912a12a304134eac86cd497e1e46b94bc54f
-EBUILD gromacs-2020.7.ebuild 10047 BLAKE2B f1fa8b8385140151b330e2138fe044e5a5f667f317c09756b5469426cbe421a3726e448b1440b0f470074f610ccddc38d12ba92313af41fdfd04ed2d5245c86a SHA512 9d7a93c64c6b0f2f43e46ac44a91643a1875eb4e24dc777d4c77f5464745dceff30506a342ab972491660dcd49c5365369325a63e7fb86d5dfe179767ed108f4
-EBUILD gromacs-2021.3-r1.ebuild 10251 BLAKE2B 985713c5252f895b9bb9915cb8f0317eabe93b95887729fe4e1c7d7581eac4c0993a2838655a184098520dbd78bc46fc4d6da5cf8ab0eff035d33a45f2818e48 SHA512 b6253087c3160cac469dc0d3d22c36ad6bf9ca2eb24b4891327c973d5e4f62af88c685056aa51ab02335609605e3bfb5696e2f11a5d850a59d1341341b1217bf
-EBUILD gromacs-2021.5.ebuild 10254 BLAKE2B d0228a613cb287b77ab0112ebbbce6f57f40c1a1f9d4949fce623a5b4d20b32e6b8b9ad1621385e9629d045db7b0ec13e723fc7ea73d4ecde6ffce65f520d76c SHA512 d01cfa540728fd8ac59bdc62f16f902e73d5666a4a241eceeab75c835a8bcef924c712ed399c473cfb52e928fbfcb72d73acc6a7d2b804d999f32f42de79d7fd
-EBUILD gromacs-2021.6.ebuild 10254 BLAKE2B d0228a613cb287b77ab0112ebbbce6f57f40c1a1f9d4949fce623a5b4d20b32e6b8b9ad1621385e9629d045db7b0ec13e723fc7ea73d4ecde6ffce65f520d76c SHA512 d01cfa540728fd8ac59bdc62f16f902e73d5666a4a241eceeab75c835a8bcef924c712ed399c473cfb52e928fbfcb72d73acc6a7d2b804d999f32f42de79d7fd
-EBUILD gromacs-2021.9999.ebuild 10198 BLAKE2B c9f488f6b264a5ced42c3225fea32938d9837efbad9dbbf5b63c6b8e01385f0e9acab6cd719d42da846b91b63e04b93f0fbc196c00a158069a626e1e19b3fd72 SHA512 6e2424b1d5f77940ea33ce8568077902b972efd27f574f57594ce97ceae08caeebdb9b34fd01209dffa06366734f1ed85eb3796bb07ce39b9aebacfe7d12ad32
-EBUILD gromacs-2022.2.ebuild 9799 BLAKE2B ea9a9e6c22bbcd869a33a4c48e22f63eea09de7b7e69e1c0844374233a8f363b7db8a732210dbd5be022e362092a3b16aae0814d5b8a6307a73a7c2a1df4ec7b SHA512 6e7fdac6e590679a6c705e9dd4140cd0e00e0ce9daaca644ee62c1de3a15e578e529b53123ab08300de6c6568c64409975d5421e5b3e6e1831a5a86824208500
-EBUILD gromacs-2022.3.ebuild 9799 BLAKE2B ea9a9e6c22bbcd869a33a4c48e22f63eea09de7b7e69e1c0844374233a8f363b7db8a732210dbd5be022e362092a3b16aae0814d5b8a6307a73a7c2a1df4ec7b SHA512 6e7fdac6e590679a6c705e9dd4140cd0e00e0ce9daaca644ee62c1de3a15e578e529b53123ab08300de6c6568c64409975d5421e5b3e6e1831a5a86824208500
-EBUILD gromacs-2022.9999.ebuild 9394 BLAKE2B 2a8fc8946225e3da59b9dfe7b92799e9cf9db4e7493fd54de4ee66245288f3ab6a563f3a95dcfc2f3c1cb0084c5c2587c75a7ad91b171ca3956ace393dd10379 SHA512 071f4a58612045de825b39bef883c1ac31665cf57c6629e407690316538ec51390ed671b223e6c9c919b0705c39cfb702211570cd3aeb3fd0d9d62c0358f280c
-EBUILD gromacs-9999.ebuild 9394 BLAKE2B 2a8fc8946225e3da59b9dfe7b92799e9cf9db4e7493fd54de4ee66245288f3ab6a563f3a95dcfc2f3c1cb0084c5c2587c75a7ad91b171ca3956ace393dd10379 SHA512 071f4a58612045de825b39bef883c1ac31665cf57c6629e407690316538ec51390ed671b223e6c9c919b0705c39cfb702211570cd3aeb3fd0d9d62c0358f280c
+EBUILD gromacs-2020.4-r1.ebuild 10061 BLAKE2B 0ac267aa8b0501ce98be570f2c16ffed7f39735729fc746c509c073b170db6274fc720357847dc8cdc6e18c590cfb3bcfc1fed9a7d9b2b6f4348d121ad1463b9 SHA512 5dd5ed052a2fe81eadf3e8833b824d7cd68989d76882934d96a29fd6338036dfc56d3827fb977bf233b230562aa65a2fd947ed41bf143c3fc68c0f06282c4732
+EBUILD gromacs-2020.7.ebuild 10064 BLAKE2B 34000bcc42997099d04f9505e467e81e098e3ffd578e96ea34e24b6a46a44dd2b89b8d1ff37680de51f43fbbd6e8d9f20397628bebe012b805cb9b00a7361847 SHA512 51e5e488c95cf8e4d63f9673b37237ea14adefcec2d49c66e61cc75c4a00aaf82591037bd910bc2c306f8bfd2ee124e9528dee64eab8415d3ad18269d4168538
+EBUILD gromacs-2021.3-r1.ebuild 10268 BLAKE2B 2906c4cb6e4cbbcda5cec35dcbe174640144537b419c5d605b2065649cf95467fa3281bfabdf5ab458667b63468b0be6df54aac8f8170e9b692e8260cfc9616b SHA512 4743b464b1a250bd20f59ebba382e081f3abdaa07a165c6e1fcf7c0b2f1d3d5c52bc0cbbf9f6257c31c1dcd3e0dc1061f78a34e0f1847765f77c9e5b076fe0f0
+EBUILD gromacs-2021.5.ebuild 10271 BLAKE2B 09e6e7941ed2ab8b923e4c164a9535756b62e10407035d2569824e0c5d1c3becd7eea46241fe636f23cadb3e5b1fec960a16b6be12041a06da8d92eafe445182 SHA512 2b1ff8c9cacc0fb217bec29b7b3cfc4d0ce20f5beb77bd567fc7653625fe7429aa897a32d36e4deab14526df6cb0dd4f46937acd186d7b45a7e54bd65d966edf
+EBUILD gromacs-2021.6.ebuild 10271 BLAKE2B 09e6e7941ed2ab8b923e4c164a9535756b62e10407035d2569824e0c5d1c3becd7eea46241fe636f23cadb3e5b1fec960a16b6be12041a06da8d92eafe445182 SHA512 2b1ff8c9cacc0fb217bec29b7b3cfc4d0ce20f5beb77bd567fc7653625fe7429aa897a32d36e4deab14526df6cb0dd4f46937acd186d7b45a7e54bd65d966edf
+EBUILD gromacs-2021.9999.ebuild 10215 BLAKE2B 8d519848b856dcd186caf3a7650bcb1ab835f92cbca4334c26e3a63944475aea2d5c2999cc23158fd030c99cc1c94f29014e133dc6fddcd9c4f7805010f2db71 SHA512 951eeb4e0c3c4807b143bf97754e6ec1ef2606499f778e04aaa707b8a33c434743b6c9e873101d6d78720e79a77d3750a492c17df22e3eb4ff2af8007069f3ce
+EBUILD gromacs-2022.3.ebuild 9816 BLAKE2B 7cae6c6e0e61af7062f83b301d02b43dd21d29a22fe25cda690f36fd319a8bcb676fc1748791b5a3b1317452ff397ab1cc7f62ae360b402011fd9d13d875b012 SHA512 17854ca744a237dc7037f30e8234035b9017b95c90b7ea95acfba393eb3851179ac120dcadf6f92759a42e802a81b677f994b17fe3ad537f7bc1bc0ff22b2d41
+EBUILD gromacs-2022.4.ebuild 9816 BLAKE2B 7cae6c6e0e61af7062f83b301d02b43dd21d29a22fe25cda690f36fd319a8bcb676fc1748791b5a3b1317452ff397ab1cc7f62ae360b402011fd9d13d875b012 SHA512 17854ca744a237dc7037f30e8234035b9017b95c90b7ea95acfba393eb3851179ac120dcadf6f92759a42e802a81b677f994b17fe3ad537f7bc1bc0ff22b2d41
+EBUILD gromacs-2022.9999.ebuild 9411 BLAKE2B 52d043a9c1206aebaddb74403752811ae65e3ca9ae2a156ce3497645363974a74881e9c2b0b05a01a78dcaa72b858557bfd47c64b6f78c0247bc8b1fd3fd434b SHA512 86cf615adbb840f3f23bcf179373530776693580fb98f489b2faa9ed970b570f759dc1769443468ad99e19594a35ed86b3dcdc8e97bbb108945ef95367f39446
+EBUILD gromacs-2023.9999.ebuild 9338 BLAKE2B 88beb60a464141a9608d554150dcc35a595e10f14874a3cba249a7b5aa1e22b34d53315017e7e869d598bee6eb96d6867169a62d2f75875108597e193497ff42 SHA512 9a2be9a32279c8662e66fd784e2dd29733b27420871f441de818992a0296c63583e8276d6fe96e135d77f54d706aa031763bbc9b7babc4ca694575761db11f51
+EBUILD gromacs-2023_rc1.ebuild 9338 BLAKE2B 88beb60a464141a9608d554150dcc35a595e10f14874a3cba249a7b5aa1e22b34d53315017e7e869d598bee6eb96d6867169a62d2f75875108597e193497ff42 SHA512 9a2be9a32279c8662e66fd784e2dd29733b27420871f441de818992a0296c63583e8276d6fe96e135d77f54d706aa031763bbc9b7babc4ca694575761db11f51
+EBUILD gromacs-9999.ebuild 9338 BLAKE2B 88beb60a464141a9608d554150dcc35a595e10f14874a3cba249a7b5aa1e22b34d53315017e7e869d598bee6eb96d6867169a62d2f75875108597e193497ff42 SHA512 9a2be9a32279c8662e66fd784e2dd29733b27420871f441de818992a0296c63583e8276d6fe96e135d77f54d706aa031763bbc9b7babc4ca694575761db11f51
 MISC metadata.xml 1375 BLAKE2B 321b7db8536061655a6efaa40110f4858633921292eba465b85fe0cb50280842e511f2f11385fe5d62bbdfb40e9c0c76e8e986a1efce8eac25d52c438d7ed5f4 SHA512 cc61e0b477f6576079a0f7910475b9091c1c521fbb48efab365d355e3c0a80cd19e1ea9028cb269d37c2572546b1be66a210512e40ff0f2d6314d1b0138cdba6
diff --git a/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild b/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild
index 178926f0014d..90ca3b46ae0a 100644
--- a/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild
@@ -7,7 +7,8 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
diff --git a/sci-chemistry/gromacs/gromacs-2020.7.ebuild b/sci-chemistry/gromacs/gromacs-2020.7.ebuild
index de3335b0e75c..ef73982121ff 100644
--- a/sci-chemistry/gromacs/gromacs-2020.7.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.7.ebuild
@@ -7,7 +7,8 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
diff --git a/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild b/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild
index 68d9a92c288d..c8f88acab2c3 100644
--- a/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild
@@ -7,7 +7,8 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
diff --git a/sci-chemistry/gromacs/gromacs-2021.5.ebuild b/sci-chemistry/gromacs/gromacs-2021.5.ebuild
index 2f7f4f77115a..c3df9c15d1d4 100644
--- a/sci-chemistry/gromacs/gromacs-2021.5.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.5.ebuild
@@ -7,7 +7,8 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
diff --git a/sci-chemistry/gromacs/gromacs-2021.6.ebuild b/sci-chemistry/gromacs/gromacs-2021.6.ebuild
index 2f7f4f77115a..c3df9c15d1d4 100644
--- a/sci-chemistry/gromacs/gromacs-2021.6.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.6.ebuild
@@ -7,7 +7,8 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
index af0fa65d05eb..44a39087816b 100644
--- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
@@ -7,7 +7,8 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
diff --git a/sci-chemistry/gromacs/gromacs-2022.3.ebuild b/sci-chemistry/gromacs/gromacs-2022.3.ebuild
index c10e89957871..8719a5c86554 100644
--- a/sci-chemistry/gromacs/gromacs-2022.3.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2022.3.ebuild
@@ -7,7 +7,8 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
diff --git a/sci-chemistry/gromacs/gromacs-2022.2.ebuild b/sci-chemistry/gromacs/gromacs-2022.4.ebuild
index c10e89957871..8719a5c86554 100644
--- a/sci-chemistry/gromacs/gromacs-2022.2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2022.4.ebuild
@@ -7,7 +7,8 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
diff --git a/sci-chemistry/gromacs/gromacs-2022.9999.ebuild b/sci-chemistry/gromacs/gromacs-2022.9999.ebuild
index 2b70114b7ade..f8165b39b590 100644
--- a/sci-chemistry/gromacs/gromacs-2022.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2022.9999.ebuild
@@ -7,7 +7,8 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
diff --git a/sci-chemistry/gromacs/gromacs-2023.9999.ebuild b/sci-chemistry/gromacs/gromacs-2023.9999.ebuild
new file mode 100644
index 000000000000..55fe829229e7
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2023.9999.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="
+		https://gitlab.com/gromacs/gromacs.git
+		https://github.com/gromacs/gromacs.git
+		git://git.gromacs.org/gromacs.git"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	inherit git-r3
+else
+	SRC_URI="
+		http://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
+		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf -> manual-${PV}.pdf )
+		test? ( http://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
+	# since 2022 arm support was dropped (but not arm64)
+	KEYWORDS="~amd64 -arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="http://www.gromacs.org/"
+
+# see COPYING for details
+# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0= )
+	hwloc? ( sys-apps/hwloc:= )
+	lapack? ( virtual/lapack )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi[cxx] )
+	sci-libs/lmfit:=
+	>=dev-cpp/muParser-2.3.4:=
+	${PYTHON_DEPS}
+	"
+BDEPEND="${CDEPEND}
+	virtual/pkgconfig
+	build-manual? (
+		app-doc/doxygen
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+		media-gfx/mscgen
+		media-gfx/graphviz
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	doc? ( !build-manual )
+	cuda? ( single-precision )
+	cuda? ( !opencl )
+	mkl? ( !blas !fftw !lapack )
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS README )
+
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	cmake_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+	if use build-manual; then
+		# try to create policy for imagemagik
+		mkdir -p ${HOME}/.config/ImageMagick
+		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
+		<?xml version="1.0" encoding="UTF-8"?>
+		<!DOCTYPE policymap [
+		<!ELEMENT policymap (policy)+>
+		!ATTLIST policymap xmlns CDATA #FIXED ''>
+		<!ELEMENT policy EMPTY>
+		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+		]>
+		<policymap>
+			<policy domain="coder" rights="read | write" pattern="PS" />
+			<policy domain="coder" rights="read | write" pattern="PS2" />
+			<policy domain="coder" rights="read | write" pattern="PS3" />
+			<policy domain="coder" rights="read | write" pattern="EPS" />
+			<policy domain="coder" rights="read | write" pattern="PDF" />
+			<policy domain="coder" rights="read | write" pattern="XPS" />
+		</policymap>
+		EOF
+	fi
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+	local acce="AUTO"
+
+	if use custom-cflags; then
+		#go from slowest to fastest acceleration
+		acce="None"
+		if (use amd64 || use x86); then
+			use cpu_flags_x86_sse2 && acce="SSE2"
+			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+			use cpu_flags_x86_avx && acce="AVX_256"
+			use cpu_flags_x86_avx2 && acce="AVX2_256"
+			use cpu_flags_x86_avx512f && acce="AVX_512"
+		elif (use arm); then
+			use cpu_flags_arm_neon && acce="ARM_NEON"
+		elif (use arm64); then
+			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
+		fi
+	else
+		strip-flags
+	fi
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl && has_version "=sci-libs/mkl-10*"; then
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
+			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
+		)
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		"${lmfit_opts[@]}"
+		-DGMX_USE_LMFIT=EXTERNAL
+		-DGMX_USE_MUPARSER=EXTERNAL
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_BUILD_MANUAL=$(usex build-manual)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local gpu=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
+		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=$(usex mpi)
+			-DGMX_THREAD_MPI=$(usex threads)
+			-DGMXAPI=$(usex gmxapi)
+			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
+			"${gpu[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			-DGMX_PYTHON_PACKAGE=$(usex python)
+		)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile	python_packaging/all
+			BUILD_DIR="${WORKDIR}/${P}" \
+				distutils-r1_src_compile
+		fi
+		# not 100% necessary for rel ebuilds as available from website
+		if use build-manual; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile manual
+		fi
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake_src_install
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}" \
+				cmake_src_install	python_packaging/install
+		fi
+		if use build-manual; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+
+		if use doc; then
+			if [[ ${PV} != *9999* ]]; then
+				newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf"
+			fi
+		fi
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"/usr/bin/GMXRC* || die
+	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite gromacs related papers from list:"
+	einfo  "https://www.gromacs.org/Gromacs_papers"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-2023_rc1.ebuild b/sci-chemistry/gromacs/gromacs-2023_rc1.ebuild
new file mode 100644
index 000000000000..55fe829229e7
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2023_rc1.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="
+		https://gitlab.com/gromacs/gromacs.git
+		https://github.com/gromacs/gromacs.git
+		git://git.gromacs.org/gromacs.git"
+	[[ ${PV} = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	inherit git-r3
+else
+	SRC_URI="
+		http://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
+		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf -> manual-${PV}.pdf )
+		test? ( http://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
+	# since 2022 arm support was dropped (but not arm64)
+	KEYWORDS="~amd64 -arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="http://www.gromacs.org/"
+
+# see COPYING for details
+# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-11[profiler] )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0= )
+	hwloc? ( sys-apps/hwloc:= )
+	lapack? ( virtual/lapack )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi[cxx] )
+	sci-libs/lmfit:=
+	>=dev-cpp/muParser-2.3.4:=
+	${PYTHON_DEPS}
+	"
+BDEPEND="${CDEPEND}
+	virtual/pkgconfig
+	build-manual? (
+		app-doc/doxygen
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+		media-gfx/mscgen
+		media-gfx/graphviz
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	doc? ( !build-manual )
+	cuda? ( single-precision )
+	cuda? ( !opencl )
+	mkl? ( !blas !fftw !lapack )
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS README )
+
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	cmake_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+	if use build-manual; then
+		# try to create policy for imagemagik
+		mkdir -p ${HOME}/.config/ImageMagick
+		cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
+		<?xml version="1.0" encoding="UTF-8"?>
+		<!DOCTYPE policymap [
+		<!ELEMENT policymap (policy)+>
+		!ATTLIST policymap xmlns CDATA #FIXED ''>
+		<!ELEMENT policy EMPTY>
+		<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+		]>
+		<policymap>
+			<policy domain="coder" rights="read | write" pattern="PS" />
+			<policy domain="coder" rights="read | write" pattern="PS2" />
+			<policy domain="coder" rights="read | write" pattern="PS3" />
+			<policy domain="coder" rights="read | write" pattern="EPS" />
+			<policy domain="coder" rights="read | write" pattern="PDF" />
+			<policy domain="coder" rights="read | write" pattern="XPS" />
+		</policymap>
+		EOF
+	fi
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+	local acce="AUTO"
+
+	if use custom-cflags; then
+		#go from slowest to fastest acceleration
+		acce="None"
+		if (use amd64 || use x86); then
+			use cpu_flags_x86_sse2 && acce="SSE2"
+			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+			use cpu_flags_x86_avx && acce="AVX_256"
+			use cpu_flags_x86_avx2 && acce="AVX2_256"
+			use cpu_flags_x86_avx512f && acce="AVX_512"
+		elif (use arm); then
+			use cpu_flags_arm_neon && acce="ARM_NEON"
+		elif (use arm64); then
+			use cpu_flags_arm_neon && acce="ARM_NEON_ASIMD"
+		fi
+	else
+		strip-flags
+	fi
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl && has_version "=sci-libs/mkl-10*"; then
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
+			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
+		)
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		"${lmfit_opts[@]}"
+		-DGMX_USE_LMFIT=EXTERNAL
+		-DGMX_USE_MUPARSER=EXTERNAL
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_BUILD_MANUAL=$(usex build-manual)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local gpu=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
+		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=$(usex mpi)
+			-DGMX_THREAD_MPI=$(usex threads)
+			-DGMXAPI=$(usex gmxapi)
+			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
+			"${gpu[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			-DGMX_PYTHON_PACKAGE=$(usex python)
+		)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile	python_packaging/all
+			BUILD_DIR="${WORKDIR}/${P}" \
+				distutils-r1_src_compile
+		fi
+		# not 100% necessary for rel ebuilds as available from website
+		if use build-manual; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake_src_compile manual
+		fi
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake_src_compile check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake_src_install
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}" \
+				cmake_src_install	python_packaging/install
+		fi
+		if use build-manual; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+
+		if use doc; then
+			if [[ ${PV} != *9999* ]]; then
+				newdoc "${DISTDIR}/manual-${PV}.pdf" "${PN}-manual-${PV}.pdf"
+			fi
+		fi
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"/usr/bin/GMXRC* || die
+	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite gromacs related papers from list:"
+	einfo  "https://www.gromacs.org/Gromacs_papers"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index 2b70114b7ade..55fe829229e7 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -7,7 +7,8 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=no
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
@@ -50,7 +51,7 @@ CDEPEND="
 	mkl? ( sci-libs/mkl )
 	mpi? ( virtual/mpi[cxx] )
 	sci-libs/lmfit:=
-	>=dev-cpp/muParser-2.3:=
+	>=dev-cpp/muParser-2.3.4:=
 	${PYTHON_DEPS}
 	"
 BDEPEND="${CDEPEND}
@@ -66,8 +67,7 @@ BDEPEND="${CDEPEND}
 		dev-texlive/texlive-latexextra
 		media-gfx/imagemagick
 	)"
-RDEPEND="${CDEPEND}
-	<sci-chemistry/dssp-4"
+RDEPEND="${CDEPEND}"
 
 REQUIRED_USE="
 	|| ( single-precision double-precision )
@@ -214,7 +214,6 @@ src_configure() {
 		-DGMX_DEFAULT_SUFFIX=off
 		-DGMX_SIMD="$acce"
 		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DGMX_DSSP_PROGRAM_PATH="${EPREFIX}/usr/bin/dssp"
 		-DBUILD_TESTING=$(usex test)
 		-DGMX_BUILD_UNITTESTS=$(usex test)
 		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 2131fd76cc68..63c2eba41468 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/bmrblib/Manifest b/sci-libs/bmrblib/Manifest
deleted file mode 100644
index 52c462ead35c..000000000000
--- a/sci-libs/bmrblib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bmrblib-1.0.4.tar.bz2 51211 BLAKE2B 4d901c085648971af0e271d5524d4fe0f0e085f9ab34cde4cbc2d7b17d1dd37ffd4051c219e769738a9eac8b11b6950c5575d1bd9b9193ef48a698560de3fd96 SHA512 579f3beaf343416c58b344a33ee94d42bcedba558b33c2b9f98662d2ffc685887617229b5f7e75acf61712fe4f03827ca4413bc08e3bd2e72f69d952310891e0
-EBUILD bmrblib-1.0.4.ebuild 423 BLAKE2B 5bb4c180296107d1539370f4fe103a9439e97771359c6e5004f433aec1c507fbcfd93a1b9ff18735d8633498e011afe762751f0d0c8b5b4af511cc30d446e8fa SHA512 20b272020ad852e417aebf38df3ed9dff796bc61c8dfb22cb41a420a9b075bf877d226f6b0eb7100cabab6fc88b627e4b1f92cad853378c893a3ad0980bf0464
-MISC metadata.xml 698 BLAKE2B a30f54830328cf193d5a535fec58fd6d77503ab4ec877fdfe9f0fdca9a6a0bf9f5fe6f67babf169d71f9b45fdc819fe1b92748cfeb3fe0e1c9db37b99dedcd92 SHA512 1fd594ff3a2c7ca1c3765717480f1f59e98bed61cd8a45e837b52c1b78bf3df1ae1650155ef78c3d386afc85f94a9cbe2395f99b4826c2f3eb931c2b586acf62
diff --git a/sci-libs/bmrblib/bmrblib-1.0.4.ebuild b/sci-libs/bmrblib/bmrblib-1.0.4.ebuild
deleted file mode 100644
index d90182eb1a8c..000000000000
--- a/sci-libs/bmrblib/bmrblib-1.0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="API abstracting the BioMagResBank (BMRB) NMR-STAR format"
-HOMEPAGE="https://sourceforge.net/projects/bmrblib"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/bmrblib/metadata.xml b/sci-libs/bmrblib/metadata.xml
deleted file mode 100644
index 3883641649b8..000000000000
--- a/sci-libs/bmrblib/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>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<longdescription>
-		Bmrblib is an API abstracting the BioMagResBank (BMRB) NMR-STAR format
-		(http://www.bmrb.wisc.edu/). It allows the writing of NMR-STAR files
-		for BMRB data deposition and the reading and easy extraction of data
-		from files residing in the BMRB data bank, all without knowledge of
-		the Self-Defining Text Archive and Retrieval (STAR) format. The API
-		has currently only python bindings.
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index f50c9a917955..1cc110c9f369 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index c67799731818..4e34be42c13e 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -4,10 +4,8 @@ AUX octave-6.4.0-omit-qtchooser-qtver.patch 765 BLAKE2B 2f889e8278e48489f2eab1c3
 AUX octave-6.4.0-slibtool.patch 1416 BLAKE2B e4b487481490b41a4da499bb5eceff0f6a25a7e25d4f6c76088c3703259ab4899a354b0cf67eecb989bf4c4c05836be09881cce72145b3badca1393bd386a85f SHA512 cac0d183b3c555a25db37df250b2517ae4b762b7bc0d65ba0cb1093133f6f7ada42f6745b060d17f59c2177976841dafabcda61cf03d9cd14028399472f28ed7
 AUX octave-7.3.0-docs-texinfo-7.0.patch 1623 BLAKE2B 36a6ceda753083171ece9e4045af8551121f7073901d9f32facfd6c2bb88a10226f5aa719a79e8677c7a0cb7f26a226f2da190d9b4281b3fd666f570af3ac761 SHA512 0ac71393c59681a2188316356235ddb876e5c7cbf4a2ff1752bd3dddde7babeb456e0619ed65e32d5048d754416fb33c949aa0979748f7282e3e9d2589931612
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
-DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23 SHA512 b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024
 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5 SHA512 1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
 EBUILD octave-6.4.0-r3.ebuild 6043 BLAKE2B a99d2325249cbd29bcc3b00e734b28f7de4b61025f8f2133d5b7c53ad7bbb14bdbbd068ac204e3f7af80143c3797ec97688487b70361f8966dffd06569b3612d SHA512 559c07c35ecc7011e0f44a23fb2ad392a1562221f7218c0b5d89a2a9a2dd60e9f68e9cf3345b226d572d5da85d63cbe051643363bc9e1896ce4820817317f605
 EBUILD octave-6.4.0-r4.ebuild 6029 BLAKE2B 0bc2a9b11d237a51ea875b916e3dde0db429d3d577a20746d68d7dff43cf3755776a2c19c3bcc5987897e308850f9f570973d8c0abb0506a68d581b42ad3a50c SHA512 d6fef61f24420cbbc7a520ac42d9308f6e1824a68ed6bc928f9225fd5b5fa070ca091375445675d2e0654753b2d87d738e4c920d26bff2d245448a94c3a8b0c3
-EBUILD octave-7.2.0-r1.ebuild 5527 BLAKE2B 799a3175791ed82cc0f46bca34f6280a5b51b0e42381e627b748f195fa965a84fda6f562d8c6e6a20b3074a225d87a9b5ab1f8ba41b8978d3187d14df569ba0e SHA512 cfa3e263ce589e39b47b5c9240c63fe006a8751b81bf03850dc91848965fb46bc67db069550e86db5a4f3bc653ae7ab7744930753bbfbcfbcbde3efa91b4e5a0
 EBUILD octave-7.3.0-r1.ebuild 6638 BLAKE2B 4eaa8ca9ce1a7a0ce3bc91efa819aa8025d4d3ad32b7139b572d793f4b66c137adbaa952bb9a576adcfce3d9c48813522c36c7cd2e17e19dd33bda8092ef4a4e SHA512 80d0f6e43c6f45cdfb1e26d9a4c9e321fb254e1abf81f5f2cd40c64b56a9d33fe8cb6ce2062949c42742e0465d71bc56f589d374d0c3c8cfe2c884b315a09df1
 MISC metadata.xml 1703 BLAKE2B 0471bc1eeaa2ce86b8eeca5c3e831eb0d9207b5fd1d3c03aba017a257b7b98b313c42a1054471c79dab1b5d2d84df8a8d3b0ee68e772cbe6970ac92f07dc3269 SHA512 3c051ff80c958af4315faa1670cc5e1d6a53397b4182304b760cf4f2e14f716e187dd76879d094e35713ac115c47ea623530c2f4b114f7bf2eae1cdf28bc46b8
diff --git a/sci-mathematics/octave/octave-7.2.0-r1.ebuild b/sci-mathematics/octave/octave-7.2.0-r1.ebuild
deleted file mode 100644
index 74f1205d583c..000000000000
--- a/sci-mathematics/octave/octave-7.2.0-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="High-level interactive language for numerical computations"
-HOMEPAGE="https://www.gnu.org/software/octave/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-#
-# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
-#
-RDEPEND="
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-text/ghostscript-gpl
-	sys-apps/texinfo
-	dev-libs/libpcre:=
-	sys-libs/ncurses:=
-	sys-libs/zlib
-	virtual/blas
-	virtual/lapack
-	curl? ( net-misc/curl:= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( sci-mathematics/glpk:= )
-	gnuplot? ( sci-visualization/gnuplot )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-libs/qscintilla:=
-	)
-	hdf5? ( sci-libs/hdf5:= )
-	java? ( >=virtual/jre-1.8:* )
-	json? ( dev-libs/rapidjson )
-	opengl? (
-		media-libs/freetype:=
-		media-libs/fontconfig:=
-		virtual/glu
-		>=x11-libs/fltk-1.3:1=[opengl,xft]
-		x11-libs/gl2ps:=
-	)
-	portaudio? ( media-libs/portaudio )
-	postscript? (
-		app-text/epstool
-		media-gfx/pstoedit
-		media-gfx/transfig
-	)
-	qhull? ( media-libs/qhull:= )
-	qrupdate? ( sci-libs/qrupdate:= )
-	readline? ( sys-libs/readline:= )
-	sndfile? ( media-libs/libsndfile )
-	sparse? (
-		sci-libs/arpack:=
-		sci-libs/camd:=
-		sci-libs/ccolamd:=
-		sci-libs/cholmod:=
-		sci-libs/colamd:=
-		sci-libs/cxsparse:=
-		sci-libs/umfpack:=
-	)
-	ssl? (
-		dev-libs/openssl:=
-	)
-	sundials? ( >=sci-libs/sundials-4:= )
-	X? ( x11-libs/libX11:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gperf
-	virtual/imagemagick-tools
-	virtual/pkgconfig
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-plaingeneric
-		dev-texlive/texlive-metapost
-		virtual/latex-base
-	)
-	java? ( >=virtual/jdk-1.8:* )
-	gui? ( dev-qt/linguist-tools:5 )
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
-	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
-	"${FILESDIR}"/${PN}-6.4.0-slibtool.patch
-	"${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
-)
-
-src_prepare() {
-	default
-
-	# nasty prefix hacks for fltk:1 linking
-	if use prefix; then
-		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
-	fi
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Unfortunate dependency on mpi from hdf5 (bug #302621)
-	use hdf5 && has_version sci-libs/hdf5[mpi] && \
-		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
-	# Tell autoconf where to find qt binaries, fix bug #837752
-	export MOC="$(qt5_get_bindir)/moc" \
-		UIC="$(qt5_get_bindir)/uic" \
-		RCC="$(qt5_get_bindir)/rcc" \
-		LRELEASE="$(qt5_get_bindir)/lrelease" \
-		QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \
-		QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator"
-
-	# Some of these use_with flags are a bit mismatched. The configure
-	# script offers only --without-foo, and detects "foo" automatically
-	# unless --without-foo is specified. Passing --with-foo is not an
-	# error, however, so it kind of works. We wind up with, for example,
-	#
-	# --with-sundials_ida (no-op) with USE="sundials"
-	# --without-sundials_ida (disables it) with USE="-sundials"
-	#
-	econf \
-		--localstatedir="${EPREFIX}/var/state/octave" \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
-		--disable-64 \
-		--enable-shared \
-		--with-z \
-		--with-bz2 \
-		$(use_enable static-libs static) \
-		$(use_enable doc docs) \
-		$(use_enable java) \
-		$(use_enable json rapidjson) \
-		$(use_enable readline) \
-		$(use_with curl) \
-		$(use_with fftw fftw3) \
-		$(use_with fftw fftw3f) \
-		$(use_enable fftw fftw-threads) \
-		$(use_with glpk) \
-		$(use_with hdf5) \
-		$(use_with opengl) \
-		$(use_with opengl fltk) \
-		$(use_with ssl openssl) \
-		$(use_with portaudio) \
-		$(use_with qhull qhull_r) \
-		$(use_with qrupdate) \
-		$(use_with gui qt 5) \
-		$(use_with sndfile) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with sundials sundials_ida) \
-		$(use_with X x)
-}
-
-src_compile() {
-	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
-	export VARTEXFONTS="${T}/fonts"
-
-	default
-
-	if use java; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		dodoc $(find doc -name '*.pdf')
-	else
-		# bug #566134, macros.texi is installed by make install if use doc
-		insinto /usr/share/${PN}/${PV}/etc
-		doins doc/interpreter/macros.texi
-	fi
-
-	use java && \
-		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
-	doenvd 99octave
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sci-mathematics/relational/Manifest b/sci-mathematics/relational/Manifest
deleted file mode 100644
index 6afb27839d6a..000000000000
--- a/sci-mathematics/relational/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX relational-2.5-no-qtwebkit.patch 3307 BLAKE2B d0a1c4aa6261e5f52017b73e6d3ab8d689d328cca2ce9af1af3ee916edd52f99a6f5782b5a5abc723589d8b11ab04c088e0d80a89306a105da55eb59941d6c78 SHA512 9ac91976ec18b87647767f6cff525fa32c0e35749a04ed9d280016ee3b0346f12fd341b22e36a8fa97650058c12b858dbbcdd0c3c1964f554342bc8ef6d059c2
-DIST relational_2.5.orig.tar.gz 118776 BLAKE2B bec1a8c1a3c7973b9200f9a61e65aa144998558a9798e1e869d970ba15d2f7970be8dad865cfa779f05ee535638011851534a3be0c354d216eb35f38f135cb4d SHA512 588e35a57cf915e544d62749b76ed81927ac06fd88271f0d4d88ee5f221928c2c24e2a88165aae63c1b9b120ddaa20e15e21fe9c207eac3150b744274ae45a8a
-EBUILD relational-2.5-r2.ebuild 945 BLAKE2B a54bb173d1128b3b7713e758ed0a86747a36099933745f75e97e10798266ab46225fba2810aec5bc8c5d40d4ad761778ccc73c4631491ab0d5188bb2993105a0 SHA512 dee6609f9a47111e431234f760356bfe6d62e2dcbd3a9bb7ec2d85f3c3f485cbd46349bf5bc73bb31f241a105782aebfdb46c75a553643b84dc7cc015e7eb3a5
-MISC metadata.xml 330 BLAKE2B 4aedc9de4053d2de89825c05673c3f7e6479d4cc42f5b3d54d179dbd84f9fe3bf06f9be5e38f9acfa15a1d9061692878684a61769308ab09e63667d39cbad506 SHA512 2a5bce4717d3d198d5558ae504e8e32749ce3828fc42a5175ff2b00a26a13c85d219ce345af1da2dcb48779c8ec2d8b642ae3ef1749279fd38b25b3fde5e0726
diff --git a/sci-mathematics/relational/files/relational-2.5-no-qtwebkit.patch b/sci-mathematics/relational/files/relational-2.5-no-qtwebkit.patch
deleted file mode 100644
index 092b4a58e37e..000000000000
--- a/sci-mathematics/relational/files/relational-2.5-no-qtwebkit.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From bcdf81cdcd7fe531e11cb1db55e63468b7d73d47 Mon Sep 17 00:00:00 2001
-From: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>
-Date: Sat, 26 Aug 2017 17:51:04 +0200
-Subject: [PATCH] Remove embedded browser with website
-
----
- relational_gui/about.py | 32 --------------------------------
- 1 file changed, 32 deletions(-)
-
-diff --git a/relational_gui/about.py b/relational_gui/about.py
-index 4c03c99..55abfc9 100644
---- a/relational_gui/about.py
-+++ b/relational_gui/about.py
-@@ -18,12 +18,6 @@
- 
- from PyQt5 import QtCore, QtGui, QtWidgets
- 
--try:  # If QtWebKit is available, uses it
--    from PyQt5 import QtWebKitWidgets
--    webk = True
--except:
--    webk = False
--
- version = 0
- 
- 
-@@ -85,31 +79,7 @@ def setupUi(self, Dialog):
-         self.tab_2.setObjectName("tab_2")
-         self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.tab_2)
-         self.verticalLayout_7.setObjectName("verticalLayout_7")
--        if (webk):
--            self.webView = QtWebKitWidgets.QWebView(self.tab_2)
--            self.webView.setUrl(
--                QtCore.QUrl("http://ltworf.github.io/relational/allowed_expressions.html"))
--            self.webView.setObjectName("webView")
--            self.verticalLayout_7.addWidget(self.webView)
--        else:
--            self.webLink = QtWidgets.QLabel(self.groupBox)
--            self.webLink.setFont(font)
--            self.webLink.setObjectName("lblLink")
--            self.webLink.setText(QtWidgets.QApplication.translate(
--                "Dialog", "<a href=\"http://ltworf.github.io/relational/\">Relational's website</a>", None,))
--            self.webLink.setOpenExternalLinks(True)
--            self.webLink.setTextFormat(QtCore.Qt.AutoText)
--            self.webLink.setTextInteractionFlags(
--                QtCore.Qt.LinksAccessibleByKeyboard |
--                QtCore.Qt.LinksAccessibleByMouse |
--                QtCore.Qt.TextBrowserInteraction |
--                QtCore.Qt.TextSelectableByKeyboard |
--                QtCore.Qt.TextSelectableByMouse
--            )
--
--            self.verticalLayout_7.addWidget(self.webLink)
- 
--        self.tabWidget.addTab(self.tab_2, "")
-         self.verticalLayout_2.addWidget(self.tabWidget)
-         self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
-         self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-@@ -294,8 +264,6 @@ def retranslateUi(self, Dialog):
-                                                                "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read &lt;http://www.gnu.org/philosophy/why-not-lgpl.html&gt;. </p></body></html>", None))
-         self.tabWidget.setTabText(self.tabWidget.indexOf(self.License), QtWidgets.QApplication.translate(
-             "Dialog", "License", None))
--        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), QtWidgets.QApplication.translate(
--            "Dialog", "Docs", None))
- 
- 
- if __name__ == "__main__":
diff --git a/sci-mathematics/relational/metadata.xml b/sci-mathematics/relational/metadata.xml
deleted file mode 100644
index c55a483e7c97..000000000000
--- a/sci-mathematics/relational/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>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ltworf/relational</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-mathematics/relational/relational-2.5-r2.ebuild b/sci-mathematics/relational/relational-2.5-r2.ebuild
deleted file mode 100644
index 41251c5f5f99..000000000000
--- a/sci-mathematics/relational/relational-2.5-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit python-single-r1
-
-DESCRIPTION="Educational tool for relational algebra"
-HOMEPAGE="https://ltworf.github.io/relational/"
-SRC_URI="https://github.com/ltworf/${PN}/releases/download/${PV}/${PN}_${PV}.orig.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-no-qtwebkit.patch" )
-
-src_prepare() {
-	default
-
-	sed -i -e '/^Terminal=/ s/0/false/' \
-		-e '/^Keywords=/ s/$/;/' \
-		relational.desktop || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${ED}" install-{relational-cli,python3-relational,relational}
-	python_optimize
-
-	dodoc CHANGELOG complexity CREDITS README.md
-}
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 4f76acc1e75a..5349a4b455b8 100644
--- a/sec-policy/Manifest.gz
+++ b/sec-policy/Manifest.gz
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
deleted file mode 100644
index 9f75fa49dda1..000000000000
--- a/sec-policy/selinux-prelude/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST patchbundle-selinux-base-policy-2.20220520-r1.tar.bz2 294472 BLAKE2B 12dbda1952bde3db32758470735327c9934f42128dd54513c5a5d082d41cc73e39f49567dafa6abca3fd9d7d036e3a032a26a572e3ba3871de451a78f3757057 SHA512 d75e66f484281d1987e9c6fbe18a483934af39f28f908cfd21c14ba72acbf2ce9afc3bb9211f83e17badbbfaeadbd5263845dc8535eb28bf3b6b56f89db62d43
-DIST patchbundle-selinux-base-policy-2.20221101-r2.tar.bz2 285989 BLAKE2B e6c5851c4f9b4cbe3f0b478d72e20a1ce05ce85dd0b11d2be7a9a6a4a6c4091e70c092307ed8a1c626a39e13e6437417bc78875fc5985e7d652c69f4644d347e SHA512 8d881cd42f1da699af7ea39023fcc2d89fab5b2476975e2ab8764ad110b237cbf44d1688499d6cbc0514ee538f7770f391a3e2df32e8980f1af6a509ea9ffd78
-DIST patchbundle-selinux-base-policy-2.20221101-r3.tar.bz2 444710 BLAKE2B e33cc01a8be5a354e022be1e8bf242883b09b15ead0673f859819f5e668f18773a16527f2e608878e6976695dcb2890c55658e77877e93c716ae0b2dd2ed5a9b SHA512 52e60b22346903a6fead95c9fb348fa1d4037b7dcd3e5781248a7dfc426c8c3fced258fd22762c779a5f436d8be21eaed5425ed36ff99c267daae5e1cb9c8e7f
-DIST refpolicy-2.20220520.tar.bz2 577155 BLAKE2B d4352009ef5eb8599feb4adbec0ecef7fd5c9617b820300ab5e95723ddc790dc9244628417c71097ea3f7fff47c1d47a6e4a39da539e6b662acfd9d7ea8cc190 SHA512 eeeca3817fd305f82f62a53ae9c5120775fdf6f6c57d5420584e225019cd66357f7da119e8ea8f21549631d14b1c8076e9ac81aa4907de6c6fa0d7fc827b67ff
-DIST refpolicy-2.20221101.tar.bz2 583183 BLAKE2B 783d8af40fd77d7ddb848dba32e91921dd7c1380c094c45b719ada7b15f91aacbb52b410ffa6341f2f705ecbc9674b8570bd4867ce998e944fa0054ffd8bdf74 SHA512 29e5a29d90f714018c88fead2d5006ea90338fb5b7a1e4e98cb2e588c96cd861871d32176f6cc6f7c4e864ce5acae1aeed85d4c706ce2da8168986535baaf3a6
-EBUILD selinux-prelude-2.20220520-r1.ebuild 375 BLAKE2B 024a2930b7ec89dae42974f4b55d1e2a3249c1d98d9faed5d8b42b4d1da4b3c607b1ff8ce500c5c3b803f08f64966eed4ac7de355623819976fcc03f801dd1ba SHA512 3661a726aa3ad7fa3e9c7ce48405b85e34c7cca4094138a30064a6ce04c3ccfbafbda1f12751f891d08288f5e8b7422f2e62a506d65f48762100bb7391764b53
-EBUILD selinux-prelude-2.20221101-r2.ebuild 375 BLAKE2B 024a2930b7ec89dae42974f4b55d1e2a3249c1d98d9faed5d8b42b4d1da4b3c607b1ff8ce500c5c3b803f08f64966eed4ac7de355623819976fcc03f801dd1ba SHA512 3661a726aa3ad7fa3e9c7ce48405b85e34c7cca4094138a30064a6ce04c3ccfbafbda1f12751f891d08288f5e8b7422f2e62a506d65f48762100bb7391764b53
-EBUILD selinux-prelude-2.20221101-r3.ebuild 379 BLAKE2B 0e2fbc4ac3d6d81f79bd3275076aa3e46f4ddd4534aed86a66de8caeb80fafb5c4e3cb4080d2ad94baa48bd85b7586de3b2c13e44b6a8f35d96adc404cd79e55 SHA512 fdbcbeb5428d155ecffa3a30527c4f0f25225a262b5441726ba0bb935ae392931850d2ff3f7c06ba74b228b706b3bf94d596d52d430e2e1a02ed2fc7fcf973f7
-EBUILD selinux-prelude-9999.ebuild 379 BLAKE2B 9abf97bfaf98a2017884e9543638e8ee79bf7605bf57ef507a4dedb834b33b34cf54ebc2f1331280866426c5947f7e449cc4fd067d5a76b3d38e9c7f64a955f2 SHA512 83e909d343ea6271010554cdc2e9f7ec7057b86dc0b572892d34f634ccae3d9696a26043dc7cf52e8806d55ee8b01bbd7f1bc189d2a7102f831c447a11812382
-MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-prelude/metadata.xml b/sec-policy/selinux-prelude/metadata.xml
deleted file mode 100644
index 781bc07e6d59..000000000000
--- a/sec-policy/selinux-prelude/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>selinux@gentoo.org</email>
-		<name>SELinux Team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20220520-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20220520-r1.ebuild
deleted file mode 100644
index 628bffa06a0d..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20220520-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20221101-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20221101-r2.ebuild
deleted file mode 100644
index 628bffa06a0d..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20221101-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20221101-r3.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20221101-r3.ebuild
deleted file mode 100644
index 284d47186b16..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20221101-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild b/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
deleted file mode 100644
index 4c31ae670da8..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0f4511c7eecb..1dd100632275 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/intel-performance-counter-monitor/Manifest b/sys-apps/intel-performance-counter-monitor/Manifest
deleted file mode 100644
index 524abceb31bc..000000000000
--- a/sys-apps/intel-performance-counter-monitor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST IntelPerformanceCounterMonitor-PCM-V2.10.zip 950922 BLAKE2B 3b3b0cf3e12e1f57241e25b13848253157624ac49c1aaec74a0ec8fd2cf92dffa56e5c25299189bd886cb069897dd5a7117a71b5189487be89ee704a377bbc03 SHA512 a9a219495d9e99f8a8ffdae729c56e565c63856b81d71d7d188db2543d8d656535bb88f5701351a41aee948aeeeae304951cdf99dac7e6628bd43ba79bda757a
-EBUILD intel-performance-counter-monitor-2.10.ebuild 1112 BLAKE2B e70bad83ebc6a3360e8d115ccf27fd4fa363f85711725c4f725da0aee59c64b7ede8409019f922d4edee5c0a076845a0d09417f41e01180e5fbe5b07d14900d7 SHA512 be4919dde28099d8aad4bd839a5120d4bcb3aadfa55e035124fc4a4df8a1a57c10d32348c81583414ee20d938050ac5530dcd2e05363a24c5c410ce207800580
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.10.ebuild b/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.10.ebuild
deleted file mode 100644
index f3db85a77f66..000000000000
--- a/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps
-
-MY_PN="IntelPerformanceCounterMonitor-PCM"
-MY_PV="V2.10"
-MY_P="${MY_PN}-${MY_PV}.zip"
-
-DESCRIPTION="Intel Performance Counter Monitor - A better way to measure CPU utilization"
-HOMEPAGE="https://software.intel.com/en-us/articles/intel-performance-counter-monitor-a-better-way-to-measure-cpu-utilization"
-SRC_URI="https://dev.gentoo.org/~idella4/distfiles/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=sys-devel/gcc-4:*"
-
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~X86_MSR ~PERF_EVENTS"
-ERROR_X86_MSR="Intel Performance Counter Monitor, requires X86_MSR to be set in kernel config."
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_install() {
-	newbin pcm.x pcm
-	newbin pcm-memory.x pcm-memory
-	newbin pcm-msr.x pcm-msr
-	newbin pcm-numa.x pcm-numa
-	newbin pcm-pcie.x pcm-pcie
-	newbin pcm-power.x pcm-power
-	newbin pcm-sensor.x pcm-sensor
-	newbin pcm-tsx.x pcm-tsx
-}
-
-pkg_postinst() {
-	fcaps CAP_SYS_RAWIO usr/bin/pcm
-	fcaps CAP_SYS_RAWIO usr/bin/pcm-{memory,msr,numa,pcie,power,tsx}
-}
diff --git a/sys-apps/intel-performance-counter-monitor/metadata.xml b/sys-apps/intel-performance-counter-monitor/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/sys-apps/intel-performance-counter-monitor/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/memtest86-bin/Manifest b/sys-apps/memtest86-bin/Manifest
index fcd5292639a3..a83e18e66e31 100644
--- a/sys-apps/memtest86-bin/Manifest
+++ b/sys-apps/memtest86-bin/Manifest
@@ -1,4 +1,4 @@
 AUX memtest86-bin-grub.d 467 BLAKE2B cf36f784b4032f615e5e3cd07d67125ea54c2d4fd9c7ce2f05a6a87fb4a2636491edabc77a0833039c6a8667d0cefffb20c3d4a755bc9571a363b3c6193a1831 SHA512 0f8063689c2a1dcc5d5aee2b7a7e7db4c195012ab6c641bbd66c3c495bec5252a5733664e900483580e78ee47a29a6e8e078127ef1c723ee6419e9accb4a7bc0
-DIST memtest86-bin-10.1.zip 5485908 BLAKE2B 3d67e56533b2143399426964f79389cc565b598059bf8a94f9d8fc7d48395f425186382a89625953016e92e66ecc964e09566b08e4b0759b946a2ac69116e116 SHA512 59e92f5ee7717dd6be960c75c3a10a1c15d96fc18edcaac8c6e1cf5ba422d607e69f8d979dbbd3d68ec44f0e908250f10a0ab1c999dc17d3b9b92bc64111e604
+DIST memtest86-bin-10.1.zip 8845495 BLAKE2B 24035a0ba3db98d5658dd24854eeaee1a48c168a6f66914be0c67c5e5dd992a18ef3c30e393afb3bfcc1ada58d299407626d27bf604c16cec37e1343dc5e726f SHA512 166ba41dbc112a2376a7f56a0d8c28ddd214df5e875de229fe6be5a403068970aefe0066baa8ecf73245b43e6c0890f33f2b07055e4d4ab7146c561fcf458548
 EBUILD memtest86-bin-10.1.ebuild 904 BLAKE2B e990885b3c7af0859858b3e5b558b12b4a15b746354d614469181f9b4e0f6a3c7216a8382d65def8ad225932ded276672043084a1f62a71b2cc51235e43bd3e1 SHA512 900cf5e2c7d418e0b043b3030928cfbcfdd90830b163fa7e1ae1831b7dd35ec96ce69bb1bc9bdc3945c06eacd8768f6478bd3421ced879090f159706010ad304
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 97e5eee5256c..799827617533 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,4 +1,4 @@
 DIST net-tools-2.10.tar.xz 229616 BLAKE2B 0d11a5c12f6447282c65ee74428c1b9f6da9fd6d26ca558813d002fac8a4f03fd25a26231a5f4e45f88d821e9a8281e3be1fea4a832bd09afbc2239634a1c25d SHA512 aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf
-EBUILD net-tools-2.10.ebuild 1922 BLAKE2B 1accae1bcd60f548222dbbb063d245300d81768474fff15e1306fa8e6b24fcfbb1f270e7fdc57570bfdcb07bd8e0da5e0a3eac6e84c9524e8cc2578040c46469 SHA512 20dacee1fa8b998b81f6286827effa552a845bd827037ef53a4a5f6be0b3cd3331811b617c3bef4002048f266d683ad1efd6b315e917f7c37a85c24293167802
-EBUILD net-tools-9999.ebuild 1923 BLAKE2B 16912890591ac8db71923c955330d8f96839ff2fbe9c9c5b495924f95e9b4fac9ecb9d4e6fab7aaea6ac592e51776e1912392189f7728383deeeddb8fb1a495c SHA512 e875bfadb197f9249637f2891cd45be68dd512ac7eefc381d5a360e0bee3e53b29acc82e07670d18fdbec9fae24e4be80b3f790d1133482560d2d0b56979351e
+EBUILD net-tools-2.10.ebuild 1950 BLAKE2B 8f12838ebcf1af75100b13078dd31160a53afe202eae74a7aa6bda795f0cdc82cf6fff152143c355fb394b831be266ed978f06df161cf5da037b01dad38e7af8 SHA512 52acd14c62cdd931f1bf623582602b2a72f17ee94648cee0d82540df7152f76c1229cb58e6e0093ef1f3bf0da0031b3ab24608a50765dd2fa218ffe8c01fb10c
+EBUILD net-tools-9999.ebuild 1951 BLAKE2B 9215c09731a57973481a58236779c8236c861c5531b9fd551fbaea655b17de50417d0a8f034a12378c010e4ebd967ae2a885dfc9398dfda8720c7f4a7768ab4d SHA512 c9d70eca24bfa2a75a146447ed60ad5a5e591a9d976fc6fca459884dbfe4d106f590f66ef903e7b35de937c80ca7f6c13a374b181a11cb53a7a238a641666768
 MISC metadata.xml 758 BLAKE2B 4b48cf808b718f43de859726556f703d980d66aeaf8840057576d99edb2e676c4cf68b3cc4732cc114049bc7d465d1717c70bc9e805584673f4b12e210a0190a SHA512 f1e99c1fc28f25ca0f9051e3e7eaade834362b1cd0b9c01bd492b896da3df9c51d66fa31114189149e0a1827bee785d7c7361b34e2b76abc6865871cf800b9d1
diff --git a/sys-apps/net-tools/net-tools-2.10.ebuild b/sys-apps/net-tools/net-tools-2.10.ebuild
index 71379f1a2ef6..fca68bc4c63d 100644
--- a/sys-apps/net-tools/net-tools-2.10.ebuild
+++ b/sys-apps/net-tools/net-tools-2.10.ebuild
@@ -23,7 +23,8 @@ REQUIRED_USE="nis? ( hostname )"
 
 DEPEND="selinux? ( sys-libs/libselinux )"
 RDEPEND="${DEPEND}
-	hostname? ( !sys-apps/coreutils[hostname] )"
+	hostname? ( !sys-apps/coreutils[hostname] )
+	nis? ( !net-nds/yp-tools )"
 BDEPEND="
 	selinux? ( virtual/pkgconfig )
 	app-arch/xz-utils
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
index 96f533d8a695..66cdcd23d4c1 100644
--- a/sys-apps/net-tools/net-tools-9999.ebuild
+++ b/sys-apps/net-tools/net-tools-9999.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"
@@ -23,7 +23,8 @@ REQUIRED_USE="nis? ( hostname )"
 
 DEPEND="selinux? ( sys-libs/libselinux )"
 RDEPEND="${DEPEND}
-	hostname? ( !sys-apps/coreutils[hostname] )"
+	hostname? ( !sys-apps/coreutils[hostname] )
+	nis? ( !net-nds/yp-tools )"
 BDEPEND="
 	selinux? ( virtual/pkgconfig )
 	app-arch/xz-utils
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index a7f86a522938..abdb10a595a4 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index dcfaf9207d04..ed969656fddc 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -4,11 +4,9 @@ AUX grub-2.06-grub-mkconfig-restore-umask.patch 1377 BLAKE2B ea5369b79a1ec0dbb4e
 AUX grub-2.06-test-words.patch 2553 BLAKE2B 21d6167945b461be7cc73198451ae0dc15ce0dfe2a301342f1a3bb75d6fcb5d73da9997fb8a93f36dffb43a351f056a1a4db9eed3147b0f3e77c65034b805c64 SHA512 627422377bdad97d0197f178814d6616a0f7ec07357182b00166a455d38ba0c5a60185c5febf4dfb7a11b35f26c7af607508cb5f418acdb7290517240fbd99e4
 AUX grub.default-3 2528 BLAKE2B c32de43644eca5fae8d8d727ff443600917a93e015f8a83dde555e3bca7506a817b08a2fc926970eeb5b7f40028f4951c6cdcd281f9fc0b6504f26c8e76bf0c5 SHA512 505960e62b44c70af0a90c7ff486bd57101831d7c6e9d80084013e374070ff02b40f77b0790aebb926e1e0854e375867cba1d4977dbb00c2ba54ebaa9f6a1a0b
 DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
-DIST grub-2.06-backports-r1.tar.xz 31900 BLAKE2B d8320eff8cebc408b7c4845d17adf82470407fd3837ab8508703f0f3b2bf5271d6ea8ec2cdf57461e77dd9b69458e9a9d197b533029df3637aad3656b2968b65 SHA512 2487a305ca3f969ed735df0ef181cc7caceffcfaf0126dbd8cceb19ce1062952404f0e5deeaa4f9431cafa94c40c2d57c77da17ea3da4ff62592e42e852b107a
 DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602 SHA512 99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
 DIST grub-2.06.tar.xz 6581924 BLAKE2B 2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417 SHA512 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
-EBUILD grub-2.06-r3.ebuild 8292 BLAKE2B ebe5dd8e02d48d0bda4d3c12cb00f64aae6b5f59f548ac20ce6d1d3ebaf5ddf32e02e02c0ca3ff3f2788b650c252fbc0d229a9965de578877358f597e354519d SHA512 50e4cc94e3e9cb49e0e2814f094b032773ef949ae33f292263b55d2d801275bebac21f984e300a916ebe6e864b5e6e0cc1201db0e743e5ef5e82df626cbb9edc
-EBUILD grub-2.06-r4.ebuild 8292 BLAKE2B a2d5189cab5f6f8e8eded669a2fc17e8e78611cad060def99d239a68722b247c02af3bf167358778c341467a1659eb6ada115ddc58c12c8ac941a95db7505bba SHA512 52ad54914e17ca62d425b0b8567a1f64fefc68d7d570a29bdb4a22eb303a2859e45f71d4471cec813ea02a3d1a15690994316501773bb555b5121dafbcb4ce99
-EBUILD grub-9999.ebuild 8130 BLAKE2B d18c0aabc0169068c3edfca6af8c4536fb6a999a63623fc305e695a960c010189f27337be4ee1391072473469860b32b3716fb4e34294503361d734c949a89f1 SHA512 011fa6aa320be9a69aa0dddb90dfd952c2b5b7e5280749b1b1625a690213b5294b88612131026b353eea5e5542978b49459657ffacf7db3acb2bd7da3d89187f
+EBUILD grub-2.06-r4.ebuild 8363 BLAKE2B 77534f64396da94fd1d7d898194f81ee36c1ea06ec330d5ff671b59a5c0518cc0421ef391b4931440429151c0bf5501b361f36ce7505f63b1b63909357b3bcd7 SHA512 4905d2512a3c98cdeae205618483007bcee6ec78204df735aef22c5659163f640c5be6571fcc260cfa92fff2ed40d9bd548d4d3db0674748ec6b33d009a6b082
+EBUILD grub-9999.ebuild 8201 BLAKE2B 6d78e989c74ba35a6b11b02f90009cf6071dede28472e45aa3298d4fb4a8c7c5124a32b82f9d3b2a9b0567fb770bd3e94cf4026c5d2bbf9b9acb0b8b31cc0724 SHA512 f05d59d07a7cccd9eee450715555c4f32698836d64fe3a984b4413d6039042251bbdf549de2f1d732b814c65615c685a1e7ef1f84fe47ae60899e579bf6fc93a
 MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c
diff --git a/sys-boot/grub/grub-2.06-r3.ebuild b/sys-boot/grub/grub-2.06-r3.ebuild
deleted file mode 100644
index 3f691ad4626e..000000000000
--- a/sys-boot/grub/grub-2.06-r3.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# This ebuild uses 3 special global variables:
-# GRUB_BOOTSTRAP: Depend on python and invoke bootstrap (gnulib).
-# GRUB_AUTOGEN: Depend on python and invoke the autogen.sh.
-# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
-#
-# When applying patches:
-# If gnulib is updated, set GRUB_BOOTSTRAP=1
-# If *.def is updated, set GRUB_AUTOGEN=1
-# If gnulib, *.def, or any autotools files are updated, set GRUB_AUTORECONF=1
-#
-# If any of the above applies to a user patch, the user should set the
-# corresponding variable in make.conf or the environment.
-
-if [[ ${PV} == 9999  ]]; then
-	GRUB_BOOTSTRAP=1
-fi
-
-GRUB_AUTORECONF=1
-PYTHON_COMPAT=( python3_{8..11} )
-WANT_LIBTOOL=none
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-	inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
-	inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
-		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
-		MY_P=${P/_/'~'}
-		SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_P}
-	else
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-		S=${WORKDIR}/${P%_*}
-	fi
-	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-backports-r1.tar.xz"
-
-PATCHES=(
-	"${WORKDIR}/${P}-backports"
-	"${FILESDIR}"/gfxpayload.patch
-	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-	"${FILESDIR}"/grub-2.06-test-words.patch
-	"${FILESDIR}"/grub-2.06-grub-mkconfig-restore-umask.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.1.02
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
-	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/"
-
-# Includes licenses for dejavu and unifont
-LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs"
-
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot
-	qemu qemu-mips pc uboot xen xen-32 xen-pvh )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
-	grub_platforms_coreboot? ( fonts )
-	grub_platforms_qemu? ( fonts )
-	grub_platforms_ieee1275? ( fonts )
-	grub_platforms_loongson? ( fonts )
-"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/flex
-	sys-devel/bison
-	sys-apps/help2man
-	sys-apps/texinfo
-	fonts? (
-		media-libs/freetype:2
-		virtual/pkgconfig
-	)
-	test? (
-		app-admin/genromfs
-		app-arch/cpio
-		app-arch/lzop
-		app-emulation/qemu
-		dev-libs/libisoburn
-		sys-apps/miscfiles
-		sys-block/parted
-		sys-fs/squashfs-tools
-	)
-	themes? (
-		app-arch/unzip
-		media-libs/freetype:2
-		virtual/pkgconfig
-	)
-	truetype? ( virtual/pkgconfig )
-"
-DEPEND="
-	app-arch/xz-utils
-	>=sys-libs/ncurses-5.2-r5:0=
-	grub_platforms_emu? (
-		sdl? ( media-libs/libsdl )
-	)
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	libzfs? ( sys-fs/zfs:= )
-	mount? ( sys-fs/fuse:0 )
-	truetype? ( media-libs/freetype:2= )
-	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-"
-RDEPEND="${DEPEND}
-	kernel_linux? (
-		grub_platforms_efi-32? ( sys-boot/efibootmgr )
-		grub_platforms_efi-64? ( sys-boot/efibootmgr )
-	)
-	!sys-boot/grub:0
-	nls? ( sys-devel/gettext )
-"
-
-RESTRICT="!test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-		pushd "${P}" >/dev/null || die
-		local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
-		local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
-		git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
-		git-r3_checkout "${GNULIB_URI}" gnulib
-		popd >/dev/null || die
-	fi
-	default
-}
-
-src_prepare() {
-	default
-
-	sed -i -e /autoreconf/d autogen.sh || die
-
-	if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-		python_setup
-	else
-		export PYTHON=true
-	fi
-
-	if [[ -n ${GRUB_BOOTSTRAP} ]]; then
-		eautopoint --force
-		AUTOPOINT=: AUTORECONF=: ./bootstrap || die
-	elif [[ -n ${GRUB_AUTOGEN} ]]; then
-		./autogen.sh || die
-	fi
-
-	if [[ -n ${GRUB_AUTORECONF} ]]; then
-		eautoreconf
-	fi
-}
-
-grub_do() {
-	multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
-	multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
-	local platform
-
-	case ${MULTIBUILD_VARIANT} in
-		efi*) platform=efi ;;
-		xen-pvh) platform=xen_pvh ;;
-		xen*) platform=xen ;;
-		guessed) ;;
-		*) platform=${MULTIBUILD_VARIANT} ;;
-	esac
-
-	case ${MULTIBUILD_VARIANT} in
-		*-32)
-			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
-				local CTARGET=i386
-			fi ;;
-		*-64)
-			if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
-				local CTARGET=x86_64
-				local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-				local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-			fi ;;
-	esac
-
-	local myeconfargs=(
-		--disable-werror
-		--program-prefix=
-		--libdir="${EPREFIX}"/usr/lib
-		$(use_enable device-mapper)
-		$(use_enable mount grub-mount)
-		$(use_enable nls)
-		$(use_enable themes grub-themes)
-		$(use_enable truetype grub-mkfont)
-		$(use_enable libzfs)
-		$(use_enable sdl grub-emu-sdl)
-		${platform:+--with-platform=}${platform}
-
-		# Let configure detect this where supported
-		$(usex efiemu '' '--disable-efiemu')
-	)
-
-	if use fonts; then
-		ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
-	fi
-
-	if use themes; then
-		ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
-	fi
-
-	local ECONF_SOURCE="${S}"
-	econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-	# Bug 508758.
-	replace-flags -O3 -O2
-
-	# Workaround for bug 829165.
-	filter-ldflags -pie
-
-	# We don't want to leak flags onto boot code.
-	export HOST_CCASFLAGS=${CCASFLAGS}
-	export HOST_CFLAGS=${CFLAGS}
-	export HOST_CPPFLAGS=${CPPFLAGS}
-	export HOST_LDFLAGS=${LDFLAGS}
-	unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
-	tc-ld-disable-gold #439082 #466536 #526348
-	export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
-	unset LDFLAGS
-
-	tc-export CC NM OBJCOPY RANLIB STRIP
-	tc-export BUILD_CC BUILD_PKG_CONFIG
-
-	MULTIBUILD_VARIANTS=()
-	local p
-	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
-		use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
-	done
-	[[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
-	grub_do grub_configure
-}
-
-src_compile() {
-	# Sandbox bug 404013.
-	use libzfs && addpredict /etc/dfs:/dev/zfs
-
-	grub_do emake
-	use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
-	# The qemu dependency is a bit complex.
-	# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
-	grub_do emake check
-}
-
-src_install() {
-	grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
-	use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
-	einstalldocs
-
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default-3 grub
-
-	# https://bugs.gentoo.org/231935
-	dostrip -x /usr/lib/grub
-}
-
-pkg_postinst() {
-	elog "For information on how to configure GRUB2 please refer to the guide:"
-	elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test -gt ${v}; then
-				ewarn
-				ewarn "Re-run grub-install to update installed boot code!"
-				ewarn
-				break
-			fi
-		done
-	else
-		elog
-		optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober
-		optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn
-		optfeature "enabling RAID device detection" sys-fs/mdadm
-	fi
-
-	if has_version 'sys-boot/grub:0'; then
-		elog "A migration guide for GRUB Legacy users is available:"
-		elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration"
-	fi
-
-	if has_version sys-boot/os-prober; then
-		ewarn "Due to security concerns, os-prober is disabled by default."
-		ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
-	fi
-}
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild b/sys-boot/grub/grub-2.06-r4.ebuild
index 10638d064406..04ab2f692a59 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -86,7 +86,7 @@ REQUIRED_USE="
 
 BDEPEND="
 	${PYTHON_DEPS}
-	sys-devel/flex
+	>=sys-devel/flex-2.5.35
 	sys-devel/bison
 	sys-apps/help2man
 	sys-apps/texinfo
@@ -262,6 +262,9 @@ src_configure() {
 	tc-export CC NM OBJCOPY RANLIB STRIP
 	tc-export BUILD_CC BUILD_PKG_CONFIG
 
+	# Force configure to use flex, bug 887211.
+	export LEX=flex
+
 	MULTIBUILD_VARIANTS=()
 	local p
 	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 477b43363226..a256108539c8 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -82,7 +82,7 @@ REQUIRED_USE="
 
 BDEPEND="
 	${PYTHON_DEPS}
-	sys-devel/flex
+	>=sys-devel/flex-2.5.35
 	sys-devel/bison
 	sys-apps/help2man
 	sys-apps/texinfo
@@ -258,6 +258,9 @@ src_configure() {
 	tc-export CC NM OBJCOPY RANLIB STRIP
 	tc-export BUILD_CC BUILD_PKG_CONFIG
 
+	# Force configure to use flex, bug 887211.
+	export LEX=flex
+
 	MULTIBUILD_VARIANTS=()
 	local p
 	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 1ba0cff3d1b2..170be23fbc0f 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/prewikka/Manifest b/www-apps/prewikka/Manifest
deleted file mode 100644
index 387b61872373..000000000000
--- a/www-apps/prewikka/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX prewikka-5.2.0-fix_siteconfig.patch 331 BLAKE2B 0aa3a6ce4d31067b1ce38976bfa6081527d760f0b5461494c36a9fccedba2fbf8bf44691090fea285d70c6743fa948708c32561beaea80758fc528bfd71b360d SHA512 9d7c48ffa8f225f6927961a94da2d69b011209c1c69fe98efb3d37343f7ad78774ac8d5b1a56b5831605800471117e34ec0ec49309385976a41557c3713702df
-DIST prewikka-5.2.0.tar.gz 1808717 BLAKE2B 5713b0ce47a3ef137795035ca074410abf9e934c3e9c90b48d127396f0c92e48969e755b48a8519f52cc63bf56e7200c285fb7ad7069f4489cd552eddaa1be5a SHA512 034040e22c2b122289f6af5a2221024585c671327f158e61845feef720c7f70b06a6aa4caaaeba7b48394aa95cd67c45061d97cdaecc3902e26175df9b86c411
-EBUILD prewikka-5.2.0.ebuild 1358 BLAKE2B ab958dde5680c367dc316f1e7981c782abd881d046c16e984dec5ea909f060843fc4d3625cd555922e9c46163879faeca75ff68b37ae5487c623efab196fc5b4 SHA512 4c6c3456ab23ed7e961517210e69a20a7b2597095ec4f78f6a1a2225600c190f4abce9a057f232d8296e7f2b95947ec70eef2bcfb98301a4cdf4809a41259cfc
-MISC metadata.xml 584 BLAKE2B c13f4e7cf2fbecfb8dac6a4e671328bcc68d922d5b7b06dab0fe63d1e2d1c38a93a6a15e062813f6a7e28953e2e40f27332d19824a0e3951142d755dc631c2da SHA512 6615399a41608faaf3c48540da110f6b547fb4401aeb9aa2f7cf544b62c9065d9ff00e0dec7a728a80ebe9747b5654ddf5093c799c0d858041df679233ed4339
diff --git a/www-apps/prewikka/files/prewikka-5.2.0-fix_siteconfig.patch b/www-apps/prewikka/files/prewikka-5.2.0-fix_siteconfig.patch
deleted file mode 100644
index 03a20ab36efe..000000000000
--- a/www-apps/prewikka/files/prewikka-5.2.0-fix_siteconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py	2020-09-09 16:44:23.000000000 +0200
-+++ b/setup.py	2020-09-29 01:07:56.522604785 +0200
-@@ -108,6 +108,7 @@
-         ofile, copied = self.copy_file('scripts/prewikka.wsgi', share_dir)
- 
-     def run(self):
-+        self.skip_build = 0
-         os.umask(0o22)
-         self.install_conf()
-         self.install_wsgi()
diff --git a/www-apps/prewikka/metadata.xml b/www-apps/prewikka/metadata.xml
deleted file mode 100644
index 32f02839d2d0..000000000000
--- a/www-apps/prewikka/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-needed -->
-	<longdescription lang="en">
-		Prewikka is the graphical front-end analysis console for the
-		Prelude Universal SIM. Providing numerous features, Prewikka
-		facilitates the work of users and analysts. It provides alert
-		aggregation and sensor and hearbeat views, and has user management
-		and configurable filters. Prewikka also provides access to external
-		tools such as whois and traceroute.
-	</longdescription>
-</pkgmetadata>
diff --git a/www-apps/prewikka/prewikka-5.2.0.ebuild b/www-apps/prewikka/prewikka-5.2.0.ebuild
deleted file mode 100644
index 05a33df39048..000000000000
--- a/www-apps/prewikka/prewikka-5.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ssl"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Graphical front-end analysis console for the Prelude Framework"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/libprelude-5.2.0[python,${PYTHON_USEDEP}]
-	<dev-libs/libprelude-6[python,${PYTHON_USEDEP}]
-	>=dev-libs/libpreludedb-5.2.0[python,${PYTHON_USEDEP}]
-	<dev-libs/libpreludedb-6[python,${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/croniter[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/lark[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/voluptuous[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	media-fonts/font-xfree86-type1"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-python/lesscpy[${PYTHON_USEDEP}]
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.2.0-fix_siteconfig.patch"
-)
-
-src_install() {
-	distutils-r1_src_install
-
-	keepdir /var/lib/prewikka
-}
-
-pkg_postinst() {
-	optfeature "Asynchronous DNS" dev-python/twisted
-}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index f5feb0dbe459..5921d13ef4c0 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 7b239f9c11ba..447fa9f3365e 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,5 +1,5 @@
 AUX gunicorn-20.1.0-new-eventlet.patch 1103 BLAKE2B 3329864c05238c3b2a6e38727991f7273bb0fe5aa8e3e4c09cd2f7132b5d47fb9ee02fde171abbfc64d84ab0bf11b6712101e8510935d284175ea46771bc8f5b SHA512 cf404efa930c1e6948a8d2508107315d380bbd55a54df1e2a2e8472bbf392383a8505cc7dc15077f1d182f7be9ece558676470a6dbedbfcb0d873438b82fa9b8
 AUX gunicorn-20.1.0-tests_optional_modules.patch 622 BLAKE2B 27efd7afd2c69e65622091f9fbc59e5db1efbd519015c51cc607735cb6c709b2234e3ee5fce045f3d2c3eb67099b68ae5295d7000df893775e3a28c050b5b0ce SHA512 42ef99e0ae1b125e379cd2d6ef3dd917de640db96411495eaa04c09eae88254fa7930f00de72571aca3320454eef2fdd54d16c97bb09b45abd7232965e4fb861
 DIST gunicorn-20.1.0.tar.gz 354960 BLAKE2B bae414a8da7a4dbdf79e0b46f517138534521a1a8544f4ea2e1e27e6778d2f6ad8d6a8af02590fedad47d305acdea53f1cdbc4deeda3619fc4a5ffef0932bea1 SHA512 4fd905f62adc30e044cf2a56a1a77e14bc633258267d6bfbd4f6a68494f93f377e9fb9ed94fab7f11f9d7813857a680974a88c4b6bf97d4f1b74792a81810111
-EBUILD gunicorn-20.1.0-r1.ebuild 1377 BLAKE2B f6d1c8052ead2295d1e10ec9a17cb3e21abd1ab1ff80b31ff14c2f6bb82b1da3c0bc7b477a86240d3b86c5505a7a6348b938e58cbb21cf95db407215f9919069 SHA512 6f2578376e402522776b9f9cb223d8abfc429f4b9ed78ce45725baf6ae5be95eb4a02a8415145861db4207c8d5a3fc56036ac67d1215cc18f3caa39efb61d9dc
+EBUILD gunicorn-20.1.0-r1.ebuild 1312 BLAKE2B eab97158b81d0bdcfe731dd7429d5d65d5811096ef94dba524e8d7c401f06c0ab0132a44d291ba5d86ee7b5c828ad946924255446e56cb81eacdc563c0de4735 SHA512 efa53e51aed8833119ecf70f7f1996bff89ca65b496f5a229ed8288382ec9666c46dd9c3aadf4ed1b3063e4f18d5c518789135ae95bd9bb9b09891e51bbc501b
 MISC metadata.xml 821 BLAKE2B aa75468eafd9c717f3b3b55b4c91917cd94e612f591e752c93bec95b57e5abd4f46fd98de88c52ca5c624dc00f6d45afbd03f04743f962f87be9321902142712 SHA512 c7746b7036159f99a67dcc688a839ec06adf85d2bfb2214a2ec0b961bfcbd9a72fb5f2dd66dc3868f0d50e5d99386e4a4251f872afd7ad932dc4cca6fc33dff3
diff --git a/www-servers/gunicorn/gunicorn-20.1.0-r1.ebuild b/www-servers/gunicorn/gunicorn-20.1.0-r1.ebuild
index 8bc4d05051cf..04a83a8cbd7a 100644
--- a/www-servers/gunicorn/gunicorn-20.1.0-r1.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.1.0-r1.ebuild
@@ -52,5 +52,4 @@ python_install_all() {
 pkg_postinst() {
 	optfeature_header "Alternative worker types need additional packages to be installed:"
 	optfeature "eventlet-based greenlets workers" "dev-python/eventlet"
-	optfeature "gevent-based greenlets workers" "dev-python/gevent"
 }
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 1eef3c1ac2a7..e1ccccf22216 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -5,5 +5,5 @@ AUX uwsgi-2.0.19.1-pynode-compile.patch 3950 BLAKE2B 4ec0f5357b7b99f3365ddfbc864
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.19.1.tar.gz 804398 BLAKE2B 73fc19990866eb1058a742b34a817b3bd87e00c838da055bece2bff5e13c161f53c642866ed591aa4afeb23ef924205502f2cb0a4cf9d303b5b63fb9a53f57e2 SHA512 34b55f7c7a77dc0b0dab34d1a9ca9a4cba8a9261969656c88435e7f32fe8a0c5654e1562706775f77e2f60c4ad0f5c6055257a23ab7d387c1579639e054807b5
-EBUILD uwsgi-2.0.19.1-r109.ebuild 11611 BLAKE2B 5163b51125c9843fcf11a17c40389033212bc8a5355096215f5a5e5a21cd33f113b0e0114c4549c2765a9ac0fa3d903dcdaae0a58b6af7f4a629596054547abc SHA512 9330c018fa83179c32b6beb29782420413489e2242a94fa47da2fada5a75eb73a73e3ce058adebd379166141a6c8bf97cce292cfa52a13988cde0dcf76c5002e
-MISC metadata.xml 1412 BLAKE2B c4f2831a4f5e53f49953045619adbe15ae45dc5d9c019eae8defe3de586121b3fe2292c9c7921b086d8bbf6a0c727ef1cd443c01df99e7532db9126f1b82bdb6 SHA512 2fa796e52f80dc37fe43190541675bd69a082932b00b8c92998b717d8a332300a12b19dab7cfdf1ebf0c1363252b6035a8f17e285bd86bbd685aaa2ac3464dd8
+EBUILD uwsgi-2.0.19.1-r109.ebuild 11203 BLAKE2B e70475abe4150ffc5124ac409e99bc8ae2ab2f3c47dc6c4e32f533c3dd4d9afbe0e203478de9699fe61f020e58882afd52b1f668a152312774cf26405664af82 SHA512 4e743d603d45806fb70570d611e543869b6504e31d18611b726017fda77bf7cb67d4f5940bf888876482ef6149d76bc548ec6c910d72ae1f1d61c6cd7a05df02
+MISC metadata.xml 1245 BLAKE2B 3254a0e0211101ad9c353f6247424bb44df9ddb56bb152414b9fac2b515fe163e5163d2119bc040da1676b4d941afedf4a331a19e4cdbf794a7816d012abd328 SHA512 4e3dc2b9c9d7386ed6f132da703af971789c73af567f5333faca65e3194567ead794a84c28b5382eadb149ae4dcc7847e07bc02e3d84391b3b6cccc11e08e232
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index d90f0ad8dfee..84453cdb8a75 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="go">Build the gccgo plugin to run Go applications.</flag>
 		<flag name="json">Support json as a configuration file format.</flag>
 		<flag name="python-asyncio">Use the EXPERIMENTAL asyncio (tulip) for python3.4 async request dispatching and as LoopEngine (see http://uwsgi-docs.readthedocs.org/en/latest/asyncio.html).</flag>
-		<flag name="python-gevent">Use <pkg>dev-python/gevent</pkg> for async request dispatching and as LoopEngine (see http://projects.unbit.it/uwsgi/wiki/Gevent).</flag>
 		<flag name="routing">Enable routing support</flag>
 		<flag name="yaml">Support yaml as a configuration file format.</flag>
 		<flag name="yajl">Use <pkg>dev-libs/yajl</pkg> instead of <pkg>dev-libs/jansson</pkg> for parsing JSON configuration files (if USe=json is set)</flag>
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild
index 35d80ed88c4b..f7ef10e2833d 100644
--- a/www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild
@@ -43,7 +43,7 @@ UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
 	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
 
 LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
-LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
+LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio ruby )
 
 # plugins to be ignored (for now):
 # cheaper_backlog2: example plugin
@@ -71,7 +71,6 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	python-asyncio? ( python )
-	python-gevent? ( python )
 	expat? ( xml )"
 
 # util-linux is required for libuuid when requesting zeromq support
@@ -120,7 +119,6 @@ CDEPEND="
 	)
 	python? ( ${PYTHON_DEPS} )
 	python-asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
-	python-gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
 	ruby? ( $(ruby_implementations_depend) )"
 DEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
@@ -256,11 +254,8 @@ python_compile_plugins() {
 		fi
 	fi
 
-	if use python-gevent ; then
-		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
-	fi
 
-	if use python-gevent || use python-asyncio; then
+	if use python-asyncio; then
 			${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed"
 	fi
 }
@@ -365,9 +360,6 @@ pkg_postinst() {
 				elog "  (asyncio is only supported in python3.4)"
 			fi
 		fi
-		if use python-gevent ; then
-			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
-		fi
 	}
 
 	use python && python_foreach_impl python_pkg_postinst
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 332ab1d7beb5..9a6533461551 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 7f41870fb831..3e3be3cafdd2 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -2,7 +2,9 @@ AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f98
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
 DIST xwayland-22.1.5.tar.xz 1273444 BLAKE2B a6773f2b9655d0651a0a686f5e1fa41bdeaba998dc3e42c2c24dcc262d2affdb055c7ab0cf32b94ba11c82cbfe91bfcf10eb651f678feda95fccb55cc21d2e4f SHA512 806219692be297419777ad5343158f72473a691f7c8be4468fac185a3bc5e3b6811755de3133c12f3694480e51529ac3fa409b22640a80a233925716fec24c06
 DIST xwayland-22.1.6.tar.xz 1273532 BLAKE2B aa0604e425c8e5648966f58d8baa56163f7f39b439618e4fe556cdbfd7d417e4d8b1d34a7d850d31ed51b782e268c05f8d8ef4c8c48b3f8c702aabe8e579fb0f SHA512 a78f44f14a6c1e25afbf245c5c757a253f0607afdc80c8b852cf6f810247566d1cc17b63d4442a21d8e69bdb696faf1014438ad98a977fbed9a11b9c5b85e0a4
+DIST xwayland-22.1.7.tar.xz 1273476 BLAKE2B 9e128ff85690c6fb35eb196eefd49b1cf24aed290fd74cdb6e2fb8ad72d61b8dd9dccf83bdafc9a8e1ba13dc61135a7756dbae5ff40490d2076516d72818dbb1 SHA512 dc4187d4e9e1bbf5f431a4a71da01b773be3a8870c3f82da599739d9f72756ac69c1fb8cc3b6c96c88da3c1dd40ce42429a3a003c08f90fc337ebaf6200de649
 EBUILD xwayland-22.1.5.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839
 EBUILD xwayland-22.1.6.ebuild 2154 BLAKE2B e76ecab4126e3bd7a4f37633ab56773759de72653e2d04ed8a58c278720770d38efac5dba2ae53acbbf560d3b3494de34d0dc4a32370bde9daa03fce940645ab SHA512 3216ab44000ff2bda753586a506251a3ec7ba3320497d347a3888f7638ba93622abec5ad03b7951a88915bc7ecc53afd67eef8c6d9192d10c35a1c4d24454924
+EBUILD xwayland-22.1.7.ebuild 2154 BLAKE2B e76ecab4126e3bd7a4f37633ab56773759de72653e2d04ed8a58c278720770d38efac5dba2ae53acbbf560d3b3494de34d0dc4a32370bde9daa03fce940645ab SHA512 3216ab44000ff2bda753586a506251a3ec7ba3320497d347a3888f7638ba93622abec5ad03b7951a88915bc7ecc53afd67eef8c6d9192d10c35a1c4d24454924
 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 79ebcf371891bcf3000095f61b53459279b78e1461e6ce361532452f6d20a5f5a204d1c366fe5cdd36093d40237932866d08a62edfca2aa7b82960285d1360f2 SHA512 67fad119e1bef87751bdb1ebff8d349e122875a9940bd2557d93ce2db99209d663e9f3c74486775d6cb9258d692642bc9472344e5bf4063d34ceb8ea6fe9456a
 MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/xwayland-22.1.7.ebuild b/x11-base/xwayland/xwayland-22.1.7.ebuild
new file mode 100644
index 000000000000..384312c2aa5c
--- /dev/null
+++ b/x11-base/xwayland/xwayland-22.1.7.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+	inherit git-r3
+else
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standalone X server running under Wayland"
+HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
+
+IUSE="selinux video_cards_nvidia unwind xcsecurity"
+
+LICENSE="MIT"
+SLOT="0"
+
+COMMON_DEPEND="
+	dev-libs/libbsd
+	dev-libs/openssl:=
+	>=dev-libs/wayland-1.20
+	>=dev-libs/wayland-protocols-1.22
+	media-fonts/font-util
+	>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	media-libs/libglvnd[X]
+	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libXau-1.0.4
+	x11-libs/libxcvt
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	x11-libs/libxkbfile
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+
+	unwind? ( sys-libs/libunwind )
+	video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+	>=x11-libs/xtrans-1.3.5
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xkbcomp
+	!<=x11-base/xorg-server-1.20.11
+	selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+	sys-devel/flex
+	dev-util/wayland-scanner
+"
+
+PATCHES=(
+	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use selinux xselinux)
+		$(meson_use unwind libunwind)
+		$(meson_use xcsecurity)
+		$(meson_use video_cards_nvidia xwayland_eglstream)
+		-Ddpms=true
+		-Ddri3=true
+		-Ddrm=true
+		-Ddtrace=false
+		-Dglamor=true
+		-Dglx=true
+		-Dipv6=true
+		-Dsecure-rpc=false
+		-Dscreensaver=true
+		-Dsha1=libcrypto
+		-Dxace=true
+		-Dxdmcp=true
+		-Dxinerama=true
+		-Dxvfb=true
+		-Dxv=true
+		-Dxwayland-path="${EPREFIX}"/usr/bin
+		-Ddocs=false
+		-Ddevel-docs=false
+		-Ddocs-pdf=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	dosym ../bin/Xwayland /usr/libexec/Xwayland
+
+	meson_src_install
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index a4046dd8d125..de47235e1c11 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index a9be6040ae7b..8f46775756c8 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
 DIST py3status-3.47.tar.gz 419624 BLAKE2B a8c5d6aad0d9cf8a4f768a6c7aa2f2695018ba4ced742ca6ffcd4e3d72dade5efe72d7a23152cca4045b412b8ee0fed91e23038a5521b7ccdf52563c1d06c6ac SHA512 4c583685b37ec251bad824930c6935ccc5cf527d784f89f4ba222f53d987409337b4ca1aa3b7f0adc995e2494aee3ad9efb315fcc2578cab4996fa719f3310eb
-EBUILD py3status-3.47.ebuild 886 BLAKE2B 06c4c89fde351654e7c7bf9b50662356e226a67933e302d9a2013216ee6717e923c134d7cc7a618bf96b21d4ee7200f4ad156fdb78286088017e8c316ff1ae3d SHA512 9d4d945ca504187f5634b5cfd76d3348fd758eef6b5436acb5b161797df21a99eb9e9d250445fbf15dfc735bcf17072ec1bf4dcf5cad5e69644087dc78d21e4c
-MISC metadata.xml 758 BLAKE2B 640668524d2db72abf19e3acddfb502b8adbf71e397a1b37f6179ecce65abd361ee81a3821448561ed350d5f62c711c726dd8ff8e03d8980215934de2ce73b9c SHA512 cb0875ce9a6477d4c1a1b67ea25e67d0cc397d81c4021301e5f52e9a50b782cc44958060aebfe1bd03ca087d4e5d29a0b7dcc826eedf2694c238a2f211912460
+EBUILD py3status-3.47.ebuild 822 BLAKE2B ecff793cc45184f79bc7b77870321226f67c40fb2ee16f10f1c2052f7f147aadbe1d76417506ef1f9b3ed0767cc5eca812103cd59d3f52abdf93c869bc8bfb74 SHA512 dd358bd151889ae12fe1bfd4771b20bb8107a53652ad187fc6fa9e0e3e5e46190ec0e72594de6bee3173cefa8faf54095dede42f3bf6f5a6be126dee47453eb3
+MISC metadata.xml 649 BLAKE2B a3ea307c4d4c613773015caa89c6aab50af43fe2b7fb8ef0ba673cbace9fefa015236819f85e416639e9683c554c06f3c0141bb1b933001b69b5c2d55fd0a0d0 SHA512 fee8d759154f61a9228038eb1ed990d55a2cc70c43afebb213b6d81f7b98ea333dc89775a64c6600adefae8bdc82a76df26dc0c26ad1bbdeac6020c0f065e67e
diff --git a/x11-misc/py3status/metadata.xml b/x11-misc/py3status/metadata.xml
index e3a14215d9ee..deb1ffbd6ce4 100644
--- a/x11-misc/py3status/metadata.xml
+++ b/x11-misc/py3status/metadata.xml
@@ -10,7 +10,6 @@
 		<remote-id type="github">ultrabug/py3status</remote-id>
 	</upstream>
 	<use>
-		<flag name="gevent">Install extra requirement <pkg>dev-python/gevent</pkg> to enable green threads.</flag>
 		<flag name="minimal">Don't depend on <pkg>x11-misc/i3status</pkg> if you don't plan to use any of its built-in modules.</flag>
 		<flag name="udev">Install extra requirement <pkg>dev-python/pyudev</pkg> to enable udev events monitoring on modules.</flag>
 	</use>
diff --git a/x11-misc/py3status/py3status-3.47.ebuild b/x11-misc/py3status/py3status-3.47.ebuild
index feeede8caa44..ee11233d1483 100644
--- a/x11-misc/py3status/py3status-3.47.ebuild
+++ b/x11-misc/py3status/py3status-3.47.ebuild
@@ -18,14 +18,13 @@ HOMEPAGE="https://github.com/ultrabug/py3status"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gevent minimal +udev"
+IUSE="minimal +udev"
 # It feels useless to run tests on this simple package
 # since upstream (I) runs tox on CI
 RESTRICT="test"
 
 RDEPEND="
 	!minimal? ( x11-misc/i3status )
-	gevent? ( >=dev-python/gevent-1.2.0[${PYTHON_USEDEP}] )
 	udev? ( >=dev-python/pyudev-0.21.0[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index 2c2b2b83a78f..a77f29723d15 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,3 +1,3 @@
 DIST xflux-gui-2.0.tar.gz 35805 BLAKE2B 7a15371d682b31c900f35bebd36e12b70d6095c4cdc9c33f43bad031d72b82d8d3800f7f34f7e31965725dfe075dc6934512eeced98aa685d0023a57dfb61103 SHA512 4a5235feecb06ee95d28d4c05bb710014aea120943b3cbe23f2d2130486de82295891d8211a02e52385edb577da3438dd1c2ba45b209ab4359eb3469df08eade
-EBUILD xflux-gui-2.0.ebuild 1034 BLAKE2B 18bcd7301aed80a2d73b485fbc017f7f2a40d8c51247c01857b4cc1ae40eed1e39189c011c0459bb37c065440e8082c1e93e9651861ecbc95651af841a5bff8f SHA512 06c5b26cd5049f1673850138630ce7cefe76c732943f68c7297f9a12a98764b845936f4627e01395bdbbdaf4237b675baa8a96a7004d2d79d8f60be81440b750
+EBUILD xflux-gui-2.0-r1.ebuild 1042 BLAKE2B cef0aa19c7876b5a972a74ebb5a8c1970502f1268dc3994b2ef65387ffe676bdad6b79358887946d64341e0bd3ceeb06083e74ec1902dca0aea48116bef6b4dd SHA512 18d756a74fb7f24dde981f47262f2e9ce3ec2226587f539df8603261978181e23a623212a7c3258398426dfd8df35d42b3962ee670f781c498e2be0a4c5100a2
 MISC metadata.xml 738 BLAKE2B 9cba265844f261bb6629334f0d7982791d198fd13fbb76ffde6c7755f1141ccc403a76a45ea1af0cff639dc5a631b72ca1c6e9c1fde0716d1b86a0f97a4c1847 SHA512 1c80057a213da1fed5890ef29fe32ef4308dc7f67db8340e07439d5521738955a4d9ce1fbd1a7bae1a6ee8cab68e644ed407fa9754e1322142aa3eb91b192529
diff --git a/x11-misc/xflux-gui/xflux-gui-2.0.ebuild b/x11-misc/xflux-gui/xflux-gui-2.0-r1.ebuild
index 4f75d03ddfb2..cd7a845f5c10 100644
--- a/x11-misc/xflux-gui/xflux-gui-2.0.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-2.0-r1.ebuild
@@ -15,10 +15,10 @@ S="${WORKDIR}/fluxgui-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="
-	dev-libs/libappindicator:3
+	dev-libs/libayatana-appindicator
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	dev-python/pygobject[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index be4b35680ef8..4c34bfddbf29 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -1,6 +1,8 @@
 AUX xsnow-3.0.7-gamesdir.patch 317 BLAKE2B 747eb31910be55b1086e05f685d39118e274c99629fd055708cd48aea28baa323ae4a8fd6d8ecc374aa6c457aeae74a336d9dee8992b601bcebcf28c3f634d4e SHA512 f947444e15fe12e1596d1e6869390ade46b8f0dc293bfcfcf7a60e9ff267de0857fe0d3830fa1524de2d9ed53748924d31e9973f1f90807c26d5b3b96aeaba67
 DIST xsnow-3.3.0.tar.gz 405967 BLAKE2B d2b6d87b781c894c09157ff2f06389d0b1cf401eff735b812ec324560d295195c5afaa3c9c755f569f10f4ff4cd9738dbcc393044dbdebc13454bfeb8e1a9065 SHA512 b2674039ed26c5788a137cf44396b18f07458e926ea0552034d2c78cefaeaffce35ef42f2da386ee48b8b4d8f98960a4a31edfcf737c6d269485785699f9227a
 DIST xsnow-3.5.3.tar.gz 474540 BLAKE2B 8b7e841cb2cefe44787b8457d55cc526114b09d7f1f4c435d89519b49295ac89ca73d15a026e2d7095e0f450775ea59763c7d253026fefcc90241390b5d17142 SHA512 e1172660c4fd344454a7b1619321cfe773d35430311f108c6aa7b04f8da7fe4fdf2886a7cd8b4093ad7d2f6fbb0046a12b29598b6ab46d3ad35f8eadb76ff0a5
+DIST xsnow-3.6.0.tar.gz 495875 BLAKE2B 9ebc87254ce81b7fd051bbc0170faa7198390679a8dbaccdfa3674b1f584ad298fa73506b7eb8ff63fe04f168ebafcd30bc2101510c4e912e029edefe4813c65 SHA512 e2684e6d011a8add8819e16b6b649f8d501525c41a4baa0ef32d90b7603e30910a77093c2d21f52a7adb72f0ba18076f9265557e70dc246b365e0fd2b8ed4ab1
 EBUILD xsnow-3.3.0.ebuild 676 BLAKE2B e58678eb175a2a2f142c11427ec4a0f42f4067bdc03ddf0f16fc8793f84c5544bba3709709a09af27afd831d0a1bdc833ab3908e7050a93360456d8bc227c032 SHA512 b693ab85cd1b13507bb4986706c286e923f072d829da2046e67f23679ee3410e0ce7e980cab9a78650aa06cc169fd69a65d02d5bc8d9c7ff61cc1c26b9060812
-EBUILD xsnow-3.5.3.ebuild 634 BLAKE2B 078b6f8b348e01cacb77a66c3dde12c3662aab28c822b237348901d3d54c3feecf9af5e9d9adae88c00f254f444038718a0da0de6a46a984df1366c000eb5330 SHA512 a3cf461dd821dbd7e4155228dd1dd65d70fa6133d621b64bc5aefb0e6a583bdc68f26ccf188f7ee0d96d0011cfd4a79518d4368b37599a3960832c2964be926d
-MISC metadata.xml 221 BLAKE2B 4b8e1435358aa300f6debd1760de3509ae9e0ae2678b4d55057c3940efa9b15d62881ac988725e58cce5d2cf63d1de6791cb0b98aa797eecbcdd29c85d8a682f SHA512 40bf10d939c1f6ba4a0594cff7f4a44c16660489226a9a23a6e9327a43dbf757b42a8be0bc8d82daa8818b90c1b4f8c3d093a6b9f36ca15dc36301cda2a308dc
+EBUILD xsnow-3.5.3-r1.ebuild 650 BLAKE2B 0cd0d1251cdd9b9c3aac7818c30317890d364aad8db169a6c8660fd31611a6e80244eb70eb5b3c829f7427ff94fccd00edb0b7b7990a6e768dd37f607a35b87d SHA512 9ca7420fa968f8a2fa71426e23d4eccd118f07eea885c25b02476534712e29cb02a9cf69c3f955344116973201229c5ab43583beca47f06e4ccf4247992b3334
+EBUILD xsnow-3.6.0.ebuild 754 BLAKE2B 23cb398c30ca752574fdc73649fea35aeffed53d75cc8504638fae3aa61cc9583082f02f970ef2b13f0ae5db5a913e00da8185b6ce569319931e9a7b17ca3b83 SHA512 46e67a91e7ae23e65ad9d378ec088fab5239e5d6aaa98c1de108b40b5e10cc8f881be1edfbfe44376033d9c71499566f73fd89bdc1a90d63b922565adb489d7e
+MISC metadata.xml 296 BLAKE2B 60ba9ec1cdae7e670f52fdb9d81fbffbf1d5c94fdfbf30d0d951b063b0d1abc77a147ecfefbf646d7f48f0f473c1dd5bedca14d289d869b6f5a6ebe73f75d8de SHA512 2ad28ea6866958c01004f390b983082c22418eaab3e0ea14c17aad5bb65bd7e29a4f90581fa9ad205ed6fb6eb4b2617ec8b7c8e3b656d18ac359ae533987e57b
diff --git a/x11-misc/xsnow/metadata.xml b/x11-misc/xsnow/metadata.xml
index 96729a07e765..bf0492280805 100644
--- a/x11-misc/xsnow/metadata.xml
+++ b/x11-misc/xsnow/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>dilfridge@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type='sourceforge'>xsnow</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xsnow/xsnow-3.5.3.ebuild b/x11-misc/xsnow/xsnow-3.5.3-r1.ebuild
index e0918534a97e..d57c9e3051f7 100644
--- a/x11-misc/xsnow/xsnow-3.5.3.ebuild
+++ b/x11-misc/xsnow/xsnow-3.5.3-r1.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-libs/glib:2
+	sci-libs/gsl:=
 	sys-apps/dbus
 	x11-libs/cairo
 	x11-libs/gtk+:3
diff --git a/x11-misc/xsnow/xsnow-3.6.0.ebuild b/x11-misc/xsnow/xsnow-3.6.0.ebuild
new file mode 100644
index 000000000000..c8462ed48e95
--- /dev/null
+++ b/x11-misc/xsnow/xsnow-3.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools xdg
+
+DESCRIPTION="let it snow on your desktop and windows"
+HOMEPAGE="https://www.ratrabbit.nl/ratrabbit/xsnow/"
+SRC_URI="https://www.ratrabbit.nl/downloads/xsnow/${P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	sci-libs/gsl:=
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXpm
+	x11-libs/libXtst
+	x11-libs/libxkbcommon
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.7-gamesdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-12-20 19:52:06 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-20 19:52:06 +0000
commit	d4d7098dcb2f9dd257109bbcb55fd40beda1b78d (patch)
tree	48d3c6b3c45f18db0f90650f822ea19a10284f61
parent	4161fa7d1be6dac96e36f8ed343f234a8ef3a74f (diff)