gentoo auto-resync : 10:08:2022 - 20:18:34

author: V3n3RiX <venerix@koprulu.sector> 2022-08-10 20:18:34 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-10 20:18:34 +0100
commit: f1cd8f3514f8b9fbc1cc9cfe0dd08a8cb258e87a (patch)
tree: e16b2f573ffa54d21accbf0dfc3647b47b0578c8
parent: e9c5cd3a9230f2f3f5980a5ca0c4ec20c099c7ed (diff)
333 files changed, 1336 insertions, 3436 deletions
diff --git a/Manifest b/Manifest
index 8a4b4fe9a82f..e1f6705a29b6 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29643 BLAKE2B 5a1b8d79367f1be452683ad4038da2b070dfe6ab8697df3521f9b51d9c997bbfc4b48e6ebae5b29ec100d4748a60fb080d02893b364a38e3940d84d6214a9fd4 SHA512 479f4891d1175e0ab9d64bc5ef7b8501ede705dee34c59ac18a7f10b51056d361fa11e1cc9be5ccb383ccd60ee60dad0768e583b9ad308c0e899c70ba6e297e5
-TIMESTAMP 2022-08-10T12:39:58Z
+MANIFEST Manifest.files.gz 29651 BLAKE2B d063aa8649789cc7d69d15220cd5c7550eefd8ad544373070aa785068b557420b7a6593ebfb7f59b377d96760f4d549c046a82c2bc83c3ea909526d53f273033 SHA512 47cd12788907017e17416e951c65ce74de695651dc629fe28859a58c625af5ff08b9ab1544a0a56fe6173d9922ed161893203b45d2dbf1b2003e8e2755411223
+TIMESTAMP 2022-08-10T18:40:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzpx5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLz+4FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCvMg//fDwUekHcC0VxSrBDiqs3iaq/hdjYUYsDbSSkwaBM90Zbo/eSREf/XPBw
-+RUeMqSt21L1TeoF8f8YMLtSsTgI3VBzcPxe6uno4Q0TdYh5D20gjRnbVYvKT8Lt
-RMPvWPWTiRB+p9iQrYaPWP6sPUroafCFZUbjXMEyqF0/Lq/lgaLpknBBGLFJSYQc
-974qXV6WC1lOS8VmM6a9/C5WI1QjCGrgvN1nymmPpS307Qn1HweHh9d08OwQw/mL
-0GRZbGYTmOQV1tOJCICnARmXifXX5i1218t7myplP5BKI5tBlsFBptNR6K2t2WWu
-MN0ARWZHTASNACDBWzpO6ZRZUwZocUEbjsjGm29eUnqHGYiR1QZIbBiNAiDv6Ebs
-XMZrZn9Ob46YfsOf81HeAn5hxPYiLflahiLwZmp+G0Rzi2m/rL0Qnx14zYwaZZcU
-dgUTOc0mP7whWjQ3pJpbXMTd4aqLsnH5WKZcx13bUXgV03Vdc4TDPHRSBjFMPAFC
-8SLDH+Tl7casFwJBqLVtyNYUIfdaYXTtVCmMjZFqpZ010SYm4ooeGXC2kRvtDX4U
-r39zRN/JVHARan60zMqHglD80Vq10DunTV0oUyXDAD/cZARmhS//RZXrQ2OFrulr
-ddJoO0KLidIu2c2ZMWtFECimSwt6j5HD0YokrLL/YJmRHkNY4ic=
-=3gKa
+klCYXhAAsCuPhmZoJjZj3BTJxo/iAzSqlw3SPCiJmMfPxasTmAZO6t+UWfsOKNav
+qo6Qw0cblII82+BCfRoeuYFcc+enVwQO+wvh8AAxcJ7IWz5/fLtyjZyG4umnH6io
+Am6eAIxhG4kuwXcRPfkjNoitJsgnbAFjZGRMU388sppaPyAtq+oVyHk5UlLE3Rv0
+yA4ina/C6jt5z1AXerhdlmryvwVmYlVqgGGgWDaIGDRBYe1ajav+Exxdf1kQgs3E
+34cxsf9bOyq8RLUXOasoskuOUPT8Zoo4MBkPdgaft33l4WpZIzEJH7D9ZwqfBRcJ
+6xjRwjawC/rzWLNwC75Q9aEyP+QkIlimQUfnQK6CPUdO5oS1yKFcq4RWHIktwcBc
+hy5yGp9vA605EbtBzoXX9c9AQa+roPOg3wyy/kYBNac7bCfQZa2/0xmR69iglFil
+vM8eazhHEfTmABtalAXdNiuI/wvHC5JfcxIZ34nSzCbvwWb3OwYaO6sgFbJVtirl
+JM0cTBeQp9REq5S1RyGPLkVp3oM3Cf86NBigbuJJmQJI9HFWcV3hq82QMsKaz4Rb
+e2H7FWNonnjK7cq/K/1cIgU7IzgD5xy6lIxEK/NALgWtqw0Dx+Go8EWI/RBbORFH
+99MSKtM8oAos4RWzX/uwB1urU4o//iT4Splfv7TjSjFUCJVSQf8=
+=FYqm
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 592b80165e30..577821c47695 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 470ca3ff69fc..aeb6f4dd664e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index d55c0c1d789b..5144db8eea09 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -7,24 +7,21 @@ AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad1
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
 AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686751bd88db5263c912e60a7be1e90fa50ecd3b10b14d046f525227b1feb39528ef488b8879d58ba84 SHA512 5d11cfe47ca797941815f51f08d4e8e308e4827bed9235ddf1174f3357d7279a3c8151e02f1cbd3cf3a6d2f7d5e2f68061d3e17fab6a0291f01c32f88e995039
 DIST rsyslog-8.2102.0.tar.gz 3123684 BLAKE2B f5c4e00d68ec82ed3f7b89dd5e888bebda9c4eb38185dfd8ecd96c1bf77380385aaddac73ab1de8364e1239a3de746f160c18b0f135d006f473f9e40be2c18a1 SHA512 281b0e5d5cb548c39a6e514e5fd5b1bdbe8ca0bdd9234f4fea581ed7679f76d2d75b65d14c3c5e799f86f91600074ff75b467aa1ff27cdbec0f4197261c5aec0
-DIST rsyslog-8.2106.0.tar.gz 3180745 BLAKE2B a949c36e0c5251fa3cd7748387990b667564561a5fcf0250bb19ebf62bf88f367814f86d743c64e0b5e5a184e2160ec0c2cd2600ac0ffc655e41d651495e9311 SHA512 309bba7e53f0dc6462f8cac781f567ce879f31bc020b233e80aa4461cc4c6e9279ca1c65c910ce3015fcab9ed663020db84ff4073c03a436b5be66e57a99164f
-DIST rsyslog-8.2108.0.tar.gz 3204178 BLAKE2B d120f2b20521a40fbe985a4ba751edd51ed5917fcd0db5d7abb35ecada3ada31f99d34f74cd3278736356e8f09f13b79ca2166e4732676a97655c189d257e3fa SHA512 95096660bc93f7808d22c39549d7429deb340ef8d706f08dc8be35f48d1c7e3d389907fdf18ba04dd54fb59c9780fdb267eef7985184f0e5932bf11f46c5423b
 DIST rsyslog-8.2110.0.tar.gz 3217225 BLAKE2B df239609b7a5e08d2a5b1ab5823d45868ac75e1359876e032d4de633165878310f43bfacabab2df4b5657789f77dd2d93814d2fe2aa39e18b267b9bb9234c975 SHA512 b3ec40a272e1fee3034fb24a21ae6c773878b013c04bd01279f6b3bba65a98287c3497a3c4c3e46f8c91311117b3dc491a11a7e193f7ee0347b769c4162b48aa
 DIST rsyslog-8.2112.0.tar.gz 3230105 BLAKE2B deee27f0b1e2b9783bef4d90e396c92c772465156ae8242172548794d628edb5d1e9a95d9ee2aeb2b301ec4b691572391ea7db7b1e8fdb1d14c65e3857857799 SHA512 32ee475d4ef34a68aa43997a97472d21f45c27052c528c1904786df608977189a53e8bb88f310dc2ebe3bf11857824e4e2188c5b85591a005b6977f90a6b17c3
 DIST rsyslog-8.2204.0.tar.gz 3242825 BLAKE2B 1e7a75f151053c28bf8e1215f8f1da58ee2232127b4edae6c1a59ff236b2ff0aea57fb175bcdde9a3bd3ce516015422a2eda1f857fdeb56489555de27cf2deda SHA512 d26ab950788b8931b895719f7d8a42509f709b69a76e4188df16f72be050863ee402310ad9300840fed4ac089638497725d67433172778be7b2932fa82210472
 DIST rsyslog-8.2206.0.tar.gz 3246829 BLAKE2B cfe88f12821146011914610e33cb907bd96f19b6e67c0eb3f9bd88b749eebd3a91ae27e445688842a806719cfe9757778d3f9705cd2d6a497d358015c9ddf36b SHA512 000d2a05ef4823879e615a347f62f76d3af7d43cddb119e7f57a8470aade00139475368579385ba008a1d5979082128ef6148e0fac2478f6e0ccb26e68d317b7
+DIST rsyslog-8.2208.0.tar.gz 3262298 BLAKE2B c13920c755a24d8060335f3281a349d2f32c3c99de7351991e09e62302f6d9f61f4390b7945e30816c7d28afe5f757f6a49b2855e40e3f2f518a423662196b1b SHA512 e63f2465011722eb1bc99676ef6afd66e655af4fb9d751b3d8776499d054c422b195c65fef9ea6b9012d9fb334b7ed8a1c918167fecff389cbb79aa6b74acb73
 DIST rsyslog-doc-8.2102.0.tar.gz 6419104 BLAKE2B 134c7ccde6f7435b35840fa37f5774223ac1ebd7dc10db961900a7b1600483156518433c7f70d0981e96ea750e1916ab53e346abacf58066bf141e85c719ae00 SHA512 a5dc4fb9bd8892fac693c5692b926c8d7d9fa36667d6b4c6eccba750713af88d4317f6232efc2a16de38c2e58c4a8bc4d04c9ebb2e7ebc3b0878d53eef20dd2e
-DIST rsyslog-doc-8.2106.0.tar.gz 6500747 BLAKE2B d004af40dfc82577fe262993b10497cbf50142295ccfc046126e0d8cc85dd964cca7798732d2f41ef9d776096b3ec99a8c835bb037a78c9030ea6cd596d1e057 SHA512 04c205ea463f7487baedf60d0469f3752edfb60a0833954a3f208d52ed6495152c785a4a8ea47396ac85b581ced0657f7b51d313c2d4295e26d547b996ff4ca3
-DIST rsyslog-doc-8.2108.0.tar.gz 6527584 BLAKE2B b7974d2f723603017f1c725f820e03f355af1805d77143e6ff9eeb02e54a991ba4c143fc45b48b3e1625328e68113df36d71abd0763983a8db655081c5d81abc SHA512 d4ca8c91cbdd7be458083ffec9d933e5d1e175dff93fdf9274f5ca444c9cfe8710349c16de6edfd3e12cf97fc889a9e71059ef1d0b85fda4ed335fb107b98a9f
 DIST rsyslog-doc-8.2110.0.tar.gz 6533014 BLAKE2B 16670903ddbbc14ef5ebc726964d1fa879849294401825a4e2c65e0ca06924830c2c882b98ab6eb6c2f639dfcf683b8c7659b49965b4280d441935126364ce9c SHA512 f0081b28d7394af30d4e1873a040208ec358d45c7336c69e99e2d6d4a2aae86a25a65d3c803b6570668e24625e50e01d5af3f9fa90f1c8cc82b45b1b6bd7a7e0
 DIST rsyslog-doc-8.2112.0.tar.gz 6545985 BLAKE2B 4f6cfbbf8062a70faa67dd7168ad35bcbe2c81f80560ddb48229a332ce8ac861efe3bdaa1baeddbdd086c3e9ac8912746ba58bc64ab62f3caba8b8cc1b0014fd SHA512 8588d5fd1a79fce785db85ba162ed2fa9e5375590ee8e6d8569e75334d36683a1b977e930c096a6b3dac15596c066b46fc3105fcc5e8232ab11cf43c6eed3a55
 DIST rsyslog-doc-8.2204.0.tar.gz 6553264 BLAKE2B b4691a6bba44ec37bf310c4f7b307f85bc5d30954296ad62f77ff0f5041badf5fc40fc5680b940f6f3929da8956928dea890f7f2547f7db5e1e4141ef0855b48 SHA512 361528b95c1f02cdc2b2ca8ba5252c8215996e81ef1602e08c46be4e1fd8c1c287dd7d52ae9b2b58c0ec7fe38d7079a89e10642ac3f34fe0b6c5737968999fb4
 DIST rsyslog-doc-8.2206.0.tar.gz 6553532 BLAKE2B 51288f5e819393ad6b5af1acfa030b262c1a97c9cc791606c16792201eb8f7bbc9750bb004e7592a99fa1261b971911a6c2bbe6c0b82a6c3bb067b077ce22641 SHA512 23d686241bb6422146602420e21a53208ff82f39f76258d7147dc0b5c06863f8229e1e2df06bfcae63408d06e70b68f7a0b0d216671b78302527d436091a698a
+DIST rsyslog-doc-8.2208.0.tar.gz 6563848 BLAKE2B ec68684f1d7d895833f656ba6224a8013213a12b1bc7a28a268f2f629c25a3fbac7c379091f17eae24b6d71278c087e4a4cbed1656554de743fe5616a96559bf SHA512 428c2fe9e5025928d4a9d33f05f4eb20ac1bbde052b7fa2a8a0e45bfffe111eecc94eb2b6ec129de1011f0eabb106b4fb41d402b2a270e4148d3b1081e3b1da0
 EBUILD rsyslog-8.2102.0-r1.ebuild 12864 BLAKE2B cdbbbe6c4b582c5d899318ebffc5a3eb0469eb3326db85fd152c1288e1494456bddca5e891690b7331c5e852db3cb7ec092471f42ece1e12ad71b92f894efd7e SHA512 7d20f94c6f7730c3644f1aa90035cc79dc3c945549e03d7e7bdaf2f062c701b5d42a21688d837134bb8b7e4bcdd871ef8c48af0bd3edf9d33b890e5a74172e5e
-EBUILD rsyslog-8.2106.0-r1.ebuild 12967 BLAKE2B f0054541a377a79f49f51a977a085b53dd75699f18204666ddf281db571dbf8c5a3a4ed73265b7562cb77132bab3a1be917b4dc5bdd23cabd7574d478e49e96d SHA512 0ac99d17ffcf484f60a8fb019655223665c34c4a112b0512c17a277380146da20824ec59d15736f3f726a128f21f329e90108aa945a453bc2478a2c18a507586
-EBUILD rsyslog-8.2108.0-r1.ebuild 12924 BLAKE2B 8c34d70db094b3249718e6076f415d9986f6d357396e5abf474b8414a6330b9de4285f1fd79e6287e5e7af33e62fe96a086466f28d8925d9d4096b13222abedd SHA512 7e6078eae9a74a52d7d3614299ea472bbf548187fd1069259ccfb005516a1c440e242530c287415df819d6daadf28cbb13da605a10a567a5dd28d22bc3658af7
 EBUILD rsyslog-8.2110.0-r1.ebuild 12990 BLAKE2B 556a0641ea0dc1bf634a3e2eb67bf4ad98be01988b92b268d4319bee2fb044976c8c0e659f203b20583d82e9b9c2aeb78347077f32bd95d133cb4500ce66fd8c SHA512 c630700d84ed9462eaa2f56245d2bd4f4720440f686fa6c3559dcc1fb8609de440d80305ee3d8e0b75cbc21fbcf17f2e7076764b8c1d31761eede3a6de0c5870
 EBUILD rsyslog-8.2112.0-r1.ebuild 12918 BLAKE2B a6b90c61486be47ed3b22a9bb5c7cc8b7837f56db21d88353403c50ef427fa4cf364a964db74d0a07fd15f4420cd87441a4d51edec4ff19dfbce7ef7d4c787f1 SHA512 a9b6313794a45610b62a0ff700c89db057c9c825445a124ab7b10826e379333fa236fa9376f4c4c798519f163ced12c9d753a63f48c1840e1d705d218bbb329f
 EBUILD rsyslog-8.2204.0-r1.ebuild 12922 BLAKE2B 7190afdac273d3d1be851dafb59e4a0dcebe368eff979340cd48b177ad8d896467b84b6ec33aa3e20c1310af2242b6b00d5bf2f66f5a3a20e4017486a136ff9e SHA512 730f72c6bc668aa550851dac2e7954cc35e21180adf212cdc5cbbabe367093f15e5946985ed8ad98dea456c708314eac8b966108411e99905359813129543511
 EBUILD rsyslog-8.2206.0.ebuild 12923 BLAKE2B c11a103ea1cd9f10a1ec0cc55dca9fbcfe4eff0712e4e9fddb2a9f3f513b10d39352c1b72e051f91579dd7d59627f10b59fc4cc2f529e04772d19afd633b0ea8 SHA512 8c4bde5bbf9ac2097cd7a1071d4397a5a1e68b88fd1fabca30347b5e0feae50592554c6c54cd25daedee370fdf56e862401422ba42cd1b3bf94610535a6f3b8d
+EBUILD rsyslog-8.2208.0.ebuild 13008 BLAKE2B f503fbad2ab404cab93e957078eb8f00c63c35ccd44fa4e4beb5ee61fb5648e7df6f6a2c47a187b44c4673c4dbc07958fba28e81ee6a65e8c9dd96a561d32d7e SHA512 bd8ef69ecc3c3bf12c01e42b591afcef75073d8204bf3c0f33b8f7f3e7aeca308d497958da3469865ad6c7a597420079f9219edfa836a9aaf99118dfe0d511b7
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2108.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2108.0-r1.ebuild
deleted file mode 100644
index 4ead7a5d9cca..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2108.0-r1.ebuild
+++ /dev/null
@@ -1,486 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-
-IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
-IUSE+=" systemd test usertools +uuid xxhash zeromq"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? ( www-servers/civetweb )
-	impcap? ( net-libs/libpcap )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? (
-		>=dev-libs/hiredis-0.11.0:=
-		dev-libs/libevent[threads]
-	)
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		>=dev-libs/openssl-0.9.8y:0=
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-4:=[drafts]
-	)"
-DEPEND="${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-	)"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	BDEPEND+=" >=sys-devel/bison-2.4.3"
-	BDEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without dependencies
-		--enable-imbatchreport
-		--enable-imdiag
-		--enable-imfile
-		--enable-improg
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without dependencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmtaghostname
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		--enable-fmunflatten
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmdb2diag
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis imhiredis)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable imhttp)
-		$(use_enable impcap)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	if ! hash certtool &>/dev/null; then
-		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2106.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2208.0.ebuild
index 17e58184ef8f..28fb4cde75da 100644
--- a/app-admin/rsyslog/rsyslog-8.2106.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2208.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..10} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools linux-info python-any-r1 systemd
 
@@ -16,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
@@ -42,7 +43,6 @@ REQUIRED_USE="
 
 BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
 	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
 	test? (
 		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
 		!jemalloc? ( sys-libs/libfaketime )
@@ -57,7 +57,11 @@ RDEPEND="
 	dbi? ( >=dev-db/libdbi-0.8.3 )
 	elasticsearch? ( >=net-misc/curl-7.35.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? ( www-servers/civetweb )
+	imhttp? (
+		dev-libs/apr-util
+		www-servers/civetweb
+		virtual/libcrypt:=
+	)
 	impcap? ( net-libs/libpcap )
 	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
 	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
@@ -96,11 +100,11 @@ RDEPEND="
 	zeromq? (
 		>=net-libs/czmq-4:=[drafts]
 	)"
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${RDEPEND}
 	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-	)"
+"
 
 if [[ ${PV} == "9999" ]]; then
 	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
@@ -182,6 +186,7 @@ src_configure() {
 		--disable-generate-man-pages
 		--without-valgrind-testbench
 		--disable-liblogging-stdlog
+		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
 		$(use_enable test testbench)
 		$(use_enable test libfaketime)
 		$(use_enable test extended-tests)
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a0803c3279cd..228def1aaebe 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 054cc4943b96..e412c44f0eb3 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,4 +1,4 @@
 DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
 DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb044c74344cc0fb4b6c6a02d0dd840e62e7eb60acfaf004e6f3650d58436b58e645ef2a50b948ecaf3ca162bf577a SHA512 e1a4213d0d39f2efd0d5c007a0449c76bd650e76e002a9acb673eef0579912db06d844df11a4f7cb821e1d8468d2d6c1303f1c5d915a5c3c9cb5abacfbd004fc
-EBUILD gpgme-1.17.1-r1.ebuild 3338 BLAKE2B 0ef0376fc45aa59da998221c683b6cd95aba45a83bc4505b0d8d9623699cb101092f1edd77ae9d01ea99689e5cde780532bcf076fdf95e8c706c596d26f13cda SHA512 56f050bb6856e59e1edf5938df3202d3faf9d35c01ca1aae7fee1c00e83774594aa36ad16c69c46a633998cdaeca62d3eeff8f84b29a99fe294c37bfca932c9e
+EBUILD gpgme-1.17.1-r1.ebuild 3339 BLAKE2B b94b1c3ccbac471ad16c406823460d4ffca1c9428b1420f3b433f224faf2a4a760c23b2923bff5a007cf37c63497d9ed5737683ad9bb4cc97250443bb71e00b6 SHA512 f4479a00ae16770c7180c8465079a4cf0cb92811715f87439e92c591701d1ace2c6af35a2990120723ca4c4091fc673aa61fdbda67d6648891c24905279a0dd5
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
index 532d754689ae..278233bab4c9 100644
--- a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
@@ -10,7 +10,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
 inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
 SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
 	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
 
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index bdb6d74deeb3..0d6f6f79ab81 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/citar/Manifest b/app-emacs/citar/Manifest
new file mode 100644
index 000000000000..49ff9b18b3ba
--- /dev/null
+++ b/app-emacs/citar/Manifest
@@ -0,0 +1,4 @@
+AUX 50citar-gentoo.el 69 BLAKE2B 4852ed7422e341e92f938dceedc3d6f0d0fdf8f955ef93021286d9d10e7c3a5d726175e2e79d34ca67f6815d7d6e0445ca2c9a80a2a6690daf4bda49d9972f96 SHA512 0afe62329cd2dc6ea548bbc28aa3c7fea86fb2a20febc91528ba994c77edf08fd72dcf1a0c417dcd4db75b4a6b8e237ade2257130ff3887499377b8f77fefc46
+DIST citar-1.0.tar.gz 1339812 BLAKE2B 2093cc820199219ec70f99a746c630f2b8e6b4d464b1457d7b7db1c5c953138e7dd5ac55e21b13e7417dd0a764b6f1caaf400af353ecce9fb7e1bc578f570b0d SHA512 7f02a4e41a927c2c7c625189fa38caea8f0fc5616dd3487a93f71a373d1e4a124dd1cc520778a1ff2fa6dd7c3b619b539e3b0e47cb9caf7edd16e27e9d739585
+EBUILD citar-1.0.ebuild 979 BLAKE2B 8b40e7b2c88ea5b739db50ffd588be12720330a89c84a11c2e0092fab7c08bc8c411e04e476df97867a7fd0ba59bee8829519a99fc2856c70ecbca7da8c2a29a SHA512 192a72c0a645dde0fabd681769f1dfa1eb9cf5f2cc91a996c7f52f837ef014543b2d2f299b35dcf3ee5c696da66f3fa63fc84caa64692d599293f95b67424bf0
+MISC metadata.xml 1034 BLAKE2B 10d658566f58e3a91deab1c4d2035bcd25ee216777aa105b1e8c8853ab103add779f0f439e706496b2468a3fcb8490320ccb454d90c2e70b5b8bbe9f218773e4 SHA512 4b81115dfccc471987c63876c0b282875fe95c5738f69dfdf7a6300c37998102f2fdda829d14938871bd857fbb5d145e6c62b5b4be40b532f46245256d0be259
diff --git a/app-emacs/citar/citar-1.0.ebuild b/app-emacs/citar/citar-1.0.ebuild
new file mode 100644
index 000000000000..0f6a51de1eb0
--- /dev/null
+++ b/app-emacs/citar/citar-1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Emacs package to quickly find and act on bibliographic references"
+HOMEPAGE="https://github.com/emacs-citar/citar/"
+SRC_URI="https://github.com/emacs-citar/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-emacs/citeproc-el
+	app-emacs/parsebib
+"
+BDEPEND="${RDEPEND}"
+
+# Embark integration has it's own package on MELPA, and it is probably better
+# to split them. https://melpa.org/#/citar-embark
+ELISP_REMOVE="citar-embark.el"
+
+DOCS=( CHANGELOG.org CONTRIBUTING.org README.org images )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+		-l test/citar-file-test.el \
+		-l test/citar-format-test.el \
+		-l test/citar-test.el \
+		-f ert-run-tests-batch-and-exit || die
+}
diff --git a/app-emacs/citar/files/50citar-gentoo.el b/app-emacs/citar/files/50citar-gentoo.el
new file mode 100644
index 000000000000..6243866c44c2
--- /dev/null
+++ b/app-emacs/citar/files/50citar-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "citar-autoloads" nil t)
diff --git a/app-emacs/citar/metadata.xml b/app-emacs/citar/metadata.xml
new file mode 100644
index 000000000000..2ba5ec6831b5
--- /dev/null
+++ b/app-emacs/citar/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    Emacs package to quickly find and act on bibliographic references, and edit
+    org, markdown, and latex academic documents. This package provides a
+    completing-read front-end to browse and act on BibTeX, BibLaTeX, and CSL
+    JSON bibliographic data, and LaTeX, markdown, and org-cite editing support.
+    When used with vertico, embark, and marginalia, it provides similar
+    functionality to helm-bibtex and ivy-bibtex: quick filtering and selecting
+    of bibliographic entries from the minibuffer, and the option to run
+    different commands against them.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/emacs-citar/citar/issues/</bugs-to>
+    <remote-id type="github">emacs-citar/citar</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/citeproc-el/Manifest b/app-emacs/citeproc-el/Manifest
new file mode 100644
index 000000000000..8c0b587e41fc
--- /dev/null
+++ b/app-emacs/citeproc-el/Manifest
@@ -0,0 +1,4 @@
+AUX 50citeproc-el-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST citeproc-el-0.9.1.tar.gz 108702 BLAKE2B 409548f50baa37c03906d3435569b8f75d8f0238b2d463e22ab0428a0536c6b12e2bf723a8fc4684fae17b31a9d46121d0ebcfd3cd03ada5b0838c8f0e042106 SHA512 6eab58576b4f851f44b45e444ee43a9022651dd322efa77b6162db0906a8cace70458b0a1431ed3d995d480d38944bafc13e76e04e5a310e8c14ffc28888953f
+EBUILD citeproc-el-0.9.1.ebuild 909 BLAKE2B 6416b809b0f5cb6fa84b9f092103e4892f73720275052209604fec5aca036251929a5cedc99feec206f8199859c9c8883fd8ad6e9ae52023e968fde48d8468ac SHA512 0796d18c86de02a2bb137baecce1fd9a65eb20fa46e8d9cefea9d9560da51e1f5f0dfa7de2e327769ec5b076881f2ee37fbda53d4c6a8ada5f8ea2488c3a4e2f
+MISC metadata.xml 1335 BLAKE2B 100bfe27f5d296a91fa300faa044dd80ba7762e53468b9f4c62c1ffaf23cfbcea7c611451f1ec82385d29d8a0400812ac536c302ae6f4b615bf25583d98c8b8b SHA512 2e9ce67c3e10f25113fe65a9307139b1e493ecb2b6cf15c34c5b4659279361fba04b5830cc20fb7a2818a290067236811754ca92607c8d991ea505657dad7570
diff --git a/app-emacs/citeproc-el/citeproc-el-0.9.1.ebuild b/app-emacs/citeproc-el/citeproc-el-0.9.1.ebuild
new file mode 100644
index 000000000000..b59dcf28c0e8
--- /dev/null
+++ b/app-emacs/citeproc-el/citeproc-el-0.9.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26
+
+inherit elisp
+
+DESCRIPTION="CSL 1.0.2 Citation Processor for Emacs"
+HOMEPAGE="https://github.com/andras-simonyi/citeproc-el"
+SRC_URI="https://github.com/andras-simonyi/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-editors/emacs-26:*[libxml2]
+	app-emacs/dash
+	app-emacs/f
+	app-emacs/parsebib
+	app-emacs/queue
+	app-emacs/s
+	app-emacs/string-inflection
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ht
+		app-emacs/yaml
+	)
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+		-l citeproc-test-human.el \
+		-l test/citeproc-test-int-biblatex.el \
+		-l test/citeproc-test-int-formatters.el \
+		-f ert-run-tests-batch-and-exit || die
+}
diff --git a/app-emacs/citeproc-el/files/50citeproc-el-gentoo.el b/app-emacs/citeproc-el/files/50citeproc-el-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/citeproc-el/files/50citeproc-el-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/citeproc-el/metadata.xml b/app-emacs/citeproc-el/metadata.xml
new file mode 100644
index 000000000000..33a57a1b947e
--- /dev/null
+++ b/app-emacs/citeproc-el/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    citeproc-el is an Emacs Lisp library for rendering citations and
+    bibliographies in styles described in the Citation Style Language (CSL), an
+    XML-based, open format to describe the formatting of bibliographic
+    references (see http://citationstyles.org/ for further information on CSL).
+    The library implements most of the CSL 1.0.2 specification, including such
+    features as citation disambiguation, cite collapsing and subsequent author
+    substitution, and passes more than 70% of the tests in the CSL Test Suite.
+    In addition to the standard CSL-JSON data format, citeproc-el has
+    rudimentary support for reading bibliographic data from BibTeX, biblatex
+    and org-bibtex bibliographies and can produce output in several formats
+    including HTML and org-mode markup (see Supported output formats for the
+    full list).
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/andras-simonyi/citeproc-el/issues/</bugs-to>
+    <remote-id type="github">andras-simonyi/citeproc-el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/string-inflection/Manifest b/app-emacs/string-inflection/Manifest
new file mode 100644
index 000000000000..12d7a03960e4
--- /dev/null
+++ b/app-emacs/string-inflection/Manifest
@@ -0,0 +1,4 @@
+AUX 50string-inflection-gentoo.el 81 BLAKE2B a8d271963c8ee584ed50ab57b0797f2406728f1ba4fcdcc705a4cc134b307d0a66dd61d0dc9893377a7dd6ebc582312388ec831e9eb90c3637207caf73eec2ca SHA512 4715c7f6502d55ba7f821a8cf8ce1b89edc021808c1566cfdda6ea04fafd1988f7088d9d80e889e654c509c73e1547422cf3c0ad949d90a4038a044c47a56115
+DIST string-inflection-1.0.16.tar.gz 6238 BLAKE2B 2a8db2786f9a744329e6e298308a5bec00e6872ed350ab867ff2d2d5176cbb1532d3dec5e09573228808fd5ba3e3214cda063cf01cd52f862043718e8e664bec SHA512 7bd575c02e1917d9f52f49c4409150dbc9d097968304e687eb1145520ed88dee0bc359bbc85883dd1c167e8918440c91d1f362983f0a35f99feff61c85a08ca8
+EBUILD string-inflection-1.0.16.ebuild 663 BLAKE2B 6572ed3038a751e2256eb59ede2a873913a3c404d829e5b8a38b1ea3f3c243008887c2e610e9c72958e37a5c5d1ac5ce55cb5687feeebf9d437daffb169b0361 SHA512 2a4b2e9493d980ba21beceb59262825a158a0832975c3d5164d90a12a80000e6ca67efae2ce2d5a50ed1a4384695e8dbf3c238718fde67fe8e26873afeafe8d4
+MISC metadata.xml 713 BLAKE2B b11d272fc2fb866eabc353bf90a5a22c19e40637150709406985838d2b05cbac17603c54b60bed771e435b3155448735b0dbbae3ccc2a32dc2a92146f64e0fe9 SHA512 a1f00997455092ba5d2014419da0614bbb1801870573fe28c71106595e9c2190230c4f1109b7d6c6551d09e330278b59e3da1cb93bcf2a9b42a4f3ae85a66aab
diff --git a/app-emacs/string-inflection/files/50string-inflection-gentoo.el b/app-emacs/string-inflection/files/50string-inflection-gentoo.el
new file mode 100644
index 000000000000..df8f2cee5137
--- /dev/null
+++ b/app-emacs/string-inflection/files/50string-inflection-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "string-inflection-autoloads" nil t)
diff --git a/app-emacs/string-inflection/metadata.xml b/app-emacs/string-inflection/metadata.xml
new file mode 100644
index 000000000000..cd4c3ed5c6ab
--- /dev/null
+++ b/app-emacs/string-inflection/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    This Emacs package provides convenient methods for manipulating the naming
+    style of a symbol. It supports different naming conventions such as: camel
+    case, Pascal case, all upper case, lower case separated by underscore.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/akicho8/string-inflection/issues/</bugs-to>
+    <remote-id type="github">akicho8/string-inflection</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/string-inflection/string-inflection-1.0.16.ebuild b/app-emacs/string-inflection/string-inflection-1.0.16.ebuild
new file mode 100644
index 000000000000..74a4f359e8e7
--- /dev/null
+++ b/app-emacs/string-inflection/string-inflection-1.0.16.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Convert symbol names between different naming conventions"
+HOMEPAGE="https://github.com/akicho8/string-inflection/"
+SRC_URI="https://github.com/akicho8/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org HISTORY.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+src_test() {
+	# "test/string-inflection-test.el" calls "(ert-run-tests-batch t)"
+	${EMACS} ${EMACSFLAGS} -L . -L test -l test/${PN}-test.el || die
+}
diff --git a/app-emacs/yaml/Manifest b/app-emacs/yaml/Manifest
new file mode 100644
index 000000000000..eebf2c3d7883
--- /dev/null
+++ b/app-emacs/yaml/Manifest
@@ -0,0 +1,4 @@
+AUX 50yaml-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST yaml-0.5.1.tar.gz 44335 BLAKE2B dbcaf29d5d0a18e167cf0fd43d5ea0536d3879ed8bc924930c06aa1eedb2c268f91fd2d0c8981ab81f928db82148ad7fbc01a5926b3dd4645ec57cc78bac7256 SHA512 4ed2dc26a87137deb2d06cffac7c9b0748f66a9b05d91e33022da0edee0966b94ac2dfdb5a181628357dd3714ac55cfb48b1a35f9f6352c01d745a1d69131381
+EBUILD yaml-0.5.1.ebuild 573 BLAKE2B b25bbdf7655812861b9f354c2ad0bbc5e559dcb460f0d5472a314d30fe973d0fab51dae5e19129197e57d7453acc62c69290d7f0f1bd4a927a4d1950ae43cfaf SHA512 a114ebd698d3f955e250947d15ec2ea7424abef1bd6721d3200b93ae6d3d82e92a61eaf3262c509b36c8484e73151b87c0d2dba7291ab94b162d613f46a481b3
+MISC metadata.xml 616 BLAKE2B e28c7b7774635055616362ec847585f91e12a8a92832e51cf8c13dee70ce35273b255257b213804ff5d7ae5733718fc3194f97f1307e45c3dd439be144c82dd0 SHA512 7035a36f53cd4c08a274b88d216fbad3c3fd5579e0c10f38158a5128c61d7feea30800101dbf71c5baa03a3a1f2ec8d61f343a1fec21a067a919cbd146835d77
diff --git a/app-emacs/yaml/files/50yaml-gentoo.el b/app-emacs/yaml/files/50yaml-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/yaml/files/50yaml-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/yaml/metadata.xml b/app-emacs/yaml/metadata.xml
new file mode 100644
index 000000000000..ebb91ed4f6fa
--- /dev/null
+++ b/app-emacs/yaml/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    yaml.el is a YAML parser written in Emacs List without any external
+    dependencies. It provides an interface similar to the Emacs JSON parsing
+    utility.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/zkry/yaml.el/issues/</bugs-to>
+    <remote-id type="github">zkry/yaml.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/yaml/yaml-0.5.1.ebuild b/app-emacs/yaml/yaml-0.5.1.ebuild
new file mode 100644
index 000000000000..7e951ead7442
--- /dev/null
+++ b/app-emacs/yaml/yaml-0.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="YAML parser in Emacs Lisp"
+HOMEPAGE="https://github.com/zkry/yaml.el/"
+SRC_URI="https://github.com/zkry/yaml.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/yaml.el-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	# "test/string-inflection-test.el" calls "(ert-run-tests-batch t)"
+	${EMACS} ${EMACSFLAGS} -L . -l yaml-tests.el || die
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 072e6a81c3fb..4ee059d98369 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 07b3b0cade42..d17d898e53d2 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,3 +1,3 @@
 DIST cpuid2cpuflags-12.tar.bz2 84750 BLAKE2B 0f7418eaad406427be02047c06f9a6e3f3b1cd953ef320c1cdf5082d309f6887f1caeb4828761287266e2f527d5bb9d6cd4c8848ac2b47a019d6d156231364f6 SHA512 e415a04b5963eaaf4027dbb191a30d4b3cc93a7708e33ea21f9dfe53ad90e735fc5f298fdfb35e155323391a8b8c6c208d988d5cbad811536ab27764bf1e5981
-EBUILD cpuid2cpuflags-12.ebuild 421 BLAKE2B 1aa35175f8a82ed3a1159223fcaea3be6c20e047e667d8330ebfd6ebfb082fdb105ab256661b06c93f8634f887dc9dba8e083787798f194c7d33248af108c3d7 SHA512 b316da8927f820950ea97d51bb47b8f80ee14b2bdac1b7fb9d827f2fdc95f029ca25923a4643bdbba1b50476e2965593a3afcf832d6e9e5b550e1024a4c39e8f
-MISC metadata.xml 344 BLAKE2B f374f330468fc02f2bb21ba9fb5d5e24ea9537b9f2ed83f8c770e9d60dfc5274e180225b5f362daeac65fd298893f58239a3c300e24d00faf1454584c8478c2d SHA512 2ad0184d5828342cc42f17ff74b6964acdde380ee489f70f90bcb60cf84aae84743b4af6afefe33c923a24d68cb18e2b1087df476ec287ed046d5a487e4860da
+EBUILD cpuid2cpuflags-12.ebuild 421 BLAKE2B 17823d4b49b5ef25c45047e0c8e076b724d07fa6e828a65f5c358bc6dd5c9546dce720c61cafd305d84b760bf1bd62e2e23833f8e0e3ea336f9a91ad2ecbeed8 SHA512 ea1e1b1813f7b885c41793615b901ff9fab7ad44221b375bd8b38e97eac6f58bb9373eba5bd5704e2a9f200c6f862ba6e1b66d322e6054eca9dcafc82e6f4b2a
+MISC metadata.xml 344 BLAKE2B 60e1495c23b3805355f49fb292debd6c0c5be230be41bd7bbbfae7770980e24894cab32fa35b85561069e7cf830aa595d60ebb3193fe71151e2c4690e17c9ebd SHA512 2033445c5b2789011c913a4776bfd3b49cf130c1239eb189540800086f526dd3727aa46e2c162f1e66e24d307455a05ce004465303a9047ccc09817e6f495c25
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild
index 52cc6a3f3194..a80354af97ff 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags/"
+HOMEPAGE="https://github.com/projg2/cpuid2cpuflags/"
 SRC_URI="
