gentoo auto-resync : 18:08:2022 - 14:34:37

author: V3n3RiX <venerix@koprulu.sector> 2022-08-18 14:34:38 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-18 14:34:38 +0100
commit: 3fb6e94893672e0dfbae682e6a3418e3f1260bf2 (patch)
tree: 6b19e4b8d9cb929c7caba132adbd596883f582ca
parent: 933ed80ab9b645de54b16eeb7410c0a54f47574f (diff)
198 files changed, 875 insertions, 9662 deletions
diff --git a/Manifest b/Manifest
index 64a5305149f8..c5994ba5a158 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29620 BLAKE2B 4fbfcd6af34fa000061785e33162074c2b05bd0f2ae1d6c860da72baf219c83096e56bd701462f675f1f110413a62480d1d77c7012798b4b1edd64ac0112eba2 SHA512 badc6de8d96a1991567e90a523ec8c37f4dbc57e6bd91fc16fb319b5f451acd8124b45a71d10a2e8bac104613f623a881eb0d0caa09eaf847e8bcb13e2de59e2
-TIMESTAMP 2022-08-18T06:39:46Z
+MANIFEST Manifest.files.gz 29635 BLAKE2B 8b9f77ced6b503676a2c7f266d5421714916007eef3c9966f06bb4ce863228bc7d77ef4a0d76c9b5ceb3058995fa79c5b3e5ada978b1de7de3e48d9bce6c49e4 SHA512 43612a95355d3b11ab5f7bc50ca0230007735346a733db038fbbcdabdf5715cc8b46fa1f36b16f252439e126efcd53591f2cd55492ee22b5fb4a37f3844f7c55
+TIMESTAMP 2022-08-18T12:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL93rJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL+MxJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAnXw/9Fgl/guaBwfZQ55GdjL8AEBp6qW5FeFGxk5HdTeEBkdbpkDR48PZTuqoA
-yxNQ5FE0DnobzffOMmGwOdtzaIQwdcD9XdcPkKdUnH2I/SqQO6wPLABiMLA0iz5u
-99T3fNp+F+qmRYHa/UjjtI0+9L+N4G1PwDAwl10WRro5d9BbQNDnl9v0yc8zb0Te
-F7hJNsXLZOmuFuBhJQup4T9WMup8+MQqbde6OOeeCj7906I6U0QWZ2/43mnN9PTM
-bd+QUjfzErd2LDgzGs0wL24Il/akXavFOWPiL+bMgEVB3IKvwwiPotUPLDLHMJza
-SMFMGJMA1IH7onlTF7NJALyYTIKlPnBcKy5Ysy24u6q7eqKgA3zuEyeNonNcMEzP
-jBGbe0Fz8CBZyrNPixjtvNX7Wo+ho8TZ8g0HtNCFniPhp9DmkQsgDH9RUCP0tXlN
-v4ihwwMOdQKYb5QtkOEz2EICxJlWJ9WxHc2wrTEe9hDgFZaWDMt8FnpKEj+jzDJr
-z4DW2xWG09bn5TlxVxyh2ZdoibtEIofKjSf/2AkQVfOb710arBV4wopvuBdkpKWK
-x07s9pFrRWlaJh8BApBHYDtAhTwBtZRXwMu4pJCKGQKryBq5keiUxopYkyVPVhVe
-eK7q1+HEDqRVFLtySuTfvIZHTZ3tpihVx5r9KMHyayG6uMkrHFo=
-=Acxg
+klBHAA//aiV+5y9m3x7vT/CDirOc2y+UEwr53xqYk31QIi1lJxEjdGHiXv1R6tjS
+X0djG/x5QJFTEiF2GIK89M9kRzklO8SBm3MZhLWPSgk0G38FfWe0tjsTFm4BVskp
+8PxfAPOsGosbfJvCqS8IzM6k4kKBWtp0Vtaiv8lqxQMe0NtpfKEl1NamlQIxjmXV
+AuK0VcbArWBDdahSfTAfz/wfs/VCgo+laCLI46xOs+Ta4CGgm5SQVwzlFASjNDDk
+3/gEGPdpZ5MBE9x3W62ZnN1SAdLPAFZmVF3HZg1nEf4sWQlx1bzbFmtTahTT8sD0
+Y0rNgNH1meUx3xADxqkeIdZR7WUkboVu818ytX5GhYVM/502UEOP08n6taIRG1cw
+2romQy2csCwJaJwzz6NeMUzG1CKWLcUihpVTBJ6iFUKKUSTK6TOUmXxZ0ZhQgM+w
+FZtbpgRKftQSJunwjmJs3FVHBncAfTeeN7nEhpCJjytcSHjrJk/EtexLd4rYS5yR
+ev3SeJJAGiIFK8plZh+IS7Uc6bRRzA/a3BVQkOrBLustaeInfUfEfmB0tDo0/6yl
+uKAXqVlrX4YXLLN+N6qPK9bmdlF0QnkiyFKO9TjM5feabXbvUNoKMAWmhW+iV+C8
+PjeLcITdGM0VsIDS9dUQe2sYLk4vLTlhgs+s927uNUP+fwc4BkQ=
+=ZnBg
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3b0141cb5dc8..90a947da49ea 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index be0ac7c13523..d43474f9464c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
index 36d9cc8f70c8..5de0f1638ec7 100644
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@@ -1,9 +1,7 @@
-DIST featherpad-1.0.0.tar.gz 1010200 BLAKE2B 22a11a0655ed57f7a7d53949e59c3b989a304b7c3db1f7308af0a52cc00a151cee505b02c19ece286da1be37e76c8874cee4102db3d881ef2c4ad48ecbb2f20a SHA512 9f7e24fa5e89e269693bc0a37f79d987e4914dde2d2b46bd0385886383dab8b35556fbc0f5c5b7b9a2c3a41694174ffa8532c48def87d2972fbc73c1e9c38bf3
-DIST featherpad-1.0.1.tar.gz 1014744 BLAKE2B 1525b0894e47facdc51da0c6417d69b12d630bb0e6e8d7b3916b0c4e82380243b1b4dd0ddf82f7954d83edcd7b30346cff0305d98296b4aeccc1fe3cab325cd7 SHA512 8d1a07f8f32f63ec77e6bff8a39badd1eef87b0675096f964ff2fa770dda7c79ec9a1f788cbfa77528163aeb6c6067ca74e009293eca2e718dce92a48aef5f98
 DIST featherpad-1.1.0.tar.gz 1061070 BLAKE2B 78c7ddf0b7961a300fe2e425876bfaf32a1186eb88c2619202cb2f07a780aed3c2f8d1ced0e963b1868c94e890d1d809baae534fe1f3d06b3f3036aeeccf7414 SHA512 c734619ea8eda2709ccfa4d1b3c2ac541f32d52f31f0896ddf3c1c5733f175da9d955458a62a34221400a73003970cf796f59cf574b499831267b6f4d1a28d21
 DIST featherpad-1.2.0.tar.gz 1091776 BLAKE2B f63ddcc8bf02b3f9ad5f6ad2b56b8f99cc8566f70351a293fbe339930b41542e9ba27888afabfcf98a04ec6a1087dd77aa35006ea33526e1a7d6c45f5fe3b7d9 SHA512 cf21ed9394444920fcf3a8ce3a8338814d69322389c4652e79f0754fe67ee61260f81604c91adf0a864fb1441307706c60ee1bd29efd2e617ab8e1f5fc254cdd
-EBUILD featherpad-1.0.0.ebuild 758 BLAKE2B 65419f5390e095a0e67ac4b60beb278fc5e390ab61c78bafd3a4c17c8eae139511d3203853aa5b054e8c71e1233d583cecf8a67250dea4ff635969f9ec6b4798 SHA512 ba15e7b6ea2b02da544bf346752f5d1bcbd3ec732b62abcd115079d329593d114a510fe401e2172ffefa299bd57ca5f78ed0f09592ab5a53908465e155eb51b6
-EBUILD featherpad-1.0.1.ebuild 758 BLAKE2B 65419f5390e095a0e67ac4b60beb278fc5e390ab61c78bafd3a4c17c8eae139511d3203853aa5b054e8c71e1233d583cecf8a67250dea4ff635969f9ec6b4798 SHA512 ba15e7b6ea2b02da544bf346752f5d1bcbd3ec732b62abcd115079d329593d114a510fe401e2172ffefa299bd57ca5f78ed0f09592ab5a53908465e155eb51b6
+DIST featherpad-1.3.1.tar.gz 1096886 BLAKE2B 360940f0fe781676baa89a99f3d0a7c8ff8219da05fc5757b2e96654ab6c937534e2ef1cd216a3df73fd417353a3285716d09198b27626183c58d031abed363e SHA512 d17eb4691c759a7e97f24bf149152d104141162bef9f819cb09ecdd440916d1f5aa1a56252e64b859220237ea078a072c75308ec7b2e131078df938a171f506f
 EBUILD featherpad-1.1.0.ebuild 763 BLAKE2B 53acb0884d81da49e51ef6012e8e64e9f8ba009117b6ac83aeeac3a0c8ae4e421d0f2ca73faa86e8379f4c1471daeaca417c8f38ab1495732a1e6d22607c892b SHA512 407e8dc0667213f8c6bad387fb4b0102047ac39b05768fcfe8a7ee5c58aa2dfe5e7b74a064c3a1a2f27172a41f423367becaa8412435a44c39cb352903b72fd8
 EBUILD featherpad-1.2.0.ebuild 770 BLAKE2B c7f29009e12a6f7d6db402ebb44539048425333d52d7f2a06f60825d2abbe1d664036b44abeada9d8630de90754d05736a3e1e407bd4931fbb34ef7f7611b11a SHA512 5e2e341eff0a90ae49cf1638c862711a628ccb6e59776e954cc0ba8f80c53094e325d3b19e240dbc4c15f19b036f660faf2c4924de75a340569993dbada0eb16
+EBUILD featherpad-1.3.1.ebuild 769 BLAKE2B 9c98e0d59766428dbb69da8d1c090a887ea9b5f0f463d2a83c526fbc0ba2175cd42554bf8ca4e765955abd8c6825f10a593d2424e01367cf1dc27269dcc0c6f9 SHA512 ea64429fc39da3a75ff8e8645267cc8b39e25d45d4dcc992081afdd0e0800b8a882f51e179f6d23e4c407dea850b1d4210d6e7823e3872ec8b2ccd5cf7030ee8
 MISC metadata.xml 829 BLAKE2B d6d60de9902f49b8f04e15818d2da71a30e9b54fa6c73245eabf33bdfcbbb193f017e0b3967512578bd538c7ac718b26276442e411fe934a75873fef05fd3a67 SHA512 218c520af75da8a59b2b75cf2d4dbaa3f67c63620afe69221c854c2e5815518dc1514cffe54e57e4bca29529d99b95ca83a7879713552b9e0635aa27069f500e
diff --git a/app-editors/featherpad/featherpad-1.0.1.ebuild b/app-editors/featherpad/featherpad-1.0.1.ebuild
deleted file mode 100644
index ce5b1b855fdc..000000000000
--- a/app-editors/featherpad/featherpad-1.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux"
-HOMEPAGE="https://github.com/tsujan/FeatherPad"
-SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/FeatherPad-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+X"
-
-RDEPEND="app-text/hunspell:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_X11=$(usex !X)
-	)
-	cmake_src_configure
-}
diff --git a/app-editors/featherpad/featherpad-1.0.0.ebuild b/app-editors/featherpad/featherpad-1.3.1.ebuild
index ce5b1b855fdc..c456752a0f7c 100644
--- a/app-editors/featherpad/featherpad-1.0.0.ebuild
+++ b/app-editors/featherpad/featherpad-1.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit xdg cmake
 
@@ -16,9 +16,9 @@ KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="+X"
 
 RDEPEND="app-text/hunspell:=
-	dev-qt/qtcore:5
+	>=dev-qt/qtcore-5.15.0:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 1044bd06db91..5c068fa5def7 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index 9183308020a3..f17f109a7a1d 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -12,5 +12,5 @@ DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4a
 DIST linux_logo-6.0.tar.gz 117486 BLAKE2B 3340b893574f0c18561b208824cd80cff19c387d981af6ca63f56e691cebd2030e058ef367d91a999fd662592582da38b21a5a31f3f8364dbd87a43bd2c2b608 SHA512 ebd7513f90e79bb21acd984c671a1d1ce8421411d2b2948b01e6e08f7c9826184f9b9d528e0cfc814df8d8015d444a09c45025c344115ac9a6c2cff5743f03ad
 EBUILD linux-logo-5.11-r4.ebuild 2261 BLAKE2B bc8e64c3d10bf6efa6d8cb69f2117182176f3b48dbaeb33e198595a81ff7d1a48cec49be8ea6f8690db464d61138eca3c2cd12d29de1bd423eb7cb300295ab73 SHA512 becc70a568a70895990b8ff4259c1253124c9d9f38c5da0b1fba6c7ed3592f13f0cdf6916e42efa3c07445605c9394ef7c16fd374191af36631d4cde0febe4bf
 EBUILD linux-logo-5.11-r5.ebuild 2282 BLAKE2B beb00eaa05d1075dfae1ee11650e36e619a3c9773ac27d86e6485e2842af6bbf74957494aeaa31a310129e1af1338e32ed1bd8ba0aa88b9d546a48e02e9ff3e9 SHA512 c085b8f05f310098ef3effddc8ad3651fca8801d8d5ef6f0d62b205559dbc1ee4ec58402671e7fefb8dd76ea57a16c6889e5240d0c3a3a2d194078b674dab952
-EBUILD linux-logo-6.0.ebuild 2218 BLAKE2B ff0fd7091712fd772d26a47530d21fe9b4bf4a786bce99f3ff0d6c6a04703e158072a64bb9059be073beb1b8128bc3cf63398154f1483073bb19c0ac1bf8b1fd SHA512 4d32b09ca8419801cc67ab436d45168704dd3897e564cc1202295b34dd7eb50aef795da82cdf16763bfc736cee44906083a84e0226a8128acd91efc578981a87
+EBUILD linux-logo-6.0.ebuild 2216 BLAKE2B 60cc5fda01636c474979c790d66fc1f68848a274f42f62004a2426f5b960ab0dc3e5b3ca7b4d4af1d80a25e0fe9a1eec313e22b2d4116979c856e51998d78d05 SHA512 d54f4542f2046c3ed773d7f7b12e465f5ba6c43b890d6c7c008ffc6526396610ca354b2691b3222adef51b0c355531e62514d161b4f8628d2d7c869165891d41
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/app-misc/linux-logo/linux-logo-6.0.ebuild b/app-misc/linux-logo/linux-logo-6.0.ebuild
index 70f7b741388d..3d7fa90c7339 100644
--- a/app-misc/linux-logo/linux-logo-6.0.ebuild
+++ b/app-misc/linux-logo/linux-logo-6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 4fc6a161649f..c5c999feec99 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index e729dba03318..e9f969bb6cb6 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,63 +1,27 @@
-AUX postgres-llvm14.patch 4963 BLAKE2B 66e50d40cd9491ef1757d9b5756b07af683e98d8a6b3e808f90699745b6a772f921695d1528d9d486240690b2efb55b39a184032e205b857609d27430cd6eb9f SHA512 c74841faa6120450481dccc94af3700313c389494e8adacc02ab1d655592dac08e97e6828452140b901548af58f857e3290650c3318c86f9e63d3c5a8ae90fc5
 AUX postgresql-10.0-icu68.patch 606 BLAKE2B ebe222879ddd0e97da8762ad85994beced0d706d2db140db9b3e588951f485763f698d70a8ff4e4bbfe1d66f8762bf3d329bc97aaa70bf5b36f0e2e72e53a508 SHA512 1c3c994c79155845d6b3d1a92df002d4127fc576eb837f892aef0ba2e0b914d107c35656f9e5946084892693054cb935e85eb5902be2296fd04c7cf958ba98ea
 AUX postgresql-10.2-no-server.patch 3117 BLAKE2B 399e295e393aa84aeaefbe236bf63e091414c9f3d9238ef8f4af3ec955cc0ded6324f4241ee4e78ee1aa775524768f65b15d5064cf4330f5b3149bed2e13aad3 SHA512 1888985a0fa67241b18d3c21c1ededc34666c55f6f4f3806efbe4dcb5a2e30d6d08c955a3bbcc52f589bc5bb857d1c09bd82b555069637a71afe9062994199fd
 AUX postgresql-11_beta1-no-server.patch 3080 BLAKE2B 29d4f5d8e26e9360490876d2d51cb29cc340128fe77c0bd76248073157c9e5be09c788cc4344e09c0c2bf2f57e274d5f31f211d1950ee3f47660dfdc4cb7b455 SHA512 42c39e602a019d1d44c39795904fb37a7f14b4623fa90b066f4f26a743d80b6eeaef2e8c7de4c47dddf53d7e89cbe5a2a3473b456ddc76fc0e96f57ff6a9df69
 AUX postgresql-12.1-no-server.patch 2965 BLAKE2B 168f39c02f0614c57a60c0ce3bb540e0d29dc407c569661d0cd29ddb57657bfada44aa90ca915c8474ca5541ac1f4cc152fbd70c105efcbe83f9e5b9f918eeb5 SHA512 5e025da1cb5f696821b19093ab893667426a08b1bbc8e3f748d34207730026625b61a8cfd2596af124080a4a292363546dce5b703ce6164efceceabc6b170aa2
 AUX postgresql-13.3-riscv-spinlocks.patch 966 BLAKE2B 4834d47b01e1f8e122fa940a84e1e790686d96b538d27f253724f7be454c455c6853cdadf41da5cafeb8767012b45a6eef742685117afaaa78e0e9a930c728c8 SHA512 1c217ec177a1669fcaeffe2cce241b5ba2cba6425d9eee8bf50dce6626e70e2d063776e1ced4590cbf9ffc046ede02dbe4f06bdfb7bc4c3dcb0f028c128c15ea
 AUX postgresql-13.8-no-server.patch 2985 BLAKE2B 81a4a7c1d3c9e104ea7a575a14eecada57b62ed652b4401b459886250518179b1f68efd73246773cf7b745c298ac59f0e5f693f2ac0e6e0fd4a29c4c431e3715 SHA512 7a3fd3f8411c59b812da6deaf743247c0e728aca653fb66860a7a6e55704bc732327dcf917ce17fe089003740131d4d92879e171b4b9ff262fef0743f6f50122
-AUX postgresql-13_beta1-no-server.patch 3787 BLAKE2B 35a01d479262cf21699043d65bb0d71539198ca30e8a627fc134183fa57ac6e1cc3856848bbbe9916a99569c79f4af1e2b6ed50b3d029bdb8f58d050e08552d3 SHA512 2fbd07eb865bac3e9381a0b851f7c92c1c08c2e6521a02a42cc7435bccdce70823eb752afc67aa221b804ff4baee1a2fd5a2762a6b82b14a6f77ef739233bca1
 AUX postgresql-14.5-no-server.patch 3018 BLAKE2B cbb900bcb7bcc8e788369829811da0d57a45682a77ac54f430cab7ebf6df9ff10489d50d129fa5b24bfff80929497b3107a8e650962b8e772d6b0bee610f05a9 SHA512 90e88567af5f30969e946295c4c058cd245bdd7dce01d48b70aa3dd000cf9e54570ed1b6bcc423a10ed0b7102047927da19bd26f5714e003ccffde967c77db26
-AUX postgresql-14_rc1-no-server.patch 3508 BLAKE2B edd8525df7ec0505a8468c8f79a32a989f13bf3e0bd48efd00bfa3adff5b69735768ab4a1269d168076905b8ddda4467357e161714a205dd7cb3e66a0552784c SHA512 35c5e32b973fb683452773f93f45b69ad7eabfe13539c1764ed3919c0b0ebbc9e2e373cf101b1a224d1d5c93db4cb8f1936e0dddd86c6c28d2da5f4998cde002
 AUX postgresql-15_beta3-no-server.patch 3061 BLAKE2B aeba13501762f4e21653ad65ab10f708d604c393797766c1acad207a7889e02eb2806c0f6823fcbf9f2891be85d17ff7d3ba6066afe5f5fde3b9b39e56bfa5f7 SHA512 a41d01f994c4301ec059615446a3cc03cd16af67e3a3c1c0fa73b145c1b910de38d5a4a4757ad861c9cd11124f1d2d13f6503be2e5a2bb28f803fb03b055edb5
-AUX postgresql-9.6.3-no-server.patch 3067 BLAKE2B 49822723f1e90b05b56bd4714a2480b366a1fad8d6db23cd2e99ad74eb389310077e12580c312a8ccefe0058218e8354a8665e82bcb7b27be6f744433425b0ec SHA512 314f5cea74dde55d054b43cf890dbbd216b65843f2a863a32cf8ba9fdaead1f74ad01905b7f93d2996068addd8705ff2119e1efc709cf84c18f6685937e969bc
 AUX postgresql-check-db-dir 1013 BLAKE2B 2be45942d0442822113879708c11dfde267938b6e7118bd225f567ca9fdacb11082792eabcb40b8a39cd6017fdedb18100576fea0895dae2dcda83c2d51de34d SHA512 2f34ee0cb6a889500ccfca7621ada6ee1bb06dc146f3c556938152dd3d7c0312266bb4db5f4099838d93ade26e2b8866dfddb3576cb5a737431ea2befd0cec6f
 AUX postgresql.confd-9.3 2477 BLAKE2B 0d42eedb99c951c8c60ed02abb5d4526bc288e8dd50b048cb3ab374239f1929aa80d10306037e45188a81593163121c029b91f9149365bff02ff7bfd0fe52ac4 SHA512 6c9e7c2de31eace2b3ce771a29eb354b143ea81f85d9d7ef601f302b7ae71c1c3badde8765fb7757dadcf0c49dcfa1116977e8b7f1e238350d3732962267147f
 AUX postgresql.init-9.3-r1 4999 BLAKE2B f2bc23a51b6d9643bbc14320aaa9c41b7eb1df86f8b760b9146739b14060178a415fe49b77a47b6bc5522759759fa0aefa9f0050b340534a64c2f22f89c7825d SHA512 a0f003c7d00b9749b8b25fce8ac728869e0c8f5a3c87e699b62806207413d5abba8db1e9d35e801316fbfb0ee070eb3b6a099b7991065c21cdb27ca7dc164bed
 AUX postgresql.service-9.6-r1 1477 BLAKE2B 2a652d5b2892f3a52f484fcc0b4f4dad09cf4b46c3739c3f805072040a26128cb2ad9a25d4a7c9f109a95696d739538d379af6bac53c656f5c41af45b6110de5 SHA512 9e2b04923f6ebec1424c0f276c58a6a0c4933f2de5e2a9776169227729afd06ce5284461be8b6ed70e5aaff2a68b9f96c6893d867d35761c9977f9847ccfe93d
 AUX postgresql.tmpfiles 39 BLAKE2B 25a5725af53c8e4e4009887e998172dd863ce218a5438351194548c4fc8ea15308dfba3602d5a922cf49b46015198268a4a4528119d8a74dcef4cc4c1767c052 SHA512 498060f2a597cf374f4fb31deaa2d6c5b00edef68efc0e71b82bfc20b717ae12518ba18fcb455a0c518ebba1a0868f38321470616151d02fa79b889a66dcb9f8
-DIST postgresql-10.19.tar.bz2 19261478 BLAKE2B 3ccd44d68980ddb0e394b811af20c213cf89eb8d4374d2c49c9cda5165f222ca849a2db4fe4d521991f15f9cc84ec35bafa91083b9625f2a6729159f490a94c9 SHA512 41b0f5026be7d563e41b54e9ea7199dd466a132d355be0b71a91d41f533d97fbf550eccf2a2ece3d60c5dab5921ebeea3ac4780c18c54b924df52d7423305a22
-DIST postgresql-10.20.tar.bz2 19371473 BLAKE2B 24ce3e3dda749375e999206307154e79bf15d20b3cd598ba0b78bf27976241d71e88e6fa4cd459b675bc9a9047e9315321b1535dbb41ed9e558858c2a7e9dd31 SHA512 44cfca541947d58c70593b767d3c2423f20cc6904f3d4cea8f63c1802ccbc569130c4a2a15f1af152285926f6a200e13d59c21584295dafd6f6e74bd38251428
-DIST postgresql-10.21.tar.bz2 19409454 BLAKE2B 5e43abaee8156b9eb99360efeb25ba268f93a60ac2c29044d9025c4faa8753d84cb3c0c8cbcd65eb9e0eb094ebf63e0cc1cbd0ef12c0a2faa360754e63ae106a SHA512 1053e15505c0448df491119c9aad1617889b66118628a2155e3ec87e6648b2071a0a54e10d8fbbe00161b2aa86d1a6194d932a8cf5808c626e7972d135bb05c5
 DIST postgresql-10.22.tar.bz2 19455874 BLAKE2B 10a8a894ba6e649abcc68abfd829bd30bca04b6e90f987ae5771fe02474517254ea2b48c7c9f2a899309de7b84aeaf13bac025965a9cc44814727ba257a633d7 SHA512 2e1ea75be7696ffbbb947351a8e8e55aaf067f86ad318308499a6a58797f0bf86227ed33e257e261c5c71ebba2f73ba514ef195a2394b91414ce6a0c3ab62532
-DIST postgresql-11.14.tar.bz2 20172910 BLAKE2B a033752fc5fc593c96fe63a258b2cc0d4b896548a366e3fefa8afde1f96ab64aab97eb395b10ae10494709963ed924623279f76f66870c4faee435969400c1b7 SHA512 ab71461ee6fb4cdc5b4240f7ecd8af2497ce6780283fde2abf5951ffdb616bd0c8ed22b26fdfca402a346e663ff77c4d17f3284c9d700e6fd6795b2aec97c9be
-DIST postgresql-11.15.tar.bz2 20245750 BLAKE2B f6a632606fe4b34b2a44df2c165ccfa6e890b85f4f6048994f781428bbd1de6888a24493fb5d0c231f3f34e6a4e94cfd23078a9afdaf5925d284b4854847d23f SHA512 1eba7bddee1edf034617102c1d61ad0aa1b58927dad63de1d054817966c4c9a1d7d3fa6f6896af3fe5a6880b09a6ec86be298256ee6ecc3705ff2654d3d00c74
-DIST postgresql-11.16.tar.bz2 20347100 BLAKE2B 240e86b68ff8833265f10802da2fb847d72e38ac9325fc56bb6864266b2ad98939170038ccdb7044ae16f9fd29e7a9e1d404456d8bc7d53430067d714b9bb563 SHA512 e1b6be0a97e60cdd95cd0ebc756b1de6abf2f33f41f6a80da3dff25483a30146fb6bf750ab787bb5bb4f2a04718946c7429e71f891cbd491001e9f9c2ea8e63c
 DIST postgresql-11.17.tar.bz2 20385599 BLAKE2B d145bc0f5e0f277be91bf46868c78c9ce5bb2eebbbd84fbdcdbb1ec115911d124a0a054df783739fb912eeae1322fb7eb58b7b1b8d40a8f81cffe2f24d3dda01 SHA512 35304279c06577eca134581490710db976edeac8cca169d3436fcdce8eebb18159459ea3b5ef403f6a8efe85542726f9960c4ca653da4619e081ce5869866032
-DIST postgresql-12.10.tar.bz2 20990621 BLAKE2B a7a56cf75944c558ae9bb9165dfb17b30cc5f7a865961e0a588677e4dd3e53d1fab15a212a21ec12f8e7b669a448d78efa0dfe985fd4902e16485a298c7adc62 SHA512 befedb14320aa033dc55bbb93bbbec4e67d9cfced63be0e4f631c7495a0fbc6fe280bd6d2fb941d7a2e6b2ac570b7f40d8db7f07a192a81bd9cd63c6c244a9c5
-DIST postgresql-12.11.tar.bz2 21086745 BLAKE2B 7062d334f3ef3b98f69e709f5de744324c7ce53ea516384902632a454a2ccadfd7bcc0c9ef4d51a685dd7a06e1fdccc292109294517831181c3db30bc2b7be91 SHA512 705e9e1ccf8202062cce61069b5ddb7db5f804dd0736c620640ce5622b9e42fdcbc1417771e77d51aa54beb4562a09b4307f2ff7dec135bd0e31f4941ca36ac8
 DIST postgresql-12.12.tar.bz2 21089064 BLAKE2B 7285dcfc8ed6cf2dbbe29d894dbcef53fad18cbeddbfdb3a43893234a1ee75a9bf5d966968a0c481a8ab15bf8a37400bf6eb4b57a83359501b729e70398e3551 SHA512 eeff79279ac11db04fdddeb2c52ba1ec6b549223b862222540e1f659fbfc3617130699c22694b465bde46b1a4a665c01aef70b68b86d80e58a5657efd019407d