-	https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2
+	https://github.com/projg2/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2
 "
 
 LICENSE="BSD-2"
diff --git a/app-portage/cpuid2cpuflags/metadata.xml b/app-portage/cpuid2cpuflags/metadata.xml
index 6de9269a1ebe..2d8cc330ba90 100644
--- a/app-portage/cpuid2cpuflags/metadata.xml
+++ b/app-portage/cpuid2cpuflags/metadata.xml
@@ -6,6 +6,6 @@
     <name>Michał Górny</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">mgorny/cpuid2cpuflags</remote-id>
+    <remote-id type="github">projg2/cpuid2cpuflags</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
index 6d8992665d91..c5205a78368a 100644
--- a/app-portage/diffmask/Manifest
+++ b/app-portage/diffmask/Manifest
@@ -1,4 +1,3 @@
 DIST diffmask-0.3.3.tar.bz2 8605 BLAKE2B a7699dba6b619ff2e64a8148057e06be8d477605fba100b45f056957eb1b55cc50634b698250f68023137bcf01932635c7de798f42edfa1297cc38097e764f44 SHA512 5f28f68dc1adba2fb7b0db5e2a329e46017298de9c44765d521a0f338223eef2a77573636987e942595db9b89b72db93b68cf5b805091b0ebb1e91a18bfcd48b
-EBUILD diffmask-0.3.3-r4.ebuild 544 BLAKE2B 047990aac93ff7ceaee037c9ae1147f2474d2bdd4e024d468511a8c8bb8ad44bcc07a2266b1efeb0a60cb8ac90e424eddd3e4ed3fcb00ca06f975f36aa2a6ed2 SHA512 4831b31221f2427016ae54c163a19d7a4b1c7eb66e338982db14b2a2ea886949ad0b7c2c0d7ce323f51feed36dcaf30c205552317838abd0f69e7a2697adc5f0
-EBUILD diffmask-0.3.3-r5.ebuild 544 BLAKE2B 82bca667e0179945fdde82124932af1383d1bb2801aa8e7e11f512cf18d337967567c55a3a3a7c9eb1b54de655390a4509f00f6ac4635ac7a8291d65e3e35df2 SHA512 f163775c9d00a460c3d7d6646d7ed511a1a4fcae7e8b4c45c50f35e402b539dec7a912bc5f724e1dfbd57b731a0b229e1da4c76285e29cd86210ae151ca607a9
-MISC metadata.xml 752 BLAKE2B afe13741c466af0964e8df5675b09dd0951bb4a34b93f3bab8070b1385dff66a50e3013bb455c4c7b5deb32d8b922e9fab8959760692cca28536738001e895d7 SHA512 8b34c7a30cdb16e08df2808ff355b560c68bb674242b83c4f30d363b3d789472383cf40c0160a334f260bb0ced04774c89e091bb08a793b7906118b66424a79f
+EBUILD diffmask-0.3.3-r5.ebuild 544 BLAKE2B 23994287e74be1ea243f7bd181e1c5dc2bf05319dc11e2a78521f5ca876cacb8c6c40b0531115742f031fdc95edf374d0de47bb1e35b9f850869622e21569f82 SHA512 302573af46cf8a0ba789c3720b080c8fcbe5752e9d7f47804e238f6b8038a220f98ab88b6650e7eb5a5851021666d45b1e2f3d3f9f866133d78c1a2d803a1b08
+MISC metadata.xml 752 BLAKE2B 6d4fab0465c176648efd096d0f5b8529057224f233d18e6d11ff447805f40cb5ffdd0dc907c106cf75341b2c1e3f6dc8d6e7a23785b1595e6e7e136a2cb9c52f SHA512 95cc67ec491b1acf367334222f89df9b44d0dfe3b5ac29ac0b3203621f8996c71af9caba9c15c8550d56ff738f61efe2eb35e23e5681a2c5522ca524c73c17ea
diff --git a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
deleted file mode 100644
index 4942a259424f..000000000000
--- a/app-portage/diffmask/diffmask-0.3.3-r4.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://github.com/mgorny/diffmask/"
-SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
index e1d32c613721..d20dd7797195 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://github.com/mgorny/diffmask/"
-SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/diffmask/"
+SRC_URI="https://github.com/projg2/diffmask/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-portage/diffmask/metadata.xml b/app-portage/diffmask/metadata.xml
index 0d301429aca9..82b3808f17cf 100644
--- a/app-portage/diffmask/metadata.xml
+++ b/app-portage/diffmask/metadata.xml
@@ -13,7 +13,7 @@
 		the mask entries) and remove old unmasks.
 	</longdescription>
 	<upstream>
-		<bugs-to>https://github.com/mgorny/diffmask/issues/</bugs-to>
-		<remote-id type="github">mgorny/diffmask</remote-id>
+		<bugs-to>https://github.com/projg2/diffmask/issues/</bugs-to>
+		<remote-id type="github">projg2/diffmask</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index 812648882987..9af9053e3757 100644
--- a/app-portage/flaggie/Manifest
+++ b/app-portage/flaggie/Manifest
@@ -1,4 +1,3 @@
 DIST flaggie-0.2.1.tar.bz2 16767 BLAKE2B fea0fbc505bfa97e7bee2c05f0cc19077b9b23a021b01aafa2c4b064466677f9dd4ae95c36f6de65b4ad07c5046d539ceb0cb667dcb791b60410d7a5e688813f SHA512 3f273ebeceaaedce7a3807126fb3f450e420338a883440066d06a4d6a95b63bd538bb5da882fea23e0d390b28a83f50375dbda2624f656327775b2b700f2b2e4
-EBUILD flaggie-0.2.1-r1.ebuild 1134 BLAKE2B 022cff23c92b9e98cc1a5ce369d31cb8e972a677ceb8aee977a5d3e346d9b1e851ea33298fc0e2951042b5b39edfbef3c7f80397637d709ca7376b9deeb2d45a SHA512 002c9e4e2200a674ada814d08184ba4bfe2844f7aaa446c8a59f7a364b1fce0a8577889f933a2699e8f731b6238bd342b5c7a1d30aaf8f569d4c88ffd848d612
-EBUILD flaggie-0.2.1-r2.ebuild 1134 BLAKE2B df4c0408ae5897f6be4759ed21c5e6da09d90979f4c9737a7d9d91d7df245afb4015e11fb8f278fbe055f8ea4bccb1ec251854a39dc44fc03ec78c76681603f2 SHA512 b1206e7bb6b8fdc78831754e1382cb827f293d3150607c7ff11ad4be2ff4fb16a466853c4743abdc0d7d856430b5381f98d5c9e630c72064d90ef98a4a7e2ba4
-MISC metadata.xml 414 BLAKE2B e1943db472d39833f39013b45ef474c54ea19e252a9dde019d083c8c5dde4b790758488b2135d11415f5a0fa60baa5831a7e554cbec83eeb854ea85e2709c8e3 SHA512 10a6e4a79ab5a6fa8810d06ca0aa22ccfe81aba18430227c6ee7874bb9aeb562d585515d98b522894a8b87b51504b5db35e2dc6afab5c53ccd049537afbedf8a
+EBUILD flaggie-0.2.1-r2.ebuild 1134 BLAKE2B 74557fe9278d6f7ee9e20da32ca337d2fd4c125b4d054c4c02ca399ec5b3d7ce09f8c4d6105ebddc08c97b8d5aa0d3e75cdbb8541992c8e978e871847baba506 SHA512 08d6c8958b7a40e5ee35d69ca78e4675e1a2f571fe590a3551ca55d127c3dbfd3949cb8c60f6a9c8966df826625b8e15cf230afa39884076efaab82bdcb55821
+MISC metadata.xml 414 BLAKE2B a2588b6736a139961f6d6902437c9bdf0418eff547ce47814ed2b5630a3b27a74798434971de570ec740c4364b808c1035ea624bb4c0d8911631c72e8e43ce61 SHA512 a675b33fc1d436db9215f2bc373258749a34f31f9b70d0d191d7464eca0ef121ccae2e5aa3f7537ed015fd6bbd02ab91264576080725b6c50c3984910a7ed05d
diff --git a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
deleted file mode 100644
index ccf3b152e2ca..000000000000
--- a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A smart CLI mangler for package.* files"
-HOMEPAGE="https://github.com/mgorny/flaggie/"
-SRC_URI="https://github.com/mgorny/flaggie/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn "Please note that flaggie creates backups of your package.* files"
-	ewarn "before performing each change through appending a single '~'."
-	ewarn "If you'd like to keep your own backup of them, please use another"
-	ewarn "naming scheme (or even better some VCS)."
-	if ! has_version app-shells/gentoo-bashcomp; then
-		elog
-		elog "If you want to use bash-completion, you need to install:"
-		elog "	app-shells/gentoo-bashcomp"
-	fi
-}
diff --git a/app-portage/flaggie/flaggie-0.2.1-r2.ebuild b/app-portage/flaggie/flaggie-0.2.1-r2.ebuild
index dc1e4ca5c0ae..bc938abe510f 100644
--- a/app-portage/flaggie/flaggie-0.2.1-r2.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.1-r2.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="A smart CLI mangler for package.* files"
-HOMEPAGE="https://github.com/mgorny/flaggie/"
-SRC_URI="https://github.com/mgorny/flaggie/releases/download/${P}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/flaggie/"
+SRC_URI="https://github.com/projg2/flaggie/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-portage/flaggie/metadata.xml b/app-portage/flaggie/metadata.xml
index a1a932d16da1..8d9c07df173b 100644
--- a/app-portage/flaggie/metadata.xml
+++ b/app-portage/flaggie/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<bugs-to>https://github.com/mgorny/flaggie/issues/</bugs-to>
-		<remote-id type="github">mgorny/flaggie</remote-id>
+		<bugs-to>https://github.com/projg2/flaggie/issues/</bugs-to>
+		<remote-id type="github">projg2/flaggie</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/gander/Manifest b/app-portage/gander/Manifest
index f173313f80d5..4a365b41ba8d 100644
--- a/app-portage/gander/Manifest
+++ b/app-portage/gander/Manifest
@@ -1,3 +1,3 @@
 DIST gander-0.0.1.tar.gz 8882 BLAKE2B 29c25fedabff3936e13789ae31f2e06871cfe4eb31a0eed1d36150ec219e741d25ba1603d0151d026777c81dff8461a1c051e4c02bff2488d8b9d6888ebe9618 SHA512 d72b2fd92ddd646369f8eb16d73a67e7b793aa84109231365abebec3ab2e14a8c76bae301271ec1cc82850a71bcb217a72f969086554e6c850117b5492215d57
-EBUILD gander-0.0.1-r2.ebuild 796 BLAKE2B 77fb5be23e306055ae5d297a60dfe541cf83478e74c254953abecb0ed37e1be403aa00cd06114a7c70c806b3b8008799f721e1add80656530c20b5030497e968 SHA512 7b22821068b83596e4bced8e8ebdd6b399653a6513131174008a65a20bb6efc31178c23caa0b79aae751842e448dd57b42d24f3818183c0a09e2938ad91ca953
-MISC metadata.xml 326 BLAKE2B 63c40c392a14654552fc7fe5d5b719afb2cb6876966d283360b15c88c57621b486b17a8bfd7fa11d5dcaf8f61d48ebca6641d5708f64472254b98c34bd109cc6 SHA512 a66081eaa96514f941073ae4060492202f6ad350a839811bf0137b9866b5bb896f4561eb9ced5d57392503089e88c8d6aad19b91528190b0e0ecb2b3a81e712e
+EBUILD gander-0.0.1-r2.ebuild 796 BLAKE2B 7afb336f3989dddaae54e65317c6d00920fdd30e6b3846b855ceeb5e0c7955091484ddd0a0a09563c914256f7e589ae46ae14abba1a4508b1e74d418a73bca1b SHA512 415d79ba0236cd3e4e34b0bdbd4ecd1e76cfb16b54b705a30bc0bef644131ee2fc55bead27067e6c3e75606d145eb6102752090b91bb32d5351436705541039e
+MISC metadata.xml 326 BLAKE2B 6a5d01a474dc60b61cc93ae42a149c97584c99ad281c437916f38b1480c69ac17aa87a506705f8879a5f28ca80b581f9eeb7a8a4de23af386858a0f9e1e09546 SHA512 2c7c6dff031808964e0d2f59c16f92c6e4adc54d8648a67397b4214adf64b02387c628efd1353fb448d711ca46bb828306458ebc9373f515e481cb516c1444ee
diff --git a/app-portage/gander/gander-0.0.1-r2.ebuild b/app-portage/gander/gander-0.0.1-r2.ebuild
index b2903319f0c2..56b2c1f608d2 100644
--- a/app-portage/gander/gander-0.0.1-r2.ebuild
+++ b/app-portage/gander/gander-0.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Statistic submission client for Goose (anser.gentoo.org)"
-HOMEPAGE="https://github.com/mgorny/gander/"
-SRC_URI="https://github.com/mgorny/gander/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/gander/"
+SRC_URI="https://github.com/projg2/gander/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-portage/gander/metadata.xml b/app-portage/gander/metadata.xml
index 09d062ff11d2..b4083e29dfcf 100644
--- a/app-portage/gander/metadata.xml
+++ b/app-portage/gander/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">mgorny/gander</remote-id>
+		<remote-id type="github">projg2/gander</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 09f521925692..80ad5362bfed 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,4 +1,4 @@
 DIST gemato-16.2.tar.gz 80178 BLAKE2B c973c36bb1277d07618ba8d90f7d6820508d78aedae200f0678c8b2e1dde38e3b7f4d7dc24791dedb9c88791d3b71711c9bdeb749b5fc091a20aa87f71ad70d3 SHA512 9d59ba360afaf237e47c5ded0e5bc29ec44d5b1d73eadadc19ff834a1966e1e620da258eb7a1b6afbff5c66cbd7e39454fd5920f2f82fc510c2f8836c0b80462
-EBUILD gemato-16.2.ebuild 980 BLAKE2B a3616f07d88c1f656534f4cabf904d5d45eef85e03ee9c07197cf0333c335bd6c76b180702edc29549fe38c2ff96c8632505b91b76387859119a272427b72eeb SHA512 e3c4b0820d6228de1dcbb16b0014049445a4f7a9d81487a67906fa5d5007cb5e86bb36fae87ddf4e209ee7be3ca923b43bb0086c492ba5e96363dd46692ecca7
-EBUILD gemato-9999.ebuild 879 BLAKE2B e29bc4109bec2140b19df25b09479ebeb13a933f1fa7c07d86c8b037ba13d40260fa68b9a335cb21c0be5f3509f1e29acb25eb8e7c5b5131cae324d743ebb47e SHA512 848580249bf3288ed81c30c9439cf903832ba91fa9e7d0a3c87ab1717b9261273fe5c012b4c15f7af22566fb2525e52d68f114e98afbd6bf5859f09c12d935e4
-MISC metadata.xml 715 BLAKE2B f13d81c7c06f97f5a60bddf1f5161b45140d4ce649b77b719ce6857af5c4d23e03e185c00e1ee61eed9e17a65b141f87d4c677d7037d62d2b0a0b47d40ad1fea SHA512 d286065399a0c7c379731a90db3fb66d8da8edb2b093a59b902f01330a7c25b961401bdf9b2a0359d0e656a724dd9c8059df52a3c5c65fbab3c07609febd43f7
+EBUILD gemato-16.2.ebuild 980 BLAKE2B 16c0d7fdce3c3defa0b7015412d67f651caba7141dcdc7a85ac731f039f2f07fff25d95a3ce92ac4ba3b400fee8ffd0fba43522910ad1c1bbe1caf55874d0c71 SHA512 34d7b6b56721719ef46b8215cd24b9f0df814b698de3bd2eb2c88732d39a0e58a636a36b8ffb110b7ee69c1d0960773237137c91290b07effbad4320cf7f51fd
+EBUILD gemato-9999.ebuild 879 BLAKE2B 720e02d9130298eb1382dfbf24ce0d42096fe67f92926e837ccb45927cc3cda3d5ecabb1ee83009e0adf2e8755ddbc8c3a9100c7c805b1f026cdac211d6a4ca3 SHA512 e28ef345f444fedd446765b679396f5e30e911f4250fee56726e997c28213d50dd3d02807cafebab261390ee90a49bf9c23c415e6c55bd70a8ac7f15cc03fcdb
+MISC metadata.xml 715 BLAKE2B a059e3f4fb7629c06ddddf660e19aa59717514fd0004837020d8db3ef7fdacc2b8abb5bdff5241e00d68cc8de88d213331542f5afb56dc1954c8b81047593727 SHA512 1d53b9e589241c76fa0327296a43b22c6a60e2fc04be9e65cd57ddfcbd4449a40b7ad7fbb7660eb7cb55236dc88215129a61398524d1e0729582f1c05fd84d83
diff --git a/app-portage/gemato/gemato-16.2.ebuild b/app-portage/gemato/gemato-16.2.ebuild
index 81db99fc2309..00a120a58c04 100644
--- a/app-portage/gemato/gemato-16.2.ebuild
+++ b/app-portage/gemato/gemato-16.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
+HOMEPAGE="https://github.com/projg2/gemato"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 6892ffdf9023..d889559f38d7 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -9,9 +9,9 @@ PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
+HOMEPAGE="https://github.com/projg2/gemato"
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/gemato.git"
+EGIT_REPO_URI="https://github.com/projg2/gemato.git"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/gemato/metadata.xml b/app-portage/gemato/metadata.xml
index 7baeb4158267..2157106e5d71 100644
--- a/app-portage/gemato/metadata.xml
+++ b/app-portage/gemato/metadata.xml
@@ -14,8 +14,8 @@
 			to /usr/share/gemato.</flag>
 	</use>
 	<upstream>
-		<bugs-to>https://github.com/mgorny/gemato/issues/</bugs-to>
-		<remote-id type="github">mgorny/gemato</remote-id>
+		<bugs-to>https://github.com/projg2/gemato/issues/</bugs-to>
+		<remote-id type="github">projg2/gemato</remote-id>
 		<remote-id type="pypi">gemato</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index eb9002f24e08..5707b0fc8091 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,4 @@
 DIST gentoopm-0.4.tar.gz 39123 BLAKE2B c8ea81e2d1aa09d3aa838ccb2a1d221e29ba6cf20c5539435a36da058733ee6814864f11a5a96742b371c6d0f2e1ffa269edf197cd30cf4bc7d517f9fa6623cc SHA512 7af0d4d8b3562b009d8897b70b8621d2004e22a16006ec84144544174724757b39e09cbde98ee876adc166947a58e4afa85f752c66d4dbb03ff1d3a52074720f
-EBUILD gentoopm-0.4.ebuild 979 BLAKE2B c38bb41ba66659b9bfe95d96739a023c7165bed7bb562c200a28183a6ec59da01d78deb216b9cd5f9e7c6599d6d08dd2d025da3b2e99c9449d5f531dffc08976 SHA512 7346b3b6416399ec52a439d4f5cbe59b2f8881d546558baa16bbc10834ef2e1d41068807a3ebaf5ab2df9757d24d1bb821b10600778ef6ff21924bcc8348d6d5
-EBUILD gentoopm-9999.ebuild 587 BLAKE2B 0e32cb8009f92072f675608d3ea41141b296c3bd9a09fa56fa74d94d41af5780c7a5e9f56d249009da955771871ff1056146bef67c95b42fc7da8dfaba4bcf7e SHA512 eb39068ae38aebf7006f056d2017b47eab1d000529a14924e00771db36b2056d04b8e23d9590eb5c05fa4fa94844c8ea6a10410fa318cdbd68a254b0c245fe01
-MISC metadata.xml 601 BLAKE2B 838ca5c422fd36bd0a7b5404a80a5e19155738bf5bcaad568952983079b33b3c056b0a181d6c61448e06746107db63149fb4fe4b856b502346c561909de68b8c SHA512 0a8c96d9b8b153c6970c0200169dff748ad11908d454fcb8e770f7c5ad82518e425bd269edbc420666306a154188e88c5e614edeaf40ec9d0c436dc494626f6b
+EBUILD gentoopm-0.4.ebuild 979 BLAKE2B 15eee7f3b2280155e401f08aab1f5ec7fe2ea40bd2ba97a86f23bd217e83813d6842b82744c3f967f71ac317f325c8e2e40e1d1b5b365f4046acf3c45062b990 SHA512 d42e7bacd655a0d55877ef92ecf59c9b5374c0eb81c983ef5a6f432db1de1dc821cdc3661dda4e1ae3b65ef1a2ba7e9aaaa0250139e4a6125cb1ec72eb406ca1
+EBUILD gentoopm-9999.ebuild 587 BLAKE2B 197379cbc7c3c98fb37efba89ebbf5bdb185c78f74fa1d7402d66aa8e28b474b885ef783770cc698852f3a72ed71eecd7b99cdc65eeb5e1cc39e7948f3f42182 SHA512 7da950ca313802ff76d9776bd43f1956ed2f60c39f840c3242722c4a3ebbfa15fa399d57a7cc0ab62c99de25a155a40d67ce233dee039559a03739ac6b1fbc93
+MISC metadata.xml 601 BLAKE2B d0b8ff6fbeff832d028c1b42a73c33ee4a66c915b054c90976a3b6b53cb68bb62b39ef6d2462781df24cbe56f0232cb2234640c56e6ba3c10adbff1f312c39d4 SHA512 82dd932cccccc873beed8c20e080591221d9fb2247deddc068828799638154eb4bd18736e27edff7fd323e9d2af5fd7eff42fa1a8fea9cedadff658a93c20c4e
diff --git a/app-portage/gentoopm/gentoopm-0.4.ebuild b/app-portage/gentoopm/gentoopm-0.4.ebuild
index a0239a1e00e6..7c4adef8e55a 100644
--- a/app-portage/gentoopm/gentoopm-0.4.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.4.ebuild
@@ -9,9 +9,9 @@ PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
+HOMEPAGE="https://github.com/projg2/gentoopm/"
 SRC_URI="
-	https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz
+	https://github.com/projg2/gentoopm/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 93e0b5ad6e14..8a42963846f3 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
-EGIT_REPO_URI="https://github.com/mgorny/gentoopm.git"
+HOMEPAGE="https://github.com/projg2/gentoopm/"
+EGIT_REPO_URI="https://github.com/projg2/gentoopm.git"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/gentoopm/metadata.xml b/app-portage/gentoopm/metadata.xml
index 96c8ee1d462d..4eaa4cb48702 100644
--- a/app-portage/gentoopm/metadata.xml
+++ b/app-portage/gentoopm/metadata.xml
@@ -11,8 +11,8 @@
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
     </maintainer>
-    <bugs-to>https://github.com/mgorny/gentoopm/issues/</bugs-to>
-    <remote-id type="github">mgorny/gentoopm</remote-id>
+    <bugs-to>https://github.com/projg2/gentoopm/issues/</bugs-to>
+    <remote-id type="github">projg2/gentoopm</remote-id>
     <remote-id type="pypi">gentoopm</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index f4f9abe5adcd..eec634f1dabb 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,4 +1,4 @@
-AUX implementations.txt 868 BLAKE2B d7319947a1e548f877a3fd2799cb9f5387d8c6d6787073edcc4763a15220c5dec2fcad48f81de0505569615dd5b67541a330044af61e4035cd4a697e4b989d46 SHA512 ff34a2a4c31799c21e1eb9001da8be85bd84b1e956e1905271b8c9e4b1e44cd9703b72dccf665c1122cd706da5e0b65e9ce409227f39c53d61cb24a2f1e17cd8
+AUX implementations.txt 862 BLAKE2B 676429b6a1eaaf20e0823ca1a6c4b0b482359b9cf37943a876af0e67ed770d0ff457bc1898dc4f243b23245fcec735685e09574633da3d33e1ca9f34e0e23da9 SHA512 18bf218672ef713f1fee2d396c3383191222931fa98123ae1eeba99fc6f82b07202b6721a509eabee18836553baa863781ca9cf6d3c7b4071eabdefb16cf5104
 DIST gpyutils-0.8.2.gh.tar.gz 20247 BLAKE2B acbde89975e233ebd7d7dcaba629d35c09a9064be48ae1d529e9f5f814b9486e9a208506ff194894dcf827069cf24faa81efa14258866fb32cf5946dafadaf6f SHA512 932500c730635ed1f8f529012f7c65c48385d92db4a673abc0145fdbb14edf8c8b5a5ed4a4c7f892e7df310b92cd8fa0532af95340096f2bd4ef7047d6b6163b
-EBUILD gpyutils-0.8.2.ebuild 573 BLAKE2B 9b97713889d100ab250a791afcf288b899f1ca7c62922759f447df55017b610b1873856919a9c5173502615f4b8b8552d6c33c5d93d501baa2e7bf42f1154ccf SHA512 cd124b6957b8898b223c39048203ff899a7b50450300790bd9025f238618e8f4229923b7342a1b2775e004a8c0b4fb95e8a1b085180650921fbf58d6c8d52f00
-MISC metadata.xml 601 BLAKE2B 55e9b56b636971035d53b432dcdc5100127f286512a3d2c7568baf91970656803db20ec62ae8161fc2dfb0c27343ed8d869c73d71f0889860d4b648faaa9a96e SHA512 7f7e83d43dbe3fe944178e1547737973ff2012510aca40a8f30b9a081db894d23ad0126047f418f9fbe7748a8ea6133487af07e2f0f26ba5d04fe6a918853820
+EBUILD gpyutils-0.8.2.ebuild 573 BLAKE2B 946384ee7998fd2012c91c3d55a9d8c09328c55a4aa3e0677d4de2c6756247df373d499cb95674838318a2f89fcdabfcb084273b60ce2e5d79952b58f2a49d69 SHA512 d74fa0544d104a3f6bdac999b71239792cf0daf30e2e2753d1890e731efb94ce868486210ad0305d45c8cbc978f002aecd2ca55ab362a7d9b5c609d5052b8ab2
+MISC metadata.xml 601 BLAKE2B 3a90fccb93c2acd9e02c847f5a9170c6a7b976561d02e76ec0f58906b4b514b352bd621fe5a64ae6c8653253417a90fcce5b10e13bda2218b9b7bc29a86b9b8d SHA512 ce7bded5842dfd2dec8f0db875d8b302726f42deec340efaacdf4c6f99cde9daf18365f3edb9367b6a77f7690442b14a0b925bb2265c58f833a0937d6325dcfa
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
index f55ca773827c..88202c6748a3 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -18,8 +18,8 @@ python3_5		dead	3.5
 python3_6		dead	3.6
 python3_7		dead	3.7
 python3_8		old	3.8
-python3_9		current	3.9
-python3_10		supported	3.10
+python3_9		old	3.9
+python3_10		current	3.10
 python3_11		supported	3.11
 
 pypy1_8	2.7-pypy-1.8	dead	p1.8
diff --git a/app-portage/gpyutils/gpyutils-0.8.2.ebuild b/app-portage/gpyutils/gpyutils-0.8.2.ebuild
index 9a5bbcb0aeee..dcd8ac0da69c 100644
--- a/app-portage/gpyutils/gpyutils-0.8.2.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.8.2.ebuild
@@ -10,11 +10,11 @@ inherit distutils-r1
 
 DESCRIPTION="Utitilies for maintaining Python packages"
 HOMEPAGE="
-	https://github.com/mgorny/gpyutils/
+	https://github.com/projg2/gpyutils/
 	https://pypi.org/project/gpyutils/
 "
 SRC_URI="
-	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
+	https://github.com/projg2/gpyutils/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
diff --git a/app-portage/gpyutils/metadata.xml b/app-portage/gpyutils/metadata.xml
index a7e17ec45420..89201d449b7c 100644
--- a/app-portage/gpyutils/metadata.xml
+++ b/app-portage/gpyutils/metadata.xml
@@ -11,8 +11,8 @@
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
     </maintainer>
-    <bugs-to>https://github.com/mgorny/gpyutils/issues/</bugs-to>
-    <remote-id type="github">mgorny/gpyutils</remote-id>
+    <bugs-to>https://github.com/projg2/gpyutils/issues/</bugs-to>
+    <remote-id type="github">projg2/gpyutils</remote-id>
     <remote-id type="pypi">gpyutils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index ed72a05ef47b..91d9f0d60db7 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,3 +1,3 @@
 DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957
-EBUILD gverify-2.ebuild 689 BLAKE2B 4732acae8f1ce9220685e1ccdf44c16f505c76dcb6b318f618ac87981cd2db45a4195ad6d9d11562967a989c3e4fc221a4e5d25661390ab7e92fe2c8756c7b85 SHA512 21ba14a2bd1f17bab89492520d8e601c3616c0ee7a95acf89b0a7d384ff6f441450fa4a9cba312181fba1f6a39828a3b1b0fc58c974d3253b37839a4464f3ea5
+EBUILD gverify-2.ebuild 689 BLAKE2B 51ab3ef0f094813a35728d8435b2fc88bbae86f19420ce66496f20f388f676081763efd7ab25c40c6a8872d15cc54efbbf6cce9a1464579160750528b9686c7e SHA512 1ebb864e67a57c2aa78271897f2fe36b87f2188843958fdec957d86cd1ceaba6b7e512257b96f551b71c6b6803f44c8930d302557685bb91c7471fe63c0411e7
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index a6afeed27f55..0cc566534efc 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{7..10} )
 inherit python-single-r1
 
 DESCRIPTION="gentoo.git signature verification tool"
-HOMEPAGE="https://github.com/mgorny/gverify"
-SRC_URI="https://github.com/mgorny/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/gverify"
+SRC_URI="https://github.com/projg2/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/kuroneko/Manifest b/app-portage/kuroneko/Manifest
index f917c5712baf..66410eaeb663 100644
--- a/app-portage/kuroneko/Manifest
+++ b/app-portage/kuroneko/Manifest
@@ -1,9 +1,3 @@
-DIST kuroneko-0.1.0.tar.gz 8964 BLAKE2B 051539ab6714332b02188854debe655d405093418a3edcf88f58bc54f153c5e9cecf9f9ab165ea32e9dc1d967c43618249b2a6677cb74ea020b05def99479d1b SHA512 b4f9e4cbf932927549ab1411aba15e8ca394919e80a19f7bd04a560764d74c7c884e96133c9aad1be69f9646b1d37713dfb449a1ca09bd74d407101789c213c1
-DIST kuroneko-0.1.1.tar.gz 10223 BLAKE2B aad046291218139662e74c653241bfb36180a0f7fdb4e3571c4d3c8787c41032c48a96d7b02f612e957b2a0eca9fd880daa03c31302d2e92eb6dec5df1b18aab SHA512 c4f29cb5244e659f2615cca706d002c9f20b200b51c964250da8c915d45bcaca03eac2a2dbc19e1d9b6a6374b7458b2c9e0a004e0fa14b1655e8c2c9ce8268a9
-DIST kuroneko-0.1.2.tar.gz 10279 BLAKE2B 9c468e17a1ca566a0bbdc65a3b4d8f5e08e188b2d999c9ee94187ee072f627f34dad9c965d67fc58108585cf05b876158b12b0c2c6043e0a1f5f16ed2cfe929f SHA512 9fff9b65fdda9a48d6c2b40b84fce5af811b288b0da08aee50ab2d393826dad2bfbd2250875b2dc40c55e417c7f8bff04bf7f4ad1b5f2adbee26a0bc94b9955f
 DIST kuroneko-0.1.3.tar.gz 10872 BLAKE2B 3dc85e92a4490501897e25949d258341e661672a2bd1fbce2673d3be6ead3599269cfc93884ad05da9ee41f90b60d17faeebb6b806da870458c8cf13e33fe58e SHA512 b388e0c19faae282b158e63a2ef3f54af98932e5f0efe96dcdcbd0ace509a22a1f7887834c94813912a03734448bc230767ab8e1367545f5cc877d778954fa0c
-EBUILD kuroneko-0.1.0.ebuild 790 BLAKE2B 4d5b1b9aa95ac1a1ed215e08690fa3b5b4d5f6a183c9d52960d2cb6bccd825e2d9a30c688f4b9d203571bf3ee63ffbbcfd7888182d9a02518ab0c33833005ea6 SHA512 52e2fa14d8baf97817e400170bc452a105a3b677ac91b9ea16654272f0076fbc25eb1fb2b1e6c77adbd08e632e6084059984e6215a91ae1ee3033101c8a9ff73
-EBUILD kuroneko-0.1.1.ebuild 749 BLAKE2B abe1b2260751e12a962bc2bafc53a11ebaadeffe107ae12fcdf16460aabd4e8481d88d4e78c73ac9f98f3b65a2b20d7f7016915307bc896052d1882ad503a6ea SHA512 581ff5f1d6c6a8081160141507f5fcd141dcf0b549f18f12702cfc08f57b6a0713bf9eabc607d426501b8976c985bee636e5b9619b0a5419e3e1573203e90628
-EBUILD kuroneko-0.1.2.ebuild 749 BLAKE2B abe1b2260751e12a962bc2bafc53a11ebaadeffe107ae12fcdf16460aabd4e8481d88d4e78c73ac9f98f3b65a2b20d7f7016915307bc896052d1882ad503a6ea SHA512 581ff5f1d6c6a8081160141507f5fcd141dcf0b549f18f12702cfc08f57b6a0713bf9eabc607d426501b8976c985bee636e5b9619b0a5419e3e1573203e90628
-EBUILD kuroneko-0.1.3.ebuild 749 BLAKE2B abe1b2260751e12a962bc2bafc53a11ebaadeffe107ae12fcdf16460aabd4e8481d88d4e78c73ac9f98f3b65a2b20d7f7016915307bc896052d1882ad503a6ea SHA512 581ff5f1d6c6a8081160141507f5fcd141dcf0b549f18f12702cfc08f57b6a0713bf9eabc607d426501b8976c985bee636e5b9619b0a5419e3e1573203e90628
-MISC metadata.xml 438 BLAKE2B f6580ad00ec0574de3d6f3a254a493263c6569e6af7e71abb2e0e62da8c300b33813df2efa9cb68d790510ad35c7beaf30b642b7577d0007d4eb2d399c051d69 SHA512 2158c9311b3898ffdc2cd3acad1f4fbd3aa3703c1ed49fd5e969c48cf039f603a9ce02f7667a909bcf7fec01b6f39a2b52a70a8384b5ef847a26593c5ed48948
+EBUILD kuroneko-0.1.3.ebuild 754 BLAKE2B 62ff24035b45737a0a175fecb7baa78e032306fb1398be0768d00defe646a67077afb871dddf8b5ebfa8335ffc37c664a55b41e8600403e72cab8169fd286f0e SHA512 8989f30d2bcefa992e226ffdec7893aaf1ce3b037d389662ff2374337f1d81c961383579109bcc35e8326a1d886338db296762f9274d95cd9d97aaa7b0435ff5
+MISC metadata.xml 438 BLAKE2B 75bd77f5e0411973b394f906dcce51fbaa9b75d3ba30b80a72b3ea3cfe15120ed9767d553e67e2a6f1ca8179d31c57e6113bd2393157ae4f0ef08afabb4635f5 SHA512 41b54eeb946cfd4f704c0b03bf4440b8f987cd6b710dd631c982262816bde6b06675e0f2a86310a840c59b351b3e736f2e6db3642dc086b4d91d17862119349d
diff --git a/app-portage/kuroneko/kuroneko-0.1.0.ebuild b/app-portage/kuroneko/kuroneko-0.1.0.ebuild
deleted file mode 100644
index 0bd9b554e20a..000000000000
--- a/app-portage/kuroneko/kuroneko-0.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 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="Vulnerability checker using data scraped from Gentoo Bugzilla"
-HOMEPAGE="https://github.com/mgorny/kuroneko/"
-SRC_URI="
-	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scraper"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	scraper? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/app-portage/kuroneko/kuroneko-0.1.1.ebuild b/app-portage/kuroneko/kuroneko-0.1.1.ebuild
deleted file mode 100644
index 9b74e4af13e3..000000000000
--- a/app-portage/kuroneko/kuroneko-0.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 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="Vulnerability checker using data scraped from Gentoo Bugzilla"
-HOMEPAGE="https://github.com/mgorny/kuroneko/"
-SRC_URI="
-	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scraper"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	scraper? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/app-portage/kuroneko/kuroneko-0.1.2.ebuild b/app-portage/kuroneko/kuroneko-0.1.2.ebuild
deleted file mode 100644
index 9b74e4af13e3..000000000000
--- a/app-portage/kuroneko/kuroneko-0.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 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="Vulnerability checker using data scraped from Gentoo Bugzilla"
-HOMEPAGE="https://github.com/mgorny/kuroneko/"
-SRC_URI="
-	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scraper"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	scraper? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/bracex[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/app-portage/kuroneko/kuroneko-0.1.3.ebuild b/app-portage/kuroneko/kuroneko-0.1.3.ebuild
index 9b74e4af13e3..8760452d1720 100644
--- a/app-portage/kuroneko/kuroneko-0.1.3.ebuild
+++ b/app-portage/kuroneko/kuroneko-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Vulnerability checker using data scraped from Gentoo Bugzilla"
-HOMEPAGE="https://github.com/mgorny/kuroneko/"
+HOMEPAGE="https://github.com/projg2/kuroneko/"
 SRC_URI="
-	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
+	https://github.com/projg2/kuroneko/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/app-portage/kuroneko/metadata.xml b/app-portage/kuroneko/metadata.xml
index f97ac90e4b67..7af1965fdefb 100644
--- a/app-portage/kuroneko/metadata.xml
+++ b/app-portage/kuroneko/metadata.xml
@@ -11,6 +11,6 @@
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">mgorny/kuroneko</remote-id>
+		<remote-id type="github">projg2/kuroneko</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 6954f8e37b07..da306277c930 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,7 +1,7 @@
 DIST mgorny-dev-scripts-21.tar.gz 11674 BLAKE2B cb3c217df259a6ef48f8e11da8d42c3dcba6c50cbed7e9006d0a02520b0f4bd54a7ea330c680f8570a93d799accfd7f93f410e8fc085cd544fb9f09168a47f84 SHA512 be49f0f5392817cf881ec9bcbca78da525f8170b0f9babdfcc0f7c2b9fdd3a0bd31db332498e98c937b22b3b6a5b6325ec2f7150548847cbbdc915d589a99b06
 DIST mgorny-dev-scripts-22.tar.gz 11684 BLAKE2B 6a17ecec290d761df650d8607f246411d85e80e8511ef1073d671878544785c055dfc4e35bb9e8d937747eac731e4c18075dcbc95044fff3bfe3e8567ed9300b SHA512 597505fe6d27fb0f21308a4966714bc9161e976abe66ac5437d4705a161d960a4beeaa9d3dc36346e69221b1dc912a5957a6ad537ae0f7b4b96f33a419d6933b
 DIST mgorny-dev-scripts-24.tar.gz 11691 BLAKE2B bfc81908b4769a111eee3ad12c931f8d3c1b60715d6b9828ff091da19a7df8258878105cfb402f7b1f4760f27e746db5e65e452bc5a727366cdd51be442e5bd2 SHA512 f2fd31f1a8c9de6b7310c7cc24bf861836948a9d88adb389ebdde9fc0d365efafae908f7fdba556a83c6de607587c55a90fd96116c48e78d39900e8b6dfb15b7
-EBUILD mgorny-dev-scripts-21.ebuild 662 BLAKE2B 19c9b1e870586b42036e48983021b78c5237ad4492d2819fa74a4c9090f9123dc69aa938dcab8c1d6cd78b637e4820ed34a3233b394fad7d46eba11f82945eb7 SHA512 c26fde3efa808e48b2414ef1f7106ff2d1788c3c868efe50a2405977d060149e7116c8c6f8a5220cb4870ffc28d4b9d3298f57ca9ded609e45be71aa557f055d
-EBUILD mgorny-dev-scripts-22.ebuild 666 BLAKE2B d710ad936e36c317afcd07ecedd163a30c30669e259d0f9379abf123ff8081a178d95c92aa9f05f267bb69173819ae0d8e3ff0a69b53bfd33fd0d05b41672455 SHA512 28fd5a01b940970ee1a5eead332cde991ed0feae7b030aed7cef34b866e75572d6abe9f48c3cbe9ccf89e1444707964d87aa6c5d3a6425f8d775be00315f801f
+EBUILD mgorny-dev-scripts-21.ebuild 662 BLAKE2B 753e4b2ae52dec310c27f21ebcd690d86822fccfd5dc08c11e963e6613d0c2b5967316c9a1b60020de7863677b35a7fd781b56062f12557996ab3cbde17ce58e SHA512 b1d47a3a289cf9339f151b7ddd451ed95c86439dc741bac199cc464dcc3f28370834402b2608bd255306a65627e73cd2a0bec8598bf3a54945f84f3dce6f076b
+EBUILD mgorny-dev-scripts-22.ebuild 666 BLAKE2B 3b35b5f9e8a3462fc06dfe58c77c9a62affe90641fdacb11998746cc4c1c67b2deeba8abdad58a0320777b56bf2c6bf82d70656d1fcbf85533086650fa9e40d1 SHA512 c7dc3f9dc74cba4a45895aa68319300d5ed8337931c16034eba6bcbc41fb3707da5a875c3ea8cbfdf9c829a59392deb171eb52130ba4005552fe33e04a4fc62f
 EBUILD mgorny-dev-scripts-24.ebuild 666 BLAKE2B 3b35b5f9e8a3462fc06dfe58c77c9a62affe90641fdacb11998746cc4c1c67b2deeba8abdad58a0320777b56bf2c6bf82d70656d1fcbf85533086650fa9e40d1 SHA512 c7dc3f9dc74cba4a45895aa68319300d5ed8337931c16034eba6bcbc41fb3707da5a875c3ea8cbfdf9c829a59392deb171eb52130ba4005552fe33e04a4fc62f
 MISC metadata.xml 362 BLAKE2B 9f7873c2b1dea8abe84daabea4db33438b730c92487220d28af391e411f58b15f7eaa7aedffab8849a8d0cf4c032db04e48cbf9be28f0ee7602b6a05f0e430be SHA512 d7d44e67c952a00cda52b223975c1c48ca8283d55ccc084edbed956633e8f2a04ede1553f16a3b673485ce433b9067d35c1459f0ef392ddf6d4d03ab02d339a2
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild
index e607c80581a5..56f187c76de9 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
-SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts"
+SRC_URI="https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild
index 3b3f636dbc02..09ed49fb3813 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
-SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts"
+SRC_URI="https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index c9805c898936..c073a25864e8 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,3 +1,3 @@
 DIST nattka-0.3.1.tar.gz 95368 BLAKE2B cefe8236694ceffe9adf3c5af9c8c3521613fbc09b6e27804ee855a376f940baa5e7bf3d6d5d62371d37cea090748ec7053963dd675e88b9cedb48d595425ff4 SHA512 14b04b2f6fff41cc9705afe5cfc522a3009b14afa4ff5759c1913387afd04c97231fe2ad5661cef43c5ebfe764012cec251fd78463bbca924fbf33068a31aaee
-EBUILD nattka-0.3.1.ebuild 952 BLAKE2B da1bd79e29cb79bf775a8347e0470543eb4d505f35d515e2c62e616452bc76f4738666409629f98167bf230f4603985554fce7f97ebef8fc8cb194df45bcf8f2 SHA512 9e32ecbd6556f30d7913af114ae67dba586ed342d93f37501f4ee36ca164edab89fe9300ed68994eb17091888966782511016bc3ed666ade606809f5d717eef6
-MISC metadata.xml 507 BLAKE2B ce5804f8de9203f99ba65cbd80a7f17644b98d16cd771b7003563a2fce3411141db157b88032bceb9279371c0a537c79f8a0f6dbb7786f4c4af4a8cf5e5a0ed1 SHA512 67f71ff09ba69666813aff7ef9380dd86f58144de9e1ecaa5f1232034b7693707a2a43b9bb018e180d177994e3c9221ce5eee45b3d7eafb383ac9f222da6fdf4
+EBUILD nattka-0.3.1.ebuild 952 BLAKE2B 11b850bb00518f839dcd4d94317648950f2a67d0b23c72766a80b83931a8e7bde9f3e3ae7354c74ecabcd3059c9eead2b958a3d6b8874dc976fd454c72ff4fa3 SHA512 9e41b5402ede0c9f2cbb0bcf0fec01a6ebe511e5ffaf0eb8291ecf7519772d9c0fc13513ccded8cc5bc71f5eb2477420cf958a1c6208b713fe34cc94edaa36f7
+MISC metadata.xml 507 BLAKE2B 8a1c2cdea4e8af36c498cdcab09ce144df070f082ed18a7fae9b6efdc51a62ed47d6afe77de4a416811e1d29bdb8989f4a470a012c6e08db757a34ecd60871c7 SHA512 82acdc10588aaae42fe818de37bc2ba23464e46847d8e9ee83240a6555e1b7d94a3495fa8df964b142977f9b42a404d5cf01ca2e345a4a2a36594a1039a76e70
diff --git a/app-portage/nattka/metadata.xml b/app-portage/nattka/metadata.xml
index 39c3292f2a1c..5ab1f4379e97 100644
--- a/app-portage/nattka/metadata.xml
+++ b/app-portage/nattka/metadata.xml
@@ -12,7 +12,7 @@
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">mgorny/nattka</remote-id>
+		<remote-id type="github">projg2/nattka</remote-id>
 		<remote-id type="pypi">nattka</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/nattka/nattka-0.3.1.ebuild b/app-portage/nattka/nattka-0.3.1.ebuild
index 57dec4861b07..8b8256936b3a 100644
--- a/app-portage/nattka/nattka-0.3.1.ebuild
+++ b/app-portage/nattka/nattka-0.3.1.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/nattka/"
+SRC_URI="https://github.com/projg2/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index 1c021ddb706c..72646e4a3f08 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,3 +1,3 @@
 DIST pram-10.tar.gz 8292 BLAKE2B a5d6cbef942127479709b3306f20aaed696ac60d34dba53cbe15377c42d785d43c11b36889ce67a674d3ce355529c267e896cded714ef6f042cf77a3721100f8 SHA512 5dc11ef82ed84b5170f094ccd5e9515affc250f9efdc24be52edc7aa1720cda664a1a394301e0d8fc18a7f8c839a1147d29eca5f758d922a5ebbed6d166394f2
-EBUILD pram-10.ebuild 590 BLAKE2B 59c477357c28000a37f8925718a6471a8b602d6199889afb878e4098846d291ffba2d2818e5ea0a6b6838d60dec64f42b851db157b8baa7dda68d962677cf985 SHA512 5f35dbed078169c8cb0c6d5719d2ab417ea72797c24ac0e8d4c202bd7511cf7ea403d16702e714b4a1ecc9f4e44cfc8d7d1fac5478bcd2b987f1200434b77f8f
-MISC metadata.xml 522 BLAKE2B 51d47d3af0c81e86e9465ed49dc43f5994844444049870d8de1e3e3a8a01b1ffea366d0669df99badc72f26e21767a38378258472b3165aa7e1a1a8025e6947e SHA512 41fa051f0ee62189023ae3fb12121f74fe4276a8c221c74ac0d1683464bfd2fffce0be3d9328ca68f9101ce74089ab2e19a4364abd2ff5459aa61deb11ee0152
+EBUILD pram-10.ebuild 590 BLAKE2B 8e57378da09f213656665766b529e11d05dd9858c25ceed90b5a3d95f16978ed4f7380f63cfdb82c09dd1f846d5f0701ea0e5ec39cf981e2234a5fb4a4cc382e SHA512 cdcb6212670a799cf0370dad4caf7aaa1243d202a9f6022bbe71f27baed0925d9576cbcbaa248ea985d89a2879c5f7e58d3349c93d083433c85b26e594e890c6
+MISC metadata.xml 522 BLAKE2B fba6a122663f259795ee8ab8c53f48651761f145f16aff1094309bd7253c1261236c301a9753cd516fc929a4b9d01f38a08fbc5970f422a14e9ea79a1aff992e SHA512 16844d850f9d405854323c230195919c8bd082606b06051995ea0961c71280ac7d4cb24c38fe604ed1633d9269da9e8e10d8fd2e5df6c9311bb5814375fb8d19
diff --git a/app-portage/pram/metadata.xml b/app-portage/pram/metadata.xml
index 0b3b5635fcc0..8a8dbe18503f 100644
--- a/app-portage/pram/metadata.xml
+++ b/app-portage/pram/metadata.xml
@@ -11,7 +11,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/pram/issues/</bugs-to>
-		<remote-id type="github">mgorny/pram</remote-id>
+		<bugs-to>https://github.com/projg2/pram/issues/</bugs-to>
+		<remote-id type="github">projg2/pram</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/pram/pram-10.ebuild b/app-portage/pram/pram-10.ebuild
index c60fc2d697b3..25e440cef3bf 100644
--- a/app-portage/pram/pram-10.ebuild
+++ b/app-portage/pram/pram-10.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit meson
 
 DESCRIPTION="Tool to ease merging Pull Requests and git patches"
-HOMEPAGE="https://github.com/mgorny/pram"
-SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/pram"
+SRC_URI="https://github.com/projg2/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 83c81ca472d5..0d9339a22023 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,4 +1,4 @@
 DIST smart-live-rebuild-1.4.0.tar.gz 17630 BLAKE2B 84faabbe702dc05dbd895961dba83b8b8968bafcc5e35bd1b7dc8644f98a904651168aaee081ecb0c101761def2f5d49046116179156e75f6b335a79595d82e6 SHA512 add82ac413c698a430afbb48a7d4c7d0dae26b9d37f01dcbe7f71ee2e2fbc1686ff63c6ea9ae1c24dbc3662d27247bec2ccc002841bd42c4c11729873a49617f
-EBUILD smart-live-rebuild-1.4.0.ebuild 816 BLAKE2B 5c86d8a0e58ec7ccce434b303c7b4a9fc58c261060ddb7d1f645ea7eeecb41a7998c16fdf191daebc8232aa060b8ee2d93fdd72871fdf33d7f5310845b96444d SHA512 fee0e917fb37095ad5e11d34ef5aacaad0c0b470a717bc1c3244c2b5bb65d58dd9eec7e332c71f582309eab79807054b71e3ed154149839748ecb5db52547ede
-EBUILD smart-live-rebuild-9999.ebuild 723 BLAKE2B 757ddfda7dbcb90fce93a7bc3c967975a68ee372e089bebaf554f685869cd6f687f44f301fccb391ff784eb94c2b8ecc2df236017b6c17aa8a799f762e62b8ff SHA512 9e4f540f520f79307b094a5c745e764c0d921af037e89395645b8df406fc760a0fbcf0f8a28634e8f59c257c6745f8e5840d6bdf76fa58b78bb119db1f84912f
-MISC metadata.xml 794 BLAKE2B 24cd92d94a8efeb0b9a3ab601f9f5581dce5686365332decc71c80c5a3a431560929d33faa4736259a19bf8c92fc9e1b6557126e67678c3bf1c2573236eca3f9 SHA512 24d79d34c1aa3c213ff920ca9f6e010809f949d1c5487601735ead39da88ad8c285eee091336f4a45ab5d9a095597e3aea16511f17ad6e33416439e89521d35e
+EBUILD smart-live-rebuild-1.4.0.ebuild 816 BLAKE2B 350a62c20c6277601c025c48fd99fc48c6e613793f5a5300e2532cb84ff893b5d9eb2ca5d960193bb9eb133ebeb6c4ee6de0c3be228173283f4ff4fade5baa94 SHA512 853d0f5d4cd5c0ff94bf87f492c10c5256119a343243fcca0120232aec574b1dbd64978b5f256684475ec42ad4ae3cbe6d963d1f7b399616e85dfa4eabcc4c09
+EBUILD smart-live-rebuild-9999.ebuild 723 BLAKE2B 7e44cd57e02b4be1dd9637fa39ecaa8419e7b48d37841efbce0c759d31269f24475b49b1eecb818cda4d190955b8c502bedac49cd79d686025954b7ad7cdfd34 SHA512 f767d0dcea03f2edfbe5ec74fd919a9acaafde8790c49578126d6981fd9c62090a4773a20888f1cd1ac3cd211030d251c4b660ad644822238835d5375bb8f560
+MISC metadata.xml 794 BLAKE2B 782678608fa8406a1f0cc82d6c121f69c11d6f5cfad96ede40f8d50203fc1ca5f74c8b3f17bdd98d007843387cc7ef67aaec2e70b21f8d032a82d7b5ef5341bb SHA512 30a2d57a354ed9ca5e61a08cd08d122c7d29058b967ddbb61b3bbea6ff14ac35c5ebac490ea7116d486c16a80d458d66619a8dae417d3af727437e2edd8a139c
diff --git a/app-portage/smart-live-rebuild/metadata.xml b/app-portage/smart-live-rebuild/metadata.xml
index 2d3dc3beb1b3..122403d5a743 100644
--- a/app-portage/smart-live-rebuild/metadata.xml
+++ b/app-portage/smart-live-rebuild/metadata.xml
@@ -17,7 +17,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/smart-live-rebuild/issues/</bugs-to>
-		<remote-id type="github">mgorny/smart-live-rebuild</remote-id>
+		<bugs-to>https://github.com/projg2/smart-live-rebuild/issues/</bugs-to>
+		<remote-id type="github">projg2/smart-live-rebuild</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
index 06f0f8a0098b..871b545544f3 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
-SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/smart-live-rebuild/"
+SRC_URI="https://github.com/projg2/smart-live-rebuild/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
index 190ef2047ebe..14cf632fdf30 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
+HOMEPAGE="https://github.com/projg2/smart-live-rebuild/"
+EGIT_REPO_URI="https://github.com/projg2/${PN}.git"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 5fbf172e2e62..0bd1dc4a5df7 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,3 +1,3 @@
 DIST unsymlink-lib-20.tar.gz 11333 BLAKE2B bf5ab4390e52dceb0f86717abc21d752449754b6cb1083b34547997377c24618412d1dfef9736286d5af35632113885c998bddaeb373267280289b93a9ee8f40 SHA512 084d733046499ffa3bbeec6f59e72a8bd8bd9924c6f4cdca5f1bec5a6ef59502ceb19b156783c14d0418dbcd37025da65caaa2ce47665a26cec609e1895b01fb
-EBUILD unsymlink-lib-20.ebuild 721 BLAKE2B eab912763fbe9a46d1b8dc043f4019b50f8980d9759e4e5ee9a85a5976e1f0819349356eddea4b5842cee54398f17cb13f4fc95e687cf084a59401af65c827b9 SHA512 11554b955d9472a9d8115c408aa63c15f1455aceab8a6fe43ddc8e30a70912d4338b38580f813f6c3d6739511ef18191c1f393aa86978408c58767da18633349
-MISC metadata.xml 402 BLAKE2B edaf7e0b834e6f57dd8db2d667a47539d0d1a0ba402880fa79855036fc5f25684657e1b8870aca2705010aae30b189f60eba1a14e18d2ed3956c4277ea013159 SHA512 5bbe61d0e16c6c7dfc928dcdc4ce7fc7006577c0e41d18ea3e1b91c0943050ec232c9c184152c9f248e09cfa15ee3d86796ed22ea903f7286cfd02271d8d7ef1
+EBUILD unsymlink-lib-20.ebuild 721 BLAKE2B 474b5f1aa9a090879781411793c60d5b130911fbed30423de78c64b7c258d7ef013d9d2ae84d5120632ba1578d4156156e39e507846a99455f1d02ddf601ed8e SHA512 b7333e5f03dd01f9699e5184de5279515034109a0aad64f9d77b400712e0e1d2528b07f5d5aabbcd04ad7f81cdcb083f9ae754d8935cba5354cba372b2c0cc8e
+MISC metadata.xml 402 BLAKE2B 1a8af8f3754ec266f0708ec05269e9ae452610cddae9899bca4ac6fb44670e600ba7baf8c4c56e5a34ce6f9db18b696366f2daeb3fcc39fc9006aa7b5e4b0665 SHA512 e8f30e3b9041b935d92a9cf9987e6631d45b9b15ae77c93db3fe95630137584bfb91bb1af9ab8224dc1c594b1e3a7c9eb84cc7bf49dc7131f064fbf48aaa981a
diff --git a/app-portage/unsymlink-lib/metadata.xml b/app-portage/unsymlink-lib/metadata.xml
index 0ba87dff8fe0..3cccb08d1631 100644
--- a/app-portage/unsymlink-lib/metadata.xml
+++ b/app-portage/unsymlink-lib/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://github.com/mgorny/unsymlink-lib/issues/</bugs-to>
-		<remote-id type="github">mgorny/unsymlink-lib</remote-id>
+		<bugs-to>https://github.com/projg2/unsymlink-lib/issues/</bugs-to>
+		<remote-id type="github">projg2/unsymlink-lib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
index 070dd5986d41..30c2eb4c6e4d 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/unsymlink-lib"
+SRC_URI="https://github.com/projg2/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7da535a3bcd2..2d4f830fd1f7 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index a44978ff5a44..2197144a4cc3 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -3,6 +3,6 @@ AUX mysql-connector-c-8.0.22-always-build-decompress-utilities.patch 534 BLAKE2B
 AUX mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch 11508 BLAKE2B 1fe2341c938ce580611bb1f2ded279d02d4f1130b719c43d0c70942e9954214cc4392b86a18dfd0f88082c6b72fdf270e076647dd1600d7ebb8eb437ca10bb64 SHA512 1b7b1bf471ad6cab6c86dbfb7f6ffe506e3d20a51efcc1df503a9d65976fedb8dbcd67993897241fc0dd9e1f7356670bf3ec80c5b7f66c9246a44b4aa3eee3cc
 AUX mysql-connector-c-8.0.27-res_n.patch 1635 BLAKE2B f75811958a6415bf45aa571a8da14c371500216a197602dec19b8b565bc219f98e8feb9bc660d81e32c4af7f39abb626af405d33a7f478617c8ee96c5b4453b8 SHA512 bb6315f0ac540d0723dffd9f8c2bdad9b9b1c0a3d706f80fd3bbdc9c7f276a8dda2754df94f6cb4ffecb0c3b0e65edc96c90b171eb0a4e5032fe6583e56ade85
 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
-EBUILD mysql-connector-c-8.0.27-r1.ebuild 3266 BLAKE2B 34dc236b5a08f9baea91c131460b6dedee196baea60acf07b607fc70888c186869a4c839e6905b1f9a46da0b9543117d7a3314affa758e8f34098ceccdadfb6e SHA512 24a66ad5b675b283da39d7c87b7d2741a4781d8b1c33b1d6ac8e549e07d896ab3da6bacdadb9dc6af2401c6f8989f01b7f9664792f787c94d5ecb1245fc2606c
+EBUILD mysql-connector-c-8.0.27-r1.ebuild 3265 BLAKE2B 8c7893af95ce60f773c6331ab38bf339e0c72ae0e351a056b2b0e2e3517c24f64246f03bbc4eb66020b1eb660541656d22a0abdc91719b0c12b0f0846602df5a SHA512 097d0e7ef8b9a0b0cbf251268bb2a8d0d8beec58a5aa71f033693ea7952be9b763d585bb733f9a462422a9305ed089aa8fd1b16826b29d789513c58345550976
 EBUILD mysql-connector-c-8.0.27.ebuild 3222 BLAKE2B 3b8888fe231a27fd07f29ebe1fddabc215ccd9337af0b7f7b30cfab64f2c98b3af06d4840b19fb7a8dbe47fb3699bbfd7a2be39bf8d39ca9eb8d704e92eedc51 SHA512 60c9a2f43d481b51d1334dc92dc9f2f056efb8217f381503b8253ad8b54e570dda98f5b79c0b2ceb272a1b4de84157bbb14a99da3998bed428dce8196734d924
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
index 14e1bb92ef6b..058130f8eb17 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 	S="${WORKDIR}/mysql-${PV}"
 fi
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 22f3237a0ec7..011a637e8c38 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 25734ec7c140..03ceb95a20e9 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -36,16 +36,16 @@ EBUILD python-2.7.18_p15.ebuild 9827 BLAKE2B 77ebeacfa236e518ec0c0a791e0da60f815
 EBUILD python-3.10.5.ebuild 11701 BLAKE2B e83015ffd3bdcbceab4271ed82f6ee54d8b79494458a51ff46221ecfd1f39319fd00ad4d27471c73ef2fab3a3468b587138f9dd3d431ebf8192f31789c9d58f0 SHA512 fe2a00f53699a0ea809d891b66e0c1973402e8a504dc45bb67f57d1549b3809c2f894cb27264d8d8f35071c5fc967cb43c6250382e2627ec4197635d7f91a023
 EBUILD python-3.10.6.ebuild 11189 BLAKE2B b50f71bbb9b5a72724f52193aa114fc7ec4ceef3559649964899f9aec4911726503ab24ec4c07b53d2f15ba498844913d3618832763e9b3728d8f9303a97a3ea SHA512 2a09997fa8f451ab873bd039f47a7f4c1a146befb43c8b56467ea9fd93f61e7d55a90ef289804aa6d15c9e5ebc5fded62879eec8dccd528ab25e4df8d39e63a8
 EBUILD python-3.10.6_p1.ebuild 11189 BLAKE2B b50f71bbb9b5a72724f52193aa114fc7ec4ceef3559649964899f9aec4911726503ab24ec4c07b53d2f15ba498844913d3618832763e9b3728d8f9303a97a3ea SHA512 2a09997fa8f451ab873bd039f47a7f4c1a146befb43c8b56467ea9fd93f61e7d55a90ef289804aa6d15c9e5ebc5fded62879eec8dccd528ab25e4df8d39e63a8
-EBUILD python-3.10.6_p2.ebuild 11189 BLAKE2B b50f71bbb9b5a72724f52193aa114fc7ec4ceef3559649964899f9aec4911726503ab24ec4c07b53d2f15ba498844913d3618832763e9b3728d8f9303a97a3ea SHA512 2a09997fa8f451ab873bd039f47a7f4c1a146befb43c8b56467ea9fd93f61e7d55a90ef289804aa6d15c9e5ebc5fded62879eec8dccd528ab25e4df8d39e63a8
+EBUILD python-3.10.6_p2.ebuild 11185 BLAKE2B 74667d26bfcce104fda9fa80195a550778c0ae26497342d40df5c32c40118ffc0fc44ed86cea42a8ed65f6f301292c6fd33fc8d061939fe512079105407aab24 SHA512 315a2a0a008f275764c44964a90d65adb9dd0aec27840c1b3a38504dead761a823c7da54755122fa8efe7eea82bee8339a71eba306b3cdeeb0bf197473e92f2d
 EBUILD python-3.11.0_beta4-r2.ebuild 13637 BLAKE2B 230701d089c7e42f80b0666a1ac6c5d48ff6fe8a5b7822ee3d4cd41adfe6e50143ecde143e228416f97cc0886910b22bc0fbb83ffad3ad19006aebcc382516fc SHA512 ec7a302106654abefb0672e25e1f189506d35111be4a983ae5b51281bd195a452fe1fb7170b77f8048c880563664f8b9b3624c434594a4f3b36306a203e299e9
 EBUILD python-3.11.0_beta5-r1.ebuild 13385 BLAKE2B 00d7c1d17bd8ad3acebfde6907fc27f77abc91a25f3d3e576bb6895c46f7cae88a8cd6dcf883dc3d91d0fba36349f3b209a512fff70cf4ff950a7f52d3e7d548 SHA512 56442b0cd0b7789c30d180b07e2e77b3203720e66084340cc85923410d54ca2ff40ce9096af844cde217f44bbd4e95ed4f8e69f192130de45bf14883d5127982
 EBUILD python-3.11.0_rc1.ebuild 13384 BLAKE2B 7ac3f74190fafd1321f2ae9b478cb1b7381f13ce88d1839bbe2eea12a9abb0f14286f3e6036ca65c2d37ca6b07b62c14f557a7af080f6f05f119e7bbd77764cc SHA512 3b94a9e45017c0ec3d2bb2ca346d423a0e31d3b1f2c1fa098aa2c4f0af58e49f3626688dacde9740b2c1f44c63f143bf43ec305d0ce69c3e68de3ff6ae0a88c3
 EBUILD python-3.8.13_p2.ebuild 10219 BLAKE2B c736d7417d2f7c8f8a6ee61182e1b2b9e22873343594a3779c83fc1af03103ae71f440f856d7dae7a661dc7190e70afa7c478dd7d8531d28637897c1ebd4106f SHA512 89f482e716b308565f41c4c6ce1db32f9a4023a41570070ddad4ac9d156f802d79f8ad7d2971b9ed02487482c50d8e4de64d212df092dd907d2c94838e6af921
 EBUILD python-3.8.13_p4.ebuild 9739 BLAKE2B 7baa8adde29baaea89a9f126a3090fba2186bcb2734ca737705c97d1b3f8d3036341ab2b626dc6e4cd5ab7630e386ef7f3444bb5847b79abf41806e2607715a6 SHA512 80ee67adf3b1c7461edb6b3ba60f5f825d93d89cc68f4a11b1de2bf84f4cb428718cee8079e68b074044a8e7f00d2423c97fc0cc3bfaa0848b6154b9abc3d6c7
 EBUILD python-3.8.13_p5.ebuild 9739 BLAKE2B 7baa8adde29baaea89a9f126a3090fba2186bcb2734ca737705c97d1b3f8d3036341ab2b626dc6e4cd5ab7630e386ef7f3444bb5847b79abf41806e2607715a6 SHA512 80ee67adf3b1c7461edb6b3ba60f5f825d93d89cc68f4a11b1de2bf84f4cb428718cee8079e68b074044a8e7f00d2423c97fc0cc3bfaa0848b6154b9abc3d6c7
-EBUILD python-3.8.13_p6.ebuild 9738 BLAKE2B 7103f430ad54633b7b30b82fd8c26d7b39f0accf9704ea781217888b8dbc910da9663a774075727d05097818c733b9cbc722d7a2292c2d010927f4272070e08f SHA512 3bd7ce3dae452f66f001ade710eec475fef26fcf02504964dfc08663263d2de43e93fcaa4e88efaf00ab92eef26a791ff774fcf463c3e1caa46bccdde54d71f0
+EBUILD python-3.8.13_p6.ebuild 9734 BLAKE2B 3647765a3fe766069b8689e970159a7f2660b9daf096eec27bff652c59cc2339bd2bb01aafb6c0289ca7e7a11c323f961f8882df9c5596e056fc2ff71e065ce5 SHA512 c7397835bb6ea3b47dd3649eafc1dfb472a98ff133967714b44632d80b2a439ed23088ab2a236129cdecf8292e59642ecb68ecedf8aade16f69117e3bb9f507a
 EBUILD python-3.9.13.ebuild 11462 BLAKE2B cfa217f58ee03528ce5dd467daa9023c67f89d4673def5a183eb7a0c2db6fe40527a78067803f7edcdcf32eef5dc72179b9be9d9a04f5766258945a4a16e3991 SHA512 4a7fbd6f6e7ae1fc1726a170879e26a6f7e74fe4fc2b52efacf5608350bd967ee52d63df4fb8d52aebe881bc003285e29d55fca5aedf74182cdb5f8b120ca8c4
 EBUILD python-3.9.13_p1.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
 EBUILD python-3.9.13_p2.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
-EBUILD python-3.9.13_p4.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
+EBUILD python-3.9.13_p4.ebuild 10989 BLAKE2B 5b9fd1d22c6c1deb694b46ed6f991237af6c92285c5915bf073ae3f85365fc9b8442a6623165121e61c3da96f9c195ccd765d166eaabc8efb01e2e464c1668a7 SHA512 c54690ea24fa8e0d1dc90777a4b31c85efcec9b634820aa5e3dd5a84feb37cec0ee519d53784404f09fa2245ebd826228db342d2048b7f90304379dca661cc2d
 MISC metadata.xml 1068 BLAKE2B 3c3511739ae8251d11bde32aa3a21225fd3468f2b1f31c459de956c5bb7dbc2de4103a288dd29b26d1023e40bac62631fa953d1515513e934f5c3962d9c715a7 SHA512 0f7d3f9305cc539619568aea7e54cdb9a3319579e811108cf03d7c66290e4f21080a87ca02f1a62264d4ecd41a243c91f0a639e6c064ccf2b24b460508c848b8
diff --git a/dev-lang/python/python-3.10.6_p2.ebuild b/dev-lang/python/python-3.10.6_p2.ebuild
index 5d9861331971..7bcf965809fe 100644
--- a/dev-lang/python/python-3.10.6_p2.ebuild
+++ b/dev-lang/python/python-3.10.6_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened libedit lto
 	+ncurses pgo +readline +sqlite +ssl test tk +xml
diff --git a/dev-lang/python/python-3.8.13_p6.ebuild b/dev-lang/python/python-3.8.13_p6.ebuild
index 97f49aad0b1a..5487cc4c3e38 100644
--- a/dev-lang/python/python-3.8.13_p6.ebuild
+++ b/dev-lang/python/python-3.8.13_p6.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk wininst +xml
diff --git a/dev-lang/python/python-3.9.13_p4.ebuild b/dev-lang/python/python-3.9.13_p4.ebuild
index c3fe846a9d19..450744bce894 100644
--- a/dev-lang/python/python-3.9.13_p4.ebuild
+++ b/dev-lang/python/python-3.9.13_p4.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk +xml
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 9b3a1acf785c..16bb68dd8b09 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgcrypt-compat/Manifest b/dev-libs/libgcrypt-compat/Manifest
index 87ea88144214..e762464f715c 100644
--- a/dev-libs/libgcrypt-compat/Manifest
+++ b/dev-libs/libgcrypt-compat/Manifest
@@ -1,5 +1,5 @@
 AUX libgcrypt-1.5.0-uscore.patch 981 BLAKE2B 0f7bae068fa1c04834a0295b902aa479304a8b9f066d984d28a49c59a5c041281d93a7bc73e053f4098461364e87b7a665cb890b4792cdf221f44593c23fbae4 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601
 AUX libgcrypt-1.5.4-clang-arm.patch 4189 BLAKE2B 39fb88e752a544232c4c48aa8b8df44952e700966f1cbc361664015d075c1d8ef171ae68e9cabd87cab9ce0424243dfbe71271ce2a984d7ad1bdc8c52efd1349 SHA512 86d462340595420a70977d697237a8bb87583750e90c8368ce783ca0fbfed8816c646dd5e40b8e929fbce29917a2b05bb48a0a492d271605958fcb98faf4caa4
 DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
-EBUILD libgcrypt-compat-1.5.6.ebuild 1560 BLAKE2B 1263cfe7d7f281b19737a9ee4640bdbda4bd9581c3a7cbfb73f64921b5f3d679b0601dce7e77cf345e810ffe67ed68296e5fb15be8a554e6e3daa09073554547 SHA512 787b49b758d421a41e9d063e13789b2909a6b1a6e49e1c8ea6a732ca77ea84f79e32b3bd8d0e69343e0063e825b8dfc32c0c426f800a36f9c87c66edff726ba7
+EBUILD libgcrypt-compat-1.5.6.ebuild 1561 BLAKE2B d7bcafab1ef8408e6238db172f6464d1fb8bed85f8aae996529eb8c5a91e62742941bd8ef207c428c939633e941f23cf826982bcea76d19f2978a9193374a7f6 SHA512 496092531de8de328346df234856b178190237991b2bdc9c6929e29ffc52edb36c1c7807455942a1b4a52ae8a79174bbc646e2ac37919833a1afd588cccdf718
 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
index ec5dee1b148b..9cab16a86f27 100644
--- a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
+++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_PN="${PN%-compat}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Old version of libgcrypt needed by some binaries"
-HOMEPAGE="http://www.gnupg.org/"
+HOMEPAGE="https://www.gnupg.org/"
 SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1 MIT"
 SLOT="11" # soname major version
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 693138f0fcf8..cd5a342fddc5 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,7 +1,7 @@
 DIST libksba-1.5.0.tar.bz2 656518 BLAKE2B 077655031f82ff13c596ad0be0d0f15408a5b793f00e3af3516f4f207285f7d76096216c7bf11d2c46c28eb332cc74df39bef84afb0f47184c8ebdd8cb92a86d SHA512 84383e8b084bf47ac646a9aacb174e510ffcab4b966b649e4351990eaf7ce78cc9d199e6c4f3a1be697888c857ee86ecef949c06156790c7d8d0bd0fb0142721
 DIST libksba-1.5.1.tar.bz2 659280 BLAKE2B f247a2c9545e3c3ae3bbcf50344ca530ef320d12b9a1e301bca086b0e1a69e6b7a88b912b14f862d82e7ad45bf588754db601d987ee42579d8042e68b5108d33 SHA512 156fe6a36daa7b11ce580366ab36a5fceda253413f0057ace791e4f028fd3158a70a3f6ba1d0c824fafee4420d1076864dbd0911606fb65e14c8b2332b6cc92b
 DIST libksba-1.6.0.tar.bz2 662120 BLAKE2B 59bee23f764ab3e0f79fae6074ffe568845b6089ff29b8c5112973490ff5e1436834d5d0b50954ba9fbd6be655f47043a6345181c5c7e552322ceb331d030780 SHA512 a7c76d41dfd8ec6383ac2de3c53848cd9f066b538f6f3cd43175e3c8095df51b96d0a24a573481c0c4856b09b7c224e2b562d88f5c0801e7acfb582ea2739c2b
-EBUILD libksba-1.5.0.ebuild 1044 BLAKE2B 53a3c6515f07e397a33e68214c3569a29e1c146c38310ba8aefb009b89f5e0055cc721ba0f74c0ff339ef394369c367338cc5830da7d1e567bc95f2fd7f7b7f1 SHA512 b4eb5db5c7e043235df8c2ae1f7f480983e0f7833533460e49ae3fe9b25d165913a755b6068ddd4deb5593785cf0345dfb6a33a423d3ffff895a467193f6b35c
-EBUILD libksba-1.5.1.ebuild 1044 BLAKE2B 53a3c6515f07e397a33e68214c3569a29e1c146c38310ba8aefb009b89f5e0055cc721ba0f74c0ff339ef394369c367338cc5830da7d1e567bc95f2fd7f7b7f1 SHA512 b4eb5db5c7e043235df8c2ae1f7f480983e0f7833533460e49ae3fe9b25d165913a755b6068ddd4deb5593785cf0345dfb6a33a423d3ffff895a467193f6b35c
-EBUILD libksba-1.6.0.ebuild 1057 BLAKE2B e3a7e0a602785a3277e7b1a121d5a25377c867f437d4ff43498bae0aad654a0f7b56ec64895ec6f02d4051beddfc72e17f6ea31e7f0e198325ddb3f86f494007 SHA512 20ca2f2811d4cf0aa53e71d45531dd91d588aebedc25056bb0dcff3c2be653cf1cace7aa39850f7b4b3390cee858a652959796da1ad3d1f0bdc2a72c73132376
+EBUILD libksba-1.5.0.ebuild 1045 BLAKE2B 3a522d4a2e1c74b5f7480643697905061c39dbe8c40f448679ca5102b630f94566766ff286c588847cad686a8aeb24c8105097613359a30a51f92ef26989ce99 SHA512 0a0b32fccad43d1e6c06fc451ea300c847053802157e0e72b5c38501144074a8b3dd6bb4292225ca712c4dd0b5460525ca8b5a8401da9f11a4617d6762365fb6
+EBUILD libksba-1.5.1.ebuild 1045 BLAKE2B 3a522d4a2e1c74b5f7480643697905061c39dbe8c40f448679ca5102b630f94566766ff286c588847cad686a8aeb24c8105097613359a30a51f92ef26989ce99 SHA512 0a0b32fccad43d1e6c06fc451ea300c847053802157e0e72b5c38501144074a8b3dd6bb4292225ca712c4dd0b5460525ca8b5a8401da9f11a4617d6762365fb6
+EBUILD libksba-1.6.0.ebuild 1058 BLAKE2B 51ce7a93f6561d8c631072a742132676eaf636924ab46bfd93fd45f789403c40298ce31a92677e30e43868e7636a95d6740999c31e3f9961ef419ce952f7a6b7 SHA512 9cc8ed42f6fc43ce99294be3c02495e5d5f4918f441d44576e01038571955db9da96268846f1cc90751f91eaf40ccd03cf2d0b6b1ad761000350fc5279f16d85
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libksba/libksba-1.5.0.ebuild b/dev-libs/libksba/libksba-1.5.0.ebuild
index 32f6d92671c7..24c1dc721659 100644
--- a/dev-libs/libksba/libksba-1.5.0.ebuild
+++ b/dev-libs/libksba/libksba-1.5.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="http://www.gnupg.org/related_software/libksba"
+HOMEPAGE="https://www.gnupg.org/related_software/libksba"
 SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