-DIST postgresql-12.9.tar.bz2 20904260 BLAKE2B fc88d61d369569a3054b889848eaf1405a4f5137cd8c2cf27282115f70853dd4d5d8b4bf0a9fc60c63db936246a0a64077c9bfdb90685d4dfe375558e4519b2b SHA512 11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f
-DIST postgresql-13.5.tar.bz2 21186674 BLAKE2B 3e51d6d67bba09fb134cd71c48349674e0cacfaefee299620482c93f0b09edbfead578deb63083686ab691563b088fc0ea60a6281a0bcf9145689fb3ce1ec0f0 SHA512 c76effbca8ee63be48fa3aeb39c7038221848fe83ca2afc4e0904ba8c6a50b89aa2ad37080d4e3be75e9bdc2d6ca6dfefcda334ef55a5e1a8954bb955ce905e5
-DIST postgresql-13.6.tar.bz2 21257213 BLAKE2B f5ea95fd9ffc8846e0aaf5bac03b02afa71e62e796bbe40f68af727a2f3c74eddd98cb68427bcc13b87b6fa00a8e2a7b18dd7749318f0a4a32cfdbf9b0e0a873 SHA512 2852726a3031b8d469f1c38f3019af02fc5afe40ec27b22288a29acefd30c63a98806bce88a214d0c2f9177f547b0b5010ad64e70bcbe2c2f1d97a27ae1984f8
-DIST postgresql-13.7.tar.bz2 21364433 BLAKE2B 2d8a505f6de4eb31cae415529eeac750a60abafcf45e7fde29043597b385a8150fac55df659f8c2ad200822e8063d388ed606dff9108d4407f9e26b893fa62f4 SHA512 9254f21519c8d4e926f70082503bb5593c91064a3d2a4ea18ac503dfd9aa94751d6f01ce00fca9fec9b2b7af40caf8d0951b661dd8be4d6aa87c1e35b6fa7a41
 DIST postgresql-13.8.tar.bz2 21397381 BLAKE2B eb076382027a175789652a6ae8579d9b9c8856918741e8058456d22f1ef89525cff5fafe863bf615f658bc94b740b00d1268825969e37a7cefed6b5c90f402c5 SHA512 3b39448b291342a5e9b610d410c222aeb85f8acf95632e73e138ae316133af3dadc795a6e706f6447f543cf10df3c786da4f1afa1d91489b50eb77e2d9ed5d84
-DIST postgresql-14.1.tar.bz2 21887101 BLAKE2B a496dfd513c52339d1b3cb72773f9611721fd7c5d2a702d6fd71f650a1d41c3d7bf6574eba23671c7f9f11718e007f51f9547949bdc3d7fe1ea2248ebfb8d70b SHA512 4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd
-DIST postgresql-14.2.tar.bz2 21964841 BLAKE2B 6460533a40064404f18642147b949cf7c85d036c45ede478fb9af8919895ee7b09dc78b89ed08a292226911f07cfc9e46d7f2d42e0aaea546c5e97a291d599b9 SHA512 19aeb6528605dbcf5df84048b2eed8f54b202576134d3fe3900bb8f073179c4258d2581acd745887e7e6fa86ebdb5f7b159ffaa0a645d601efee7c5f7730456b
-DIST postgresql-14.4.tar.bz2 22094218 BLAKE2B 05b65083d826ed2f451b31b29b4b247dfd76b3d24ef05f6be128ee9e58d521d506a3ec4ae4839cbb74d8e217dfae81a95bd97894a778ef3c47b907b85b1fb25e SHA512 dd2f80248684e331d2ffb1e26cd2a285df1fb18710807a0c31aedabf917912ce9267f8ca26318e5371d916c6fe476f8a17886d82d3ff86a974e6f24c19a6aafb
 DIST postgresql-14.5.tar.bz2 22132996 BLAKE2B 6d303850ef1e8f9f5d66a53275fc814475646c762b9747a4f0401a472ebaf59be06d6e7c08e9c1c5ad5d3b9dbc3bb3c06d58bae137806e1a437c86bcc8cae501 SHA512 3051c5ab729f6a55952c6108098b022517398b1de64f7fefbdd6c806c7e2eb0637d00f3c98a6203c5bee654656528c4ff3530db5a69470e7888864c77900178a
-DIST postgresql-15beta2.tar.bz2 23511057 BLAKE2B d1e6d8ce67998d4295587780c2cb75f33b930556e11fd95bbd4d828086f63faed6bbddbb809ebc1fddf0980c83c7cf51e3d37f110d7bb68959dab34f61b5b8c9 SHA512 139bf4f95e2bc8942666009c6680d2b61d8ea2898e9e7eb3a0afb118f0bf6acfac5f21676525cccd82e9ee5c43ad79e07e23a55333e1318426d8b9bc95a4f00d
 DIST postgresql-15beta3.tar.bz2 23585136 BLAKE2B cdea196fb62587800f7fceafcbbd781f5636323fc6b205a0e5e0081964f2d08fcb421d0d66f710150dba37f30c2b0e7f7b3119a9a83a0cc573104968b16fc043 SHA512 caf79b889ca1325bcbdce3bbbcb3a0707b8928c8bd7b97f594cfedaedc06826e829a561b2fde73210c1e2596a0201305fa350bb3f12c05783014fc0c8564298a
-EBUILD postgresql-10.19-r1.ebuild 13409 BLAKE2B 7e201611ef1e5d282d43ad994d1f9a4bebb864b272b96b69165054514a36c296561d51c8abda752bbddaad5d16803a473b4dc5cf3425d75da754b0b4824ecdb0 SHA512 ba0a8c14f4e0e665d6ab50a16b6b256faa2fe6f3de3dd3fb6c817edce9112a7bd87a09fb444e96ffc201a4bf196c8bcfaaf5aa3abda935e73f4e8d1b946371f9
-EBUILD postgresql-10.20-r1.ebuild 13416 BLAKE2B d70e618b0bc07941ff8dd794a64c3cf94798f470c24b0222f505e5c36188ccf51477e1c9a35e71dd753250a7f5fe744297a017289006bcffe2b38ddd3c744179 SHA512 aa03b4ac07f61e75b71ea664546f0a6011d6afe93e6e487c36a634156441422465f6e2680587f8ff3bde2fba04f071c60ab35502099a8657e942a5b24f76754c
-EBUILD postgresql-10.21.ebuild 13419 BLAKE2B a7ee8b15038673ecc77165bfe85bb4235b250cc29e2fe876e16483cc0e051990a0e275156ce0dccace75637e2dbd65e157a07076e0025321581d1eba017df40f SHA512 a7b5a64b2177bfa85e66589ffdaff8b52373f55f63dd3760060b077c70fce87b1a350969e944031d6246d4fac0ad839f1025d44d23ec9597e4a74a004f9de3e0
 EBUILD postgresql-10.22.ebuild 13396 BLAKE2B 76f9664e84f8fc6bc72932c823a9e86efccb9a11b238d743ed05a6b2173454a3289d4642b1a20a2aedac7468d91e03d300fbe91751f81efd896b83de6e047267 SHA512 d4586bf730baa7640f77e5c7578ca35e524c1828d7cc8849d8b4cbeac6a708d593f4ca0f44e301d515215e8f40bc98634b891d384363dd67dd743dd890172e95
-EBUILD postgresql-11.14-r1.ebuild 13450 BLAKE2B 3e760d7d7a663171decfc776ce3559b44b8e75b0fb378b4a613ba53093a655086583f4eda6d7500eba2f49ce4387d403c22dedc3b0bdac0ddd61f8c4d2ad1846 SHA512 96b2b23a7773117d205fbbc38a5e0c310bcfc5d922aec198ee9bcaa81c093926d540db80592788f941d03288a6007f678d34ff6a0191a626d2508726ff084584
-EBUILD postgresql-11.15-r1.ebuild 13457 BLAKE2B dee96904f9cdcbd4ba3bdfde139235901e42d8152c9d3450706a8bfbb65d612da6df97e68a441c65e0a156f2ded4f59ed19d084941683fcb64b46a05310fc9d8 SHA512 35a5a7ce237ffddd3d3267f78c4f89307a8c959d2d4f541d9dc5776554c16fab540d32fee34b67215300f02cc0d3a02e06ad8f818a841e0ec0778c2d84bbef28
-EBUILD postgresql-11.16.ebuild 13460 BLAKE2B 2c293e0cbd9a5a85a600f0736511cd04fcbfb4f973ffcfb8da11bb70648b8f03ebd14a1df3371710768b82a5c6ffa8367cfce16f94b4e5d14aa1cd2a80cc3d5e SHA512 a83bce28182383fcda369e900452867a425ece6d91042958bdf321253e6a061d0b15be40314ae953ac47126fbabc9302cbd137dbaa93c76a35a688f7e1e27047
 EBUILD postgresql-11.17.ebuild 13437 BLAKE2B 30430d49593f412e99b0b5f03e8bf95e9246b77ee26f767e9caf4c460aa150b3d211ccdc95e27a55d9af36a8a38f401eef8306034be519dd3e998839f0fc218a SHA512 03928c84dc681726ac45434cc58c4e46df1023c6f52bfb06007a99bcade4546007c087dca0951870e482dc63ae54e39f1956e8e431641ad7e89b35438b275b81
-EBUILD postgresql-12.10-r1.ebuild 13485 BLAKE2B 17be08192ba86e5046e54d5b76d57dee6bceae73f296e974640df028c641795cdb410d8f096dc51256756c76f4fc4aee843e83aa495eee4c5013568a51588da7 SHA512 cf0adab3e839c94ac3ac2f5d7367f70d15a23417ea60ea8122bce6355409abb82f8d29dc4ab2b39cef46cd9b38476981c3e882a89388affb69fcd46d7a2cdc1b
-EBUILD postgresql-12.11.ebuild 13432 BLAKE2B db1f67a15ec8655a0f5389b87411957ac478763ef617e81f6970834491ba628916411e78d625d48c262bbbbb5a748a582a6f7815ccfb46353fd94a67c12b43e1 SHA512 9d15681dcf8e1dbf70dc7c53fb6b9e8db0589beebf93b8ea1644bf8844c5cd6704be65f7cad3fb180d7b4e13c72eb088ecfe7437ff2f1f210641d6d94995c159
 EBUILD postgresql-12.12.ebuild 13409 BLAKE2B 281c833ddabcb85f6044d30a3cd36c1626ce6f053dfd597f080ff82d9f4330190971e8fd605f12396fb6f4a983d66667761fdfbe4a02b7f7fe2d63c2e0535265 SHA512 f48c59daafb48564149269de494f4293fe09f851da7e37ee3181d1527b0469b388d8c97efb13bb28393d533c6de25ab6c9da54d3faeb59cdfbf685a9ec129d6d
-EBUILD postgresql-12.9-r1.ebuild 13478 BLAKE2B 286c0122968488d15640f1e42097044e65fc80ef4fdbc1a2fd00b3bd28fa5c9ec8c40a2b41080c91d05910cb074d0002d0221fbb6bc006f5b0fb4a2857357f6b SHA512 f9da7b2cc17290e4ec1e5fab1aa66174455635ff016f6faf657352d20d4278f8858953b6103af4e94f38a653055cf0757c61ba1867bf0541b79339e174f1a38f
-EBUILD postgresql-13.5-r1.ebuild 13916 BLAKE2B 66ba4ec3af94de732d39566dd374d993ec9bc5f6219a4232a73a28a2c5ec69542623aff1ad8fa5c3392a806d6ba58044b56d8945859c3485c623474b3b96f556 SHA512 a656b23b25795deaa06d105d9472080d653c05ddf7fa384614625f7d98f9ea82bd0a2a28f3e249794914d77275ebfbedc1243b8c8c212e5529571180abd22a4b
-EBUILD postgresql-13.6-r2.ebuild 13923 BLAKE2B 4affe91b5f0d9a50c5c4151614da2aa51f53c1c1a009e3bee1cdc9bf948ef1f393943192a7d7bc697b2e76ec7a34ff5cf3862f2d1f12a8a85a6e87ae9d01d6a3 SHA512 3b564b616a8a33a8f16c35d2d9360b35b6682169875de9cc79f00e44aea6d29a7324ea641c1df9613226db3f83e0bf860c131fae18b609ad3e817e21df97de19
-EBUILD postgresql-13.7.ebuild 13870 BLAKE2B 20258249b38c7d6785a520e1905d07b9893e2324c74fa18b48380d91912bbc0a45031539abe48e586d8856d26ec535b60eedf3a3805c564b353ee11492f033ce SHA512 0d36a3191649a989243283a0d21cd36efc8c01aa3f217449a9d64e1846bec033e281fc4afc40f85e3b0c7ecab05a8c558d247acf765594b561d1082a95f37139
 EBUILD postgresql-13.8.ebuild 13843 BLAKE2B 45c47bee6be51818fc067e8650817977baab83b5b8e2ed4af488a5b2020a330b22641844a8b12c2be21710d6166d02119c87d82b38c485d463271cae27460a40 SHA512 02e658d14c756bd34399a68c562d92b59deb6665d31d1d93058f1c1e7c3501ea4ac2150d620f288181ccfe7042a03fdccff60217a45bf6627fef775da80957ad
-EBUILD postgresql-14.1-r1.ebuild 13911 BLAKE2B 579d9eb3d1b3ecbbaabfe44c2fefc590ebc7cc3a638e7affc9e4c5235c0da9cfccbd5b21b91cca5455924adbb5cca033b7d0fbfcc444119dce2ce570741f580c SHA512 4a9839e479f1c851f28b9d8738b65ec973346a650190c94b3968bbfa2dd45807a24efeba806a973dff83a7dc90f685616d659735528eff4113b9fbf658c64642
-EBUILD postgresql-14.2-r1.ebuild 13845 BLAKE2B fc8833b37fd7b7782637781845156cfe5e90d3e33c16d2df12867d4395bf778715b83d67d38d1c23912d284a34069cb4dda7c14ecabe7e79b899d643a8a0079e SHA512 8cf6ca31517ca84b5eba134c349aaf6bb71eb335bd6e10bdd84081ff46f4085b0c0527710e174b34818b1ef43592ec75aaaefcd1c2671b01176ec3f9e317fae0
-EBUILD postgresql-14.4.ebuild 13799 BLAKE2B 40af950a78f56c80e6ea14e3930e67408b53985a7298d857c634dabfe7b15f34cfd6b2c8559c4ae5000f59e5ad19b53000bf4eea1abed345f1697bee711178e9 SHA512 295043db0513669e2e23d6cf1ed36d78da2df4db21bd9dcb8d39497738b1638238b0ce0b7992ae0adda37fbfa8b440a60dd2ba3610a291a1fba923e0e9aa0a76
 EBUILD postgresql-14.5.ebuild 13774 BLAKE2B ecec6f9fb648d6b0eea89197564c3a9a96da8fd28beab9d0c102196389c9ce65b58ef70009d5dbc90947865ba00c29bf38f23bed7741fbcfca63fc0d1f3095ad SHA512 60388969b633570788f2b2fe0b74d73a535c39a981d7777d58b4908ef79fd2fef24dae53f31901fe702e5e0394a097c38c0901861a2ede03e2c3fe0bee4818f8
-EBUILD postgresql-15_beta2.ebuild 13665 BLAKE2B ce6a7544e317469603a81dbab5072a8d142bc2b3ada6f9dc7a72606176f64a1a8f9678e6734893ce320a6795839a8f9aee0d95e82044947999de51a63cc7a922 SHA512 5eb71847b3744f1f8145531e97a10089482631d28121d652fb91ddd2900cb7d4ffb70de58cd3c94fe312fe0777ea2a33f821f0967efe6aa9ea531b0a7cf214ef
 EBUILD postgresql-15_beta3.ebuild 13651 BLAKE2B 51bed616c3f486b95fd56ec3106d68463cef32b0c1e86717ffca2c267af195ed3d7443ec8fe210dc5147bd2dfbef340d71eab6df4f2cffca00f27c972451ba85 SHA512 02f91cc698c1c3eac7fc03f772d1937cd1d0c412b2a4395066a36b59e44389952a9f030f0cc9b7a2c8dcef4960409cf4ec0f921e8f19dee9bc30332c6d33dd89
 EBUILD postgresql-9999.ebuild 14085 BLAKE2B 451cd42e7fede68e3c27c77a86ec19bf29eecd254d12f235aaf07cb5ab58aa74e3ef9d8c4ea1b8a1bdafb6590608387eb1b30f1c7387e9eb2bce466cbb170fbe SHA512 90d7c1b53706a4015c7292b1f3bce730f2326541071eb08c84a6b0aa76b0d2e5f98b43f7b6f677df1a1a926cdf270b7b2fb076efca4d7f48bc67942d44d994bb
 MISC metadata.xml 653 BLAKE2B b5b85d83ee78ac502e2707d156e2fadf6fea857160e2f48da51c755e221c52a14b9eb04354202287f4aba15c274c07ba7b0911c76fd034bfa774ce3500ccb165 SHA512 fd543af224f6f8677e138cb1db7154d2444295c45df8696e3584911943176023d8d1b179f6b16d88ffc6d290265ec1b2f4c902cf95cc79eb37599ae3635b0942