diff --git a/dev-libs/libksba/libksba-1.5.1.ebuild b/dev-libs/libksba/libksba-1.5.1.ebuild
index 32f6d92671c7..24c1dc721659 100644
--- a/dev-libs/libksba/libksba-1.5.1.ebuild
+++ b/dev-libs/libksba/libksba-1.5.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="http://www.gnupg.org/related_software/libksba"
+HOMEPAGE="https://www.gnupg.org/related_software/libksba"
 SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
diff --git a/dev-libs/libksba/libksba-1.6.0.ebuild b/dev-libs/libksba/libksba-1.6.0.ebuild
index 59e487368563..184c9cd1140c 100644
--- a/dev-libs/libksba/libksba-1.6.0.ebuild
+++ b/dev-libs/libksba/libksba-1.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="http://www.gnupg.org/related_software/libksba"
+HOMEPAGE="https://www.gnupg.org/related_software/libksba"
 SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c32b6762537d..e4eb794e19fd 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cachecontrol/Manifest b/dev-python/cachecontrol/Manifest
index 6b06fc80863b..f3785e7fa782 100644
--- a/dev-python/cachecontrol/Manifest
+++ b/dev-python/cachecontrol/Manifest
@@ -1,3 +1,3 @@
 DIST cachecontrol-0.12.11.gh.tar.gz 41338 BLAKE2B 09ce2336216b69dbe9796d658db9f5b0d378259484cba3a78ecd789843e19683adc2b1b90d579cea8700d07ed55a93ecc3a56e5da2c8ab025e5084d2847d4dbf SHA512 be1c91f58edda36192f1267a8fdfdc50685ff57da5d84f5348b608982327993333f18f5c318a20cf258b16d2bc83272ba58317e8c4c44a84d5d1f93b522dfc8b
-EBUILD cachecontrol-0.12.11.ebuild 755 BLAKE2B 4ab61172418eb3b6958d346c2a788f736baf7ec4cc1f1b04daed557428a35298dda82a836855be5d99fbc1aaa3bf8ac8241bf3eb7b10a6712b9c75816587e7a3 SHA512 780fe396777e6d539902c852f3dabc8b9d1f9402d4d33523f257f965b3c667797aaa8fa476aa5631024a9fa8de1d6eec45604fb5617666ac2eda3c60ecd75c40
+EBUILD cachecontrol-0.12.11.ebuild 755 BLAKE2B 7b8cf66d600e982f79382dfbde36e822ba028049290094bba0945f39f644cfb553f51065d795a03dc22dfca1537095c32fd2a5a8878916a1a7dc8401477be1de SHA512 89e119469d462b93076c36fd80cc8281b88267e7769c4964707adc0a2f0b12bfeeea29df253c920efff474a601acedf25f27848be78ab3cd3d72e7fe12984018
 MISC metadata.xml 400 BLAKE2B 0a4de3dff77966722a153ca7d1b4e6531932fc2ae1c99bf4c7482fa83a35ccdc1bf647e3c7a9097ff2844e2127af90709a47ed4f6b47e38c1ca0f240896b270e SHA512 992efa678056928cfaeb04df9a6a7c5523bef32ea0665d86e06faf7b61decaf424cb1c8f813fe19bab74ab25427b5a70f3e106e61cfaab1cc3fa3a359f052e8c
diff --git a/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild b/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
index 415ebf228fa9..6519fd738c06 100644
--- a/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
+++ b/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 665ff150f9a5..bfc5ee0d7031 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,3 +1,3 @@
 DIST construct-2.10.68.tar.gz 1190512 BLAKE2B b41e5b3b62cd1568c78ac4975b0d66e7a7ad4489e97031d3e866ff8eb98eea4eb387041dce15210304c608e0c419548cddea3557c2f53d52ecbcf6eb5be67749 SHA512 2388751323b16b69a06457c4862e7d1334580c201050734f150ab4437e2066ed18ff5323f7d81b8bb93124ae0f57a2ae91d7c64ffefc6e0369d6e625b7fef4eb
-EBUILD construct-2.10.68.ebuild 1048 BLAKE2B e914f94d7683960265f067617abb64e740c74295032fcd2335c60e874c042b4d0a9dbd6d7008dbb5fb350cdcbc6252000a944e80b89a5638e509f0b44e78e72a SHA512 5848649ecfe1c23cbbe4cec5865085cd31153ac23c0d5a1ebf0fd568caa3c926ba1ee0e28317f22f2a437b92195877edda5ce0d94bbfb0f9fc46ed880f03a1cc
+EBUILD construct-2.10.68.ebuild 1048 BLAKE2B 400663bdc444aac4f6339e7d96c04dbe64b91a03f3f509eb66fa3aef690fbf8676dcf963b2cfb2b0750e62ecb211ca14440d0bfd5b1a14ee275eef078833a76c SHA512 4f261068ca5bf64530bfb68fbcb3a479e7c8e4f81090f59d7131deb87528ed0765e8e806bd2b1614008ed1db052c4841d9a173ef4a564196c4a9e10edbca8725
 MISC metadata.xml 530 BLAKE2B 841ba440080eb109449759509abcefb1449a87e3aed1f63a2acf021e6bb8c18e67d4e7e6c85d530877b7a2eb3de167708a728ad35507e3e6268f2d3f202018a1 SHA512 6c0e4d31dfaf335a7f94bc21866791100f8e96f5d58aaf988a48c55a054f5ac5d7ef579943a01d68e1403432b33f62c241b2a06dcf874278a1424f3cf60c8caf
diff --git a/dev-python/construct/construct-2.10.68.ebuild b/dev-python/construct/construct-2.10.68.ebuild
index 727d0a891abc..4f911c8266f0 100644
--- a/dev-python/construct/construct-2.10.68.ebuild
+++ b/dev-python/construct/construct-2.10.68.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index 242717788187..d12ab93eed4d 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,3 +1,4 @@
+AUX css-parser-1.0.7-python311-tests.patch 1849 BLAKE2B cc0912aa456246ad2a94b54f3871cc407ca3aeb3759bbe208a4c51784fb96e5bfe03cf79bc6a051524d6d420ef55bd537c2c7875516b9a269e438961d1a54e6f SHA512 6e58df270716d9de01ad04cc3d31a7750f481c7c1ca44cea5950b46a5b2a252d6de3ebfc32fea530f46bfcc8b930d8527c5e2bfa05764d8049739d8b60230b27
 DIST css-parser-1.0.7.tar.gz 348843 BLAKE2B 72fd2a0555eea2b912d3088b1d38a4bf082862a47a414c4c00718ad1b31299a3df3b2e9dcf4f22c3195520c28f5652aaf4103a9a999ceb3ea6b8c785f50bb40e SHA512 51e4ca836b18f963d798a14762bed78cbd3034598cc828dfe81b3f7d921a5bfe52374b0dc6160e1c01e40a8c8147a10664b9f7edeee867ca1086e6a4a96ff162
-EBUILD css-parser-1.0.7-r1.ebuild 536 BLAKE2B 6843a32f8c6d140728c1b44d87962f6076e4f17bb90eba1779f0990d031bd189999103b33e9d941034136b66ccfcb62d872121a485568766b541739787136a85 SHA512 994ff8ea97b2923ef19330304a77cfa3340486ec1c74373520d3a1588340dac970140c910333f6afcacc25cb89702b4003f0e7e22e5fb9372c1930b03c466c66
+EBUILD css-parser-1.0.7-r1.ebuild 591 BLAKE2B 083890af76373542ebd416e8dbb2442067ffa8cd31cf32ea815d203f28944a54ec5ea155b36aa4936e5b2b5f5277215e21babd415c2997472b369cb40aac8ab3 SHA512 0d12e750eea1bbb177d382c98dc92c73994e84bd8f579c1ebdda042c6d7589d5c50f4f2775deb2defbba50698d37b786e9544598b53156c9b5ac984247a2fdd5
 MISC metadata.xml 479 BLAKE2B 117a5a889216d7f10d68f4f61a5787e5c921167a26d099e1f268916f5e96c8332a396d2a41d76411e48a67991473ac2dae158b8c978bbc6a88cc015e79d32f5a SHA512 339cb0d6b67f1aa92e4ebef1ffd1dd79975e92d67b91c0fb88a39ae6bd54a7e713964655d8e486b7107562cb5b186404714531c5b348985cbf8d598c00b29f75
diff --git a/dev-python/css-parser/css-parser-1.0.7-r1.ebuild b/dev-python/css-parser/css-parser-1.0.7-r1.ebuild
index d450388f0198..91c945604f6a 100644
--- a/dev-python/css-parser/css-parser-1.0.7-r1.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.7-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -20,4 +20,8 @@ BDEPEND="
 	test? ( dev-python/chardet[${PYTHON_USEDEP}] )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-python311-tests.patch
+)
+
 distutils_enable_tests unittest
diff --git a/dev-python/css-parser/files/css-parser-1.0.7-python311-tests.patch b/dev-python/css-parser/files/css-parser-1.0.7-python311-tests.patch
new file mode 100644
index 000000000000..c9e4801cafbe
--- /dev/null
+++ b/dev-python/css-parser/files/css-parser-1.0.7-python311-tests.patch
@@ -0,0 +1,51 @@
+https://github.com/ebook-utils/css-parser/commit/ad79cfcb6e55837a4353b92d051de023c18f6581
+
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Sat, 21 May 2022 14:21:28 +0200
+Subject: [PATCH] tests: adjust exception string checks for python 3.11
+
+Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2062102.
+--- a/css_parser_tests/test_property.py
++++ b/css_parser_tests/test_property.py
+@@ -5,6 +5,7 @@
+ import xml.dom
+ from . import basetest
+ import css_parser
++import sys
+ 
+ 
+ class PropertyTestCase(basetest.BaseTestCase):
+@@ -162,8 +163,9 @@ def test_literalname(self):
+         "Property.literalname"
+         p = css_parser.css.property.Property(r'c\olor', 'red')
+         self.assertEqual(r'c\olor', p.literalname)
+-        self.assertRaisesMsgSubstring(AttributeError, "can't set attribute", p.__setattr__,
+-                                      'literalname', 'color')
++        pattern = "object has no setter" if sys.version_info >= (3,11) else "can't set attribute"
++        self.assertRaisesMsgSubstring(AttributeError, pattern,
++                                      p.__setattr__, 'literalname', 'color')
+ 
+     def test_validate(self):
+         "Property.valid"
+--- a/css_parser_tests/test_selector.py
++++ b/css_parser_tests/test_selector.py
+@@ -11,6 +11,7 @@
+ import xml.dom
+ from . import basetest
+ import css_parser
++import sys
+ 
+ 
+ class SelectorTestCase(basetest.BaseTestCase):
+@@ -412,7 +413,9 @@ def test_specificity(self):
+ 
+         # readonly
+         def _set(): selector.specificity = 1
+-        self.assertRaisesMsgSubstring(AttributeError, "can't set attribute", _set)
++
++        pattern = "object has no setter" if sys.version_info >= (3,11) else "can't set attribute"
++        self.assertRaisesMsgSubstring(AttributeError, pattern, _set)
+ 
+         tests = {
+             '*': (0, 0, 0, 0),
+
diff --git a/dev-python/editorconfig-core-py/Manifest b/dev-python/editorconfig-core-py/Manifest
index bb583ddbe1a5..4d8438aebbc1 100644
--- a/dev-python/editorconfig-core-py/Manifest
+++ b/dev-python/editorconfig-core-py/Manifest
@@ -1,4 +1,4 @@
 DIST editorconfig-core-py-0.12.3.tar.gz 19261 BLAKE2B 58cac122cfee19527bc45def7e923da50982de0e2cd443cf67dd824c050fb12352b85a5679815a701bc5b8d88a089a0a98280c364730086d01b80f119ad996a4 SHA512 005d0698c410c8865d177a1e891b5c51b15255f36303b116fddbbbc08e309d1d60ca3003d27e6fd8455e53c5956db0c29e298f22f4b10950e1f7c56c7c6e0ab3
 DIST editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz 7900 BLAKE2B 9ebdb5e522948bc9e86ea84435ccaa11585a8a12f4cd6fe54c64d78917281c913568351767d8077623b1196d84206d1c2d0126a0510f70df484c1b55d829028b SHA512 ae5424b4926d6cb127cb3da473400ced4f7ccf224f7baa8bc5bde0317cc045bb7b99738a56efe5fd0e5a0fbe39b997b9fb1739d24713e7f83b58e987c5e56a32
-EBUILD editorconfig-core-py-0.12.3-r1.ebuild 1123 BLAKE2B ad68edaf5141b8422228bad5ba8bcef3844e17860810683db31ea0dac3b0bb3278f1e3da3bd453860fe1de56d928c95ce82f8c4ff883ecf985e108ad3177c7f7 SHA512 c66b67816cc83aa922d69e791a5aee359e21302ed1e2e3c73803ec3e3d58905121774ed53126087f5413a8fffed48f55670f86a1acde0d1de82b3b2401e98748
+EBUILD editorconfig-core-py-0.12.3-r1.ebuild 1123 BLAKE2B 0935194ba421edcfcb89fb4805ac2eb162fecd41110839949efd04f0c00ca02d0ec943aad065c1b89bec6e8efa2e44de6370292a1f169c00447b9e7c9593c4f5 SHA512 e5f1c381bb7b3bbf9589b338d618e28c5f58879c6c2435b8f8d74013b5407af88595ad2d4c80c13c7d5d6ca5abd3f922a5153fab1b2d2e1623f18559137ca1e9
 MISC metadata.xml 831 BLAKE2B 3eef9346c8fc78e09a5538c3dc7332edf53914bbf042bdb84b4173a3a6c7d00ec1e05054eb32e5641880e65957e1794a15dbcc748caf78e5d648c21b6deecffe SHA512 6de6c0a54227b593460da5c2e77ba739e854eaaf4576df55596d33f18417771d8f911d976fd7605c9ebf2bb332a934a89ef99e01da7940dc1b9603802c2bd949
diff --git a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
index 33ce2edc0308..94256dc40013 100644
--- a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
+++ b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake distutils-r1
 
 TESTVER="abb579e00f2deeede91cb485e53512efab9c6474"
diff --git a/dev-python/exam/Manifest b/dev-python/exam/Manifest
index d37d77b8aec8..655001af2ebd 100644
--- a/dev-python/exam/Manifest
+++ b/dev-python/exam/Manifest
@@ -1,3 +1,3 @@
 DIST exam-0.10.6.tar.gz 15028 BLAKE2B 6d2a888b9adf14665e8f009bae7b2c724dcb60fe19efa98a189988a73a0cb5933179407c754ed1c19b24694080b6df31838768f694460fabd9196e58e8b4c94d SHA512 1cc082b4fb9a7270ea81750ee3f34400f3f6eac65dd1488af333a43d0623bf8f9176b73e2948c324bb9c0062296284bae66fe215263456baf9db378676c8a4f0
-EBUILD exam-0.10.6.ebuild 427 BLAKE2B 2f3f18667f8393bc8efb53167c9b3ddcbb979bf12bbf71a6de1115e8a7e6e0cf7dd3ddd03f595d3caf19b6d4cb643a6c2b3d7bf5d8f1b7b303daa9c28f962af1 SHA512 e74117f4ebafe4231de4c162dded289cd225d2679f2fbea8ae1a77e96227ca7adea846d1ad15e20fb8fcf5f25e0c1c0736e76a8ed6ad358ffe2ec8956a4822d1
+EBUILD exam-0.10.6.ebuild 427 BLAKE2B f8517c61901e73bcb3d2824c25974ca6cf88454a3aab960e2625ef210f5899358739b09d8ced0739064e6cfb8f238dfb7a655350cf2daa375a85a1d3a734bb40 SHA512 fc5872099c82725c04a9f26f95330dfb027aaf97497d2b777217a633d2e4e4ab0fd782dcc3e85d589ce22bde500db0fcc8bd40a2954f29b9f141a3a30005dcf1
 MISC metadata.xml 1731 BLAKE2B b6cc78ede7ae95106d0d1ff71bee52c6c7c56189ffda08e98430b372340574c580cc8c854259f80f3a0ee27f4d0406a10e231ca9430603e1d15e8f8cfa0e0d65 SHA512 c0e76b36f3ff962e6d70a6c0ebab589e51dd74557d05acff8bc9dd274ff5075670960ff901a07a79af33c0ae2fa8cc6eb252150cc8a1176456fc2503251df2fc
diff --git a/dev-python/exam/exam-0.10.6.ebuild b/dev-python/exam/exam-0.10.6.ebuild
index 8fe56f7886f9..ae55b9cf342e 100644
--- a/dev-python/exam/exam-0.10.6.ebuild
+++ b/dev-python/exam/exam-0.10.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 0b8235efa915..50ff2687ba7b 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,3 +1,3 @@
 DIST progressbar2-4.0.0.tar.gz 663046 BLAKE2B 1616f1b9c5f720f370dc9eb02ba37cf83391c853a525fca523fb33af1b580f38647b835a83558674a78dacc33bf7652cb9af8799ad13763f62d33417abaa35cf SHA512 b9b9dabb3093e42bc6f40c0e284caae2d29ebfa450db379c214a5ae39e7ccb8c690655da21a44882d0b68f24d83f55a3342671087a25ada168bce9d236685666
-EBUILD progressbar2-4.0.0.ebuild 718 BLAKE2B 2842582020925fb7be82a1eebd95c500d16cec11c87b5914e1b7377f6e5f9f9ccf812884dd4228ea065561b1fb70b5359c11c8d7f6f11554859f360f346008e6 SHA512 9d640141010c8047bd20f93d2dfeae96036860a6ed2655ed7fef8dbe92f074b9021695afa069fdb94837717144df6e27c2b5688015ad90e1fa5b41c100c690ef
+EBUILD progressbar2-4.0.0.ebuild 718 BLAKE2B 33eb46ad683cd82547a6a21b0cf472bacf4c44738c559b743c1d3b1d79f6f3573d8079b0ddde84932aab07330e6821185f05a9bf8113aba15c2f18b063bf6187 SHA512 7edb45896151f0c343b306b4a81c4c4a89a632b2685c5ee8bca6cdae1ffdd92e7b2bfd83b48cf61d0c600c2aaa2a571a1e5f420b80a87a72decaf1fece0d5691
 MISC metadata.xml 404 BLAKE2B 774a579e397ff18f4196eaf238847e52062742b1ff00999e6b970c4a0f5e032d6caf57e2f64903882269738bdeefa3b3533711d36c68694989ffe6b508c9c467 SHA512 95bd7c3ad0f1addc6d6dd57aa89f04b20ad7019b35468aa44cb5077a819c4658cf64196c5443a671d8beb339f5bdbf40e544807b21c7e2bc11b39da5e0e8dc99
diff --git a/dev-python/progressbar2/progressbar2-4.0.0.ebuild b/dev-python/progressbar2/progressbar2-4.0.0.ebuild
index 10b80ccec1d4..730fd2de7dcc 100644
--- a/dev-python/progressbar2/progressbar2-4.0.0.ebuild
+++ b/dev-python/progressbar2/progressbar2-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Text progressbar library for python"
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 52db53fcdad5..db8cf19ea5b1 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,3 +1,3 @@
 DIST Pyphen-0.12.0.tar.gz 1969022 BLAKE2B 9b7f6712a2085507684ddde52401a75b05d0a13a530572f0f08b9143168a8ea61a5ee73983606b19f88ff23f3c5344aa87722c3986291c7349f82e95dd3b1f19 SHA512 abecf0773f59b7a757b47c6512f1bf8e98f4709b285f04cf235c085ab4767eb95deab8ede4b792d6f4a6156d47287f9f712cb658939ed5afc475644e282adbd3
-EBUILD pyphen-0.12.0-r1.ebuild 632 BLAKE2B 178a56a9f11d1352421a3d1495df40dc7a780aa6eeba1b5360ab0c53074ac64a4b1bc64ce0240ee3d9bcf70d82c4edd0131c1d2cb9d042e8dba9b70f8c6787ec SHA512 0fcdb35530f17013773fbdc3bac737c735ef68e7cb367f77ae83c9de1c31e8ec3691a767e3b1271965461225d2b24e11ec3d8e55c2737b9fa36117ebbf98fee3
+EBUILD pyphen-0.12.0-r1.ebuild 632 BLAKE2B 0be300792e8aa4952428be73e2d793bd355462edbc2420f1c9927d0c4c76a19a7a6c988f366a25299f43661e2ef645e70f19afe658872a7f76e5032835fe007c SHA512 7dedd061b5e72e76f849acb8cce2155d77bc99db72d58765f05f03c6c6266bd324faa0ae4f8b4c82f8c39ec64fc077d3a53340f1ad70b9bc82246f7887d1ee62
 MISC metadata.xml 386 BLAKE2B 884bd76d980e70fcec706674b5363dfebc74931eac7a2e06cd77e5ca2cd7a72ec0673e44dd05a17dd16f91b7d43b7f97c996bb3994045adb008d97b64ef40c0f SHA512 20752bbbc3c47d4a6f1330a552a5c02bb5fc036f3656c067cb6ebcb4ac2fe2e766c343ec90542aa3ff7465d0726fcf705118ac03d743508ab135261fb115f8f8
diff --git a/dev-python/pyphen/pyphen-0.12.0-r1.ebuild b/dev-python/pyphen/pyphen-0.12.0-r1.ebuild
index 56755fa62959..a926e34e33f0 100644
--- a/dev-python/pyphen/pyphen-0.12.0-r1.ebuild
+++ b/dev-python/pyphen/pyphen-0.12.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index ce45926b74cc..f1f14cdbad87 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1,3 +1,3 @@
 DIST pyte-0.8.1.gh.tar.gz 92220 BLAKE2B f4f803ecbf9bc62936ea499929b7fb976c14ee09fe00ee56d5499bb2543a6ac769dd7c87e177c297bbf8ab082c34f154a26daf3a1c84917249400b09556c2b80 SHA512 f49d9394cca92c27fdd5319bdce164d5cac63b77d13156de7105bee6087a615e844fafa8507089c8bf6cf31a796cc858a3ccf597aa23cfa595d0d9e0adfab5d4
-EBUILD pyte-0.8.1.ebuild 738 BLAKE2B f2a4604af398dd8d61e781eee4423cd4f7d1cc28a9b180bcac9610f5b977fb4350b09e939c117698450586b0f8da41f1604f66b590b1894351b18f7b55281036 SHA512 488accd6d334ab612283aa155104d9b23839f6dd3dfc102710d599b54bd18dfe1d7f78904d1cb9ad11cbda69fe0b40b7cda05dc4f5164fc1e92c231b0c8a0a45
+EBUILD pyte-0.8.1.ebuild 738 BLAKE2B fc3be6e667353e5763c859bee2596e96e557a7060f941ecf780fd7f5cacbd6953936e8f77f28c37718cbe70b9a8f8b8b0e6845714cac98ce4a68fcef594b4e2b SHA512 9f2336382f09c53a0a3b9043811f5a2ad67da356c884a7fa8bbcfb91dc5f06a66b802e290be292991fa9c6bd2f37bb9e87f66c816c90c0c68362c40e2fff7761
 MISC metadata.xml 398 BLAKE2B 4bca2386a5448c989f5aa69096d6f1ab1601fbbd547d81c01920054cab0d3aed2182965e6ffda0ec07ddac5a18fc759e002173ffced3574767d730a39f06fafe SHA512 30ca4fae97a92145e55e0a59dec2edaafeb7931cd422bbe0c96d1ab1f68cc49124f00ed0d2143d444091b5c2561076e47b9ecd7436f59a11c79d3af670528a24
diff --git a/dev-python/pyte/pyte-0.8.1.ebuild b/dev-python/pyte/pyte-0.8.1.ebuild
index fa7fea362e6b..e6918854356f 100644
--- a/dev-python/pyte/pyte-0.8.1.ebuild
+++ b/dev-python/pyte/pyte-0.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 07835a7765f7..3ff0aabe85bc 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,3 +1,3 @@
 DIST pyxattr-0.7.2.tar.gz 31550 BLAKE2B 3505300d7a50dc305068740379bb8edbefa29f228c797e2e74467a51f4b0a6b740203f89b8ed461218978214213a6cd778107f58eb07a64d6b45e25d0fb769ea SHA512 fb9b36d5d2fb9ab674daf40d6f5c7dbe50d847dcb6d9955d270ef3aed2d8e3540f8feebd934009f47d63f3c55882846a20f7ed733b0d0c004e7a1984e7106206
-EBUILD pyxattr-0.7.2.ebuild 833 BLAKE2B 2855052a0cbaa3cd30935ce30e0a0a9dda80d39e50686f9f7a06ce54a811e465ab739b1f227c6ccd66d9c5dd040191bac0d689fa2d4a2e3452128a3114975dc6 SHA512 7fa7692c510e2a5b70b198ab80811ec21003fe5a7200428ff61bca3a852f013e1b27be8a6ffc3a5667ef2a059d8fd4686b8310ebd5d5666442ebef6e579b3d8f
-MISC metadata.xml 610 BLAKE2B 5e7bade0365a6bc3c784e678cd7165931f2ed212fde393cb4d110efca2f8e02c7627777317c91e4f03f8dea88e3c31105364334d1e63bd27f4bce973bd3d1278 SHA512 af554dee568ac71a61464a75ba29fdf4ac17dcf4c9b9be7bbaf2b009dbf52c04ea979503dee14d7289b6bdabec45ef05fc2374f2598d9802252018ea8054cae9
+EBUILD pyxattr-0.7.2.ebuild 833 BLAKE2B 6959b68b43d3b9377dffe705e0a4925f0e9c6ebde4641d951c01c4cd3a50b7e9bb566c6b8fdd2a8d3055542347f69be08b543092e57b28c00e9ed37a02d6a110 SHA512 abac72117c700b6045fd9f8014f2109cb5a2d108fd22e38e8be7e4e4e96b93dcc945223badc501a7ab928c33f141775cd8d39149b08192206404b7a6dacbc8ab
+MISC metadata.xml 666 BLAKE2B 0d08037b686b758708647a9bac820ec0664dd8b70e64bdc212270c95958e077de5ca6c4f32354dbc93522f1cf0d73df58f4160cd3dc9afea2586ca45280cb0fb SHA512 14fc002e3803a7f43fec0e36104c5af58b219bed19ec13dc71de94644bd71dcc8c3e516df4c201fac8c489cadddb1fd92915f2fb20da89045234fbbaaf497ede
diff --git a/dev-python/pyxattr/metadata.xml b/dev-python/pyxattr/metadata.xml
index 74f6f576e107..bc37bc90ec46 100644
--- a/dev-python/pyxattr/metadata.xml
+++ b/dev-python/pyxattr/metadata.xml
@@ -14,6 +14,7 @@
     <name>Python</name>
   </maintainer>
   <upstream>
+    <remote-id type="github">iustin/pyxattr</remote-id>
     <remote-id type="pypi">pyxattr</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyxattr/pyxattr-0.7.2.ebuild b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
index a6778fa0e754..e78d5d513925 100644
--- a/dev-python/pyxattr/pyxattr-0.7.2.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index ce35d4b93d69..1bae7f8195fa 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,3 +1,5 @@
+AUX scandir-1.10.0-python3.9.patch 2703 BLAKE2B bc37fbbf3cfb9c77db15a932b047f82af10b19890ef8e29979502a0d0d0bd3f71300a871a8a76d08ad606143c47ed3389e7a2f1c2f6376e3b86d32227ef0dfe8 SHA512 edd491cd68aee1a405b51113833a2cbde77f2146c0b3b1c807f2efff2cdbb307fe18d6a40f39b5b4567320dc52346feabf342472de308982bc46d03be28b5777
 DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
 EBUILD scandir-1.10.0-r2.ebuild 584 BLAKE2B 72eda9a3d5eb828b5a00a765283c729a5245c6d2c213067a7a9a58248be39b272e56a12c2dc72064ef5e305ac7c5f6e9dd5ef4e5f730b8f042a7ca41a72613eb SHA512 2696963e0cbc0d63e2caf139a7deed1ed7ba418174ff6217cbc6edf693826a3f7fc89a7d6bc2438eb2769b1eaf7d135d7f5f01bf8675e659b96b1ce84e23f6be
+EBUILD scandir-1.10.0-r3.ebuild 773 BLAKE2B 07b9b8580f5fae38d3f68ce6dcbc7a5b62717baffc1f62824b0bda48d4ae102f98f0e361dc85316867ec2cf587bf4883a5182ffe4b5efcf443b3c6094e9c3a5c SHA512 a978ab19d5eaa3c836a657dd82c864dcf6887377d1ef4aedc68e2a6c752e6f2f3c34cd10a05d0ab2553e3f4c63e5791139c5aee5b6544e2172c67d5a3c49b871
 MISC metadata.xml 496 BLAKE2B a5e4d74cf0526a99d2c968bd225f6b5d284a7f532e18ab5d1ec8f2da6b43d25c323d194982ccdc29d216c42fde989f1515c07fd8d65ff2d464191fc428125140 SHA512 66ead6b25749d156a0b702f558ee93005653de6c2039e3d76c7567606154e5720ea4da69944f725eb1598254cc251f091a46fddd03df695a1aa88058c64d4df7
diff --git a/dev-python/scandir/files/scandir-1.10.0-python3.9.patch b/dev-python/scandir/files/scandir-1.10.0-python3.9.patch
new file mode 100644
index 000000000000..c8683c1c6b9b
--- /dev/null
+++ b/dev-python/scandir/files/scandir-1.10.0-python3.9.patch
@@ -0,0 +1,62 @@
+https://github.com/benhoyt/scandir/commit/3396aa4155ffde8600a0e9ca50d5872569169b5d
+
+From 3396aa4155ffde8600a0e9ca50d5872569169b5d Mon Sep 17 00:00:00 2001
+From: Ben Hoyt <benhoyt@gmail.com>
+Date: Mon, 24 Jan 2022 08:44:07 +1300
+Subject: [PATCH] Add Python 3.10 to tests (#137)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix PyStructSequence_UnnamedField build issues on Python 3.9/3.10
+
+_scandir.c:663:7: error: conflicting type qualifiers for ‘PyStructSequence_UnnamedField’
+  663 | char *PyStructSequence_UnnamedField = "unnamed field";
+      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In file included from /usr/local/include/python3.10/Python.h:127,
+                 from _scandir.c:14:
+/usr/local/include/python3.10/structseq.h:22:27: note: previous declaration of ‘PyStructSequence_UnnamedField’ was here
+   22 | extern const char * const PyStructSequence_UnnamedField;
+      |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Fixes https://github.com/benhoyt/scandir/pull/137
+---
+ _scandir.c                  | 10 +++++-----
+ scandir.py                  |  2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/_scandir.c b/_scandir.c
+index 6cc28c8..433483f 100644
+--- a/_scandir.c
++++ b/_scandir.c
+@@ -660,7 +660,7 @@ _pystat_fromstructstat(STRUCT_STAT *st)
+     return v;
+ }
+ 
+-char *PyStructSequence_UnnamedField = "unnamed field";
++static char *scandir_unnamed_field = "unnamed field";
+ 
+ PyDoc_STRVAR(stat_result__doc__,
+ "stat_result: Result from stat, fstat, or lstat.\n\n\
+@@ -681,7 +681,7 @@ static PyStructSequence_Field stat_result_fields[] = {
+     {"st_uid",     "user ID of owner"},
+     {"st_gid",     "group ID of owner"},
+     {"st_size",    "total size, in bytes"},
+-    /* The NULL is replaced with PyStructSequence_UnnamedField later. */
++    /* The NULL is replaced with scandir_unnamed_field later. */
+     {NULL,         "integer time of last access"},
+     {NULL,         "integer time of last modification"},
+     {NULL,         "integer time of last change"},
+@@ -1817,9 +1817,9 @@ init_scandir(void)
+     if (!billion)
+         INIT_ERROR;
+ 
+-    stat_result_desc.fields[7].name = PyStructSequence_UnnamedField;
+-    stat_result_desc.fields[8].name = PyStructSequence_UnnamedField;
+-    stat_result_desc.fields[9].name = PyStructSequence_UnnamedField;
++    stat_result_desc.fields[7].name = scandir_unnamed_field;
++    stat_result_desc.fields[8].name = scandir_unnamed_field;
++    stat_result_desc.fields[9].name = scandir_unnamed_field;
+     PyStructSequence_InitType(&StatResultType, &stat_result_desc);
+     structseq_new = StatResultType.tp_new;
+     StatResultType.tp_new = statresult_new;
diff --git a/dev-python/scandir/scandir-1.10.0-r3.ebuild b/dev-python/scandir/scandir-1.10.0-r3.ebuild
new file mode 100644
index 000000000000..ac31277480d8
--- /dev/null
+++ b/dev-python/scandir/scandir-1.10.0-r3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+# Do NOT add Python 3.11 without verifying the C extension is actually built
+# and installed for it!
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A better directory iterator and faster os.walk()"
+HOMEPAGE="https://github.com/benhoyt/scandir"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python3.9.patch
+)
+
+python_test() {
+	"${EPYTHON}" test/run_tests.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 8d05c3038e4f..748727d71292 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index 40be7c365ae7..d5b99e679ffe 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,3 +1,5 @@
 DIST wpebackend-fdo-1.12.0.tar.xz 43080 BLAKE2B 0ef0e537d430b60841732e9b350d46b44317c2ee9833d6f382cc792a7aaf6e93b5eb782c4913c6bd7af5e30a08cac348430d4d383bce247415babf48f1f4322f SHA512 856885394872ad3f205b600caecbae48ae0c51185a8e19e66add93222e49bb1b060cdc77f5c9269d43509a0b85af0b5642c27f951d1c9836d8616aa51a9180a5
+DIST wpebackend-fdo-1.12.1.tar.xz 43148 BLAKE2B 3d666cdcd68c3b9356ec58020502bf4d61c0d8651b9dcc646f50ba63aa336e475a47627712678e4a192e0502cd86ea030613199503b056efe4c7afa3a49e0490 SHA512 0464ab4eb634390591b8cc09bc3db6a3a816c68aef6f9140012230e8dba9550e44bdc4f9008ea3fecfcc5f441306d6c4d91e6f693398179ee8bf7516dd58875b
 EBUILD wpebackend-fdo-1.12.0.ebuild 660 BLAKE2B ff96a893f6ada3510d52a3dbba54bcbfd701bdb993ca747fde6c213ebeea1e8509fda492a901ac801f80b1c32e63fe6d003206af3d1f5fde62bee993a06696ba SHA512 4547ab5ad0de181f8eddb5b841fdb08abe5c1708b2a3a05f603e0275ae1d0783408b7d010642f95235d4029078012b9a6b6ede64b25867a68bfd46ecb93bdf2f
+EBUILD wpebackend-fdo-1.12.1.ebuild 666 BLAKE2B 29261d1dcc9733e714f9786238542d7ccd82e5f4822449208be3d31868cd6fed46bd4f203bb0b24b9d412fe7c7ea66f6f7b2787d05d193b1a2aed731e56092a3 SHA512 23a26b5b84317d10aa9f019aacdd64023a7e4c0c0b7ade2108a445e1239964b3ddfbf29e95bf0561f740aba21800fff20a7b2ad34bcf5ee02d6052cb19581e86
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild
new file mode 100644
index 000000000000..0b98d16fc95c
--- /dev/null
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="WPE backend designed for Linux desktop systems"
+HOMEPAGE="https://wpewebkit.org/"
+SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="1.0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	media-libs/libepoxy[egl]
+	dev-libs/glib:2
+	>=dev-libs/wayland-1.10
+	>=gui-libs/libwpe-1.6:1.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dbuild_docs=false # hotdoc not packaged
+	)
+
+	meson_src_configure
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b45b51fc7a1d..2786bdb976d8 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 2e180b8e78c5..84d86a7d0c80 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,7 +1,9 @@
 AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c743a0fec456ae09ad77ecee887e67d2891efd200d8d08bad594472060515b56b02b9097951c5ad285ddfebd3d46acc4265a SHA512 d231237fa1512637c5448b1c8c7a1dcffa1383a0dd24f6606215643ce51932ef58e994bfbc3f24d3376acdd9cc06d713d453c643d4d00e9d00af0e011e55762d
 AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3
 AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399
+AUX xpaint-3.1.4-gentoo-lto.patch 670 BLAKE2B 851334824d813029f2a78fb2b3698c85eee3cc79bd63f3db222f6c32fa75bd3f7af85f00fc898ee71e3f5851c1c8181b2f3e798865d7516f2bebbba794783e38 SHA512 d2211c291fca46c102ecb820eeda7e4441326e856e91819c6e3adadfde9dd02e1bda8610b305bb2fe056bd6c5d4ad8e1e6b52015dafad86c76005ef5d166e7de
 AUX xpaint-3.1.4-gentoo-shared-lib.patch 503 BLAKE2B 12bae42eb3a119c8acb3c5a6436191bf65c9697f6d743531633f0d64f5cdb26270f659eb0725a26efcc780cc06f91cf7f4e4f5032cf72f21614f3f7e48615b25 SHA512 971fb77386f2a896605d05346c4cf65fd68bdcc7b2f82e1319059f1c4ac37b0d76585c8ff0ce6d5841639bd94b420ac29b2e5275fe9309b31549cc540f2a9833
 DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d
+EBUILD xpaint-3.1.4-r1.ebuild 1722 BLAKE2B a0f24b55e5374d2d84a8a16e83d97e99f29a67ce2644bc38f50563893543cc6b10c3361308ee94c2de9e65a4c7610ed49f0407c16bc8539b9270de17b6f245ba SHA512 5fd04cdcf7cd6cd74ae45ca141f716f5c17215aea7acdbc83fcd9419cd9e004aa24afc5c93e9e44cc31637318011295815b4346963722f69c5914ad53fa98e88
 EBUILD xpaint-3.1.4.ebuild 1831 BLAKE2B b58a61ef1b8713afd3483f0222aef890c88a439551ef417d1cd3b88f5429eecba6b141485ad60856083b5794acebb8a91f3dbe4c2668ab419656d7f3393b45b7 SHA512 f8c103d2e97011cece1ca579b12d186eefd10478f591269b234297edd6c2a6f166384fb329fb92fcf920d717c2a6011aaa5cf023fad771e1d1cb7296d338ab4a
 MISC metadata.xml 1440 BLAKE2B 54c11ed5ec99921d5ff28f23ee6be2df1fb2d21b3a994c92a94f0edfb2b69116620767bb51811c095736c1f1a7fb4205d6f1971997d81ca9f3c17c6c394d3068 SHA512 34c889965c22aa055b0205d0f93b45f51572958bf0ac992a781a3a5c679303081c368e4af35fa4c4699e8ac4724e125b4048b2d2856c408092cd4c7859728880
diff --git a/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-lto.patch b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-lto.patch
new file mode 100644
index 000000000000..abdb51967fbc
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-lto.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/859820
+
+dynFinish is declared as double, but always used as int (actually Boolean).
+
+--- a/dynPenOp.c
++++ b/dynPenOp.c
+@@ -35,7 +35,8 @@
+ 
+ #define XTIMEOUT 20
+ 
+-double dynWidth = 10, dynMass = 600, dynDrag = 15, dynFinish = 0;
++double dynWidth = 10, dynMass = 600, dynDrag = 15;
++Boolean dynFinish = 0;
+ 
+ typedef struct {
+ 	double	startx, starty;
+--- a/ops.h
++++ b/ops.h
+@@ -26,7 +26,7 @@
+ extern double tickSize, tickAngle;
+ extern double brushOpacity;
+ extern double dynWidth, dynMass, dynDrag;
+-extern int dynFinish;
++extern Boolean dynFinish;
+ extern int sprayRadius, sprayDensity, sprayRate;
+ extern int boxSize;
+ extern double boxRatio;
diff --git a/media-gfx/xpaint/xpaint-3.1.4-r1.ebuild b/media-gfx/xpaint/xpaint-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..65557236f490
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-3.1.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop toolchain-funcs xdg
+
+DESCRIPTION="Image editor with tiff, jpeg and png support"
+HOMEPAGE="http://sf-xpaint.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pgf tiff"
+# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/netpbm
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2h[unicode]
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	pgf? ( media-libs/libpgf )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.3-libtool-clang.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-qa.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-prefix.patch
+	"${FILESDIR}"/${P}-gentoo-shared-lib.patch
+	"${FILESDIR}"/${P}-gentoo-lto.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		--disable-libdvipgm \
+		--disable-libopenjpeg
+}
+
+src_compile() {
+	# clean up
+	emake clean
+	emake -C util clean
+
+	# parallel make still fails sometimes
+	emake substads
+	emake xpaint.1
+
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		includedir="${EPREFIX}"/usr/include \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+	doicon icons/xpaint.svg
+	make_desktop_entry "${PN}"
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b1631f3cf859..7e27c1b9943d 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a99aae6b36a4..15dea768782e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 12:39:53 +0000
+Wed, 10 Aug 2022 18:39:57 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index ea775c2d5b64..2bfbfc345785 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 520976 BLAKE2B 7dfaf17999dad5e80e78ca82a3453bad0d1dd93080c368421ff47c3671435b97874f1120a4f79883a4be6eef4c4ca625a2780e2baa63a836f2c65b64d721932b SHA512 b7a8242e7f468835252f7166256d06fc326a7b57876a83546b977c0010c88282d7526387515ddfdc846408f5965fd794a2d8be4351a3422ce499e998eaf2eb90
-TIMESTAMP 2022-08-10T12:39:58Z
+TIMESTAMP 2022-08-10T18:40:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzpx5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLz+4FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCYqA//aBFc+UlLgwzDp4tqpsiHaD0ZXio3v6Vg738dI+T1uV6guDUQRqAYpCfS
-Ji3Zj7ogowKiIM0BRu/RXRyb52cLJGEBEiP87YylD+bZT/W8ydXCt3ToEVgyp/6t
-+AmeR6oiOgdXa2Fo5acvS/ltAYACpPw9yNUazjt606R9d6YtsLV/0fVDBKP6uhKG
-kaZMiPRwFwNge3bfXceEgdGJc/RK8SYHIJSGvTHycetEPClRk5oBaG2MAkFinRaJ
-pLau/2RsZsMWzEMpzP9cEOUDYBkOCP+ezZE3lBO8/9z6no+ime7siha2/TpNempw
-TSUfA31x8LZEuzfsfN5ZhLaIkaOTDX3gOcrKhLa+LtwKci82Pi3y+3/ROrOlaFtr
-DkZDbSw75lgdDM3ioemntgxrW/suE9T5edvS6ctlhK6kwepgpMNL6YPN5ZC5mOV8
-E9UPUHiVAJidqvdrL0ZKbL6TODGAUrbKCUr83tReQNScmdCyGHZhdP5xju75mOdg
-x9fkTOWeaxk+DtltfB4z09pczYJww5OrolkcRsxY0oC6C6dt/f+H5STTcn5PM9q3
-Q+YikrmbbwgdBw6tOutG7Eq3vhbQwRGBzUREW05fQ5PZWD8BnEHnA0tFwB0ceS0G
-CtDnm6Unpb6wg8GgzreZwX7SPeBXTDDjGt+7RVylvePR3Omn5Ao=
-=98QC
+klCgYw//U9DKl5Agi5yIj5OakzSa4+aKRCbs2iqWf8rRTASgOzvJssxVZtnpxE2A
+hNlAU2qfk163V/GdOjigsKCMDndptOOHM2gSpxklNhUaWo2qDx/f5HUisJdRFig3
+Lqygt/um6t22Gmg0YUXyvXDet/XGdTjClk/GtLRHE/t3EdrVKewjt/O1vJ3MGHjE
+2GVc+5ZJPt3mrntAidOxBRV/pp8o6No27McRM0Y5IXVS0WeFGNSpJHMLkXjjUxth
+uJdNs8QNlE8HavW0e7+xnt1y1N8nPjG+dclZmGSsIsfwFkETeZABGt6w8HXauqrZ
+9+PNn91tcEWJ29Iy/SkYZKvqlGlqnu+MnW4bBwHM/lX1yfLSlF5ZrvIJ1avY/zUD
+qs3wx8GqR9DlXy8AsoVEfTLEtiMP7IkNP1U6/go63pyn4MBk/GCbEjY9Wg8+GEm5
+A6dJk9OtD2iQQBBRFoFm9CRv+eulL6uGcIowLxnDQzPjKEOLs9+5UDJnjNJZhYgt
+Siie4BH2IdZgvIb1rblyi54g3foLvrvcIGcTzvSAJT8rN4g9hEsPlIEFjZsVVHd5
+pn2NypRIc8qbONfhnHeEZNZaVPCqk5B6Z17EkpDlc1pwJq3I2FsEYkOXTUNSDf+D
+ZZmZeVzaC1xwtKeABg5zqYNjGIwwvVGStm6GiYQB+NtjiEDj+yU=
+=K0aK
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a99aae6b36a4..e69524458e6e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 12:39:53 +0000
+Wed, 10 Aug 2022 18:39:58 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e3c8963119c6..94a70917597e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index b082b4c849e8..8c7b266a4785 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2106.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.2106.0-r1
deleted file mode 100644
index 92e7c264c9e1..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.2106.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=7
-HOMEPAGE=https://www.rsyslog.com/
-INHERIT=autotools linux-info python-any-r1 systemd
-IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2106.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2106.0.tar.gz )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a0751a36d751f7c6ff5906da5e26789a
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2108.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.2108.0-r1
deleted file mode 100644
index 50c01fa6c8a3..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.2108.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=7
-HOMEPAGE=https://www.rsyslog.com/
-INHERIT=autotools linux-info python-any-r1 systemd
-IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2108.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2108.0.tar.gz )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=34cfaef58cb6e90862f2613939f89fc2
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2208.0 b/metadata/md5-cache/app-admin/rsyslog-8.2208.0
new file mode 100644
index 000000000000..7fc6dc79f0c4
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2208.0
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=8
+HOMEPAGE=https://www.rsyslog.com/
+INHERIT=autotools linux-info python-any-r1 systemd
+IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
+REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2208.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2208.0.tar.gz )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ef7301882cf2b1c27c3317c1c51637e5
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 881765344362..299cce8c4851 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1 b/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
index 0935a2740eb3..47e5baeeb84f 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( 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 ) ) qt5? ( dev-qt/qtcore:5 ) test? ( qt5? ( dev-qt/qttest:5 ) )
 DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=8
-HOMEPAGE=http://www.gnupg.org/related_software/gpgme
+HOMEPAGE=https://www.gnupg.org/related_software/gpgme
 INHERIT=distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
 IUSE=common-lisp static-libs +cxx python qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1/11.6.15
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.17.1.tar.bz2 verify-sig? ( mirror://gnupg/gpgme/gpgme-1.17.1.tar.bz2.sig )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=5a1f921a7a11e95aa57346ee7fa462d8
+_md5_=960f004f3ded96b47952ee8f53dc92ca
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 7c00060fa6fd..1477d5938c65 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/citar-1.0 b/metadata/md5-cache/app-emacs/citar-1.0
new file mode 100644
index 000000000000..2df9ffc21375
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/citar-1.0
@@ -0,0 +1,13 @@
+BDEPEND=app-emacs/citeproc-el app-emacs/parsebib >=app-editors/emacs-27.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Emacs package to quickly find and act on bibliographic references
+EAPI=8
+HOMEPAGE=https://github.com/emacs-citar/citar/
+INHERIT=elisp
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=app-emacs/citeproc-el app-emacs/parsebib >=app-editors/emacs-27.1:*
+SLOT=0
+SRC_URI=https://github.com/emacs-citar/citar/archive/v1.0.tar.gz -> citar-1.0.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=a169af51debec25e0653beee004c1c2f
diff --git a/metadata/md5-cache/app-emacs/citeproc-el-0.9.1 b/metadata/md5-cache/app-emacs/citeproc-el-0.9.1
new file mode 100644
index 000000000000..89d0a0622f01
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/citeproc-el-0.9.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-editors/emacs-26:*[libxml2] app-emacs/dash app-emacs/f app-emacs/parsebib app-emacs/queue app-emacs/s app-emacs/string-inflection test? ( app-emacs/ht app-emacs/yaml ) >=app-editors/emacs-26:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=CSL 1.0.2 Citation Processor for Emacs
+EAPI=8
+HOMEPAGE=https://github.com/andras-simonyi/citeproc-el
+INHERIT=elisp
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-26:*[libxml2] app-emacs/dash app-emacs/f app-emacs/parsebib app-emacs/queue app-emacs/s app-emacs/string-inflection >=app-editors/emacs-26:*
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/andras-simonyi/citeproc-el/archive/0.9.1.tar.gz -> citeproc-el-0.9.1.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=97d03043107578c98c258906effcee53
diff --git a/metadata/md5-cache/app-emacs/string-inflection-1.0.16 b/metadata/md5-cache/app-emacs/string-inflection-1.0.16
new file mode 100644
index 000000000000..2bec4be92ef4
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/string-inflection-1.0.16
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Convert symbol names between different naming conventions
+EAPI=8
+HOMEPAGE=https://github.com/akicho8/string-inflection/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://github.com/akicho8/string-inflection/archive/v1.0.16.tar.gz -> string-inflection-1.0.16.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=e751cd638166ccfb54c7b0f3e2dc1dce
diff --git a/metadata/md5-cache/app-emacs/yaml-0.5.1 b/metadata/md5-cache/app-emacs/yaml-0.5.1
new file mode 100644
index 000000000000..790643cbe38d
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/yaml-0.5.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-25.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=YAML parser in Emacs Lisp
+EAPI=8
+HOMEPAGE=https://github.com/zkry/yaml.el/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-25.1:*
+SLOT=0
+SRC_URI=https://github.com/zkry/yaml.el/archive/v0.5.1.tar.gz -> yaml-0.5.1.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=26548ee7a937507b25c835ef403f6580
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 2e67cc465363..8fd5026eed7a 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/cpuid2cpuflags-12 b/metadata/md5-cache/app-portage/cpuid2cpuflags-12
index bd126e786056..e3619b861a6a 100644
--- a/metadata/md5-cache/app-portage/cpuid2cpuflags-12
+++ b/metadata/md5-cache/app-portage/cpuid2cpuflags-12
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Tool to guess CPU_FLAGS_* flags for the host
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags/
+HOMEPAGE=https://github.com/projg2/cpuid2cpuflags/
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 SLOT=0
-SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v12/cpuid2cpuflags-12.tar.bz2
-_md5_=fa1ae5e2506df9da5d1e0e9409ae628c
+SRC_URI=https://github.com/projg2/cpuid2cpuflags/releases/download/v12/cpuid2cpuflags-12.tar.bz2
+_md5_=83039200c8e80644997bb2b19cb3831f
diff --git a/metadata/md5-cache/app-portage/diffmask-0.3.3-r4 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
deleted file mode 100644
index e26456f904eb..000000000000
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
+++ /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 )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A utility to maintain package.unmask entries up-to-date with masks
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/diffmask/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8704990890ce1daf0bad1aac5f729b78
diff --git a/metadata/md5-cache/app-portage/diffmask-0.3.3-r5 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
index 90be588f898b..1054a2a7bb86 100644
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
+++ b/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
@@ -2,7 +2,7 @@ BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_target
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A utility to maintain package.unmask entries up-to-date with masks
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/diffmask/
+HOMEPAGE=https://github.com/projg2/diffmask/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux
@@ -10,6 +10,6 @@ LICENSE=BSD
 RDEPEND=sys-apps/portage[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 )
 SLOT=0
-SRC_URI=https://github.com/mgorny/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
+SRC_URI=https://github.com/projg2/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6d6399854666b30f56707bc61b4f1493
+_md5_=244fa61d76881dff069ccc7262652b72
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1 b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
deleted file mode 100644
index 52945b027659..000000000000
--- a/metadata/md5-cache/app-portage/flaggie-0.2.1-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 )
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A smart CLI mangler for package.* files
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/flaggie/
-INHERIT=bash-completion-r1 distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=10681e8480705db1ff9331574920dcae
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2.1-r2 b/metadata/md5-cache/app-portage/flaggie-0.2.1-r2
index 0993830d939b..cb36cbf8c809 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.2.1-r2
+++ b/metadata/md5-cache/app-portage/flaggie-0.2.1-r2
@@ -2,7 +2,7 @@ BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_target
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A smart CLI mangler for package.* files
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/flaggie/
+HOMEPAGE=https://github.com/projg2/flaggie/
 INHERIT=bash-completion-r1 distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
@@ -10,6 +10,6 @@ LICENSE=BSD
 RDEPEND=sys-apps/portage[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 )
 SLOT=0