diff --git a/dev-db/postgresql/files/postgres-llvm14.patch b/dev-db/postgresql/files/postgres-llvm14.patch
deleted file mode 100644
index 2c7b91d75153..000000000000
--- a/dev-db/postgresql/files/postgres-llvm14.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From d9f7ad54e552262ee0090e88d5abd3e04fcdeac8 Mon Sep 17 00:00:00 2001
-From: Thomas Munro <tmunro@postgresql.org>
-Date: Wed, 16 Mar 2022 11:35:00 +1300
-Subject: [PATCH] Back-patch LLVM 14 API changes.
-
-Since LLVM 14 has stopped changing and is about to be released,
-back-patch the following changes from the master branch:
-
-  e6a7600202105919bffd62b3dfd941f4a94e082b
-  807fee1a39de6bb8184082012e643951abb9ad1d
-  a56e7b66010f330782243de9e25ac2a6596be0e1
-
-Back-patch to 11, where LLVM JIT support came in.
----
- src/backend/jit/llvm/Makefile           |  6 +++++
- src/backend/jit/llvm/llvmjit_error.cpp  | 35 +++++++++++++++++++++----
- src/backend/jit/llvm/llvmjit_inline.cpp | 12 ++++++++-
- 3 files changed, 47 insertions(+), 6 deletions(-)
-
-diff --git a/src/backend/jit/llvm/Makefile b/src/backend/jit/llvm/Makefile
-index 0268bd46d5..2da122a391 100644
---- a/src/backend/jit/llvm/Makefile
-+++ b/src/backend/jit/llvm/Makefile
-@@ -22,6 +22,12 @@ endif
- PGFILEDESC = "llvmjit - JIT using LLVM"
- NAME = llvmjit
- 
-+# LLVM 14 produces deprecation warnings.  We'll need to make some changes
-+# before the relevant functions are removed, but for now silence the warnings.
-+ifeq ($(GCC), yes)
-+LLVM_CFLAGS += -Wno-deprecated-declarations
-+endif
-+
- # All files in this directory use LLVM.
- CFLAGS += $(LLVM_CFLAGS)
- CXXFLAGS += $(LLVM_CXXFLAGS)
-diff --git a/src/backend/jit/llvm/llvmjit_error.cpp b/src/backend/jit/llvm/llvmjit_error.cpp
-index f4720732a3..5ad92f3090 100644
---- a/src/backend/jit/llvm/llvmjit_error.cpp
-+++ b/src/backend/jit/llvm/llvmjit_error.cpp
-@@ -23,15 +23,22 @@ extern "C"
- 
- #include "jit/llvmjit.h"
- 
-+#include <new>
- 
- static int fatal_new_handler_depth = 0;
- static std::new_handler old_new_handler = NULL;
- 
- static void fatal_system_new_handler(void);
- #if LLVM_VERSION_MAJOR > 4
-+static void fatal_llvm_new_handler(void *user_data, const char *reason, bool gen_crash_diag);
-+#if LLVM_VERSION_MAJOR < 14
- static void fatal_llvm_new_handler(void *user_data, const std::string& reason, bool gen_crash_diag);
- #endif
-+#endif
-+static void fatal_llvm_error_handler(void *user_data, const char *reason, bool gen_crash_diag);
-+#if LLVM_VERSION_MAJOR < 14
- static void fatal_llvm_error_handler(void *user_data, const std::string& reason, bool gen_crash_diag);
-+#endif
- 
- 
- /*
-@@ -129,23 +136,41 @@ fatal_system_new_handler(void)
- #if LLVM_VERSION_MAJOR > 4
- static void
- fatal_llvm_new_handler(void *user_data,
--					   const std::string& reason,
-+					   const char *reason,
- 					   bool gen_crash_diag)
- {
- 	ereport(FATAL,
- 			(errcode(ERRCODE_OUT_OF_MEMORY),
- 			 errmsg("out of memory"),
--			 errdetail("While in LLVM: %s", reason.c_str())));
-+			 errdetail("While in LLVM: %s", reason)));
-+}
-+#if LLVM_VERSION_MAJOR < 14
-+static void
-+fatal_llvm_new_handler(void *user_data,
-+					   const std::string& reason,
-+					   bool gen_crash_diag)
-+{
-+	fatal_llvm_new_handler(user_data, reason.c_str(), gen_crash_diag);
- }
- #endif
-+#endif
- 
- static void
- fatal_llvm_error_handler(void *user_data,
--						 const std::string& reason,
-+						 const char *reason,
- 						 bool gen_crash_diag)
- {
- 	ereport(FATAL,
- 			(errcode(ERRCODE_OUT_OF_MEMORY),
--			 errmsg("fatal llvm error: %s",
--					reason.c_str())));
-+			 errmsg("fatal llvm error: %s", reason)));
- }
-+
-+#if LLVM_VERSION_MAJOR < 14
-+static void
-+fatal_llvm_error_handler(void *user_data,
-+						 const std::string& reason,
-+						 bool gen_crash_diag)
-+{
-+	fatal_llvm_error_handler(user_data, reason.c_str(), gen_crash_diag);
-+}
-+#endif
-diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp
-index 6f03595db5..9bb4b672a7 100644
---- a/src/backend/jit/llvm/llvmjit_inline.cpp
-+++ b/src/backend/jit/llvm/llvmjit_inline.cpp
-@@ -594,7 +594,11 @@ function_inlinable(llvm::Function &F,
- 	if (F.materialize())
- 		elog(FATAL, "failed to materialize metadata");
- 
--	if (F.getAttributes().hasFnAttribute(llvm::Attribute::NoInline))
-+#if LLVM_VERSION_MAJOR < 14
-+#define hasFnAttr hasFnAttribute
-+#endif
-+
-+	if (F.getAttributes().hasFnAttr(llvm::Attribute::NoInline))
- 	{
- 		ilog(DEBUG1, "ineligibile to import %s due to noinline",
- 			 F.getName().data());
-@@ -871,7 +875,9 @@ create_redirection_function(std::unique_ptr<llvm::Module> &importMod,
- 	llvm::Function *AF;
- 	llvm::BasicBlock *BB;
- 	llvm::CallInst *fwdcall;
-+#if LLVM_VERSION_MAJOR < 14
- 	llvm::Attribute inlineAttribute;
-+#endif
- 
- 	AF = llvm::Function::Create(F->getFunctionType(),
- 								LinkageTypes::AvailableExternallyLinkage,
-@@ -880,9 +886,13 @@ create_redirection_function(std::unique_ptr<llvm::Module> &importMod,
- 
- 	Builder.SetInsertPoint(BB);
- 	fwdcall = Builder.CreateCall(F, &*AF->arg_begin());
-+#if LLVM_VERSION_MAJOR < 14
- 	inlineAttribute = llvm::Attribute::get(Context,
- 										   llvm::Attribute::AlwaysInline);
- 	fwdcall->addAttribute(~0U, inlineAttribute);
-+#else
-+	fwdcall->addFnAttr(llvm::Attribute::AlwaysInline);
-+#endif
- 	Builder.CreateRet(fwdcall);
- 
- 	return AF;
--- 
-2.30.2
-
diff --git a/dev-db/postgresql/files/postgresql-13_beta1-no-server.patch b/dev-db/postgresql/files/postgresql-13_beta1-no-server.patch
deleted file mode 100644
index ceb0e3a61d25..000000000000
--- a/dev-db/postgresql/files/postgresql-13_beta1-no-server.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naruw postgresql-13beta1.orig/contrib/Makefile postgresql-13beta1/contrib/Makefile
---- postgresql-13beta1.orig/contrib/Makefile	2020-05-18 16:09:19.000000000 -0400
-+++ postgresql-13beta1/contrib/Makefile	2020-05-22 19:56:42.560113731 -0400
-@@ -5,56 +5,9 @@
- include $(top_builddir)/src/Makefile.global
- 
- SUBDIRS = \
--		adminpack	\
--		amcheck		\
--		auth_delay	\
--		auto_explain	\
--		bloom		\
--		btree_gin	\
--		btree_gist	\
--		citext		\
--		cube		\
--		dblink		\
--		dict_int	\
--		dict_xsyn	\
--		earthdistance	\
--		file_fdw	\
--		fuzzystrmatch	\
--		hstore		\
--		intagg		\
--		intarray	\
--		isn		\
--		lo		\
--		ltree		\
- 		oid2name	\
--		pageinspect	\
--		passwordcheck	\
--		pg_buffercache	\
--		pg_freespacemap \
--		pg_prewarm	\
--		pg_standby	\
--		pg_stat_statements \
--		pg_trgm		\
--		pgcrypto	\
--		pgrowlocks	\
--		pgstattuple	\
--		pg_visibility	\
--		postgres_fdw	\
--		seg		\
--		spi		\
--		tablefunc	\
--		tcn		\
--		test_decoding	\
--		tsm_system_rows \
--		tsm_system_time \
--		unaccent	\
- 		vacuumlo
- 
--ifeq ($(with_openssl),yes)
--SUBDIRS += sslinfo
--else
--ALWAYS_SUBDIRS += sslinfo
--endif
- 
- ifneq ($(with_uuid),no)
- SUBDIRS += uuid-ossp
-diff -Naruw postgresql-13beta1.orig/src/backend/Makefile postgresql-13beta1/src/backend/Makefile
---- postgresql-13beta1.orig/src/backend/Makefile	2020-05-18 16:09:19.000000000 -0400
-+++ postgresql-13beta1/src/backend/Makefile	2020-05-22 19:58:14.403299909 -0400
-@@ -56,7 +56,7 @@
- 
- ##########################################################################
- 
--all: submake-libpgport submake-catalog-headers submake-utils-headers postgres $(POSTGRES_IMP)
-+all: generated-headers
- 
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -195,23 +195,7 @@
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(MAKE) -C tsearch install-data
--	$(MAKE) -C utils install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
-+install:
- 
- ifeq ($(with_llvm), yes)
- install-bin: install-postgres-bitcode
-diff -Naruw postgresql-13beta1.orig/src/bin/Makefile postgresql-13beta1/src/bin/Makefile
---- postgresql-13beta1.orig/src/bin/Makefile	2020-05-18 16:09:19.000000000 -0400
-+++ postgresql-13beta1/src/bin/Makefile	2020-05-22 19:59:11.399875256 -0400
-@@ -14,22 +14,8 @@
- include $(top_builddir)/src/Makefile.global
- 
- SUBDIRS = \
--	initdb \
--	pg_archivecleanup \
--	pg_basebackup \
--	pg_checksums \
- 	pg_config \
--	pg_controldata \
--	pg_ctl \
- 	pg_dump \
--	pg_resetwal \
--	pg_rewind \
--	pg_test_fsync \
--	pg_test_timing \
--	pg_upgrade \
--	pg_verifybackup \
--	pg_waldump \
--	pgbench \
- 	psql \
- 	scripts
- 
-diff -Naruw postgresql-13beta1.orig/src/Makefile postgresql-13beta1/src/Makefile
---- postgresql-13beta1.orig/src/Makefile	2020-05-18 16:09:19.000000000 -0400
-+++ postgresql-13beta1/src/Makefile	2020-05-22 19:59:59.656464613 -0400
-@@ -15,21 +15,12 @@
- SUBDIRS = \
- 	common \
- 	port \
--	timezone \
- 	backend \
--	backend/utils/mb/conversion_procs \
--	backend/snowball \
- 	include \
- 	interfaces \
--	backend/replication/libpqwalreceiver \
--	backend/replication/pgoutput \
- 	fe_utils \
- 	bin \
--	pl \
--	makefiles \
--	test/regress \
--	test/isolation \
--	test/perl
-+	makefiles
- 
- ifeq ($(with_llvm), yes)
- SUBDIRS += backend/jit/llvm
diff --git a/dev-db/postgresql/files/postgresql-14_rc1-no-server.patch b/dev-db/postgresql/files/postgresql-14_rc1-no-server.patch
deleted file mode 100644
index 4f2d388386a2..000000000000
--- a/dev-db/postgresql/files/postgresql-14_rc1-no-server.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -Naruw a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2021-09-20 17:33:01.000000000 -0400
-+++ b/contrib/Makefile	2021-09-23 16:28:52.919265033 -0400
-@@ -5,57 +5,9 @@
- include $(top_builddir)/src/Makefile.global
- 
- SUBDIRS = \
--		adminpack	\
--		amcheck		\
--		auth_delay	\
--		auto_explain	\
--		bloom		\
--		btree_gin	\
--		btree_gist	\
--		citext		\
--		cube		\
--		dblink		\
--		dict_int	\
--		dict_xsyn	\
--		earthdistance	\
--		file_fdw	\
--		fuzzystrmatch	\
--		hstore		\
--		intagg		\
--		intarray	\
--		isn		\
--		lo		\
--		ltree		\
- 		oid2name	\
--		old_snapshot	\
--		pageinspect	\
--		passwordcheck	\
--		pg_buffercache	\
--		pg_freespacemap \
--		pg_prewarm	\
--		pg_stat_statements \
--		pg_surgery	\
--		pg_trgm		\
--		pgcrypto	\
--		pgrowlocks	\
--		pgstattuple	\
--		pg_visibility	\
--		postgres_fdw	\
--		seg		\
--		spi		\
--		tablefunc	\
--		tcn		\
--		test_decoding	\
--		tsm_system_rows \
--		tsm_system_time \
--		unaccent	\
- 		vacuumlo
- 
--ifeq ($(with_ssl),openssl)
--SUBDIRS += sslinfo
--else
--ALWAYS_SUBDIRS += sslinfo
--endif
- 
- ifneq ($(with_uuid),no)
- SUBDIRS += uuid-ossp
-diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile	2021-09-20 17:33:01.000000000 -0400
-+++ b/src/backend/Makefile	2021-09-23 16:30:03.015728022 -0400
-@@ -56,7 +56,7 @@
- 
- ##########################################################################
- 
--all: submake-libpgport submake-catalog-headers submake-utils-headers postgres $(POSTGRES_IMP)
-+all: generated-headers
- 
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -194,23 +194,7 @@
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(MAKE) -C tsearch install-data
--	$(MAKE) -C utils install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
-+install:
- 
- ifeq ($(with_llvm), yes)
- install-bin: install-postgres-bitcode
-diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2021-09-20 17:33:01.000000000 -0400
-+++ b/src/bin/Makefile	2021-09-23 16:30:50.718922745 -0400
-@@ -14,23 +14,8 @@
- include $(top_builddir)/src/Makefile.global
- 
- SUBDIRS = \
--	initdb \
--	pg_amcheck \
--	pg_archivecleanup \
--	pg_basebackup \
--	pg_checksums \
- 	pg_config \
--	pg_controldata \
--	pg_ctl \
- 	pg_dump \
--	pg_resetwal \
--	pg_rewind \
--	pg_test_fsync \
--	pg_test_timing \
--	pg_upgrade \
--	pg_verifybackup \
--	pg_waldump \
--	pgbench \
- 	psql \
- 	scripts
- 
-diff -Naruw a/src/Makefile b/src/Makefile
---- a/src/Makefile	2021-09-20 17:33:01.000000000 -0400
-+++ b/src/Makefile	2021-09-23 16:31:41.842107531 -0400
-@@ -15,21 +15,12 @@
- SUBDIRS = \
- 	common \
- 	port \
--	timezone \
- 	backend \
--	backend/utils/mb/conversion_procs \
--	backend/snowball \
- 	include \
- 	interfaces \
--	backend/replication/libpqwalreceiver \
--	backend/replication/pgoutput \
- 	fe_utils \
- 	bin \
--	pl \
--	makefiles \
--	test/regress \
--	test/isolation \
--	test/perl
-+	makefiles
- 
- ifeq ($(with_llvm), yes)
- SUBDIRS += backend/jit/llvm
diff --git a/dev-db/postgresql/files/postgresql-9.6.3-no-server.patch b/dev-db/postgresql/files/postgresql-9.6.3-no-server.patch
deleted file mode 100644
index aa7cf773a39a..000000000000
--- a/dev-db/postgresql/files/postgresql-9.6.3-no-server.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- a/contrib/Makefile
-+++ b/contrib/Makefile
-@@ -5,57 +5,9 @@
- include $(top_builddir)/src/Makefile.global
- 
- SUBDIRS = \
--		adminpack	\
--		auth_delay	\
--		auto_explain	\
--		bloom		\
--		btree_gin	\
--		btree_gist	\
--		chkpass		\
--		citext		\
--		cube		\
--		dblink		\
--		dict_int	\
--		dict_xsyn	\
--		earthdistance	\
--		file_fdw	\
--		fuzzystrmatch	\
--		hstore		\
--		intagg		\
--		intarray	\
--		isn		\
--		lo		\
--		ltree		\
- 		oid2name	\
--		pageinspect	\
--		passwordcheck	\
--		pg_buffercache	\
--		pg_freespacemap \
--		pg_prewarm	\
--		pg_standby	\
--		pg_stat_statements \
--		pg_trgm		\
--		pgcrypto	\
--		pgrowlocks	\
--		pgstattuple	\
--		pg_visibility	\
--		postgres_fdw	\
--		seg		\
--		spi		\
--		tablefunc	\
--		tcn		\
--		test_decoding	\
--		tsm_system_rows \
--		tsm_system_time \
--		tsearch2	\
--		unaccent	\
- 		vacuumlo
- 
--ifeq ($(with_openssl),yes)
--SUBDIRS += sslinfo
--else
--ALWAYS_SUBDIRS += sslinfo
--endif
- 
- ifneq ($(with_uuid),no)
- SUBDIRS += uuid-ossp
---- a/src/backend/Makefile
-+++ b/src/backend/Makefile
-@@ -51,7 +51,7 @@
- 
- ##########################################################################
- 
--all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
-+all: generated-headers
- 
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -218,23 +218,7 @@
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(MAKE) -C tsearch install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
-+install:
- 
- install-bin: postgres $(POSTGRES_IMP) installdirs
- 	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
---- a/src/bin/Makefile
-+++ b/src/bin/Makefile
-@@ -14,19 +14,8 @@
- include $(top_builddir)/src/Makefile.global
- 
- SUBDIRS = \
--	initdb \
--	pg_archivecleanup \
--	pg_basebackup \
- 	pg_config \
--	pg_controldata \
--	pg_ctl \
- 	pg_dump \
--	pg_resetxlog \
--	pg_rewind \
--	pg_test_fsync \
--	pg_test_timing \
--	pg_upgrade \
--	pg_xlogdump \
- 	pgbench \
- 	psql \
- 	scripts
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -15,19 +15,12 @@
- SUBDIRS = \
- 	common \
- 	port \
--	timezone \
- 	backend \
--	backend/utils/mb/conversion_procs \
--	backend/snowball \
- 	include \
- 	interfaces \
--	backend/replication/libpqwalreceiver \
- 	fe_utils \
- 	bin \
--	pl \
--	makefiles \
--	test/regress \
--	test/perl
-+	makefiles
- 
- # There are too many interdependencies between the subdirectories, so
- # don't attempt parallel make here.
diff --git a/dev-db/postgresql/postgresql-10.19-r1.ebuild b/dev-db/postgresql/postgresql-10.19-r1.ebuild
deleted file mode 100644
index 2bab39336a23..000000000000
--- a/dev-db/postgresql/postgresql-10.19-r1.ebuild
+++ /dev/null
@@ -1,453 +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,10} )
-
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap nls pam perl
-	  python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libcrypt:=
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-10.2-no-server.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	# https://bugs.gentoo.org/753257
-	# https://bugs.gentoo.org/766225
-	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-10.20-r1.ebuild b/dev-db/postgresql/postgresql-10.20-r1.ebuild
deleted file mode 100644
index 93f17aa04271..000000000000
--- a/dev-db/postgresql/postgresql-10.20-r1.ebuild
+++ /dev/null
@@ -1,453 +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,10} )
-
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap nls pam perl
-	  python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libcrypt:=
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-10.2-no-server.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	# https://bugs.gentoo.org/753257
-	# https://bugs.gentoo.org/766225
-	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-10.21.ebuild b/dev-db/postgresql/postgresql-10.21.ebuild
deleted file mode 100644
index f2b4125d2922..000000000000
--- a/dev-db/postgresql/postgresql-10.21.ebuild
+++ /dev/null
@@ -1,453 +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,10,11} )
-
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap nls pam perl
-	  python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libcrypt:=
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-10.2-no-server.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	# https://bugs.gentoo.org/753257
-	# https://bugs.gentoo.org/766225
-	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-11.14-r1.ebuild b/dev-db/postgresql/postgresql-11.14-r1.ebuild
deleted file mode 100644
index 314f76723449..000000000000
--- a/dev-db/postgresql/postgresql-11.14-r1.ebuild
+++ /dev/null
@@ -1,453 +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,10} )
-LLVM_MAX_SLOT=13
-
-inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	<sys-devel/llvm-14:=
-	<sys-devel/clang-14:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-11.15-r1.ebuild b/dev-db/postgresql/postgresql-11.15-r1.ebuild
deleted file mode 100644
index 4be0a8926b5d..000000000000
--- a/dev-db/postgresql/postgresql-11.15-r1.ebuild
+++ /dev/null
@@ -1,453 +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,10} )
-LLVM_MAX_SLOT=13
-
-inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	<sys-devel/llvm-14:=
-	<sys-devel/clang-14:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-11.16.ebuild b/dev-db/postgresql/postgresql-11.16.ebuild
deleted file mode 100644
index 2fca671b4f2d..000000000000
--- a/dev-db/postgresql/postgresql-11.16.ebuild
+++ /dev/null
@@ -1,453 +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,10,11} )
-LLVM_MAX_SLOT=13
-
-inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	<sys-devel/llvm-14:=
-	<sys-devel/clang-14:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-12.10-r1.ebuild b/dev-db/postgresql/postgresql-12.10-r1.ebuild
deleted file mode 100644
index b34da8d7f42d..000000000000
--- a/dev-db/postgresql/postgresql-12.10-r1.ebuild
+++ /dev/null
@@ -1,454 +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,10} )
-LLVM_MAX_SLOT=14
-
-inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	<sys-devel/llvm-15:=
-	<sys-devel/clang-15:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
-	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-12.11.ebuild b/dev-db/postgresql/postgresql-12.11.ebuild
deleted file mode 100644
index 1930b6f2927d..000000000000
--- a/dev-db/postgresql/postgresql-12.11.ebuild
+++ /dev/null
@@ -1,453 +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,10,11} )
-LLVM_MAX_SLOT=14
-
-inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	<sys-devel/llvm-15:=
-	<sys-devel/clang-15:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-12.9-r1.ebuild b/dev-db/postgresql/postgresql-12.9-r1.ebuild
deleted file mode 100644
index e59f0a032797..000000000000
--- a/dev-db/postgresql/postgresql-12.9-r1.ebuild
+++ /dev/null
@@ -1,454 +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,10} )
-LLVM_MAX_SLOT=14
-
-inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	<sys-devel/llvm-15:=
-	<sys-devel/clang-15:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
-	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-13.5-r1.ebuild b/dev-db/postgresql/postgresql-13.5-r1.ebuild
deleted file mode 100644
index 6e0f3bba6848..000000000000
--- a/dev-db/postgresql/postgresql-13.5-r1.ebuild
+++ /dev/null
@@ -1,466 +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,10} )
-LLVM_MAX_SLOT=14
-
-inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-
-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"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	<sys-devel/llvm-15:=
-	<sys-devel/clang-15:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-13.3-riscv-spinlocks.patch
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
-	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	local myconf="\
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)"
-	if use alpha; then
-		myconf+=" --disable-spinlocks"
-	else
-		# Should be the default but just in case
-		myconf+=" --enable-spinlocks"
-	fi
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
-		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
-		local old_ctype=${LC_CTYPE}
-		export LC_CTYPE=${LC_COLLATE}
-		emake check
-		export LC_CTYPE=${old_ctype}
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-13.6-r2.ebuild b/dev-db/postgresql/postgresql-13.6-r2.ebuild
deleted file mode 100644
index 3ecf907af22e..000000000000
--- a/dev-db/postgresql/postgresql-13.6-r2.ebuild
+++ /dev/null
@@ -1,466 +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,10} )
-LLVM_MAX_SLOT=14
-
-inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-
-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"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	<sys-devel/llvm-15:=
-	<sys-devel/clang-15:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-13.3-riscv-spinlocks.patch
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
-	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	local myconf="\
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)"
-	if use alpha; then
-		myconf+=" --disable-spinlocks"
-	else
-		# Should be the default but just in case
-		myconf+=" --enable-spinlocks"
-	fi
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
-		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
-		local old_ctype=${LC_CTYPE}
-		export LC_CTYPE=${LC_COLLATE}
-		emake check
-		export LC_CTYPE=${old_ctype}
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-13.7.ebuild b/dev-db/postgresql/postgresql-13.7.ebuild
deleted file mode 100644
index bec67b2f0353..000000000000
--- a/dev-db/postgresql/postgresql-13.7.ebuild
+++ /dev/null
@@ -1,465 +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,10,11} )
-LLVM_MAX_SLOT=14
-
-inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-
-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"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	<sys-devel/llvm-15:=
-	<sys-devel/clang-15:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-13.3-riscv-spinlocks.patch
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	local myconf="\
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)"
-	if use alpha; then
-		myconf+=" --disable-spinlocks"
-	else
-		# Should be the default but just in case
-		myconf+=" --enable-spinlocks"
-	fi
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
-		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
-		local old_ctype=${LC_CTYPE}
-		export LC_CTYPE=${LC_COLLATE}
-		emake check
-		export LC_CTYPE=${old_ctype}
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-14.1-r1.ebuild b/dev-db/postgresql/postgresql-14.1-r1.ebuild
deleted file mode 100644
index 4865e372312f..000000000000
--- a/dev-db/postgresql/postgresql-14.1-r1.ebuild
+++ /dev/null
@@ -1,466 +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,10} )
-LLVM_MAX_SLOT=14
-
-inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-
-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"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm lz4 nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	<sys-devel/llvm-15:=
-	<sys-devel/clang-15:=
-)
-lz4? ( app-arch/lz4 )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
-	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	local myconf="\
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with lz4) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)"
-	if use alpha; then
-		myconf+=" --disable-spinlocks"
-	else
-		# Should be the default but just in case
-		myconf+=" --enable-spinlocks"
-	fi
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
-		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
-		local old_ctype=${LC_CTYPE}
-		export LC_CTYPE=${LC_COLLATE}
-		emake check
-		export LC_CTYPE=${old_ctype}
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-14.2-r1.ebuild b/dev-db/postgresql/postgresql-14.2-r1.ebuild
deleted file mode 100644
index ba00ea41f4e1..000000000000
--- a/dev-db/postgresql/postgresql-14.2-r1.ebuild
+++ /dev/null
@@ -1,463 +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,10} )
-
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-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"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm lz4 nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
-)
-lz4? ( app-arch/lz4 )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
-	use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	local myconf="\
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with lz4) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)"
-	if use alpha; then
-		myconf+=" --disable-spinlocks"
-	else
-		# Should be the default but just in case
-		myconf+=" --enable-spinlocks"
-	fi
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
-		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
-		local old_ctype=${LC_CTYPE}
-		export LC_CTYPE=${LC_COLLATE}
-		emake check
-		export LC_CTYPE=${old_ctype}
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-14.4.ebuild b/dev-db/postgresql/postgresql-14.4.ebuild
deleted file mode 100644
index 9e6e14b865be..000000000000
--- a/dev-db/postgresql/postgresql-14.4.ebuild
+++ /dev/null
@@ -1,462 +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,10,11} )
-
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-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"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm lz4 nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
-)
-lz4? ( app-arch/lz4 )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	local myconf="\
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with lz4) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)"
-	if use alpha; then
-		myconf+=" --disable-spinlocks"
-	else
-		# Should be the default but just in case
-		myconf+=" --enable-spinlocks"
-	fi
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
-		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
-		local old_ctype=${LC_CTYPE}
-		export LC_CTYPE=${LC_COLLATE}
-		emake check
-		export LC_CTYPE=${old_ctype}
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-15_beta2.ebuild b/dev-db/postgresql/postgresql-15_beta2.ebuild
deleted file mode 100644
index 0207dd4f4251..000000000000
--- a/dev-db/postgresql/postgresql-15_beta2.ebuild
+++ /dev/null
@@ -1,464 +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,10,11} )
-
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS=""
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos ldap llvm lz4 nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib zstd"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap:= )
-llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
-)
-lz4? ( app-arch/lz4 )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-zstd? ( app-arch/zstd )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	local myconf="\
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with lz4) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_with zstd) \
-		$(use_enable nls)"
-	if use alpha; then
-		myconf+=" --disable-spinlocks"
-	else
-		# Should be the default but just in case
-		myconf+=" --enable-spinlocks"
-	fi
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
-		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
-		local old_ctype=${LC_CTYPE}
-		export LC_CTYPE=${LC_COLLATE}
-		emake check
-		export LC_CTYPE=${old_ctype}
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 5645bb98be38..cb3e95ac82d0 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 0034503c498c..617dc5c2f102 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -6,10 +6,8 @@ AUX aseprite-1.2.35_shared_libarchive.patch 5056 BLAKE2B b681461ccc86889fe387fe0
 AUX aseprite-1.2.35_shared_webp.patch 3815 BLAKE2B 4d7b5e66c2f8c6a53e8f35e0373ac224caaad3e1da927e1e8979d23e9106f49c8f105bd100aea06ca49b8ad5d2bbf5b868725eb9939b46fc5f69453246b1752f SHA512 b4a452b1ab1f94e4b47d0f567a7d9f35ffafc477372479701a3ba5ce2cf9860751f0f6db2d30eed9911a24959e07c2c1ba6c919f863248dbccd35b07b111b6b5
 AUX skia-m102_remove_angle2.patch 644 BLAKE2B 11705c6376ad85303b8d64e6046e6e31191774d940458ddc64b8bf2d2e998168d3f1c8cd4361d623c040a03fd948ee4e0b6189c774522ae255cd0f2f572bf4c0 SHA512 bc587d92286528cbaec140a0492d5381a1dfce8263e4a2c2231b1e28778e3e5919b3896ccae416faa1b39f34517b6ada77ccaf671d25ae7d3c552a7991f5bb45
 DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e
-DIST Aseprite-v1.2.35-Source.zip 61972632 BLAKE2B f9e24d04a19756f65041cb9c96a4142fe5078a4f6d8b48f69e79501822ff8a5070f350cf9016e5500fec5aeb82d4d8eb2c8d8b42a73fd8bc73aecab185d002fe SHA512 2577a683516adc9c601300da15e9099d6fa698fec32f4b62ce95c46412c1dd26b0538cc23996e0a1060ac4a4de47c2538124c4a01ade375f3b4efcbc99fbbdc8
 DIST Aseprite-v1.2.37-Source.zip 61977600 BLAKE2B f904e5f2a296fa5dae6dedb7b32d5249a8cda64e3b545057e9c033e3e428f050ee128b4f96098a655d871339a77b48d7be58fdad8edffd252d8bbd7b80d0db5f SHA512 c846a6bd6f11bea18e49146cac735a165c6ab7ca63f76b3dfaf7c1f64ddc6719804bfbb340e05ecb75a171b12db9a6a0444b26782d31a84cc810b7266843b0e9
 DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz 53944562 BLAKE2B 9da3e8386cd7a18a6ee9362743bee4146c41038af8868a6f5e8a2dce468e4dc4669b488861d117da8d1bd8461b2ad47bfc300774a33a84153bca345d63a929a7 SHA512 9ae0032ee3861ce4958af6eb7047273d28b1faa3823576ef568e3c7faed7f49a9976540a72c3fa38234a4ae6319ac381324eff807938f9763781fd33ad67d075
 EBUILD aseprite-1.1.9.ebuild 2751 BLAKE2B 6c5780619c95e893e181291c0fbce2f826f8ac6ba2cc559fd33c1461432e2498461f02496031b0ffc50bd974dc64ae47301c4546d600c823d809a7f162c74e64 SHA512 4178e2fb7f9c8b6b267cae0bc83d9887718057c99c4f6dd9acf7c2f41f484e463e75df78a60fbd7f8699de5ae2ee221e476148bf2bb5e93e7c064b66f6b1ac2e
-EBUILD aseprite-1.2.35.ebuild 4953 BLAKE2B 486a36e9842834b2459fa6c01d17746662aa8c12bbd14ec1fa93492b98abce1dc74826ba4493a08aef4319f8fe7f34590aa29833eadc355efbccb43554e7e2a3 SHA512 0c2714d682069e7f1c47b1a080316f7428069fdce440c4b1a8df15084787d44711489a969e510c4812527d994273a5a89de25a9cdae8e07b701c3470e1d747df
-EBUILD aseprite-1.2.37.ebuild 5009 BLAKE2B 087c4b8a07e01b7b402ff0ec2df173eaeadbc5fde0066707ec7857b9ba8b4a8fca0216266bc556c700957ce1502bf826363a08d01cfc9cc3961244bb80b2ecc9 SHA512 3acc1898ae9f7db9000a572442bf37fc5cb2557924e5f1c3727ff65655ae59294ff3735bacaa3bba39899375a63fabdc92d429223137af44fe38156a20b79753
+EBUILD aseprite-1.2.37.ebuild 5074 BLAKE2B f2d6f624acc979bf17fe03fd2e01108477f7f68b02a850fb8216d40fd3f38d032d2fe0a1e7ab2fa56c1d25411e508015c3c306c8d326acfdb99dff0ce0cb3a94 SHA512 1620656405836b89f05538359e225ecef2c9563a7444dfbf237c7a4caa2d0c80e683e3ce07adde536de766d4b30ebb720d8f294e556fa43180af6276c607028e
 MISC metadata.xml 684 BLAKE2B a1ad6d72f940738634ce874c50abaadaee4f897a1a694170da97d4403a9fa69383934fff7392c1417b9b954c3c98a4f138a9da1921e01171a8ebf1ab91d9f256 SHA512 a4d1efc2228d170e868d8328d64a8195fec01807ca4a4424e44f55354d57ab1949c827dbadf6b8a2037979fa684cb6445d95feb37a61b4d3ac637620699f9a77
diff --git a/dev-games/aseprite/aseprite-1.2.35.ebuild b/dev-games/aseprite/aseprite-1.2.35.ebuild
deleted file mode 100644
index 701559c4ea4b..000000000000
--- a/dev-games/aseprite/aseprite-1.2.35.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop ninja-utils toolchain-funcs xdg-utils
-
-SKIA_VER="m102"
-# Last commit in ${SKIA_VER} feature branch
-# Don't use skia.googlesource.com, it produces non-reproducible tarballs
-SKIA_REV="3338e90707323d2cd3a150276acb9f39933deee2"
-
-DESCRIPTION="Animated sprite editor & pixel art tool"
-HOMEPAGE="https://www.aseprite.org"
-SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip
-	https://github.com/google/skia/archive/${SKIA_REV}.tar.gz -> skia-${SKIA_VER}-${SKIA_REV}.gh.tar.gz"
-
-# See https://github.com/aseprite/aseprite#license
-LICENSE="Aseprite-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="kde test webp"
-RESTRICT="bindist mirror !test? ( test )"
-
-RDEPEND="
-	app-arch/libarchive:=
-	app-text/cmark:=
-	dev-cpp/json11
-	dev-libs/tinyxml
-	media-libs/freetype
-	media-libs/giflib:=
-	media-libs/harfbuzz:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libxcb:=
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		kde-frameworks/kio:5
-	)
-	webp? ( media-libs/libwebp:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( dev-cpp/gtest )
-	app-arch/unzip
-	dev-util/gn
-	virtual/pkgconfig"
-
-DOCS=(
-	docs/ase-file-specs.md
-	docs/gpl-palette-extension.md
-	README.md
-)
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}/skia-${SKIA_VER}_remove_angle2.patch"
-	"${FILESDIR}/${P}_check_colorSpace.patch"
-	"${FILESDIR}/${P}_shared_libarchive.patch"
-	"${FILESDIR}/${P}_shared_json11.patch"
-	"${FILESDIR}/${P}_shared_webp.patch"
-	"${FILESDIR}/${P}_laf_fixes.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# Skia: remove custom optimizations
-	sed -i -e 's:"\/\/gn\/skia\:optimize",::g' \
-		"skia-${SKIA_REV}/gn/BUILDCONFIG.gn" || die
-	# Aseprite: don't install tga bundled library
-	sed -i -e '/install/d' src/tga/CMakeLists.txt || die
-	# Aseprite: don't use bundled gtest
-	sed -i -e '/add_subdirectory(googletest)/d' \
-		laf/third_party/CMakeLists.txt || die
-	# Fix shebang in thumbnailer
-	sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' \
-		src/desktop/linux/aseprite-thumbnailer || die
-}
-
-src_configure() {
-	einfo "Skia configuration"
-	cd "${WORKDIR}/skia-${SKIA_REV}" || die
-
-	tc-export AR CC CXX
-
-	passflags() {
-		local _f _x
-		_f=( ${1} )
-		_x="[$(printf '"%s", ' "${_f[@]}")]"
-		myconf_gn+=( ${2}="${_x}" )
-	}
-
-	local myconf_gn=(
-		ar=\"${AR}\"
-		cc=\"${CC}\"
-		cxx=\"${CXX}\"
-
-		is_official_build=true
-		is_component_build=false
-		is_debug=false
-
-		skia_use_egl=false
-		skia_use_dawn=false
-		skia_use_dng_sdk=false
-		skia_use_metal=false
-		skia_use_sfntly=false
-		skia_use_wuffs=false
-
-		skia_enable_pdf=false
-		skia_enable_svg=false
-		skia_use_expat=false
-		skia_use_ffmpeg=false
-		skia_use_fontconfig=false
-		skia_use_freetype=true
-		skia_use_gl=true
-		skia_use_harfbuzz=true
-		skia_use_icu=false
-		skia_use_libjpeg_turbo_decode=true
-		skia_use_libjpeg_turbo_encode=true
-		skia_use_libpng_decode=true
-		skia_use_libpng_encode=true
-		skia_use_libwebp_decode=$(usex webp true false)
-		skia_use_libwebp_encode=$(usex webp true false)
-		skia_use_lua=false
-		skia_use_vulkan=false
-		skia_use_x11=false
-		skia_use_xps=false
-		skia_use_zlib=true
-	)
-
-	passflags "${CFLAGS}" extra_cflags_c
-	passflags "${CXXFLAGS}" extra_cflags_cc
-	passflags "${LDFLAGS}" extra_ldflags
-	myconf_gn="${myconf_gn[@]}"
-	set -- gn gen --args="${myconf_gn% }" out/Static
-	echo "$@"
-	"$@" || die
-
-	einfo "Aseprite configuration"
-	cd "${WORKDIR}" || die
-
-	local mycmakeargs=(
-		-DENABLE_CCACHE=OFF
-		-DENABLE_DESKTOP_INTEGRATION=ON
-		-DENABLE_STEAM=OFF
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_QT_THUMBNAILER="$(usex kde)"
-		-DENABLE_UPDATER=OFF
-		-DENABLE_UI=ON
-		-DENABLE_WEBP="$(usex webp)"
-		-DLAF_WITH_EXAMPLES=OFF
-		-DLAF_WITH_TESTS="$(usex test)"
-		-DFULLSCREEN_PLATFORM=ON
-		-DSKIA_DIR="${WORKDIR}/skia-${SKIA_REV}/"
-		-DSKIA_LIBRARY_DIR="${WORKDIR}/skia-${SKIA_REV}/out/Static/"
-		-DSKIA_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskia.a"
-		-DSKSHAPER_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskshaper.a"
-		-DUSE_SHARED_CMARK=ON
-		-DUSE_SHARED_CURL=ON
-		-DUSE_SHARED_FREETYPE=ON
-		-DUSE_SHARED_GIFLIB=ON
-		-DUSE_SHARED_HARFBUZZ=ON
-		-DUSE_SHARED_JPEGLIB=ON
-		-DUSE_SHARED_JSON11=ON
-		-DUSE_SHARED_LIBARCHIVE=ON
-		-DUSE_SHARED_LIBPNG=ON
-		-DUSE_SHARED_PIXMAN=ON
-		-DUSE_SHARED_TINYXML=ON
-		-DUSE_SHARED_WEBP=ON
-		-DUSE_SHARED_ZLIB=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	einfo "Skia compilation"
-	cd "${WORKDIR}/skia-${SKIA_REV}" || die
-	eninja -C out/Static
-
-	einfo "Aseprite compilation"
-	cd "${WORKDIR}" || die
-	cmake_src_compile
-}
-
-src_install() {
-	newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png"
-	cmake_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-games/aseprite/aseprite-1.2.37.ebuild b/dev-games/aseprite/aseprite-1.2.37.ebuild
index aeb7901ac8ac..0848144f77df 100644
--- a/dev-games/aseprite/aseprite-1.2.37.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.37.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit cmake desktop ninja-utils toolchain-funcs xdg-utils
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake desktop ninja-utils python-any-r1 toolchain-funcs xdg-utils
 
 SKIA_VER="m102"
 # Last commit in ${SKIA_VER} feature branch
@@ -48,6 +50,7 @@ RDEPEND="
 	webp? ( media-libs/libwebp:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	test? ( dev-cpp/gtest )
 	app-arch/unzip
 	dev-util/gn
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5c4ead22942c..62bb1ff157f1 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/json-parser/Manifest b/dev-libs/json-parser/Manifest
new file mode 100644
index 000000000000..e7aa33ac27eb
--- /dev/null
+++ b/dev-libs/json-parser/Manifest
@@ -0,0 +1,4 @@
+AUX json-parser-1.1.0-pkgconfig-libdir.patch 844 BLAKE2B 991a915cff64a9a3fd1fbeea36e9a6389272e70d04b25419650b8eaeb7ef13cd568d171a60817dbda4b51f6cfafebc18637ba9adcac8998d2b35a552e8183a53 SHA512 ee83f9b29d81de6fe313055ee53a3e9f9ab20a9fef46b42c155bda78abd687bdf4e834c9dc9c9ca8b76c1556217a9cbdda89b604efe75e7d9c7ba6ec7a1abf8b
+DIST json-parser-1.1.0_p20211208.tar.gz 51479 BLAKE2B 31ce7929c1de829e312dfc855365d8851ad7c2ce31379d3ab4b4937291e2ec367c7692ecb11b781d0647e5dc38008e4e7bd122d9edaafd1c393a1cbf765117b9 SHA512 cbe6690a70ada1906b2c208fcbe03fe5a14651660ece9ba933a3160ea027c6dd9507189e1c63052059c3a00b2e2a59dbc65fa668a287455d438aa4453eecf22f
+EBUILD json-parser-1.1.0_p20211208.ebuild 1560 BLAKE2B 5bf66698ffb5a86c92a104719661d48fd630e99c8305e0c35340975622937dfbf167d6f62aaa4db15b6c7e8e89f473e06afc0d023d4f773a9f012b07be1c1252 SHA512 93837b3872190a84c75d40d3554170c8d57e716633adefaa40000735595b5ecd2b85d106f336050503baa25befe6d27252473dcd57d8d45b8d9ba536a5a34400
+MISC metadata.xml 479 BLAKE2B 8bc63ea5aaacf718ff53ee6ff554a9037ab7344b4bca7bbe3348ac4206a1d76352bcc534c009232c7323ffe53fb65d68b09b9ed773320d59c01456e29c705865 SHA512 8907f69489f48488198a92960b262769c6f85f40bb6acf11860835544fff644346778c2da17a374e1ff43028a2913e76ac133e1ed9816b5f68bee0acb4693055
diff --git a/dev-libs/json-parser/files/json-parser-1.1.0-pkgconfig-libdir.patch b/dev-libs/json-parser/files/json-parser-1.1.0-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..094f8f985dec
--- /dev/null
+++ b/dev-libs/json-parser/files/json-parser-1.1.0-pkgconfig-libdir.patch
@@ -0,0 +1,22 @@
+Upstream-PR: https://github.com/json-parser/json-parser/pull/164
+
+diff --git a/Makefile.in b/Makefile.in
+index 8938230..b7539f7 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -43,9 +43,9 @@ clean:
+ 	rm -f libjsonparser.$(SO_EXT) libjsonparser.a json.o
+ 
+ install-shared: libjsonparser.$(SO_EXT)
+-	@echo Installing pkgconfig module: $(datadir)/pkgconfig/json-parser.pc
+-	@install -d $(datadir)/pkgconfig/ || true
+-	@install -m 0644 json-parser.pc $(datadir)/pkgconfig/json-parser.pc
++	@echo Installing pkgconfig module: $(libdir)/pkgconfig/json-parser.pc
++	@install -d $(libdir)/pkgconfig/ || true
++	@install -m 0644 json-parser.pc $(libdir)/pkgconfig/json-parser.pc
+ 	@echo Installing shared library: $(libdir)/libjsonparser.$(SO_EXT)
+ 	@install -d $(libdir) || true
+ 	@install -m 0755 libjsonparser.$(SO_EXT) $(libdir)/$(REAL_NAME)
+-- 
+2.35.1
+
diff --git a/dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild b/dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild
new file mode 100644
index 000000000000..a551d83b795c
--- /dev/null
+++ b/dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 edo toolchain-funcs
+
+COMMIT="531a49062975d6d2cd5d69b75ad5481a8c0e18c5"
+
+DESCRIPTION="Very low footprint JSON parser written in portable ANSI C"
+HOMEPAGE="https://github.com/json-parser/json-parser"
+SRC_URI="https://github.com/json-parser/json-parser/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD-2"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.1.0-pkgconfig-libdir.patch" )
+
+wrap_python() {
+	local phase=$1
+	shift
+
+	if use python; then
+		pushd bindings/python || die
+		distutils-r1_${phase} "${@}"
+		popd
+	fi
+}
+
+src_prepare() {
+	default
+	wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+	default
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	default
+	wrap_python ${FUNCNAME}
+}
+
+python_test() {
+	"${EPYTHON}" test.py || die "Tests failed with ${EPYTHON}"
+}
+
+src_test() {
+	edo $(tc-getCC) ${CFLAGS} -I. ${CPPFLAGS} ${LDFLAGS} -o tests/test tests/test.c json.o
+	pushd tests > /dev/null || die
+	edo ./test
+	use python && distutils-r1_src_test
+	popd
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-shared
+	dodoc README.md AUTHORS
+	wrap_python ${FUNCNAME}
+}
diff --git a/dev-libs/json-parser/metadata.xml b/dev-libs/json-parser/metadata.xml
new file mode 100644
index 000000000000..4580bd57e5b3
--- /dev/null
+++ b/dev-libs/json-parser/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">json-parser/json-parser</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9b4a72350c6c..fb8ef42b17f3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/commentjson/Manifest b/dev-python/commentjson/Manifest
index d9aaa02cf550..33227a2df20f 100644
--- a/dev-python/commentjson/Manifest
+++ b/dev-python/commentjson/Manifest
@@ -1,4 +1,3 @@
 DIST commentjson-0.9.0.gh.tar.gz 15297 BLAKE2B a857b0fa5551079d3d37bff94fb51a903e998c4fb84e0f62a5de28d6eafe0cb8a38b3215515e72c56de0cddb661f109921c801d15b9ba93771290135adaaa5b1 SHA512 cd3d28adecbc445ed3faed7847c65a23829f408cf8aa3fa85544a0f0cf9fa5544b8aff560725cf51921f249123daf9ce9953069e99ca64a312bb4bff652512fe
-EBUILD commentjson-0.9.0-r1.ebuild 801 BLAKE2B 30814ef36f082d6ef81f6210a6cab42978ab9190b8e9429f2640e08eac366455b5a8c17850aa2f42d643de2379910461fbcd89f2e5661cf6d94695f2456d1e8a SHA512 f64e4338cf9fd7368d8ce7f105a1cbc434a94abbe14936fdf9d822ec4f7246748f757bdfe4a759674bd89dda12b1a1a78eff991fa580273ef579c8ab724b9314
-EBUILD commentjson-0.9.0-r2.ebuild 834 BLAKE2B 3a4ff6d2b348a599b0b3f83a34e5d01030885823d5567741af7e67495c558aa1382f6e301efddf0cb7bf6dd1dc4550023d4baf3f3b0d7b8bcbfac1323d3dfacc SHA512 ab2b455524a7c07ef216f3da01deceaf24aab288dccf6b450700db298f86d274c8b89839449e0f4e33ba887cb81bfae19d2ea4d4e9bec1fe61df9263eb7c912d
+EBUILD commentjson-0.9.0-r2.ebuild 833 BLAKE2B 0a6fc2db30e1331425f82d9afeba2f8faed6d4bb6bca6127d24a4a262f46ac00601c454ceea7377a0b023631a6d64a16dd1b276d5961a3ca5b23c5092c3723fa SHA512 13a61376d021c7b943ad2398e9b03028d387081ac68c94070d24492d3c392176ca509de561b1eecc623ee0cc994d279699e74593ba2e0b148ccfa03fb36dfa4b
 MISC metadata.xml 375 BLAKE2B 7391dadca9ed1ad8c62515f56347a04fe099c5020b2cfb5d6037e1057199f20a9a512c90800f81186bced7a8ff3f192b36e8c83d7d5ca2b961ea5f5a0e799e80 SHA512 005e5180f3f69d3c162b5ed113840494e0afbc9c09b5c4f02bad97ed7bf5a77e4b7806462f9c7aa3ca72d5d963e5d4b85a591e6e557742685c5738d66214915e
diff --git a/dev-python/commentjson/commentjson-0.9.0-r1.ebuild b/dev-python/commentjson/commentjson-0.9.0-r1.ebuild
deleted file mode 100644
index c90432d94b96..000000000000
--- a/dev-python/commentjson/commentjson-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Add Python and JavaScript style comments in your JSON files"
-HOMEPAGE="
-	https://pypi.org/project/commentjson/
-	https://github.com/vaidik/commentjson/
-"
-SRC_URI="
-	https://github.com/vaidik/commentjson/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/lark[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# remove lark-parser dependency to allow painless upgrade to lark
-	sed -i -e '/lark-parser/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/commentjson/commentjson-0.9.0-r2.ebuild b/dev-python/commentjson/commentjson-0.9.0-r2.ebuild
index 022ad09cf609..2876eb66257a 100644
--- a/dev-python/commentjson/commentjson-0.9.0-r2.ebuild
+++ b/dev-python/commentjson/commentjson-0.9.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/lark[${PYTHON_USEDEP}]
diff --git a/dev-python/confuse/Manifest b/dev-python/confuse/Manifest
index 75428dac0d24..1e8735fd2c51 100644
--- a/dev-python/confuse/Manifest
+++ b/dev-python/confuse/Manifest
@@ -1,5 +1,3 @@
-DIST confuse-1.7.0.tar.gz 49171 BLAKE2B f102ed445d4fc259739305f745fea6c1fef90fe4d8eb7b77bb6c370d37929807478df86ad78ffc8fc2fb1d4cd7033d76e34d880d6dab6721b5fd6cc0e7f5d02a SHA512 0da6cb237aa31f63cf6d2df2e90eb27e7b1a81bd126546a4314425b9dc1d9f993232b4787815abaf7ef4b54ef03ac3286c321e6654fdf18f05f92aa69c3da78e
 DIST confuse-2.0.0.gh.tar.gz 48269 BLAKE2B 58b96ab65da7b48236b798ad5546a72f0f74934c42525b26b44c0aad08ba4de385dbc2dd6915a4b570b1c4e59003e23119f0da80cf84b1bbc88abb9f72d4d8b1 SHA512 53732ef24903bc464f4cda0c9a2728814ff286c2e2a2150b4703b61f925d5bf77d75b98469a4fb92267caeec736e51d33285264f3fd8daa4adaaf23fa9511733
-EBUILD confuse-1.7.0-r1.ebuild 594 BLAKE2B 295b99da58291a2204b9e00390199e6ae9363f2f24d60915c8fb6d77c5a14244a3deae45f55d1cd7fc649c0db688e05c7a19008d7b4c808acca15036ebc75089 SHA512 96e9a82f7c60ab27435a4385d559497805b5548ca51b4bef56ad307cdbf4034f7f39042b32618d3d5a11f8e6affc4b7ae2f72f88420f752660166981f74aadd9
 EBUILD confuse-2.0.0.ebuild 641 BLAKE2B 7f1ade52797c1170067fa649173653bf2da9a481a5e1eec1c7bdcbcf67a266777ce913ba1b1f3693590b689fb46a3cb3404a1f84bcd3b9ebf547a57791e20108 SHA512 4546a97dbf9166f7b6a7f637b0f1703c314533814ece2c75bcae38dafca66caffebbbf5ebec00850499d3d2ada928c91b4111616bd4d498b817021622d08a6f8
 MISC metadata.xml 878 BLAKE2B 2c3a52104c43764bd91ab68c7706013373ab30fa0fdb447bd5401f986ac242b1935268ced5fb70657d44ae2539758b81f8956eddcb0656c7dee70be292e240f8 SHA512 64f959d0ce18e4fb412f482712101117f8f824f333c0befce184e736b52897dd105a0d9d71d65eea57bb21d724e2b69661f9efcaffa36536c61d9c6ae2d2a522
diff --git a/dev-python/confuse/confuse-1.7.0-r1.ebuild b/dev-python/confuse/confuse-1.7.0-r1.ebuild
deleted file mode 100644
index 865cf80bbc1d..000000000000
--- a/dev-python/confuse/confuse-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-DISTUTILS_USE_PEP517=flit
-
-inherit distutils-r1
-
-DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
-HOMEPAGE="https://github.com/beetbox/confuse"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	'dev-python/sphinx_rtd_theme'
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index f7604cb8718c..dd5b72afc016 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,3 @@
-DIST dulwich-0.20.44.tar.gz 425226 BLAKE2B ba120c682b0fd298a9f17eec524ffdd92af9024e30d0b8c52accda3ef8a1d4876b483e8aaa5f12b4beb73a6c1719ed4504c52396cd355244ab688ceab551faaf SHA512 124a3ae89abf5df9e192919f916012be67112195fc7cfd7c30e814a04d93749a3dc396e12f2d8df1456b113a24cdd1b2f3a1f2733864d5cfad22431a987c25fb
 DIST dulwich-0.20.45.tar.gz 424373 BLAKE2B 4eb6731312bd8bb45d35efdc1e640dd2cfb118b633de461c4f9ffa2a9e50258bada2c77b4d4bf2e72bc9947f143f89fd720e4e9411f0f84d67ab208f39f7b4b8 SHA512 5b7217fac88a84591e42db2cd3c812a0aae6482221e1da9474df9b3fd968a80b653353fec804103f36a29f0f96e650267f124575a260dd082a3106de5f13fc7b
-EBUILD dulwich-0.20.44.ebuild 1644 BLAKE2B c27c433faf91999c3a52391cde1bd690c19edaf77b12f5b7fbccb9c5c9c52f2cd7ff0bb1ee162991738ff46d8ab892b10d4590c3b2f6f0aa653b04a2dcbfdd0a SHA512 bd78b84c26d625706bffcecd4fa3cb187746392df0366f4107262628034dbbe7095ea9a54fc9d826acaa8ce315c7c5ec33d62a5b7c2e85d58c77d75504caeea6
-EBUILD dulwich-0.20.45.ebuild 1646 BLAKE2B 6d7f8051b9cd3ccdb2326adf4aacc2012be693d4d2c0b8a38a18b42cafedf1dd21d65c4cd7b969ef7aba004b0ddb4ce5cf521eea214e38fe5cfdaaa636c82b36 SHA512 35c1d73ddb5103a7b6597530d2c22841c8a6f1e01b045f13d32404a5ea41b7c530450d0178a588db781a8739f6ec0dc49be053ab1268e28d777d7795ffc5c8b4
+EBUILD dulwich-0.20.45.ebuild 1644 BLAKE2B c27c433faf91999c3a52391cde1bd690c19edaf77b12f5b7fbccb9c5c9c52f2cd7ff0bb1ee162991738ff46d8ab892b10d4590c3b2f6f0aa653b04a2dcbfdd0a SHA512 bd78b84c26d625706bffcecd4fa3cb187746392df0366f4107262628034dbbe7095ea9a54fc9d826acaa8ce315c7c5ec33d62a5b7c2e85d58c77d75504caeea6
 MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.20.44.ebuild b/dev-python/dulwich/dulwich-0.20.44.ebuild
deleted file mode 100644
index 8d39b956a1f3..000000000000
--- a/dev-python/dulwich/dulwich-0.20.44.ebuild
+++ /dev/null
@@ -1,59 +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="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/jelmer/dulwich/
-	https://pypi.org/project/dulwich/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? ( !s390? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) ) )
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.45.ebuild b/dev-python/dulwich/dulwich-0.20.45.ebuild
index 9a4626b476d7..8d39b956a1f3 100644
--- a/dev-python/dulwich/dulwich-0.20.45.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.45.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index 74aed748aa96..2aa78a5280d5 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,4 +1,3 @@
 DIST html2text-2020.1.16.tar.gz 49464 BLAKE2B f0331daa63b9e5d7508e0446e19b4dd4d05e5f7af0279efd71dc43b633f8273666189899a27cb598e8afdd5bd8ffb3d566b97327d82870ef44a81310d8e7e7c9 SHA512 14453c98e81d05afb3241b04a9e50caf63e4b6f857337b4bd9f53e6b8fa7146aa6a1f4f64777db9fa350316b19fe62a0033dce5748191ca9fbd17a8757002855
-EBUILD html2text-2020.1.16-r1.ebuild 697 BLAKE2B a60d2cc00a4af95494784763d4e0d1d7c1548c85112d53d38e641ddb2128636c99dff3a2d64c9da348fb46967db574a462db644247e1edbd196b5838390a1670 SHA512 67925501194270fd7bf0d998cc3f2d699c7b7c7bb22eda8df57880d46ee6d5c8931354863a2c6cd96ad36268378777e404428839f6b46a9f9d74a857cf701710
-EBUILD html2text-2020.1.16-r2.ebuild 720 BLAKE2B 67102c344a9f189efbd031e5c3c28197144ad59febbaecc82ad3e7581e302b7b69960522cfcec1d49a5fb61c8e0f757ea3f48cc3ad9337140fc7f72abbcbfa1c SHA512 76e50ec2de2f6e6b7839ddfe78deffef97a551cd44c09d03a428c8c189d6db714ef070471ce87b3a60bcea3f3fa10abd9d5d40b800ca1e091c2ba560c4d4adf1
+EBUILD html2text-2020.1.16-r2.ebuild 719 BLAKE2B ffca64d569d7f17791665c9585d0219a8811d47cfee098826ae46f7716ec0eb88f8780e94bb58200622b9441c870a637d2349c5f813ef5abfece5073ad3253d1 SHA512 1708c28cdde272d7e04fc4f76fdc40b5ef4a010c60d65856e8008955d213669f8af34df468fa152d164e209f4d38574a9fa239f46344d54f6287074ddf805b23
 MISC metadata.xml 394 BLAKE2B 45ca69b813241875394c5f6ac562bf6515671e22f8c802ab9197c37a7ef724fca96f8db7b5cccd5849da8f76be3a3f59c87801faa1acdd7eb908b196e6b39f95 SHA512 8a9c8941e6ab54fd5936756ba9f851d79ea3effa70cd8bbbcb05487c31e50cec6c072fe61d6fdffa009e754d1014676b06b1778daee82ae7a110f3ad9663d970
diff --git a/dev-python/html2text/html2text-2020.1.16-r1.ebuild b/dev-python/html2text/html2text-2020.1.16-r1.ebuild
deleted file mode 100644
index d45328eb58c1..000000000000
--- a/dev-python/html2text/html2text-2020.1.16-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.md )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# naming conflict with app-text/html2text, bug 421647
-	sed -i 's/html2text = html2text.cli:main/py\0/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/html2text/html2text-2020.1.16-r2.ebuild b/dev-python/html2text/html2text-2020.1.16-r2.ebuild
index 477c53bb1dc5..7e7517e4c0a9 100644
--- a/dev-python/html2text/html2text-2020.1.16-r2.ebuild
+++ b/dev-python/html2text/html2text-2020.1.16-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 
 DOCS=( AUTHORS.rst ChangeLog.rst README.md )
 
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 16a65d1d7d7a..2e99575fa3e8 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.logging-3.1.0.tar.gz 11801 BLAKE2B 858f0930b7e04ea6f1e3d13b3d7be1056ad9efa901857ded3759e450e151c8485feb1cb6eb91c8ebf7be53c649bc818759009394b20f606fd5551c82ce0d1e61 SHA512 ce9a9cbad6d6bb448615eac986d361f9c6ff477b1209e85433f12a49055a9e30125cd49bebcf915a08b8efe0732439a8e1d336e63f6454369b3e846a9a1383ba
+DIST jaraco.logging-3.1.1.gh.tar.gz 10804 BLAKE2B 32d978ae8e9105986926649dcccd710aea44e2b8ea2f4b41dfdb6cb6512cc8597951909c4e217d608245fb37b29ced544429b4f960d080f5a3436f454d042826 SHA512 80cca221c713b3868ac06332451c2bf31cb3c95e27b82275a8cd70533cd790b4e420a5851c0a5ba067a85aa4efa266e38e2b5792e2a0e97fde158357b16b1794
 EBUILD jaraco-logging-3.1.0-r1.ebuild 880 BLAKE2B fada073312b4879907072a0d50f8a501270b2f74af659a58774035b47df604db81505c479e47077ec96ad2a8333de29aad5f264582437cc1605f83081a821cc7 SHA512 64f87d268fccc8af8568e41c86fdf1e5a6b53915e28fa1da6e47116d158d8f2e30f05ee698482cbc355ca9a45f2136e40211d393f6a621a5ef4814474cc9b7a2
+EBUILD jaraco-logging-3.1.1.ebuild 1025 BLAKE2B e995dcda723f49556c24be168960ed294278ff17bd2395730d72d0cf50546c1f9c48f52c0f229c4274f75240229fcc6d71bf5027e77a6cc8087071146e6b3445 SHA512 988df2e286a80b79aaf7c2f6c60902f408a46506caf6a58ba070e49667a0ad78b3900bed7ce8b389b747707caa7e6d0c569ea3cd61b70183e1c313461d0e998a
 MISC metadata.xml 578 BLAKE2B 1d5b2ffc158ad19270346831bfad35fb36b8cdbd73d6175b0e007ab4dcc7872f09acca21897f9261669a7bb5633abbb2b19fa4018960bf094018f4e31e20f05e SHA512 387e591d4ea4dbb900d7e06f67a8cbf95d99adaa80da80620751eba04ac28ba8b0c5695ce9f7e246b3ebb03a855cc2ba86c8793acbabacb95403255fb8d03905
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.1.ebuild
new file mode 100644
index 000000000000..7c8eaa3c8628
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.logging/
+	https://pypi.org/project/jaraco.logging/
+"
+SRC_URI="
+	https://github.com/jaraco/jaraco.logging/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# create a pkgutil-style __init__.py in order to fix pytest's
+	# determination of package paths
+	cat > jaraco/__init__.py <<-EOF || die
+		__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+	EOF
+	epytest --doctest-modules
+}
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 5f46807ab38d..e810cdbc0a10 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,5 +1,3 @@
-DIST kiwi-1.4.3.gh.tar.gz 91238 BLAKE2B bdd6164eb428e6769ae7de2a8e689a3944e13e81aef9a839d9f68459deb7e7c0840b0eb59e70932e5c1d835444c515c8cb66fa47f40d8fc6244de47852be57d6 SHA512 04205555da46e772f2d25a481c4d966dc7bab8a541434a7c183e1b4f41ccd6e06aec564f2a95dae649585d337c1bf818a7cf24727460ad14669a3b3d74c74274
 DIST kiwi-1.4.4.gh.tar.gz 91343 BLAKE2B a5e345509e7294eaf89e1361c035b3ef5d672d335682dbb426196d22876762b1f729cc728300f731a42afbfdf2828591f83cc53daf28e8d4c451a1b246b4800f SHA512 9a7ed487bb28f8c430543dc21ea59156078c129fd29b1382f1578368e72f312f4e813eb4501e4c9387647b42b085b93d4bd27d0e846f1396fa4ce68fd9e9ba5f
-EBUILD kiwisolver-1.4.3.ebuild 828 BLAKE2B 9723e16905b4d74ed5036eae21019a412263764522e50851317ead1287520f57cd288b90f2542b56ec18a1dbbbe4ffb2385f35e53ebcfa037eb2db7b345028fa SHA512 a7fce21852cdd18559b7de5ed80e48d2640ca573b4594b907fdac75138ea723de5d4af98c0ac07c59f1c2b4f866fab897a59424c982875616c00c0d867c37986
-EBUILD kiwisolver-1.4.4.ebuild 870 BLAKE2B 876d7122a353ec908317b41042771902b8cbc27678f6c57a354118953a6b7e5b8950a570802bb2a285c9505b399cc1d5ead10c310070c229330244366cf6cdc9 SHA512 e10b3c167f5bddb3b694ab9836a093c960d823de1c7751dff08f3dbc5341e9f753f145af6545ada87057f3e06d98df51719a42794e5c1ff3bf539c764c2ced8d
+EBUILD kiwisolver-1.4.4.ebuild 869 BLAKE2B 18f061e8aa0c604b466a560101f83c35782fb81b1d7ea8731b4bc7534b499c05159712c062ac40a9ec643274199819e4856c459f2f8351ceff92f7608dbada18 SHA512 8012b3da214ccd3febc174bd8cee1142b7ab8c4e5027a472b07a58d65fd38c33a8f3fc2d5d71f0d5a39b5e4c7858ce4ddedb74e9fb4aff6027aec3c0d8d56722
 MISC metadata.xml 366 BLAKE2B d724248e9950219de4990e67822a16781e1a28f41d863fde04b3e1212b982a86819636a621b6e23089b76042ebbb23e0944a88ef9ab4c4abe62103f12197e5c2 SHA512 526fe3a81426edfc4c050631133799d948d1becb016319e954491090b9f3f6d410958db7027b5c2e2386b40c783f8c984b2588cda56e3ac58f3d2b1a5a8af0f0
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
deleted file mode 100644
index 611d0160aa2c..000000000000
--- a/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
+++ /dev/null
@@ -1,37 +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
-
-MY_P=kiwi-${PV}
-DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
-HOMEPAGE="https://github.com/nucleic/kiwi/"
-SRC_URI="
-	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-COMMON_DEPEND="
-	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild
index 566c2ff32009..a49ab8f01ff0 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 COMMON_DEPEND="
 	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 1f2183b182ec..d9126fc64a02 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,5 +1,4 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
 DIST netifaces-0.11.0.tar.gz 30106 BLAKE2B d531cec80142d005548ad30f4d13b23d0a7aa85f6907998bdc6d6081567234b169774b25d2e274d14e68564b16e96ff016c429c0a7aefabd6abae6994f1e7c5c SHA512 a53110efb78c89c4d72d002104866253a4c085dd27ff9f41d4cfe3811cc5619e7585ceda4e91e83cdd0645c40c745c61d205708ee9a34427b35f437a48f148e5
-EBUILD netifaces-0.11.0-r1.ebuild 684 BLAKE2B 07789dc6bb5608b91bfbf9795e07530d3043d7990fc30dc0163c5fbb5dcf74487243f81c8fc497f2cdcb20e69218eb1e3078f74743a4b6b3600bfba88e9a5e79 SHA512 157fd8f00fdb076a24abb1c44522d70703c730c064e262365167fb7f33a4f17ff4b0818e7bcad4b6d1145a9ad06771cd0001046a5a36dc8b2745099eb11edb4a
-EBUILD netifaces-0.11.0.ebuild 572 BLAKE2B bedcff6df8d62dac261911249984dbe330eb34d708118ec6e0890ad967d0e0e009de5773d16d7c1e2d99e832446d848dfb44085b6bcb1c347b2a69094b470435 SHA512 53f372d542e4ea80af0af7ceebcccbf75c3dcf31d2a38333ebdfdf0d85bf90d09a796866e969762a88a58831f592e1c8e696caf1db0416628505850c7b226ba8
+EBUILD netifaces-0.11.0-r1.ebuild 683 BLAKE2B f9e8dd19455da29568dfae68e9845be0c4ebcfd3ea4dc328e1ffe153edc864d786ff4518eecec7a9aca3e7273aba45c39472db1a8addd1a170b7d608867c9cad SHA512 49dcbddc3ed7dcd058cfd2edee8c4cb09971e7ec43a9651115124cbd7f7bb8f28810dddd180c22f3ffbbb897a6e53cde8a731cbcccff3df04a84fece24a60a64
 MISC metadata.xml 451 BLAKE2B 4d43f77c5e911cad7a8bdfa7cee80c553a645abfce7c551f1d819a62193e1263bf28d70c47d14f05ccbe9155ab08dae49c18cfdafdbd6c5705eab28e5c717258 SHA512 abf26a0026b93acfb3d81979694c13b2298bf09d410fa85994c9406a4e0219c1ee8d83b4814323cde287d27fab2526682df48238fe5db35ef93c4c3e0c0e068f
diff --git a/dev-python/netifaces/netifaces-0.11.0-r1.ebuild b/dev-python/netifaces/netifaces-0.11.0-r1.ebuild
index 43ae78b6dea1..da5a4e46cc0d 100644
--- a/dev-python/netifaces/netifaces-0.11.0-r1.ebuild
+++ b/dev-python/netifaces/netifaces-0.11.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
 
diff --git a/dev-python/netifaces/netifaces-0.11.0.ebuild b/dev-python/netifaces/netifaces-0.11.0.ebuild
deleted file mode 100644
index 5beb4380a339..000000000000
--- a/dev-python/netifaces/netifaces-0.11.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Portable network interface information"
-HOMEPAGE="
-	https://pypi.org/project/netifaces/
-	https://alastairs-place.net/projects/netifaces/
-	https://github.com/al45tair/netifaces
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index 5f379f39d1d9..37455f3e8704 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,5 +1,3 @@
-DIST osc-lib-2.6.0.tar.gz 98452 BLAKE2B b22bcce4a0cdc787422f4fa2d63cae8a289801f5e04bbb2623f261017887e936d2514016ee38aa5b2e4f6e87f137f1d9f59a289b589cd0d6ccce21c54065ccd1 SHA512 b97935da923bbd802ba32a70a91084ca60377a0995b1b204053409c87865dda2a88e8bbf9adf3ed6fb05169448a9d1793a9ea00bc0199f17f86201989159621a
 DIST osc-lib-2.6.1.tar.gz 98508 BLAKE2B 26ca0229c174ac17e17a3b3075e5a225add8272fbf6c28fd1cda40acff5c34092bc37ed7e8f4004734c5509213b9a92915c15e9f37e8e032d99f30fb143b7505 SHA512 ed62fe45ed324d2fa672b4d0366df2db0462e6fa40820ee028540afe853e394293d60d72168d09313fd86f204a55784fce7c038ed906a9b2f8b587f4958f3391
-EBUILD osc-lib-2.6.0.ebuild 1459 BLAKE2B 12f71d4a5f7d0915dd65e87c6ef034b6af0617f462aa76e7d679d5cb03ce865482dc9b6e006995115d4b1711a1b480f393fb943e3e6744a3aad15fffe2f78dc1 SHA512 31b8d46bc60e284f28d478443ff3b20473de3e383ef3e054d0cc676f8d47680cf708a8dfaa6e2c01ed63015288e1f18fca955d0c350337ed3c8139576ed2987d
-EBUILD osc-lib-2.6.1.ebuild 1540 BLAKE2B 951535680c1a5ba400c6a305011eb8990d24ef7218ea143f9f5fc859c69c574ff210508fd64eb725e8652ebb3f1f32e79fee154ca25c43da473b14b087047a95 SHA512 be2bba285dc8f96f008bf118f97ee8d3601057d9884aca7c5ea43f00ebdc19f6134c98a1cf1ca8345840394bdd71595c1469c1361c5b3ee754d0e1a23e13f82e
+EBUILD osc-lib-2.6.1.ebuild 1538 BLAKE2B 4b71fc81909f4f651f74a26db01f1b04b195c8adbb79dd29537e664d208cbfe65881d3095ffa3b13d2d7494e6fdaed90adb94f5e95e206632fa86a25643f6cdb SHA512 7d466409a9516dff72a8a5078258d60505e87f5a43a9009586203be6340324af3380b49a26109f25c35e82d64244a11e08adb07267e218c6143f7279bd7937bc
 MISC metadata.xml 836 BLAKE2B de71d2a55a0b65cdabf503321d91f3e708f50189e6a06e11ce96f0d273286e1a6b5a871726dfe33784b91e941463500c964cb85c583241b003d3742b1d91c92d SHA512 e132c2ed9283d65464a151c918ac4ca91793ce850c7bb0a7b63178ddd42cb59b69b036acce0a8d0078f4b1b778a2361ca6a6f6e01d83e12cdc76dd8682b5b281
diff --git a/dev-python/osc-lib/osc-lib-2.6.0.ebuild b/dev-python/osc-lib/osc-lib-2.6.0.ebuild
deleted file mode 100644
index 4b1581252d95..000000000000
--- a/dev-python/osc-lib/osc-lib-2.6.0.ebuild
+++ /dev/null
@@ -1,47 +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 package of common support modules for writing OSC plugins"
-HOMEPAGE="https://github.com/openstack/osc-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# need to skip all tests under TestTagHelps class
-	# checks exact help message, based on another unittest runner
-	sed -e '179,$s/test_add_tag_/_&/' -i osc_lib/tests/utils/test_tags.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/osc-lib/osc-lib-2.6.1.ebuild b/dev-python/osc-lib/osc-lib-2.6.1.ebuild
index 20c842306de9..ddf261a45462 100644
--- a/dev-python/osc-lib/osc-lib-2.6.1.ebuild
+++ b/dev-python/osc-lib/osc-lib-2.6.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 94521a585e85..dd5ac664f3aa 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,7 +1,3 @@
-DIST pikepdf-5.3.2.gh.tar.gz 2886857 BLAKE2B 343006c8123bd814a93d1863442e9fdf80d93ae020ae6b4471cbae640653e74f3652c7c3e32d2e5ec68f5425f24a34543c0d712d78320d46db9bdb8db64ce1bb SHA512 3586a8f33550698d9b49852d741ebea7fd06e3afdbd7f1ed74ba7d9f8bbc086ff35ed964dd065f1e764f6690b3a708440eee97857591829a565acf2f0702ae33
-DIST pikepdf-5.4.0.gh.tar.gz 2891493 BLAKE2B 12aec9e7fe22c9e372886bdf3c32d509f13a92fe0526469445f801ecb3b92d8fb27ad817bee6fc1845a3057d6fe56cfde5712907e9a89fc16412a1528e988504 SHA512 5be5f1d79a4fb9119aa4aed8fd4e0d02f53a7affe39c8b019aad3717b20ec303e8dbd3ac19d57e099c591ea7a29cbaf786b40d5235850f756bc17fe5335324fd
 DIST pikepdf-5.4.2.gh.tar.gz 2901145 BLAKE2B d7559901f59e5bd08ef660b88a4e9d50ac1bb64b397bcd56c1ed707ea7c0d9eca61d7ffe9e98361c01f3b71b640a9da1376c130fa5dff3324bbe2d64ce267347 SHA512 9afbd565ae82c65f743ffe7dc37509a15b03a1057bbdf4243ebacf4e0d315f9dead31fcd0f8b34023850a4d85aec302c229b1df0f045db4b1a8c171b58732b48
-EBUILD pikepdf-5.3.2.ebuild 1497 BLAKE2B bfc314997a9d893cc6a877bc25948e5a9ca3aabddddf477407cec457161ff47be015f10013bda30b30d5260d8d2ce960dcc7f308208b301b3fbb7d627d4944e9 SHA512 03813c5248d467b201ab6583e7c75a2732f4a16088661b11fee8dae19f37196232b7dcc27f9ce85dfa513d9ad3bdd1d207c4a75bea580ca1dac491db6f0db09c
-EBUILD pikepdf-5.4.0.ebuild 1541 BLAKE2B 56ecc778d49fecd927ccb693ecdf58fb41dc8c9bebb1763e81e6c3ea650c91573ac2ca1fe5b72282fa8e2a9649e3421817a55cfd6883f4ea8cc80a292cb322a4 SHA512 7864f4fbde7cf5fad575091d13e37def859f9ef9cf89050df9add0e395e64f19eedca4cc0503c4310f53056d8d87b8378c6ef89ca39c3e573c4e491a442e01d5
-EBUILD pikepdf-5.4.2.ebuild 1541 BLAKE2B 56ecc778d49fecd927ccb693ecdf58fb41dc8c9bebb1763e81e6c3ea650c91573ac2ca1fe5b72282fa8e2a9649e3421817a55cfd6883f4ea8cc80a292cb322a4 SHA512 7864f4fbde7cf5fad575091d13e37def859f9ef9cf89050df9add0e395e64f19eedca4cc0503c4310f53056d8d87b8378c6ef89ca39c3e573c4e491a442e01d5
+EBUILD pikepdf-5.4.2.ebuild 1540 BLAKE2B a18382fd9aca786167af7ee89ca7fbd17baa0c4e8d0f070581b0b84e21a97a14cff5b706110300493f87a50a0893877741007dc8a59c16db56a988b632a23ac3 SHA512 f0dc8845062d30016a9850ccdc8971c7ec9861d277cdd089926b6a275dfba1d33d4a8e666fe2ce335391f864f4341640bbe79279ed17329d4e91f374482f206c
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-5.3.2.ebuild b/dev-python/pikepdf/pikepdf-5.3.2.ebuild
deleted file mode 100644
index 3e65d8db197a..000000000000
--- a/dev-python/pikepdf/pikepdf-5.3.2.ebuild
+++ /dev/null
@@ -1,59 +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
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.4.0.ebuild b/dev-python/pikepdf/pikepdf-5.4.0.ebuild
deleted file mode 100644
index 0dcfce946c36..000000000000
--- a/dev-python/pikepdf/pikepdf-5.4.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=app-text/qpdf-10.6.2:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.4.2.ebuild b/dev-python/pikepdf/pikepdf-5.4.2.ebuild
index 0dcfce946c36..6f8e5d46da2f 100644
--- a/dev-python/pikepdf/pikepdf-5.4.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-5.4.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
 	>=app-text/qpdf-10.6.2:0=
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 2ec600301645..51782ea6d05f 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,5 +1,5 @@
 DIST pybind11-2.10.0.gh.tar.gz 716362 BLAKE2B d9d3a8a108a303721766b822d43b631396c451c8caea0ec1bd36a97850382cdaec69a4f4e5fb475bc84e2aead050f73b759320a81750a661997870e1a84383b5 SHA512 93112ce530a0652b2b4458a137b4a35f2fd8607f82ad96698ef422128d0b53e16e1d06c239ee4643b821acafae09c74eb0f72bc4ee5584aa9fcdaff4d79980d9
 DIST pybind11-2.9.2.tar.gz 709521 BLAKE2B 76ae9c72faad805885eabbe4dadf1092fe814f04f2a8d834da035c7389dcc996c09a63149911aa7a5c0b70d2da9f7c32e94aaf1c941f13345e0aef40a5748dfc SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272
-EBUILD pybind11-2.10.0.ebuild 1234 BLAKE2B 5a1762efb95dd8d8855346225ff47fe080b316856649950c5449fbf9232a58aa6a03fb99737e20d7ad5b9f16129ce6920f7fa194357f771f63187f5c7a84a3f0 SHA512 902d1950aff7449b760e2aa89022cc2b3e591e3177578d626a5f1d5777a93232d8fbc550a38723e3507112777c5eb456284bfdf58fcf56f4bb715f60c2063603
+EBUILD pybind11-2.10.0.ebuild 1233 BLAKE2B fd81972c767d8d99c9682f2248ddc631f20ee4b29f4f8a40a2b76616d38f549630735a979977188058ff93f9ae9c85da22278388365d5770042f37f0acbacd48 SHA512 a9efa31da4891ff6183bcbd9b5db9d2e47464fc6e1a5c57a71815b8bbf9c056feedb1e9679e2e4c2e62ab83b0adf4c29722c275035d397a2e14a96a924ae8c2e
 EBUILD pybind11-2.9.2-r1.ebuild 1230 BLAKE2B e64837a80f44d0e2f766fce42db1d5e2f1310e9ec83b6139b5f6c316ad5b7bb7b0d0ed495e5f91e2e12ef7c291321aea604af0c919d48b52aa57a6f3115413ae SHA512 102fd9df725323434138f8517de62e5accc4c5cece77f7c9d289d31eac19f6ebeff5b393f6b5a6b22bf4b3f7da81aa0ffefc219ef701995cf3e4a769a2df562a
 MISC metadata.xml 420 BLAKE2B 8a3480ac275b7e2893d696bf4fd0d70f41ea941fab9e24b19d8561c0efeee81024ba6fea0ab26333346f3c176d1a87b35229e31ecefc74de2e7614600a64013e SHA512 8140e933878a75968420deab189bab1decd030b5209baada2857a7659dc32980bbc46678c6612ef56e4b4f6b598579bb8227e6c7fd00fbde63a40eb13bccf86c
diff --git a/dev-python/pybind11/pybind11-2.10.0.ebuild b/dev-python/pybind11/pybind11-2.10.0.ebuild
index 7397d60475f2..4db5d8f3f9ea 100644
--- a/dev-python/pybind11/pybind11-2.10.0.ebuild
+++ b/dev-python/pybind11/pybind11-2.10.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index 83bf1db75218..5fa731bad8da 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,5 +1,3 @@
-DIST pypng-0.0.21.tar.gz 111899 BLAKE2B b4b8f17b76918f415c02edc09a597af643615f46839fb4464f3116e4cefb0a251227f344ff2c1c51efb87933faf647bfa6a7c4d89bc91c8389a3dc71479e878d SHA512 b8f5f9be05aafe59aeb69462b7ccc9e5c4df8eb157731d888773f0ef223dc1c45db83daa51347b45dc3c59be5141c3fc4e031004ac28927b786d7e254ffff4fa
 DIST pypng-pypng-0.20220715.0.tar.bz2 103437 BLAKE2B 4079df64f54a2f7f38ac0515c6be7d1b1048d5662c4bee78d0d1cbc014b3a560c7458845b8be07d499644e112a5b92aac890d887c0165577daeded09ca69a69d SHA512 48e254be1631c626bea366bcac5d8123bda14378d27ee95b4b80ae172821a9b194f136be315ae3539a6d1ad3e712a795f5cc60938b55941e441c64ec40feccb0
-EBUILD pypng-0.0.21-r1.ebuild 569 BLAKE2B 1de3c585d59877e6545f6b5be2573053b16257afdb23e3231bb4765110fabbfade995ed82fc09d67621e4620ca5fdaa50c68590503882b9d603c8f21e1228b7d SHA512 ed805c2c2d1fce00cd47fb815ed005871fcab1511d20764103595fc20fb8454307322ad899d972d3e995a01fe712fa21f2d8f82a6757a3eeabfa0bfec913f089
-EBUILD pypng-0.20220715.0.ebuild 674 BLAKE2B 7cb06fe16da0026e8b7de65e0091c5122cc11d16c3bfc74c31eb0b59c5b44340ec6b3c0c6848bff62d8b0ddffd67aac8f037bbfd59a8c601746670f51a3ca9c7 SHA512 8891b03f4d8d51de8fca55c022484471f41189c2c4b0c60fd7a6b0beca1c422cb6b1b8900ec0038a48df8421582c3848d60d1648f9af37e81027c3cd0dd27d10
+EBUILD pypng-0.20220715.0.ebuild 673 BLAKE2B 92a3a99f9afae97e1af581b3300a0c6bf6a3d5656ca9f5e7bebb0f409ed6a3049e49637e5fd68402596dad88afb1b979296c69a847c4972b5d31e46963534bd0 SHA512 647b3d004c7bac8809b441a7a0ab88e246e06f22ca5f4a47574043803a68218120029aa4ce175442849bed2cd48c8ea64f60ded340e9a2a743abc8afd68c5599
 MISC metadata.xml 451 BLAKE2B 75c7df259e2f4bfceb7b7abf4302169b5b423d9a9818238b06df0b69270a953ea590f4026774c2fbba4aa24c1e100c3ea40aeeae8a0625390f12c8aab1c173c1 SHA512 b7139dd634bc093222cbd6f7acba8f6ed7856c3b84a101cd3f5703b960d52aa9ef9b388b33cd7b997bf32405fb6bd67771663022da254c7a88fab56d515f4758
diff --git a/dev-python/pypng/pypng-0.0.21-r1.ebuild b/dev-python/pypng/pypng-0.0.21-r1.ebuild
deleted file mode 100644
index fc4c27e1f789..000000000000
--- a/dev-python/pypng/pypng-0.0.21-r1.ebuild
+++ /dev/null
@@ -1,25 +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="Pure Python PNG image encoder/decoder"
-HOMEPAGE="
-	https://github.com/drj11/pypng/
-	https://pypi.org/project/pypng/
-"
-SRC_URI="https://github.com/drj11/pypng/archive/${P}.tar.gz"
-S=${WORKDIR}/pypng-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-
-python_test() {
-	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pypng/pypng-0.20220715.0.ebuild b/dev-python/pypng/pypng-0.20220715.0.ebuild
index 5c15c01e1532..cf3a14f8e617 100644
--- a/dev-python/pypng/pypng-0.20220715.0.ebuild
+++ b/dev-python/pypng/pypng-0.20220715.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 python_test() {
 	# let's talk about code quality
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index 620f804708c8..9ddf6f84c1b4 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,5 +1,3 @@
-DIST python-evdev-1.5.0.tar.gz 86384 BLAKE2B 6cb6fb634d974b8ab15722def24037019590f510792fcf2bb64d8c2ffec0871ab4075674eb45a737185e4b42e39d0cd556760d51b13b5a97b79d3ee64cfd342f SHA512 27ceca723a0157fe9efa2f7aad8bb790c63d2b8d399f629eaf11fb387f3ebde0885b2d8a5297492968d625d8d9b186877e074334115e70551a1b121c8864339d
 DIST python-evdev-1.6.0.gh.tar.gz 86212 BLAKE2B bbb9adc3caff31c817972e33cd02ff63ee4e037ebe346fc6b128d119c38b337681bc9ef9069cbe9b604b1ac926dd23a02add23da2f629b31b74b0de338f9f423 SHA512 d3dc27aad70897d46ae3cad71cafdf5ac49e8cb52b88566b004edaee3b192b68093e44b487f9ab27b503a18e8e62a08b17d7b782726658f4d8131aa4562cd17a
-EBUILD python-evdev-1.5.0-r1.ebuild 730 BLAKE2B 887ad1fe48fcd5615d7f56f083902c5bf5b89cddcd3f74ce40acf216083a378c3445297c7615a0c81a27ceade56ae504a689d2e0e347e4c7365e611f9490b104 SHA512 f77b9be830adbd1659f253165ec9933e302cbcc81c9249fd60b34a569c71a9e39d0f7086b5834650ea78840a95edbe47645e1e8e80da6cd16277b5c98730f7f0
-EBUILD python-evdev-1.6.0.ebuild 819 BLAKE2B c0ef9a6a16074592c304679e833dea92ae8a3bc1c32e22051283c81536258a3fcf116b9cd861433b89247b0a2c48e25621d68600f601bbbcb19e9ce6f1e73f63 SHA512 5f77972944159131a3b22e94952fff59f136c5dfd7109528939cd77fc2bd76193e12d6a7fbdaeb9a954879d20720fb64a4bc34b6ebc451fe0f55d901bd3c0eef
+EBUILD python-evdev-1.6.0.ebuild 818 BLAKE2B 4b38e1b3b2e1a921129475839cae0b0fbbe4b4eadf771ddd1fedc265b4afa4dee6f788a0eadb6ba6e731cb846084b18f0f95f7fa8e794848d2e36903f564be08 SHA512 5c5b932e0e23bf3a771463a9ab983d3641cfec7c989c6a94ed4cf804638b4a091509aedc3813c5d99060930de64b743810a9d2979de21dee5844ddc484b59018
 MISC metadata.xml 309 BLAKE2B 6ae01a8430958d20e84fe2de8b8eaeec666b4937a5dc140eed1a90b455f6a17be819e8ae999fe13e1095f2aa9415385ff520fad147318110482390a1aae8419e SHA512 067f19a8bcb3eb7174b9db8c475ca66fbe661a263c8280accd7d05cfd2864605ddfb2660cfd2f146e99266985808b29081a9bff1aef8c8c50303d2ba059c13bc
diff --git a/dev-python/python-evdev/python-evdev-1.5.0-r1.ebuild b/dev-python/python-evdev/python-evdev-1.5.0-r1.ebuild
deleted file mode 100644
index a1df11de9086..000000000000
--- a/dev-python/python-evdev/python-evdev-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,37 +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="Python library for evdev bindings"
-HOMEPAGE="https://python-evdev.readthedocs.io/"
-SRC_URI="
-	https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/test_uinput.py
-)
-
-python_configure_all() {
-	esetup.py build_ecodes \
-		--evdev-headers \
-		"${ESYSROOT}/usr/include/linux/input.h:${ESYSROOT}/usr/include/linux/input-event-codes.h"
-}
-
-src_test() {
-	cd tests || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/python-evdev/python-evdev-1.6.0.ebuild b/dev-python/python-evdev/python-evdev-1.6.0.ebuild
index fcc6d029fe65..86d97a21941b 100644
--- a/dev-python/python-evdev/python-evdev-1.6.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.6.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 2cda2986857a..3ab26ba8da8a 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-ironicclient-4.11.0.tar.gz 220770 BLAKE2B a653cf04497a4df9627ed5026094690d0569dd7d6c55abf3a3223fee8cbc14e450106645ed1e4461cb3931f2ca49c8df47ca9e8e2ec9478cf15fcc0623d19379 SHA512 863429269807f759a864e427206d29a68b7431ce33009e1b6d3a630ab154e66b85b9f61dd90303a681a5ed459005af1686edf056eb9a63cfb6de1f1eda85bbb5
 DIST python-ironicclient-5.0.0.tar.gz 220583 BLAKE2B 8de728995db55d6786349ad390234c02b2dd38cb0119569c3f2af3a88789bae1b9fb6a43300502f083f4c01e75476d707a8b86576b509b4f3dbf750038f915b9 SHA512 3bee0be64daeee1ae3b88f00a3c3bf4a96a0ad10e7c55e60fd5342925e836a753668e32284b64aee4bf9d88b9f4379ad66287516559738b817efe1e815bb483d
-EBUILD python-ironicclient-4.11.0.ebuild 1442 BLAKE2B 091cccb364fd3149797fa0119175c0be1db34db55ddd1be37c7566777fd2802fbf216f7eba59c6e21588d919c4ded935bff74a08497cec771db20e4f605ef262 SHA512 8af3ff0dc6a4704bb04c934235f317d2e69d9a6ca9ab1e2b122055674e71d0ed3da765eaf3bc081d0de522595165a74acbde4c161ac461d4d17c6716f1a5c3a6
-EBUILD python-ironicclient-5.0.0.ebuild 1444 BLAKE2B cdea4e287b563283cdd269bbb0319412922f6cbd22407e2187dd902f7c597f2d1dd182586aee2d466bca070444704264ba1a1905f7ac051ce3891cddcf41728f SHA512 7d0a62f8f30a81537f51af27e8692f3ebc54ec101ae43a2d9df6546388d776550abe7f54596f884b97fce5efadf54f4cc3f4b5536a85ea3ae4fe611bda9a62ab
+EBUILD python-ironicclient-5.0.0.ebuild 1442 BLAKE2B 091cccb364fd3149797fa0119175c0be1db34db55ddd1be37c7566777fd2802fbf216f7eba59c6e21588d919c4ded935bff74a08497cec771db20e4f605ef262 SHA512 8af3ff0dc6a4704bb04c934235f317d2e69d9a6ca9ab1e2b122055674e71d0ed3da765eaf3bc081d0de522595165a74acbde4c161ac461d4d17c6716f1a5c3a6
 MISC metadata.xml 531 BLAKE2B 0dc9961528a2fda61466eace2d8069b75dbb362b32d5adc3f50dd8b6c9daf5bb2690bc145e30d96807cb063c450e98824d783d566c2db96f036cc227f025dbc4 SHA512 99b57932cfbc2fc5e6607b167991964c17376504f07e7d3741900940d512a40a9c5dda73c0f87cc9b3718159d7aced0360831ef9c11ba063d11febda0786f943
diff --git a/dev-python/python-ironicclient/python-ironicclient-4.11.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-4.11.0.ebuild
deleted file mode 100644
index f27563650b66..000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-4.11.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=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Ironic API"
-HOMEPAGE="https://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.0.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.0.0.ebuild
index 39d952acbce6..f27563650b66 100644
--- a/dev-python/python-ironicclient/python-ironicclient-5.0.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-5.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index d250e5fcea89..391d9b759d1a 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-keystoneclient-4.5.0.tar.gz 325120 BLAKE2B 4511cb381ebfc11afefef0dbb7b9962efd2bbb5ac7455386ef4e831459614dfd51570cfaa1be9672936a6ed45d58b9b29e8326830840e80ffdb758089cbab887 SHA512 d3a5034bd05843b733410d4c6fc2c271edb25c837b50ba801031b45a00c0632b4420f2f4dd24dd25e78bf71b5ae31e2ec6b303d85aa4ecea0a89a49b5c67533d
 DIST python-keystoneclient-5.0.0.tar.gz 325208 BLAKE2B 86feea8d226976ee9fc568d10514d56d378727a11fada2d3f7acb1f95a33cbdcef165e8c5add656e53874463d81f8250905753aa03234de9dc87cf8d92213309 SHA512 94010e8a681817cae7c0555968a34102a430366b81393badc7661fd13eeea17e4e82d2065385a41c569c0e6ee89f4ccf3308a909186fbe2d29d7f46c5795d95b
-EBUILD python-keystoneclient-4.5.0.ebuild 1603 BLAKE2B 204392034fee3def14cc9bf20894a6859a81c860088c8e6af9a8a8f7ddbd0cbf0a632260a532dde9df61d44b67940d9d8f2bdca3873a2e048ead5b7c56366a95 SHA512 b9bab09647576f6f20832a8fa8b1fe2bd148704c260de32c725ea62bf5a0c18e95c9fd8b43491938f6cae865169de2495949cd4d1bc38483cf10d79307b94cc5
-EBUILD python-keystoneclient-5.0.0.ebuild 1605 BLAKE2B 3d751c0f9f6a9dae5e686a9242445814909e7f14d1146dddc2451231f6449ec9bbfe98adf711900f7ea974e22c1250fae233ba0de4c58ac73ecc0f6c8cccf3cf SHA512 123cd2608cf0d67b2ff61c5796e95375cfd1d5fcb41d178399159433687eb267c83be6caaac277b13b6a0b308fdd0ebd03eda1e8885196b068f036f38bfab206
+EBUILD python-keystoneclient-5.0.0.ebuild 1603 BLAKE2B 204392034fee3def14cc9bf20894a6859a81c860088c8e6af9a8a8f7ddbd0cbf0a632260a532dde9df61d44b67940d9d8f2bdca3873a2e048ead5b7c56366a95 SHA512 b9bab09647576f6f20832a8fa8b1fe2bd148704c260de32c725ea62bf5a0c18e95c9fd8b43491938f6cae865169de2495949cd4d1bc38483cf10d79307b94cc5
 MISC metadata.xml 594 BLAKE2B effce3a1ff7b31d301f9a597ccc8a7c70854d64aa50f92e5d990deec018f47b8fe7460eeda8c72a032ad713ddf32fcb3d84c9bddead92e5e82c807b5646360f6 SHA512 319bc83641ffbe8bcda7aafedcbb63a95dac3dd9a151a9d9f8c51d5f7a4522bf08b04f3157cae5667cd14ce8c87707e40426bece26c37b5df41845d3dfe90586
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild
deleted file mode 100644
index 97d6d25ea891..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.5.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=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="https://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest keystoneclient/tests/unit
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-5.0.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-5.0.0.ebuild
index 1d319bef1a1a..97d6d25ea891 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-5.0.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-5.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index f92251cf2537..85a0e087654f 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-neutronclient-7.8.0.tar.gz 304872 BLAKE2B 780e1b2942a43bca93888683d1c2e713cfc0927d49135004a6f6d42dff7962def6b0fc7f308b75b4392f4fb5df4d26fcea107b9006d4ba957c0d76294395e5c9 SHA512 3022d79348334632ab3afa142aab11e424b168a4ba04223722da80e59de2695b477c2d829bb14a37e7baf387f9d63b8c4456fc5712f8d591d3de51fad76d6c78
 DIST python-neutronclient-8.0.0.tar.gz 304243 BLAKE2B 664594bacd1d7480d502f97a0b0a3f441433ee70dac2af9359a22091c64503aba51e026b4e5eb0c68e7bc847b9120639ffdc1547d1d4ff92785459e1880a9747 SHA512 8846a87fb70555ca9f02a93f04dc68aa4ad332aea41398df744531f9afab034a37cb5390b93fa4fe4bd9ca25a9ee5787cccc1493232fe4019e5fcb2a842b2b44
-EBUILD python-neutronclient-7.8.0.ebuild 2242 BLAKE2B 652582a9b006c17bc92c9f6c29fda3385677d7d6a7f4869420ff1b979776a6eee2b049a27afbc4440dedf607cf70a5611cf9adebbc5d9f626bb11b48c0df7271 SHA512 a1271d1d26ba54fe0c53a488459452ed40a56009a81fc31e25c954a9a803beec2dcd922168735c3e45a2ec065f535ffda06d8ea748ee6e20e76436b9f5e57f64
-EBUILD python-neutronclient-8.0.0.ebuild 2244 BLAKE2B ad8fa1cc4013e6a1e9350ada9949ae9b927e82487a588f67ab9a8c0117ff250480a70332a7cf6015aa3c4695d4989cf8140300b6b3361a8cd7e8fc8f8b07b881 SHA512 eb2a5ea3b61c9fde1681eb55ceaba6e9c8f48dd34560826cc6aeec66a8b0f5bc22dc4470b81a70ae713ab8ddf82401ac828a18a470ff10d317096ef31d9a331c
+EBUILD python-neutronclient-8.0.0.ebuild 2242 BLAKE2B 652582a9b006c17bc92c9f6c29fda3385677d7d6a7f4869420ff1b979776a6eee2b049a27afbc4440dedf607cf70a5611cf9adebbc5d9f626bb11b48c0df7271 SHA512 a1271d1d26ba54fe0c53a488459452ed40a56009a81fc31e25c954a9a803beec2dcd922168735c3e45a2ec065f535ffda06d8ea748ee6e20e76436b9f5e57f64
 MISC metadata.xml 645 BLAKE2B 7c6f6fa18789cbd9334a7d611b47f5d2b9b0110a2c15cfcd50b95a4be593e8d5c7fa5d53a2db8a82c68c6e9f75db668cef4b4dfa7aa446f4cada0db80a669acb SHA512 035c9734f11c8b8d1edad8991c527d51060f58a171dbacd26c62a37cf8b061df318fad31ca352c17116e77e7e2338a85cfd8ee8550b10a2f93eb7ca3be3fd192
diff --git a/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
deleted file mode 100644
index 143e5e0a0ef8..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslotest[${PYTHON_USEDEP}]
-		dev-python/python-openstackclient[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Needs osprofile
-	rm neutronclient/tests/unit/test_http.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b neutronclient.tests.unit
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-8.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-8.0.0.ebuild
index 6a5635106383..143e5e0a0ef8 100644
--- a/dev-python/python-neutronclient/python-neutronclient-8.0.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-8.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 3e5161166d92..fd9519924793 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,7 +1,7 @@
 AUX pyzmq-23.2.0-libdir.patch 510 BLAKE2B cb7884416d3e15f735412d69a7ae0decbbf8eca14ae909b23e68231a65b3ad36d021b5c6f5315a3cb982cd571913ce021cc5df60509d90b28d4353dd7bd316e8 SHA512 f268d03de45971d50a89210366b4aef0e79e652a45d650fc3e4a6711558ee186ee558a2808b7c9f5c5a64ce8b9282adf024ab21a782ba614900a4813e8b6d6ca
 DIST pyzmq-23.2.0.gh.tar.gz 402085 BLAKE2B 4ab26af04c76205d0770163e248e28a22aa8f710a66c9dc96e18c772338c434ad06227d57edd5aa3476fad68fa7320e9216a102b2cb19649393f1e9ef5d9599c SHA512 348482f4b6fd4ebeae8e4720a7005ed35eccee2bf26b0128115b756ee560156b34e6f043c96b71a84d47b1313bd2d8e0ed0f74c7768e23cbf65bd906036800c5
 DIST pyzmq-23.2.1.gh.tar.gz 402170 BLAKE2B 4cedd065cecbabc0e18928423e853a38953cd1f360fc326573c60bf69ffefadf3bed556d9d71eedf824e646ae23640d14b6aa8938c397c367be32cc36d300e38 SHA512 4ba236b87db062b245a04530de5b1e8385491107ae8de465f6f664c75ab8a929d57491eb3f8dddf31ff1db7b1eee89a6892a9a844bc285096cc9960704b36c9c
-EBUILD pyzmq-23.2.0-r1.ebuild 1938 BLAKE2B 6f57457d4930c31eca9f6df6e52db21d9391fc13a297a744c4f782b0234df7dc5b9e2057cb4e8d97f208c4ec5c2087dbe9f0008b033f5f18d40b70fb8025e893 SHA512 ac4e7b3228e1ad005cefd524547da5e60d71958fdc03f26586bfcb069b35ab174a98d6d4ba504a7fbe5e24194b3cc7be85f8d51664b07beb046c0ce6464d7860
+EBUILD pyzmq-23.2.0-r1.ebuild 1937 BLAKE2B e4f5f498e4da3d39ec0c819be6d2ece3b6f7ed2a71b0336f2d4d775d4e2831e8e5d56d136564d3909d50205f318c2b213f5191caa8710ae4ca4264bf7333f19b SHA512 ce6803feae967730a31e704a070516031c3488988ba7b893316dd9cbded82d6585a1ef4d86a71d92579e124346748f1aba85ae6fa02c5909068071953e4a5915
 EBUILD pyzmq-23.2.0.ebuild 1882 BLAKE2B 64244a051abb1d374d87d202887385482730156a21141bcbf0075358d378345e46e0c93acdb4e62866f0c529a4309a32a8671fd95d6e20f075f6d3bb17c9ac3f SHA512 03625c285825f06e5fc2fb80f442eb8ef1ff8cbaaadf1a231eda52f7c0fcff540147c056cfa2fecbdd9f995b0ff48a0c6f808c607539d49200e7a907824ff42c
 EBUILD pyzmq-23.2.1.ebuild 1944 BLAKE2B ddb71887234f1d8fc509f8b100aa33a80e929ccdafb3e4c7513886dde4f04dfafe1ab6be0891cd8c3408e9a1dd53f3cda23f0ede3a2f077f5e7c0f655b1dc7cc SHA512 bc9c1f1366d4744cd953cb50de3184f8e8b2e8a45137870d39e297e1fbb8defc2c12d03ff746568b8ef17d247997246556b8a05b509157ac1cd5c7f9bcac2344
 MISC metadata.xml 548 BLAKE2B 0120b82c6a48537f80d08237f4184ff855c109a0a461adfe7921e25468928ea053cc7727c7b00ff96ea556d719e453ee27cf534b285f24f62f7d1ca4ab326770 SHA512 124145f71518d39daa57522eadc27ab4782c3fc1794543396a6b6c91dda29175c4c097d6be90d7d405823621ce66f62e169b97e086c983d7f08178e6d85cee40
diff --git a/dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild b/dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild
index 5e5609836a56..22b7deb11926 100644
--- a/dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild
+++ b/dev-python/pyzmq/pyzmq-23.2.0-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/simplegeneric/Manifest b/dev-python/simplegeneric/Manifest
index 433c7ada9e1e..880cdefe2306 100644
--- a/dev-python/simplegeneric/Manifest
+++ b/dev-python/simplegeneric/Manifest
@@ -1,4 +1,3 @@
 DIST simplegeneric-0.8.1.zip 12663 BLAKE2B cc3d70f8f4f04209b7ce259c6caaccec001515a3da04736cb8baa5fe7e6091f4f85bdde0c5c4227a01bfe52739f51ab0116d8bfdc4bb58bd2188c3a54c5eac37 SHA512 74c25d4e04fe197058cb43fabe3702cc5901989dc0b0bcf7511369f4f3d90fd98e4225174db0680c8f39389914f82824bdbdaf4c302b53998fbabbf0dba393e4
-EBUILD simplegeneric-0.8.1-r1.ebuild 527 BLAKE2B 64cd198525603bb492dd9bafb32ba57e9948746d2fbb3c980e3ca5465810ae5415b42b567f86fa96f3b0d4dd188c849815983c501747f89794841f8a5081601a SHA512 26980fee6afaa01ec6b5e737e3cb938670ec8db7bf004ea0fd999800eb4ed0b0531396305a0419beb9e9f2016267dc99fa4342f343c0fb07feb1d94f6297a8be
-EBUILD simplegeneric-0.8.1-r2.ebuild 560 BLAKE2B d831044f6c76696d45e883405479bb29d9d0d4affae4475bba7e260287df6d0fc12342187118bf4eb37182e395b89d8d5e5836a006d600c490f248d76a2269d5 SHA512 66561d7f5177146ac777243e560638155627aedbd1b650512834a1aef8f1fa08ff13689186af5a3e3e82e1cee46fa3c5dc4700667c9f829ef4bb3c82d9e1d007
+EBUILD simplegeneric-0.8.1-r2.ebuild 559 BLAKE2B e5b417d0a3cd981c7582450bdc7807777ac9188f6be90af4f1b0e6abce58c3a8d006b5b21666f21533639d22c982bb444d45cebaeb28012a0a370d3a5fed8dbb SHA512 c9411ddc93b7920601fdc4b746924610ab99abacbde5b4668a4c6f0f8fabb3cb1dd1ee80d21693170de9f9565de2879a2e873bd90aec47b33e2dac28b6a6aa68
 MISC metadata.xml 757 BLAKE2B 413fa1c6ce55944c3f0b66f4bfc496c88eb1499603529050580f3df48bf7674c9a590aeea27c9533e709e33c61716e7f54e052c00261e81879069b91ff2928b6 SHA512 158c130fdfef00b5c2bf953f4d1811e5802438e2c4d6467f53b97879fff6aa93793f04d50de8ba65f41131fe7ece42327afdb667cd03c2021975fb11a6cf2267
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
deleted file mode 100644
index c062692b4dfc..000000000000
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple generic functions for Python"
-HOMEPAGE="https://pypi.org/project/simplegeneric/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="app-arch/unzip"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r2.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r2.ebuild
index 03beab4ee10f..089940cf5fc4 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r2.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a61ad3f9e2dd..3d80136344b0 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index c96939d09f70..e8321986fd63 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,5 +1,4 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
 DIST shaderc-2022.1.tar.gz 222009 BLAKE2B c6707699a49c130b2669620e11f52862790999954a84b05f9f54d238fb0ae68e2523cc4b86104b3d4bce4528db31be89e441b278a97a375b90d7e0f458075f51 SHA512 21c2462cb434d94da87c71ba660f6cd5b161450d7faeff8789b41db25e64f2baa7c560e78aa856d128c5a73699215d6b1085b5ca19a4640237adf194793ad44b
-EBUILD shaderc-2022.1-r1.ebuild 2104 BLAKE2B 4804181cd83601ecd542de5d80598d9e5066973fd64d5b848d487657185de002aabb3141d7d6779df85899093734126a2f4507eca1d9562fa45cf3cf2ea26e28 SHA512 8386390f27797f855254cf79b81d192e7322e93054b77c3b14ec41645e8b7f75f0b916ecf8f81180a404ef796832a08be5647111899248ec24f111b85687cf61
 EBUILD shaderc-2022.1-r2.ebuild 2091 BLAKE2B 85c675010f45ff5d83bac7b2bd86149ffcb0fe2fe04107e70d6a1da5f02bfdcddc22ebbb73f1cb06a9cc0398fabbec92282ce571220fc70acd5ab97d7d99797e SHA512 f322b1ef2d5e5d56e7aa418eb6ba205401e7edec2f2ab62f94bcccd95a445f5a55d3b2609bc89f8f8c5eab9cafd5017e7bb9c0a2dd62d7ae983a0007988cd8b0
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2022.1-r1.ebuild b/media-libs/shaderc/shaderc-2022.1-r1.ebuild
deleted file mode 100644
index bd74f502102a..000000000000
--- a/media-libs/shaderc/shaderc-2022.1-r1.ebuild
+++ /dev/null
@@ -1,92 +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} )
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-EGIT_COMMIT="${PV}"
-SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-util/glslang-1.3.204[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-1.3.204[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.3.204
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-2020.4-fix-build.patch
-)
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-		-DSHADERC_ENABLE_WERROR_COMPILE="false"
-	)
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake_src_compile glslc_doc_README
-	fi
-	cmake_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake_src_install
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 53b9da772af0..b9708a1ef8af 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 8b0f13c169d7..9e50b8a2bf24 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,5 +1,6 @@
 DIST qtractor-0.9.26.tar.gz 1868666 BLAKE2B 3e0febf185ad5818bec00c3b66cfdcf8e2ff89909f3934facf3e371283b840847111b3eb175bcc7f5e0a073f06b01554aa5f61a0add1c21588124858849a3cfa SHA512 ca1a1cfcd7083bae83d26b0710cb7b884658176c060858f5f9fbc40a885a498731a544390be2a61f4f986d113ca112271eaf5c6218f6e3051b152dcae836b8d0
 DIST qtractor-0.9.27.tar.gz 1995105 BLAKE2B 08b3a18d37eb700960e24741178079deb728f909f80fc00491abbe832c1d1966022ec6bd2c24469047b53b168a7e084a7d76da96e587afff78662f2f1c9b1d26 SHA512 2bcd4c5676fda58c7cf9ad9a9dcc139eda11c69b1c608812ff912ff63da56fbd0ba6b76828b326038365c9d84519bc752c54572e8edbf573e6cd0d068a17faf6
 EBUILD qtractor-0.9.26.ebuild 2443 BLAKE2B 55b7a06d8840c4b0303511e5a2b790a80672f95d5e270b3bccc9232562902a1ca6eea92de9586fb598976de0b54190139f34342024358569d823d121ec313a5a SHA512 f71d82260c8ad9ff055ca1c881a70924338b86b2360d56b5cec580296ac8d99863ec27cdf9d84ba85883165eb454b1fbfccfd51fc4e5e8eaa0f9d29505e6f18c
+EBUILD qtractor-0.9.27-r1.ebuild 2505 BLAKE2B b5b7e2648460990bb9b70a871d73884ef5a548d63776209152c5a89b5f66be692f692566dbf6965594df97073617c56024f97ec564b8245860b2587d851821df SHA512 363c99eaea284ad66a1cd246069e4feefd0a2c0d5bae1ec7f8093b1d3d205d0f9c07ce17dcd85ad9e2111f60c0086e5b5e4e2b183e7f8fec00c15dba20e495b9
 EBUILD qtractor-0.9.27.ebuild 2445 BLAKE2B 7508a7aea3d74dc68d3a8fffa85f733bf1772d5f87dd545d6dc3ab6ea2e75d8aa96b0320014236f855a667fabac9e14fb603859140c1f5ba733b0ecc4faf8abd SHA512 acddfa87c474e4876081bc1ad5b7607fde4ac785ab10d0ed5e97711b32f4de0c8e827833d2a3a91222ed5409e2913ea3eefdae5e13bc66634ecff0a168edafff
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.27-r1.ebuild b/media-sound/qtractor/qtractor-0.9.27-r1.ebuild
new file mode 100644
index 000000000000..f3c019cec2bc
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.27-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+REQUIRED_USE="dssi? ( ladspa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	x11-libs/libxcb:=
+	aubio? ( media-libs/aubio:= )
+	dssi? ( media-libs/dssi )
+	ladspa? ( media-libs/ladspa-sdk )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=1
+		-DCONFIG_VST=1
+		-DCONFIG_VST3=0
+		-DCONFIG_XUNIQUE=0
+	)
+	# Following options are left to the default
+	# CONFIG_LV2_ATOM
+	# CONFIG_LV2_BUF_SIZE
+	# CONFIG_LV2_CVPORT
+	# CONFIG_LV2_EVENT
+	# CONFIG_LV2_EXTERNAL_UI
+	# CONFIG_LV2_MIDNAM
+	# CONFIG_LV2_OPTIONS
+	# CONFIG_LV2_PARAMETERS
+	# CONFIG_LV2_PATCH
+	# CONFIG_LV2_PORT_EVENT
+	# CONFIG_LV2_PRESETS
+	# CONFIG_LV2_PROGRAMS
+	# CONFIG_LV2_STATE
+	# CONFIG_LV2_STATE_FILES
+	# CONFIG_LV2_STATE_MAKE_PATH
+	# CONFIG_LV2_TIME
+	# CONFIG_LV2_TIME_POSITION
+	# CONFIG_LV2_UI
+	# CONFIG_LV2_UI_IDLE
+	# CONFIG_LV2_UI_REQ_VALUE
+	# CONFIG_LV2_UI_SHOW
+	# CONFIG_LV2_UI_TOUCH
+	# CONFIG_LV2_WORKER
+	# CONFIG_LV2_UI_X11
+	cmake_src_configure
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 42e9abedc7f1..7b26a6c01a78 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 8cdd99cad9f2..f75b979c3097 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -14,7 +14,7 @@ DIST vlc-3.0.17.3.tar.xz 26393440 BLAKE2B 5079caa779335647394eb4af631ae89098b225
 DIST vlc-3.0.17.4.tar.xz 26567148 BLAKE2B 4f36e7a9695d9e839fbebe92ec85c9411fa5b980b18332caf3dacfe51c6fea30cae71ee4cb0dad8b5536dd7d9b8801987f87a3c978eec17e444eaeacda603881 SHA512 dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb
 EBUILD vlc-3.0.16-r8.ebuild 13840 BLAKE2B 7dfa1bf55d9ad0ccfb899f14c15479ad78c0eb6bd16061d6b78ce1b2ea6c131961ab56cfb485e57d85b62025d0f5ef4a999aeebb099a3b2db98a9d0af159202b SHA512 5c045d13dc3ca796a4ba670ea89ed3a5177bcd34af08e91ebd673d9bcf913b17d704aa29f0f03a507685a30730a1ba5469f01c92b04433726013fa21427589bb
 EBUILD vlc-3.0.17.3-r2.ebuild 13552 BLAKE2B 16a9ecb6a011dd4d2f85e5d837edfb4d767a9c73d11b6c445d5351fa45ebb2f7888278fd02632d74c37a19aa63796219e20f292f7bab3cbfc2722529fb8f30db SHA512 df4818976c7082b590c1fda7ce7198649f229240412c012ddd8c9139c9e1d2697808d7edd7a78c09392dde57e686b3e6bc48ed41f2b69776272876c3f230c305
-EBUILD vlc-3.0.17.4.ebuild 13573 BLAKE2B dcc7e7089babca0493d6bf36f8775c8c6d9760a8a0f99d317c2fe19d468fcf861b1a77c8984e5bca21030325fbb3ea5180c5da6f893cf738b15590aeb5bd07e4 SHA512 05fbe758b69cac43878a3560307a2a1f742629a6c3f37b35dda97eba698a55c4dfb18aa867a48c8cc925a26e7e648cabbb0080bed5f61191a3c5b1a10d0d9eb2
+EBUILD vlc-3.0.17.4.ebuild 13572 BLAKE2B 643129b6df988d258e3d4a2fc62f9b1ee74fd163e52644938b8993713c1e8f96e13aebfaccb3c67578097b0d57e69c9f8e689b7f557c24b2db3de5dc66786cd4 SHA512 c8587800290d03fb508a45b1cf311803ca934bf708548c421dc609bd78c7db686effbf10cf739e8a118d72c054a74709837a1ec9d7e67f5ce22dbf54b89f1375
 EBUILD vlc-3.0.9999.ebuild 13433 BLAKE2B 8712b957e2829bf0f33c2d4ea0c2164f82da322a50b44c0dbf1e6c670d63acb8704b9b4b754d94207b0e6a11038b42004ba46fdb7e2fce0bb7cb2b1a160b9729 SHA512 8c89645dd3a33133a19dde64faaf76fd4bfe5ff1e3b1fb34901d92849aed9f3d65b5c09e9d1ca63f4ef9159bf71902448b9ed7782d1c173c7650d388dda64e4d
 EBUILD vlc-9999.ebuild 13488 BLAKE2B 006133119bf236b523954aae0172a87e4c8db79b8d986d408cd262fb17c439d419c941ad9135ead5099a2b33f465ee15bc76d07b6addd2cce1ce6dcfe3a8c0b8 SHA512 298dc503c597272872a3537232a8e40d381fa082c23533aa66e1d27ab4c506feec94e8b5a5d76cf1ac6d19b6d1f91d3873077ad025885086f8e25054d1459da5
 MISC metadata.xml 4912 BLAKE2B 97661f54c1c16cb3084e12ce7899c080e7e69b203c1539b90048cf3d7c1f673b29051fd68216b6bed54f8842990f0c47e2c67038d85e911dcd1c905b54093719 SHA512 c24db55603932f9b52808e0b9d5687a333078d1735c05e1b561d91c08b99246b321b5b60f8111b286041c524d5913ec6f4f321a79c0773cbb9aaaa3fea9a50d6
diff --git a/media-video/vlc/vlc-3.0.17.4.ebuild b/media-video/vlc/vlc-3.0.17.4.ebuild
index 92454d946ac3..7d9eb9eb5587 100644
--- a/media-video/vlc/vlc-3.0.17.4.ebuild
+++ b/media-video/vlc/vlc-3.0.17.4.ebuild
@@ -20,7 +20,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv -sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv -sparc x86"
 fi
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 88e9f8a11313..da32e2f8fc64 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 68c4c65979b2..d7b9cdb71f33 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2022 06:39:42 +0000
+Thu, 18 Aug 2022 12:39:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 46ed87052126..9979f0c4fe9e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 523682 BLAKE2B a866720fe3384cb354d689c52dc2eed547ab55e37608dcb637780fcc52106c8f5b1ad8a84b41fe53778860d6ace908fc8c4af0faa17e457054d95d23aee6e6b7 SHA512 8cd7653583d003af73b72c5887e3bbb7c5321dc87e14d08d6283a4c633685378b7922f0cd4552eeb523a7d2aca7c675e2fd4704a62d96cc574355d98d5158f89
-TIMESTAMP 2022-08-18T06:39:45Z
+TIMESTAMP 2022-08-18T12:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL93rFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL+MxJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCvbRAAhWyYSTDPNe6dI5Aj2f0LxDugROb/jVUjwNyLbJBYPm8Lh/e9GSyQ5d1N
-lp2iwfL41HrN+XgaoWt7sMF2HsXBeYypgq+ja9noNja42BCkvB/UXt9q8wOb9scY
-m35MGhWsyUoY2bViaNsNTjcinSY8HXdAMxAo08AOJYPoJ2Dbzop4A7GXGdfgPnAV
-odjbH1VwTuI12JJ04IYrMVULqcDxUggmrIAoL6p4VubqCyo8Vzt87J0iEdN7xWcj
-Ain/R/Q1qhkrqet7o34xB2fS8TSgqvKOsEzsMcs1dSrW4VrqcMfLg39bEOWIDDLq
-xJRrKkZ+5USPRh1gt2eeqSN8FAcDlBRQwFWaiJN313++XsOjZ0k770Eugh30HrsY
-WAngfkiWLczOklhrrVJliNWL3iX/MBLg5qnikwCuqkkrKzKnOSOcNsL/S0wivkDS
-wStDN2yJ5NQN49jAqKoJhGvp/Frp3l4XXFB7D8GaTjGU3ktoQ5BFXjPikr5jUMr8
-mlHQ0VjbKGpMuKJQ2z2p+xvsptgNkGvrPLK/DUJ5Rm6sPPYQuUjYVDKRG4mck9LL
-/Zawj5DhqSq1pOz5kHRt99/WV2tk7YN1WyX3pde/EPjh7FRsuYj8klxfeqUpAXtv
-JJsWzYFsm2vZgzD1+G/svmJdyF/aeRszbXj9KuUVwRCwmRopde0=
-=PYAc
+klDemA/+IFOdLgngBJEsPX77gnT53KxMhs7cZy3CFW86XbPGcLucyuyIPFzB75K7
+dI8Z0jwlrDkbtOx52eRc1B1u4v9fFQZmWK4L8pRWnF0r33RjVwaooO6GemHrheJO
+aEgar9RFWLbobWBTQWgiXtexS523vO/PCV9ajZh90GWKTLg9LE64JOgf9+cpuvSW
+vPWPocLvh2ftHEjesq4b9Kt31LGDPfWffW/r1qqBcrFymMvbeXtNWeQKH/A8v4fS
+ldxTgqO67/H8Il5Hp+0lAYeFXY2CgrWuxObHl7NbFlfkiquVc4CTL4pf75LUFCKR
+roxzTOGYMJ/R+BNHBCNh0qYSLSfgN0J1VIeZJ/6FY/QaypY/6ebleIonsnmOs97w
+Ps6jBCPoN3EJyekoLY4RX0y/zhO+XxqQjS6Q/Wo2bUz7zzH4Qe9vLM0oA8mguWf4
+6+z2MSZlMkHV9YOamteh5YQdlLvtRbvSBdp4rna6UA1Jq2KrGJqdHY7Hs6p1ggFs
+MA+cIoAa3NoTZNKhnIQ9MHCE7v/hhQ6FYxqj4Wb2axvQbldbdfXfO4gL0oaUzMPo
+VCFYqtAAvgDhLFaS1DK21JP9UN+0Zld4t9E2nAeOs2XuwdKxT1k5f/XAdF2ms+ny
+BmoOu4shSsj21qt/j6u+RHcs67dFgpNZO9iYdl0sXUR/4KK/mc0=
+=okEy
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 68c4c65979b2..a789215eba99 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2022 06:39:42 +0000
+Thu, 18 Aug 2022 12:39:43 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index c36601252957..0f9058ef3b16 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index b48a56ccd24c..c935113bba77 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/featherpad-1.0.0 b/metadata/md5-cache/app-editors/featherpad-1.0.0
deleted file mode 100644
index 12868f035e29..000000000000
--- a/metadata/md5-cache/app-editors/featherpad-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Lightweight Qt5 Plain-Text Editor for Linux
-EAPI=7
-HOMEPAGE=https://github.com/tsujan/FeatherPad
-INHERIT=xdg cmake
-IUSE=+X
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-3+
-RDEPEND=app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 )
-SLOT=0
-SRC_URI=https://github.com/tsujan/FeatherPad/archive/V1.0.0.tar.gz -> featherpad-1.0.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a01f416ac810dbd33f2334bf27dc9e14
diff --git a/metadata/md5-cache/app-editors/featherpad-1.0.1 b/metadata/md5-cache/app-editors/featherpad-1.0.1
deleted file mode 100644
index 7a90f91cfeaa..000000000000
--- a/metadata/md5-cache/app-editors/featherpad-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Lightweight Qt5 Plain-Text Editor for Linux
-EAPI=7
-HOMEPAGE=https://github.com/tsujan/FeatherPad
-INHERIT=xdg cmake
-IUSE=+X
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-3+
-RDEPEND=app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 )
-SLOT=0
-SRC_URI=https://github.com/tsujan/FeatherPad/archive/V1.0.1.tar.gz -> featherpad-1.0.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a01f416ac810dbd33f2334bf27dc9e14
diff --git a/metadata/md5-cache/app-editors/featherpad-1.3.1 b/metadata/md5-cache/app-editors/featherpad-1.3.1
new file mode 100644
index 000000000000..71145ca69b73
--- /dev/null
+++ b/metadata/md5-cache/app-editors/featherpad-1.3.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-text/hunspell:= >=dev-qt/qtcore-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 )
+DESCRIPTION=Lightweight Qt5 Plain-Text Editor for Linux
+EAPI=8
+HOMEPAGE=https://github.com/tsujan/FeatherPad
+INHERIT=xdg cmake
+IUSE=+X
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=app-text/hunspell:= >=dev-qt/qtcore-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 )
+SLOT=0
+SRC_URI=https://github.com/tsujan/FeatherPad/archive/V1.3.1.tar.gz -> featherpad-1.3.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=41468d536b58ed2393a3c3a16843cf33
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index a38b1657b21c..f00f0ea32c49 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/linux-logo-6.0 b/metadata/md5-cache/app-misc/linux-logo-6.0
index c5e343e8c3b1..c1095a75e24e 100644
--- a/metadata/md5-cache/app-misc/linux-logo-6.0
+++ b/metadata/md5-cache/app-misc/linux-logo-6.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.deater.net/weave/vmwprod/linux_logo/
 INHERIT=toolchain-funcs systemd
 IUSE=nls
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-6.0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=74a6fc7ab61695153427cf3397edcb8c
+_md5_=63f35db38857629a3b8d7665b507b782
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index bf27a362412b..6f8bb389e791 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/postgresql-10.19-r1 b/metadata/md5-cache/dev-db/postgresql-10.19-r1
deleted file mode 100644
index 0ed527608dd4..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-10.19-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=10
-SRC_URI=https://ftp.postgresql.org/pub/source/v10.19/postgresql-10.19.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=93281f4ba9835c711d829db5f3c16bba
diff --git a/metadata/md5-cache/dev-db/postgresql-10.20-r1 b/metadata/md5-cache/dev-db/postgresql-10.20-r1
deleted file mode 100644
index 7e2ae7950ee2..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-10.20-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=10
-SRC_URI=https://ftp.postgresql.org/pub/source/v10.20/postgresql-10.20.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=50723f184eb68f272e2c905502938865
diff --git a/metadata/md5-cache/dev-db/postgresql-10.21 b/metadata/md5-cache/dev-db/postgresql-10.21
deleted file mode 100644
index 0001884e5517..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-10.21
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=10
-SRC_URI=https://ftp.postgresql.org/pub/source/v10.21/postgresql-10.21.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0965a0d0b42cda319df098e674032c5d
diff --git a/metadata/md5-cache/dev-db/postgresql-11.14-r1 b/metadata/md5-cache/dev-db/postgresql-11.14-r1
deleted file mode 100644
index bd1bbf00ba78..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-11.14-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-14:= <sys-devel/clang-14:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-14:= <sys-devel/clang-14:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=11
-SRC_URI=https://ftp.postgresql.org/pub/source/v11.14/postgresql-11.14.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1999d126540e45642de7f462abf32273
diff --git a/metadata/md5-cache/dev-db/postgresql-11.15-r1 b/metadata/md5-cache/dev-db/postgresql-11.15-r1
deleted file mode 100644
index fafe5d417789..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-11.15-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-14:= <sys-devel/clang-14:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-14:= <sys-devel/clang-14:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=11
-SRC_URI=https://ftp.postgresql.org/pub/source/v11.15/postgresql-11.15.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7718ac3439a0f4f0c601ad6afd5faa6e
diff --git a/metadata/md5-cache/dev-db/postgresql-11.16 b/metadata/md5-cache/dev-db/postgresql-11.16
deleted file mode 100644
index ac822f9c9dcb..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-11.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-14:= <sys-devel/clang-14:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-14:= <sys-devel/clang-14:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=11
-SRC_URI=https://ftp.postgresql.org/pub/source/v11.16/postgresql-11.16.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e2b4bb84594be1393028dfb3b1d1c488
diff --git a/metadata/md5-cache/dev-db/postgresql-12.10-r1 b/metadata/md5-cache/dev-db/postgresql-12.10-r1
deleted file mode 100644
index 4d002b5cdddb..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-12.10-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=12
-SRC_URI=https://ftp.postgresql.org/pub/source/v12.10/postgresql-12.10.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2273e207ea64e65c210c412a58ab0cfc
diff --git a/metadata/md5-cache/dev-db/postgresql-12.11 b/metadata/md5-cache/dev-db/postgresql-12.11
deleted file mode 100644
index 772b6b381cea..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-12.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=12
-SRC_URI=https://ftp.postgresql.org/pub/source/v12.11/postgresql-12.11.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ef7ec7e98779edd4a8b78d8583f2dd37
diff --git a/metadata/md5-cache/dev-db/postgresql-12.9-r1 b/metadata/md5-cache/dev-db/postgresql-12.9-r1
deleted file mode 100644
index b738c54f037d..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-12.9-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=12
-SRC_URI=https://ftp.postgresql.org/pub/source/v12.9/postgresql-12.9.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0e90010bde58ef655ea93ddaabf7367e
diff --git a/metadata/md5-cache/dev-db/postgresql-13.5-r1 b/metadata/md5-cache/dev-db/postgresql-13.5-r1
deleted file mode 100644
index 2a27e713cf9a..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-13.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-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=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=13
-SRC_URI=https://ftp.postgresql.org/pub/source/v13.5/postgresql-13.5.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7232dd30758fd3fdaca569e24f80fc06
diff --git a/metadata/md5-cache/dev-db/postgresql-13.6-r2 b/metadata/md5-cache/dev-db/postgresql-13.6-r2
deleted file mode 100644
index aafd16a0aae2..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-13.6-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-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=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=13
-SRC_URI=https://ftp.postgresql.org/pub/source/v13.6/postgresql-13.6.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=582a3760e7f37dabbb134e0992b7c1f2
diff --git a/metadata/md5-cache/dev-db/postgresql-13.7 b/metadata/md5-cache/dev-db/postgresql-13.7
deleted file mode 100644
index fc1c6b3a8136..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-13.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=13
-SRC_URI=https://ftp.postgresql.org/pub/source/v13.7/postgresql-13.7.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e43d923af24ae7fac568ecf7c5a3c0d2
diff --git a/metadata/md5-cache/dev-db/postgresql-14.1-r1 b/metadata/md5-cache/dev-db/postgresql-14.1-r1
deleted file mode 100644
index 8d841809bb87..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-14.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm lz4 nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-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=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-15:= <sys-devel/clang-15:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=14
-SRC_URI=https://ftp.postgresql.org/pub/source/v14.1/postgresql-14.1.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e62c2ae4635d890d65280e7281bf4390
diff --git a/metadata/md5-cache/dev-db/postgresql-14.2-r1 b/metadata/md5-cache/dev-db/postgresql-14.2-r1
deleted file mode 100644
index 0fb85ccf6f03..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-14.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm lz4 nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-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=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=14
-SRC_URI=https://ftp.postgresql.org/pub/source/v14.2/postgresql-14.2.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d74249e818151897a9ba737514a2762a
diff --git a/metadata/md5-cache/dev-db/postgresql-14.4 b/metadata/md5-cache/dev-db/postgresql-14.4
deleted file mode 100644
index 6aab0e09af5c..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-14.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm lz4 nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=14
-SRC_URI=https://ftp.postgresql.org/pub/source/v14.4/postgresql-14.4.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=367bcacc074c9f33797c29a67f88718f
diff --git a/metadata/md5-cache/dev-db/postgresql-15_beta2 b/metadata/md5-cache/dev-db/postgresql-15_beta2
deleted file mode 100644
index b7af13f772ce..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-15_beta2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-INHERIT=flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-IUSE=debug doc icu kerberos ldap llvm lz4 nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=15
-SRC_URI=https://ftp.postgresql.org/pub/source/v15beta2/postgresql-15beta2.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6f2fbc6318386ba94a51bc4994f271eb
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 5742fde5e2cc..ba7e18301750 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/aseprite-1.2.35 b/metadata/md5-cache/dev-games/aseprite-1.2.35
deleted file mode 100644
index f4d1b2a7ec02..000000000000
--- a/metadata/md5-cache/dev-games/aseprite-1.2.35
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-arch/unzip dev-util/gn 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-arch/libarchive:= app-text/cmark:= dev-cpp/json11 dev-libs/tinyxml media-libs/freetype media-libs/giflib:= media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= net-misc/curl sys-libs/zlib:= virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libxcb:= kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 kde-frameworks/kio:5 ) webp? ( media-libs/libwebp:= )
-DESCRIPTION=Animated sprite editor & pixel art tool
-EAPI=8
-HOMEPAGE=https://www.aseprite.org
-INHERIT=cmake desktop ninja-utils toolchain-funcs xdg-utils
-IUSE=kde test webp
-KEYWORDS=~amd64 ~x86
-LICENSE=Aseprite-EULA
-RDEPEND=app-arch/libarchive:= app-text/cmark:= dev-cpp/json11 dev-libs/tinyxml media-libs/freetype media-libs/giflib:= media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= net-misc/curl sys-libs/zlib:= virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libxcb:= kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 kde-frameworks/kio:5 ) webp? ( media-libs/libwebp:= )
-RESTRICT=bindist mirror !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.2.35/Aseprite-v1.2.35-Source.zip https://github.com/google/skia/archive/3338e90707323d2cd3a150276acb9f39933deee2.tar.gz -> skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=102a88fc7cdfba02773badc70fa7148f
diff --git a/metadata/md5-cache/dev-games/aseprite-1.2.37 b/metadata/md5-cache/dev-games/aseprite-1.2.37
index bbafc8b1c6ad..34ca4889aa52 100644
--- a/metadata/md5-cache/dev-games/aseprite-1.2.37
+++ b/metadata/md5-cache/dev-games/aseprite-1.2.37
@@ -1,10 +1,10 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-arch/unzip dev-util/gn virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) test? ( dev-cpp/gtest ) app-arch/unzip dev-util/gn virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=app-arch/libarchive:= app-text/cmark:= dev-cpp/json11 dev-libs/tinyxml media-libs/freetype media-libs/giflib:= media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= net-misc/curl sys-libs/zlib:= virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXi x11-libs/libxcb:= kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 kde-frameworks/kio:5 ) webp? ( media-libs/libwebp:= )
 DESCRIPTION=Animated sprite editor & pixel art tool
 EAPI=8
 HOMEPAGE=https://www.aseprite.org
-INHERIT=cmake desktop ninja-utils toolchain-funcs xdg-utils
+INHERIT=cmake desktop ninja-utils python-any-r1 toolchain-funcs xdg-utils
 IUSE=kde test webp
 KEYWORDS=~amd64 ~x86
 LICENSE=Aseprite-EULA
@@ -12,5 +12,5 @@ RDEPEND=app-arch/libarchive:= app-text/cmark:= dev-cpp/json11 dev-libs/tinyxml m
 RESTRICT=bindist mirror !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.2.37/Aseprite-v1.2.37-Source.zip https://github.com/google/skia/archive/3338e90707323d2cd3a150276acb9f39933deee2.tar.gz -> skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c6b65168102d17ee1765692b480e452b
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5cb312a4cf8c96c2e1ef423449083fc1
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index d1ece696f9d9..4dcd28787abd 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/json-parser-1.1.0_p20211208 b/metadata/md5-cache/dev-libs/json-parser-1.1.0_p20211208
new file mode 100644
index 000000000000..2ce40206dde5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/json-parser-1.1.0_p20211208
@@ -0,0 +1,15 @@
+BDEPEND=python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Very low footprint JSON parser written in portable ANSI C
+EAPI=8
+HOMEPAGE=https://github.com/json-parser/json-parser
+INHERIT=distutils-r1 edo toolchain-funcs
+IUSE=python python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+SLOT=0/1.1
+SRC_URI=https://github.com/json-parser/json-parser/archive/531a49062975d6d2cd5d69b75ad5481a8c0e18c5.tar.gz -> json-parser-1.1.0_p20211208.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1146f5bec43f349fe1bf202b3ed890df
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 3b9079bb091a..a2fbea71dfd5 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/commentjson-0.9.0-r1 b/metadata/md5-cache/dev-python/commentjson-0.9.0-r1
deleted file mode 100644
index ce293ff8782a..000000000000
--- a/metadata/md5-cache/dev-python/commentjson-0.9.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/lark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Add Python and JavaScript style comments in your JSON files
-EAPI=7
-HOMEPAGE=https://pypi.org/project/commentjson/ https://github.com/vaidik/commentjson/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/lark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/vaidik/commentjson/archive/v0.9.0.tar.gz -> commentjson-0.9.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=09d3464870766aa0f5400bcb95bfd1df
diff --git a/metadata/md5-cache/dev-python/commentjson-0.9.0-r2 b/metadata/md5-cache/dev-python/commentjson-0.9.0-r2
index d0372c0c9af6..4009c9677710 100644
--- a/metadata/md5-cache/dev-python/commentjson-0.9.0-r2
+++ b/metadata/md5-cache/dev-python/commentjson-0.9.0-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/commentjson/ https://github.com/vaidik/commentjson/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/lark[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.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vaidik/commentjson/archive/v0.9.0.tar.gz -> commentjson-0.9.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2ddbfca4e2025c308585b3cd2c0f7eaf
+_md5_=4db28eb15825f42df0df56ad32064e37
diff --git a/metadata/md5-cache/dev-python/confuse-1.7.0-r1 b/metadata/md5-cache/dev-python/confuse-1.7.0-r1
deleted file mode 100644
index 02efe1f75131..000000000000
--- a/metadata/md5-cache/dev-python/confuse-1.7.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.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
-DESCRIPTION=Confuse is a configuration library for Python that uses YAML
-EAPI=8
-HOMEPAGE=https://github.com/beetbox/confuse
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pyyaml[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.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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? ( test )
-SLOT=0
-SRC_URI=https://github.com/beetbox/confuse/archive/v1.7.0.tar.gz -> confuse-1.7.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e81dac394b33c78e19fd69e288561c42
diff --git a/metadata/md5-cache/dev-python/dulwich-0.20.44 b/metadata/md5-cache/dev-python/dulwich-0.20.44
deleted file mode 100644
index f98a6cf70028..000000000000
--- a/metadata/md5-cache/dev-python/dulwich-0.20.44
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( !ia64? ( !s390? ( dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/geventhttpclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) app-crypt/gpgme[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fastimport[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure-Python implementation of the Git file formats and protocols
-EAPI=8
-HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/
-INHERIT=distutils-r1
-IUSE=doc examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ Apache-2.0
-RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4: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/d/dulwich/dulwich-0.20.44.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3b02962e80d713395f46639811e07444
diff --git a/metadata/md5-cache/dev-python/dulwich-0.20.45 b/metadata/md5-cache/dev-python/dulwich-0.20.45
index ed2ef8af0c57..0e8ecec1eb28 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.20.45
+++ b/metadata/md5-cache/dev-python/dulwich-0.20.45
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/
 INHERIT=distutils-r1
 IUSE=doc examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ Apache-2.0
 RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.20.45.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d4a83d90f550f97539a6f9c973350a66
+_md5_=3b02962e80d713395f46639811e07444
diff --git a/metadata/md5-cache/dev-python/html2text-2020.1.16-r1 b/metadata/md5-cache/dev-python/html2text-2020.1.16-r1
deleted file mode 100644
index 3adb6e5ec85d..000000000000
--- a/metadata/md5-cache/dev-python/html2text-2020.1.16-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Turn HTML into equivalent Markdown-structured text
-EAPI=7
-HOMEPAGE=https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~ppc ~sparc x86
-LICENSE=GPL-3
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/html2text/html2text-2020.1.16.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4e090e3d091c52b462674f900858b769
diff --git a/metadata/md5-cache/dev-python/html2text-2020.1.16-r2 b/metadata/md5-cache/dev-python/html2text-2020.1.16-r2
index a55313255851..311a798170ec 100644
--- a/metadata/md5-cache/dev-python/html2text-2020.1.16-r2
+++ b/metadata/md5-cache/dev-python/html2text-2020.1.16-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~ppc ~sparc x86
+KEYWORDS=amd64 ~arm ~ppc ~sparc x86
 LICENSE=GPL-3
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html2text/html2text-2020.1.16.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=94629279e5c2187f4d0c20b023c9441e
+_md5_=9a3988b8d95beebcce52c8cfa8e2afc2
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-3.1.1 b/metadata/md5-cache/dev-python/jaraco-logging-3.1.1
new file mode 100644
index 000000000000..868ad5cd9ab7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-logging-3.1.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/tempora[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[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.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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
+DESCRIPTION=Additional facilities to supplement Python's stdlib logging module
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/jaraco.logging/ https://pypi.org/project/jaraco.logging/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/tempora[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.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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? ( test )
+SLOT=0
+SRC_URI=https://github.com/jaraco/jaraco.logging/archive/v3.1.1.tar.gz -> jaraco.logging-3.1.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1bf834d9e727581aea3f2ae3795e8f3f
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.4.3 b/metadata/md5-cache/dev-python/kiwisolver-1.4.3
deleted file mode 100644
index f3bf6afbb165..000000000000
--- a/metadata/md5-cache/dev-python/kiwisolver-1.4.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cppy-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-3.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/cppy-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An efficient C++ implementation of the Cassowary constraint solving algorithm
-EAPI=8
-HOMEPAGE=https://github.com/nucleic/kiwi/
-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 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Clear-BSD
-RDEPEND=>=dev-python/cppy-1.2.0[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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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=https://github.com/nucleic/kiwi/archive/1.4.3.tar.gz -> kiwi-1.4.3.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7838e4acc02e26c4831eb3de051057ff
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.4.4 b/metadata/md5-cache/dev-python/kiwisolver-1.4.4
index 6af0f1b7e7a5..bdff245823f3 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.4.4
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.4.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/nucleic/kiwi/ https://pypi.org/project/kiwisolver/
 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 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Clear-BSD
 RDEPEND=>=dev-python/cppy-1.2.0[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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nucleic/kiwi/archive/1.4.4.tar.gz -> kiwi-1.4.4.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d8235835f3d99df3f23ca32ed5df1b45
+_md5_=22906733cf2cd9d96d6de507c2daec82
diff --git a/metadata/md5-cache/dev-python/netifaces-0.11.0 b/metadata/md5-cache/dev-python/netifaces-0.11.0
deleted file mode 100644
index 13149625c2d3..000000000000
--- a/metadata/md5-cache/dev-python/netifaces-0.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Portable network interface information
-EAPI=7
-HOMEPAGE=https://pypi.org/project/netifaces/ https://alastairs-place.net/projects/netifaces/ https://github.com/al45tair/netifaces
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/n/netifaces/netifaces-0.11.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3d66c2eab902cb7aab330b5443f3448a
diff --git a/metadata/md5-cache/dev-python/netifaces-0.11.0-r1 b/metadata/md5-cache/dev-python/netifaces-0.11.0-r1
index 8761e051b7a2..499ac6800c25 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.11.0-r1
+++ b/metadata/md5-cache/dev-python/netifaces-0.11.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/netifaces/ https://alastairs-place.net/projects/netifaces/ https://github.com/al45tair/netifaces
 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 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netifaces/netifaces-0.11.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9478de189aa250adb97eaa8c507310ed
+_md5_=8c2ca778ddd39a52b0abb05b3264bf9c
diff --git a/metadata/md5-cache/dev-python/osc-lib-2.6.0 b/metadata/md5-cache/dev-python/osc-lib-2.6.0
deleted file mode 100644
index 32e262d7ecfa..000000000000
--- a/metadata/md5-cache/dev-python/osc-lib-2.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/statsd-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cliff-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A package of common support modules for writing OSC plugins
-EAPI=8
-HOMEPAGE=https://github.com/openstack/osc-lib
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cliff-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4: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/o/osc-lib/osc-lib-2.6.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=68c1d3967a1dd3992314ce7d28505c39
diff --git a/metadata/md5-cache/dev-python/osc-lib-2.6.1 b/metadata/md5-cache/dev-python/osc-lib-2.6.1
index 5b30ed372619..3733c1bd9b57 100644
--- a/metadata/md5-cache/dev-python/osc-lib-2.6.1
+++ b/metadata/md5-cache/dev-python/osc-lib-2.6.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/osc-lib/ https://github.com/openstack/osc-lib/ https://pypi.org/project/osc-lib/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cliff-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/osc-lib/osc-lib-2.6.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=60e153f01a4c99a9990556c65524104a
+_md5_=fea75f52c510a22b74f03dd0da08e56b
diff --git a/metadata/md5-cache/dev-python/pikepdf-5.3.2 b/metadata/md5-cache/dev-python/pikepdf-5.3.2
deleted file mode 100644
index 0725da23e82a..000000000000
--- a/metadata/md5-cache/dev-python/pikepdf-5.3.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-7.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-text/qpdf-10.6.2:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-text/qpdf-10.6.2:0=
-DESCRIPTION=Python library to work with pdf files based on qpdf
-EAPI=8
-HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=app-text/qpdf-10.6.2:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pikepdf/pikepdf/archive/v5.3.2.tar.gz -> pikepdf-5.3.2.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0f39094ded678991c94165e05ba249d0
diff --git a/metadata/md5-cache/dev-python/pikepdf-5.4.0 b/metadata/md5-cache/dev-python/pikepdf-5.4.0
deleted file mode 100644
index 7a662d02265e..000000000000
--- a/metadata/md5-cache/dev-python/pikepdf-5.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-7.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/attrs-20.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-text/qpdf-10.6.2:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-text/qpdf-10.6.2:0=
-DESCRIPTION=Python library to work with pdf files based on qpdf
-EAPI=8
-HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=app-text/qpdf-10.6.2:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pikepdf/pikepdf/archive/v5.4.0.tar.gz -> pikepdf-5.4.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=51e0f7cc8c1be9be43e34cdf6845ab72
diff --git a/metadata/md5-cache/dev-python/pikepdf-5.4.2 b/metadata/md5-cache/dev-python/pikepdf-5.4.2
index bd34473394fb..2adf0d8ab4ce 100644
--- a/metadata/md5-cache/dev-python/pikepdf-5.4.2
+++ b/metadata/md5-cache/dev-python/pikepdf-5.4.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=app-text/qpdf-10.6.2:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pikepdf/pikepdf/archive/v5.4.2.tar.gz -> pikepdf-5.4.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=51e0f7cc8c1be9be43e34cdf6845ab72
+_md5_=14ec87f2ea551a6f7a1e83a655d748cc
diff --git a/metadata/md5-cache/dev-python/pybind11-2.10.0 b/metadata/md5-cache/dev-python/pybind11-2.10.0
index c134d2a888a7..dc8c74c99810 100644
--- a/metadata/md5-cache/dev-python/pybind11-2.10.0
+++ b/metadata/md5-cache/dev-python/pybind11-2.10.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pybind11.readthedocs.io/en/stable/ https://github.com/pybind/pybind11/ https://pypi.org/project/pybind11/
 INHERIT=cmake 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 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pybind/pybind11/archive/v2.10.0.tar.gz -> pybind11-2.10.0.gh.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2fdb53afcd2dcd128377dff8ca1c0107
+_md5_=3bc4a1124bceed2ab6212792d7c87ef3
diff --git a/metadata/md5-cache/dev-python/pypng-0.0.21-r1 b/metadata/md5-cache/dev-python/pypng-0.0.21-r1
deleted file mode 100644
index b6a8cc194478..000000000000
--- a/metadata/md5-cache/dev-python/pypng-0.0.21-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python PNG image encoder/decoder
-EAPI=8
-HOMEPAGE=https://github.com/drj11/pypng/ https://pypi.org/project/pypng/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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/drj11/pypng/archive/pypng-0.0.21.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4bc3c64f11e8334c68ce941bc45b25c9
diff --git a/metadata/md5-cache/dev-python/pypng-0.20220715.0 b/metadata/md5-cache/dev-python/pypng-0.20220715.0
index bfa9ba978c5d..368ab02ef39a 100644
--- a/metadata/md5-cache/dev-python/pypng-0.20220715.0
+++ b/metadata/md5-cache/dev-python/pypng-0.20220715.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/drj11/pypng/ https://pypi.org/project/pypng/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm arm64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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://gitlab.com/drj11/pypng/-/archive/pypng-0.20220715.0/pypng-pypng-0.20220715.0.tar.bz2
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6bc9fb90a34c05a9a4ca3af65db4dfcd
+_md5_=06d82b099b5be45581db92cd01f77e27
diff --git a/metadata/md5-cache/dev-python/python-evdev-1.5.0-r1 b/metadata/md5-cache/dev-python/python-evdev-1.5.0-r1
deleted file mode 100644
index 3eddfd58be61..000000000000
--- a/metadata/md5-cache/dev-python/python-evdev-1.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for evdev bindings
-EAPI=8
-HOMEPAGE=https://python-evdev.readthedocs.io/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gvalkov/python-evdev/archive/v1.5.0.tar.gz -> python-evdev-1.5.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7117406021907d6001067162321974b1
diff --git a/metadata/md5-cache/dev-python/python-evdev-1.6.0 b/metadata/md5-cache/dev-python/python-evdev-1.6.0
index 76a0ce5a4060..cd71e2254647 100644
--- a/metadata/md5-cache/dev-python/python-evdev-1.6.0
+++ b/metadata/md5-cache/dev-python/python-evdev-1.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://python-evdev.readthedocs.io/ https://github.com/gvalkov/python-evdev/ https://pypi.org/project/evdev/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gvalkov/python-evdev/archive/v1.6.0.tar.gz -> python-evdev-1.6.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9b94e53c88ada81862cdfa696d4b7219
+_md5_=ccc974fb5ddec2953f464e8d314aafd5
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-4.11.0 b/metadata/md5-cache/dev-python/python-ironicclient-4.11.0
deleted file mode 100644
index a9bec7a8ce7b..000000000000
--- a/metadata/md5-cache/dev-python/python-ironicclient-4.11.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tempest-17.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ddt-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-openstackclient-3.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dogpile-cache-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/osc-lib-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings for the Ironic API
-EAPI=8
-HOMEPAGE=https://www.openstack.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dogpile-cache-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/osc-lib-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4: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/p/python-ironicclient/python-ironicclient-4.11.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ff02245f26a91178d66bcbfd82f3d81d
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-5.0.0 b/metadata/md5-cache/dev-python/python-ironicclient-5.0.0
index 9014231997ca..65689d8c3522 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-5.0.0
+++ b/metadata/md5-cache/dev-python/python-ironicclient-5.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.openstack.org/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dogpile-cache-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/osc-lib-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-5.0.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=100d9346def1723d2a07931791143a19
+_md5_=ff02245f26a91178d66bcbfd82f3d81d
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-4.5.0 b/metadata/md5-cache/dev-python/python-keystoneclient-4.5.0
deleted file mode 100644
index 7505762c0365..000000000000
--- a/metadata/md5-cache/dev-python/python-keystoneclient-4.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oauthlib-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/os-client-config-1.28.0 >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tempest-17.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Client Library for OpenStack Identity
-EAPI=8
-HOMEPAGE=https://www.openstack.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4: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/p/python-keystoneclient/python-keystoneclient-4.5.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0852436f9f47d4cf0fbb0c94db81498e
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-5.0.0 b/metadata/md5-cache/dev-python/python-keystoneclient-5.0.0
index 01d3e16ccc5d..8ba72d47ba1b 100644
--- a/metadata/md5-cache/dev-python/python-keystoneclient-5.0.0
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-5.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.openstack.org/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-5.0.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=70ac0f1b41b3a89cfc6ad9138c98063a
+_md5_=0852436f9f47d4cf0fbb0c94db81498e
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-7.8.0 b/metadata/md5-cache/dev-python/python-neutronclient-7.8.0
deleted file mode 100644
index 4f466f2bb1b3..000000000000
--- a/metadata/md5-cache/dev-python/python-neutronclient-7.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/bandit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/oslotest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-openstackclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/subunit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testscenarios[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tempest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cliff-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/osc-lib-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/os-client-config-1.28.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A client for the OpenStack Quantum API
-EAPI=7
-HOMEPAGE=https://launchpad.net/neutron
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cliff-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/osc-lib-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/os-client-config-1.28.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4: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/p/python-neutronclient/python-neutronclient-7.8.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cfb60ec156303e06f95af01c549f3c3f
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-8.0.0 b/metadata/md5-cache/dev-python/python-neutronclient-8.0.0
index 2959b2c28191..eb879e4436bc 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-8.0.0
+++ b/metadata/md5-cache/dev-python/python-neutronclient-8.0.0
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://launchpad.net/neutron
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cliff-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/osc-lib-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/os-client-config-1.28.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-8.0.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a3fdd0e44f7e858862652928ffc31036
+_md5_=cfb60ec156303e06f95af01c549f3c3f
diff --git a/metadata/md5-cache/dev-python/pyzmq-23.2.0-r1 b/metadata/md5-cache/dev-python/pyzmq-23.2.0-r1
index ddce3ee2f517..c3ac333e9f9a 100644
--- a/metadata/md5-cache/dev-python/pyzmq-23.2.0-r1
+++ b/metadata/md5-cache/dev-python/pyzmq-23.2.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://zeromq.org/languages/python/ https://pypi.org/project/pyzmq/ https://github.com/zeromq/pyzmq/
 INHERIT=flag-o-matic distutils-r1 toolchain-funcs
 IUSE=+draft test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/pyzmq/archive/v23.2.0.tar.gz -> pyzmq-23.2.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3254ac9c4778d7fabaf8d128b989ba27
+_md5_=a01634837df21bf354f0991cc02ad27d
diff --git a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1 b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
deleted file mode 100644
index 278499767e1f..000000000000
--- a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple generic functions for Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/simplegeneric/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=ZPL
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/s/simplegeneric/simplegeneric-0.8.1.zip
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d484057ff6acc420522b8823fcf720f7
diff --git a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r2 b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r2
index ea1acde15707..8dc009921d11 100644
--- a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r2
+++ b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/simplegeneric/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=ZPL
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplegeneric/simplegeneric-0.8.1.zip
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ed4c736ad6582d7617f06e45165eef80
+_md5_=6fa5f6440becb73d1f586b7917fd0e53
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 01f9f3e8d857..4f15b6007241 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/shaderc-2022.1-r1 b/metadata/md5-cache/media-libs/shaderc-2022.1-r1
deleted file mode 100644
index 4d6f12ee462e..000000000000
--- a/metadata/md5-cache/media-libs/shaderc-2022.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/glslang-1.3.204[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-tools-1.3.204[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/spirv-headers-1.3.204 doc? ( dev-ruby/asciidoctor ) test? ( dev-cpp/gtest || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/nose[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/nose[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/nose[python_targets_python3_8(-)] ) ) )
-DESCRIPTION=Collection of tools, libraries and tests for shader compilation
-EAPI=7
-HOMEPAGE=https://github.com/google/shaderc
-INHERIT=cmake-multilib python-any-r1
-IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-util/glslang-1.3.204[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-tools-1.3.204[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/shaderc/archive/v2022.1.tar.gz -> shaderc-2022.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8ccb9e56a57e17f43ff45236c4d83e38
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index e7f5144b70d1..204a58b24303 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/qtractor-0.9.27-r1 b/metadata/md5-cache/media-sound/qtractor-0.9.27-r1
new file mode 100644
index 000000000000..79ba64fa1c60
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.27-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack x11-libs/libxcb:= aubio? ( media-libs/aubio:= ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framework
+EAPI=8
+HOMEPAGE=https://qtractor.sourceforge.io
+INHERIT=cmake xdg
+IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack x11-libs/libxcb:= aubio? ( media-libs/aubio:= ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=dssi? ( ladspa )
+SLOT=0
+SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.27.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4f4633c3c075a28dcdfc48df8e8d1b43
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 2b410253cbb2..ab91b8fc2fb6 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/vlc-3.0.17.4 b/metadata/md5-cache/media-video/vlc-3.0.17.4
index 1a60223fe5e7..bd18c692bb2b 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.17.4
+++ b/metadata/md5-cache/media-video/vlc-3.0.17.4
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 INHERIT=autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv -sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv -sparc x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm(+),wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.17.4/vlc-3.0.17.4.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=93822ea4dfbd9855a017f4dd3bb0771b
+_md5_=76dc129abbe028b438abf2f2765080ed
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 788f770da64d..7f54d325fc4d 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/bitlbee-3.6-r1 b/metadata/md5-cache/net-im/bitlbee-3.6-r2
index ae31bcd6be78..0cac46bc974a 100644
--- a/metadata/md5-cache/net-im/bitlbee-3.6-r1
+++ b/metadata/md5-cache/net-im/bitlbee-3.6-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.bitlbee.org/
 INHERIT=python-any-r1 systemd toolchain-funcs
 IUSE=debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd msn oscar purple twitter +xmpp
 KEYWORDS=amd64 ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2
+LICENSE=GPL-2 BSD-2
 RDEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( dev-libs/openssl:0= ) ) xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=|| ( purple xmpp msn oscar ) purple? ( plugins ) test? ( plugins ) xmpp? ( !nss )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://get.bitlbee.org/src/bitlbee-3.6.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=55729bf158ce5812e882c00a05c23168
+_md5_=c201d9eda6d78ffb04c72ac578381d09
diff --git a/metadata/md5-cache/net-im/bitlbee-3.6-r3 b/metadata/md5-cache/net-im/bitlbee-3.6-r3
new file mode 100644
index 000000000000..552a8bed8ed4
--- /dev/null
+++ b/metadata/md5-cache/net-im/bitlbee-3.6-r3
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install setup
+DEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 dev-libs/json-parser:= purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( dev-libs/openssl:0= ) ) selinux? ( sec-policy/selinux-bitlbee ) test? ( dev-libs/check )
+DESCRIPTION=irc to IM gateway that support multiple IM protocols
+EAPI=8
+HOMEPAGE=https://www.bitlbee.org/
+INHERIT=python-any-r1 systemd toolchain-funcs
+IUSE=debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd msn oscar purple twitter +xmpp
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 dev-libs/json-parser:= purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( dev-libs/openssl:0= ) ) xinetd? ( sys-apps/xinetd )
+REQUIRED_USE=|| ( purple xmpp msn oscar ) purple? ( plugins ) test? ( plugins ) xmpp? ( !nss )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://get.bitlbee.org/src/bitlbee-3.6.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8969618f9a290149840ce77be84b2b58
diff --git a/metadata/md5-cache/net-im/bitlbee-9999 b/metadata/md5-cache/net-im/bitlbee-9999
index 381679a31f44..8214ecfced3d 100644
--- a/metadata/md5-cache/net-im/bitlbee-9999
+++ b/metadata/md5-cache/net-im/bitlbee-9999
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install setup unpack
-DEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( dev-libs/openssl:0= ) ) selinux? ( sec-policy/selinux-bitlbee ) test? ( dev-libs/check )
+DEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 dev-libs/json-parser:= purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( dev-libs/openssl:0= ) ) selinux? ( sec-policy/selinux-bitlbee ) test? ( dev-libs/check )
 DESCRIPTION=irc to IM gateway that support multiple IM protocols
 EAPI=8
 HOMEPAGE=https://www.bitlbee.org/
@@ -8,9 +8,9 @@ INHERIT=python-any-r1 systemd toolchain-funcs git-r3
 IUSE=debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd msn oscar purple twitter +xmpp
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( dev-libs/openssl:0= ) ) xinetd? ( sys-apps/xinetd )
+RDEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 dev-libs/json-parser:= purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( dev-libs/openssl:0= ) ) xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=|| ( purple xmpp msn oscar ) purple? ( plugins ) test? ( plugins ) xmpp? ( !nss )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8cc6a1e42917e37f13824fbd9af74bf3
+_md5_=8d8a1c407850bc009ce1ac0d3d5e3c98
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 3c3ba6e7ba49..59edc44ad54b 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/unrealircd-6.0.4 b/metadata/md5-cache/net-irc/unrealircd-6.0.4
index 696ab1c03fb4..738513e82893 100644
--- a/metadata/md5-cache/net-irc/unrealircd-6.0.4
+++ b/metadata/md5-cache/net-irc/unrealircd-6.0.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.unrealircd.org/
 INHERIT=autotools ssl-cert systemd tmpfiles verify-sig
 IUSE=class-nofakelag curl geoip +operoverride operoverride-verify verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=GPL-2+
 RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:= dev-libs/jansson:= >=net-dns/c-ares-1.7:= virtual/libcrypt:= curl? ( net-misc/curl[adns] ) geoip? ( dev-libs/libmaxminddb ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://www.unrealircd.org/downloads/unrealircd-6.0.4.tar.gz verify-sig? ( https://www.unrealircd.org/downloads/unrealircd-6.0.4.tar.gz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=877a3e2d472645817439793cf8a27d21
+_md5_=cbe5651cac4617b0a91592e85acd96fe
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index c715d48cf4fa..fa06ddf92f0d 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/yt-dlp-2022.8.14 b/metadata/md5-cache/net-misc/yt-dlp-2022.8.14
index 953cd5b2a326..e4fe872e2718 100644
--- a/metadata/md5-cache/net-misc/yt-dlp-2022.8.14
+++ b/metadata/md5-cache/net-misc/yt-dlp-2022.8.14
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/yt-dlp/yt-dlp/
 INHERIT=bash-completion-r1 distutils-r1 optfeature wrapper
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos
 LICENSE=Unlicense
 RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !net-misc/youtube-dl[-yt-dlp(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yt-dlp/yt-dlp-2022.8.14.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=91793711c86c926c1b3f724565bffc7b
+_md5_=65e9e160041c301a5536c7056d6f1fc6
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9eab8b57769f..c31deb863653 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-18T06:39:45Z
+TIMESTAMP 2022-08-18T12:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL93rFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL+MxJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCzFRAArtL4rkNUEuaSXz6ed+MfvZUslBNZcZQLFXEH/a5EQu4HP43IUshSdsJh
-lPs9rblvQsjWHL3f6vGugyKd3oQDbU2MdrtvqarZjHhKG3OeC/A4ahT66rmzxuY7
-KMgfRaEzRfwCeVkX7W0d0FLsDTSYg4pvpaO7VkgDfZcOuSckWaU6qZgMUf0GYWT5
-t8hBJ8NeOehlfri3OQf2D59ollIzZj1HJcM2ZKM08frJ3AKdDvHzFISM2ttotQp6
-fpm3ONmtVFFPY1TYDC5LW/1/Czez7RZ3d8UAt+grVsQeLFSWvfyapqXKoUge/jpa
-PuscC8zVmd3b4YztXFOLxHL6KjnYYvuui9mKAzB0msFq+cTCHe/WgTGeNua2ifGh
-V1sY2Lp7QDPe0srSZWBp9iq5zQEbh1KA16N1L/+I+Pzy+eVOZHsUWQvV2ZntV4j/
-mOeSTTSzXv+VWRr4N/tYMjOHF/D9aPYMKsXVpSLso/Ixsav15u6R8TuL/Tel0KwW
-lXpsqVr9Ldt+JY2sg0jcmPCVkpK1V7WfYQr6H2FY5rTwGzbj8gISiHsfphTd/Q1g
-L3ahsIOErJgtRH1qGWaPQxzdBUbyHZ2E80JWwTchfbaTpIergcjtLYmMVpw2XGbj
-yc0yxL2D+5IcTtFDEWzaFXK1vxt4FO5IGlZ4JrJ1qTAUwY60Q2s=
-=hYQ7
+klAE8Q//XJlAtvrftwjNCf9i1FE1cgaXNW2hYH1wSACTiN4dAVAwPmZLTp6pSLWz
+p47GA7+fX3pYl57UjAo8hBMlwu1qWvvaPu70jaYhlFPW6OuBaU1pTBCX4ODcDywG
+TMi4ZU0QjbCOUWGN9ICS0mNCIjdrU/NWgck4QO3Dszm0xDC0FbrYd6jfz7NHp93+
+WgRVYk6S/1po5Q7LfblbIDkW56CeF8Uc/wJkBwHaj7u9y2km4MpIhIYP3cxBX/4g
+CHXbyvuIefik3FKvUp/aEd8DHdIQpAK8APuCCAQLcYPhtcL7h6rKR7cHGkJeEz+0
+gQ/P+Awc80ZeWdJNYaniCwRvSsoL54lxxskQ0Q++u3Yd0ggiRAMU5/2yyV5C+GVI
+gRls2PQFuKQSCIJ5NPD2ULlA1nzcy9Hui2mw7AMUJhvIBCZOzcTsllxqrYWyN0bs
+MwRhjLef2EodCwHzf0yBcp/MEfkHYXqbNMP7mZIK2STEck8PMi3l0nCIHlUNuuMH
+V9R96y8dgaqOMz86+ii+6m9eZlqSf0VXIOzw0WDHBEch86DXAQY9nkWlBUCAF1/A
+zdnPKDUcmkonDlvljPaFaegpdH1o5pQgSMTMbnoT+YnBjX8NdFvuZAU21BpKffgb
+ZsveP3jGoRMbu45Ijb0JdGfE1aFNPVEDL3JrPVULH7cSeqmertQ=
+=cF08
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 68c4c65979b2..a789215eba99 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2022 06:39:42 +0000
+Thu, 18 Aug 2022 12:39:43 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3c0507c3e97a..c2d7ede7cf8b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Aug 18 06:39:42 AM UTC 2022
+Thu Aug 18 12:39:42 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d3fc8b79c268..f9b26407e60f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2022 06:45:01 +0000
+Thu, 18 Aug 2022 12:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3fca65899aa5..63d39c4ad1c9 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-67b7b5d5a8e9895175d92798d924f28d4c7cc947 1660803522 2022-08-18T06:18:42+00:00
+92634e10850338c32fa7b3f7751fd83c3a22bee8 1660821758 2022-08-18T11:22:38+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c78e5d25309a..48d76ae1fa8f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660804801 Thu 18 Aug 2022 06:40:01 AM UTC
+1660826401 Thu 18 Aug 2022 12:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 68c4c65979b2..a789215eba99 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2022 06:39:42 +0000
+Thu, 18 Aug 2022 12:39:43 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index cd9767c79898..f9e74f3ef236 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index bcdfa4991de2..6e2b53648d93 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -2,9 +2,13 @@ AUX bitlbee-3.5-libcheck.patch 17203 BLAKE2B 14cb1ba02178e89ed098518a8fb48b6f312
 AUX bitlbee-3.5-libevent.patch 1942 BLAKE2B a6233d97f17d2695efe13a6bd395ba77e72e7c5c3177ae8aaf3223ac3f0979b9650cefcbb000d5e4ccc9ecb8fdab97173ad59022453c5b13c8486fb095b4ff14 SHA512 b8937c542eda36aa5dcdd3213513f6dd5a928166f1017ef370a78765dbc511552072fe46d8322dea27ee716126fd859245e6c2fa713f6b255fb6e7a4ce2c1328
 AUX bitlbee-3.5-systemd-user.patch 188 BLAKE2B 9cdb3713aaf213b741a8dbef0a790a35458b955515bb720987471c519848ec6b9a232fe136ca554a3fe1eb0c184d96b8774cee4a41c0cd3d822a33598ac50e79 SHA512 1775b5dce7bdd4fbe52a46e361d8a9b0127be2dc32a3e8b438fca8fce9139903feb91c968847f002e099553eb8d4a110914cfb19121ae79a3f6c9eb100846edd
 AUX bitlbee-3.6-disabled-plugins-use.patch 1695 BLAKE2B 5c5ab3f330921a471da5fcc39c2156322eb040683ad0ee6894a4c9d189868e9af126c6530ff46879d48878771007c76c1e77b266ea3bcfdba5fc2fe7121ac7ac SHA512 9e7f2a25c70a0d2eca9b6731f568fc3b639b057bebf8131aa9f4089f0ce28761cd03035320cd88ba58c622ec342d08946f31fdec20e45d3b25fb316ac4fe0dfc
+AUX bitlbee-3.6-strict-aliasing.patch 1081 BLAKE2B 69dfd5114e763a40da4a4032fa10b94db69e9a3440f93462396de56078be1980e07bcc3e1c89e3422d8be568c5732c45df9c971c5db0b629f5c396618a660f29 SHA512 f1aa18124a8d6a3bbad2bf6b9c5f6572dd765a33a9a678719f5b980b04a235adfe6c06ff31fe31200260380ec4131202c5f58fd41296525fc6f73974d7ab43f4
+AUX bitlbee-3.6-system-json-parser.patch 2416 BLAKE2B f3b3e2f38fd92893120ddcf2b3825c81df5ae08a1fbf838f5421c0e085956f0a913783bddd2d8218e77bb6d1db0e0591e469d18099e42355a0cc411ad8a8c410 SHA512 f017205c67e0a57d74fc6480eb7a77a942626b83cd09a47201f4dd5f4e8f21f66643f3f448299d58aba5ef8254ca57d527e65d8d624453fef3a738d09d054206
+AUX bitlbee-9999-system-json-parser.patch 2448 BLAKE2B 70d0591724bd40ceb7a4e3da1dd1364b9b08238c6bf6ce0790b13657854a37a20f297d54597501c0bc628b8ab08b6ef2edc9e3de1710307f69b55307a4689799 SHA512 433e243e37df230ea8a3ef7a1ceeadbad3d5f556b25a67122522bdd6b5e51d03639e7a785e1bba667256687690f036d90bbc2297646498d3d48aee3c90748464
 AUX bitlbee.confd-r2 303 BLAKE2B 01ac57be4d6d50be227d6528425909a98231d3e5e2d7718ee71195890123145169a4be1568514b41b9509b992e747c4169022d31fb33c62e00a00f757307d8d8 SHA512 4ba7b8a81d5b77bd8ccd94431b065d4850c97bb153ca715f5f4ea6a1f9a6c90ab2c99fb9d6342311ae948bd34904a9cc2b3696f1b8f09e2475b79d254f744ae4
 AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3c6d30b16ab343995870cfa27a33cfaff04df59fc52f888368d173966a2d5306b2adae98c72c28a305 SHA512 c965f8bbd2b3d13a6c66455a3cc503a94ea0c8000a0e41e283ce1828ee59105d162552979343e8ebb6513fd15bf44a4274b0558928ae0e89b424773cdb8b7b97
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
-EBUILD bitlbee-3.6-r1.ebuild 3349 BLAKE2B 6fdcc45ce8c781104c6d99833f5dbc6a58869fef831c9fcedc5f51c2712eaef88d538162fe1ee5371dd052d7e1cd2ecd82ce449a045d73f8f26f80e852e143a0 SHA512 8c4d2d82c6d9af52690d176c7712399bd5661c691025903f45cf4bee57cbf18b89406b7e098467dad21c2c66a60aab2ff750f7f2b0e8e9bc8d41a0d4fde24f81
-EBUILD bitlbee-9999.ebuild 3218 BLAKE2B 52f5e6430c79a63512a5287b2fe5e252b47e135bf780406caa713a87b8e4cd16bf789a6f20616b725ecdedc4d11622849e0037f6b9654c9ba967109ec53d0bd0 SHA512 5dc19698ce6f2336c9e9d64d0164b58c277674e0d31b623b0e5d062a3d9eec3f76e6023d411396f90dfc6d1115e8cdbfb30ff7e9ee583722c8f68cb0abd82060
+EBUILD bitlbee-3.6-r2.ebuild 3429 BLAKE2B 6fe3a53244299cd65de9bef03574e80d682057b16927aaf311574b4bea67e7df4704eddab070f99e7d5f2c5882bdaa0eb18cb9b22168ccf52c6fa20ba553941a SHA512 d5dbd63b8ba6253b90c485a2587d951a4803f2fad76b838e73549929bed25e78ff378d59b16043896b3ec89040af40e497f2088d50b09f103c67e0e543da4394
+EBUILD bitlbee-3.6-r3.ebuild 3456 BLAKE2B ca4c8c900f0f2a4162cf81b01823c9e433b36ff5cba7ff2d639ff5a239143d0bbe0334d8a4bdd90685911605d427d3d4a2b3b06ed444f496ad72f9761a095a61 SHA512 2d6eac5608a402cdc889bd512b078a6e92ccf247ff2182a4720559264ae46ff6598886f29ab840e4e776584af5eae40a97f07a87ed72ad98ad9c591040b47643
+EBUILD bitlbee-9999.ebuild 3353 BLAKE2B 77f1d077fd562d6c995dedc72e7fbbb5449138ce25b5246b0a908f3fe4ef803a25bb0a44e1298b26d70fc3ffa3b7fadca1650d5f692acfb900d72d55cbe2c014 SHA512 603a0df44a93590b9a3d642e95da80c5305be5b62cb282686a7a934b7f3f690a78ff1401360bc4bb113b3cdfa89876cd9e8a8308376b74c6808f3026dfe9dc72
 MISC metadata.xml 1249 BLAKE2B c632b9333f1ece9f3ff98937466943f3e3cd00040402d77a3036e916f26a31cd6db4fd0448f84236830875b2e4bb8611d9cd3925166aff6840ab6d0511ac0d1f SHA512 6ebc32ca990a8904828f5b120e489669e5544e2d0dbba17aa627dde28d511d3cb7f9de86363134a0b5d629ad84e659a8834dac70dcdde0816e7ce1961dcd45eb
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild
index c54da3fb2392..127f0a88198d 100644
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild
@@ -18,7 +18,7 @@ fi
 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
 HOMEPAGE="https://www.bitlbee.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 BSD-2"
 SLOT="0"
 IUSE_PROTOCOLS="msn oscar purple twitter +xmpp"
 IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd
@@ -65,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-libcheck.patch
 	"${FILESDIR}"/${PN}-3.5-libevent.patch
 	"${FILESDIR}"/${P}-disabled-plugins-use.patch
+	"${FILESDIR}"/${P}-strict-aliasing.patch
 )
 
 src_configure() {
@@ -114,6 +115,7 @@ src_configure() {
 		--prefix=/usr \
 		--datadir=/usr/share/bitlbee \
 		--etcdir=/etc/bitlbee \
+		--libdir=/usr/$(get_libdir) \
 		--plugindir=/usr/$(get_libdir)/bitlbee \
 		--pcdir=/usr/$(get_libdir)/pkgconfig \
 		--systemdsystemunitdir=$(systemd_get_systemunitdir) \
diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild
new file mode 100644
index 000000000000..72d2a7207ba2
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-any-r1 systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
+	inherit git-r3
+else
+	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="https://www.bitlbee.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE_PROTOCOLS="msn oscar purple twitter +xmpp"
+IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd
+	${IUSE_PROTOCOLS}"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	|| ( purple xmpp msn oscar )
+	purple? ( plugins )
+	test? ( plugins )
+	xmpp? ( !nss )
+"
+
+COMMON_DEPEND="
+	acct-group/bitlbee
+	acct-user/bitlbee
+	dev-libs/glib:2
+	dev-libs/json-parser:=
+	purple? ( net-im/pidgin )
+	libevent? ( dev-libs/libevent:= )
+	otr? ( >=net-libs/libotr-4 )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		nss? ( dev-libs/nss )
+		!nss? (
+			dev-libs/openssl:0=
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-bitlbee )
+	test? ( dev-libs/check )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	xinetd? ( sys-apps/xinetd )
+"
+
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.5-systemd-user.patch"
+	"${FILESDIR}/${PN}-3.5-libcheck.patch"
+	"${FILESDIR}/${PN}-3.5-libevent.patch"
+	"${FILESDIR}/${P}-disabled-plugins-use.patch"
+	"${FILESDIR}/${P}-system-json-parser.patch"
+)
+
+src_configure() {
+	local myconf
+
+	# setup plugins, protocol, ipv6 and debug
+	myconf+=( --jabber=$(usex xmpp 1 0) )
+	for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do
+		myconf+=( --${flag}=$(usex ${flag} 1 0) )
+	done
+
+	# set otr
+	if use otr && use plugins ; then
+		myconf+=( --otr=plugin )
+	else
+		if use otr ; then
+			ewarn "OTR support has been disabled automatically because it"
+			ewarn "requires the plugins USE flag."
+		fi
+		myconf+=( --otr=0 )
+	fi
+
+	# setup ssl use flags
+	if use gnutls ; then
+		myconf+=( --ssl=gnutls )
+		einfo "Using gnutls for SSL support"
+	else
+		ewarn "Only gnutls is officially supported by upstream."
+		if use nss ; then
+			myconf+=( --ssl=nss )
+			einfo "Using nss for SSL support"
+		else
+			myconf+=( --ssl=openssl )
+			einfo "Using openssl for SSL support"
+		fi
+	fi
+
+	# set event handler
+	if use libevent ; then
+		myconf+=( --events=libevent )
+	else
+		myconf+=( --events=glib )
+	fi
+
+	# not autotools-based
+	./configure \
+		--prefix=/usr \
+		--datadir=/usr/share/bitlbee \
+		--etcdir=/etc/bitlbee \
+		--libdir=/usr/$(get_libdir) \
+		--pcdir=/usr/$(get_libdir)/pkgconfig \
+		--plugindir=/usr/$(get_libdir)/bitlbee \
+		--externaljsonparser=1 \
+		--systemdsystemunitdir=$(systemd_get_systemunitdir) \
+		--doc=1 \
+		--strip=0 \
+		--verbose=1 \
+		"${myconf[@]}" || die
+
+	sed -i \
+		-e "/^EFLAGS/s:=:&${LDFLAGS} :" \
+		Makefile.settings || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd
+
+	keepdir /var/lib/bitlbee
+	fperms 700 /var/lib/bitlbee
+	fowners bitlbee:bitlbee /var/lib/bitlbee
+
+	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins doc/bitlbee.xinetd bitlbee
+	fi
+
+	newinitd "${FILESDIR}"/bitlbee.initd-r2 bitlbee
+	newconfd "${FILESDIR}"/bitlbee.confd-r2 bitlbee
+
+	exeinto /usr/share/bitlbee
+	doexe utils/{convert_purple.py,bitlbee-ctl.pl}
+}
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index fc8360cb0399..0a8cc973ae18 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 	acct-group/bitlbee
 	acct-user/bitlbee
 	dev-libs/glib:2
+	dev-libs/json-parser:=
 	purple? ( net-im/pidgin )
 	libevent? ( dev-libs/libevent:= )
 	otr? ( >=net-libs/libotr-4 )
@@ -61,7 +62,8 @@ BDEPEND="${PYTHON_DEPS}
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-systemd-user.patch
+	"${FILESDIR}/${PN}-3.5-systemd-user.patch"
+	"${FILESDIR}/${P}-system-json-parser.patch"
 )
 
 src_configure() {
@@ -111,8 +113,10 @@ src_configure() {
 		--prefix=/usr \
 		--datadir=/usr/share/bitlbee \
 		--etcdir=/etc/bitlbee \
-		--plugindir=/usr/$(get_libdir)/bitlbee \
+		--libdir=/usr/$(get_libdir) \
 		--pcdir=/usr/$(get_libdir)/pkgconfig \
+		--plugindir=/usr/$(get_libdir)/bitlbee \
+		--externaljsonparser=1 \
 		--systemdsystemunitdir=$(systemd_get_systemunitdir) \
 		--doc=1 \
 		--strip=0 \
diff --git a/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch b/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch
new file mode 100644
index 000000000000..30ecff9747ee
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch
@@ -0,0 +1,31 @@
+Based on upstream [1] commits:
+- 161dff8321df ("Fix error type-punned pointer warning")
+- d7b67db02aaa ("Fix error type-punned pointer warning")
+
+[1] https://github.com/json-parser/json-parser
+
+Upstream-PR: https://github.com/bitlbee/bitlbee/pull/162
+
+diff --git a/lib/json.c b/lib/json.c
+index 24288f94..2150cbaf 100644
+--- a/lib/json.c
++++ b/lib/json.c
+@@ -139,7 +139,7 @@ static int new_value
+ 				return 0;
+ 			}
+ 
+-			value->_reserved.object_mem = (*(char **) &value->u.object.values) + values_size;
++			value->_reserved.object_mem = (void *) (((char *) value->u.object.values) + values_size);
+ 
+ 			value->u.object.length = 0;
+ 			break;
+@@ -406,7 +406,8 @@ json_value * json_parse_ex(json_settings * settings,
+ 					case json_object:
+ 
+ 						if (state.first_pass) {
+-							(*(json_char **) &top->u.object.values) += string_length + 1;
++							json_char **chars = (json_char **) &top->u.object.values;
++							chars[0] += string_length + 1;
+ 						} else {
+ 							top->u.object.values [top->u.object.length].name
+ 							        = (json_char *) top->_reserved.object_mem;
diff --git a/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch
new file mode 100644
index 000000000000..02d57e02d6d2
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch
@@ -0,0 +1,82 @@
+This is adapted patch from upstream PR 151. Original PR defines
+--external-json-parser which breaks configuration, see [1]. It was changed to
+--externaljsonparser and $external_json_parser to $externaljsonparser.
+
+[1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905
+
+Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151
+
+diff --git a/configure b/configure
+index 4640c806..77b1213b 100755
+--- a/configure
++++ b/configure
+@@ -47,6 +47,7 @@ plugins=1
+ otr=0
+ 
+ events=glib
++externaljsonparser=auto
+ ssl=auto
+ 
+ pam=0
+@@ -148,6 +149,7 @@ Option		Description				Default
+ --events=...	Event handler (glib, libevent)		$events
+ --ssl=...	SSL library to use (gnutls, nss, openssl, auto)
+ 							$ssl
++--externaljsonparser=0/1/auto	Use External JSON parser $externaljsonparser
+ 
+ 
+ --target=...	Cross compilation target 		same as host
+@@ -398,6 +400,20 @@ else
+ fi
+ echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
+ 
++if [ "$externaljsonparser" = "auto" ]; then
++	if pkg-config --exists json-parser; then
++		externaljsonparser=1
++	else
++		externaljsonparser=0
++	fi
++fi
++echo "EXTERNAL_JSON_PARSER=$externaljsonparser" >> Makefile.settings
++if [ "$externaljsonparser" = "1" ]; then
++    echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings
++    echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings
++fi
++
++
+ detect_gnutls()
+ {
+ 	if $PKG_CONFIG --exists gnutls; then
+@@ -979,6 +995,12 @@ else
+ 	echo '  systemd disabled.'
+ fi
+ 
++if [ "$externaljsonparser" = "1" ]; then
++    echo '  Using system JSON parser.'
++else
++    echo '  Using bundled JSON parser.'
++fi
++
+ echo '  Using event handler: '$events
+ echo '  Using SSL library: '$ssl
+ #echo '  Building with these storage backends: '$STORAGES
+diff --git a/lib/Makefile b/lib/Makefile
+index fc46aedc..ad95d9cb 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -12,7 +12,11 @@ _SRCDIR_ := $(_SRCDIR_)lib/
+ endif
+ 
+ # [SH] Program variables
+-objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
++objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
++
++ifneq ($(EXTERNAL_JSON_PARSER),1)
++objects += json.o
++endif
+ 
+ LFLAGS += -r
+ 
+-- 
+2.35.1
+
diff --git a/net-im/bitlbee/files/bitlbee-9999-system-json-parser.patch b/net-im/bitlbee/files/bitlbee-9999-system-json-parser.patch
new file mode 100644
index 000000000000..07f2878525ec
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-9999-system-json-parser.patch
@@ -0,0 +1,83 @@
+This is adapted patch from upstream PR 151. Original PR defines
+--external-json-parser which breaks configuration, see [1]. It was changed to
+--externaljsonparser and $external_json_parser to $externaljsonparser.
+
+[1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905
+
+Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151
+
+diff --git a/configure b/configure
+index 4640c806..77b1213b 100755
+--- a/configure
++++ b/configure
+@@ -47,6 +47,7 @@ plugins=1
+ otr=0
+ 
+ events=glib
++externaljsonparser=auto
+ ssl=auto
+ 
+ pam=0
+@@ -148,6 +149,7 @@ Option		Description				Default
+ --events=...	Event handler (glib, libevent)		$events
+ --ssl=...	SSL library to use (gnutls, nss, openssl, auto)
+ 							$ssl
++--externaljsonparser=0/1/auto	Use External JSON parser $externaljsonparser
+ 
+ 
+ --target=...	Cross compilation target 		same as host
+@@ -398,6 +400,20 @@ else
+ fi
+ echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
+ 
++if [ "$externaljsonparser" = "auto" ]; then
++	if pkg-config --exists json-parser; then
++		externaljsonparser=1
++	else
++		externaljsonparser=0
++	fi
++fi
++echo "EXTERNAL_JSON_PARSER=$externaljsonparser" >> Makefile.settings
++if [ "$externaljsonparser" = "1" ]; then
++    echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings
++    echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings
++fi
++
++
+ detect_gnutls()
+ {
+ 	if $PKG_CONFIG --exists gnutls; then
+@@ -979,6 +995,12 @@ else
+ 	echo '  systemd disabled.'
+ fi
+ 
++if [ "$externaljsonparser" = "1" ]; then
++    echo '  Using system JSON parser.'
++else
++    echo '  Using bundled JSON parser.'
++fi
++
+ echo '  Using python: '$PYTHON
+ echo '  Using event handler: '$events
+ echo '  Using SSL library: '$ssl
+ #echo '  Building with these storage backends: '$STORAGES
+diff --git a/lib/Makefile b/lib/Makefile
+index fc46aedc..ad95d9cb 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -12,7 +12,11 @@ _SRCDIR_ := $(_SRCDIR_)lib/
+ endif
+ 
+ # [SH] Program variables
+-objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
++objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
++
++ifneq ($(EXTERNAL_JSON_PARSER),1)
++objects += json.o
++endif
+ 
+ LFLAGS += -r
+ 
+-- 
+2.35.1
+
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index b30dcd1d2b0e..11abae8e7389 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 7be452356d06..33a6e2e9393a 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -7,5 +7,5 @@ DIST unrealircd-5.2.4.tar.gz.asc 866 BLAKE2B 9fc520e93f80a548650b016690036c4e995
 DIST unrealircd-6.0.4.tar.gz 8696690 BLAKE2B 25960ce78d56f7e5c2ad62751f3359ffc8df1885351f5a8bc36461f2a0a45aed1e99adb207e56988f9bf637d51f8cc17ca3d82f232f09e659a26c0afc3655a93 SHA512 fddce374dc7480e0f02d91965926028993e965450cfe871985ffbfadf38c86198d55be024eddc3dac65e44ff859a6e5e7e8176110d87042b489ce4b14deeeca2
 DIST unrealircd-6.0.4.tar.gz.asc 866 BLAKE2B 79bc065c7b24398bee53660c9dc4a7cfca857c7368b3667d2fdd30c87a160126dff0b255b3a20cc436026b923eb6dd744ca21a010f3a0b5df13af185bec211db SHA512 467b3cc1d291da76fea6b4e8fbeb02ffd24a3bd94b6eddf1e94ceabe9fc97e573fd6a3860b49370088a9c60ba0e0485af0f9f5a48e854e1b30f4d45be873ac20
 EBUILD unrealircd-5.2.4-r1.ebuild 5491 BLAKE2B a82c2aab7db44a19a1d752434d86f092e90c7ac88931a45bf1c7f12d0459759eef445ba73d03f9ba828debe30b79d56bd4b2d0d828462f1b21799b883469ebe6 SHA512 ba0fe9538fdc7bf601e318b30b3529fcb0c5da14c71689c7e2fe6ce2e4465d74c6e72ec4aab2db1ad6a20d7267feba745a302c068f2542a278c72b984b4aaa5f
-EBUILD unrealircd-6.0.4.ebuild 5857 BLAKE2B 47fabbc2879e41c4108b2dbf0b7f3240fe7cc5f5a219f3a9026d17d98f8cd567b5f4f0205323a0e5d80683b8b4a00ae10bb40a5f0abe14b2bf67788e6c33a393 SHA512 be8cf1005007ffed85812e02f0feb8a77695aa285c503e956293c2f039c2ade72e07d7a1a2e2ae7a2c3f7c105eec6020dc86fa4e65f3b08913438454d72ef66b
+EBUILD unrealircd-6.0.4.ebuild 5864 BLAKE2B eafed7d7c5c700b22e4de634c16c89967a44cdffbb7a21a53279a2ce3e0e6fd8fe37cb4940ae9a9bf14ad0f5a993609af10025d8de55d38b79758ec15fb03bf7 SHA512 6063d17541d77c989d181cafe6ee358d15b09bf769cde42c4c0ef4347ca6383e02e1902367211a45aad6be512b68ec87d9b2d26a52eac3f896cabd323156468c
 MISC metadata.xml 978 BLAKE2B 7149e20723b563c08f93a7383b4f934104c24c945a4cf07510a7945d418a824db990eec1fca839f67c739296e519e67033b4181c7fbf0761336053dfd68a1898 SHA512 926d227e04485b71ce6f6cce4f8addebd4479837d5b9f4bb412f391edd74d72d38aefbe9275bc2a45ee25117990ceeb796722f7753c082e987dc09d07c277987
diff --git a/net-irc/unrealircd/unrealircd-6.0.4.ebuild b/net-irc/unrealircd/unrealircd-6.0.4.ebuild
index 7cc9feca1c71..4811353f1fb1 100644
--- a/net-irc/unrealircd/unrealircd-6.0.4.ebuild
+++ b/net-irc/unrealircd/unrealircd-6.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE="class-nofakelag curl geoip +operoverride operoverride-verify"
 
 RDEPEND="acct-group/unrealircd
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 679f994100f7..e3f8cb9c953f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 4b6d272c766d..b749ab840f14 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -2,6 +2,6 @@ DIST yt-dlp-2022.7.18.tar.gz 2348854 BLAKE2B 3ef23b1fbc379af2e2a291e96efe495a38d
 DIST yt-dlp-2022.8.14.tar.gz 2368444 BLAKE2B 77994eabc7832ee75b397fbd3d7a37b4fc3cfda2e092e3410656bf303618b2bc6f65eeffe1c99b21e80233f7ddf4ade72debbf5151eb68a0e0e87c512917626f SHA512 5a2219d55fb4f02c2f22eb6bf11d9986c75613401c3b8f7f8d39e6a5a534cb91f5c27fbf735919c414c3d7f193024315eb3eee02a1743828bdcf9b102a748cee
 DIST yt-dlp-2022.8.8.tar.gz 2361172 BLAKE2B a210786df56faa39a725f2ab06c9cc7805128c2f4fde4c504bd26a09d6a38cf25bea8b52f1471261bb007c8645170a29fae364e3b4008d1ebc8d4f0caf645c35 SHA512 bef1f1110c97f0c8338e94fc2671849cbfe086eb7dba974c623dde2beec29a17dd0c9972603a5af530a07e0721a00e56c6437a2b5d82b39630e3f4f49b51b00b
 EBUILD yt-dlp-2022.7.18.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
-EBUILD yt-dlp-2022.8.14.ebuild 1829 BLAKE2B 653c11229a14a5f360e24041cee0610d843fd31127712a2460d9d3096a579ad32afb9b09f6eb69fc4695f839c7503bbec0637fb052b2687e86d7439499dfb268 SHA512 be1ee1cc642fa36d49dc26737e8eba82e63c49b01e864c757923ce0021e07dcda1e6823400eecaadf3cfcd3b4b784d64606bbb801acde5e064ef14b32f02cdeb
+EBUILD yt-dlp-2022.8.14.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 EBUILD yt-dlp-2022.8.8.ebuild 1829 BLAKE2B 653c11229a14a5f360e24041cee0610d843fd31127712a2460d9d3096a579ad32afb9b09f6eb69fc4695f839c7503bbec0637fb052b2687e86d7439499dfb268 SHA512 be1ee1cc642fa36d49dc26737e8eba82e63c49b01e864c757923ce0021e07dcda1e6823400eecaadf3cfcd3b4b784d64606bbb801acde5e064ef14b32f02cdeb
 MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/yt-dlp-2022.8.14.ebuild b/net-misc/yt-dlp/yt-dlp-2022.8.14.ebuild
index 775abf17078d..705a62db9da4 100644
--- a/net-misc/yt-dlp/yt-dlp-2022.8.14.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2022.8.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@koprulu.sector>	2022-08-18 14:34:38 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-18 14:34:38 +0100
commit	3fb6e94893672e0dfbae682e6a3418e3f1260bf2 (patch)
tree	6b19e4b8d9cb929c7caba132adbd596883f582ca
parent	933ed80ab9b645de54b16eeb7410c0a54f47574f (diff)