-SRC_URI=https://github.com/mgorny/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
+SRC_URI=https://github.com/projg2/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1b45a22e192b05e453d08f4fe4bdb596
+_md5_=70f24117223b34b3fea2f84f9124c47b
diff --git a/metadata/md5-cache/app-portage/gander-0.0.1-r2 b/metadata/md5-cache/app-portage/gander-0.0.1-r2
index 8fd7edfb012d..f8ff7afdc53f 100644
--- a/metadata/md5-cache/app-portage/gander-0.0.1-r2
+++ b/metadata/md5-cache/app-portage/gander-0.0.1-r2
@@ -2,7 +2,7 @@ BDEPEND=test? ( dev-python/responses[python_targets_python3_8(-)?,python_targets
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Statistic submission client for Goose (anser.gentoo.org)
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/gander/
+HOMEPAGE=https://github.com/projg2/gander/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
@@ -11,6 +11,6 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/mgorny/gander/archive/v0.0.1.tar.gz -> gander-0.0.1.tar.gz
+SRC_URI=https://github.com/projg2/gander/archive/v0.0.1.tar.gz -> gander-0.0.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0a6f66b4b1a439628b71d4cbad68c404
+_md5_=db1a778105db56702e0aad124de4ae47
diff --git a/metadata/md5-cache/app-portage/gemato-16.2 b/metadata/md5-cache/app-portage/gemato-16.2
index 75aa9b5c7089..b4a37474502c 100644
--- a/metadata/md5-cache/app-portage/gemato-16.2
+++ b/metadata/md5-cache/app-portage/gemato-16.2
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=app-crypt/gnupg-2.2.20-r1 >=dev-python/pytest-5[python_targets
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/gemato
+HOMEPAGE=https://github.com/projg2/gemato
 INHERIT=distutils-r1
 IUSE=+gpg tools test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-16.2.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_=0b3f6e77d78b9333eb4a25c8de668bf5
+_md5_=750bc83b0adcc4783ce87eb181db0df5
diff --git a/metadata/md5-cache/app-portage/gemato-9999 b/metadata/md5-cache/app-portage/gemato-9999
index 2a09f62080c0..4459b2f4ea24 100644
--- a/metadata/md5-cache/app-portage/gemato-9999
+++ b/metadata/md5-cache/app-portage/gemato-9999
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=app-crypt/gnupg-2.2.20-r1 >=dev-python/pytest-5[python_targets
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/gemato
+HOMEPAGE=https://github.com/projg2/gemato
 INHERIT=distutils-r1 git-r3
 IUSE=+gpg tools test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD-2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c681e221ea2a3d6713719e8c89999576
+_md5_=6356a3cb401009144a857835c94186b3
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.4 b/metadata/md5-cache/app-portage/gentoopm-0.4
index 6f43fbf53282..7876c15b3a9e 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.4
+++ b/metadata/md5-cache/app-portage/gentoopm-0.4
@@ -2,7 +2,7 @@ BDEPEND=test? ( || ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy3(-)?,python_ta
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A common interface to Gentoo package managers
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/gentoopm/
+HOMEPAGE=https://github.com/projg2/gentoopm/
 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 hppa ~mips ~sparc x86 ~x64-macos
@@ -12,6 +12,6 @@ RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy3(-)?,python_targets_py
 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/mgorny/gentoopm/archive/v0.4.tar.gz -> gentoopm-0.4.tar.gz
+SRC_URI=https://github.com/projg2/gentoopm/archive/v0.4.tar.gz -> gentoopm-0.4.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=37a8c1d8fa795b05e1b19a150ac17ba1
+_md5_=d612933cf0a0d7e75d3f21c5e929eb45
diff --git a/metadata/md5-cache/app-portage/gentoopm-9999 b/metadata/md5-cache/app-portage/gentoopm-9999
index cb4c31c49f2e..8e723bf291b7 100644
--- a/metadata/md5-cache/app-portage/gentoopm-9999
+++ b/metadata/md5-cache/app-portage/gentoopm-9999
@@ -2,7 +2,7 @@ BDEPEND=test? ( || ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy3(-)?,python_ta
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A common interface to Gentoo package managers
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/gentoopm/
+HOMEPAGE=https://github.com/projg2/gentoopm/
 INHERIT=distutils-r1 git-r3
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD-2
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2807eea930b81f1a568ed07d9b746f89
+_md5_=f09ac0bc897712ee6bf6fa6e0dc6f97c
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.8.2 b/metadata/md5-cache/app-portage/gpyutils-0.8.2
index 9320c4af9812..57c022c83e64 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.8.2
+++ b/metadata/md5-cache/app-portage/gpyutils-0.8.2
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utitilies for maintaining Python packages
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/gpyutils/ https://pypi.org/project/gpyutils/
+HOMEPAGE=https://github.com/projg2/gpyutils/ https://pypi.org/project/gpyutils/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
@@ -11,6 +11,6 @@ RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets
 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/mgorny/gpyutils/archive/v0.8.2.tar.gz -> gpyutils-0.8.2.gh.tar.gz
+SRC_URI=https://github.com/projg2/gpyutils/archive/v0.8.2.tar.gz -> gpyutils-0.8.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_=19a3d08af13fc8ba94fedb97270b66d8
+_md5_=3223d8b17dd4336a63a647305fd694c6
diff --git a/metadata/md5-cache/app-portage/gverify-2 b/metadata/md5-cache/app-portage/gverify-2
index b28884e949c6..3956ac0cd8af 100644
--- a/metadata/md5-cache/app-portage/gverify-2
+++ b/metadata/md5-cache/app-portage/gverify-2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install setup
 DEPEND=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 )
 DESCRIPTION=gentoo.git signature verification tool
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/gverify
+HOMEPAGE=https://github.com/projg2/gverify
 INHERIT=python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
@@ -10,6 +10,6 @@ LICENSE=BSD-2
 RDEPEND=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 ) app-crypt/gnupg sec-keys/openpgp-keys-gentoo-auth dev-vcs/git
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
-SRC_URI=https://github.com/mgorny/gverify/archive/v2.tar.gz -> gverify-2.tar.gz
+SRC_URI=https://github.com/projg2/gverify/archive/v2.tar.gz -> gverify-2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f9ba98af72077b9e461e470de5f9d59f
+_md5_=391f5eeaf335e6f637121c48dcd62171
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.0 b/metadata/md5-cache/app-portage/kuroneko-0.1.0
deleted file mode 100644
index 169f430d0df6..000000000000
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulnerability checker using data scraped from Gentoo Bugzilla
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/kuroneko/
-INHERIT=distutils-r1
-IUSE=scraper test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.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/mgorny/kuroneko/archive/v0.1.0.tar.gz -> kuroneko-0.1.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_=ec7619c11e7ca093f990a0dda9e827d1
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.1 b/metadata/md5-cache/app-portage/kuroneko-0.1.1
deleted file mode 100644
index e7699b617d73..000000000000
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulnerability checker using data scraped from Gentoo Bugzilla
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/kuroneko/
-INHERIT=distutils-r1
-IUSE=scraper test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[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/mgorny/kuroneko/archive/v0.1.1.tar.gz -> kuroneko-0.1.1.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_=7133bf273231886b860a4eb450f0a0e2
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.2 b/metadata/md5-cache/app-portage/kuroneko-0.1.2
deleted file mode 100644
index 021bea515fc3..000000000000
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulnerability checker using data scraped from Gentoo Bugzilla
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/kuroneko/
-INHERIT=distutils-r1
-IUSE=scraper test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] scraper? ( dev-python/bracex[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/mgorny/kuroneko/archive/v0.1.2.tar.gz -> kuroneko-0.1.2.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_=7133bf273231886b860a4eb450f0a0e2
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.3 b/metadata/md5-cache/app-portage/kuroneko-0.1.3
index 732065d2dfc5..4939572123b5 100644
--- a/metadata/md5-cache/app-portage/kuroneko-0.1.3
+++ b/metadata/md5-cache/app-portage/kuroneko-0.1.3
@@ -2,7 +2,7 @@ BDEPEND=test? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_py
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Vulnerability checker using data scraped from Gentoo Bugzilla
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/kuroneko/
+HOMEPAGE=https://github.com/projg2/kuroneko/
 INHERIT=distutils-r1
 IUSE=scraper test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
@@ -11,6 +11,6 @@ RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/mgorny/kuroneko/archive/v0.1.3.tar.gz -> kuroneko-0.1.3.tar.gz
+SRC_URI=https://github.com/projg2/kuroneko/archive/v0.1.3.tar.gz -> kuroneko-0.1.3.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_=7133bf273231886b860a4eb450f0a0e2
+_md5_=f0a320b35742b849a153108e8cfdccdc
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-21 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-21
index 5b44ee49cc06..cd7a05d27f5b 100644
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-21
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-21
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Handy scripts for ebuild development and more
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/mgorny-dev-scripts
+HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts
 KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=app-portage/gentoolkit dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
 SLOT=0
-SRC_URI=https://github.com/mgorny/mgorny-dev-scripts/archive/v21.tar.gz -> mgorny-dev-scripts-21.tar.gz
-_md5_=d28b785881c6d7953f568a12ae38952f
+SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v21.tar.gz -> mgorny-dev-scripts-21.tar.gz
+_md5_=e56fc15d3ee9398f1e40e3a9c5955b35
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-22 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-22
index 2fd2f1ded0ad..c76a97159ce1 100644
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-22
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-22
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Handy scripts for ebuild development and more
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/mgorny-dev-scripts
+HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=app-portage/gentoolkit dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
 SLOT=0
-SRC_URI=https://github.com/mgorny/mgorny-dev-scripts/archive/v22.tar.gz -> mgorny-dev-scripts-22.tar.gz
-_md5_=68a6f896712d0d20630235500698e9ff
+SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v22.tar.gz -> mgorny-dev-scripts-22.tar.gz
+_md5_=b0e72ae6229ed2fc7c229891080a8e70
diff --git a/metadata/md5-cache/app-portage/nattka-0.3.1 b/metadata/md5-cache/app-portage/nattka-0.3.1
index 6f74bda10749..bda7fd31af4d 100644
--- a/metadata/md5-cache/app-portage/nattka-0.3.1
+++ b/metadata/md5-cache/app-portage/nattka-0.3.1
@@ -2,7 +2,7 @@ BDEPEND=>=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A New Arch Tester Toolkit -- open-source stable-bot replacement
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/nattka/
+HOMEPAGE=https://github.com/projg2/nattka/
 INHERIT=distutils-r1
 IUSE=depgraph-order doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
@@ -11,6 +11,6 @@ RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/mgorny/nattka/archive/v0.3.1.tar.gz -> nattka-0.3.1.tar.gz
+SRC_URI=https://github.com/projg2/nattka/archive/v0.3.1.tar.gz -> nattka-0.3.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=08b675743b009bc36527bc27d5a88738
+_md5_=802818ed7af75f5fdd967492d76fec8e
diff --git a/metadata/md5-cache/app-portage/pram-10 b/metadata/md5-cache/app-portage/pram-10
index 6d5d0c333887..2775bffb81c7 100644
--- a/metadata/md5-cache/app-portage/pram-10
+++ b/metadata/md5-cache/app-portage/pram-10
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=test? ( dev-vcs/git net-misc/wget[ssl] virtual/editor !dev-perl/Gentoo-App-Pram app-crypt/gnupg sys-apps/diffutils )
 DESCRIPTION=Tool to ease merging Pull Requests and git patches
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/pram
+HOMEPAGE=https://github.com/projg2/pram
 INHERIT=meson
 IUSE=test
 KEYWORDS=amd64 ~arm64 ppc64 ~riscv x86 ~x64-macos
@@ -11,6 +11,6 @@ LICENSE=BSD-2
 RDEPEND=dev-vcs/git net-misc/wget[ssl] virtual/editor !dev-perl/Gentoo-App-Pram
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/mgorny/pram/archive/v10.tar.gz -> pram-10.tar.gz
+SRC_URI=https://github.com/projg2/pram/archive/v10.tar.gz -> pram-10.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=277df8d6d5b51c19fdb379cd24f15577
+_md5_=05b970fed419b0cee6097dcf988cf126
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0
index 65d8c2f9d4a8..2b1a9fd88c70 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=app-portage/gentoopm-0.2.1[python_targets_pypy3(-)?,python_tar
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Check live packages for updates and emerge them as necessary
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
+HOMEPAGE=https://github.com/projg2/smart-live-rebuild/
 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 hppa ~mips ~sparc x86 ~x64-macos
@@ -11,6 +11,6 @@ RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_pypy3(-)?,python_targets_pyt
 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/mgorny/smart-live-rebuild/archive/v1.4.0.tar.gz -> smart-live-rebuild-1.4.0.tar.gz
+SRC_URI=https://github.com/projg2/smart-live-rebuild/archive/v1.4.0.tar.gz -> smart-live-rebuild-1.4.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e5ccbcb2bcdcf57c9144e838001ec64f
+_md5_=7143694f8940d08cb5c6a410f75d21d8
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-9999 b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
index 8fbf398ee283..a1dbc50db2a3 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-9999
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=app-portage/gentoopm-0.2.1[python_targets_pypy3(-)?,python_tar
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Check live packages for updates and emerge them as necessary
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
+HOMEPAGE=https://github.com/projg2/smart-live-rebuild/
 INHERIT=distutils-r1 git-r3
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD-2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3f2bc5308ebbd195041e41edabec36b7
+_md5_=5b3e9ed784dc5164405c3aa65d64dc2a
diff --git a/metadata/md5-cache/app-portage/unsymlink-lib-20 b/metadata/md5-cache/app-portage/unsymlink-lib-20
index cb05bbb532a7..ee9b49342f3a 100644
--- a/metadata/md5-cache/app-portage/unsymlink-lib-20
+++ b/metadata/md5-cache/app-portage/unsymlink-lib-20
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install setup
 DESCRIPTION=Convert your system to SYMLINK_LIB=no
 EAPI=7
-HOMEPAGE=https://github.com/mgorny/unsymlink-lib
+HOMEPAGE=https://github.com/projg2/unsymlink-lib
 INHERIT=python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ppc64
@@ -10,6 +10,6 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/mgorny/unsymlink-lib/archive/v20.tar.gz -> unsymlink-lib-20.tar.gz
+SRC_URI=https://github.com/projg2/unsymlink-lib/archive/v20.tar.gz -> unsymlink-lib-20.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e4d8a0a229998e52c96791dc3a429446
+_md5_=c2615c235f44778636ba66406842eaa0
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 62ea8d957e12..1574fd09221a 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/mysql-connector-c-8.0.27-r1 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
index a7f3a53182a7..bb53b0465fb3 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/
 INHERIT=cmake-multilib flag-o-matic
 IUSE=ldap static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/openssl:0=[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-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
 SLOT=0/21
 SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.27.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=508102c180e6855484458f9fd83c3f3c
+_md5_=828d1683ab0d2fd4a04e678a345d2d62
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 3bbd7a4ed2b6..c1343c9335e0 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-3.10.6_p2 b/metadata/md5-cache/dev-lang/python-3.10.6_p2
index e4031c69f7fb..5e05876635ed 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.6_p2
+++ b/metadata/md5-cache/dev-lang/python-3.10.6_p2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.6_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a9ec79b902daca7d9d5b8d094911f0b0
+_md5_=4b3ece6ea9293e1623a0c42a0aaaf43b
diff --git a/metadata/md5-cache/dev-lang/python-3.8.13_p6 b/metadata/md5-cache/dev-lang/python-3.8.13_p6
index 6f893e869b98..05fc6880f2e1 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.13_p6
+++ b/metadata/md5-cache/dev-lang/python-3.8.13_p6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.13_p6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=05b8194fca48583eb817fc10273b79bf
+_md5_=232121970d0c3058b5a69eb0eb5abd6d
diff --git a/metadata/md5-cache/dev-lang/python-3.9.13_p4 b/metadata/md5-cache/dev-lang/python-3.9.13_p4
index 632fad2009c5..b010df12a294 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.13_p4
+++ b/metadata/md5-cache/dev-lang/python-3.9.13_p4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.13_p4.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=24db5924ad4febe69c342bea080e6bac
+_md5_=06ab4f5e5a9f30d1897fa5df262b9a82
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 68aa5a8bd4a7..f1a0333f641b 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/libgcrypt-compat-1.5.6 b/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
index 2c484d6622ac..07bdda6fcdab 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
+++ b/metadata/md5-cache/dev-libs/libgcrypt-compat-1.5.6
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libgcrypt:0/11 !dev-libs/libgcrypt:11/11
 DESCRIPTION=Old version of libgcrypt needed by some binaries
 EAPI=7
-HOMEPAGE=http://www.gnupg.org/
+HOMEPAGE=https://www.gnupg.org/
 INHERIT=autotools multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 SLOT=11
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.6.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2407a0041665ec9de836c5402e45deb0
+_md5_=e6e662ee709fc29e4dd9edbffdf71de3
diff --git a/metadata/md5-cache/dev-libs/libksba-1.5.0 b/metadata/md5-cache/dev-libs/libksba-1.5.0
index 30aa1dd8e43f..91b18bb43642 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.5.0
+++ b/metadata/md5-cache/dev-libs/libksba-1.5.0
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libgpg-error-1.8
 DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=7
-HOMEPAGE=http://www.gnupg.org/related_software/libksba
+HOMEPAGE=https://www.gnupg.org/related_software/libksba
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.5.0.tar.bz2
-_md5_=dfc22bd0ae25a8d3879303a8b9242eac
+_md5_=8d601acf8ffda13aac3adebf27ffed34
diff --git a/metadata/md5-cache/dev-libs/libksba-1.5.1 b/metadata/md5-cache/dev-libs/libksba-1.5.1
index 7fbcdab6631c..a53f22905f01 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.5.1
+++ b/metadata/md5-cache/dev-libs/libksba-1.5.1
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libgpg-error-1.8
 DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=7
-HOMEPAGE=http://www.gnupg.org/related_software/libksba
+HOMEPAGE=https://www.gnupg.org/related_software/libksba
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.5.1.tar.bz2
-_md5_=dfc22bd0ae25a8d3879303a8b9242eac
+_md5_=8d601acf8ffda13aac3adebf27ffed34
diff --git a/metadata/md5-cache/dev-libs/libksba-1.6.0 b/metadata/md5-cache/dev-libs/libksba-1.6.0
index 2b0758865a17..4f9337d76fd0 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.6.0
+++ b/metadata/md5-cache/dev-libs/libksba-1.6.0
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libgpg-error-1.8
 DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=7
-HOMEPAGE=http://www.gnupg.org/related_software/libksba
+HOMEPAGE=https://www.gnupg.org/related_software/libksba
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.6.0.tar.bz2
-_md5_=2ff3d325f7c70dda9690a8d279f9e72c
+_md5_=9e2a117f0103c51766c3107bbfa5987a
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 3dccc42e45e0..824f3f5bdaef 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/cachecontrol-0.12.11 b/metadata/md5-cache/dev-python/cachecontrol-0.12.11
index e18cbe35f799..e702cb03118e 100644
--- a/metadata/md5-cache/dev-python/cachecontrol-0.12.11
+++ b/metadata/md5-cache/dev-python/cachecontrol-0.12.11
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/cherrypy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lockfile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/msgpack-0.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/cherrypy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lockfile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/msgpack-0.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_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=httplib2 caching for requests
 EAPI=8
 HOMEPAGE=https://pypi.org/project/CacheControl/ https://github.com/ionrock/cachecontrol/
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/msgpack-0.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[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 )
+RDEPEND=>=dev-python/msgpack-0.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_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/ionrock/cachecontrol/archive/v0.12.11.tar.gz -> cachecontrol-0.12.11.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=35d3463e3c8623bceedab7cba482a7bf
+_md5_=e59e16b81422e8cdfdbea0039880710b
diff --git a/metadata/md5-cache/dev-python/construct-2.10.68 b/metadata/md5-cache/dev-python/construct-2.10.68
index 2aa4a6052ecc..bf2d993c0897 100644
--- a/metadata/md5-cache/dev-python/construct-2.10.68
+++ b/metadata/md5-cache/dev-python/construct-2.10.68
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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(-)?]
+BDEPEND=test? ( dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=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 postinst prepare test
 DESCRIPTION=A powerful declarative parser for binary data
 EAPI=8
 HOMEPAGE=https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_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 )
+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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.10.68.tar.gz -> construct-2.10.68.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5c0f54c55abc55b371ebf330ec677425
+_md5_=180709faf54440a8edd599219b529f1e
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.7-r1 b/metadata/md5-cache/dev-python/css-parser-1.0.7-r1
index f9f2b12206da..9821a986a66b 100644
--- a/metadata/md5-cache/dev-python/css-parser-1.0.7-r1
+++ b/metadata/md5-cache/dev-python/css-parser-1.0.7-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( 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(-)?]
+BDEPEND=test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/unittest-or-fail[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=A CSS Cascading Style Sheets library (fork of cssutils)
 EAPI=8
 HOMEPAGE=https://pypi.org/project/css-parser/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=LGPL-2.1+
-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 )
+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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/css-parser/css-parser-1.0.7.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=69b8eca6a4fd20e9fc98b89cc4eeeb8e
+_md5_=4d3ae82c092cd69fd3256f4f67fcb07d
diff --git a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1 b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
index 6e0e8effee62..b19328d79b35 100644
--- a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
+++ b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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(-)?]
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Clone of EditorConfig core written in Python
 EAPI=7
 HOMEPAGE=https://editorconfig.org/
 INHERIT=cmake distutils-r1
-IUSE=cli test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=cli test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=PYTHON BSD-4
-RDEPEND=!<app-vim/editorconfig-vim-0.3.3-r1 cli? ( !app-text/editorconfig-core-c[cli] ) 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 )
+RDEPEND=!<app-vim/editorconfig-vim-0.3.3-r1 cli? ( !app-text/editorconfig-core-c[cli] ) 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/editorconfig/editorconfig-core-py/archive/v0.12.3.tar.gz -> editorconfig-core-py-0.12.3.tar.gz test? ( https://github.com/editorconfig/editorconfig-core-test/archive/abb579e00f2deeede91cb485e53512efab9c6474.tar.gz -> editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7de256f386f3153ec86ef07745d98023
+_md5_=ab8eb19590b57afe946e6dd7b0969d8b
diff --git a/metadata/md5-cache/dev-python/exam-0.10.6 b/metadata/md5-cache/dev-python/exam-0.10.6
index 3d8752210d93..c1d83ec828e9 100644
--- a/metadata/md5-cache/dev-python/exam-0.10.6
+++ b/metadata/md5-cache/dev-python/exam-0.10.6
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/mock[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(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Helpers for better testing
 EAPI=8
 HOMEPAGE=https://github.com/fluxx/exam
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/mock[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 )
+RDEPEND=dev-python/mock[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=mirror://pypi/e/exam/exam-0.10.6.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=95bad0f8a232d8d280e79ede29278e87
+_md5_=8b8e6da976c9d09aa8e61f33e35da43b
diff --git a/metadata/md5-cache/dev-python/progressbar2-4.0.0 b/metadata/md5-cache/dev-python/progressbar2-4.0.0
index 8e2b3e92cccc..254944e750ae 100644
--- a/metadata/md5-cache/dev-python/progressbar2-4.0.0
+++ b/metadata/md5-cache/dev-python/progressbar2-4.0.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-utils-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar >=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(-)?]
+BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-utils-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/progressbar >=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/setuptools-42.0.2[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=Text progressbar library for python
 EAPI=8
 HOMEPAGE=https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/python-utils-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar 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 )
+RDEPEND=>=dev-python/python-utils-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/progressbar 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=mirror://pypi/p/progressbar2/progressbar2-4.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_=10846de6ff558f5abcf4b7765cf85a80
+_md5_=c8390c7a78db749635cc099fee47cc3b
diff --git a/metadata/md5-cache/dev-python/pyphen-0.12.0-r1 b/metadata/md5-cache/dev-python/pyphen-0.12.0-r1
index 2f0806e19b7e..0c9befe8185c 100644
--- a/metadata/md5-cache/dev-python/pyphen-0.12.0-r1
+++ b/metadata/md5-cache/dev-python/pyphen-0.12.0-r1
@@ -1,16 +1,16 @@
-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/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=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/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python module for hyphenation using hunspell dictionaries
 EAPI=8
 HOMEPAGE=https://github.com/Kozea/Pyphen
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+ MPL-1.1
-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 )
+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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kozea/Pyphen/archive/0.12.0.tar.gz -> Pyphen-0.12.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e20f62e97802712596c2785325dd5a6a
+_md5_=d9fc2ba5d17ec14f13438d9ce56bc979
diff --git a/metadata/md5-cache/dev-python/pyte-0.8.1 b/metadata/md5-cache/dev-python/pyte-0.8.1
index b53b8a87edde..d82c785f7b5b 100644
--- a/metadata/md5-cache/dev-python/pyte-0.8.1
+++ b/metadata/md5-cache/dev-python/pyte-0.8.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/wcwidth[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(-)?]
+BDEPEND=test? ( dev-python/wcwidth[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=Simple VTXXX-compatible terminal emulator
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pyte/ https://github.com/selectel/pyte
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
-RDEPEND=dev-python/wcwidth[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 )
+RDEPEND=dev-python/wcwidth[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/selectel/pyte/archive/0.8.1.tar.gz -> pyte-0.8.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_=3058d2cb857f90ec1fe4d4b35a22a443
+_md5_=ef4a2f9750bff59506aa4ea48c12ae4d
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.7.2 b/metadata/md5-cache/dev-python/pyxattr-0.7.2
index 8bc25ad879d2..a60f5fa51294 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.7.2
+++ b/metadata/md5-cache/dev-python/pyxattr-0.7.2
@@ -1,17 +1,17 @@
-BDEPEND=test? ( sys-apps/attr:= >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,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-python/recommonmark[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/recommonmark[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/recommonmark[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/recommonmark[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 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( sys-apps/attr:= >=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(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/recommonmark[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/recommonmark[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/recommonmark[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/recommonmark[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/recommonmark[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/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-apps/attr:=
 DESCRIPTION=Python interface to xattr
 EAPI=7
 HOMEPAGE=https://pyxattr.k1024.org/
 INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/attr:= 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 )
+RDEPEND=sys-apps/attr:= 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=mirror://pypi/p/pyxattr/pyxattr-0.7.2.tar.gz https://pyxattr.k1024.org/downloads/pyxattr-0.7.2.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_=5cb9a687ab5c80420aba10c414e70ef9
+_md5_=9eb39cd42e8c5a96f46f34c94db1d5c5
diff --git a/metadata/md5-cache/dev-python/scandir-1.10.0-r3 b/metadata/md5-cache/dev-python/scandir-1.10.0-r3
new file mode 100644
index 000000000000..13d07960fed7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scandir-1.10.0-r3
@@ -0,0 +1,15 @@
+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 ) >=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 better directory iterator and faster os.walk()
+EAPI=8
+HOMEPAGE=https://github.com/benhoyt/scandir
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 )
+SLOT=0
+SRC_URI=mirror://pypi/s/scandir/scandir-1.10.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=675455021a163ff84a9ce0590dc89cdd
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 6ef3fa04eab1..e84933efd8c8 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.12.1 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.12.1
new file mode 100644
index 000000000000..ec08ad5b85a4
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.12.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.6:1.0
+DESCRIPTION=WPE backend designed for Linux desktop systems
+EAPI=8
+HOMEPAGE=https://wpewebkit.org/
+INHERIT=meson
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.6:1.0
+SLOT=1.0
+SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.12.1.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0840f27b946f7270ce1c12a2fd0b2e26
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index e90505d1fac9..4e6b111b15cd 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/xpaint-3.1.4-r1 b/metadata/md5-cache/media-gfx/xpaint-3.1.4-r1
new file mode 100644
index 000000000000..89c6b9e7c9bc
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/xpaint-3.1.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=media-libs/fontconfig media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/netpbm x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2h[unicode] x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pgf? ( media-libs/libpgf ) tiff? ( media-libs/tiff:0 )
+DESCRIPTION=Image editor with tiff, jpeg and png support
+EAPI=8
+HOMEPAGE=http://sf-xpaint.sourceforge.net/
+INHERIT=autotools desktop toolchain-funcs xdg
+IUSE=pgf tiff
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/fontconfig media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/netpbm x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2h[unicode] x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pgf? ( media-libs/libpgf ) tiff? ( media-libs/tiff:0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/sf-xpaint/xpaint-3.1.4.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9aa108077b1ecc3e4ad6299009c4f334
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 514af74ff884..a622107f401c 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.12 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.12
index 874f8baa17ae..23e94ae33d09 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.12
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=89fa9836c3db65885a60d2efda5c3d67
+_md5_=efa92a8c33be0c5caf8269377be3467f
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.8 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.8
deleted file mode 100644
index c2655d6bdebd..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=efa92a8c33be0c5caf8269377be3467f
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.5 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.5
deleted file mode 100644
index e99441266f38..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0e2bb4b645b1ad8006c74b2e4046b775
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9
index bf17e5548166..b260235baecc 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=96f2f40b22c5538a7288b51733848246
+_md5_=0e2bb4b645b1ad8006c74b2e4046b775
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.0 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.0
deleted file mode 100644
index 80a605a2e729..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=893bcdb912eb65b8fe820892509f6287
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3
index 541ee5b482d7..062cd3cb625f 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=893bcdb912eb65b8fe820892509f6287
+_md5_=0ecbfd978938bb1ff79da475abd4b596
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.12 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.12
index fd2e5dda8896..43d3b258ec61 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.12
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=b2de9b053f81cbd49c92269a10084a0e
+_md5_=fdcff15001a376fd7f003c8110dd8ee5
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.8 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.8
deleted file mode 100644
index 435b031ba8bf..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=fdcff15001a376fd7f003c8110dd8ee5
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.5 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.5
deleted file mode 100644
index e8dd82cbc08b..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=589d1d8ccc235a4ebf4c58f085a6d34c
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9
index 175b98a16db0..20e0d5be4f89 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=7c5d50a549ed10a54110d5aae5a0f94b
+_md5_=589d1d8ccc235a4ebf4c58f085a6d34c
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.0 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.0
deleted file mode 100644
index b938cab2946c..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=d2956d962cf75e7f87969dacc801597f
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3
index fbb8ab629bc6..be4452ae09f0 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=d2956d962cf75e7f87969dacc801597f
+_md5_=5d3baf739f712a82d222abe23a4914ef
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.22.12 b/metadata/md5-cache/sys-cluster/kube-proxy-1.22.12
index 0d2bd54557ac..97e6b62e7627 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.22.12
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=e26b6327c24c068cc57a04cc4194325d
+_md5_=b45d3c32b1225fc90fc061ae95d81c3b
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.22.8 b/metadata/md5-cache/sys-cluster/kube-proxy-1.22.8
deleted file mode 100644
index 9bbb27ca0daa..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.22.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=b45d3c32b1225fc90fc061ae95d81c3b
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.5 b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.5
deleted file mode 100644
index d6570a5bcf75..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=c17434a82e6c2af19743bdb7c0821799
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.9 b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.9
index 744cb37ab984..1324f9258ea6 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.9
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=4ceab05f6dafa180eb2d3d9821f660e8
+_md5_=c17434a82e6c2af19743bdb7c0821799
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.0 b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.0
deleted file mode 100644
index 4ecd8f1b38ad..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=d6cc245cbbbaeefb53b1de213061689e
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.3 b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.3
index 92c8bd59fea9..b6a23a6de320 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.3
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=d6cc245cbbbaeefb53b1de213061689e
+_md5_=bd9f144a2699058397862de61a2e6847
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.12 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.12
index ab95b6c6be04..a3999c3c26eb 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.12
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=1f4a53ca7f0fee1dda2eedadbb74eb9f
+_md5_=3a5a8ff3c2f5e93698031db0375e6054
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.8 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.8
deleted file mode 100644
index 4e38d793d2c3..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=3a5a8ff3c2f5e93698031db0375e6054
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.5 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.5
deleted file mode 100644
index e55d47d77eb4..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=893906f2c9933daf3a11474a43d60503
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9
index 587765df61a3..40436591956f 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=e8827078bfa0531fac0ba86c94a8fc02
+_md5_=893906f2c9933daf3a11474a43d60503
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.0 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.0
deleted file mode 100644
index bfbc21c0bb99..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=82db5e596b7bc69f33565bf7aa29c22d
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3
index 5d764e1dd751..a73efd4db5a5 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=82db5e596b7bc69f33565bf7aa29c22d
+_md5_=285d3b044dc198f1e84a6f95f328c563
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.22.12 b/metadata/md5-cache/sys-cluster/kubeadm-1.22.12
index 59f6f53c3a08..1c180119cad1 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.22.12
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=61607ca439c903a945818ba8317c2704
+_md5_=93e61ca419b38ee24a0f9f0d93bab666
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.22.8 b/metadata/md5-cache/sys-cluster/kubeadm-1.22.8
deleted file mode 100644
index c616d2895b3b..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.22.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=93e61ca419b38ee24a0f9f0d93bab666
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.23.5 b/metadata/md5-cache/sys-cluster/kubeadm-1.23.5
deleted file mode 100644
index 6ba5f31545be..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.23.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=96ccbcc518727dbf6a5fd42cc4278386
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.23.9 b/metadata/md5-cache/sys-cluster/kubeadm-1.23.9
index 1459d12e3261..dfea34b95e0a 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.23.9
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=de36be3af9385a90061f2a1a8c15e201
+_md5_=96ccbcc518727dbf6a5fd42cc4278386
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.24.0 b/metadata/md5-cache/sys-cluster/kubeadm-1.24.0
deleted file mode 100644
index f144004b8a5a..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7818fe291a2a9583eba583dd06c81d4a
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.24.3 b/metadata/md5-cache/sys-cluster/kubeadm-1.24.3
index af786f6da070..82e3ecf25364 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.24.3
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7818fe291a2a9583eba583dd06c81d4a
+_md5_=8c8760eff4c0e49d2ff34a43cd946a41
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.22.12 b/metadata/md5-cache/sys-cluster/kubectl-1.22.12
index 9d3ccc8ff8d7..06e9d5009007 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.22.12
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5f594a399c4ae6a9e86ab239101ab9c9
+_md5_=eb7d3b86fc42ed8ab9a6f3a04c083866
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.22.8 b/metadata/md5-cache/sys-cluster/kubectl-1.22.8
deleted file mode 100644
index 2ca1cb6d3d21..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.22.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=!sys-cluster/kubernetes
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=eb7d3b86fc42ed8ab9a6f3a04c083866
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.23.5 b/metadata/md5-cache/sys-cluster/kubectl-1.23.5
deleted file mode 100644
index 44e51e3c95ce..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.23.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a23e8aae87642a507f622651a93f63ea
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.23.9 b/metadata/md5-cache/sys-cluster/kubectl-1.23.9
index 923a15516736..04ed2c2671c8 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.23.9
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=88c58e69ec38a9111b1b4fbad171d56c
+_md5_=a23e8aae87642a507f622651a93f63ea
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.24.0 b/metadata/md5-cache/sys-cluster/kubectl-1.24.0
deleted file mode 100644
index 7b05a91cf806..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=93c8067665939eba64dcb34235370972
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.24.3 b/metadata/md5-cache/sys-cluster/kubectl-1.24.3
index ad23ddbcad78..bfe699a172ae 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.24.3
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=93c8067665939eba64dcb34235370972
+_md5_=4826db9b81b2cacf7c1b73ddc0599718
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.22.12 b/metadata/md5-cache/sys-cluster/kubelet-1.22.12
index 6e633be2a53d..1b6b48a1c48b 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.22.12
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.22.12
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.12.tar.gz -> kubernetes-1.22.12.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3ff3b4106bb9c945d2764d28836e9599
+_md5_=11d1b76e603f4d4b11405abb6858f628
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.22.8 b/metadata/md5-cache/sys-cluster/kubelet-1.22.8
deleted file mode 100644
index 56d6b87cb5a0..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.22.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=!sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.8.tar.gz -> kubernetes-1.22.8.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=11d1b76e603f4d4b11405abb6858f628
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.23.5 b/metadata/md5-cache/sys-cluster/kubelet-1.23.5
deleted file mode 100644
index b559ac2bdf75..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.23.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.5.tar.gz -> kubernetes-1.23.5.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1914a810ccc022d2444725d30df263c1
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.23.9 b/metadata/md5-cache/sys-cluster/kubelet-1.23.9
index 0f165add6376..7d666044d171 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.23.9
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.23.9
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.9.tar.gz -> kubernetes-1.23.9.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3690c5e2bd5039cdc7ab2505e5cc3495
+_md5_=1914a810ccc022d2444725d30df263c1
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.24.0 b/metadata/md5-cache/sys-cluster/kubelet-1.24.0
deleted file mode 100644
index 9d819caf9102..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.0.tar.gz -> kubernetes-1.24.0.tar.gz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=aff9f5cfa6fc6bc66372379a4f5f8f66
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.24.3 b/metadata/md5-cache/sys-cluster/kubelet-1.24.3
index 2fd5d1c0b17a..ad036caba71a 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.24.3
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.24.3
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.3.tar.gz -> kubernetes-1.24.3.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=aff9f5cfa6fc6bc66372379a4f5f8f66
+_md5_=3f011fe78ea4d4708099f43dd1ca0b58
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 43c588003784..3d07fd49788b 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/binutils-2.38-r2 b/metadata/md5-cache/sys-devel/binutils-2.38-r2
index 3fb0459c6ce8..7b5d59218910 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.38-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.38-r2
@@ -1,17 +1,17 @@
 BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=Tools necessary to build programs
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-IUSE=cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla
+INHERIT=elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+IUSE=cet default-gold doc emacs +gold multitarget +nls pgo +plugins static-libs test vanilla
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=2.38
 SRC_URI=mirror://gnu/binutils/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38-patches-4.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=06d016b2f7d4433ba41fcbf7f619eb34
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=1c827f47f6b334f45d3b14783da9b545
diff --git a/metadata/md5-cache/sys-devel/binutils-2.39 b/metadata/md5-cache/sys-devel/binutils-2.39
index 9fbddb9614c5..3102ae465c2f 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.39
+++ b/metadata/md5-cache/sys-devel/binutils-2.39
@@ -1,17 +1,17 @@
 BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=Tools necessary to build programs
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-IUSE=cet default-gold doc gold multitarget +nls pgo +plugins static-libs test vanilla
+INHERIT=elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+IUSE=cet default-gold doc emacs gold multitarget +nls pgo +plugins static-libs test vanilla
 KEYWORDS=~loong
 LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=2.39
 SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39-patches-3.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=87499d00cfa4394d18b0d260662f0dd8
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=eea640db77daed6b734d4507a7a14fff
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index de407522b397..14e362067eb9 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=Tools necessary to build programs
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs git-r3
-IUSE=cet default-gold doc gold multitarget +nls pgo +plugins static-libs test vanilla
+INHERIT=elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs git-r3
+IUSE=cet default-gold doc emacs +gold multitarget +nls pgo +plugins static-libs test vanilla
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* )
 REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=9999
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a2e8d3180c34b839d56fee7a2537b7cf
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=037390a6c9f6bd6cf46978ffea260b8b
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 1dab9ea41d61..46e9cfa3db31 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1 b/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
deleted file mode 100644
index f1f5b83eedd2..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-apps/iucode_tool-2.3
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=7
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-INHERIT=linux-info toolchain-funcs mount-boot
-IUSE=hostonly initramfs +split-ucode vanilla
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20201112.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20201116.tar.xz
-_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=df40198abb78fc67087a80c423e0217f
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221 b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221
deleted file mode 100644
index 9f94ad6e763b..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-apps/iucode_tool-2.3
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=7
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-INHERIT=linux-info toolchain-funcs mount-boot
-IUSE=hostonly initramfs +split-ucode vanilla
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210216.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210221.tar.xz
-_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=df40198abb78fc67087a80c423e0217f
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514 b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
deleted file mode 100644
index 341bcba94698..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-apps/iucode_tool-2.3
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=7
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-INHERIT=linux-info toolchain-funcs mount-boot
-IUSE=hostonly initramfs +split-ucode vanilla
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210216.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210514.tar.xz
-_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=df40198abb78fc67087a80c423e0217f
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608 b/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608
deleted file mode 100644
index 1a10746cee66..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-apps/iucode_tool-2.3
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=7
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-INHERIT=linux-info toolchain-funcs mount-boot
-IUSE=hostonly initramfs +split-ucode vanilla
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210608.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210608.tar.xz
-_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=df40198abb78fc67087a80c423e0217f
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20220809_p20220809 b/metadata/md5-cache/sys-firmware/intel-microcode-20220809_p20220809
index 9bc8c0c1a900..e3140f7877ef 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20220809_p20220809
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20220809_p20220809
@@ -13,4 +13,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20220809.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~mpagano/dist/intel-microcode/intel-microcode-collection-20220809.tar.xz
 _eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ac6aa9c16449b3171642aa62e2fa6461
+_md5_=c9ea4a8fd969e02e5855752756d09a0f
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 49f97967f6cf..8abb25104432 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r1 b/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r1
new file mode 100644
index 000000000000..73c9fc21b321
--- /dev/null
+++ b/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DESCRIPTION=Sonarr is a Smart PVR for newsgroup and bittorrent users
+EAPI=8
+HOMEPAGE=https://www.sonarr.tv
+INHERIT=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=acct-group/sonarr acct-user/sonarr >=dev-lang/mono-6.6.0.161 media-video/mediainfo dev-db/sqlite
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=https://download.sonarr.tv/v3/main/3.0.9.1549/Sonarr.main.3.0.9.1549.linux.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c8639d27e95f1de8229281941d1349ca
diff --git a/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r2 b/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r2
new file mode 100644
index 000000000000..6d0168075fc0
--- /dev/null
+++ b/metadata/md5-cache/www-apps/sonarr-3.0.9.1549-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DESCRIPTION=Sonarr is a Smart PVR for newsgroup and bittorrent users
+EAPI=8
+HOMEPAGE=https://www.sonarr.tv
+INHERIT=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=acct-group/sonarr acct-user/sonarr >=dev-lang/mono-6.6.0.161 media-video/mediainfo dev-db/sqlite
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=https://download.sonarr.tv/v3/main/3.0.9.1549/Sonarr.main.3.0.9.1549.linux.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=611e2e178ba4a067247acd5273cf0458
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 95e8580409d0..3a16cf0f198b 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/firefox-103.0.2 b/metadata/md5-cache/www-client/firefox-103.0.2
index 76f873e376da..e6a771647898 100644
--- a/metadata/md5-cache/www-client/firefox-103.0.2
+++ b/metadata/md5-cache/www-client/firefox-103.0.2
@@ -13,4 +13,4 @@ REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) || ( X wayland )
 SLOT=rapid
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/103.0.2/source/firefox-103.0.2.source.tar.xz -> firefox-103.0.2.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-103-patches-03j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-103-patches-03j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-103-patches-03j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/af.xpi -> firefox-103.0.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ar.xpi -> firefox-103.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ast.xpi -> firefox-103.0.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/be.xpi -> firefox-103.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/bg.xpi -> firefox-103.0.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/br.xpi -> firefox-103.0.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ca.xpi -> firefox-103.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/cak.xpi -> firefox-103.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/cs.xpi -> firefox-103.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/cy.xpi -> firefox-103.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/da.xpi -> firefox-103.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/de.xpi -> firefox-103.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-103.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/el.xpi -> firefox-103.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-103.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-103.0.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-103.0.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-103.0.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/et.xpi -> firefox-103.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/eu.xpi -> firefox-103.0.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/fi.xpi -> firefox-103.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/fr.xpi -> firefox-103.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-103.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-103.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/gd.xpi -> firefox-103.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/gl.xpi -> firefox-103.0.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/he.xpi -> firefox-103.0.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/hr.xpi -> firefox-103.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-103.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/hu.xpi -> firefox-103.0.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/id.xpi -> firefox-103.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/is.xpi -> firefox-103.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/it.xpi -> firefox-103.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ja.xpi -> firefox-103.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ka.xpi -> firefox-103.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/kab.xpi -> firefox-103.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/kk.xpi -> firefox-103.0.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ko.xpi -> firefox-103.0.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/lt.xpi -> firefox-103.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/lv.xpi -> firefox-103.0.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ms.xpi -> firefox-103.0.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-103.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/nl.xpi -> firefox-103.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-103.0.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-103.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/pl.xpi -> firefox-103.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-103.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-103.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/rm.xpi -> firefox-103.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ro.xpi -> firefox-103.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ru.xpi -> firefox-103.0.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sk.xpi -> firefox-103.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sl.xpi -> firefox-103.0.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sq.xpi -> firefox-103.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sr.xpi -> firefox-103.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-103.0.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/th.xpi -> firefox-103.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/tr.xpi -> firefox-103.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/uk.xpi -> firefox-103.0.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/uz.xpi -> firefox-103.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/vi.xpi -> firefox-103.0.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-103.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-103.0.2-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ach.xpi -> firefox-103.0.2-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/an.xpi -> firefox-103.0.2-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/az.xpi -> firefox-103.0.2-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/bn.xpi -> firefox-103.0.2-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/bs.xpi -> firefox-103.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-103.0.2-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/eo.xpi -> firefox-103.0.2-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-103.0.2-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-103.0.2-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/fa.xpi -> firefox-103.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ff.xpi -> firefox-103.0.2-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/gn.xpi -> firefox-103.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-103.0.2-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-103.0.2-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-103.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ia.xpi -> firefox-103.0.2-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/km.xpi -> firefox-103.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/kn.xpi -> firefox-103.0.2-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/lij.xpi -> firefox-103.0.2-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/mk.xpi -> firefox-103.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/mr.xpi -> firefox-103.0.2-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/my.xpi -> firefox-103.0.2-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-103.0.2-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/oc.xpi -> firefox-103.0.2-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/sco.xpi -> firefox-103.0.2-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/si.xpi -> firefox-103.0.2-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/son.xpi -> firefox-103.0.2-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/szl.xpi -> firefox-103.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ta.xpi -> firefox-103.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/te.xpi -> firefox-103.0.2-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/tl.xpi -> firefox-103.0.2-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/trs.xpi -> firefox-103.0.2-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/ur.xpi -> firefox-103.0.2-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xpi/xh.xpi -> firefox-103.0.2-xh.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b151e0c1fab00d2bb645c06ff3702ca4
+_md5_=4af02865110f77bee49c85a495fcc559
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index db3abd5dcb8f..d494b173a91d 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h b/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h
index 780ce5d51495..bbdfe04d08c1 100644
--- a/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h
+++ b/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h
@@ -1,9 +1,9 @@
-BDEPEND=sys-devel/flex virtual/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=sys-devel/flex virtual/yacc x11-misc/util-macros sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
 DESCRIPTION=Xaw3dXft library
 EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/sf-xpaint
+HOMEPAGE=https://sourceforge.net/projects/sf-xpaint/
 INHERIT=xorg-3
 IUSE=unicode xpm
 KEYWORDS=amd64 x86
@@ -12,4 +12,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/sf-xpaint/libXaw3dXft-1.6.2h.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	38a663574d97f06b6b729046865c8fb6
-_md5_=875c671a900edc46eec96eff551b951d
+_md5_=5247537c979b6ce4bb973fcfab9e61d5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 7b7f2ebb13e1..134f627cc1b8 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-10T12:39:58Z
+TIMESTAMP 2022-08-10T18:40:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzpx5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLz+4FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klACZg/9GBrPpL7MqKA5rM5RSVTkLGyJ2tH6ZGPNYcKbsl9VdBu1YwwPRuuqm8xw
-rQLQGwK6KG4ODFGVuOTiY6XyAyPMAsaEXJrBJ6DmKLn43rAqLK5fT3vZsRQTizUV
-sr+XITZVNtUeFivakGpBinW9IAtq64Fh8Pf/neSzHvlruQ0nKXBFsIwO9eLl5UmT
-w3f2zCzzYguglD6EQ+LUEG+LdxLUh1sltomlJ68YegRYEGGnJbGsus8/Vs7H4zF6
-dAx6bxe+gJ25Iezj2iUyJ6Pm/5+ehVenGQUZEEFWpPi0T01NPwkv3ymXwsqav5Dn
-yNmtQWiW72nfFNMzNwSbvW6x3iEoE3kgCNfTBcImhbqL9n9IQZk6ZWZvkVXruE/9
-aTpEjNXF9D5bQ35laLsw9HaRG3fFRcVCF0m3EVaRwUTkkMyE66Q/cAcC9cPMuzXt
-JK7MER/me6UoBNXVnv+80/zqqIUv/30nliyR4ddR+7tiWNOvILhVP8C5CUcqAF2q
-QQzN96RxmANDOP9oEITzHuFtXeD73dPliLgxJeNbC95aqLFfODY27du/inpvYdKa
-lfDSDw+6rbZjUxyPTZSnLn5/slK+s7k6VLKD5AbV2y9OyYJ1KUW8bKOdcWnnWX+M
-QCIa4/3I9edy9jTEm4d9TmMSi2g5YkkhYz2FN1BnQezh2Rnx/Zs=
-=iw54
+klBhuQ//aEzdphz907k0DpgDI9NgWu8f8TVVda03gSUuIBwrpAe3quLAzjv7xGzY
+ngH0qWkU76Ll3Y4ocuHQybzBGRL4RkeaQWj4xIdioS0t4qpp7lVHx9s77SZDr2y6
+fgnlc26MmhXrQeNgWvjukmR4kfBS4fI5QQHTgpiK46mjlGmnHTuagkZKfm5XBNkh
+8qXB4GiC3T/Qpu01/tlqSNsjH0ySLbP8M8qsFwmQkNTM2NxpZMFth1D/h2GS01/O
+2ctfSfipt6v/5ra1zlDewLOg5YjSFV2jCto4qP9hKUZT1vNsCwrfovXWO1rr6Yri
+v7B3nOw9rdbY0HExne+f9vdQBNJWbsmR6TTl+P83zScPh9jwJ/LJ4FSC9/dZMiFE
+g/kKbLB0IMdWaShGAdGKxZq35P38rMOvIULltnlyEjQBFThUNPFpSi7XklvrRnO3
+vBurOQsVb/KKAJhJ6EZZFBCpiTLX9G9CRpHQL4wpqOTibdzDzFOPgwP9kqK3ztDR
+G6qH63iZ/p9I3s1Gl8i2dOo1zbHgXlHUxoyYK4x4hjA0ZdRsBNRk3/yMbbG0yL1h
+Pms0hGW17e5TaaNltMZSabMtHKnu2cU4cFZfmTosBvWJZ6WymsKjm3Fg5b6P9uRU
+WKnEgMoAKKXuBWHOf/nT3itCkz2ezkfC9BmZng02+1SGr1JZFSg=
+=DDpv
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a99aae6b36a4..e69524458e6e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 12:39:53 +0000
+Wed, 10 Aug 2022 18:39:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 293b429383e2..6a8da7547d52 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Aug 10 12:39:53 PM UTC 2022
+Wed Aug 10 06:39:57 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e861d7366545..da58e455942d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 12:45:01 +0000
+Wed, 10 Aug 2022 18:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index cc0542a8780c..5a25b556921a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0877509414c54a84d3bddbeda4e5b4dc89ccb4ef 1660134587 2022-08-10T12:29:47+00:00
+803681fad8645146939e8333af00d9351ca66f7c 1660153271 2022-08-10T17:41:11+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0f06506222d4..da6836edcd57 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660135201 Wed 10 Aug 2022 12:40:01 PM UTC
+1660156801 Wed 10 Aug 2022 06:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a99aae6b36a4..15dea768782e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 12:39:53 +0000
+Wed, 10 Aug 2022 18:39:57 +0000
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 3971c5dd71f3..f898b92ba288 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 31594af521a7..632d1001d50e 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -3,20 +3,14 @@ AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c73
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kube-apiserver-1.22.10.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
-EBUILD kube-apiserver-1.22.12.ebuild 1017 BLAKE2B f891662b03ea5bdcf7b0455c1013bf51ea916b8d100f16bea54a8734eb3bc3ddf86ea9f947c80be3dd997b713fa3e5b0f687d68ebfc807e6b80c562c1be6601c SHA512 1d2087cc96ad81c431dddb04a484ed2d3d5f10281b48d25f466f10474899780c35697a99bdb32c167182dcec2a5820ff8ead4138cb318aae967a25c39e701e5a
-EBUILD kube-apiserver-1.22.8.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
-EBUILD kube-apiserver-1.23.5.ebuild 991 BLAKE2B ee45da98c6c18e3bf3e979863e01c1401596cf21cf3cc79da20e6ccbdf2f7383b409f571f8cf6a245138dcfd481cf361a789284ef62e59bcb20938e1bdb5d148 SHA512 43091fd9e05355a4063d5133917ec5dade31ac326c0c332afae795b88648cdc3c96944305ff25553312a44ecb785361b1893310686a4e16bb82f218404592815
+EBUILD kube-apiserver-1.22.12.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
 EBUILD kube-apiserver-1.23.7.ebuild 991 BLAKE2B ee45da98c6c18e3bf3e979863e01c1401596cf21cf3cc79da20e6ccbdf2f7383b409f571f8cf6a245138dcfd481cf361a789284ef62e59bcb20938e1bdb5d148 SHA512 43091fd9e05355a4063d5133917ec5dade31ac326c0c332afae795b88648cdc3c96944305ff25553312a44ecb785361b1893310686a4e16bb82f218404592815
-EBUILD kube-apiserver-1.23.9.ebuild 992 BLAKE2B 78848d01aea6d0efb3c42f0af1ef60b6b80e8884fa1c0b3d811ade0dfe3d0552f2adda802eea4478b069323807a96ff915c329a1bd37d60b3d7d87cf63a6ac7a SHA512 13ef47a1f969ac0437f103e04825cbdf5a8951bed255b69199d8270a1f4b42324c2c9c84fdac7466d64f42682ef81fa90256921a58dcfecb5b03257e845498c7
-EBUILD kube-apiserver-1.24.0.ebuild 994 BLAKE2B 0365339fecbc58416819babbbb01b3dec184b7b34164c7b45005921f15a2f4a67216968572e48befcdd6b5f9359d77fabbc29c704642671439d0b52f53e44108 SHA512 4a6af8c8d24e26fecf865dc62786cd2bb44767ab247b9e56fe6a5792ff520303bddae25c7e6e82ae1d0eefb1400715171c7594d53ea7ccb39d74353be1fcf572
+EBUILD kube-apiserver-1.23.9.ebuild 991 BLAKE2B ee45da98c6c18e3bf3e979863e01c1401596cf21cf3cc79da20e6ccbdf2f7383b409f571f8cf6a245138dcfd481cf361a789284ef62e59bcb20938e1bdb5d148 SHA512 43091fd9e05355a4063d5133917ec5dade31ac326c0c332afae795b88648cdc3c96944305ff25553312a44ecb785361b1893310686a4e16bb82f218404592815
 EBUILD kube-apiserver-1.24.1.ebuild 993 BLAKE2B a1c1286df644af89f70d7023ab9033a8ce3e5cd565cfaefcbf59870b5acb242b2d153dad13e54bac53d1c48afdc2dba2c04d7f1b576799fa90508c9731fdcf29 SHA512 e79676ef0d19f4004a7431d5c3abc8cd9f69ac1438cbe429c6a8d1f9d8166119a656bf016fd49e6c4380de5dc55214e4f1b4fa53f3b831a657e731afac218084
-EBUILD kube-apiserver-1.24.3.ebuild 994 BLAKE2B 0365339fecbc58416819babbbb01b3dec184b7b34164c7b45005921f15a2f4a67216968572e48befcdd6b5f9359d77fabbc29c704642671439d0b52f53e44108 SHA512 4a6af8c8d24e26fecf865dc62786cd2bb44767ab247b9e56fe6a5792ff520303bddae25c7e6e82ae1d0eefb1400715171c7594d53ea7ccb39d74353be1fcf572
+EBUILD kube-apiserver-1.24.3.ebuild 993 BLAKE2B a1c1286df644af89f70d7023ab9033a8ce3e5cd565cfaefcbf59870b5acb242b2d153dad13e54bac53d1c48afdc2dba2c04d7f1b576799fa90508c9731fdcf29 SHA512 e79676ef0d19f4004a7431d5c3abc8cd9f69ac1438cbe429c6a8d1f9d8166119a656bf016fd49e6c4380de5dc55214e4f1b4fa53f3b831a657e731afac218084
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.22.12.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.22.12.ebuild
index 19b4da1a49f7..a43f3c267727 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.22.12.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.22.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.22.8.ebuild
deleted file mode 100644
index a43f3c267727..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.22.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.23.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.23.5.ebuild
deleted file mode 100644
index 5fb6d6b47274..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.23.5.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
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild
index a7400f70bdbe..5fb6d6b47274 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.24.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.24.0.ebuild
deleted file mode 100644
index 4010c16c51d5..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.24.0.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
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild
index 4010c16c51d5..6c3647f71003 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 87696883de67..93198f6ba190 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -3,20 +3,14 @@ AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kube-controller-manager-1.22.10.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
-EBUILD kube-controller-manager-1.22.12.ebuild 1014 BLAKE2B 97c377f2df93c70ff500772c031802d7d5cebbe23a38000829179f6dd35f4352b694a85c2f72d4e752862fe797a6cba8e2c143a7426c235a1a536297d30a6dae SHA512 ef4f30da99afb95c3574abf48c43ffeea20285a8ac9a48556156992df047e8e3480f9a9a9ce1503d720677db42ab754120abfdc43dd2fa01acbfba74c0ce8b11
-EBUILD kube-controller-manager-1.22.8.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
-EBUILD kube-controller-manager-1.23.5.ebuild 988 BLAKE2B 87d2477f6f3dcc1b9b44ced1d69e981fbd21e5cb3e44c10848d8c53c393d82312b26cab030e8afc55be8b01af13160c42f28a52751e69b70d44dc7d00e4bfe53 SHA512 aa70cb437ed4cebfe426c899a4c80d5426df0ff733e5e633ce1986b8a6fbad3453058f42655f0cd03284837adc8eae7951ccc3cb735c1faa449a63905b6a2477
+EBUILD kube-controller-manager-1.22.12.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
 EBUILD kube-controller-manager-1.23.7.ebuild 988 BLAKE2B 87d2477f6f3dcc1b9b44ced1d69e981fbd21e5cb3e44c10848d8c53c393d82312b26cab030e8afc55be8b01af13160c42f28a52751e69b70d44dc7d00e4bfe53 SHA512 aa70cb437ed4cebfe426c899a4c80d5426df0ff733e5e633ce1986b8a6fbad3453058f42655f0cd03284837adc8eae7951ccc3cb735c1faa449a63905b6a2477
-EBUILD kube-controller-manager-1.23.9.ebuild 989 BLAKE2B 6502e890aa70159eed88ed4d79d0ae176355ce33fea5e47fa87986769586abc5fc9d1a220b1b79116e25bc8f66bf1ae0765f18b731159c94ea7692913591127a SHA512 207f261358a494ce4d6a7b8d1805157fab087b6eadbd04122fbd40482112276e22e180314740e520707c176d5c2c1aaa57e8752a447ef5b35115d2da28941d17
-EBUILD kube-controller-manager-1.24.0.ebuild 991 BLAKE2B 111b237cba0d979e2ab42e25dfcdd99c24f35aa7bdd34a8fa452721476c6d0a5efa4c20f41d6138a8514c02e96be6a75904a28a741f4ca75581138c9dff3ee5e SHA512 375680a8fa40c07fb906d2df6ba8463cf0bf2a2871b59666bb3df0b941ccf6038f6ff986aac31e82c514b98487649c1a802c662b89032ca1ed49807807fc7f66
+EBUILD kube-controller-manager-1.23.9.ebuild 988 BLAKE2B 87d2477f6f3dcc1b9b44ced1d69e981fbd21e5cb3e44c10848d8c53c393d82312b26cab030e8afc55be8b01af13160c42f28a52751e69b70d44dc7d00e4bfe53 SHA512 aa70cb437ed4cebfe426c899a4c80d5426df0ff733e5e633ce1986b8a6fbad3453058f42655f0cd03284837adc8eae7951ccc3cb735c1faa449a63905b6a2477
 EBUILD kube-controller-manager-1.24.1.ebuild 990 BLAKE2B b2e9ba94485dabf41608df895ea0e37bd2c128768cd4102b8a68a5dcd0d73fa0f1c3d3b9341fcdb340e33587475941f707f45a35b7fa85600765e0361cad287e SHA512 eae86891024b243e3d74f83df46edbeb205a03c696563d5b86269c75dd6fa1cfbc245c377719c7167619822a3dc06fdb7f5ae60b8bb33620c65f993c215d362b
-EBUILD kube-controller-manager-1.24.3.ebuild 991 BLAKE2B 111b237cba0d979e2ab42e25dfcdd99c24f35aa7bdd34a8fa452721476c6d0a5efa4c20f41d6138a8514c02e96be6a75904a28a741f4ca75581138c9dff3ee5e SHA512 375680a8fa40c07fb906d2df6ba8463cf0bf2a2871b59666bb3df0b941ccf6038f6ff986aac31e82c514b98487649c1a802c662b89032ca1ed49807807fc7f66
+EBUILD kube-controller-manager-1.24.3.ebuild 990 BLAKE2B b2e9ba94485dabf41608df895ea0e37bd2c128768cd4102b8a68a5dcd0d73fa0f1c3d3b9341fcdb340e33587475941f707f45a35b7fa85600765e0361cad287e SHA512 eae86891024b243e3d74f83df46edbeb205a03c696563d5b86269c75dd6fa1cfbc245c377719c7167619822a3dc06fdb7f5ae60b8bb33620c65f993c215d362b
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.12.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.12.ebuild
index 3611bae7ae46..2e2307593ee7 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.12.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.8.ebuild
deleted file mode 100644
index 2e2307593ee7..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.5.ebuild
deleted file mode 100644
index 6b3568782a04..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild
index 8a6411803c93..6b3568782a04 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.0.ebuild
deleted file mode 100644
index 492d28a5d90e..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild
index 492d28a5d90e..7cb5f5ddc809 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 13e99ed6b577..07a920c1d597 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -3,20 +3,14 @@ AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe46
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kube-proxy-1.22.10.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
-EBUILD kube-proxy-1.22.12.ebuild 929 BLAKE2B e7cf539cc2ae4e8f47ad785b6c720f66ae3e1dee7fce5f93f104566ebff9ee012f3b6d0623ea56261ff2f923bebdf6f71cc14c68406c9643d5875fd305d3e4b5 SHA512 49859b7ddd88894471d9e58b98455af9f93469a03eb4c40a1e73f113deb684706d69eeb79e06316ee9968af584b558e2cf7a6b908831b71b341492b11889b7d3
-EBUILD kube-proxy-1.22.8.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
-EBUILD kube-proxy-1.23.5.ebuild 903 BLAKE2B 6af6c1be968999dd8b76cd9a7036137d8be4c72c0516ce89f512f13eb3fc2186e34fc74d090fc5d34f285e2ca6f822382b6194ef1e80238ee23c7be1b10f6df9 SHA512 6f3a8e41e2505e752c4a0fbde6a93801db713a500903882f17c4001443a878c61087db361686a89afe529bb43d50e626343cac75c18f5c577b0e12ed582ab12a
+EBUILD kube-proxy-1.22.12.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
 EBUILD kube-proxy-1.23.7.ebuild 903 BLAKE2B 6af6c1be968999dd8b76cd9a7036137d8be4c72c0516ce89f512f13eb3fc2186e34fc74d090fc5d34f285e2ca6f822382b6194ef1e80238ee23c7be1b10f6df9 SHA512 6f3a8e41e2505e752c4a0fbde6a93801db713a500903882f17c4001443a878c61087db361686a89afe529bb43d50e626343cac75c18f5c577b0e12ed582ab12a
-EBUILD kube-proxy-1.23.9.ebuild 904 BLAKE2B 3630914e093e3f07eaaaa9e7d9a2bb7706810d3fc9b13843d9caf7dae3baa29fe25b2d1b0fa97545cf074cc56bf59bcfdc2595926fd1785cb93efaa2f4743234 SHA512 1a1a893b9f33407cceecd7e5e06fc9f1baf6e76a2831029b3d7d6743b1090b6c73ab96061e74d54f0f4fd5771b65f6891c58f67ff737ffd52f349edb5ef5f155
-EBUILD kube-proxy-1.24.0.ebuild 906 BLAKE2B b15e95243cd35fb900d792f9be7be136fed833eb8d09112cb71206ccde67cdd88c50a7c52cee398afaf3e902974a539ae73ac2029f56910d2b65f702fadfdf61 SHA512 5d0ec68ee23b1138ea859ba0db48902f65a7568e7ab99b3da59922ac7c428850373f82677a9948791f08802e14c1461c069c704643578dcb92114468a046e43e
+EBUILD kube-proxy-1.23.9.ebuild 903 BLAKE2B 6af6c1be968999dd8b76cd9a7036137d8be4c72c0516ce89f512f13eb3fc2186e34fc74d090fc5d34f285e2ca6f822382b6194ef1e80238ee23c7be1b10f6df9 SHA512 6f3a8e41e2505e752c4a0fbde6a93801db713a500903882f17c4001443a878c61087db361686a89afe529bb43d50e626343cac75c18f5c577b0e12ed582ab12a
 EBUILD kube-proxy-1.24.1.ebuild 905 BLAKE2B 38437dace1ad859f1d0071440672f140b57a025e51b0f6cd48c7bf3f8541a2c310927b212462f0ed3f4987d55c6b734ec272905b044909d6f50fa0ccd0552a49 SHA512 d7fd98864877ebe1e4362801c0a0d14799396241d65a0db7d4189023ed4d41d61b7f1b044761aa8a4e28a51096d76eb48fc06eb4abb4a6c8985a46b633280016
-EBUILD kube-proxy-1.24.3.ebuild 906 BLAKE2B b15e95243cd35fb900d792f9be7be136fed833eb8d09112cb71206ccde67cdd88c50a7c52cee398afaf3e902974a539ae73ac2029f56910d2b65f702fadfdf61 SHA512 5d0ec68ee23b1138ea859ba0db48902f65a7568e7ab99b3da59922ac7c428850373f82677a9948791f08802e14c1461c069c704643578dcb92114468a046e43e
+EBUILD kube-proxy-1.24.3.ebuild 905 BLAKE2B 38437dace1ad859f1d0071440672f140b57a025e51b0f6cd48c7bf3f8541a2c310927b212462f0ed3f4987d55c6b734ec272905b044909d6f50fa0ccd0552a49 SHA512 d7fd98864877ebe1e4362801c0a0d14799396241d65a0db7d4189023ed4d41d61b7f1b044761aa8a4e28a51096d76eb48fc06eb4abb4a6c8985a46b633280016
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.22.12.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.22.12.ebuild
index 866b8b777f1f..5cb1f41bbeab 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.22.12.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.22.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.22.8.ebuild
deleted file mode 100644
index 5cb1f41bbeab..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.22.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.23.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.23.5.ebuild
deleted file mode 100644
index d0b34277f839..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.23.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild
index 2193eb857e81..d0b34277f839 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.24.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.24.0.ebuild
deleted file mode 100644
index 9073ae83aebc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.24.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild
index 9073ae83aebc..c71a00eedf48 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index c24ba38cd496..59423e8b638d 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -3,20 +3,14 @@ AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559f
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kube-scheduler-1.22.10.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
-EBUILD kube-scheduler-1.22.12.ebuild 987 BLAKE2B 152ac5b31334c12ca7a7cdcdae627ea8d00b8e1f118044b33bc59a430d64c9ed46d8231a2d6afcbae9ebf190730533cd405f1bda5661230689a4d1cbb264993f SHA512 ff649c406b4d0da1223c0b0e3611a1fc6570cf78901cd766352b3db0f430eea7a1471de6315b4ba1eabaa515deb4600800ad27ca04997706da4097c57d574e9b
-EBUILD kube-scheduler-1.22.8.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
-EBUILD kube-scheduler-1.23.5.ebuild 961 BLAKE2B 833f5fcd8ed332afd7e503ac7fde09828ce18565ebf9c98d43356790bf79d985d6f6de1d682e371cceca717a593a10bc85e266c141ea20725cb57f6c6e34b26f SHA512 6d9ad34d6bb8a1a3a3a88576ef3ffa6129317ce5f9ad3bf7a9574414d3ace6a207f92324387f8fd9a1506a15cdeae09d5a2d30c9138a0fcc555d70513c6da120
+EBUILD kube-scheduler-1.22.12.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
 EBUILD kube-scheduler-1.23.7.ebuild 961 BLAKE2B 833f5fcd8ed332afd7e503ac7fde09828ce18565ebf9c98d43356790bf79d985d6f6de1d682e371cceca717a593a10bc85e266c141ea20725cb57f6c6e34b26f SHA512 6d9ad34d6bb8a1a3a3a88576ef3ffa6129317ce5f9ad3bf7a9574414d3ace6a207f92324387f8fd9a1506a15cdeae09d5a2d30c9138a0fcc555d70513c6da120
-EBUILD kube-scheduler-1.23.9.ebuild 962 BLAKE2B ebc2aeda907841925e5c217a07407dddac04b82f46271387b1403486b870d95d42d40c4107da9741a7325efa812efecf4cbe771697071ad3e6639f5136631d9a SHA512 0b9cef2e337d0c0af9bd3b2f2e4131d434423724f27fed7992df106bde8e7c788cc5a207b0ef97c7e6ae9d5c50e0fe54c06876a1b24d89e184beb90feca17fbe
-EBUILD kube-scheduler-1.24.0.ebuild 964 BLAKE2B c9d6ce2d76b582df1fe639d31a045ceac568478eb20ba1ddfdbab0449e9b53c8ed62855a5678367f3fb07079e5fbc18799d3271e60a37c7d10be2e8d8ba37f3f SHA512 82c646d2f5278f388c9269e384be9fc5ee59b6b432e2eb48445347e12fd48028c478940e9373aa555ccba1b702291671c7cdcbdb90e223154b92eb3cd90f6552
+EBUILD kube-scheduler-1.23.9.ebuild 961 BLAKE2B 833f5fcd8ed332afd7e503ac7fde09828ce18565ebf9c98d43356790bf79d985d6f6de1d682e371cceca717a593a10bc85e266c141ea20725cb57f6c6e34b26f SHA512 6d9ad34d6bb8a1a3a3a88576ef3ffa6129317ce5f9ad3bf7a9574414d3ace6a207f92324387f8fd9a1506a15cdeae09d5a2d30c9138a0fcc555d70513c6da120
 EBUILD kube-scheduler-1.24.1.ebuild 963 BLAKE2B 81cb462597c2f4ead1eaf7eb5685ff200fbc6e7084ff171f3b471aeb41446de2a1566712aac755b482838007f929cad652bf1a715ff7639c3197d35cfa5d1c57 SHA512 8c882cab899db965a73ee86d0e5605adffe2dea197fe11e54705c93ded70cdaff0afaf393d845bc39dcdfb948bc08d000e86970fd083a539ba2122098ab6e228
-EBUILD kube-scheduler-1.24.3.ebuild 964 BLAKE2B c9d6ce2d76b582df1fe639d31a045ceac568478eb20ba1ddfdbab0449e9b53c8ed62855a5678367f3fb07079e5fbc18799d3271e60a37c7d10be2e8d8ba37f3f SHA512 82c646d2f5278f388c9269e384be9fc5ee59b6b432e2eb48445347e12fd48028c478940e9373aa555ccba1b702291671c7cdcbdb90e223154b92eb3cd90f6552
+EBUILD kube-scheduler-1.24.3.ebuild 963 BLAKE2B 81cb462597c2f4ead1eaf7eb5685ff200fbc6e7084ff171f3b471aeb41446de2a1566712aac755b482838007f929cad652bf1a715ff7639c3197d35cfa5d1c57 SHA512 8c882cab899db965a73ee86d0e5605adffe2dea197fe11e54705c93ded70cdaff0afaf393d845bc39dcdfb948bc08d000e86970fd083a539ba2122098ab6e228
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.22.12.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.22.12.ebuild
index 6deafd6db8c6..992ec024d537 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.22.12.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.22.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.22.8.ebuild
deleted file mode 100644
index 992ec024d537..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.22.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.23.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.23.5.ebuild
deleted file mode 100644
index 446310121794..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.23.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild
index 393cef8175ab..446310121794 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.24.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.24.0.ebuild
deleted file mode 100644
index 0644cbea3c98..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.24.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild
index 0644cbea3c98..825dcd92ae76 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 59b71004eb35..f0c3ed92e0cb 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,19 +1,13 @@
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kubeadm-1.22.10.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
-EBUILD kubeadm-1.22.12.ebuild 912 BLAKE2B 7548d6905fd17d946d2d4e974229257aac34a826728c50d113ebff6a5d9758fe2f92c1388b6ed344056435f1af1563311f0c3e185d0aef4318cb1ba3167276c1 SHA512 094215e91d4681b9be05d3c67426e99f3a7bd6e7ffb34ee5c7a3fac96907c06f34dcb492d09dbaec7a045b2c13a66aef699ed0308fdf12dc6d1196a7bf7b01d0
-EBUILD kubeadm-1.22.8.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
-EBUILD kubeadm-1.23.5.ebuild 877 BLAKE2B 2c27ca601ccb9c9498cc2f3dcbc242e38946275232eaba4cc35d56a0edba48ecb7bdbd36d8de59a76bc36e5854c4f8f46957f2160bf96c41a80be731f104f00d SHA512 d02b2409d74052608b3150db41a3b77e8bf0cebb6398c2a4e51034304b28875ddb22bb7a21a61338bb09cacb930523444e5e25ae941a38ad6fb100cafb94397a
+EBUILD kubeadm-1.22.12.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
 EBUILD kubeadm-1.23.7.ebuild 877 BLAKE2B 2c27ca601ccb9c9498cc2f3dcbc242e38946275232eaba4cc35d56a0edba48ecb7bdbd36d8de59a76bc36e5854c4f8f46957f2160bf96c41a80be731f104f00d SHA512 d02b2409d74052608b3150db41a3b77e8bf0cebb6398c2a4e51034304b28875ddb22bb7a21a61338bb09cacb930523444e5e25ae941a38ad6fb100cafb94397a
-EBUILD kubeadm-1.23.9.ebuild 878 BLAKE2B 2278f6ff3cd15b03d5fafd5d5e03e6a565666171533c849750fbabee73e9300e29a4b3b80d213e0ca05ed43854f3b3444579d4da6081c40f09aa7633cb3d97f7 SHA512 b9c84df0bac044457c6cc1db5e745955349b2e035ae49ec91ea7f2f478eb2d40e0d904238ca0f2a4307eea0c2e59410c26935b7f52c72a5f45a819983493e0ad
-EBUILD kubeadm-1.24.0.ebuild 880 BLAKE2B a13ac00b8f2141c0d9829cad0f519e30330b6ebdd58783ffeffcc3f9ba73f613fa5c083599c116fc048951c3e71f05fcaee0b01c064152b144a9a56cbfc471c0 SHA512 2f43c723dc4f8e99e690fdfb788293a197dce92017a7a2bfaaa29bea0b47ede3cd6a397d122fcb0c2cdb80059299920c1ca99c60e59d5b2ef6cb11d4031224b1
+EBUILD kubeadm-1.23.9.ebuild 877 BLAKE2B 2c27ca601ccb9c9498cc2f3dcbc242e38946275232eaba4cc35d56a0edba48ecb7bdbd36d8de59a76bc36e5854c4f8f46957f2160bf96c41a80be731f104f00d SHA512 d02b2409d74052608b3150db41a3b77e8bf0cebb6398c2a4e51034304b28875ddb22bb7a21a61338bb09cacb930523444e5e25ae941a38ad6fb100cafb94397a
 EBUILD kubeadm-1.24.1.ebuild 879 BLAKE2B bbf1734ee70deee6e3f279da38e83f60e616dc02b432c60c272149617c346fcb352ae01c36b22fc8b394a57a1367590b97540bf3f94beebcd2acc53112bf52af SHA512 cae05e44f0cd285b606afd1231337c3a9b9f8659ed9aaa3b8e4121b6db9913ed90baf9e5cc3dc09d884bc7f031e1552ebb7df9c7fc4e936ab9278b3fc5b5e556
-EBUILD kubeadm-1.24.3.ebuild 880 BLAKE2B a13ac00b8f2141c0d9829cad0f519e30330b6ebdd58783ffeffcc3f9ba73f613fa5c083599c116fc048951c3e71f05fcaee0b01c064152b144a9a56cbfc471c0 SHA512 2f43c723dc4f8e99e690fdfb788293a197dce92017a7a2bfaaa29bea0b47ede3cd6a397d122fcb0c2cdb80059299920c1ca99c60e59d5b2ef6cb11d4031224b1
+EBUILD kubeadm-1.24.3.ebuild 879 BLAKE2B bbf1734ee70deee6e3f279da38e83f60e616dc02b432c60c272149617c346fcb352ae01c36b22fc8b394a57a1367590b97540bf3f94beebcd2acc53112bf52af SHA512 cae05e44f0cd285b606afd1231337c3a9b9f8659ed9aaa3b8e4121b6db9913ed90baf9e5cc3dc09d884bc7f031e1552ebb7df9c7fc4e936ab9278b3fc5b5e556
 MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3
diff --git a/sys-cluster/kubeadm/kubeadm-1.22.12.ebuild b/sys-cluster/kubeadm/kubeadm-1.22.12.ebuild
index 654b067fe403..7ce55220d46f 100644
--- a/sys-cluster/kubeadm/kubeadm-1.22.12.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.22.8.ebuild b/sys-cluster/kubeadm/kubeadm-1.22.8.ebuild
deleted file mode 100644
index 7ce55220d46f..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.22.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.23.5.ebuild b/sys-cluster/kubeadm/kubeadm-1.23.5.ebuild
deleted file mode 100644
index 0789de0b701a..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.23.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.23.9.ebuild b/sys-cluster/kubeadm/kubeadm-1.23.9.ebuild
index bcdb2bea7e7d..0789de0b701a 100644
--- a/sys-cluster/kubeadm/kubeadm-1.23.9.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubeadm/kubeadm-1.24.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.24.0.ebuild
deleted file mode 100644
index 0bc4d23fc42c..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.24.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.24.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.24.3.ebuild
index 0bc4d23fc42c..b616b259fd08 100644
--- a/sys-cluster/kubeadm/kubeadm-1.24.3.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index e68602f90989..b0b0ba3fe5a8 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,19 +1,13 @@
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kubectl-1.22.10.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
-EBUILD kubectl-1.22.12.ebuild 907 BLAKE2B 999827e20b71b48c7bd7b18a4a42e7c9fd3e518330e5a47341f3b0801989c2febc2118500fc4441c9cb4e7ba82bee6981b9a3c57e653e6ca83d13b459f5590d3 SHA512 3a37997bcbb018485e0d09c0236f95242092a0dfad1717d72cdc4a9ad65ee7290b31faf0d6e6b837476bc6f3c0cc73ce193e20ec2f3fdb2c112b35857a2b760e
-EBUILD kubectl-1.22.8.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
-EBUILD kubectl-1.23.5.ebuild 873 BLAKE2B 92dd69326d788658c1c9d7ce0800f1762459ed06bda11aacbae11fb7e8babfa447f72d30749458630e44f0413d18f5e928799097cfb7585a97ffc52fd4b0f6ac SHA512 bdedaf5eaf161a6ee62aec1a2777d9b2a228b3ba6c2b232f4a1ecd9c11caa9b5b2ff65cf4c8fefc2f1afb146abb13501c42e148c02e44d695a734178aabe99a7
+EBUILD kubectl-1.22.12.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
 EBUILD kubectl-1.23.7.ebuild 873 BLAKE2B 92dd69326d788658c1c9d7ce0800f1762459ed06bda11aacbae11fb7e8babfa447f72d30749458630e44f0413d18f5e928799097cfb7585a97ffc52fd4b0f6ac SHA512 bdedaf5eaf161a6ee62aec1a2777d9b2a228b3ba6c2b232f4a1ecd9c11caa9b5b2ff65cf4c8fefc2f1afb146abb13501c42e148c02e44d695a734178aabe99a7
-EBUILD kubectl-1.23.9.ebuild 874 BLAKE2B f8edcff235a13dab9ff396b87d207ef4d829ac54213b312621f4f3d9da9e76828af7bbf2ba312ebc8255764568591775501478cdba4533cb6c3f3bbcd6ef47bd SHA512 21c7c81aa7ec98429c6cf6d993ee7ed90380e0f8a32799c66dc80e40d9a3a7b4d7a3612edb1673ce99f1fea6e9f04e0b9bbcffccb73f78f72f261127556cac9e
-EBUILD kubectl-1.24.0.ebuild 876 BLAKE2B 6bd715af975a6a28bff9df5d3e28506d7309751d0031a7091f230d4e65de3d0a0cb7b6672f992d9fdf381a4c7354ce45331654fa79264c76366e9a6f371ac33e SHA512 9a2e3ae147f1643386e0d43362bd1876b374bca199c36cc890baeb111a7ca0af7e2c9098edffaeb2738e53322431b9635b94883f7fecdaad0ac29c2bd335f6e0
+EBUILD kubectl-1.23.9.ebuild 873 BLAKE2B 92dd69326d788658c1c9d7ce0800f1762459ed06bda11aacbae11fb7e8babfa447f72d30749458630e44f0413d18f5e928799097cfb7585a97ffc52fd4b0f6ac SHA512 bdedaf5eaf161a6ee62aec1a2777d9b2a228b3ba6c2b232f4a1ecd9c11caa9b5b2ff65cf4c8fefc2f1afb146abb13501c42e148c02e44d695a734178aabe99a7
 EBUILD kubectl-1.24.1.ebuild 875 BLAKE2B fdf10d1e8ae1aea685425639eebbef4576f17afe6e55a4f26e51f7d6d058987e606097a3cb1d704826f7fd258cd6f4491340867b8f39bcafdfebc762dad4a8cd SHA512 b18e3add6afa37d1b5b8b248d67cce2af2f17faa78f649d670582a252d64cba44a2cd67f7ebe1968f4d108698518fffd478c8c2cce1859a747a35ea39e538340
-EBUILD kubectl-1.24.3.ebuild 876 BLAKE2B 6bd715af975a6a28bff9df5d3e28506d7309751d0031a7091f230d4e65de3d0a0cb7b6672f992d9fdf381a4c7354ce45331654fa79264c76366e9a6f371ac33e SHA512 9a2e3ae147f1643386e0d43362bd1876b374bca199c36cc890baeb111a7ca0af7e2c9098edffaeb2738e53322431b9635b94883f7fecdaad0ac29c2bd335f6e0
+EBUILD kubectl-1.24.3.ebuild 875 BLAKE2B fdf10d1e8ae1aea685425639eebbef4576f17afe6e55a4f26e51f7d6d058987e606097a3cb1d704826f7fd258cd6f4491340867b8f39bcafdfebc762dad4a8cd SHA512 b18e3add6afa37d1b5b8b248d67cce2af2f17faa78f649d670582a252d64cba44a2cd67f7ebe1968f4d108698518fffd478c8c2cce1859a747a35ea39e538340
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubectl/kubectl-1.22.12.ebuild b/sys-cluster/kubectl/kubectl-1.22.12.ebuild
index f480c2f82844..1bc008b30c4a 100644
--- a/sys-cluster/kubectl/kubectl-1.22.12.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 DEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.22.8.ebuild b/sys-cluster/kubectl/kubectl-1.22.8.ebuild
deleted file mode 100644
index 1bc008b30c4a..000000000000
--- a/sys-cluster/kubectl/kubectl-1.22.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-DEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.23.5.ebuild b/sys-cluster/kubectl/kubectl-1.23.5.ebuild
deleted file mode 100644
index 619b0c541831..000000000000
--- a/sys-cluster/kubectl/kubectl-1.23.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.23.9.ebuild b/sys-cluster/kubectl/kubectl-1.23.9.ebuild
index 93befd485395..619b0c541831 100644
--- a/sys-cluster/kubectl/kubectl-1.23.9.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubectl/kubectl-1.24.0.ebuild b/sys-cluster/kubectl/kubectl-1.24.0.ebuild
deleted file mode 100644
index 375df35b0a71..000000000000
--- a/sys-cluster/kubectl/kubectl-1.24.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.24.3.ebuild b/sys-cluster/kubectl/kubectl-1.24.3.ebuild
index 375df35b0a71..bc629ac72555 100644
--- a/sys-cluster/kubectl/kubectl-1.24.3.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 997594bae305..c219c3e66c37 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -5,20 +5,14 @@ AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba8320
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.12.tar.gz 36092785 BLAKE2B dc6427905469afee9d18b83f725a58a3f78d40f9fc1f4128e3105a0547df91d8b04500c507b21b43efba9358c012652b62c747d4f6ad3c4c442cca2a0093c897 SHA512 a024b652fd47e2e23890ae1509314456cb0abd96d3619054da18b8264e4f9da3a00278e1a4ab5b342aa7e80fbe637b4fb4d3053b8f999d4246bb1699ac145633
-DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
 DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.23.9.tar.gz 38225608 BLAKE2B f657a2ed9df4a45f360f90e7dbea5c04c9ff536ffb08c53797d5745f3b18468041374910525995a8ae45e31add799ce863c2912892333a84197e6bf0e733dda2 SHA512 e5e46e68c90f6374e4b97424b088ed5b3d494a60bfd753a88cafed59d51d6696260d2be279631eab52f73b9f5444511609aaf950c51c73dfc77cba174943f37f
-DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
 DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 DIST kubernetes-1.24.3.tar.gz 37961140 BLAKE2B 663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd SHA512 21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105
 EBUILD kubelet-1.22.10.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
-EBUILD kubelet-1.22.12.ebuild 1004 BLAKE2B 3df4d1079ca82c4e80a182230735e807b741bcf0cba6ceb9277c4126b62378e49ee6acb40145553b61f773139c0427a0078d516d56752ad6320716418177bf7f SHA512 7719010c913ef05977a61e1e5bad258eb1f891a1c511a39d8d89e15df2a31c2e718c695d2e6864fdd4a1e6513587f025fc2dddae40ef32cf050b8c7370de48b8
-EBUILD kubelet-1.22.8.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
-EBUILD kubelet-1.23.5.ebuild 969 BLAKE2B 1aa00967d2b13a6607ca139498c8772385c8fae93c086c9128ea1968bb3ad61b40a63831f27718a7fe43eff8d5f52dc8001a5c7301d0146f327918fa05f53d2a SHA512 2a483fe573fa549b7a1886e2757e368b874d602027a7ed844602bad71b64c4ccb9171a74343e1950049d3640bc78f698c6c6063b75b7912927b02e69ca6aa9e6
+EBUILD kubelet-1.22.12.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
 EBUILD kubelet-1.23.7.ebuild 969 BLAKE2B 1aa00967d2b13a6607ca139498c8772385c8fae93c086c9128ea1968bb3ad61b40a63831f27718a7fe43eff8d5f52dc8001a5c7301d0146f327918fa05f53d2a SHA512 2a483fe573fa549b7a1886e2757e368b874d602027a7ed844602bad71b64c4ccb9171a74343e1950049d3640bc78f698c6c6063b75b7912927b02e69ca6aa9e6
-EBUILD kubelet-1.23.9.ebuild 970 BLAKE2B fc431b0d0543d2a6d8a0a38aea43443a218437dea52c2e5719e9b21266a648137a27acaf4dacc4ca3ff1e575e62f13b80a0d67c17e80a12135e0685c99ada902 SHA512 b868d712bfa9a549eac6b3836c6d6c6f8fee039fd74b735bb37dbd0dc2d49987ac40b927f93b08425a9b67b710a4bc38a062a1472e5334cd4ad7cc63294d51ac
-EBUILD kubelet-1.24.0.ebuild 972 BLAKE2B d073eb7e7f1009b5c1ceb372bc6e40c84805d633a543154f04e6f56fbfc1f641e678ced0711ad35467df86fe0ad2d41b7b7199ee7345df19c303350cfa9800ec SHA512 ce266a3e4b72b5a0ed6ebfe120c323e9489cb6ba95888edeb3e447c0d5a7c4fb124b6397f922dd8f441c55c96cf76f651808cfc16dceda2d8b9c210f64f66834
+EBUILD kubelet-1.23.9.ebuild 969 BLAKE2B 1aa00967d2b13a6607ca139498c8772385c8fae93c086c9128ea1968bb3ad61b40a63831f27718a7fe43eff8d5f52dc8001a5c7301d0146f327918fa05f53d2a SHA512 2a483fe573fa549b7a1886e2757e368b874d602027a7ed844602bad71b64c4ccb9171a74343e1950049d3640bc78f698c6c6063b75b7912927b02e69ca6aa9e6
 EBUILD kubelet-1.24.1.ebuild 971 BLAKE2B a79899c59bf5c31ed15b98512e5868a7d11da802ec23517e08833c99470a11ee13db4dd119e369183b9713e83ea41fc6d1ecb853cc0d622967329fb94ccbdec9 SHA512 f5f5a0ecc9379a7062d9f275e7704e1887aeb59ecd235eacb6962ae393456b0c1f81a0f5cbf44246360e33e26ee033a7ebce2919b744ce8c927c4a1f7475b1eb
-EBUILD kubelet-1.24.3.ebuild 972 BLAKE2B d073eb7e7f1009b5c1ceb372bc6e40c84805d633a543154f04e6f56fbfc1f641e678ced0711ad35467df86fe0ad2d41b7b7199ee7345df19c303350cfa9800ec SHA512 ce266a3e4b72b5a0ed6ebfe120c323e9489cb6ba95888edeb3e447c0d5a7c4fb124b6397f922dd8f441c55c96cf76f651808cfc16dceda2d8b9c210f64f66834
+EBUILD kubelet-1.24.3.ebuild 971 BLAKE2B a79899c59bf5c31ed15b98512e5868a7d11da802ec23517e08833c99470a11ee13db4dd119e369183b9713e83ea41fc6d1ecb853cc0d622967329fb94ccbdec9 SHA512 f5f5a0ecc9379a7062d9f275e7704e1887aeb59ecd235eacb6962ae393456b0c1f81a0f5cbf44246360e33e26ee033a7ebce2919b744ce8c927c4a1f7475b1eb
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubelet/kubelet-1.22.12.ebuild b/sys-cluster/kubelet/kubelet-1.22.12.ebuild
index 3dc412ebab17..dff62dcd892d 100644
--- a/sys-cluster/kubelet/kubelet-1.22.12.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.22.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.22.8.ebuild b/sys-cluster/kubelet/kubelet-1.22.8.ebuild
deleted file mode 100644
index dff62dcd892d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.22.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.23.5.ebuild b/sys-cluster/kubelet/kubelet-1.23.5.ebuild
deleted file mode 100644
index 1460ed4513e3..000000000000
--- a/sys-cluster/kubelet/kubelet-1.23.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.17"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.23.9.ebuild b/sys-cluster/kubelet/kubelet-1.23.9.ebuild
index ecbeff2f53f1..1460ed4513e3 100644
--- a/sys-cluster/kubelet/kubelet-1.23.9.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.23.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.17"
diff --git a/sys-cluster/kubelet/kubelet-1.24.0.ebuild b/sys-cluster/kubelet/kubelet-1.24.0.ebuild
deleted file mode 100644
index e4341ebfaa6b..000000000000
--- a/sys-cluster/kubelet/kubelet-1.24.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.24.3.ebuild b/sys-cluster/kubelet/kubelet-1.24.3.ebuild
index e4341ebfaa6b..e27cd329b9b4 100644
--- a/sys-cluster/kubelet/kubelet-1.24.3.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.24.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 035a3652f200..3aefaef8d6c3 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index d57a7fcaf206..3b7ef791c9df 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -1,3 +1,4 @@
+AUX 50binutils-gentoo.el 142 BLAKE2B 2101b53bb85e33b34b807cd3483979db3466e1a4d804f274d086b7975f7c437df731e922a706d03921f5e838524d126098462fd29f9867cfd863dc85fd83f321 SHA512 c6ff6a3b9ef606368a6b74e38c8d3f030098c6dd619ce1a0b090f5b30b5fc0c35e3567a8af5f12a63611d9fee1d9127fd844b9e3f3cfac8357413dc405955f96
 AUX binutils-2.29.1-nogoldtest.patch 730 BLAKE2B f4f5926511866e58566abc224d2bae1336eb2cbfb63ae6d2a8a3b1f455f24d31fe0ecaee616eb6075712b8d90c40495a639c413c7229c9dfa741a5d284ff2911 SHA512 dd94d947fd25a770990ebc711fba6f680c90677e726f7cdc5435dd121f57e28e3a19343805e514045513bb011094f3a1fe2c4178d1be73e5d38a24abcc2b88e5
 AUX binutils-2.32-gcc-10.patch 321 BLAKE2B a16a525ac14a2ebc5ec8a463370c6917a57835bd8c04599cb880193fc7c3a4569084e9eb206505357f9d73575fe380964fc404171dae7bb1ee53c157bad3e221 SHA512 dc3ef3da32ac58bb0678f49ba3e6c613653113d93dfc3af4541e1808ad92268c62003cae22e0059a8d5d8ba9e27282bca8d59ecca928d7a9f593454d795e54de
 AUX binutils-2.33-gcc-10.patch 815 BLAKE2B 84cf88e34afea70ea3728e2a78f0ba004e24934f57ff53d42694c3fe6f1afd6fb091b70ca114ff539ae6274699f0e3584decbf1355d1d1cd720bb4aca31bcb33 SHA512 8c0cd37738d2d172aadf1df875d028538d9edca35b681d7faa7dc3ab64e2c214d9c33862795a51c0cba9a61aaea9c5bbf5f9f9fb4a01762aa266f32c97eaafbd
@@ -28,7 +29,7 @@ EBUILD binutils-2.35.2.ebuild 12651 BLAKE2B d97d3cfab222e74e94bdc5d462bf95f9d39c
 EBUILD binutils-2.36.1-r2.ebuild 12553 BLAKE2B 8ce3d14f6d7cc81e920f7d5a28875a5bcc45b396169afe5a6e4429849eb9b420977f39fd85487d3ef93a2aef838c6122413b7ef5c9f8c6273d9d1b1bf5b4608a SHA512 53935fec45e8241e73c76be22dde5e9576360cb511642bb5fded59515ea0641cbcb7eb6bd6eef2f30d6d4e940cf1869908c96b194ec1f5e9a016664a5c6cf2eb
 EBUILD binutils-2.37_p1-r2.ebuild 13024 BLAKE2B e67ed4a55a9f07ebd064c82901bc6b5e23933f562c8b6258d32649571f38cbc81061fcb886feaa70619d46d47c52cd701745c173ccf060e47c5cfef2d202a8ca SHA512 480b1921ff344b943b1cf2c1ea9960cd5252f8055a4bffc109f096b038d4d1fc2dd670d696ce7217fd1d827eef5c07cc81c7d0886fc554d939535582d5300f26
 EBUILD binutils-2.38-r1.ebuild 13032 BLAKE2B 23dcf886c2fc5837ad09a69fb5671b65e57cedd0b1275242da32d6fa07ca198ebfc08875f0675193651f33a39b4f872cea46de2953bff94246d5f0db22e20abc SHA512 9fcd78ef633f16e1ecdd5c5ffe68f182e93ad8c2fbbcda8a80d00870b102c4801a65781251ecc623a6f7d42a20d60cb29e88d074d7b8b9a0736e63f252420603
-EBUILD binutils-2.38-r2.ebuild 13403 BLAKE2B 93a4cc53ac967879484b7a6e5ed33b2a188eff6407d4e8dc321f04612b7bf99610cbf8799e878b2763ed3fd7c2313ae87cbafa6d671548ffc4501d21782a51de SHA512 e1116d00b4d7625381d298ee81a92dd123c4d6cf291e72789e4434488a13714646bcefd40b5bb0df00423a4e4960e4b3913d7bf53f0bfb982f159c288889e83c
-EBUILD binutils-2.39.ebuild 13306 BLAKE2B f543f00804b351eab89acf1d9077aa9a95aff44ac4a22b0badeb72f778ccfc086add54d8259b03759bc7d83d13931678add6f0c91b379e182a14bffcd35b1ad9 SHA512 b2266c63bdece82d4929989d0b29e2a2d53d83eef80cff50fb7533f9ba630be5c927590a608c0ebb5109c11d9c64f05bc46846bfb390f61f4fd4b8b0d7f59ade
-EBUILD binutils-9999.ebuild 13287 BLAKE2B a062c840272d6676b2189400c6b975728b72ecba8481c6e0793ca10571f008ecec604d9629a6a54e7d6cc3b1380996b46a3e04baee117597d9d5444862e892bb SHA512 2fcd9c82c259f73ab9e9ed2f369fa6627b7b278fe5ae5487a86ea5922776b0f11cb5bd5e5a86e88b08943ed849d84e3baf0cf3b0133ebe5fa25adcb39b5359fb
+EBUILD binutils-2.38-r2.ebuild 13724 BLAKE2B 85c8c6b7313e1f98c7b57c438dbd8e99e6c944e4f63e3c7fdac05b21a6c3c5baa6afa0d399bdcd63e0204c4645ed5eea5b9d88c82f85f0325dda84cd7f27b28e SHA512 c0e3db18964094ec7b496160e7dcbc0a72c80a1d5a3cc3d8172f537328d456488b19bcfcbc7327cfd7c705262ddb38882ad91d2bdc8395c380bb7547335014dc
+EBUILD binutils-2.39.ebuild 13627 BLAKE2B b2640f5e1d090b5f9b626a84258ea0a4b0e1b2bbd8d07fe5a7d5997184a3c3a4866c2c0d407b67894af53926b85607ab9986b4b7a8e7247eecd4205cbb57dbc1 SHA512 84a2107693d21cae6c79c17238ab68752e709b539d278c9b9ab97b213f65e3c56daf780ea8ece3f319264663ea3ca6b8652181b0f403b016e28d3a943f13e76e
+EBUILD binutils-9999.ebuild 13609 BLAKE2B 27d4f21ae2951cd979db1a9fbd75ea5802bb25467dacf57015bddd7256e115e8d69a6ffbdf5406d18a306dace7ebe6596bcf282415f6864f4bde6087619791af SHA512 7bc7dc9253ac7e1c4952c013b4fdd513be393be2509868e040427b4dbe7e5cad5630052e27cdd0203c8a437a3c21cc20c424da63e15444727e22a5685b9160ec
 MISC metadata.xml 815 BLAKE2B 0d866827f8a6d0244be472dea595d5784ea60464ba361cde9bd062473b5eb19ccecc99bb58729acadd2cfe7dc017cdb2107fc282a31be6ed96c757954e6c9ac0 SHA512 8996f29b159ba483293b8d80eb62372ee0016e817d9ac55b7de9c211aca770b5a05135e705aac108099181d879daf5e22df1facab64bc7765966b3d7e3274e16
diff --git a/sys-devel/binutils/binutils-2.38-r2.ebuild b/sys-devel/binutils/binutils-2.38-r2.ebuild
index 47b5e977cdfd..71cc495774c1 100644
--- a/sys-devel/binutils/binutils-2.38-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.38-r2.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+inherit elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
 LICENSE="GPL-3+"
-IUSE="cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla"
+IUSE="cet default-gold doc emacs +gold multitarget +nls pgo +plugins static-libs test vanilla"
 REQUIRED_USE="default-gold? ( gold )"
 
 # Variables that can be set here  (ignored for live ebuilds)
@@ -52,6 +52,7 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 RDEPEND="
 	>=sys-devel/binutils-config-3
 	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -311,6 +312,8 @@ src_compile() {
 		emake V=1 info
 	fi
 
+	use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
+
 	# we nuke the manpages when we're left with junk
 	# (like when we bootstrap, no perl -> no manpages)
 	find . -name '*.1' -a -size 0 -delete
@@ -403,6 +406,11 @@ src_install() {
 		dodoc opcodes/ChangeLog*
 	fi
 
+	if use emacs ; then
+		elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+
 	# Remove shared info pages
 	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
 
@@ -414,6 +422,8 @@ pkg_postinst() {
 	# Make sure this ${CTARGET} has a binutils version selected
 	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
 	binutils-config ${CTARGET}-${PV}
+
+	use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
@@ -437,6 +447,8 @@ pkg_postrm() {
 	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
 		binutils-config ${CTARGET}-${PV}
 	fi
+
+	use emacs && elisp-site-regen
 }
 
 # Note [slotting support]
diff --git a/sys-devel/binutils/binutils-2.39.ebuild b/sys-devel/binutils/binutils-2.39.ebuild
index 3b954f859b3a..3cc9c5cdcc87 100644
--- a/sys-devel/binutils/binutils-2.39.ebuild
+++ b/sys-devel/binutils/binutils-2.39.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+inherit elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
 LICENSE="GPL-3+"
-IUSE="cet default-gold doc gold multitarget +nls pgo +plugins static-libs test vanilla"
+IUSE="cet default-gold doc emacs gold multitarget +nls pgo +plugins static-libs test vanilla"
 REQUIRED_USE="default-gold? ( gold )"
 
 # Variables that can be set here  (ignored for live ebuilds)
@@ -54,6 +54,7 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 RDEPEND="
 	>=sys-devel/binutils-config-3
 	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -316,6 +317,8 @@ src_compile() {
 		emake V=1 info
 	fi
 
+	use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
+
 	# we nuke the manpages when we're left with junk
 	# (like when we bootstrap, no perl -> no manpages)
 	find . -name '*.1' -a -size 0 -delete
@@ -417,6 +420,11 @@ src_install() {
 		dodoc opcodes/ChangeLog*
 	fi
 
+	if use emacs ; then
+		elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+
 	# Remove shared info pages
 	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
 
@@ -428,6 +436,8 @@ pkg_postinst() {
 	# Make sure this ${CTARGET} has a binutils version selected
 	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
 	binutils-config ${CTARGET}-${PV}
+
+	use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
@@ -451,6 +461,8 @@ pkg_postrm() {
 	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
 		binutils-config ${CTARGET}-${PV}
 	fi
+
+	use emacs && elisp-site-regen
 }
 
 # Note [slotting support]
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index d19bdb17825d..c3d9de773f3a 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+inherit elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
 LICENSE="GPL-3+"
-IUSE="cet default-gold doc gold multitarget +nls pgo +plugins static-libs test vanilla"
+IUSE="cet default-gold doc emacs +gold multitarget +nls pgo +plugins static-libs test vanilla"
 REQUIRED_USE="default-gold? ( gold )"
 
 # Variables that can be set here  (ignored for live ebuilds)
@@ -53,6 +53,7 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 RDEPEND="
 	>=sys-devel/binutils-config-3
 	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -315,6 +316,8 @@ src_compile() {
 		emake V=1 info
 	fi
 
+	use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
+
 	# we nuke the manpages when we're left with junk
 	# (like when we bootstrap, no perl -> no manpages)
 	find . -name '*.1' -a -size 0 -delete
@@ -416,6 +419,11 @@ src_install() {
 		dodoc opcodes/ChangeLog*
 	fi
 
+	if use emacs ; then
+		elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+
 	# Remove shared info pages
 	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
 
@@ -427,6 +435,8 @@ pkg_postinst() {
 	# Make sure this ${CTARGET} has a binutils version selected
 	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
 	binutils-config ${CTARGET}-${PV}
+
+	use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
@@ -450,6 +460,8 @@ pkg_postrm() {
 	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
 		binutils-config ${CTARGET}-${PV}
 	fi
+
+	use emacs && elisp-site-regen
 }
 
 # Note [slotting support]
diff --git a/sys-devel/binutils/files/50binutils-gentoo.el b/sys-devel/binutils/files/50binutils-gentoo.el
new file mode 100644
index 000000000000..7caa9f19a37b
--- /dev/null
+++ b/sys-devel/binutils/files/50binutils-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'dwarf-browse "dwarf-mode"
+  "Invoke `objdump' and put output into a `dwarf-mode' buffer." t)
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 05340dc54cd5..d849d8088d8a 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 441948c37ca0..40ad95b3ac23 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,27 +1,17 @@
-DIST intel-microcode-collection-20201116.tar.xz 6506624 BLAKE2B b74ec0ddafe9681ae94d6a0df1de51655004eecae83c413fa824c9ad25cf68a25059627e2809a3b8cd5b3cb18647455385de0be2b2a7fcc6bc6c30e2ccabd1af SHA512 3a1aab0af9ff6dc95778276964b457a4429aa12f13499f6f89fa48285cf8aef9a0990099a80e360b76b2d4b6a836f2528f984aab17f12d905cf237dbab2a8b33
-DIST intel-microcode-collection-20210221.tar.xz 6690716 BLAKE2B 09758341d20d60b739c4859442457fcc4ce563327dd7f14e8a626f49198d3beb59ef580530500a2dacb5ab9832119e8d489f553ccffc56613b31df027eb93e98 SHA512 e3bb3644c46ee41752bbd21c56e69144d23dab9162ebfe9906a07ff646b7ba57d14b0280b044bf7ceab771fe80e75d7aed3808b68b823ae19bc0c7c4a94589dd
-DIST intel-microcode-collection-20210514.tar.xz 7907672 BLAKE2B d5226008e50e804c0acfa648393032b08a317572be1e38743721613000dede886d3885b36f7fa4a9c061e72855fc0ad409ce3299f679afc866abda7d29c9512a SHA512 fc4fcd3e2c4f1abdf5c0d23c1c0ac2f8c572531dadbc9a070c38150ec939cd4e2b13226b86df2371eb0679cef96307262d0356f2e617773c51c53f3e440894d2
-DIST intel-microcode-collection-20210608.tar.xz 8012692 BLAKE2B 98df9d18658bfdf06ac7db84ac30707fe8834874583b324ebc882b514975d71b686788fcd1c9b9c5b05448403b27524e29a94ade34facdffb1645333059019a9 SHA512 7fd810cf05334f6442b9a0c77aef5319d3e2006e887d0354dee952647ded3fa6331a30192abf82eda0676af0439b40f5e3ab0210611f96c78fe52f01f106c5d4
 DIST intel-microcode-collection-20210830.tar.xz 8681768 BLAKE2B 84f098285ed0b79b953e1f54b9ca077e42e7a2b6b28e862dddcb23a546ebebdd5afb9e54215b6c6493b72bf82121ace4b06f759413d3745571ff8156db52d6b1 SHA512 8a6a7376524888b0e89f9fd9a592d52a3859f4ddf1d961484b60d77098faa6984c5e8efc9cf4258a943cfc2c3503dbb87989868962a7ad8028c391d897e212b6
 DIST intel-microcode-collection-20220207.tar.xz 9362888 BLAKE2B 9efb2a943bffc1d702675c4ca5d17b6bc7f5bf5688fb1979caadbf96c516c31c3e1894823aaa16dbdb8c778c933eaf49dec6f2d416483d11e58ed1e75823cef8 SHA512 72458aa64c05ceb8bb21b296da5ad15230af3e6ac63240a10370fadec09523cf7ebefaaddce2b31e2c16570c2700a875cccf86fd1770046ff36cc30eb594f041
 DIST intel-microcode-collection-20220421.tar.xz 9442704 BLAKE2B 9c0d682d4ae07c6c40b7638cd53e559f0d5b672f40676a3fc478d07ac5772f350da777c20f821ed5a0907ba31800874cd15553fcdbdae319e77e17961cf49f9f SHA512 a7b5ef78618a27c6065a78d5302d19f846feb71bc09cc0359342d1f31f1f793242982bc384227b0e59a4b7f246cb9f4aaa2350ad0a4fe1a23ce3504e59b0d2c2
 DIST intel-microcode-collection-20220508.tar.xz 9444060 BLAKE2B 1737143f5227d95590f325f7205c04816d7791bebb27573dc30774fe5f40f74c1e0506d41774474a8b2495b0dc210528fac1362545d670a085c5c502aa903b24 SHA512 b9d7f2d5db0f625a219959f52822c8d6fba2e0bc682257a204c9b33cd19ed2101f5f661e7f2e2b98a8ad8d105fcb3309699d193469ee4d67d99ae188dc7034d9
 DIST intel-microcode-collection-20220809.tar.xz 9863700 BLAKE2B 266deba0890cc68de72dab28cb76b9aedd81258c2da1c1c00a19f927c73e9856c9dc6a18c08a768d1df2d5c5c3b21aab13446cdb4f84e13078ff2124859cdb00 SHA512 4c35e26d5887e9182dce5cf4cce46d4cfe8cab926e833396a645561adab775b8a5eac9a27f50a4c83887c50e56384917680a596eb02d50f1a14a56e8c163f4c2
 DIST intel-ucode-sig_0x406e3-rev_0xd6.bin 101376 BLAKE2B 66d55867954d69dda1425febd93bb8c89f7aa836d504f8b5fee127f8505bcf2246f4fcc55cc245bc5e532528d60cca2eee278de7ab5174dc2862db7982a2b36f SHA512 248066b521bf512b5d8e4a8c7e921464ce52169c954d6e4ca580d8c172cd789519e22b4cf56c212e452b4191741f0202019f7061d322c9433b5af9ce5413b567
-DIST microcode-20201112.tar.gz 3610834 BLAKE2B 4212924f1673afded961266a25fe6063ec6cdafaa26c8bee1c42372eb8ab5f278dc2501615b23e09e2f9809bf2792a8db317c98c170bf0c5e1dd62b7dc80a084 SHA512 0875675d065a83ee14fa34a31022ee34e46aee579d1ff192414e79861af157ae269ca7c2c462f03b3accbd45590c76e5cbf4f53d7a6ed237e410213a96459211
-DIST microcode-20210216.tar.gz 3506111 BLAKE2B e09ab59dcccc77c15545b119dcf5309e626d53649a601c49fc7d6a65d774b8016d9ad44783f75ceb4bf384a03b909bc28693ed2be9f047029342dca9beae9cae SHA512 211ed90a248c891224bb8c569e24c04410d3f67ecc6daee41dc025042bd51c257baaba0da1ac5327df76352d2b53d812e81f06cc8726e43b95ea2f8898bc00bf
 DIST microcode-20210608.tar.gz 4782451 BLAKE2B 2eac43aaa7832365e428bf2de20797ef42293a53087545920d205bd3b11a3d8ca2afb33931af5d36b8f3a224b9c22ed89ff828acc8afdcfa1b8220884c55ae89 SHA512 61acd2e76aa019fa0002fbf56c503791080a937ff93d81e020f8f0cc089dc08928b4c7e9884f713b886e2f9d4a8409fea59e39f628ef534a588515e1c3fc861d
 DIST microcode-20220207.tar.gz 4590237 BLAKE2B 8c47a330794615b6684084976b6bb9e8800cd2869f81ecc33b28b54441b220a645502c0ade0cbd58e91879a652ff6bca181800004de477fc74033413ea4b1c8f SHA512 efa9f80815947cf2be371e7da7185634cbacefe779d1d6dfef0c15b78ccae7d2740ea6681b967a19dfbcc3014edce5bcdcdba87c9dea1f19d0415a03fca9e936
 DIST microcode-20220419.tar.gz 4590171 BLAKE2B 69d296efad5329324a47640eace5d1a10e38b85cb8b7ac5baa9f14c40391ff809ae17cb7814f99f2e43910fe4c4b02dc77ffea7bb5f2b58069b2c17029e9f76a SHA512 abfe3942c204e42ed121bcea47c366469013a6751ef5d28d9c0d59a3a660bd1ad7010441e000367c052ee1ead00285a252d2b3c3ca86314eaea9f7d0de3f05c6
 DIST microcode-20220510.tar.gz 5912115 BLAKE2B 5f8c238b00970ddda132dbcf9059df759bb768e1eb2fe0b9912ffe69cf9a6104b32ea816e7574660ea74e3d08af1aa45cc46b5f38d0b315e6e466d8ca466f37d SHA512 00329ce62a6d9cc66fb8594d132ef67951086ab1250ceaf908d5a357753ed62557275f55c5eb7b3ad55d1fdd312b5d1a436b214cdcbf6e3e1a840c8bf6f4795d
 DIST microcode-20220809.tar.gz 5929894 BLAKE2B 3765995c88b67aff78fe8c4280b3293c60a2013f2b8c9ec155a2ef187af55a7e562c73a000e45828cf5309e2c1b644dac5849347130b1a98c831bdad117df437 SHA512 1c91df1cbba33953f4ad19cc53215cad843c61a08509596fad32a84b4f0012d9d29bce64b58eb405c345af7f646d5982e45227570ce3605780be6e8bf31a63e1
-EBUILD intel-microcode-20201112_p20201116-r1.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
-EBUILD intel-microcode-20210216_p20210221.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
-EBUILD intel-microcode-20210216_p20210514.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
-EBUILD intel-microcode-20210608_p20210608.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
 EBUILD intel-microcode-20210608_p20210830.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
 EBUILD intel-microcode-20220207_p20220207.ebuild 9283 BLAKE2B 80ef0e145d64b3c104400c7c555a4d2436c55b385a870b31b9d3288016c350f0f9f81f0a92d12985e84895bfb051b9113e2a4ba4a439a89d8d28444f03efa0b3 SHA512 13d0dc01a5a253db88756eae947cb447d1fb5e082bd45b86b6a9d083a0c7004e2d721390bc225f2ad63b11409004d5e73b99884a413fc811f90017acc403caf1
 EBUILD intel-microcode-20220419_p20220421.ebuild 9269 BLAKE2B b978c98dc2a6caddcf864696e6f9ed868f3419dfabf714bda7be6dd0da157297eb3982d51e2eccb2b0d487d248326dbd38abe0131d3888d9790b2e779eee06cb SHA512 a09e7efb3c32cb9b8f84bb5cd18ceff0c55bacdc325b8bab9f959a92cde0d5e85ab10e69bea51d1fd145a0e843ce19681b7d95ef9960caf9133ac250478b8b9a
 EBUILD intel-microcode-20220510_p20220508.ebuild 9269 BLAKE2B b978c98dc2a6caddcf864696e6f9ed868f3419dfabf714bda7be6dd0da157297eb3982d51e2eccb2b0d487d248326dbd38abe0131d3888d9790b2e779eee06cb SHA512 a09e7efb3c32cb9b8f84bb5cd18ceff0c55bacdc325b8bab9f959a92cde0d5e85ab10e69bea51d1fd145a0e843ce19681b7d95ef9960caf9133ac250478b8b9a
-EBUILD intel-microcode-20220809_p20220809.ebuild 9269 BLAKE2B b978c98dc2a6caddcf864696e6f9ed868f3419dfabf714bda7be6dd0da157297eb3982d51e2eccb2b0d487d248326dbd38abe0131d3888d9790b2e779eee06cb SHA512 a09e7efb3c32cb9b8f84bb5cd18ceff0c55bacdc325b8bab9f959a92cde0d5e85ab10e69bea51d1fd145a0e843ce19681b7d95ef9960caf9133ac250478b8b9a
+EBUILD intel-microcode-20220809_p20220809.ebuild 10233 BLAKE2B 10f02d205e2702a443f89e9b072ef740ad4d5c58003f05fe1f87913c153c46374a4af57a57808a0eb2a8dc88887019b9d01860392d37711047c6df0e1b0ef9a6 SHA512 68376b816f4398852224914bdbfb79df97573ec54888c62b6ee3dd3b0fea2a37f02a01bdbce2c52d6a5c1fb04c4c4db61c5ff3439c2f5324d373cdaa6b7cb0e1
 MISC metadata.xml 668 BLAKE2B 9b5e9c5ad6b5889f72758aa76253fc43f0fba9ab9fa51b8393f2b48e76ba61455c257561697a00dd2178c3a563ae76066a3d930cb20e5f51c9534ee1d8db232e SHA512 c1354363370d038f70e20176232dbbe8e66f515a0a28e9da4fa1b792de8c7c785bd70fdc872db774d1f29a50217955becf93a3a55e31c431a4954bada801c6ac
diff --git a/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
deleted file mode 100644
index adfb7ec7e6a4..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
-SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
-	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-BDEPEND=">=sys-apps/iucode_tool-2.3"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
-
-# https://bugs.gentoo.org/722768
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	mkdir intel-ucode-old || die
-	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-		"${S}"/intel-ucode-old/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote.md
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
-
-		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210221.ebuild b/sys-firmware/intel-microcode/intel-microcode-20210216_p20210221.ebuild
deleted file mode 100644
index adfb7ec7e6a4..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210221.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
-SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
-	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-BDEPEND=">=sys-apps/iucode_tool-2.3"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
-
-# https://bugs.gentoo.org/722768
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	mkdir intel-ucode-old || die
-	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-		"${S}"/intel-ucode-old/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote.md
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
-
-		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild b/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild
deleted file mode 100644
index adfb7ec7e6a4..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
-SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
-	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-BDEPEND=">=sys-apps/iucode_tool-2.3"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
-
-# https://bugs.gentoo.org/722768
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	mkdir intel-ucode-old || die
-	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-		"${S}"/intel-ucode-old/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote.md
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
-
-		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20210608_p20210608.ebuild b/sys-firmware/intel-microcode/intel-microcode-20210608_p20210608.ebuild
deleted file mode 100644
index adfb7ec7e6a4..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20210608_p20210608.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
-SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
-	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-BDEPEND=">=sys-apps/iucode_tool-2.3"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
-
-# https://bugs.gentoo.org/722768
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	mkdir intel-ucode-old || die
-	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-		"${S}"/intel-ucode-old/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote.md
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
-
-		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20220809_p20220809.ebuild b/sys-firmware/intel-microcode/intel-microcode-20220809_p20220809.ebuild
index 4171888a5826..426180b0a1f1 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20220809_p20220809.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20220809_p20220809.ebuild
@@ -56,6 +56,17 @@ MICROCODE_SIGNATURES_DEFAULT=""
 # only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
 # exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
 
+# Package Maintenance instructions :
+# 1. The ebuild is in the form of intel-microcode-<INTEL_SNAPSHOT>_p<COLLECTION_SNAPSHOT>.ebuild
+# 2. The INTEL_SNAPSHOT upstream is located at: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files\
+# 3. The COLLECTION_SNAPSHOT is created manually using the following steps:
+#   a. Clone the repository https://github.com/platomav/CPUMicrocodes
+#   b. Rename the Intel directory to intel-microcode-collection-<YYYYMMDD>
+#   c. From the CPUMicrocodes directory tar and xz compress the contents of intel-microcode-collection-<YYYYMMDD>:
+#      tar -cJf intel-microcode-collection-<YYYYMMDD>.tar.xz intel-microcode-collection-<YYYYMMDD>/
+#   d. This file can go in your devspace, add the URL to SRC_URI if it's not there
+#      https://dev.gentoo.org/~<dev nick>/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz
+
 pkg_pretend() {
 	use initramfs && mount-boot_pkg_pretend
 }
@@ -76,6 +87,8 @@ src_prepare() {
 	# Prevent "invalid file format" errors from iucode_tool
 	rm -f "${S}"/intel-ucod*/list || die
 
+	# Remove non-microcode file from list
+	rm -f "${S}"/intel-ucode/LICENSE
 }
 
 src_install() {
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 5adb48aa32e4..b7da36ceea63 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/sonarr/Manifest b/www-apps/sonarr/Manifest
index c22b96123173..da32c71dbea4 100644
--- a/www-apps/sonarr/Manifest
+++ b/www-apps/sonarr/Manifest
@@ -1,8 +1,14 @@
+AUX Sonarr 53 BLAKE2B 336359bd45605d20c6b03a70457a453dc1791d70f260f43d9c1749daac500b979dea39b27ca0305677793814cd89c1657552f6c4093b9b4912e1f2bade7f92c3 SHA512 9a5645217f27fe97f7aa93cd9fe31900224067e44c30c0645950a784e7ccb5db59d109de26b84642e88d9e80743813f7cbbb49f590dbdafdb5715ea99a2b52b7
 AUX sonarr.init 153 BLAKE2B b5a4d6540daf982180186d4d46b58669d2afa0ef5cb2f56e2657ffc635c61276c2950f07c56cd6a0d4d55c5302406c28c39e37057882b3ca9d4d4e9382a2489a SHA512 ee42b108d004c4d428ce0db191e2b58e1223997419b3d553908c6ed3d3306eca0fd36d99d59015a20ba73034a4e059f16aa735f512afd247aa0470b945afa1d0
+AUX sonarr.init-r1 129 BLAKE2B 694547ef7125fb05338d85761afae141583108c9b551cd80af0d34d574764f8c80db7c54475011dba4f85981898a8f0d4f8a6eb987c358a5be5bab1d65cf5b1b SHA512 1a6640901e549a85bf98b31cbedf6e1cd17dc576b891e4cb17151bd97d7eb98586b7ea272715303c6e7578072b2ce368d4c462d8c317d1bd9c89aa65fb524699
+AUX sonarr.init-r2 148 BLAKE2B ec52d371fe94038459978619cb51e1a5394d48178af12eaf8e48758af2476edad621866261454a33fc4d1fdf985463c5036442627ded3733531549c00bf7d980 SHA512 769e844e962df9880d5aa6d6030af792e14d6ca7c375f687cb0a62921b784037f45bc7e2d0da2803400f6de5a2a32b5903e3cfa910bc06bfca5a2f90b042ea65
 AUX sonarr.logrotate 187 BLAKE2B ee4f6641669084be16aa4e5bc731d3f86dc50e2d5a71a469364ff86d2af5a9f5a124445d22f1da9e25b4af4dc6891ce9d594323df5757daca8a7dbaa07e2a6cb SHA512 a31988829ee49fcf0fc2d08c1627689d73de08cc08a344c0e01f3f42767c7feae0b89255a30b0f95f45291a284661f150eadeddc146e2d4d1b1d21f22fe8b2cd
 AUX sonarr.service 586 BLAKE2B ee1adb8a3da32d9b7a0b9f51a08c05f2589e29b341773d5d83f49c3f16fab31f097c1e40c992062b7fde174970963cbede3fe5fc4c80c4340109f16ffc2ea7ce SHA512 b19daa0c08dea5349011567ade976a3c6a9d2edce85047d37eb583dbd83716ee6d461d46876c686bb8cf7de136b4b0c77a8b8c7c73dc94dbde6ee7d2559d3589
+AUX sonarr.service-r1 568 BLAKE2B 7ccc2f3def560fd07713e433a657f2664c153acbf316442e516f9591a918dc042bcc8302877e1456af2dc4ae30d44157ffc1b11e6844ea9cbea9990aecd62c24 SHA512 d99f6312ffe8dff2c0d938a3c0e5801355e1323261b7e8752f409ddab5885ebacd9c6237060cd4153bd91e1f1c8c3e70dd69285002956cc45a8259798268bfcb
 DIST Sonarr.main.3.0.8.1507.linux.tar.gz 13647325 BLAKE2B bd269ec2e628075548c9c11db0f9d31f0b9a8c24bb55e0b7d0c58cc32c33423ca4988e9e63170fa6b5f49d438877a88402cebca3183fb98ac5995eb2a38e96e5 SHA512 32efec2207e853a1d7737fc72e9484e62c07a4b39f7e9c6ea0519bcc3220bf4bdb189c6b5dc30aa168912ba912a78c4c5832e2b84bc0a42c46844e76d3b9cc1a
 DIST Sonarr.main.3.0.9.1549.linux.tar.gz 14105679 BLAKE2B 97aa7e5a3836e66433b49e6128779acfe6985fba029a17835a9de31708793752f0f7f59269697f97210994d566708aea2147f199e4d0f51a845c60918d236bfe SHA512 ee97eaa9f2864387619091656843cb57610ada9fd6ad01da3c5414a876ad3b2257572711b2d113477983fcd7456a8eed962bd05928124c6fd9fc66cb80aab170
 EBUILD sonarr-3.0.8.1507.ebuild 959 BLAKE2B 72938c850cd5133418ec3045c46e6f2cc5298a822370f33dbbfa0f7bc1f0f8e635daa9a28f12892d661c94d26faab6e671ef4f80e4dc79c9938d88ffffdf64e1 SHA512 d1cb5d58b5bd4be08165592b117ddc91ee35bf2fe4b25d74fff99dd59ccd860e73e7ec724dadb99a82415692e43b6fcc6ec06163ee557c67138cc15977cf94ca
+EBUILD sonarr-3.0.9.1549-r1.ebuild 1036 BLAKE2B 0e235bc053731f87eb3b83634dfac58ae5fc131c1f475ea50bb0fd445f97c4e03f60d43594cbd8b0c56afb3463b152a361cd1eb04e835fd2ff9696d902db748d SHA512 9a37fe166fad0e584bb249557e13b13c0c00009b454f1fff1af750de173415f258978636da9acd9023568572ad03092c39c1ff04cd64df18e490fa6b7b572b07
+EBUILD sonarr-3.0.9.1549-r2.ebuild 1036 BLAKE2B f90ffde5965043c2b6d46a2e674fa1518ce7518f57dd8a3b4f56c4502b8d22458d0c06391179244509270cccf3b778fdf8d8996da5364b8f49021f18b65c6756 SHA512 e3636d70a832e1fd32c9a7d0ebb9d84b39d70f34edf10f46d734c3b2aa0e66e63d8a71b62d60e46b2a6194b8053cbec61d718714fa4ca8718c407a46982e0197
 EBUILD sonarr-3.0.9.1549.ebuild 959 BLAKE2B 72938c850cd5133418ec3045c46e6f2cc5298a822370f33dbbfa0f7bc1f0f8e635daa9a28f12892d661c94d26faab6e671ef4f80e4dc79c9938d88ffffdf64e1 SHA512 d1cb5d58b5bd4be08165592b117ddc91ee35bf2fe4b25d74fff99dd59ccd860e73e7ec724dadb99a82415692e43b6fcc6ec06163ee557c67138cc15977cf94ca
 MISC metadata.xml 675 BLAKE2B 5ac9fb421e127c8552ee273b784205059a59245d3783efa5c69225dcc34a65cdf00e39de3dc47013807923766110992f557cb3247f9866ec6d0c836b42ab4cd5 SHA512 1c347d1e422a2653fe8c403169cc1f16f7d5c668831d60a67d67a2df8ca90c696fb28fde70cd4a3c9336f983c39fbba30ec570ab7c14caee946cdd983aa6ba58
diff --git a/www-apps/sonarr/files/Sonarr b/www-apps/sonarr/files/Sonarr
new file mode 100644
index 000000000000..773b3504ca3e
--- /dev/null
+++ b/www-apps/sonarr/files/Sonarr
@@ -0,0 +1,3 @@
+#!/bin/sh
+/usr/bin/mono /opt/sonarr/Sonarr.exe "$@"
+
diff --git a/www-apps/sonarr/files/sonarr.init-r1 b/www-apps/sonarr/files/sonarr.init-r1
new file mode 100644
index 000000000000..dd1b7388738a
--- /dev/null
+++ b/www-apps/sonarr/files/sonarr.init-r1
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+
+pidfile="/run/sonarr.pid"
+command="/opt/sonarr/Sonarr"
+command_user="sonarr:sonarr"
+command_background=true
+
diff --git a/www-apps/sonarr/files/sonarr.init-r2 b/www-apps/sonarr/files/sonarr.init-r2
new file mode 100644
index 000000000000..76b8dbed164b
--- /dev/null
+++ b/www-apps/sonarr/files/sonarr.init-r2
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+
+pidfile="/run/sonarr.pid"
+command="/opt/sonarr/Sonarr"
+command_user="${GROUP:-sonarr}:${USER:-sonarr}"
+command_background=true
+
diff --git a/www-apps/sonarr/files/sonarr.service-r1 b/www-apps/sonarr/files/sonarr.service-r1
new file mode 100644
index 000000000000..542f5d7f1031
--- /dev/null
+++ b/www-apps/sonarr/files/sonarr.service-r1
@@ -0,0 +1,30 @@
+[Unit]
+Description=Sonarr is a Smart PVR for newsgroup and bittorrent users.
+After=syslog.target network.target network-online.target
+
+[Service]
+User=sonarr
+Group=sonarr
+
+Type=simple
+ExecStart=/opt/sonarr/Sonarr
+TimeoutStopSec=20
+KillMode=process
+Restart=on-failure
+
+PrivateTmp=yes
+PrivateDevices=yes
+PrivateMounts=yes
+ProtectHome=yes
+ProtectSystem=full
+NoNewPrivileges=yes
+ProtectHostname=yes
+ProtectClock=yes
+ProtectKernelTunables=yes
+ProtectKernelModules=yes
+ProtectKernelLogs=yes
+ProtectControlGroups=yes
+RestrictRealtime=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/sonarr/sonarr-3.0.9.1549-r1.ebuild b/www-apps/sonarr/sonarr-3.0.9.1549-r1.ebuild
new file mode 100644
index 000000000000..a3d2abfcc0bc
--- /dev/null
+++ b/www-apps/sonarr/sonarr-3.0.9.1549-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+SRC_URI="https://download.sonarr.tv/v3/main/${PV}/Sonarr.main.${PV}.linux.tar.gz"
+
+DESCRIPTION="Sonarr is a Smart PVR for newsgroup and bittorrent users"
+HOMEPAGE="https://www.sonarr.tv"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/sonarr
+	acct-user/sonarr
+	>=dev-lang/mono-6.6.0.161
+	media-video/mediainfo
+	dev-db/sqlite"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/Sonarr"
+
+src_install() {
+	newinitd "${FILESDIR}/${PN}.init-r1" ${PN}
+
+	keepdir /var/lib/${PN}
+	fowners -R ${PN}:${PN} /var/lib/${PN}
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodir  "/opt/${PN}"
+	cp -R "${S}/." "${D}/opt/${PN}" || die "Install failed!"
+
+	exeinto "/opt/${PN}"
+	doexe "${FILESDIR}/Sonarr"
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}@.service"
+}
diff --git a/www-apps/sonarr/sonarr-3.0.9.1549-r2.ebuild b/www-apps/sonarr/sonarr-3.0.9.1549-r2.ebuild
new file mode 100644
index 000000000000..49124b0696ba
--- /dev/null
+++ b/www-apps/sonarr/sonarr-3.0.9.1549-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+SRC_URI="https://download.sonarr.tv/v3/main/${PV}/Sonarr.main.${PV}.linux.tar.gz"
+
+DESCRIPTION="Sonarr is a Smart PVR for newsgroup and bittorrent users"
+HOMEPAGE="https://www.sonarr.tv"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/sonarr
+	acct-user/sonarr
+	>=dev-lang/mono-6.6.0.161
+	media-video/mediainfo
+	dev-db/sqlite"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/Sonarr"
+
+src_install() {
+	newinitd "${FILESDIR}/${PN}.init-r2" ${PN}
+
+	keepdir /var/lib/${PN}
+	fowners -R ${PN}:${PN} /var/lib/${PN}
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodir  "/opt/${PN}"
+	cp -R "${S}/." "${D}/opt/${PN}" || die "Install failed!"
+
+	exeinto "/opt/${PN}"
+	doexe "${FILESDIR}/Sonarr"
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}@.service"
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index ef283eff6f96..0f7a72fc8184 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 8704f51d3f0d..e1484ec3968b 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -601,7 +601,7 @@ DIST firefox-91.12.0esr.source.tar.xz 379877004 BLAKE2B c00e5cc219c59d8347a69e52
 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
 EBUILD firefox-102.0.1.ebuild 37139 BLAKE2B 1ed14a48c14bbebfc23e6327b8d63e1ca76d28a5a6274d21b18735fd5d914e43e2f46e81b2ac17476818027eeb86e2a5c3806281a516923ac66d9fc47baec95c SHA512 39fd9d8b90a5bb9951856c66dc7681d5d3f5febdcc5d142128258c81b15f9d0f887167a552682fab18e8f3af2a1954c7764e737c1548c2f0e867c59553db65f2
 EBUILD firefox-103.0.1.ebuild 37014 BLAKE2B 79af56094abd978d936800fc2739cf5611d75e2243f6d90d385141b7736079e5d939b665c18da94d80dd341ae5ab73edb081dbe356d07fcaaa61a0e2ed27dc10 SHA512 c89852021204d736bacadd5c4fd006cf3e835cb6ed893aae84d38c60d4e5722b5cc57c69dfb88bb0c603c7001329bb985029896359afa71de4eadae69eff6fb9
-EBUILD firefox-103.0.2.ebuild 37014 BLAKE2B 79af56094abd978d936800fc2739cf5611d75e2243f6d90d385141b7736079e5d939b665c18da94d80dd341ae5ab73edb081dbe356d07fcaaa61a0e2ed27dc10 SHA512 c89852021204d736bacadd5c4fd006cf3e835cb6ed893aae84d38c60d4e5722b5cc57c69dfb88bb0c603c7001329bb985029896359afa71de4eadae69eff6fb9
+EBUILD firefox-103.0.2.ebuild 37012 BLAKE2B 67b6a46e8177ad1b568485ce7f6017d15bcab54b8c0ee5acc073f37df2b03093bd04b559c232b9428ddd5494c3d07629f6b352ca09138b1d39fe7d1d9cd24b4e SHA512 25e59e80b2afaf572c2e9dd60977caebbf6be9225e533ccd9ae95fea366d2289f98245211173283c0666cbf5ee6abf14f251d6322868662c3a677bf632b4ceef
 EBUILD firefox-103.0.ebuild 37033 BLAKE2B 7f71ee77a0a68d68385fc5428e1c2061afc04ac426fd7a897f595a61d636a231c72c1d8d389d0d53389d0536b3eaef6f1f20bbcdb3dd774ef17de9e488244631 SHA512 011158b6a1ccda18b61e92c2657389acabf527d8eb21b59e63c5b72d5a7f94fbcb50b4061eb6098ede5ed2499e24abd2423fdb4ce96f0d885e9d4ddcb4ff7cf8
 EBUILD firefox-91.11.0.ebuild 35732 BLAKE2B 34ac3cd27fa40eb44411c4f0604cc89997dcab84dffbae6548da01f6f98b6f51896916d73072d27c8c958273550290646c3e68df8794199517750b72745c2727 SHA512 8e213ae366600e1fbb130d720177db03bfbd133a35fedfbfbf45d0721f4851534831b43b752404f682e9001def063484791707c1e4a421266fb88a7327b3fd88
 EBUILD firefox-91.12.0.ebuild 35570 BLAKE2B c14dcbc494bc36b0e668cda3a7b85e97566de563e91d82d49a15e84f9136a43566c0fd5551735f604b9bfaf6af7d518044a2d1d1bd16e25153cf7215ed6508fa SHA512 d70e1454d95e4b05f1ceb4cf29e3ab39f5542368c84cc1624d7f826f259df5ae6e0f39e051a5a3e5deac6b62c5c276e4c63fe31e22237afd4f89c008d1dae38a
diff --git a/www-client/firefox/firefox-103.0.2.ebuild b/www-client/firefox/firefox-103.0.2.ebuild
index f63628c3fda5..f570f6f6b4f0 100644
--- a/www-client/firefox/firefox-103.0.2.ebuild
+++ b/www-client/firefox/firefox-103.0.2.ebuild
@@ -1271,7 +1271,7 @@ pkg_postinst() {
 	# bug 835078
 	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
 		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not supported the "
+		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
 		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
 		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
 	fi
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index b6b82df9c7ae..0da4b8177e1a 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
index 1bbbb6a28a26..5ba5785e8499 100644
--- a/x11-libs/libXaw3dXft/Manifest
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw3dXft-1.6.2h.tar.bz2 593436 BLAKE2B e0e5c3a3e5b4564d58bb059ad7eb594d1a46cc37e0e21799ea11892d206a57f3f11a46d7413310d2a43738f03e001f5dc6f8c3b86bbe806fbc651661e9f720db SHA512 bc9b6de80379bdc82c7f5cd46ac78a422282b018eed979ef5548d0382f43e53619a6ebaf40c6b9ae264d597536022dc1daf023c1d1a04e948d4b4658bc6479ca
-EBUILD libXaw3dXft-1.6.2h.ebuild 737 BLAKE2B 7588db2950c7574fb799a1c067ba2ee916a28d473e1dae53f2bd942e437a3565028b3beaccd63a6e4fad7ff13d4f7fdbf71260ee8cc8b26fabb6bfdddb8a7066 SHA512 b2cacfb2d2dc7975d8f5e16b6391a32100b515e656947faceb42203d1455f5e8eec7648515ccf13007bec2b2d2db7db6596a537945b783e01a97decc71038fe9
+EBUILD libXaw3dXft-1.6.2h.ebuild 799 BLAKE2B d738a11d8970718a695ad9fa165bb1407a1adbd4a1d165fabb8438b0c59caafbd91f005808953e22cb17a70f6e03034b02f00afaef8d13364a75ddc8db231563 SHA512 53e2075e19e38fa12e3d8a299e1ea07bb88bd4546098b15ba76292f1d2272034e31ebb4c2fb86d20b34e9f7a3637e07254d61c2789899ce0286db489f2607a7c
 MISC metadata.xml 482 BLAKE2B 72697de1fc204fcd4873595c5b22d8e45fbd4a7fc036003da81d425df1e022574fac78dc373cbcbfc618d748e0532dbdf5cdd52cd98bac569545515d1f040171 SHA512 7e29b3ac2214a41c2812af079b69d7b5784fc52b957b6807059d8e5daf18ebd3d9ab059db1852cd736c3efa8f944ddffefedd11f9263a0db1d70ac76e1d19f05
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild
index 3523c3b1a0bb..d42b0426bbdf 100644
--- a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="Xaw3dXft library"
-HOMEPAGE="https://sourceforge.net/projects/sf-xpaint"
+HOMEPAGE="https://sourceforge.net/projects/sf-xpaint/"
 SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 
 KEYWORDS="amd64 x86"
@@ -23,7 +23,10 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="
 	sys-devel/flex
-	virtual/yacc"
+	virtual/yacc
+	x11-misc/util-macros"
+
+QA_PKGCONFIG_VERSION="${PV//[!0-9.]}"
 
 src_configure() {
 	local XORG_CONFIGURE_OPTIONS=(
author	V3n3RiX <venerix@koprulu.sector>	2022-08-10 20:18:34 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-10 20:18:34 +0100
commit	f1cd8f3514f8b9fbc1cc9cfe0dd08a8cb258e87a (patch)
tree	e16b2f573ffa54d21accbf0dfc3647b47b0578c8
parent	e9c5cd3a9230f2f3f5980a5ca0c4ec20c099c7ed (diff)