gentoo auto-resync : 24:10:2022 - 21:52:37

author: V3n3RiX <venerix@koprulu.sector> 2022-10-24 21:52:37 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-24 21:52:37 +0100
commit: 7ae4e1d32a98b596d483a19ed94a21b560eb595d (patch)
tree: 1c68a1258f5017984a7878d5e913d95d72544f59
parent: 145ac95c683ecda55a9b2cafc84dced2e9c29e03 (diff)
218 files changed, 2369 insertions, 1258 deletions
diff --git a/Manifest b/Manifest
index 978be4a08fb2..090806509a83 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29633 BLAKE2B 352b9f46df43f4ecd1cd703bbd5e52ef0896fe08e70c92a3e28fba33bc51461385d4e147ea95c5aa2a3c6635e2f67ddaaabb236da8380ebb797542459826d741 SHA512 af51cae4cf5d815e19be89bea7d1d12ea163dd589646348b982266f647ea1ad923464d03923f39ba82e8b877c9f8e78962086d1f78ad8ccda3c2b99cb4ecd75b
-TIMESTAMP 2022-10-24T14:09:42Z
+MANIFEST Manifest.files.gz 29614 BLAKE2B d5d6bf1c239c269c6ff6a0235ea659af48451781d240db9fb9210653bfd481e263868d8bc8ec78063c4070a9d52fc135db54af1dae297ebae952d8fa2b1a5486 SHA512 6f6ad19e40e539653bef5db44522631cd51bf2d8c7fbfe680d1c524a7fdc452390fc95678eab64350133c4ffaece3ff7cacf92674a076d74826c315633339614
+TIMESTAMP 2022-10-24T20:09:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNWnKZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNW8QhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAgxQ/+PLhC6wTUZz0yaYquPF3VU1xXWKIt1ADPjyO6AUpdenlG0E63eJCM52x5
-pHwIMgl30m67keiXfzwx1aGbIY52zwWsZ3IsMdfBtYJU/8hiNH/7+8Gsa0xamRC+
-rb2jWkxrtNV2qy0y/YdiTyAbOG3aM86ZiUscIxW/ktiaF4yH6WE4wWCNVW+Bo3uI
-dTgBtZ9+sHZAfMZQQ8xX/SFuGBEyazXmlEsRshUGIMF1504zu5Q+JQq5zc+1IBP9
-1pEL1K/pJSO2HzPl3RAvo4L9nCKf0nJfNsiXpZShc1b1ZxJwI42dl6o3q3NQhMO9
-EPiKPSRiMvMboHjbLfpOE9s7UKB5Y3agsZtaYRWr6vyME4E4A7/o45yBs8VTZUXi
-w5X1SZ2NzwPEtBL+xtef5bf/kboaX8jHjUDCiYM/Ckb3/5NxxPuZjJHYKQ1bEjbt
-XmQLRrfViGfSJgCgKNN85PFK03QkmMjCxAcFUt8VRO3ywfGOMes/bmgUFNB08dZv
-QquaQH9Gwm2iCeUfj/UkGzzdON32/LLnMhfJCsx+08y0h/HediaIQ9cEGLXA4OlX
-ZVNgOjPCqWybwvuNMDv063ScEhj9+VMFNJsGfBWi3NWPy/ZQ8aNpe03RZfYFZCvh
-z3hTI2zfFdQfmiaivNgD6qQ9GvSbyveRW5QLcLnW0NhLVZdG9f4=
-=anKP
+klDkehAAmE2GnaZHU0dlspflJot44GGXF9C7vu0esbBhqUDnswXfaUWRMUj2k50k
+wHcRrVE5gzV6AdLSB0G4cRPO9C5skNlmS032MrLS/5maV6y+qbQFjojMUHclY53h
+6WTrT8SnugRg31rT8ukiy2zSkn7rUtJi14UGN0CVf85PqLI6ilCxx76MrqqzpTYr
+QMtvFT8l6HJH9q6tpTmnPScvYZzsnD0RIs+SiY5o18ogi0Bd8nbd2B1foCMfsWes
+rFNplyrQC+yCt/dLNy3BLhHk3HhLE94xpNZXeHAX6dwU3FZojyUI74myaWbV4aa4
+hRGgVlrS2zykPXrd067PzmweUVk/uXSYf0HvFGMORY8MIQAP5oniITg9U5Vh1aUT
+i3+jWcUHYL4d+PKhXwKW7lG9qeDo7rEJQT+7yC6r1CXuCtCh0YutVaZb93vf5+2W
+m7OVPFt5bRhZQm6M8A99N9lnB7JoycF9KPQ/cR4IByi0mHOkbyHfRRrpEMUaW/zY
+97+Q577cHCWEhI6qzPK9PSdKu5h6MbOH+kMGb5c+LwnQNyV/9jZExbdo9PQ4oU7i
+eM47qTIi6ClNxuWbIagQzxLyVHn/QRPZFGcfvj3PqgVv4K/Q3nXN9xLwiE8sVz2j
+f7KrSwPsE697HIHlaSa2Bt+jx9aSbmaiDMjeQizJBX2ze6Y0Sv0=
+=5/ip
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 745d72477214..810ecffe3d04 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f2ac38680ef8..296f50f7897f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 595bedb6ca09..e286f4f6812a 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,5 +1,6 @@
 AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
 AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
+AUX rsyslog-8.2210.0-5004-hostname.patch 1137 BLAKE2B dcc87e205a0ac1cbb40d4b7b4e489468e439974fe50273b3a49282bacca7849073845c2ca3949c8a979972352b79230c7a994ed9968ccf2a3353df2f425706a6 SHA512 51ece6d4860eff8795b1e8b9418e0f3b39358b8a094b88161a747dc75103a2c81d7c149d82e2eeda617fd3e582ec203b73786f7d054b1083d10f5e2bf7b3f93c
 AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
 AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
 AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
@@ -19,5 +20,5 @@ EBUILD rsyslog-8.2102.0-r1.ebuild 12864 BLAKE2B cdbbbe6c4b582c5d899318ebffc5a3eb
 EBUILD rsyslog-8.2112.0-r1.ebuild 12918 BLAKE2B a6b90c61486be47ed3b22a9bb5c7cc8b7837f56db21d88353403c50ef427fa4cf364a964db74d0a07fd15f4420cd87441a4d51edec4ff19dfbce7ef7d4c787f1 SHA512 a9b6313794a45610b62a0ff700c89db057c9c825445a124ab7b10826e379333fa236fa9376f4c4c798519f163ced12c9d753a63f48c1840e1d705d218bbb329f
 EBUILD rsyslog-8.2206.0-r1.ebuild 12965 BLAKE2B f57c348fd034c19ab6f68da85f881c14a1cdbbd06c89f7f0cedcf72e558dafa591acd8b9e6a1739bc0482697148f51fbaf5c10dadb8b75e9d50ca1cf794ca378 SHA512 47784827bfec562177f1673d8104d0820aef01153e5623aa5e4e96d1533ff30143b442b7613cea48799d4ec0da34fde913f47a204ff3c35116d36b2adb434af3
 EBUILD rsyslog-8.2208.0-r1.ebuild 13071 BLAKE2B aed0478ec7dd4b10ee8b5b9aad97eace6dcf00c5eb4e3c5a9fd5c6c6218c711ac7a43a6634fdc3f56fe42b645cb4554d7315053c0956e1990f68eccf97d03779 SHA512 d1f8052e38ef991de236af15d070587e643e359bffc16bc332831b55acbab55f358d3a5ac63dbbb89e654c717562f771025a22482b4d3163713d820cef74a605
-EBUILD rsyslog-8.2210.0.ebuild 13071 BLAKE2B aed0478ec7dd4b10ee8b5b9aad97eace6dcf00c5eb4e3c5a9fd5c6c6218c711ac7a43a6634fdc3f56fe42b645cb4554d7315053c0956e1990f68eccf97d03779 SHA512 d1f8052e38ef991de236af15d070587e643e359bffc16bc332831b55acbab55f358d3a5ac63dbbb89e654c717562f771025a22482b4d3163713d820cef74a605
+EBUILD rsyslog-8.2210.0-r1.ebuild 13123 BLAKE2B 7a1df2f8bfbe1c2c5be66c1a444ea83f024f3e39353506eed28eb7c31c6feed750bf435e326cdcf8fd693ff199a376c78ddf1a2b7f2770080669ec383906c52f SHA512 f3c3ba6a8420706e66cca3f8285f48ba49923b728f74211bf12d8c15a5fa7441829adf48615bc1416c5d71d3130fe0867445e8da85a7332b26c2136cb77815c9
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch
new file mode 100644
index 000000000000..4f6c6cf944b6
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch
@@ -0,0 +1,40 @@
+From e2beca531157a4c0a27bcdda689bc53373e305b3 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Thu, 20 Oct 2022 18:08:11 +0200
+Subject: [PATCH] core bugfix: local hostname invalid if no global() config
+ object given
+
+The local hostname is invalidly set to "[localhost]" on rsyslog startup
+if no global() config object is present in rsyslog.conf. Sending a HUP
+corrects the hostname.
+
+This is a regression from ba00a9f25293f
+
+closes https://github.com/rsyslog/rsyslog/issues/4975,
+closes https://github.com/rsyslog/rsyslog/issues/4825
+---
+ runtime/glbl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/runtime/glbl.c b/runtime/glbl.c
+index 3a9350b903..ed9a307804 100644
+--- a/runtime/glbl.c
++++ b/runtime/glbl.c
+@@ -1396,6 +1396,7 @@ glblDoneLoadCnf(void)
+ 		stddbg = -1;
+ 	}
+ 
++finalize_it:
+ 	/* we have now read the config. We need to query the local host name now
+ 	 * as it was set by the config.
+ 	 *
+@@ -1404,8 +1405,7 @@ glblDoneLoadCnf(void)
+ 	 * are taken from that queue, the hostname will be adapted.
+ 	 */
+ 	queryLocalHostname();
+-
+-finalize_it:	RETiRet;
++	RETiRet;
+ }
+ 
+ 
diff --git a/app-admin/rsyslog/rsyslog-8.2210.0.ebuild b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
index 87f42ed5e63c..124a6ec61a3d 100644
--- a/app-admin/rsyslog/rsyslog-8.2210.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
@@ -114,6 +114,8 @@ if [[ ${PV} == "9999" ]]; then
 	BDEPEND+=" >=dev-python/docutils-0.12"
 fi
 
+PATCHES=( "${FILESDIR}"/${P}-5004-hostname.patch )
+
 CONFIG_CHECK="~INOTIFY_USER"
 WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
 
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 8080583d2a6e..6d35845a6730 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 7a8503d9fd68..54c05c9a8fc1 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,16 +1,6 @@
 DIST btrbk-0.31.2.tar.xz 107124 BLAKE2B a05ef8a665d50b0f9637b1bc7026f0ca0f8364377b4165dae09cd27790dc139aaea1096a54719d948adda5050f91580650bf58db70a086cfdd14b73559fad9f3 SHA512 f953fe1a231f7a28c2d98cf124e3d52cc6d0810e6cb1673b90f335e07cd7473d0302ec227361f902c40a36dab5c075c675d2ee0543a23c37cb1e4baaf74efea0
-DIST btrbk-0.31.3.tar.xz 109884 BLAKE2B 7f78d00815259e42bb3fd16ee48272717fe57913b7af83ca8a98f1dfd0de715cbf8b07177ea60b5b8bdcb9793ee0d5829b90b8327cd4810f6275611276a6e707 SHA512 62dee5430635b6a31edcdc9bed1829f549b60074ea09bb6f1fcd56d242d4215339846c8c2dbcd4bee05cd2a0cb32c1237ce7311d2b887885373c13fa15a6f476
-DIST btrbk-0.32.0.tar.xz 110408 BLAKE2B d9627d0f0a258bba9412b37707c3e79ca8a65870148aa27f38e615c90d0e26adfc5ecf697cc34052916127a0a26be850f5874ff52ab6cb193093d591cb05dab1 SHA512 201dde5ea9bf459e5a837b520d3e76ef1077a1769ed2e06b9754e34a93e2abd513a0da2b18abbe13c09fc3a945117a4b022ad423f805056b62a2b2be9c0f768a
-DIST btrbk-0.32.1.tar.xz 110364 BLAKE2B 5d2860e182701ba6c407b9d0f41e476442bdf0ebc8491c3fa944860228d087d6bbe13084a4e950a24fc6ea1e251e2c4c6cbf17e9e3a4cb4f3f9b7ea9b85b2c11 SHA512 a44c1a50696793661fa6a06fafc6a7682ba5db57b511666a9b77d2df79b724855e91187e4d13e1dfe340077f550b0aced8923c6dec955d25ce46f7644ed802f3
-DIST btrbk-0.32.2.tar.xz 111044 BLAKE2B f06e563d0a3f6a7096426b205c56446c8cba34767a0a2cd092f1d0d2661c1a38d88adfae0cd2046d2f43623fb236e9a2d7ef7281938a37b410f2cf842f5df83c SHA512 204bd48605b369909b1cb586bfa75dda5ee57b833c71a9d39699020f05f7305e2bc932c76face5aa0e435c1df46e13a566cbb2042c86975f6f8cd65c82ddcccf
-DIST btrbk-0.32.3.tar.xz 110724 BLAKE2B f0e389891bfdfa961187505548ec5139aa8967932d2fcca43c151c8ca25664c30af96f0f52531507e7c838ca3df16f371f7419df226283734fee23f6af56b3cf SHA512 8503ddb47a54b02abc03b160c296f9e5d2d71cc9705f4891f99732c36a62bb0bf81caa5cbe793d7e070c68ab461de995b442aa3a140d6aa68fe2a3b8a9cafb20
-DIST btrbk-0.32.4.tar.xz 110736 BLAKE2B e76a0b6ed8d54f97fa0ac2dad139891ae0f9450095e08d560f5a62ad28e3cc2e39da0a3a094ca841c5debbe9d34ca1cb3930cb3a16877b1547fb81f9c5e7e244 SHA512 495ec786c94f76c590f8e84cc9aa6be7b9a4807c11d501360bbdf171e0f0598fe6498b0d5b8aa8030af8d957aa8cebdff903876473f5111a9100032c16995373
+DIST btrbk-0.32.5.tar.xz 110840 BLAKE2B 036a2b5c31a308dbc1efc7a27211f89dfc07bcfcead49deb68a2e8313aec9539483ef3a91481f4ebaa9d2b4817b202ced1945a30ed7fc9b51f1336878b2f17d7 SHA512 6ff8df173656cbfdc1c4e74e84e031816fec73c2a42d1069fe5e77bf9eff1a3e27699a383ee58843f59619e6cbc0d66d13bf1b2a72524c58fdcd948ba62448fc
 EBUILD btrbk-0.31.2.ebuild 2381 BLAKE2B dead45950b470fbd2303425a522186e5ac553711583ea1406112260a05484a7420884a3023dbc4314121f7ef28f4b473b78082a9a77ee9c6ab6c1afcb4a693e5 SHA512 6fb46ea01bb0f105ac50d28fb0c830b70934d8660ab24bc89c1f72eea2c5c1b6b150fab1eba9ade528a6e7b9cb514fe6f5255523ef455e23a634ae29a116c6f9
-EBUILD btrbk-0.31.3.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
-EBUILD btrbk-0.32.0.ebuild 2385 BLAKE2B f1ce5388d83881455a946299992622f44ff958cd8ef57e6d8f0ead9c8e490b784b3ac02da587119cf6415feae772d5fa4c449c9d2ba218fb9c780e94f15e98cd SHA512 b1b25893f4ded6f719b36216006de236210a3ca1b39d5c6b7d2468d4ffcff867b590be40a2e47415fdf3672873321bcf06e4393a89cce44098f7a71f83cb7f97
-EBUILD btrbk-0.32.1.ebuild 2385 BLAKE2B f1ce5388d83881455a946299992622f44ff958cd8ef57e6d8f0ead9c8e490b784b3ac02da587119cf6415feae772d5fa4c449c9d2ba218fb9c780e94f15e98cd SHA512 b1b25893f4ded6f719b36216006de236210a3ca1b39d5c6b7d2468d4ffcff867b590be40a2e47415fdf3672873321bcf06e4393a89cce44098f7a71f83cb7f97
-EBUILD btrbk-0.32.2.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
-EBUILD btrbk-0.32.3.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
-EBUILD btrbk-0.32.4.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
+EBUILD btrbk-0.32.5.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
 EBUILD btrbk-9999.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
 MISC metadata.xml 1075 BLAKE2B 9e352a1f9346ebb1cff94393f977dfb0c3714e53380ce2ed3c8eb53375d2ac74c95655556fb604bf538ae63ae00de9ed97cf9a02cadaec97c7117f9a621ca481 SHA512 681a2a38dc3ddba866d46bd9e88bc8549cb1ba297de965a1faecada4ac7b966a3603ce4b647544ba9dabfbbb59e1072cbecf550b580835ae1d1d79efcc3af7e5
diff --git a/app-backup/btrbk/btrbk-0.31.3.ebuild b/app-backup/btrbk/btrbk-0.31.3.ebuild
deleted file mode 100644
index f301c70cd559..000000000000
--- a/app-backup/btrbk/btrbk-0.31.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.32.0.ebuild b/app-backup/btrbk/btrbk-0.32.0.ebuild
deleted file mode 100644
index 29b1c6d3fc78..000000000000
--- a/app-backup/btrbk/btrbk-0.32.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.32.1.ebuild b/app-backup/btrbk/btrbk-0.32.1.ebuild
deleted file mode 100644
index 29b1c6d3fc78..000000000000
--- a/app-backup/btrbk/btrbk-0.32.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.32.3.ebuild b/app-backup/btrbk/btrbk-0.32.3.ebuild
deleted file mode 100644
index f75978a45363..000000000000
--- a/app-backup/btrbk/btrbk-0.32.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.32.4.ebuild b/app-backup/btrbk/btrbk-0.32.4.ebuild
deleted file mode 100644
index f75978a45363..000000000000
--- a/app-backup/btrbk/btrbk-0.32.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.32.2.ebuild b/app-backup/btrbk/btrbk-0.32.5.ebuild
index f75978a45363..f75978a45363 100644
--- a/app-backup/btrbk/btrbk-0.32.2.ebuild
+++ b/app-backup/btrbk/btrbk-0.32.5.ebuild
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index cc53c13812a8..55d411c4830d 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
index c0a064feac12..165c841e6a7b 100644
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@@ -1,5 +1,4 @@
 AUX 50buttercup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-AUX buttercup-1.24-properties-equal.patch 1596 BLAKE2B 384adba33517c2f6677e10aac40c5a939914f74a936d7891e52eb4b706d33c0005f1ce63e0ba8b9672fdad403f6ec36e3191246c252c30574c448408ce24a1aa SHA512 a7dfe3a0d9df701b47287afd8718fbe01886870ab0665cfb73ba240b03facae5b1dc53d5e07ac2cbf21823a203e46a038e64025a82d627d2e8a516997bc8e654
 DIST buttercup-1.25.tar.gz 86763 BLAKE2B ccf7ba797517710e66b666cc121766d29886e0e1a8fd5ad63cb8b5fa4ee2d2a0d2644cd413c1095f37b1ba60467c012e507230787e1daaca3e869a4072e61bb4 SHA512 1eb45485fb1de638837da4d97f6043a64e97d167c8c130d9c5ba6ff67a5e0bcae272c8247779ab1c9427668468a3b94e91af07426b5465a7c3f9c54433a0433e
 DIST buttercup-1.26.tar.gz 87554 BLAKE2B ee5d37360b6c9daa8b790f7ea6ae5bf7ff4266b1fcbe913877aefd4ede2e7d6561e48eae533c17c906e19b498d9d127692597ee728bd1fa791430f5f6ab508c8 SHA512 fb491e1db33ffaeca52529630c538040487a7bdf7766faab2c6a1bc39d1060c5bbbb7a259006b741abbec9b9a6911f8390b2513e0a4dddf856b79274ed24307c
 DIST buttercup-1.27.tar.gz 87761 BLAKE2B d372e3285bb80a0005e79142dc95d219a2219959974039083df502ceeec10281aaeaa57f97c8bf45ec1d31b530934faf03b24d2a40e94f09f1cce4a986ae602b SHA512 537c1cc1fc560000537f3894f0917738ab344a4b117eac927b290bc8b5d01b6ad1df1caad63e1f339edc8f4bcaa9cdf483995e2730661481b53dd5e693a33f34
diff --git a/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch b/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch
deleted file mode 100644
index 2af36a3560cd..000000000000
--- a/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 108d2298cc34d906b196178ad955e3dc139e1779 Mon Sep 17 00:00:00 2001
-From: Philipp Stephani <phst@google.com>
-Date: Mon, 6 Dec 2021 15:39:53 +0100
-Subject: [PATCH] Fix property comparisons in unit tests.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Before Emacs 29, ‘equal-including-properties’ should not be used to compare
-propertized strings due to https://debbugs.gnu.org/cgi/bugreport.cgi?bug=6581.
-ERT provides a replacement ‘ert-equal-including-properties’.
----
- tests/test-buttercup.el | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test-buttercup.el b/tests/test-buttercup.el
-index bda3e6f..4b73b78 100644
---- a/tests/test-buttercup.el
-+++ b/tests/test-buttercup.el
-@@ -1,6 +1,6 @@
- ;;; buttercup-test.el --- Tests for buttercup.el -*-lexical-binding:t-*-
- 
--;; Copyright (C) 2015  Jorgen Schaefer <contact@jorgenschaefer.de>
-+;; Copyright (C) 2015, 2021  Jorgen Schaefer <contact@jorgenschaefer.de>
- 
- ;; This program is free software; you can redistribute it and/or
- ;; modify it under the terms of the GNU General Public License
-@@ -27,6 +27,7 @@
- (require 'autoload)
- (require 'ansi-color)
- (require 'ert)
-+(require 'ert-x)
- (require 'cl-lib)
- (require 'imenu)
- 
-@@ -1117,7 +1118,7 @@ text properties using `ansi-color-apply'."
- ;;;;;;;;;;;;;
- ;;; Reporters
- (buttercup-define-matcher-for-binary-function
--    :to-equal-including-properties equal-including-properties)
-+    :to-equal-including-properties ert-equal-including-properties)
- 
- (describe "The batch reporters"
-   :var (print-buffer)
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 38e7295d5c7c..c15d3e65dbfd 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/mouseremote/Manifest b/app-misc/mouseremote/Manifest
index 4031ae11629d..3f784701cc91 100644
--- a/app-misc/mouseremote/Manifest
+++ b/app-misc/mouseremote/Manifest
@@ -1,8 +1,9 @@
-AUX mouseremote-0.90-fix-warnings.diff 631 BLAKE2B ca0d5dfc9cdcb51a9a7426be220113a21aa12d2100503632cc6c7e56cee58174b2c81bc885abd152a67dbd7cd5fd35969434e429a6e83c128b20bfda77246733 SHA512 203b8df256510e98e5f46365c308b12c80fb7c92f164663ace8627e1ff9ae0e47c69912fe562e92466f289c0827d46f295b776ce43859d94b272ff6f8cf35a6f
-AUX mouseremote-0.90-gentoo.diff 1130 BLAKE2B f219bba9912a620a02a91881e6bce1d0558dfec032d1b926b4be7439b25a224a8655de2f054230a0705fa1a5777d1e997dde7f9c07f5d542937519e3cf178921 SHA512 607483c622f3347d3fad6de2f8c9eacd3a4f389baaa2bed94e72a6d5db65006c67231b92962ad08b1756983fe6af7d599b93bba880558867a032840942654e6b
-AUX mouseremote-0.90-makefile.diff 507 BLAKE2B c93decf07db9ad8f25c9ee8902b1e9841fe29e10c26cb1dc0c49736a3755edc25cd8545190b25aafc1b36d903e381f24e01fbf1a80efd04983f815883cdba09e SHA512 160efb2db998c42ab2efb34e8b462f3b709a03b8d4a8bf0be4c6c45c8204285e67bc6e5cecc4dd25ee71c6625b3e7653f83a2be8c51ed09103e2f119102b2ec0
+AUX mouseremote-0.90-fix-clang-16.patch 657 BLAKE2B e2895fae5d77955da31c150475311d49f2ed10bf8297a5f1d44c67a991ccecf1ffd9c91ec431ca6a6ba3816545011b538222dd111d677ea30b34f12563d0bd7a SHA512 fc91ef87a5bd918779601a89636f4df5ff0cc2db477e2c6dcc970f798a8e471ed095d0925c419b9a5256db76b161ebeaa0668f1a609a9fb3e06df8b99b3a01ca
+AUX mouseremote-0.90-fix-warnings.patch 381 BLAKE2B 54e7ed74c5dd232ab27faa5e9b8841a3e8262ea0e29cea31d85920c9863aea8bea1db15664109f4b0a87169ab4830ddd4a8aa9ce864fc66b32b6f2d3a2ba42bf SHA512 d0744b28ee5f45aece227fbe42ae3ba073b0855c282372169dc261e888a42fc263367689deae3309173a29e0e2c947ae0abe10a558091c6d3676dbb68ee6dc6f
+AUX mouseremote-0.90-gentoo.patch 804 BLAKE2B 5fb6bea89179c1ba0f5752ca6d72952d4a2da10f6ed20a32451c2a25af1f210ea1b174bb0d62c32c425607756c62eb4dff71b7595a8a2f11e2415020907ff487 SHA512 e7a01110d59b1f50d533d942098d3c2aabca3a61866a9f2cb6881a22a6759ab6b2105ce694003adade9a0e492f79c3a0e3296fdf0723825f2c1936ae3fc39cb5
+AUX mouseremote-0.90-makefile.patch 439 BLAKE2B e882c266ee4a04d461d9aef6fdfec8c595ee8cbfdb3b610f9c834c62ed12f0ad45858b27a47e5dcc58a7a254c173318c52e8ceeb658e31e4cd6df0a21761dd3a SHA512 874317c9b6ab47584b4c82973aa222e0d6bba693735f3bcf0aa3e90fb929e0871d1c3393ae87f3a00f8e191ce6be33b3b223dbae1cad20c541a518eab6ab0d79
 AUX mouseremote.conf 461 BLAKE2B 323401e37e6824b581ac63c947f5551b96bea35b9901310a039f86754ab35648b09b49fe5a01ce80be518fc6841b424d65c5ae5d1e64c8864035ca080183325a SHA512 b1e99866c0aec8036ea6bbd0e831afca79a5530ab1635fa1f6f407f7c49df5aa1df9c14e7e864fd6503063c05fc882792f6da4785e694865e4ef90d459a8e1f4
 AUX mouseremote.start-r1 607 BLAKE2B 5a260f70faf0fe6ff119c83193e04a497b9865616763de970b978a92e53c63a2ca4e7c36a9e35403ee2b23fe23baf8610bf17d07fd3b0d57eca6d8ef872418d6 SHA512 41783d068e8c3a2d835edde5b8e3d5f124418a80abeadd770d1b62d3fb2b7a654ae62a6008bfac074640fd61307f56dff66d953a234dc4aaa5a6cadd85bdfdc0
 DIST MouseRemote.tar.gz 41752 BLAKE2B 90e80bf4d6584db567e035c293460bbf4d30592fa6c25a6cf97769f4e9879b935ef597d8073f429e630e3fb4947f9e8cbdff7450cb5c3b64d0f482e576e2905d SHA512 d92ec4a1efda7e63cc02283b2aabcd6b42bedba17539371856e6ca3b6b5feaf9c306604db9a781836375afb6da226c16b8031f5f749d367857c2cde28e097483
-EBUILD mouseremote-0.90-r3.ebuild 1939 BLAKE2B a299b4475ce5029fa010e4acb82c8ee70754749cce9f87c74fc7a8e91b4040ddb91555bf844791fac83daa5c7d4f1b362bfe44da51e5842ab08cfd182e2cdc3f SHA512 7ee05d7a0faacdf0edfae7a43d343722fbbd23b4ae34d9159846fd0e4d052bfb6a77840795e60111ea2ecd808453433fd328067dd52bcd8c2ae4435a229942e2
+EBUILD mouseremote-0.90-r3.ebuild 1946 BLAKE2B 6247de2685888c1f6f3ffb03db47be2d337d064411cf0e6d6a470e7374dda1112e50c62b8ce99519e5091570a89e290feaad8b494a0a99dbf9085727890fe7eb SHA512 92672ad450b85454fa349d45fdc9ec38f27e8f151c40ba43b269f1fa707eb868b8a39de4f03be8540f37511380ec8664eebe2e95e477cbc615b621c09933aa04
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-fix-clang-16.patch b/app-misc/mouseremote/files/mouseremote-0.90-fix-clang-16.patch
new file mode 100644
index 000000000000..041a28041652
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-0.90-fix-clang-16.patch
@@ -0,0 +1,29 @@
+From 4363dd75d5df8c85869f0f6f5d3a22d561cff7e0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:28:49 +0100
+Subject: [PATCH] Fix build with Clang 16
+
+Bug: https://bugs.gentoo.org/874957
+--- a/MultiMouse/daemon.c
++++ b/MultiMouse/daemon.c
+@@ -78,6 +78,7 @@ int MakeMeDaemon()
+     setsid();
+     close(fileno(stderr));
+     kill(parent, SIGTERM);
++    return 0;
+ }
+ 
+ void SetSignals()
+--- a/MultiMouse/main.c
++++ b/MultiMouse/main.c
+@@ -30,6 +30,10 @@
+ 
+ #include "mumse.h"
+ 
++int MakeMeDaemon(void);
++void SetSignals(void);
++void Selection(int numMouse);
++
+ static
+ void InitMouse(int mfd, u_short baud, u_short cflag)
+ {
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff
deleted file mode 100644
index 63447b9bc4ce..000000000000
--- a/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur MultiMouse.orig/daemon.c MultiMouse/daemon.c
---- MultiMouse.orig/daemon.c	1999-10-09 20:08:58.000000000 +0000
-+++ MultiMouse/daemon.c	2016-04-27 22:36:59.133322312 +0000
-@@ -22,6 +22,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <signal.h>
-+#include <stdlib.h>
- 
- #include "mumse.h"
- 
-diff -ur MultiMouse.orig/main.c MultiMouse/main.c
---- MultiMouse.orig/main.c	1999-10-03 17:40:23.000000000 +0000
-+++ MultiMouse/main.c	2016-04-27 22:34:58.346647395 +0000
-@@ -25,6 +25,8 @@
- #include <sys/types.h>
- #include <sys/time.h>
- #include <signal.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
- #include "mumse.h"
- 
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.patch b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.patch
new file mode 100644
index 000000000000..11a7e63b850b
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-0.90-fix-warnings.patch
@@ -0,0 +1,21 @@
+--- a/MultiMouse/daemon.c
++++ b/MultiMouse/daemon.c
+@@ -22,6 +22,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <signal.h>
++#include <stdlib.h>
+ 
+ #include "mumse.h"
+ 
+--- a/MultiMouse/main.c
++++ b/MultiMouse/main.c
+@@ -25,6 +25,8 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <signal.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "mumse.h"
+ 
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff b/app-misc/mouseremote/files/mouseremote-0.90-gentoo.patch
index d86902e37ed5..1d73ffeb8725 100644
--- a/app-misc/mouseremote/files/mouseremote-0.90-gentoo.diff
+++ b/app-misc/mouseremote/files/mouseremote-0.90-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur MouseRemote.ORG/client/MouseRemote.conf MouseRemote/client/MouseRemote.conf
---- MouseRemote.ORG/client/MouseRemote.conf	Sat Oct  9 21:03:42 1999
-+++ MouseRemote/client/MouseRemote.conf	Sat May  4 16:04:43 2002
+--- a/client/MouseRemote.conf
++++ b/client/MouseRemote.conf
 @@ -61,3 +61,35 @@
  
  # Definitions for the DVD device
@@ -37,9 +36,8 @@ diff -Naur MouseRemote.ORG/client/MouseRemote.conf MouseRemote/client/MouseRemot
 +TxtOff
 +TxtTrns
 +Rec
-diff -Naur MouseRemote.ORG/client/MouseRemoteKeys.pl MouseRemote/client/MouseRemoteKeys.pl
---- MouseRemote.ORG/client/MouseRemoteKeys.pl	Sun Oct 10 00:09:42 1999
-+++ MouseRemote/client/MouseRemoteKeys.pl	Sat May  4 15:58:58 2002
+--- a/client/MouseRemoteKeys.pl
++++ b/client/MouseRemoteKeys.pl
 @@ -11,6 +11,7 @@
  	play =>		0x0d,
  	stop =>		0x0e,
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff b/app-misc/mouseremote/files/mouseremote-0.90-makefile.patch
index 2f6fb8a81f15..560740c67a2e 100644
--- a/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
+++ b/app-misc/mouseremote/files/mouseremote-0.90-makefile.patch
@@ -1,5 +1,5 @@
---- MultiMouse/Makefile	1997-08-21 08:52:56.000000000 -0400
-+++ MultiMouse/Makefile	2010-08-13 00:05:47.000000000 -0400
+--- a/MultiMouse/Makefile
++++ b/MultiMouse/Makefile
 @@ -20,14 +20,13 @@
  	-DMOUSE_FIFO=\"$(FIFO)\"\
  	-DLOCKDIR=\"$(LOCKDIR)\"\
diff --git a/app-misc/mouseremote/mouseremote-0.90-r3.ebuild b/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
index 5827c8e764a0..3c211b40c07a 100644
--- a/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
+++ b/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
@@ -1,36 +1,34 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="X10 MouseRemote"
 HOMEPAGE="http://www4.pair.com/gribnif/ha/"
 SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
+S="${WORKDIR}"/MouseRemote
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-DEPEND="virtual/perl-Time-HiRes"
-
-S="${WORKDIR}/MouseRemote"
+RDEPEND="virtual/perl-Time-HiRes"
 
-src_prepare() {
-	eapply -p0 "${FILESDIR}"/${P}-makefile.diff
-	eapply "${FILESDIR}"/${P}-gentoo.diff
-	eapply -p0 "${FILESDIR}"/${P}-fix-warnings.diff
-
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-fix-warnings.patch
+	"${FILESDIR}"/${P}-fix-clang-16.patch
+)
 
 src_compile() {
-	cd MultiMouse && emake \
+	emake -C MultiMouse \
 		CC="$(tc-getCC)" \
 		PREFIX=/usr \
 		LOCKDIR=/var/lock \
-	    JMANDIR=/usr/share/man/ja_JP.ujis
+		JMANDIR=/usr/share/man/ja_JP.ujis
 }
 
 src_install() {
@@ -48,8 +46,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	[ -e /dev/mumse ] || mkfifo "${ROOT}"/dev/mumse
-	[ -e /dev/x10fifo ] || mkfifo "${ROOT}"/dev/x10fifo
+	[[ -e /dev/mumse ]] || mkfifo "${ROOT}"/dev/mumse
+	[[ -e /dev/x10fifo ]] || mkfifo "${ROOT}"/dev/x10fifo
 
 	elog "To use the mouse function in X, add the following to your XF86Config"
 	elog "Section \"InputDevice\""
@@ -64,7 +62,7 @@ pkg_postinst() {
 	elog
 	elog "Enable the daemon with \"rc-update add mouseremote default\"."
 	elog
-	elog "Configure the daemon is run in /etc/conf.d/mouseremote."
+	elog "Configure the daemon is run in ${EROOT}/etc/conf.d/mouseremote."
 	elog
-	elog "See /usr/share/doc/${PF} on how to configure the buttons."
+	elog "See ${EROOT}/usr/share/doc/${PF} on how to configure the buttons."
 }
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0a50cc2908c3..153702ad2471 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index 6ca4b24b96ed..5d2cb28f20d0 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,4 +1,4 @@
 DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
-EBUILD libucl-0.8.1-r100.ebuild 1490 BLAKE2B 55c295364f548c2e3c48c5b4f771fa70103382d3c292d55509a0e474f84af7909d6c49a3812ab207188112a9333bea1eca950a8f7c72612a7d03c72267d62829 SHA512 2947703267883f73d58d74b8ccba8a513f93ad1eb5fa2da5a8b9533b91a71d8e14fc1c535254977725fc6dfb18c1b97cb80e7202f33ec98ccdc41d11209a8c00
-EBUILD libucl-9999.ebuild 1490 BLAKE2B 55c295364f548c2e3c48c5b4f771fa70103382d3c292d55509a0e474f84af7909d6c49a3812ab207188112a9333bea1eca950a8f7c72612a7d03c72267d62829 SHA512 2947703267883f73d58d74b8ccba8a513f93ad1eb5fa2da5a8b9533b91a71d8e14fc1c535254977725fc6dfb18c1b97cb80e7202f33ec98ccdc41d11209a8c00
+EBUILD libucl-0.8.1-r100.ebuild 1510 BLAKE2B ee18667e322d4f17ff1ccfa1559f131e0bb601e8a403b00712749b1071f82e2153b226eb5738fd452fb65a6c33ded8c4d2e88fa2b40fccde4755845f34aa6e3a SHA512 a222fffff87d59deca9a7565185da709187a39a14256bc51c88f3c03c8e71569d20a26caf3fbb70ffea19a8452418f766f9471c5bcbfad2fc64ab40fdfbb4f52
+EBUILD libucl-9999.ebuild 1510 BLAKE2B ee18667e322d4f17ff1ccfa1559f131e0bb601e8a403b00712749b1071f82e2153b226eb5738fd452fb65a6c33ded8c4d2e88fa2b40fccde4755845f34aa6e3a SHA512 a222fffff87d59deca9a7565185da709187a39a14256bc51c88f3c03c8e71569d20a26caf3fbb70ffea19a8452418f766f9471c5bcbfad2fc64ab40fdfbb4f52
 MISC metadata.xml 753 BLAKE2B b2ec84a2e1bb8227e1e5ffc6a33ce008456c7e858291b951bfbdf72dc3c8bbbcb9bb34f2a376aecee94d073c5f9fac81a3e0208454f688eb5cb2a554645e5166 SHA512 ef5a33e0fb26259b2caa719f246065164ee501828b583f6b54976149c5d212cc9d80f5b81b1e0ce00ed59defd61f7447bf731057c67a018936f19c6457d18076
diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
index 2eb9fa97c158..8b3e4c0b5cc2 100644
--- a/dev-libs/libucl/libucl-0.8.1-r100.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r100.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
@@ -35,6 +35,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md doc/api.md )
 
+pkg_setup() {
+	use lua && lua_pkg_setup
+}
+
 src_prepare() {
 	default
 	rm tests/schema/{definitions,ref{,Remote}}.json || die
@@ -42,8 +46,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use lua && lua_setup
-
 	local myeconfargs=(
 		"$(use_enable lua)"
 		"$(use_enable regex)"
diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild
index 2eb9fa97c158..8b3e4c0b5cc2 100644
--- a/dev-libs/libucl/libucl-9999.ebuild
+++ b/dev-libs/libucl/libucl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md doc/api.md )
 
+pkg_setup() {
+	use lua && lua_pkg_setup
+}
+
 src_prepare() {
 	default
 	rm tests/schema/{definitions,ref{,Remote}}.json || die
@@ -42,8 +46,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use lua && lua_setup
-
 	local myeconfargs=(
 		"$(use_enable lua)"
 		"$(use_enable regex)"
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 166a914d432a..4d220d529af2 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.34.tar.gz 636031 BLAKE2B f33c13f4159fd6e6e83e3aada2560ed6f2160811eb1d94078c8792c5dfb07cc6c69f2a41f9b82ddf73b28b2cd57480590393b3c6b5ac24eece1ef40e55a52014 SHA512 a93ecea84d506767d20f03fa8b56408c6e8a0aaa4b8dad26b21e133c83a4726ebf3ca88425bc63249cb98fbd95dd3bb4d9afb8529bdd5e70fc5dbffbc6bf5533
 DIST libzia-4.36.tar.gz 637486 BLAKE2B d9872b4d3b3dea05a2b18b36fc4aeb75696d83fa98154ed716f70f9906c7cd66fe60a36dae802e2f05145c27945b9c97838b09a4414009b58caae86805e011be SHA512 4eaf2aa19bf85abf17299d70b2d9c6c15b9d99a4b62198675860fe8fedadec8deccfd5c664368a110e4c10cf2f6c936a85e7cc689d59cf03a1150f39a9164cbf
+DIST libzia-4.37.tar.gz 637291 BLAKE2B 1f221a0bf1229a2c6b863363e3634b51177a9d45a1f7b828e5fb85da3e2a9a319e5deebc3a7640ca5c4ed3004fa087b81d5a5bc59197b0ad90e161e1989c02ed SHA512 5b3a708f243ac845505645da0e2a76658775a49edfd8cbfd6fd99edd8bee13e4c54d6038ccccccd258c7a9d80943265486b01bd127a86c7c880fefc0a714cc39
 EBUILD libzia-4.34.ebuild 1190 BLAKE2B 9b6faa760f7ef5c0bd134d72a43903e927db0ba2ab9191611355ca62caa6378920e6265a217e0b85eceee7401a6faa22691b64f9125bd180d944a89474ef9d21 SHA512 4aad61f2c2bab235851613f3175f9b9789458cc911ba6e07e8d2c56e320690696c04e1138459741bb9a16667259d4ce362942c65a2235e0d8349e344993f0cbb
 EBUILD libzia-4.36.ebuild 1190 BLAKE2B 9b6faa760f7ef5c0bd134d72a43903e927db0ba2ab9191611355ca62caa6378920e6265a217e0b85eceee7401a6faa22691b64f9125bd180d944a89474ef9d21 SHA512 4aad61f2c2bab235851613f3175f9b9789458cc911ba6e07e8d2c56e320690696c04e1138459741bb9a16667259d4ce362942c65a2235e0d8349e344993f0cbb
+EBUILD libzia-4.37.ebuild 1192 BLAKE2B 096ac59fc183a8b54c86eb8c3f63fb971c05c9a7331d029f3ed102da207512a196f5c69e2f8c99a6d457e781ef621e6512fa124f6b2006b51837b3ef78155f93 SHA512 59439daca828396c5101fca4a8b6173ba53b642b70236577f3c913220041179d857f2b8ea683a2b249868074bf3cd2e8e29fa9f7de26de1241c176b6377f8ceb
 MISC metadata.xml 326 BLAKE2B 1b8ed6c9d40252f3371cf9a1ec295f593c8898dd8e45173ca05cededf987c7e44e2fafca613f8ad3022e9fbb6886d6aec2d183fd47c3064f35038784f361ebc4 SHA512 0c8a48b1101aa184dc596581feaf47463688801cb0f342177ecfb6fade1d63520ca1b9dcb278279470c181b560f555de332e4d2583e8856eec9057cde34df48f
diff --git a/dev-libs/libzia/libzia-4.37.ebuild b/dev-libs/libzia/libzia-4.37.ebuild
new file mode 100644
index 000000000000..ab1b7f2cd743
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.37.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:1 )
+	elibc_musl? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	# fix build for MUSL (bug #832235)
+	if use elibc_musl ; then
+		sed -i -e "s/ backtrace(/ unw_backtrace(/" src/zbfd.c || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	use elibc_musl && append-libs -lunwind
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d2c3dad6cd6b..c454acc71fd7 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 4be3ab4c5300..9dbff6b41289 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-3.8.1.tar.gz 7324180 BLAKE2B 99f85b8510782a31de2d2f6c8efa65ef5c5cde600a5c5f49d6362d5833a0443b9adcaed9beb27c5d8502aca37af154b06017f48836b73d4c61d78204b62b7f05 SHA512 3611549393e50c8d30426aee9ddd23794a71ddefe4384eb549049b93e452fafb38de7ad900737213b61fbe717bd85035a780c1622593eae250328f17d484a0a7
 DIST aiohttp-3.8.3.tar.gz 7337480 BLAKE2B 28d2b5bf6dd6f19506127747511e006c22fcb59959ab090bdc53ca5ee0f7f186aedb0c8b4103c2ea52399dc998fa2e6d3f872239223cf72629a1168e3950f1f8 SHA512 248c232604c91442b2fc9fa55fbf7df8e3af56dcf4cd9c516414a3a738c5c60a8a06395cd9c6e2c8ea9884728aea757423735c7b9be889e6f17e3ee6395a2f64
 EBUILD aiohttp-3.8.1-r1.ebuild 3657 BLAKE2B 2da81b97e0b3f1d167557b6d675acd9a857e45b45166e924493900eaf395e77cee71d45b2f0c7e428ce7a0f22bd47cbfabc49fbb9e462216029a271a57dc5f7c SHA512 d9b644e44be853ab68704d175ac8a99bb292fd09fc8097c356ee0f8b06335420c3cec66bee3d20a554c0413d278e35c25cda08251fc5e00fcca20f2f68cb0e69
-EBUILD aiohttp-3.8.3.ebuild 2930 BLAKE2B 4263aa0e93bba3c8ad8b304c1e876784e82d9a5731c74919627162aeafc6e45743f05eda133e2f5522b3c297e95de46cdf11a8a801249aa8058b3bbd447aafb5 SHA512 b38fa068f3ef3dcae065476fd61223173302dabdd767f798b767b4af4f24de875fb458d08b0a4f28b71b4a0f94d96f011d331303614dd3e1b313d4a596e81bb1
+EBUILD aiohttp-3.8.3.ebuild 2927 BLAKE2B cb43525209573c9c40e756c1b827739d2bcc5c4e3c9ebe71da6208ae55bdd1d9f00a2ca9ceb5cabafe11c36a956b78dd884709fc215c510b1fcf4d6a0e7d2808 SHA512 5bd0115445b19e4099b3b613eddc00d3690456149e09b47ab214c39f53fbab62c8197602ea83d5b853daa70db2f31ea5f1b4723eb99f10538c72c549f274fd03
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.3.ebuild b/dev-python/aiohttp/aiohttp-3.8.3.ebuild
index cc7d83ae9c0a..d2bdc579f31b 100644
--- a/dev-python/aiohttp/aiohttp-3.8.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index c7838318b1fa..3b690b0d7bae 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,5 +1,7 @@
 DIST brython-3.10.5.tar.gz 11106672 BLAKE2B 4219bdb99efd666e37ee08283e58f288e06dac52454931f72bcb4f3bf61a380fb1e01d724f49e598f6d7a95260609767d4536b5f04531939daaf93db6cdb23ad SHA512 7d2f50f94c9762d6587a9b0ed76805b14a5c2c89c0d27c7e181a3e3abdcdd28c9691fb80cd472f635f5bc6c36c884becd9a5625da4825d551b57b6b0779d3529
+DIST brython-3.11.gh.tar.gz 11684005 BLAKE2B d2ec61082787bbb571fa3a7239bad4e5d633e20f392684c532477d23ab7480dc0c3cd30a837c32fae57c88fa1779afec71bc7adb63bb4abd8f6d2d78717d55ef SHA512 98ee9c8cf1b3f8103310cf08b639fcea6675d178aedde5f425d3b44eac74552e569a8abca8cb6935cfcfc43a009ea73abbc646557a2bda916e5328a8933bea0d
 DIST brython-3.9.0.tar.gz 10232037 BLAKE2B 4dc70efa14174f90cddd72ba9c07afd7be4fc81cde3f9ace7b5f015acd4cc18e9ab222aded496523f7298cb7ecb93c1d691fda818ef9fe15fabbb876143af487 SHA512 fcacc6f5e959afd2c84980eb0a650028ad018f4ebda05c53ef0a73ef5a8e1b4a28b2940c08f6b5e82bb52975b671610ad47e42de0d6d3030a6b9f5af02784c20
 EBUILD brython-3.10.5.ebuild 792 BLAKE2B eba0c38e889b3eba79382ed812234b62261a49132e7e636b9ba90142071b32a8d5d3eb130b221d6827d6e868d582dd2500c1bb62dcda73b9e91711b1419d486d SHA512 84a248175e06b7ee43818844f5e71f0c3a08ba7ca830abe6df1811ae2f9746ab5b2b545d53caec1834a7373acdaf711cc20cdb2f3c3f6ebd4bb475568cf77011
+EBUILD brython-3.11.ebuild 800 BLAKE2B 02031743cdf108e0951244d9c5c4f117a8251fea01fa198010ce3fbf4b2757526ead39f4f189b0cfc03560e0e41962259c5b717be56c5063125278cca9ed8c37 SHA512 fc6901a79eb1632c1a1440042ef6f6775edfb74f4380125ad814a2b9bccabe45e9158dbce5286faee8dcf8270e2507bbe80d4c1a2377a8ee8f27d39e631a887e
 EBUILD brython-3.9.0.ebuild 761 BLAKE2B 8994e3c54de9d6855e703ad61b38cba69cfc68f34a2699be873e5f3d61650ab5bc749a9a3a9a2ab44eed93746ca4e5902c0f382894f7a8390dfabbafd56d5900 SHA512 e08e84a14f0b1f1e76b3328f4ee198bdeb981b626d88474321510bc961680fb7c2ee8722f45d842b820c60b7a1f98e4e349a7f33d2e711c143072f82d470d85c
 MISC metadata.xml 381 BLAKE2B ed49c3862223d1919202f08010e8e350d8231c33924c8b664a4cb03a09a5c75f3915840ce0b8f7d36c73809340fe3493f748b0f90bf02022f6d62b591a12ccc0 SHA512 7e5d3ac1d9ef869107f56816adb1b09c0c78772c4560fd9ada43a88bdf15fa9d3e53cfd8c4e8b814016faec0ac78fe2f2725f94c24e2c8453a184fcf0a4f123c
diff --git a/dev-python/brython/brython-3.11.ebuild b/dev-python/brython/brython-3.11.ebuild
new file mode 100644
index 000000000000..22a048a8d943
--- /dev/null
+++ b/dev-python/brython/brython-3.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit webapp python-single-r1
+
+DESCRIPTION="Python 3 implementation for client-side web programming"
+HOMEPAGE="http://www.brython.info"
+SRC_URI="
+	https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	dodoc LICENCE.txt README.md
+	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
+
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_src_install
+}
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 8ac7169b3959..f4091572b6d9 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,7 +1,9 @@
 DIST jc-1.21.0.gh.tar.gz 11910267 BLAKE2B 7d02f6b574dc2171daca9682ef5cfe2ccdba6230320fc331c086c47b147e49efbd11fcb7b7f26bf4d448d4462f051b5b6892eff16e853cdb6cc4927f5cffddba SHA512 5382aba5c6ea0409fae31097516912d07133d2c14eb529e9df742f2efe4682c7e36e934786c9b12454d23e4c3acd5bdce3e97f410303b761f695db787058b034
 DIST jc-1.21.2.gh.tar.gz 11910311 BLAKE2B ece8651c55f62821e30574cc208f3e1a569a2408ae1c637329556d49aae894afd7a57cdb7c70a0fdd16136fddd7329a1cefab493848376f22d5fae553c0231eb SHA512 3860e429a11131b888fa0689dd627016d3e9c052908979c22eca604281f13ba3df7164cdfa04ff6e4e08146b42d7bd76888efdcce65a549d5c904ecd207209f0
 DIST jc-1.22.0.gh.tar.gz 12062944 BLAKE2B 8a4f301c563cabb5ee780280d3aa3caa64a8cbab7972c67854e0c7fb53ba86c6cae12682f6bc8559d51ef692e0352378c01a223848249c0f8f3b664bad63e7ce SHA512 832ef3d209bbf6e3d3a4b7b038e80fc0dcb99d4ba38732ad393fdbe59be4f5d86428cfbbdb81f48d5902b31bdea635996a99aeada19361d74c991e711560767e
+DIST jc-1.22.1.gh.tar.gz 12676358 BLAKE2B dbea5d19f28abf7773787275b8e5c64b8ceee07e56474336b37e35d76bf3cb3b6bbbad0d4e129fd118dc2eba03dca7f12d07c41f469f6d0e81fad1e4acb8af88 SHA512 67fba63921b9c8bc6b47a6d8405a693ce68c7338ad0d05565a0a4b4f7872ff83d27a97241daa8bd5eeb27299e630154b7a9d923bcd00fb121c25ac61f70d3faa
 EBUILD jc-1.21.0.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
 EBUILD jc-1.21.2.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
 EBUILD jc-1.22.0.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
+EBUILD jc-1.22.1.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
 MISC metadata.xml 492 BLAKE2B 100e7421c33b90fb9180a3412206cdc2355b26dcacf988f1157a725ca8ee6eff44288ec12f8274360f086272ad3bd06e9df6a93288edeb9102551c65256a47f4 SHA512 cb0abbd0c1b02b1fd4c74034e1f41a53ed0b7f297dcfad4e9f6b2a4960e16790b5d879f407ab18f73c81684d3a0436327949bd628a1d1d146958f01e34206688
diff --git a/dev-python/jc/jc-1.22.1.ebuild b/dev-python/jc/jc-1.22.1.ebuild
new file mode 100644
index 000000000000..7b7bbfc30991
--- /dev/null
+++ b/dev-python/jc/jc-1.22.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="
+	https://github.com/kellyjonbrazil/jc/
+	https://pypi.org/project/jc/
+"
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index cea376d3c647..a0452f6456ae 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -2,8 +2,10 @@ DIST jupyterlab-3.4.3.tar.gz 17074198 BLAKE2B 08a0aa4ddaeb6b48a742ef78e1b8cefb95
 DIST jupyterlab-3.4.5.tar.gz 17108960 BLAKE2B 83f4e99a1f98265df50857988dcd011862a0be4212abd8217cc330b3b536f5c7de2486f5c19e692c78eb8305f73c11a11772b510847ec25d756c81c828425ce3 SHA512 17428899b577a9e661ea755e3d6e2e3d640ca4ae28cd51e197520b9a388088e2a0d52a799f14b128d94f0c1ee2ec7580e309586c63e1d2e3b6019ae1075abc1c
 DIST jupyterlab-3.4.7.tar.gz 17111219 BLAKE2B 8e1246b56d75f2336ab46ca66f371dde275327a445563a8c41dcb528b58558c902776008f25b28e8a4fb299e9692c20b08c224f71304aa6f16143a757548814a SHA512 16a6e38fafbe3f8daa7f2e65b511e30b65800a1b21ee5e6360faae4cc1806472268297582f12a45d39d482ed5f25fc9c6874299e5e05efed5f50e8f2a3986c66
 DIST jupyterlab-3.4.8.tar.gz 17104727 BLAKE2B 7de7d899caff7e3a9641b7568ef63a9f07c739e474cb998cf62cf62abe2d51e488d52a644ffb4d0b5bdd46cadbd15d53020c28ba9602019db1e4b25d1fb696cd SHA512 244a38077e752d5e7066da6a312fa75ac3810bffda62b89133b7cebe459b35fedaaf320999c8ecf452c98ced6e80a16e290c4df9c8f741e1662aafa10785f9e0
+DIST jupyterlab-3.5.0.tar.gz 17110889 BLAKE2B 89b20734dea44419af023b88c85b243fa3f8ac0c7272600729da8690eb53cd4286d9c9bb90e95e291644de3675a9daae63898d6621cc4c21b4fc8e0d965242b4 SHA512 43b893127b5b4f1ccd472dfe9152d4ac8f89192411d1fa6045e3ecfb5f8f16819d1cf4b6fd70d9656d25d10cafff55055da98d36d2c8537d5b07e29e2d157799
 EBUILD jupyterlab-3.4.3.ebuild 2450 BLAKE2B 715a8a45fc654a503eb336dfe5fd53724de72ad0cf5465ca69b2b1bd7f53c7c86fc62d49fedcd6d99c758b3f91276bd87151267ed58190a16e21f428e4313c93 SHA512 e37a8693fb4ae9d0699b5720250e91e5b9d792c9e48c23ffa13cce9a5a2d4cd090fa406e70f644d07e24a863074ff6c1877ac117eb82382b4531c50817ee482e
 EBUILD jupyterlab-3.4.5.ebuild 2492 BLAKE2B 6f0bd7b02b89902235e79f685e85a50f7a939a807c095585def3a5289e36365dbb4651914903d0a3d2e45882f3ea36d89c38618c10a9f7a43bd2321eaae6e8af SHA512 53d169aa9e79573d136e1f181160beefca13d4969084110b7ead88447cc0b9dd34e605285e80f230c2561b6ecc28d767ccf3cdfc5019fbb9dc441dc9e6bd6a2d
 EBUILD jupyterlab-3.4.7.ebuild 2528 BLAKE2B 47b3da2d0bf1ce023ff593b02d416e6a4cc0f9c94e701f3bd4cb10676b840a1dace3cca3c8adb12ec5236c4dce9c3a080d03debc98e2d632bdaad4b183e552bb SHA512 e3e77a91f0a41270a5ac058c4898c6032730c728abee2e64f650ce71c4ca18cc68d45f8daeea091009f784b8659f3fa5a0deb55bc8a9b3413697b41c5884da94
 EBUILD jupyterlab-3.4.8.ebuild 2533 BLAKE2B fe6d8794e22332956920182ee42d98cfd748dc9d59966c9ab2914083ec7af12d1828e2a2dab515adc245e96522beddb541714b488d3f7fe98c7f8f9120d617e0 SHA512 e72f0dee548a2db97bc3d938005e723bd791f3023dbb1496be863ad5902a590a7e2bf8bd88c5e2d870ed737734aa9cc3ab03e0ebffbdce66b4a08552d2e6da08
+EBUILD jupyterlab-3.5.0.ebuild 2533 BLAKE2B fe6d8794e22332956920182ee42d98cfd748dc9d59966c9ab2914083ec7af12d1828e2a2dab515adc245e96522beddb541714b488d3f7fe98c7f8f9120d617e0 SHA512 e72f0dee548a2db97bc3d938005e723bd791f3023dbb1496be863ad5902a590a7e2bf8bd88c5e2d870ed737734aa9cc3ab03e0ebffbdce66b4a08552d2e6da08
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-3.5.0.ebuild b/dev-python/jupyterlab/jupyterlab-3.5.0.ebuild
new file mode 100644
index 000000000000..1491c0f13490
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-3.5.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=jupyter
+inherit distutils-r1
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab_server-2.10[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.16[${PYTHON_USEDEP}]
+	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
+	<dev-python/notebook-7[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+BDEPEND="test? (
+	dev-python/check-manifest[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_server[${PYTHON_USEDEP}]
+	dev-python/openapi-core[${PYTHON_USEDEP}]
+	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+	dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+	dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/requests-cache[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+)"
+
+EPYTEST_DESELECT=(
+	# These tests call npm and want internet
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
+)
+
+distutils_enable_tests pytest
+# TODO: package sphinx_copybutton
+#distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/myst_parser
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 2db44fec9e5b..19ae4464f81e 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,5 +1,3 @@
-DIST Mako-1.2.2.tar.gz 490741 BLAKE2B 88408c10c6cae891969d67b204ade6bead6ff8f8bc4521d0a48c049b97594deb286acbddf1135caae77813d8ea075c3825ff5c738b6dc3406b12fe2048099bdd SHA512 4a9303b18710ad8111f4a83e963289df490cf1d01bf3b262e89fb2e9bb98a96fe2c83f8900597d836411d136b6ccb686f67b6e1554c4fe4868e68af1c864bcfe
 DIST Mako-1.2.3.tar.gz 491336 BLAKE2B 75a393bc91e40adf65b584f829e8f454ec894b6f09581d7511e8d5a3d534c301b8e06418a3aa896953270e54e70282afa6692b43debb8abdf122fcaeb754f1ed SHA512 904b12826b3fc74dec069e1fd4afb67a8a1962d72962c4ee8c9360deb728b8deb40c21e7bf831122ad6b095172a8de015222a97f47675d48d595c8eabd98a14b
-EBUILD mako-1.2.2.ebuild 1079 BLAKE2B 5bdab1d2d11422fbbb8a6a915f089c244c1bad9ec99c5b076b8cdf994441aa7eb1dc154b4ffc7765176426d6befbb93ba21232f2295d4bc5960de7073852a8fc SHA512 13d1644d606f0bb5406d5e2939c61556a7bc6d322d3daa1e9a25a85245782d1ef7f6286f9f071d4736131c3a44a20be8c8056727b8ef01830a0d6a3f1b3761e3
-EBUILD mako-1.2.3.ebuild 1087 BLAKE2B 70e3c032f6cf43c69bdefed725ef4cc57eefce352c310653a696bb930015deadb87869bfc3d5e6e369464f1bb8f02b88f026f6905afa218e74ec2c30a3b79ea7 SHA512 75c4547af99db5c19ed40a1aca9d963aa73314e74f01f1be79d4f98143c6ef440c4256e1ec48ab9344ddfcb1e99ef4c904f6c83eb02cad7de6190700980769b5
+EBUILD mako-1.2.3.ebuild 1079 BLAKE2B 5bdab1d2d11422fbbb8a6a915f089c244c1bad9ec99c5b076b8cdf994441aa7eb1dc154b4ffc7765176426d6befbb93ba21232f2295d4bc5960de7073852a8fc SHA512 13d1644d606f0bb5406d5e2939c61556a7bc6d322d3daa1e9a25a85245782d1ef7f6286f9f071d4736131c3a44a20be8c8056727b8ef01830a0d6a3f1b3761e3
 MISC metadata.xml 450 BLAKE2B 271e9801e0361eb9cf222fa9aca34f641e6118e17707469a87c1b41a6de34c67ec6a19576a86cc3c7ba1f671f8a28f9df8e994b3f232fe224eda85f4b8cf8b8b SHA512 d168ca10d7759129088a0d10ad73e4d0973ccaed1e649828077158aee55a8640db2446c9d874ef0da4fba5b27a6a0eacdc9d9ff4ec04a19cd1b9699542b5b0c1
diff --git a/dev-python/mako/mako-1.2.2.ebuild b/dev-python/mako/mako-1.2.2.ebuild
deleted file mode 100644
index 458c821b2cb4..000000000000
--- a/dev-python/mako/mako-1.2.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P^}
-DESCRIPTION="A Python templating language"
-HOMEPAGE="
-	https://www.makotemplates.org/
-	https://github.com/sqlalchemy/mako/
-	https://pypi.org/project/Mako/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/test_exceptions.py::ExceptionsTest::test_alternating_file_names
-	)
-	epytest
-}
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mako/mako-1.2.3.ebuild b/dev-python/mako/mako-1.2.3.ebuild
index a0e0b665671b..458c821b2cb4 100644
--- a/dev-python/mako/mako-1.2.3.ebuild
+++ b/dev-python/mako/mako-1.2.3.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 33d32b47cabd..98e56e8bd353 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,7 @@
+DIST pyicu-v2.10.1.tar.bz2 192780 BLAKE2B 0a8dea0091e07b889fbe79895b1a1fd030e29f9be02303e9b70b7380defaea14eeecc87031e4c1e57bab4a56680fad51f1489d117f31492a50c0323eefaa288d SHA512 a542fafdd1c64971ac4cf7fe0189324969cc4039319950663819e7040d9406ea200a84d3f2821a9a94c944087d0dbfe74fecebb430a01476114b6963ba83c739
 DIST pyicu-v2.10.tar.bz2 192789 BLAKE2B 824b83177b420bb78633a2d7b93bdcc781ec87ea105e7441be59547c6f56fadf292aa331decac96f095672a4d2741d709ed32dec4841b070bc056e7f0f8d65d0 SHA512 8f752ba97fc5ffc3004591826b47bd76c9b99d73a3784b2bba746cb611969a47a98971c89fe0b35dc817fd14b93b1bf0e85f4bf23986af22bcf5401485899c9e
 DIST pyicu-v2.9.tar.bz2 243533 BLAKE2B c2ea32f69637e2d12a57ded96b570ba7fd41c92aed4a0dea36ebe5c224b80fa8d1672251f8218e0a35d463957ab4291cff778c3e690f0763e465dc6f0a1af26d SHA512 f10025afe1a0de5a1726c3d4aaec5b10ba62064c33205117efe643185dcd3560e8971b600606e9699269cca795477bf86ed2f9e604e9c0e04bb75a86f31cd114
+EBUILD pyicu-2.10.1.ebuild 679 BLAKE2B 71d32386564aec1da6ffe1a59ed68ad9bd15693f5363ce51f4287cc8f1290055f69d79e9a79dc75943c29265ee3764f83f146232b081662968785a8045392baf SHA512 f06004ecf0a8eb878bee56049f3ceb84843f6179f45efcbdb5a07396b5e101af12df84decd3902b54582cd8ee05c613c0f676e7e610feab9c82c751769194696
 EBUILD pyicu-2.10.ebuild 682 BLAKE2B 4c6fc8f74ba34a6f83fa9039e094e16d387acaa6ede225ac6a9709a197f29dc9377be3d8c4d01b7bbb07ce3c01a6106eb43529cbceae635245097fc8e99ce70c SHA512 3b954ad2a3bda2105ea90b95b61d082d7036eb9ca7140104521e0414a2c611711a85405810ad39b4eb3e5db234a07d9032fa27c262c4e69791f56e604ed0aaf1
 EBUILD pyicu-2.9.ebuild 681 BLAKE2B bf4d51d2df8c47b221d6e7c11a0bd7503b846a3f3f208dd8d7cfb7b6840ac476e486a42caf0466205c2e86a46509924a76938cdad64e8a7e5d966c7b54b4306f SHA512 c7fa76c08368699425e01e2bc22667a6541afc75c1c0400c409e7935c186f345c29e400c06ea35e6e43d19c880bee645ae308c5495ce2bbdf54d72995ee8e4f4
 MISC metadata.xml 415 BLAKE2B a96dc033850e25f2afcd4128d38becd7c86263e5bb366a701c88a2bc81118aef03217bbfe0c2ff0719f636104b2a12995815c36f2a3e6539136509c7900c25e4 SHA512 e8d901e2276b0a92ae8e0cdd4b0e1cacd29d9eda86491a31a2057d013b7c4f8c340d0e83dbfd53500906f79a827d837cc7e445c24e6cf5b50ee809ec2c35eb13
diff --git a/dev-python/pyicu/pyicu-2.10.1.ebuild b/dev-python/pyicu/pyicu-2.10.1.ebuild
new file mode 100644
index 000000000000..1759ece5b608
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.10.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-/-v}
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="
+	https://gitlab.pyicu.org/main/pyicu/
+	https://pypi.org/project/PyICU/
+"
+SRC_URI="
+	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	dev-libs/icu:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES CREDITS README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index 5c6c694abd73..ff5c41361931 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-env-0.6.2.tar.gz 1693 BLAKE2B b303b8b2b486cd5f6c6273fefe709e3986183a56b6758b05f8bde973c561ebba9646538d38783749305740d8bd637966966a109fcd600cd6f6ee059449ffb328 SHA512 0b3bb21fc881023c102b584593c6e28840400ce8190810f33f9a421df4141e17dcfad2943c4159aaab82376b7b47b07b45f97c9cb232a7d17c4d35b55966596d
+DIST pytest_env-0.8.1.tar.gz 6926 BLAKE2B 1d993947c5d67a57832e170e2cc2cbe56f5f1eef37d96790ec3965e5d7b9489771d1890ef7c6f4ae504e1d6d22845cf9b1b3fccf3caeacb3e6ff33d5f86b9279 SHA512 0c99db9c5467f5fe6f8655e540fff4b91884cef3553daf455298d2dc7bb51439418f3149b941d37a777199f28d82eccb2073fdd5e09bfb97cdf24d3ddb1d21bc
 EBUILD pytest-env-0.6.2-r1.ebuild 492 BLAKE2B 83b45fa4c8799fe025a6c1fdddee4ce7f695f03fc35e8e8677c9380ab7a56cd4c924aeef79e6d5c5197da8944ce650218b5681996bbe9ea3d274ed615169365d SHA512 4e80b35540a58eb1149a56c4c99f78d3e2eb2d0234b152a0aaf8c9b5feb66e66d8387e3f69a98c205ab2b5567fe9e9e36907c2d2f31e969746b0a0ba72e5f47e
+EBUILD pytest-env-0.8.1.ebuild 498 BLAKE2B 6049f8269ecb7f8524577221d43dd1d8de87c11d0245da119c447f662a511c3dffe8fda29947ab440a5dcebe6f19cf4eec84eef21c6d5af3a6045ab387f51c1a SHA512 14565efa08009e93c1ce650fe0180b5dc7645c1a4dd7f89afe667152bc928eb5320b6996066a4185e1d0774658ae322f5aacd352ba180b8836e137de3eddd8e1
 MISC metadata.xml 407 BLAKE2B 7353d52edf97f5667e7f3119b1896cc04ce6bb5f3e88eaca88091c7c24dc8a077b50c1b03bca5975c82cf70bf19af6e9a94a59043694980796ca8714850aa0dd SHA512 f0d9b4f02428c70f3d55f70d44f02dc198a363cbf7f00f7469af8cfdd729ef7467f115f98d84f038f6c65b58bbcbcaef5fb79b9992494b3ed598b64a94d9dc71
diff --git a/dev-python/pytest-env/pytest-env-0.8.1.ebuild b/dev-python/pytest-env/pytest-env-0.8.1.ebuild
new file mode 100644
index 000000000000..3ab29754ad80
--- /dev/null
+++ b/dev-python/pytest-env/pytest-env-0.8.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin that allows you to add environment variables"
+HOMEPAGE="https://github.com/MobileDynasty/pytest-env"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index 6703a3b00091..8f367d691186 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,7 +1,9 @@
 DIST python-cstruct-3.0.gh.tar.gz 25950 BLAKE2B 7ea8c77ed87e4fb740c3f7a4ed53a7532ee5aca15ee46fbb40da7308ae62ceacd7ccc67a958e6355904604ae67c9594acc9cae5d18bfed0558b91f7e9c8ad0a9 SHA512 dd1c85363512edc4df0379dec40e7d7fe3ceff1cc4014eae8dab0e91c47ea9c3619211e1a637aeec134ce713d0681688630b7fde97f02c6bcd7103a32f258a73
 DIST python-cstruct-3.1.gh.tar.gz 26633 BLAKE2B 449510cc8cc6661270d2618cd347eea2044eacc8f665ed2f55bc6fcd95bcf79f29f8bce6498d372d8b5b78f854edb06afb89a3f3ef7f5de37582ebf68d178db1 SHA512 00e2165c14dcc4461600a8eeef5c71bcaa6e59955c23d08055aff2186b16f20d6c10fdb1a02f6e263e27070fda562c712df0c4ad2440a25dc5f23afaa9c88719
 DIST python-cstruct-3.2.gh.tar.gz 26876 BLAKE2B 084c4e3e1e5a48ee15c40e25a846b09dc1af1fe0ef9734bddad14ebac91e2bbdf78cffc39dd861f35d7ed307f1dfb14cb7b15dd47b900d3c943bf3245adb9ff3 SHA512 8b912bba7a31a8cacd77e07008ea1a0603c59c49e2cbb4a8fee158948b05166f2223c983f58c104d73c0fd868bfaebc9f38669277f27282486cfb064d9026ab5
+DIST python-cstruct-3.3.gh.tar.gz 27470 BLAKE2B 0403af7085622e26d5faf973bbfd0c7e35f5c51f0597abf079080800055058809a07a795bde37b796809ef13b6e1d030f36a42e45a7f4643202e37fe79df4730 SHA512 fd5d7d42f5458d37a44d5e792b56e5c4f3338ed656b248ec5f4f48e4ecb5b6be7e3561c697d67ce0c6a18fbef62ba4945e287754cb2d6a97fefd65c563d65774
 EBUILD python-cstruct-3.0.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
 EBUILD python-cstruct-3.1.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
 EBUILD python-cstruct-3.2.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
+EBUILD python-cstruct-3.3.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
 MISC metadata.xml 454 BLAKE2B 5138bc275b0b9e18cab52fb309283c6b6dab8be5dcc3c86dd6526f350b216c68bc94dd2aabc7a33a4879c23165924563396c6d5991f5c702a12e184067d25cdb SHA512 bb259a25444029d8ea63577f0576ab283282298d27987e276bf4eb6d4ef00853ed019ad199830e9bb4e738f9a151feb55d53e76917508f1033c2b3ecd246276f
diff --git a/dev-python/python-cstruct/python-cstruct-3.3.ebuild b/dev-python/python-cstruct/python-cstruct-3.3.ebuild
new file mode 100644
index 000000000000..7b8d01c50942
--- /dev/null
+++ b/dev-python/python-cstruct/python-cstruct-3.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="C-style structs for Python"
+HOMEPAGE="https://github.com/andreax79/python-cstruct
+	https://pypi.org/project/cstruct/"
+SRC_URI="
+	https://github.com/andreax79/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -e "/find_packages(/s@exclude=\[@&'tests', @" -i setup.py || die
+}
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 946226396f94..1deffb40d919 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,5 +1,3 @@
-DIST stestr-3.2.1.tar.gz 118139 BLAKE2B dedb63767adfab26d837ce92762dcc44a482b1772aecbc31d12beb22f2c3c08368475cd110de7376f4df7fa8ce03c5b8e3b04436296ad4bd11c2fc3a4243695b SHA512 43187ca0d81e3b31e16ed60a1db561dc49c34f679594d11cad8cb0e658bf790af0b3d606bf99233a5767e2511675d3aedb6a476046d2f5483ffab05eaae393ed
 DIST stestr-4.0.1.tar.gz 111695 BLAKE2B e9ced9237f3c889c2eb116b51645a6d8b86d8085e2991b421b8955772225342325eb66276f43e710a57d79392974cc42072e0a05b7022c666181b9ca66d51735 SHA512 a74b9278b1941da62af58a087a10e5a0624901ceb81dcdd25eab3a05f003756773551fe6eec46dfb371f7b726cf296abfe0116444fb32c94fb6811440ee22a58
-EBUILD stestr-3.2.1.ebuild 1107 BLAKE2B a4eb293e9c65627a47372f876ab606164ee573ca81ae77c5d9616d8f20b2609708659af0a7fcc80f86d679593e94fc73690f12ddaee452356722d58a25bcaa62 SHA512 291bd705b5993023020772362e141a7b5ea4b9091bb05fe6cd543cb161d60ca0af29b07a32ac71e1eac758b695cf1d53c5429e1f5aa23930a9895b7e0f85d9bb
-EBUILD stestr-4.0.1.ebuild 1111 BLAKE2B 2e22c45f72de89e4e22df105357407d99f9a2495db495856aa52870d9b6f077a3d96b53e5812dca6bc3b5c71b950e4408adf998e54f87547352343abdf2975cc SHA512 9f4c21ba8baf1be1c8581d0f724458f481f555f717f61089cd43523c2122c887579bf4b95a17f24e29ec4e1cee1be9a0bd0a3d42188239ad435eef83cc216903
+EBUILD stestr-4.0.1.ebuild 1107 BLAKE2B a4eb293e9c65627a47372f876ab606164ee573ca81ae77c5d9616d8f20b2609708659af0a7fcc80f86d679593e94fc73690f12ddaee452356722d58a25bcaa62 SHA512 291bd705b5993023020772362e141a7b5ea4b9091bb05fe6cd543cb161d60ca0af29b07a32ac71e1eac758b695cf1d53c5429e1f5aa23930a9895b7e0f85d9bb
 MISC metadata.xml 640 BLAKE2B 2f6a2d6b549da3bdde1994544d2ed3a5a96ba08e1675394112643544d6afbb64162fd0bf8c72d39f1fbc43c3e120577e9d23506d9b51e1889308e670aa7d0775 SHA512 5fa6c1132aab62f72ff471ee8b551852e6ce84d66ca50c71f11c25f228b2c6de65e9d6dfcf464a7b826d9f0ce8768109cc4e475842c39bb7a6647fed662821a1
diff --git a/dev-python/stestr/stestr-3.2.1.ebuild b/dev-python/stestr/stestr-3.2.1.ebuild
deleted file mode 100644
index e9eab5e48fd1..000000000000
--- a/dev-python/stestr/stestr-3.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="A parallel Python test runner built around subunit"
-HOMEPAGE="https://github.com/mtreinish/stestr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]"
-BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	distutils_install_for_testing
-	stestr init || die
-	stestr run || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/stestr/stestr-4.0.1.ebuild b/dev-python/stestr/stestr-4.0.1.ebuild
index 76e25799861d..e9eab5e48fd1 100644
--- a/dev-python/stestr/stestr-4.0.1.ebuild
+++ b/dev-python/stestr/stestr-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 852787c56a4c..7670ddc4529f 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,5 +1,5 @@
 DIST ujson-5.4.0.tar.gz 7139576 BLAKE2B d3bd6bcc4dc733cafc47e613e2dc503e8cf7faf562d2fad91ea66b1a62dd4a8d67a2c80c392eba0c224f382280e58ff3fff51308c22862aaae5e671b5183027c SHA512 9622e872391d5467455b32e324d7b680487664ca486bfc56ba8c3969853e5db94725cd45e81b535dca80af4a3c718af171ce7adb6dcb9b98a37a8068824f89c6
 DIST ujson-5.5.0.tar.gz 7140414 BLAKE2B cca99fbb8cec447500c0dec34a952c4474acd0149783c887ee713cee60859570e41c9e349d49ff7eeba645d0c04a7e368da2ec8c42b6f55f59e971f834449e3a SHA512 883c0bd8b933557fc98556af1679de6df0372ee83a5533d8ea3f994dc13cd9bcd3140e2532ea1ad24419dab9ffbb59027e00f0a5e7ca285bf68358205a07bcd5
 EBUILD ujson-5.4.0.ebuild 879 BLAKE2B f58b2f5d57429fd3d899023579443447348e2784052777267ccc86c5ab53e79ee72aa09effc370a8ed5fdd43b7d98fe08bb00ccb3e3083e6c3ddfb1d890cd542 SHA512 25da7256c33440a0f8577ebaf46900254fa66be01651895609ca28d2cf244262d2164bcf2f8f550e163bfa6cbc6a2c63c77ebbdbca315b7c354e77f9457869dd
-EBUILD ujson-5.5.0.ebuild 883 BLAKE2B 53b31100105961b8be57f353de9c24919f93410a9c6f8869786ad7d24e007e6e472886a50f47758581c76f76031173f3ab8abd33c91d3feafda97c8428f89fd0 SHA512 af0ff62802e67cba5dfd7fa869b68ee47f7f693607998f26890e6e83f0fd1d8b112cc618224774a1cf4aade2b53e90ee5c9f6d1eb6fc2f442e7d3624f0c319c1
+EBUILD ujson-5.5.0.ebuild 882 BLAKE2B 455e37670271da7001fb4a70d76deeaf23f6ecbff98491eea9017c99a5ed8461f1f95a8b35d82454ee9aa7dfed7f2b4416737ffa98df2b9de6b8c6b207b75011 SHA512 48e15aca252851485946b5277c86f9dceabab29ebb469ffc493f26423fb1fdf2eeef5004ffa91b92511a91ec8041367cc7fcfa5cccd543ee81b08bf46b47eec1
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.5.0.ebuild b/dev-python/ujson/ujson-5.5.0.ebuild
index ca2f1fe67e94..3475075d31c8 100644
--- a/dev-python/ujson/ujson-5.5.0.ebuild
+++ b/dev-python/ujson/ujson-5.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/double-conversion:=
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dd25eb91eab7..6c36bcff2f02 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 1250d851c6fb..21178103ae20 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,5 +1,5 @@
 AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977
 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
 EBUILD geany-plugins-1.38-r1.ebuild 2910 BLAKE2B 76181571b98ee1e7296a5f2859aea3b0acb51cda51fb729e670ea9c4d3818377b5d9d54d8399a9af866a0451b82fea5198cc13eb9b233682357b64849a14bbbb SHA512 e7f18ef4f0f9ba326050e9ff48aed4bd3a493be4d71ede5e76da1952c870b78c8c56d1d9cb5401b8fdec0cf0cf2248e11e84cb5aee7f32c266dbe24441460f89
-EBUILD geany-plugins-1.38-r2.ebuild 2958 BLAKE2B cf55e5bf55e7e3abe417876185f54ee8055dcbf7177a2ecb2a1639440801a5d5497667a0f84774b9d80e65b7ac91b0b1a7b7dab1c9ef754a731c16615d364deb SHA512 6276cfcb3d879bc4fd68f4d59689a0224ddc7a60daee342678cc9bd84a6d1b4c072601e6b49c22f645a1666eaf7c067b632b2ddf9727c37a753ddf7b65ecff9c
+EBUILD geany-plugins-1.38-r2.ebuild 2956 BLAKE2B 34b04f4838c371dd032e39aea981d8146759032e2dfbec17d36ea1f8898340f03f5a07ca33018935454d4ecd01d6738878098faff0f4199d8d90f1b92463ca24 SHA512 2f0391e05ccc5e7a7ddf7a3d93a1eea65207e0829b1e0c69c002b6a8cf2e4a76254519e707e8cebf1b3fd7fca96e8b0d8ca9e54d60ec6c436af5c07e32316c2a
 MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a
diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild b/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
index 2fb44f8f7dc1..e0c49a45502a 100644
--- a/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~ppc ppc64 ~sparc ~x86"
 
 IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-util/sgb/Manifest b/dev-util/sgb/Manifest
index 21df010d5245..c2c5793af93c 100644
--- a/dev-util/sgb/Manifest
+++ b/dev-util/sgb/Manifest
@@ -1,7 +1,8 @@
 AUX sgb-20030623-destdir.patch 2315 BLAKE2B e902a3c7e0d9a3863f02443ef33840a7a318b1fd278d7226fd7e7812fe1ceb190829599a9b06e588ab1b05ac13bb2d829f667ad0b0556dc0fd5dea3be1643d2f SHA512 0e821be0bdeac661c229958a9227b315810f66ae420f10b720b2fe0a09f9a20510d97f47aa6cc69a9c79904925ac842771743d694bd82ca9621f4fc8f1b46f04
 AUX sgb-20030623-parallel-make-fix.patch 947 BLAKE2B 7996934e520cfbfd30c2e281786714ac4f728875df2635eb7e7c1e63a1edfcfd6eac4fc9289ef7fdbeeb71fed4691ac49ff562eb5f07c7530e596d158efc1969 SHA512 d86c32c5f0a1ec9e09a70bc8dc0581654986ada562bd37f77c3d28e16856f72f6d42eae23e1cffc35973b2701718ea1e03bd0addee61a94901efbb5af0bcbd50
+AUX sgb-20090810-Fix-build-with-Clang-16.patch 1104 BLAKE2B 2c54d544fd7907dc3d4bf7aedb3f03adec9466a38f23e9958bd159af677b8e0be57d7c60c55c59134c47ee3120528fa9e18ee9eac4ab00f15d70f5afd0eb346e SHA512 120e4457e3d5038232426b196a0d8d1d34309aeeb83e7beda0932410391d84c27a3974bf03dc749ac3964b459b4fe07a7783807e2465a6a45c993e424c8f675e
 DIST sgb-2003-06-23.tar.gz 493974 BLAKE2B b4cf4e1fd9f2aba35937865d2c2075e206eabda9f56e7f5b844be8bd4684b2a220bb1d449f0b0ed431fd2603b92aaf0cfa0a7e88015e7870638b3d69cab7288f SHA512 f486317dd85dc11761c970ab2bc0c9193f8dd3fa0d114528e1b55fd935fa9cce9266dc595b2ebe3526214ce3e6a1b3dc747382b32cbfd518ffb6179d3463e874
 DIST sgb-2009-08-10.tar.gz 496678 BLAKE2B 48c780259fee240e9739166a52972c4f3a37dc44d98a503b1df63aecec553a05888e11a01b8cf40c8a853f7416ce3118109aa6ce5db15fbfed1abbee552735ce SHA512 39afaaaeda9b1e2b0ecd56d8d0fee59754ee9340c497c9bd28aa19f039be605aef6c492969082c230840ca1619de3cb81ba3a38d4d7b6fdac6f19b658d4c01e2
-EBUILD sgb-20030623-r1.ebuild 1190 BLAKE2B 405924bf3b1a94683615274604449c72e9d7e3559641910f40a9ead0327179fa316c68d9de705eb059aca49999bff59a867a1cf8f6676bd26ebc7ff8f8723312 SHA512 4ad9db2cb156d329ded337dc9df29a8397627a2cc8fea52b1ea1fff4d127315a3cfb82b9e9432405157f0e1feac1bbf1f177872d55d36746af89a1c8145f2f72
-EBUILD sgb-20090810.ebuild 1191 BLAKE2B ac8fb483b7092f6bbcc24370e73cce6a62f6872cdec5c5bb8a7aa074b01f45a5e481fe891e201fa84383c5dcaa5a15926c2269eaca55cbf3af0bdd5051f0f90f SHA512 232f33d3b031cb78eb269370620171b56b879b6812deb31e8faf8d26f08ce486be70e735f1dd8b2b4c3d0d8914a83f0fd6a4e90bb2b288b34b06b7549d4a9d29
+EBUILD sgb-20030623-r1.ebuild 1191 BLAKE2B 92e9701977b507b8ee1df84260b2b19f41dea5ab1a3a2e8df8ba07342310ea4755a4f4fb7f30e0d687b33fc75a9da88ed472a1dfaf8cc69dda64f4ad4ff53791 SHA512 4afc524f6ade75c38c3585a60a1cb0efbfe597c7295e96770d1ca844c6015c2d0d1989b043424219cb233c22ee4d81d1b28e56d003e86345b454ca14410d7935
+EBUILD sgb-20090810-r1.ebuild 1250 BLAKE2B a6feee7c3009f114b6a97aa6d811712fca57de4161701a09e14cd8f29ea8b026e3656bb6f5d1bfb5f5a0a51ca8adc41310d1334393d4d52bb90347c87f53035a SHA512 454e27c8b1e63eded4ba49925b8a4ca8c65ffd8208d7ddda139ef25fa85a5dfecf83e5c516e1ecc99062609deff8d5029bfdb4d8fd13915349cd50516e425514
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch b/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch
new file mode 100644
index 000000000000..d26e26a42e1e
--- /dev/null
+++ b/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch
@@ -0,0 +1,46 @@
+From 5d0845e935d9b8d4174b9d98dbc123ec5d5a3460 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 19:54:02 +0100
+Subject: [PATCH] Fix build with Clang 16
+
+Bug: https://bugs.gentoo.org/832835
+--- a/gb_graph.w
++++ b/gb_graph.w
+@@ -40,11 +40,8 @@ programs at a higher level via the system loading routine. Here is
+ the general outline of \.{gb\_graph.c}:
+ 
+ @p
+-#ifdef SYSV
+ #include <string.h>
+-#else
+ #include <strings.h>
+-#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ @h@#
+@@ -63,11 +60,8 @@ interfere with GraphBase use of a useful identifier. We scotch that.
+ @(gb_graph.h@>=
+ #include <stdio.h>
+ #include <stdlib.h>
+-#ifdef SYSV
+ #include <string.h>
+-#else
+ #include <strings.h>
+-#endif
+ #undef min
+ @<Type declarations@>@;
+ 
+--- a/gb_io.w
++++ b/gb_io.w
+@@ -92,11 +92,8 @@ occasion to use some of the standard string operations.
+ 
+ @<Header...@>=
+ #include <stdio.h>
+-#ifdef SYSV
+ #include <string.h>
+-#else
+ #include <strings.h>
+-#endif
+ 
+ @* Inputting a line. The {\sc GB\_\,IO} routines get their input from
+ an array called |buffer|. This array is internal to {\sc
diff --git a/dev-util/sgb/sgb-20030623-r1.ebuild b/dev-util/sgb/sgb-20030623-r1.ebuild
index d89599421b58..26b28efed229 100644
--- a/dev-util/sgb/sgb-20030623-r1.ebuild
+++ b/dev-util/sgb/sgb-20030623-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="Stanford GraphBase"
 HOMEPAGE="http://ftp.cs.stanford.edu/pub/sgb/"
 SRC_URI="http://ftp.cs.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="mmix"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
diff --git a/dev-util/sgb/sgb-20090810.ebuild b/dev-util/sgb/sgb-20090810-r1.ebuild
index 4f6d61def77b..411bb22b4b39 100644
--- a/dev-util/sgb/sgb-20090810.ebuild
+++ b/dev-util/sgb/sgb-20090810-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="Stanford GraphBase"
 HOMEPAGE="http://ftp.cs.stanford.edu/pub/sgb/"
 SRC_URI="http://ftp.cs.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="mmix"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
@@ -19,6 +19,7 @@ S="${WORKDIR}"
 PATCHES=(
 	"${FILESDIR}"/sgb-20030623-parallel-make-fix.patch
 	"${FILESDIR}"/sgb-20030623-destdir.patch
+	"${FILESDIR}"/sgb-20090810-Fix-build-with-Clang-16.patch
 )
 
 src_compile() {
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 6defd48d5109..0a77b45d7425 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/qudos/Manifest b/games-fps/qudos/Manifest
index 89df8d19900c..1986c077c338 100644
--- a/games-fps/qudos/Manifest
+++ b/games-fps/qudos/Manifest
@@ -1,6 +1,12 @@
 AUX qudos-0.40.1-gnusource.patch 265 BLAKE2B beb6c3f71b39c28789e3dcaa58185464a312d63fe416324ee7cbc8eec084af41a8ca7590e95b19c02a2bfaacc510f7c0c477c1e96cf8726bfc63ae92076d0e30 SHA512 99e30dbcd4773021e6d8e2dc20cbf054534c1d18d86877688bdcb5ea34e7644e877ae0a674baaa471283899c596293336faa7afd4492336b3284d77256fd318b
-AUX qudos-0.40.1-libpng15.patch 209 BLAKE2B 9fb92e63f23f2acd2b5f14e0ef8d85385af868fcc1ef7200b35a18a979ef556b33a49325c860e54e3ae11aabb7a70097fb0733f3b826b78d650dcf2caf1b3124 SHA512 5e8fd8eef45902dbd41e64f7fcd3a31c91f19edc71e2eb1c89d161f46ef4f4c04894f27db8e0c5f9946673bdf72580aac067c63297214fe45531119d1f948380
+AUX qudos-0.40.1-libjpeg-clash.patch 961 BLAKE2B 5b33d8122054de9295a52af11da7dec272cd8a58ae89f4142d495bc5c1c2d916de6a8b9796cc3298f65c31154243f1fbc09555bf0b7ba82ff826bf5bf37799df SHA512 3ca43812848e7974ec29451cbdd3f68d082c46e9e41a5284ee8bb58ba54f49201db877612405df3ab35d8a060f768518c977350b7d528ceec8086097af3f713d
+AUX qudos-0.40.1-libpng.patch 997 BLAKE2B af1bffb598f21488dd873688351e83b3b96bfca60bb5355ad365a9a0105a3ce74ed77118ad7c236e09be74dd1ad77e8baf0953274151f79fa3210c991e4dc0b1 SHA512 ca62553c5310161fbc1be1042c33365340887a77812d41aaa0886f7645b4c22e83dd884e0eb0a1a2c987ba895e3cb87784268aba3c8ea2a6c30aa2d5ba9d12e3
+AUX qudos-0.40.1-no-bits-nan.patch 317 BLAKE2B b9c12827056b162a9d5e8946ec3bdc6cced9d8dcfa8bc5d52f5ce0dbf495a2abff43cbbecc966b69fcd55a343c7ca0be094d9d963c54d82a78b97f8e720c346a SHA512 5538210b96bafda9144bb62fac6f96513fc828d757a77f8b656f67dfb29d548755e8ba4454773e90c7c92afa3e7f7a6391ec57d2af30b0395a701217ec3c22e1
+AUX qudos-0.40.1-respect-cc.patch 389 BLAKE2B 2f7edbc95d8525d38428b338c725a07124a7f9f4cb8622441aebbc6dcd9def9ed8c3662396e6b79f2964099581f1e03df10ceb515da29094bb463a58f6458073 SHA512 f3f89abf6d6194c427b2aff3cf4d1ca48d4f4e80ff68a5f2f2e47ba8c47e85de7daf7c0a9a914f0f1e4890694d0c538a85135268a6986dd58aaed5e90fd708c9
+AUX qudos-0.40.1-respect-libdir.patch 1516 BLAKE2B fbd0b4075ffab070db54448bd044c962925cac16b98d1b07c0fb8b6dd72b47f203b9e0489db129f1285819d1db09723e4fca5b944f119c461971f9bae8742447 SHA512 20f154f00d3595e0c404ebafb53ab681cd17a3c79352dbe7baedad77cb8bdbe8e5a7c61f375afb580d59f5f91654e3bfa73987d0828007b6a676fc10fcdd5b81
+AUX qudos-0.40.1-use-pkg-config.patch 969 BLAKE2B 176b214f2161432aaeb8fe5cb029b06450c4b60820fdcf0b89556c0aedabb7e14bb6777a776bdd4a106a7fa429e8450d63606b49409f5b065d200a483ecb6d69 SHA512 77ff07b101b50ce714bf43c45a1cf7afe39ca3d8670233c13857421a368581b44f05ef3a104cbf0a828b87220f55195c6ddcc4d6c68e9763f8920fdf6b508d74
+AUX qudos-0.40.1-zlib-build.patch 388 BLAKE2B dae75195ab0a4742277e1b240479fe9df195d81906998b349c5bd891ef67a38804e3471022eb8469cb198a222e80deae50e962a1e876a54b69c213ea06a2b7bc SHA512 f615d44b257487f2762de98bbfa8f4089e8f4f3b09c54e964022ee23f3699f94bd3befc2cfae458a82426fad744513dcc2228c9d6736b2c0e5237b9ca8e1e02d
 DIST QuDos-0.40.1-src.tar.bz2 2031636 BLAKE2B 4940f589cc6239e1489bb81f2e0c0afd6efb36930595c57131927b777913c904ada04883eb5f12f9aaf0ba06d687bf4be8b03f369dd9684fe21d7b1068240599 SHA512 97b9c6bac0d09c060ab33174604deb2781f0ebdc48b00bd0bc402523fb04cdf84edd8abc18507bba8c7e616f6d460a1de6debc96ec39bb5562b20a7f06eea734
 DIST QuDos-0.40.1.pk3 4210489 BLAKE2B 98e07682368e52f4c318e7b9ab98d01b0363986bfea54edff3b13f7f2f4cad20de0146eb498569d024d22200830b341b02f135bf50df4a317915429bb1437439 SHA512 19c3c6b3d17cbd9642320d8eb7a83d667afeafd0ee5eb818e9f07be71e2ab69182474c1f529ecbcfcfa59590bafedb0de3c70dfff10e4bc7a6e07a1546f27d4b
-EBUILD qudos-0.40.1.ebuild 4205 BLAKE2B 4ea2a769ed1a04ba80f8599cfbcf61ae82b20546bfb0e9be5d288b6beb8356a191bb239c27a7e4871f6f613feb77a67520b21f8d3be62575265cbad258e90025 SHA512 aea7c9d34ad037a5b07bf4cb0525776b85ad6d06c9b0de65e099287289dc707c8a6eef20eb09e4134e32cb5ce27670b7a00ec9c327b63df53490240d56248ff6
+EBUILD qudos-0.40.1-r1.ebuild 4048 BLAKE2B 47740eee0db2309ad903c0261fba4f81cbf1d3f44bcd1b86c7fec0b3713d9bcdf265d56eafc1f0dde49bea7c8955c846e0174a6df4eb1cb3c7cf9c3ecb727064 SHA512 cd36cd94dcf45864e3b77da234908198e9a0b50874d19db437a2f692509297953885dba09e54a07ae3ff1315a250271a748454c1ff42240df0e9890a0b34587a
 MISC metadata.xml 666 BLAKE2B 847908831b34d7bcae31859484be771ddfd94b6014de51c7fdbed9da3e058adfd740e9a937cb6ffcc7994d5612037c9c2b2c8095e163767bc8fd7ecac1ab92c9 SHA512 4631a2fce2db990ff6b0a8966ff1de1e3ff79e0b35087a2c88a1ceb85f389c0aa6b5ca43edc96966d32e34842b3211eee7e27e7796cda70811e300268a7065c0
diff --git a/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch b/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch
new file mode 100644
index 000000000000..944c1aff856c
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch
@@ -0,0 +1,25 @@
+From c657cd54baee3bdfe7a92c9b91536bb5c3ddcdd8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:50:17 +0100
+Subject: [PATCH 2/5] Fix clash with libjpeg
+
+--- a/src/ref_gl/gl_image.c
++++ b/src/ref_gl/gl_image.c
+@@ -912,7 +912,7 @@ jpg_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
+ }
+ 
+ void
+-jpeg_mem_src(j_decompress_ptr cinfo, byte * mem, int len)
++qudos_jpeg_mem_src(j_decompress_ptr cinfo, byte * mem, int len)
+ {
+ 	cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr));
+ 	cinfo->src->init_source = jpg_null;
+@@ -956,7 +956,7 @@ LoadJPG(char *filename, byte ** pic, int *width, int *height)
+ 	jpeg_create_decompress(&cinfo);
+ 
+ 	/* Feed JPEG memory into the libJpeg Object */
+-	jpeg_mem_src(&cinfo, rawdata, rawsize);
++	qudos_jpeg_mem_src(&cinfo, rawdata, rawsize);
+ 
+ 	/* Process JPEG header */
+ 	jpeg_read_header(&cinfo, true);
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng.patch b/games-fps/qudos/files/qudos-0.40.1-libpng.patch
new file mode 100644
index 000000000000..78fb4cdb7bd5
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-libpng.patch
@@ -0,0 +1,30 @@
+--- a/src/ref_gl/gl_local.h
++++ b/src/ref_gl/gl_local.h
+@@ -29,6 +29,7 @@
+ #include <GL/glu.h>
+ #include <GL/glext.h>
+ 
++#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
+ #include <png.h>
+ #include <jpeglib.h>
+ 
+Subject: [PATCH] Fix build with libpng 1.4.0
+
+From the 1.4.0 release notes:
+```
+   m. The function png_set_gray_1_2_4_to_8() was removed. It has been
+      deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
+      png_set_expand_gray_1_2_4_to_8() because the former function also
+      expanded palette images.
+```
+--- a/src/ref_gl/gl_image.c
++++ b/src/ref_gl/gl_image.c
+@@ -1186,7 +1186,7 @@ LoadPNG(char *filename, byte ** pic, int *width, int *height)
+ 	if (my_png->ColorType == PNG_COLOR_TYPE_PALETTE)
+ 		png_set_palette_to_rgb(png);
+ 	if (my_png->ColorType == PNG_COLOR_TYPE_GRAY && my_png->BitDepth < 8)
+-		png_set_gray_1_2_4_to_8(png);
++		png_set_expand_gray_1_2_4_to_8(png);
+ 
+ 	/* Add alpha channel if present */
+ 	if (png_get_valid(png, pnginfo, PNG_INFO_tRNS))
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
deleted file mode 100644
index 633215be34be..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ref_gl/gl_local.h
-+++ b/src/ref_gl/gl_local.h
-@@ -29,6 +29,7 @@
- #include <GL/glu.h>
- #include <GL/glext.h>
- 
-+#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
- #include <png.h>
- #include <jpeglib.h>
- 
diff --git a/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch b/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch
new file mode 100644
index 000000000000..adcffef23c40
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch
@@ -0,0 +1,12 @@
+--- a/src/mods/rogue/g_local.h
++++ b/src/mods/rogue/g_local.h
+@@ -26,9 +26,6 @@
+ //==================================================================
+ 
+ #ifndef _WIN32
+-#ifdef __linux__
+-#include <bits/nan.h>
+-#endif
+ #define min(a,b) ((a) < (b) ? (a) : (b))
+ #define max(a,b) ((a) > (b) ? (a) : (b))
+ #ifdef __sun__
diff --git a/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch b/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch
new file mode 100644
index 000000000000..92c7028e1890
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch
@@ -0,0 +1,15 @@
+From 76aef29111d0b8c5e5fffe80833d0c227cca1127 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:54:38 +0100
+Subject: [PATCH 4/5] Respect CC
+
+--- a/Makefile
++++ b/Makefile
+@@ -60,7 +60,6 @@ PREFIX?=	$(LOCALBASE)
+ DATADIR?=	$(LOCALBASE)/share/quake2
+ LIBDIR?=	$(LOCALBASE)/lib/QuDos
+ 
+-CC?=		gcc
+ TYPE?=		release
+ 
+ OGG_LDFLAGS=	-lvorbisfile -lvorbis -logg
diff --git a/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch b/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch
new file mode 100644
index 000000000000..b3e0cdc5a2f7
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch
@@ -0,0 +1,53 @@
+From 1dc6681ee4eea2d1b6e7edd04cf84fd10c407d28 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:54:12 +0100
+Subject: [PATCH 3/5] Respect libdir
+
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,6 @@ WITH_XMMS?=YES		# Enable XMMS support (thanks AprQ2).
+ 
+ # General variables.
+ LOCALBASE?=	/usr/local
+-X11BASE?=	/usr/X11R6
+ PREFIX?=	$(LOCALBASE)
+ 
+ DATADIR?=	$(LOCALBASE)/share/quake2
+@@ -98,34 +97,19 @@ GAME_NAME=	game$(ARCH).$(SHLIB_EXT)
+ endif
+ 
+ # Compilation flags.
+-CFLAGS+=	-I/usr/include -I$(LOCALBASE)/include -I$(X11BASE)/include \
++CFLAGS+=	-I/usr/include -I$(LOCALBASE)/include \
+ 		-DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
+ 
+ WARNS=	-Wshadow -Wpointer-arith -Wcast-align -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wnested-externs
+ 
+-ifeq ($(TYPE),debug)
+-CFLAGS+=	-Wall -Werror -g -ggdb -DDEBUGGING # $(WARNS)
+-else
+-  ifeq ($(TYPE),profile)
+-CFLAGS+=	-pg
+-  else
+-CFLAGS+=	-O3 -ffast-math -funroll-loops -fomit-frame-pointer \
+-		-fexpensive-optimizations
+-    ifeq ($(ARCH),i386)
+-CFLAGS+=	-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+-		-fno-strict-aliasing
+-    endif
+-  endif
+-endif
+-
+ # Linker flags.
+-LDFLAGS+=	-L/usr/lib -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lm
++LDFLAGS+=	-lm
+ 
+ ifeq ($(OSTYPE),Linux)
+ LDFLAGS+=	-ldl
+ endif
+ 
+-REF_LDFLAGS=	-L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGLU -ljpeg -lpng
++REF_LDFLAGS=	-lX11 -lXext -lXxf86vm -lGLU -ljpeg -lpng
+ 
+ ifeq ($(strip $(WITH_DGA_MOUSE)),YES)
+ REF_LDFLAGS+= -lXxf86dga
diff --git a/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch b/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch
new file mode 100644
index 000000000000..c2aae64e2b32
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch
@@ -0,0 +1,30 @@
+From 372cfdd9c81043667451fc46bcb8daaa5a5e3620 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:56:14 +0100
+Subject: [PATCH 5/5] Use pkg-config
+
+--- a/Makefile
++++ b/Makefile
+@@ -64,9 +64,9 @@ TYPE?=		release
+ 
+ OGG_LDFLAGS=	-lvorbisfile -lvorbis -logg
+ 
+-SDL_CONFIG?=	sdl-config
+-SDL_CFLAGS=	$(shell $(SDL_CONFIG) --cflags)
+-SDL_LDFLAGS=	$(shell $(SDL_CONFIG) --libs)
++PKG_CONFIG?=   pkg-config
++SDL_CFLAGS=	$(shell ${PKG_CONFIG} --cflags sdl)
++SDL_LDFLAGS=	$(shell ${PKG_CONFIG} --libs sdl)
+ 
+ ifeq ($(OSTYPE),Linux)
+ ALSA_LDFLAGS=	-lasound
+@@ -96,8 +95,7 @@ GAME_NAME=	game$(ARCH).$(SHLIB_EXT)
+ endif
+ 
+ # Compilation flags.
+-CFLAGS+=	-I/usr/include -I$(LOCALBASE)/include \
+-		-DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
++CFLAGS+=	-DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
+ 
+ WARNS=	-Wshadow -Wpointer-arith -Wcast-align -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wnested-externs
+ 
diff --git a/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch b/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch
new file mode 100644
index 000000000000..d2e1474f2d7b
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch
@@ -0,0 +1,12 @@
+From bdd75315feed9fbaaf9dcf87f9a7e5eb18ca0b8b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:50:02 +0100
+Subject: [PATCH 1/5] Fix zlib build
+
+--- a/src/qcommon/unzip/ioapi.h
++++ b/src/qcommon/unzip/ioapi.h
+@@ -1,3 +1,4 @@
++#define OF(x) x
+ /*
+  * ioapi.h -- IO base function header for compress/uncompress .zip files
+  * using zlib + zip or unzip API
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1-r1.ebuild
index 24a6a4e01612..2a289162e2d7 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop flag-o-matic toolchain-funcs
 
@@ -20,21 +20,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures"
 
-DEPEND="opengl? (
-		virtual/opengl
-		virtual/glu )
-	sdl? ( media-libs/libsdl[joystick?,opengl,sound,video]
-		virtual/opengl
-		virtual/glu )
-	virtual/jpeg:0
+DEPEND="
 	media-libs/libogg
-	media-libs/libpng:0
+	media-libs/libjpeg-turbo
+	media-libs/libpng
 	media-libs/libvorbis
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm"
+	x11-libs/libXxf86vm
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	sdl? (
+		media-libs/libsdl[joystick?,opengl,sound,video]
+		virtual/opengl
+		virtual/glu
+	)
+"
 RDEPEND="
 	${DEPEND}
 	cdinstall? ( games-fps/quake2-data )
@@ -45,8 +50,14 @@ RDEPEND="
 dir=usr/share/${MY_PN}
 
 PATCHES=(
-	"${FILESDIR}"/${P}-libpng15.patch
+	"${FILESDIR}"/${P}-libpng.patch
 	"${FILESDIR}"/${P}-gnusource.patch
+	"${FILESDIR}"/${P}-zlib-build.patch
+	"${FILESDIR}"/${P}-libjpeg-clash.patch
+	"${FILESDIR}"/${P}-respect-libdir.patch
+	"${FILESDIR}"/${P}-respect-cc.patch
+	"${FILESDIR}"/${P}-use-pkg-config.patch
+	"${FILESDIR}"/${P}-no-bits-nan.patch
 )
 
 default_client() {
@@ -81,38 +92,19 @@ pkg_setup() {
 
 	if default_client ; then
 		elog "Selected the ${snd_drv} sound driver as the default."
-		echo
 	fi
 }
 
-src_unpack() {
-	unpack "${FILE_STEM}.tar.bz2"
-}
-
 src_prepare() {
 	rm docs/gnu.txt || die
 
+	default
+
 	# Change default sound driver and its location
 	sed -i \
 		-e "s:\"oss\":\"${snd_drv}\":" \
 		-e "s:\"\./snd:\"/usr/$(get_libdir)/${PN}/snd:" \
 		src/client/snd_dma.c || die
-
-	sed -i \
-		-e 's:jpeg_mem_src:qudos_jpeg_mem_src:g' \
-		src/ref_gl/gl_image.c || die
-
-	if has_version '>=sys-libs/zlib-1.2.5.1-r1' ; then
-		sed -i \
-			-e '1i#define OF(x) x' \
-			src/qcommon/unzip/ioapi.h || die
-	fi
-
-	sed -i -e '106,119 s/CFL/LED/' Makefile || die
-
-	sed -i -e 's:-L/usr/lib -L$(LOCALBASE)/lib :: ' Makefile || die
-
-	default
 }
 
 src_configure() {
@@ -122,7 +114,7 @@ src_configure() {
 
 src_compile() {
 	yesno() {
-		usex ${1} YES NO;
+		usex ${1} YES NO
 	}
 
 	local client="YES"
@@ -131,36 +123,39 @@ src_compile() {
 	local type="release"
 	use debug && type="debug"
 
-	emake \
-		BUILD_QUAKE2="${client}" \
-		BUILD_DEDICATED=$(yesno dedicated) \
-		BUILD_GLX=$(yesno opengl) \
-		BUILD_SDLGL=$(yesno sdl) \
-		BUILD_ALSA_SND=NO \
-		BUILD_SDL_SND=$(yesno sdl) \
-		BUILD_OSS_SND=$(yesno oss) \
-		WITH_XMMS=NO \
-		WITH_DGA_MOUSE=$(yesno dga) \
-		WITH_JOYSTICK=$(yesno joystick) \
-		TYPE="${type}" \
-		DATADIR="${dir}" \
-		LOCALBASE=/usr \
-		LIBDIR="/usr/$(get_libdir)"/${PN} \
-		WITH_QMAX=$(yesno qmax) \
-		BUILD_3ZB2=$(yesno mods) \
-		BUILD_CTF=$(yesno mods) \
-		BUILD_JABOT=$(yesno mods) \
-		BUILD_ROGUE=$(yesno mods) \
-		BUILD_XATRIX=$(yesno mods) \
-		BUILD_ZAERO=$(yesno mods) \
-		WITH_BOTS=$(yesno mods) \
-		HAVE_IPV6=$(yesno ipv6) \
-		CC="$(tc-getCC)" \
-		WITH_X86_ASM=NO \
-		WITH_DATADIR=YES \
-		WITH_LIBDIR=YES \
-		BUILD_DEBUG_DIR=release \
+	local myemakeargs=(
+		BUILD_QUAKE2="${client}"
+		BUILD_DEDICATED=$(yesno dedicated)
+		BUILD_GLX=$(yesno opengl)
+		BUILD_SDLGL=$(yesno sdl)
+		BUILD_ALSA_SND=NO
+		BUILD_SDL_SND=$(yesno sdl)
+		BUILD_OSS_SND=$(yesno oss)
+		WITH_XMMS=NO
+		WITH_DGA_MOUSE=$(yesno dga)
+		WITH_JOYSTICK=$(yesno joystick)
+		TYPE="${type}"
+		DATADIR="${dir}"
+		LOCALBASE=/usr
+		LIBDIR="/usr/$(get_libdir)"/${PN}
+		WITH_QMAX=$(yesno qmax)
+		BUILD_3ZB2=$(yesno mods)
+		BUILD_CTF=$(yesno mods)
+		BUILD_JABOT=$(yesno mods)
+		BUILD_ROGUE=$(yesno mods)
+		BUILD_XATRIX=$(yesno mods)
+		BUILD_ZAERO=$(yesno mods)
+		WITH_BOTS=$(yesno mods)
+		HAVE_IPV6=$(yesno ipv6)
+		CC="$(tc-getCC)"
+		WITH_X86_ASM=NO
+		WITH_DATADIR=YES
+		WITH_LIBDIR=YES
+		BUILD_DEBUG_DIR=release
 		BUILD_RELEASE_DIR=release
+	)
+
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 1dc892a981b7..31c11c84aa6d 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index b982500a4c66..cc56420bfe35 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,5 +1,5 @@
 DIST caja-dropbox-1.24.0.tar.xz 309024 BLAKE2B 2ae560dcd6e744fe96d9e0fcd876a899c22ad06b8238c2ad9e5394cf80aa8844cd634431dc6bb245396e6d919da857645488214880947e5b90413c254cd4c6a2 SHA512 64d699b4c3957d5996ef69936b4b2746641bc2db4efb7b23535febf5eed3ee767330927aeeda67747c0d72e0f052a2979ae2160ffaaf01e4fd82aff68a5f27bf
 DIST caja-dropbox-1.26.0.tar.xz 361352 BLAKE2B 877196d1c6900904314e4ea0f4220821febe123395b1af8eb30e6557beea068ce572621473e733bf41f597a9c72d03ca0b2666cb7c335bbdcaefec06ffd577b9 SHA512 f96e3ddf4434936b04e992044d6cd5797b6ff77ead573e8e9a6493f4308d9716f47871f1fd7f08b0dbf7f2659f107511b6be65e98632a0892ebfff0a9888dbe7
 EBUILD caja-dropbox-1.24.0-r1.ebuild 1843 BLAKE2B ba60c03db008ff52a343cb8f66eea4aa8ffa94a029f5b5631b870429af8faac57dea531078a55e2e5d48879fa6cb8c52f3b41bc486e79d5e0c54b39b73f5d5a2 SHA512 fe7a8894418d61ee67c8da61a263e2d8b0909ba21095b55290964bd9c4ace0c3a06a5681d4c246313f56c967652a0eff2d46ff222dc9bb407116e141fa871137
-EBUILD caja-dropbox-1.26.0.ebuild 1862 BLAKE2B 65b9534fd3a35c0760c894f89eedc7aa83e30f5b1e020b8e0c42fe57965a424870e13b7c5801bd8582b5c30baabcdf19cd22178083efb49d40b0b53c58b9bc47 SHA512 df4d0cc444e0e15128e00ab62a7ddeb7f540089b3c2a5db73ad76e3b9d25f6d8e08cf3f21a8f21c8399261ab86f20650d67a542e1a563958782f549d2ad22331
+EBUILD caja-dropbox-1.26.0-r1.ebuild 1858 BLAKE2B 8d79880ca97ebc2a935c271ddeadd7fd22be82af7099475bee1e5684ddba03cf9e44a44c3bde6c5c75cd790619205e2d91d4dc86c79f439af7b3e1fdbda03fc5 SHA512 c9d109ef27a006e336780c063236346db5dc3a0378712f88908a8e1f24a530f2cbbd8bfc30d0a010f2c7a769b96600cba1d677529bdccde452d10f5f0dfbb084
 MISC metadata.xml 342 BLAKE2B 819a1836902b4b04aeff2de9a7c8af1e1baec3d4854e308f9796c9372ff50b327cef9da9d9c8a193dad97b01f8c53991b5f578323000243b27ba1d296ec6b4d0 SHA512 e1171322b47f82c9d4c9e2cc5755974ef39fdf87ec5590402d1842b3cda6b79b30ef5f40f450f91511df1700dbede47fcf885f210c03a3d4e51b6cbe063ecbde
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.26.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.26.0-r1.ebuild
index c32506a04db2..1a25e3298ceb 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.26.0.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.26.0-r1.ebuild
@@ -22,9 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/atk
 	>=dev-libs/glib-2.50:2
-	$(python_gen_cond_dep \
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
 	>=mate-base/caja-1.19.1
 	mate-extra/caja-extensions
 	media-libs/fontconfig:1.0
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index aefc3152ca22..a2d51b6c0b6a 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index fd4b8bed3fa2..def7b126689a 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,5 +1,7 @@
 DIST tucnak-4.34.tar.gz 3596477 BLAKE2B 530b1e18167e7704b1596dc606f9c352fa761c6e3e060ff88e8dfb744c25faaf0b3840e89d2fad1747cb6dfd688f92222b4553731545d59d00dc8ad01f0c77bf SHA512 860c6887ba004d8efad8d6cd60951f744f772ca4ac6022a7f1b484eb43778eeba8f3426447b9a656dc321816e0b8dfb05906868e6122edaa26a7f3c2679ceb74
 DIST tucnak-4.36.tar.gz 3601081 BLAKE2B 76dfb5a319309203ef452e1e4faff5c47208b5c7f66fb63d9dbf45a6a3a63b35f788d0a05931db44965be6593c5eca1a26c23dcc50e79fd9a70446083f2644b1 SHA512 dee0c6b60ccd66b81257dbc04ead8b9a7df1a77a6c5a73503bcdf8012b8a59318ad8e96ba5a25d6e38ac995312acac23fdf62c5d6d2ad036bc029a691c1a350d
+DIST tucnak-4.37.tar.gz 3603639 BLAKE2B d7ddfc5aae62c4c9745777249940399c4d2945c37814f84785edb69ef266234da1ff91c60ea29c36ff22def727b9b0ae2fb940c5f7284c47e5971fd88e24c909 SHA512 7273da2cfdfa2e99cc7c1873a38ecf4da0efed7e79c75de6b38d502db732fdee62aef40112cea134a7b1551b72b7ed16ab437979b00a0fc02478ced8f3cecf07
 EBUILD tucnak-4.34.ebuild 1959 BLAKE2B a7928ea7a30bedf9441e446ef60fcf4bcc93bba2eafba11c12d5d87dd315ab304b8b04c4129a0e48afc7b766b21114dd19f3a14a3f4c62d660340b9dac6c8218 SHA512 98d2528e8e512f556b50ee327d7087cbf0631a1bef683e704d46adea872aca87ddfa62054d32b46053aee1657cfa6a16d2ebba762803222fb18aa6600323a882
 EBUILD tucnak-4.36.ebuild 1959 BLAKE2B a7928ea7a30bedf9441e446ef60fcf4bcc93bba2eafba11c12d5d87dd315ab304b8b04c4129a0e48afc7b766b21114dd19f3a14a3f4c62d660340b9dac6c8218 SHA512 98d2528e8e512f556b50ee327d7087cbf0631a1bef683e704d46adea872aca87ddfa62054d32b46053aee1657cfa6a16d2ebba762803222fb18aa6600323a882
+EBUILD tucnak-4.37.ebuild 1961 BLAKE2B 8320da5011bc2ac9a99e038b903188dd522c9b7603a9b945d9758cdc9b2eb0eff95dabeeb69495e5c3d41468609c0aa95ac8a23446f241f6673cc1ca8d16aea2 SHA512 0345a92132138039c52788cf7fcf6c0e8da5adfd293bb6788d7de51b280eb9ab79920d20b47eaf7eef7dfd1255528ced294be282519f4e04f4351104fdc47cb2
 MISC metadata.xml 409 BLAKE2B 8179722b95bb5d639bbf3755eac5ec6d3a2492d117a9af0edd5aba1910974f7ca99c35bf759f9c44a6ee59d18a4b7088c1f009abf0dbdfbafd04f6c3a6875b3a SHA512 e07f3bbf055dfafb6d6fb2596fe20bdb0aaccb8960fc5d1ad5ea372a51baafb75458571729f99afc1086fcc596aa35cd22aafbc9af4d422dba2aba1243c93422
diff --git a/media-radio/tucnak/tucnak-4.37.ebuild b/media-radio/tucnak/tucnak-4.37.ebuild
new file mode 100644
index 000000000000..358be0cafa27
--- /dev/null
+++ b/media-radio/tucnak/tucnak-4.37.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools flag-o-matic
+
+DESCRIPTION="Amateur Radio VHF Contest Logbook"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa fftw gpm hamlib suid"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libzia
+	media-libs/libsndfile
+	>=media-libs/libsdl-1.2
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0 )
+	gpm? ( sys-libs/gpm )
+	hamlib? ( media-libs/hamlib:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	# fix destop file
+	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
+	# fix doc install path
+	sed -i -e "s/docsdir/# docsdir/" \
+		-e "s/docs_DATA =/# docs_DATA/" \
+		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/hamlib
+	econf $(use_with alsa) \
+		$(use_with gpm) $(use_with hamlib) \
+		$(use_with fftw fftw3)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
+	if use suid ; then
+		fperms 4711 /usr/bin/soundwrapper
+	fi
+}
+
+pkg_postinst() {
+	elog "In order to use sound with tucnak add yourself to the 'audio' group"
+	elog "and to key your rig via the parport add yourself to the 'lp' group"
+	elog ""
+	elog "tucnak can be used with the following additional packages:"
+	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
+	elog "                             (No need to recompile)"
+	if use suid ; then
+		ewarn "You have choosen to install the little helper program 'soundwrapper'"
+		ewarn "setuid by setting USE=suid. That helper is only needed if you"
+		ewarn "want to use morse sidetone output via the PC speaker."
+		ewarn ""
+		ewarn "While the helper should be safe by design be aware that setting"
+		ewarn "any program setuid is a security risk."
+	fi
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9ba2edc9282b..462e0478a4d7 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ca45ddf1d645..fd9dfcff6690 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 14:09:38 +0000
+Mon, 24 Oct 2022 20:09:40 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index af5372bb2577..ac868a12d63f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-24T14:09:41Z
+TIMESTAMP 2022-10-24T20:09:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNWnKVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNW8QdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDvqA/8CHJJfPR6dmkAdiHRpudld0nMTzEbMUVyXW2nu1XJwELqETujGpsVGGbx
-1G2vNWSbfr8JMEwS7RqVF75dAmfl7pgLlfO29ZhherVsGm8N/zVpW0uAqL7ePfIC
-NpTQWCP0wn7lh8HPXcfuN+Kj2YvTAHeI1ktHEZJQAX2CXC9/u/nTFWE5aDdczV8z
-+Q41CvBtk4i+eQuF1kD+uXvavaVjbD1zgfZRarRcligXILDYwMxYbbLAFdvQ9stC
-asF23Gz0WbjplHSXvISU2GNNg0WJ9XivLlqVYnCjxEB/RiQp0CjWzRIIbkwzQWGD
-WJkhcQdVu08lVA7CbTyOrBDNw86sTWhqW/oBJ6jJRiluUvM+dKHHHpBRw8B/V2zI
-V2zhnr93j/3endH/a366jJkXSeSLYsUUn2AinOtux35LkNeR3EV34xwd1dYseOMG
-64zvoXbJUJ1KYAsWtiR5QduuT94kzsjGVNlLw1jfaz58ksFUoNEO9AWn/BhbQu0E
-iwzzF6J80MdxE36k2oCubU1HwYF2UhdeiJ1W0IPLYBCytRfQrJn0gSz6oRDMvaHB
-PX6yiqbVOfeU15mwt+KrT3JIWk/Xd4RomQ+Rrh8N5l6nmqZQeUEIC9nmBqL/t47X
-F88SPPob/rGMBHCpjWuoPQZdIycn/QDatf07Ej6QNhrSACNDMnA=
-=IuZe
+klCp8xAApKdFpF1DJyGwqAd4dUWZciwc1+76EPvrinQ3J/hUE+uXh9WZEZDBTm2q
+BbjQn8y5IHCVauQD2gCPkorj/HGmQF7q9GZGLvGanJ12+D8N1mmiA19ReypMyJJK
+1RaIomy70CY9+2l3URgZwW+6kOQ9xpF3BQXs132w3HC6vivjp66hoeKbUxAn46uj
+bDhYIXp6lM+JsTgSSUaEk1lxCo94EDCDcHTK9KcyhzgqwtZKD3zlRagnumSu2pSq
+6FlPvb/dP8Kt0S2Mcd1flUbMZsoI0jCCANfhRXsjfGc81uUYhuINSa85JiGMURvp
+yDlIrEzys7qM46GAqMVa7ND1k1iH6uzBoBI1IM7RNyZw575pj6dL3TTJ/QyUZ7mT
+O4xoE8HKRcEVKdZv0ln0roLwDt5/I6RF9knggYNZbCwnj04kQEAU/Tshkv5F+YWf
+vO8lvCR49iHMe9aG7gxznpNGKi9RpKpLnkraIzDypL6FI2uPzaW0Pn0weykWQrMZ
+rcNiEfNxNUgGfbMZ+luocsZ4dFTOSkrKRvrnc5nBv5TH9QET6gpC6pI4PqLoMGQo
+kNzBbM1jLnBNobSvTzNoIlGrjs/VfylFjhIzPD7ZoX0jeIkV1l0hxtYkP4xAdL5d
+PXsiqk2BPD0gBGxn6IclbdjZywjrWfUjacT4Ge0WZ1QgbhQb4aM=
+=BNSO
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ca45ddf1d645..fd9dfcff6690 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 14:09:38 +0000
+Mon, 24 Oct 2022 20:09:40 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index aa5189d0d9a3..b4269f608202 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 8173560f02a2..beee8f38b205 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.2210.0 b/metadata/md5-cache/app-admin/rsyslog-8.2210.0-r1
index 21f1608a902d..02666cb315a4 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2210.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2210.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2210.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2210.0.tar.gz )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1f3916f987a0cd8b57a94eadf3dbe8f9
+_md5_=6fbfff07d4b9266c9e2bb463ef65bd6c
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 085ddf9a467e..57f951cef886 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/btrbk-0.31.3 b/metadata/md5-cache/app-backup/btrbk-0.31.3
deleted file mode 100644
index 5136728cae64..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.31.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-INHERIT=systemd
-IUSE=+mbuffer +doc +lsbtr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.31.3.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b1fe07abaabc1cc3ba48254b45e2e63e
diff --git a/metadata/md5-cache/app-backup/btrbk-0.32.0 b/metadata/md5-cache/app-backup/btrbk-0.32.0
deleted file mode 100644
index 732228fb8a97..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.32.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-INHERIT=systemd
-IUSE=+mbuffer +doc +lsbtr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.0.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bcb1b62558cc5516369c1c48921dccd3
diff --git a/metadata/md5-cache/app-backup/btrbk-0.32.1 b/metadata/md5-cache/app-backup/btrbk-0.32.1
deleted file mode 100644
index 3580059c5ec3..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.32.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-INHERIT=systemd
-IUSE=+mbuffer +doc +lsbtr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.1.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bcb1b62558cc5516369c1c48921dccd3
diff --git a/metadata/md5-cache/app-backup/btrbk-0.32.3 b/metadata/md5-cache/app-backup/btrbk-0.32.3
deleted file mode 100644
index f737045e60c2..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.32.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=8
-HOMEPAGE=https://digint.ch/btrbk/
-INHERIT=systemd
-IUSE=+mbuffer +doc +lsbtr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.3.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=651224f301e0272241351223dac9c53e
diff --git a/metadata/md5-cache/app-backup/btrbk-0.32.4 b/metadata/md5-cache/app-backup/btrbk-0.32.4
deleted file mode 100644
index 45c6c75df9b7..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.32.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=8
-HOMEPAGE=https://digint.ch/btrbk/
-INHERIT=systemd
-IUSE=+mbuffer +doc +lsbtr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.4.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=651224f301e0272241351223dac9c53e
diff --git a/metadata/md5-cache/app-backup/btrbk-0.32.2 b/metadata/md5-cache/app-backup/btrbk-0.32.5
index eca1c343cd4a..8061098753c7 100644
--- a/metadata/md5-cache/app-backup/btrbk-0.32.2
+++ b/metadata/md5-cache/app-backup/btrbk-0.32.5
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
 SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.2.tar.xz
+SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.32.5.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=651224f301e0272241351223dac9c53e
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index fbcf959452bf..aa0d823383d5 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/mouseremote-0.90-r3 b/metadata/md5-cache/app-misc/mouseremote-0.90-r3
index 88320253b21c..95e024dcdd87 100644
--- a/metadata/md5-cache/app-misc/mouseremote-0.90-r3
+++ b/metadata/md5-cache/app-misc/mouseremote-0.90-r3
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=virtual/perl-Time-HiRes
+DEFINED_PHASES=compile install postinst
 DESCRIPTION=X10 MouseRemote
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www4.pair.com/gribnif/ha/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
+RDEPEND=virtual/perl-Time-HiRes
 SLOT=0
 SRC_URI=http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3076e4e2b7567e9ee2a5ba408754c864
+_md5_=81d3c1cf26a2105a23c361728b863d39
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 79d7745a241a..d0b2e150929d 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/libucl-0.8.1-r100 b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
index 1e8a3442f03f..90033608a3e8 100644
--- a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
+++ b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/libucl/archive/0.8.1.tar.gz -> libucl-0.8.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c3fcc9dc8d1ccded2ccd07862a9b8ef0
+_md5_=49a48a284f22c4571148c22394ea8c2a
diff --git a/metadata/md5-cache/dev-libs/libucl-9999 b/metadata/md5-cache/dev-libs/libucl-9999
index fc647bf9bd08..d6549827421b 100644
--- a/metadata/md5-cache/dev-libs/libucl-9999
+++ b/metadata/md5-cache/dev-libs/libucl-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c3fcc9dc8d1ccded2ccd07862a9b8ef0
+_md5_=49a48a284f22c4571148c22394ea8c2a
diff --git a/metadata/md5-cache/dev-libs/libzia-4.37 b/metadata/md5-cache/dev-libs/libzia-4.37
new file mode 100644
index 000000000000..fe148070822b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzia-4.37
@@ -0,0 +1,15 @@
+BDEPEND=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=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) elibc_musl? ( sys-libs/libunwind )
+DESCRIPTION=Platform abstraction code for tucnak package
+EAPI=8
+HOMEPAGE=http://tucnak.nagano.cz
+INHERIT=autotools flag-o-matic
+IUSE=ftdi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) elibc_musl? ( sys-libs/libunwind )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/libzia-4.37.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=bd3619554abd6bc85a1dc925b0d77f0c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index a5277249165c..33e2e5f4545f 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/aiohttp-3.8.3 b/metadata/md5-cache/dev-python/aiohttp-3.8.3
index 3b6ac6e418d6..75ee7c69b63c 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.8.3
+++ b/metadata/md5-cache/dev-python/aiohttp-3.8.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aio-libs/aiohttp/ https://pypi.org/project/aiohttp/
 INHERIT=distutils-r1 multiprocessing
 IUSE=test-rust 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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async-timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.8.3.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=992f50a758465b74c065ea00f6f17933
+_md5_=2b73f50f3e7ddb32a4c6e074d275f204
diff --git a/metadata/md5-cache/dev-python/brython-3.11 b/metadata/md5-cache/dev-python/brython-3.11
new file mode 100644
index 000000000000..a735172c9788
--- /dev/null
+++ b/metadata/md5-cache/dev-python/brython-3.11
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=Python 3 implementation for client-side web programming
+EAPI=8
+HOMEPAGE=http://www.brython.info
+INHERIT=webapp python-single-r1
+IUSE=vhosts python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+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-admin/webapp-config
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=3.11
+SRC_URI=https://github.com/brython-dev/brython/archive/3.11.tar.gz -> brython-3.11.gh.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=8a60f6af973dcc44898a1e8a4d980ce1
diff --git a/metadata/md5-cache/dev-python/jc-1.22.1 b/metadata/md5-cache/dev-python/jc-1.22.1
new file mode 100644
index 000000000000..a3799c2f1f14
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jc-1.22.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pygments[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(-)?] dev-python/xmltodict[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/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=Converts the output of popular command-line tools and file-types to JSON
+EAPI=8
+HOMEPAGE=https://github.com/kellyjonbrazil/jc/ https://pypi.org/project/jc/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64
+LICENSE=MIT
+RDEPEND=dev-python/pygments[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(-)?] dev-python/xmltodict[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/kellyjonbrazil/jc/archive/v1.22.1.tar.gz -> jc-1.22.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=dcaea142aab83c7a2b0bf1caf4dfc7ec
diff --git a/metadata/md5-cache/dev-python/jupyterlab-3.5.0 b/metadata/md5-cache/dev-python/jupyterlab-3.5.0
new file mode 100644
index 000000000000..6eae3054a358
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab-3.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/check-manifest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-spec-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[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/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-cache[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyterlab_server-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/notebook-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/nodejs >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_packaging-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JupyterLab computational environment
+EAPI=8
+HOMEPAGE=https://jupyter.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT GPL-3 Apache-2.0
+RDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyterlab_server-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/notebook-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/nodejs python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyterlab/jupyterlab-3.5.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a523af8ab21df0a1f030e165ad78adc8
diff --git a/metadata/md5-cache/dev-python/mako-1.2.2 b/metadata/md5-cache/dev-python/mako-1.2.2
deleted file mode 100644
index d223afaef304..000000000000
--- a/metadata/md5-cache/dev-python/mako-1.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/markupsafe-0.9.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_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-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=A Python templating language
-EAPI=8
-HOMEPAGE=https://www.makotemplates.org/ https://github.com/sqlalchemy/mako/ https://pypi.org/project/Mako/
-INHERIT=distutils-r1
-IUSE=doc 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 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/markupsafe-0.9.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 )
-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/M/Mako/Mako-1.2.2.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dbf2e56529eb26e328f017b27f098c34
diff --git a/metadata/md5-cache/dev-python/mako-1.2.3 b/metadata/md5-cache/dev-python/mako-1.2.3
index 19d91e816abe..f2a72115230c 100644
--- a/metadata/md5-cache/dev-python/mako-1.2.3
+++ b/metadata/md5-cache/dev-python/mako-1.2.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.makotemplates.org/ https://github.com/sqlalchemy/mako/ https://pypi.org/project/Mako/
 INHERIT=distutils-r1
 IUSE=doc 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 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/markupsafe-0.9.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 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.2.3.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cb3b37c743b3d17140332d8531ed9a07
+_md5_=dbf2e56529eb26e328f017b27f098c34
diff --git a/metadata/md5-cache/dev-python/pyicu-2.10.1 b/metadata/md5-cache/dev-python/pyicu-2.10.1
new file mode 100644
index 000000000000..95947cd80d28
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyicu-2.10.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-libs/icu:= >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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
+DEPEND=dev-libs/icu:=
+DESCRIPTION=Python bindings for dev-libs/icu
+EAPI=8
+HOMEPAGE=https://gitlab.pyicu.org/main/pyicu/ https://pypi.org/project/PyICU/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/icu:= 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://gitlab.pyicu.org/main/pyicu/-/archive/v2.10.1/pyicu-v2.10.1.tar.bz2
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b9447e3d395e032e2f183932f607cec9
diff --git a/metadata/md5-cache/dev-python/pytest-env-0.8.1 b/metadata/md5-cache/dev-python/pytest-env-0.8.1
new file mode 100644
index 000000000000..614628ac3330
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-env-0.8.1
@@ -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 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=py.test plugin that allows you to add environment variables
+EAPI=8
+HOMEPAGE=https://github.com/MobileDynasty/pytest-env
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pytest[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 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-env/pytest_env-0.8.1.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=0b153718472c1ecea65d7bd6bcd42db0
diff --git a/metadata/md5-cache/dev-python/python-cstruct-3.3 b/metadata/md5-cache/dev-python/python-cstruct-3.3
new file mode 100644
index 000000000000..67e19b4195bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-cstruct-3.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=C-style structs for Python
+EAPI=8
+HOMEPAGE=https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/
+INHERIT=distutils-r1
+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 ) 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/andreax79/python-cstruct/archive/v3.3.tar.gz -> python-cstruct-3.3.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=6d6a2eaae86504cc8ac359445715b4d6
diff --git a/metadata/md5-cache/dev-python/stestr-3.2.1 b/metadata/md5-cache/dev-python/stestr-3.2.1
deleted file mode 100644
index 7e9bd8e467cd..000000000000
--- a/metadata/md5-cache/dev-python/stestr-3.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/ddt-1.0.1[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-65.3.0[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 parallel Python test runner built around subunit
-EAPI=8
-HOMEPAGE=https://github.com/mtreinish/stestr
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cliff-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/voluptuous-0.8.9[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/s/stestr/stestr-3.2.1.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c83536a2278ac6096040b08c3ecacb14
diff --git a/metadata/md5-cache/dev-python/stestr-4.0.1 b/metadata/md5-cache/dev-python/stestr-4.0.1
index 706d7405361a..bfe97a1d3cbc 100644
--- a/metadata/md5-cache/dev-python/stestr-4.0.1
+++ b/metadata/md5-cache/dev-python/stestr-4.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mtreinish/stestr
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cliff-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/voluptuous-0.8.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stestr/stestr-4.0.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e327e9dae0e9ef2efc8d3a8b289775fe
+_md5_=c83536a2278ac6096040b08c3ecacb14
diff --git a/metadata/md5-cache/dev-python/ujson-5.5.0 b/metadata/md5-cache/dev-python/ujson-5.5.0
index 645b084e904d..ec601b7a57ba 100644
--- a/metadata/md5-cache/dev-python/ujson-5.5.0
+++ b/metadata/md5-cache/dev-python/ujson-5.5.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ultrajson/ultrajson/ https://pypi.org/project/ujson/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/double-conversion:= 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-5.5.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=520f6b67e1626cb1c677a8941908ac32
+_md5_=b54976399573d6f8dad03e41a209116d
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 05aa1a22fd98..3c974386c8da 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.38-r2 b/metadata/md5-cache/dev-util/geany-plugins-1.38-r2
index f15e5f39cf57..2098b7b3b559 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.38-r2
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.38-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://plugins.geany.org
 INHERIT=lua-single
 IUSE=ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench +lua_single_target_lua5-1
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 arm ~ppc ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:2.91 ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:= ) gtkspell? ( app-text/gtkspell:3= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( x11-libs/vte:2.91 ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= ) scope? ( sys-devel/gdb )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.38.tar.gz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dd474465145898c6c3617146729777cf
+_md5_=9b7fb002e08743b97950f8ea2ea0d327
diff --git a/metadata/md5-cache/dev-util/sgb-20030623-r1 b/metadata/md5-cache/dev-util/sgb-20030623-r1
index 82dd35c49ec0..1b3f69bacdbb 100644
--- a/metadata/md5-cache/dev-util/sgb-20030623-r1
+++ b/metadata/md5-cache/dev-util/sgb-20030623-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Stanford GraphBase
 EAPI=7
 HOMEPAGE=http://ftp.cs.stanford.edu/pub/sgb/
 KEYWORDS=~amd64 ~ppc x86
-LICENSE=BSD
+LICENSE=mmix
 SLOT=0
 SRC_URI=http://ftp.cs.stanford.edu/pub/sgb/sgb-2003-06-23.tar.gz
-_md5_=c0832c3022dc83b77dd4c494427c9acc
+_md5_=0889ef83a8cdbd4443a665a10eec5391
diff --git a/metadata/md5-cache/dev-util/sgb-20090810 b/metadata/md5-cache/dev-util/sgb-20090810-r1
index 0cad98e28ca8..f94622f59cc2 100644
--- a/metadata/md5-cache/dev-util/sgb-20090810
+++ b/metadata/md5-cache/dev-util/sgb-20090810-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Stanford GraphBase
 EAPI=7
 HOMEPAGE=http://ftp.cs.stanford.edu/pub/sgb/
 KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
+LICENSE=mmix
 SLOT=0
 SRC_URI=http://ftp.cs.stanford.edu/pub/sgb/sgb-2009-08-10.tar.gz
-_md5_=c7110ce76381a55ce347e56521946de6
+_md5_=9daddf535c41d68fee8fecefac0c5ee8
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index f642e7b805d1..a553060450c5 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/qudos-0.40.1 b/metadata/md5-cache/games-fps/qudos-0.40.1
deleted file mode 100644
index 5135f8c42ad7..000000000000
--- a/metadata/md5-cache/games-fps/qudos-0.40.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm
-DESCRIPTION=Enhanced Quake 2 engine
-EAPI=7
-HOMEPAGE=https://github.com/ZwS/qudos
-INHERIT=desktop flag-o-matic toolchain-funcs
-IUSE=cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata[symlink] ) textures? ( games-fps/quake2-textures )
-SLOT=0
-SRC_URI=mirror://gentoo/QuDos-0.40.1-src.tar.bz2 https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> QuDos-0.40.1.pk3
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4abae2098eba9f5eddcd500757e5eba1
diff --git a/metadata/md5-cache/games-fps/qudos-0.40.1-r1 b/metadata/md5-cache/games-fps/qudos-0.40.1-r1
new file mode 100644
index 000000000000..c896173069e8
--- /dev/null
+++ b/metadata/md5-cache/games-fps/qudos-0.40.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=media-libs/libogg media-libs/libjpeg-turbo media-libs/libpng media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu )
+DESCRIPTION=Enhanced Quake 2 engine
+EAPI=8
+HOMEPAGE=https://github.com/ZwS/qudos
+INHERIT=desktop flag-o-matic toolchain-funcs
+IUSE=cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libogg media-libs/libjpeg-turbo media-libs/libpng media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu ) cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata[symlink] ) textures? ( games-fps/quake2-textures )
+SLOT=0
+SRC_URI=mirror://gentoo/QuDos-0.40.1-src.tar.bz2 https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> QuDos-0.40.1.pk3
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=771fe889c791aafc71096a180ee9de95
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 67d72f0804bf..b6c84b99e8d3 100644
--- a/metadata/md5-cache/mate-extra/Manifest.gz
+++ b/metadata/md5-cache/mate-extra/Manifest.gz
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.26.0 b/metadata/md5-cache/mate-extra/caja-dropbox-1.26.0-r1
index cf510fc7634e..22e4eed8999f 100644
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.26.0
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.26.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-libs/atk >=dev-libs/glib-2.50:2 >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango dev-python/docutils virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango dev-python/docutils virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=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 setup
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=mate-base/mate-common-1.26
 DESCRIPTION=Store, Sync and Share Files Online
@@ -8,9 +8,9 @@ INHERIT=mate python-single-r1 linux-info
 IUSE=debug nls python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=CC-BY-ND-3.0 GPL-3+ public-domain
-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 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-libs/atk >=dev-libs/glib-2.50:2 >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango net-misc/dropbox
+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 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango net-misc/dropbox
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.26/caja-dropbox-1.26.0.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	mate	e29617c33d6e271931938d0073817dde	mate-desktop.org	0da897c64adb500292c6b9db3e424496	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=431c836e8d76606b3ed4befbbe7ad0f6
+_md5_=ed6f3b086838d24995cba74f310082ff
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 006cb4275872..ef76a4311f91 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/tucnak-4.37 b/metadata/md5-cache/media-radio/tucnak-4.37
new file mode 100644
index 000000000000..20a6eef72d7f
--- /dev/null
+++ b/metadata/md5-cache/media-radio/tucnak-4.37
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= ) virtual/pkgconfig
+DESCRIPTION=Amateur Radio VHF Contest Logbook
+EAPI=8
+HOMEPAGE=http://tucnak.nagano.cz
+INHERIT=autotools flag-o-matic
+IUSE=alsa fftw gpm hamlib suid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/tucnak-4.37.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=e18d6b9d8bf9e91a02358e013a2d35eb
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 458607f8ee98..89fcf3b3c2ce 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.17 b/metadata/md5-cache/net-libs/liblockfile-1.17
index 890bf5124947..9b9aacacfed3 100644
--- a/metadata/md5-cache/net-libs/liblockfile-1.17
+++ b/metadata/md5-cache/net-libs/liblockfile-1.17
@@ -1,6 +1,5 @@
-BDEPEND=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
+BDEPEND=acct-group/mail 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 prepare
-DEPEND=acct-group/mail
 DESCRIPTION=Implements functions designed to lock the standard mailboxes
 EAPI=7
 HOMEPAGE=https://github.com/miquels/liblockfile
@@ -12,4 +11,4 @@ RDEPEND=acct-group/mail
 SLOT=0
 SRC_URI=https://github.com/miquels/liblockfile/archive/v1.17.tar.gz -> liblockfile-1.17.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6c94605569619f334c0940098b8cedc0
+_md5_=64269be4881c46219ce328b08d40785e
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3ea855c87210..ac6531601bff 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.3_p1 b/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
index c68045f67ca1..b761f8956246 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
@@ -1,6 +1,6 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=acct-group/dhcp acct-user/dhcp virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare unpack
-DEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap:= ssl? ( dev-libs/openssl:= ) )
+DEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap:= ssl? ( dev-libs/openssl:= ) )
 DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
 EAPI=7
 HOMEPAGE=https://www.isc.org/dhcp
@@ -12,4 +12,4 @@ RDEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-app
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.3-P1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a42ba7b5b52d713a89eba4151c51c510
+_md5_=001bd042da2b7ad732ee7f84695c1713
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index f784cd8757b1..567de3ede6e5 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4-r1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4-r1
deleted file mode 100644
index 280eb793a3a3..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.16.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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=configure install prepare test
-DEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-INHERIT=autotools flag-o-matic systemd
-IUSE=cpu_flags_x86_sse2 curl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.16.4.tar.gz -> cpuminer-opt-3.16.4.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c63e5f7ea68b1cfb8051e80d59ae1d58
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1-r1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1-r1
deleted file mode 100644
index fdfdc279e67d..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.17.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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=configure install prepare test
-DEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-INHERIT=autotools flag-o-matic systemd
-IUSE=cpu_flags_x86_sse2 curl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.17.1.tar.gz -> cpuminer-opt-3.17.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c63e5f7ea68b1cfb8051e80d59ae1d58
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.18.0 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.18.0
deleted file mode 100644
index acdc89c78801..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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=configure install prepare test
-DEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-INHERIT=autotools flag-o-matic systemd
-IUSE=cpu_flags_x86_sse2 curl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.18.0.tar.gz -> cpuminer-opt-3.18.0.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c63e5f7ea68b1cfb8051e80d59ae1d58
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.19.8 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.20.3
index de81d80b98be..f2dd0dee2f78 100644
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.19.8
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.20.3
@@ -11,6 +11,6 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:= dev-libs/jansson:= >=net-misc/curl-7.15[ssl] dev-libs/openssl:0=
 REQUIRED_USE=cpu_flags_x86_sse2
 SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.19.8.tar.gz -> cpuminer-opt-3.19.8.tar.gz
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.20.3.tar.gz -> cpuminer-opt-3.20.3.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=6c11a74efd0400bc52045ad4deb985e4
diff --git a/metadata/md5-cache/net-p2p/transmission-3.00-r4 b/metadata/md5-cache/net-p2p/transmission-3.00-r5
index f065a3150b2b..f8f479539bff 100644
--- a/metadata/md5-cache/net-p2p/transmission-3.00-r4
+++ b/metadata/md5-cache/net-p2p/transmission-3.00-r5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/transmission-3.00.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b4347c3919092c20b70268211327c99d
+_md5_=d6cf6400f42afc652c3ce65dc5ed88b3
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 2f1d97cd8d67..7593eefabb06 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.18 b/metadata/md5-cache/sci-libs/openblas-0.3.18
index df0cfa898d13..a26bc1bf0777 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.18
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.18
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Optimized BLAS library based on GotoBLAS2
 EAPI=7
-HOMEPAGE=http://xianyi.github.com/OpenBLAS/
+HOMEPAGE=http://xianyi.github.io/OpenBLAS/
 INHERIT=flag-o-matic fortran-2 toolchain-funcs
 IUSE=dynamic eselect-ldso index-64bit openmp pthread relapack test
 KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.18.tar.gz -> openblas-0.3.18.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e9435656422d17291c59fbbf4414149c
+_md5_=0861da1b26f74a0161d3ae5d58f0579a
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.19 b/metadata/md5-cache/sci-libs/openblas-0.3.19
index 35c1adea87a5..164987f21942 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.19
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.19
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Optimized BLAS library based on GotoBLAS2
 EAPI=7
-HOMEPAGE=http://xianyi.github.com/OpenBLAS/
+HOMEPAGE=http://xianyi.github.io/OpenBLAS/
 INHERIT=flag-o-matic fortran-2 toolchain-funcs
 IUSE=dynamic eselect-ldso index-64bit openmp pthread relapack test
 KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.19.tar.gz -> openblas-0.3.19.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e9435656422d17291c59fbbf4414149c
+_md5_=0861da1b26f74a0161d3ae5d58f0579a
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.20 b/metadata/md5-cache/sci-libs/openblas-0.3.20
index 3a22cb8845e0..06d27906088b 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.20
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.20
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Optimized BLAS library based on GotoBLAS2
 EAPI=7
-HOMEPAGE=http://xianyi.github.com/OpenBLAS/
+HOMEPAGE=http://xianyi.github.io/OpenBLAS/
 INHERIT=flag-o-matic fortran-2 toolchain-funcs
 IUSE=dynamic eselect-ldso index-64bit openmp pthread relapack test
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.20.tar.gz -> openblas-0.3.20.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5b4226cf2d57adffc01bb103d2e5b4d1
+_md5_=5315b7c6f146efb351d9381f7c57ed81
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index d1947984502c..a64215df3ae6 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/gt-itm-19961004-r2 b/metadata/md5-cache/sci-misc/gt-itm-19961004-r3
index 613644dcae71..fe0c04961d16 100644
--- a/metadata/md5-cache/sci-misc/gt-itm-19961004-r2
+++ b/metadata/md5-cache/sci-misc/gt-itm-19961004-r3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install prepare unpack
 DEPEND=dev-util/sgb
 DESCRIPTION=Routines to generate / analyze graphs using models for internetwork topology
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www.cc.gatech.edu/fac/Ellen.Zegura/graphs.html http://www.isi.edu/nsnam/ns/ns-topogen.html#gt-itm
-INHERIT=toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved sgb2ns
@@ -11,5 +11,5 @@ RDEPEND=dev-util/sgb
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.cc.gatech.edu/fac/Ellen.Zegura/gt-itm/gt-itm.tar.gz -> gt-itm-19961004.tar.gz http://www.isi.edu/nsnam/dist/sgb2ns.tar.gz -> sgb2ns-19961004.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d689f5929b3b5540318ba9be1adf411c
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=30426e9accf4e60f06bea977d116e410
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 4ca09de99ab7..10d2a8132a14 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20220830 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20220830
new file mode 100644
index 000000000000..a876d3a3e2d8
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20220830
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend
+DESCRIPTION=Raspberry Pi (all versions) bootloader and GPU firmware
+EAPI=8
+HOMEPAGE=https://github.com/raspberrypi/firmware
+INHERIT=mount-boot readme.gentoo-r1
+KEYWORDS=-* ~arm ~arm64
+LICENSE=GPL-2 raspberrypi-videocore-bin
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20220830.tar.gz -> raspberrypi-firmware-1.20220830.tar.gz
+_eclasses_=mount-boot	02a45c5e022c08dbc05178522b2772f2	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=d859c8f8408b41b64081a1da08ce5c31
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
index e7ab318aae4c..38d5e801629e 100644
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
@@ -1,7 +1,7 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
 DESCRIPTION=Raspberry Pi (all versions) bootloader and GPU firmware
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/raspberrypi/firmware
 INHERIT=mount-boot readme.gentoo-r1 git-r3
 LICENSE=GPL-2 raspberrypi-videocore-bin
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=binchecks strip
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	mount-boot	02a45c5e022c08dbc05178522b2772f2	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=9778c544cd8f443d7ebbae6d489a54ec
+_md5_=d859c8f8408b41b64081a1da08ce5c31
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 56749309b636..1307a1624608 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/raspberrypi-wifi-ucode-20210315.3_p5 b/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p7
index f5baac43f82e..69314e6065c8 100644
--- a/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p5
+++ b/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20210315.3_p7
@@ -4,7 +4,7 @@ EAPI=8
 HOMEPAGE=https://github.com/RPi-Distro/firmware-nonfree https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree
 KEYWORDS=~arm ~arm64
 LICENSE=Broadcom
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
+RDEPEND=net-wireless/wireless-regdb !sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
-SRC_URI=https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/firmware-nonfree_20210315-3+rpt5.debian.tar.xz
-_md5_=092a140ef0eadb51dc524c23e09ef841
+SRC_URI=https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/firmware-nonfree_20210315-3+rpt7.debian.tar.xz
+_md5_=21fbf68d47b4eee8a1e5146de0faca8e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 6adb5b114b17..22acaf916ced 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.3
new file mode 100644
index 000000000000..f98d5e4744e5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.3
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.0.3
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.0.3 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.0.3
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.3-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.3-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.3-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.3-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=bf7f6a7140768d3177b6555b08378d5e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.3
new file mode 100644
index 000000000000..d2584e453f0f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.3
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.0.3
+RDEPEND=!sys-kernel/gentoo-kernel:6.0.3 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.0.3
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
+_md5_=b78ae1a39b2103332b5d8719ce9727ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.3 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.3
new file mode 100644
index 000000000000..108971acd6c3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.3
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.0.3
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.0.3
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.3.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.3.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.3-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.3-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.3-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.3-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=a56fb036abb203780bf66c279bc24490
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 870eb761685e..9ba5277ac86a 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/cronie-1.6.1-r1 b/metadata/md5-cache/sys-process/cronie-1.6.1-r1
index efa79c3e87b2..d3337eebe03f 100644
--- a/metadata/md5-cache/sys-process/cronie-1.6.1-r1
+++ b/metadata/md5-cache/sys-process/cronie-1.6.1-r1
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=acct-group/crontab 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=configure install postinst prepare
-DEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux )
+DEPEND=pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux )
 DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
 EAPI=7
 HOMEPAGE=https://github.com/cronie-crond/cronie
@@ -12,4 +12,4 @@ RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron
 SLOT=0
 SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.6.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cron	b3117529d23cf99d6166b59608ed94e4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=97cc70ca36463b11cfb15e538aa87f78
+_md5_=a81743a40ad1ae301f9dfa3d4eb4bc66
diff --git a/metadata/md5-cache/sys-process/cronie-1.6.1-r2 b/metadata/md5-cache/sys-process/cronie-1.6.1-r2
index d5acc552c2a1..abd4401db403 100644
--- a/metadata/md5-cache/sys-process/cronie-1.6.1-r2
+++ b/metadata/md5-cache/sys-process/cronie-1.6.1-r2
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=acct-group/crontab 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=configure install postinst prepare
-DEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux )
+DEPEND=pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux )
 DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
 EAPI=7
 HOMEPAGE=https://github.com/cronie-crond/cronie
@@ -12,4 +12,4 @@ RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron
 SLOT=0
 SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.6.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cron	b3117529d23cf99d6166b59608ed94e4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f4ab102ebc09edb4a53f699d6d1b7cc2
+_md5_=6cc103b4e220925d60a8f0bd59f114dc
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index bbf5d8ace895..b0b626fe9ccc 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.0.3 b/metadata/md5-cache/virtual/dist-kernel-6.0.3
new file mode 100644
index 000000000000..3a4cd3682ac7
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.0.3
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.0.3 ~sys-kernel/gentoo-kernel-bin-6.0.3 ~sys-kernel/vanilla-kernel-6.0.3 )
+SLOT=0/6.0.3
+_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 179b9d22c778..6e1f9a21dfb3 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_h2-2.0.10 b/metadata/md5-cache/www-apache/mod_h2-2.0.11
index 182e4ed4e20a..08b0ed610b67 100644
--- a/metadata/md5-cache/www-apache/mod_h2-2.0.10
+++ b/metadata/md5-cache/www-apache/mod_h2-2.0.11
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
 SLOT=0
-SRC_URI=https://github.com/icing/mod_h2/archive/v2.0.10.tar.gz -> mod_h2-2.0.10.tar.gz
+SRC_URI=https://github.com/icing/mod_h2/archive/v2.0.11.tar.gz -> mod_h2-2.0.11.tar.gz
 _eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=c8215956b76b2c09f08b2ea7b6dc44e0
diff --git a/metadata/md5-cache/www-apache/mod_h2-2.0.9 b/metadata/md5-cache/www-apache/mod_h2-2.0.9
deleted file mode 100644
index 7df16d3874a8..000000000000
--- a/metadata/md5-cache/www-apache/mod_h2-2.0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
-DESCRIPTION=HTTP/2 module for Apache
-EAPI=7
-HOMEPAGE=https://github.com/icing/mod_h2
-INHERIT=apache-module autotools
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
-SLOT=0
-SRC_URI=https://github.com/icing/mod_h2/archive/v2.0.9.tar.gz -> mod_h2-2.0.9.tar.gz
-_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c8215956b76b2c09f08b2ea7b6dc44e0
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index b1e8c077134b..f272d4830bd1 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-10-24T14:09:41Z
+TIMESTAMP 2022-10-24T20:09:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNWnKVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNW8QdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC5+hAAte/k9Cbld2YqrnubfaGR+EZoUQEy3Ddlve+DM7P89r+tWdkPMzOuoC/t
-dwrefFj0wQ1lXYFzJWWrN08lkIn3X/6tBtMx647h9Dl5T4bK6vQ9mG7qSrFg0NVQ
-qNb06c9S/CV316pq+WhX41rxjUjk2WE6yOracxn1n/vfh8jJRPIxI9hNMbkCN1ly
-eQlR+M7wH9zaOyM5sniKDQxCsCLhHit/1Pv/7srDRlbsdyJNop0PHifiEI525q9Q
-B1g5EeNKLRvzII3OKio/f6IU6RTLKoZPiAjhjBjS4NyNoE2hDtZIzwq9yPa9dimD
-hD8Oo7igXruzhDhYoVJwz2ybKxe5OLV+bpjH9f/Jt2h47JSPXPBgHkkdTdIuOwd5
-ge8ii8CcZCd2NwBv5TGwJbiY/SfA2+fV5e9GSOCVxelLUFbcxBiGF4mHsCb0PDac
-7hlLKrkGbWltppwZFd/uArQoZ6Pdlo3XMhJTbEWpE+SKSkNdvmhPusTPmZleSy4W
-UNYGQWc91kPe/txcD0gAeldDE8aaNUeblEa4t0a9u90eqF7pvlWvv4zxnVfzD6fc
-FoAFBwyz3BlT9MmljlKQzJ1gnSOyEnSrbSGFg1sl27rxZFrRFit1Z8rKx6I3d4kU
-ON1x+ryHv0sLKrL6ai0pMdQMsE93F9agc4HyMTvS0pSc+rJopHI=
-=Zrqq
+klBFfhAAtBdbJORTgshuIVXUW/vYUpDzFv/MHKsTkrlxfOE22r++SDr97Hpc2iCN
+YCHUQajWmN7+/Z6bfKbIYO5lgV0rIUclrYZcw1dRevJCQmFSv/0fgfHx4R87/ne8
+cfzlgSsUSHNZjmc0XTyu57cSJWWHXY/uXxzm8OwZg+fTnR2OBeQSXqicLhL13PGw
+6PBTKnwPS3fT6O2rfdAGO4ZfLsAJJ76/856EWAh/AyCy6WXlDSKO5t7zLEAWCttc
+ce1ejlo60zFwwDjdOnD9qa5xyXjGULCvrsc1BXqS+5l7Kj4IOCD4C5ZhtrO1Vn9T
+25iATrtwyWw1wZ7UGd+NEaAxbHmV4JM8zXq6UeWY7AgYzbKiZQfdImC9WDMxDves
+QtaJMhSBCS2g6YZ3ktLbd/XcRchQnXpDGDG8VvXJSjC1wbATv0eg4/KBfXNGE+Gf
+Q6Hhe2/LaGGWsxXKXfxfwaWVI+fM0J4nUR9dFpOw81iau0YI1enjWwCDPPo7OMA5
+6chlV3sLkH7vtT//os7YQ9x1l9UxY9Do+BH/capnfnB6cfaekxUKfNbAVXwAS0Xc
+u5pH56tFjlIHK/J8/muEBVl4hHgKqOMdaC0DDS2D6e4vz/7umQe658dnFfhSRGlM
+h5iRrBXBfs696g8+g41VGE2VOxVrg8oUnTLsgW7Epegr+2JjAV8=
+=07Xb
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ca45ddf1d645..fd9dfcff6690 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 14:09:38 +0000
+Mon, 24 Oct 2022 20:09:40 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a872090a5e26..dff3a370c8b5 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Oct 24 02:09:38 PM UTC 2022
+Mon Oct 24 08:09:40 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8c5bfef56f15..b7b2159b3f38 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 14:15:01 +0000
+Mon, 24 Oct 2022 20:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 92e1f8ba98bc..0ad63d43e22c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8ec14688c88916014198689a1fa4887a8ceb8ecb 1666619467 2022-10-24T13:51:07+00:00
+19e2b06c9c1dfc0405636ad80630ade354780825 1666641139 2022-10-24T19:52:19+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0ecc9b70ec7b..c8acf4caeb89 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666620601 Mon 24 Oct 2022 02:10:01 PM UTC
+1666642201 Mon 24 Oct 2022 08:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ca45ddf1d645..fd9dfcff6690 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 14:09:38 +0000
+Mon, 24 Oct 2022 20:09:40 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 76400aa45afe..af38944d6242 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 048a8cc8c861..3c4a79036e3e 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile.Darwin.in 2436 BLAKE2B 63d9ce283549b26921cfd317639da45723ab5129e79dc0df0f4c2fa2489264db1991b6e9b2e76fb04906b85325d171af7dc2bb4f7f880cdb76fcdca76b50cd2f SHA512 e39931c63a20d49f6010dd668132295cfd3e02f39566715448665715ee909de3179c1db496b78261866794cdb21ecb14ccdd505f45aea5d8d0b7b196c344f9a1
 AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c067303c25d03095efb395e47d716b9bb0eb9a6affc7330d7537220f99afa64bb6ec14061de078f9313609d762bff066542c3ee SHA512 dd9cbf566ac8a933c4cee19a33cbe818904cf7be5aed05f2a17b87312267ac1716631c9fead4663b1979158363ff07218b0a486ee40c029fcd2a23142b59f275
 DIST liblockfile-1.17.tar.gz 69834 BLAKE2B a3c88174d96fb84dc1226102a1678aecec35945b89adb6e143f32674188ff7406f89b05f7219748bf0e9c6207ff3b28b5b800706ffc11b733c294e1e1c232784 SHA512 2169ac2219950d6ec7def6b5cc712cc04d1a185dc9c09b364c8d47b7b3d15c3482a2200b591872da87eb784717b2ba3537fbc39d7075c329cc8ba48039473a83
-EBUILD liblockfile-1.17.ebuild 1337 BLAKE2B 2b2bb9addf79153659f61b5c33106962cf958bf24f0eadfcb9f1626a55fdde065d0b11e4f81123973a8024d315f41a1a0e4a2fbb8d0d518b036c8edc0fb7676b SHA512 1e5e830f39cedd8d79094a9d36629671e89deeeb74f4804cf37e51b488d8ad7b08f9d72c6abc414239fdb4c7622bf4a76f114ebfa33b06171d81bf0832b69538
+EBUILD liblockfile-1.17.ebuild 1338 BLAKE2B 8d87d4156aed04a9761b7d823a03d40ab92b4287fbc75c4d5cf06efb2b9ec0dd669c6a27b6965aad4268140faf19863a9362eb27b334af4c393c1c46b078e1b0 SHA512 79e73e72302bcceb8f945eb8f1a96d961e76a3643d2e8673cff96c696ea6e10c2f77a11c547ae7b0011f314195ebf8ae45c30f4ddf0b4c7d19a52d6cb5110499
 MISC metadata.xml 252 BLAKE2B 41941b57b97ac20b47abd1c6d3ca599461c97bb2b06a4473605a273c68e7964d2365be48afbc54655f1dbaf896f3b91baafc2ea16c298d8f50b6849be2adca38 SHA512 16dfabb38698963e47a19156df2c54d7c01430e30fe7b51d80c94275016f39f3d8e7981473f4fd042f63f4730e567acd7e1e8ba08ce4386f3a35e3fc537aff7c
diff --git a/net-libs/liblockfile/liblockfile-1.17.ebuild b/net-libs/liblockfile/liblockfile-1.17.ebuild
index d2fcc989d6a9..f14423cf3a3f 100644
--- a/net-libs/liblockfile/liblockfile-1.17.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.17.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
 
 DOCS=( Changelog README )
 
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index ca174ab9cf2e..84b8d626e50c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 8bfa36c32dae..e82b1d4a00d6 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -22,5 +22,5 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
-EBUILD dhcp-4.4.3_p1.ebuild 8529 BLAKE2B 5b330f0333889d89456c097851cc57890b1bfb4bff4ca9e44be543a7276c5275522e0fd244252dc67e28c117787a8bd7ae7fa13526deb9b3fab6442f6e867f65 SHA512 0791828092b3cfcda94ed53a6641e27a70db0fed9ac16e411e6e31c4694f7de06d60e42fa8ff18ea5dbca37dae30efc13ec4b2c7cadd100630fd294d8a5601d7
+EBUILD dhcp-4.4.3_p1.ebuild 8555 BLAKE2B 75ae57beb9925b5fda24703bb35f19c1e367afeb27111a45e92dbe0f1e9e8392b6d7766fde16aef70dab05aba1a55eb9c9104ace5ea77e2d1735fcb64a67f6b2 SHA512 aca5321a4fc53e652ad3789d774c931c0bf221c267d77d58fa3f169ba913fe4677f0a8a97402740c2d82423dbfa58f70476289919db25c51aa520ececa46a9ae
 MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index e425d52ea36c..70e7c8c97bd7 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
@@ -21,9 +21,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
 
-DEPEND="
+BDEPEND="
 	acct-group/dhcp
-	acct-user/dhcp
+	acct-user/dhcp"
+
+DEPEND="
 	client? (
 		kernel_linux? (
 			ipv6? ( sys-apps/iproute2 )
@@ -34,7 +36,9 @@ DEPEND="
 		net-nds/openldap:=
 		ssl? ( dev-libs/openssl:= )
 	)"
-RDEPEND="${DEPEND}
+RDEPEND="
+	${BDEPEND}
+	${DEPEND}
 	selinux? ( sec-policy/selinux-dhcp )
 	vim-syntax? ( app-vim/dhcpd-syntax )"
 
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 0f20823aae9b..490f4aade4b3 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index ead5f81aa531..174d98e3c7e9 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,13 +1,7 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
-DIST cpuminer-opt-3.16.4.tar.gz 1830534 BLAKE2B c9fa07c36b634b0d1250b847baa4a971aad0b249aaf7792b4a69c42c5c98cc6b3e4fe20c95fdab9884520decc6e9d7071158a641863f1c0d2443dd096e372f2b SHA512 7459a9c6ad7afd85fdb8f7ff62c9deae2a2fc8341e3cf39da0f72e81bff8829e094bb830fb614fbce9665bbb259d764eb64b6d2a44ac45ecdd9ee870190d6539
-DIST cpuminer-opt-3.17.1.tar.gz 1840571 BLAKE2B db07547ec79df92f644e903485fb51abfddeafe2ecaffd18c0438cf292d51c6167eafaf7aa2b89cb6b7698d4358a4ef970459bff7b063cfd6d3a95ad878126eb SHA512 463d755bbb3146ef94292ae64a8a2397485e28b55d4b510881dd91461e3bcc2786a323cf575dd070481236b150c35af2898b5ab2b0db90c34f528821988af74c
-DIST cpuminer-opt-3.18.0.tar.gz 1869910 BLAKE2B 23e090cb9c077fc69f6eee64a522676c078de268e512c588a7d93e1bd3e3904a9e5dbc937a58c21b031f685175b2f2164df04a4f7f22f8129d5183d1b990ec2f SHA512 9144a39b7470682835b57b5ff34810933af5712b4bb2e83a2b5241aeeb13747884f5f48e22e9a71512831b56d345ee5f0e6fd226a8a30d5d10243b4a99f1476c
-DIST cpuminer-opt-3.19.8.tar.gz 1873570 BLAKE2B 9b20f47d5155ec3362172af93fab6a81b6a066c67a4c9c91ef95e9f4eddb5a325b62504414ae7b15d0088cbbda34e89741911ddd610ed727451d530d47ae141a SHA512 f8d172e906e379ddb635e64b0a626660a75aba2c1f74df014494ac934c7156664cdd2bef8963cd0433d20bca015228982b657b33be5c17bc3bd672867114a5eb
 DIST cpuminer-opt-3.20.1.tar.gz 1857399 BLAKE2B db41052f1020069b26839d12b5ac64c0dba352cb752faee1be86edfc2d21958d4ddc726d2c91c2fd1b9b5d5f08336592fd31e1a92fc37424f0d9137c082d8322 SHA512 98412c233749c87bb9629087c87350b559209f59e3ee7921b764dc0bb631b3a018368f33b4cde84d16725d67ac460f49d0aab0e838597e55f1ba47f8032cb4da
-EBUILD cpuminer-opt-3.16.4-r1.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
-EBUILD cpuminer-opt-3.17.1-r1.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
-EBUILD cpuminer-opt-3.18.0.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
-EBUILD cpuminer-opt-3.19.8.ebuild 971 BLAKE2B 1489c0bd50737bab2171d5fb098beec1242e095903d81110e1a0d31166102cfba248ca57c3878bbf1e0e27a312e1c90b62825fb427aeab061d51a5243318af64 SHA512 fcafdc10f9f582252ee68a1eee22965a67d56e93fb756330d7a0f023a076b6e5e56ff9b08f87835d13eda7772f63c99a20e9b95f2cb58b5be89dc160dc08f54e
+DIST cpuminer-opt-3.20.3.tar.gz 1789988 BLAKE2B 97e6a4d6a12250cc50e678d0f3bf8dc154c30727d3a1b7ec4a4557a5af1e9bbf5c3d13f6f558aa9cd159c60f4482a3301f13cc1d8f86ef4f1c116d2eb8c8d52e SHA512 d14d148acd6e8e5a1247a64997ec6339f162f4343a2609c0188d4ee7c767e7a265af1555141ac657e43f73262391bf23f9ee26ec98c95ca837c42cd020e55d95
 EBUILD cpuminer-opt-3.20.1.ebuild 971 BLAKE2B 1489c0bd50737bab2171d5fb098beec1242e095903d81110e1a0d31166102cfba248ca57c3878bbf1e0e27a312e1c90b62825fb427aeab061d51a5243318af64 SHA512 fcafdc10f9f582252ee68a1eee22965a67d56e93fb756330d7a0f023a076b6e5e56ff9b08f87835d13eda7772f63c99a20e9b95f2cb58b5be89dc160dc08f54e
+EBUILD cpuminer-opt-3.20.3.ebuild 971 BLAKE2B 1489c0bd50737bab2171d5fb098beec1242e095903d81110e1a0d31166102cfba248ca57c3878bbf1e0e27a312e1c90b62825fb427aeab061d51a5243318af64 SHA512 fcafdc10f9f582252ee68a1eee22965a67d56e93fb756330d7a0f023a076b6e5e56ff9b08f87835d13eda7772f63c99a20e9b95f2cb58b5be89dc160dc08f54e
 EBUILD cpuminer-opt-9999.ebuild 971 BLAKE2B 1489c0bd50737bab2171d5fb098beec1242e095903d81110e1a0d31166102cfba248ca57c3878bbf1e0e27a312e1c90b62825fb427aeab061d51a5243318af64 SHA512 fcafdc10f9f582252ee68a1eee22965a67d56e93fb756330d7a0f023a076b6e5e56ff9b08f87835d13eda7772f63c99a20e9b95f2cb58b5be89dc160dc08f54e
 MISC metadata.xml 334 BLAKE2B f5b55d2366d5e2bc0fa04e0bbfd20fb8fb21993a352641b1f63b0d33075c97611fee985b6296cb1338a8b8b613f6835efcf8621cb8ca89d6598bd4a493673bb8 SHA512 a7b29760fbd65f440341fe862a157676a66caea1ac0d51b324e3cb79297a1293de9464ff1a460b9ee0b9399f3e637bf4ec8eb6022db957db792fe13282585ffa
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild
deleted file mode 100644
index 1cd33b0d51cc..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:=
-	dev-libs/jansson:=
-	>=net-misc/curl-7.15[ssl]
-	dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild
deleted file mode 100644
index 1cd33b0d51cc..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:=
-	dev-libs/jansson:=
-	>=net-misc/curl-7.15[ssl]
-	dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild
deleted file mode 100644
index 1cd33b0d51cc..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:=
-	dev-libs/jansson:=
-	>=net-misc/curl-7.15[ssl]
-	dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.19.8.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.20.3.ebuild
index ae5b2d66fa4b..ae5b2d66fa4b 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.19.8.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.20.3.ebuild
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index eb7f930d4ae6..daaddfaaa1f3 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,5 +1,6 @@
 AUX 60-transmission.conf 56 BLAKE2B 4c2aadb19b4c85ce8ecec4f190f83da81a8b9e27f02cb20b785251122b5a495d1b3b7425378c4e17d3cda3c1c5b92c4297140dcfc3d4973dfbd1ac8e713245ca SHA512 9f79cfb00fa92e6d9054aad615f0ca7a1ad9d57b750e40b8942b7987a4a93d97b1f1ba9774a64f2b16e7c49fe7ae5fb4978d7aca3c481431ff333d508ed36410
 AUX cmake-unused-command-line.patch 875 BLAKE2B 3f86d8cd5977504e89d09948120a09a152be54a5f705c3a0e44b35bb26610750f526e5dcff2f781215a66be3b3a1fba0be797187972adcbfacf41c5835d00341 SHA512 58278a26998f560f52b76bbc76bf4c2981464e2f5c8e13672c288b9eedd0944228ee104abb99422154ba23646135baabb8400344122ad13b1333156af73fea8f
+AUX transmission-3.00-horizontal-progress-bars.patch 1391 BLAKE2B 95e01e439a6cfc460dd13ee6c13c4e2cef25a2a22d1ec001271a31871bbe30580998c15ba10597762fefa07b06004e60037ac56a4acf1a376bfcdd40a9681940 SHA512 ae8a1befde3727dd2976ed0364a52bb5b1911b800603cf403222c4d61b608729aa603576eebe7624657f0f6540d4f4750e407c5cdd7fdcb82a2eac6fe80d527e
 AUX transmission-3.00-openssl-3.patch 1136 BLAKE2B a9e2aa976145c8b08d05d464216695e6b0bd4f072f3d514e46840a0d5694ce870c6824a8c3ff3fb0f6178b3d7a54f3b0602518bed9980c18cf4c5abf1ca9b760 SHA512 aa184955ef483668690ffd3788a27bfdecd3968e331dbb8997b1fbfc6acda604bd7087ed49a63607128c61273e8177e8cc6d73d2b9aad88e5b8977ebbadb459b
 AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a9bb84f93b54f7d13be1c430209647bae89054b60f5d8dd434049140f74c1cb4ad04064d03b37ad88a851c28c07fa SHA512 47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
@@ -7,7 +8,7 @@ AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3a
 DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156edb16f9410b83058c53548f466fb9502c23157756a29e921e4468db1ebac7832b755cfcf98451c663c64401559f5498 SHA512 c8fb96086ba4b18f04d6181a29f6e2af85864840c533f3470a202dfa686e9431caeccd25f12c975a9a8f9b7802ca0bd73c4edc1ca06bdbada682326cad188a76
 DIST transmission-4.0.0-beta.1+r98cf7d9b3c.tar.xz 9481044 BLAKE2B 99d287645f4c28a9f021c0923712ca2b0246be53c26b2654a50e00dc7b3db51b7de304280f6ae2d57c879d96ebe811163af3c38a29e64764712d926fa5c3fb0f SHA512 1bd4265e708070577a5624ee33ab8b0a71baa6d12d121974be6c104078289892f35cab6ddb22070c749d8c1333996ad83eb6f08adf96ea492d96104cab550d60
 EBUILD transmission-3.00-r1.ebuild 3115 BLAKE2B 127e0f735cf5790d6a836ad732c3e8e414211d8d299ce90f244011ad8dc4e96bd1a5e69f735b0442cc7192415016fab5c7e81bb5cc37bf6c388c03a54b8c5d89 SHA512 3a867649911e8937c120f890c7a69dd01ef56e3e718212e5d5514308683e514049f4afe975e76340c78a1c389df076822ce02e1f2b36e6ec42fe4753ad8acfda
-EBUILD transmission-3.00-r4.ebuild 3139 BLAKE2B a2218ecab72fe5ebf921cad901d4f3b50f5ab6ae6f938ef52a6e699c6a8f553bc42aa75b9c65186b0e2c5b4c43e7fe07351cf178fd26f9014d32f26bedd4e955 SHA512 c9696e4b0c8056b1ce53bec345d93caae0503ba21671451165f3b57072cc7350719381523de0058e1404bfe8abe947d2bd754302b1101dc32bd212d38370d984
+EBUILD transmission-3.00-r5.ebuild 3203 BLAKE2B e9504a7e83980e06832b50f05426f62b55eeffa666cc4b6be25b5a1c3b414fd4a3b800be72bf242d8f68558de73ce75f2029a3794137ed62decb49aa23ec9d0c SHA512 b18ecae1f053cc0f0bd11e00f781a9a29361b5770a09819c981f128a5afa3126521654c9ef62fa37411e9f9cbe4ec4b387013925decac1a68a6515b2f0e58e4f
 EBUILD transmission-4.0.0_beta1.ebuild 3471 BLAKE2B a5628a172b969f68f69f265599b72e7dc296c2d29040b890c48be19f39ba58fa1206e09d89b93879c5f93bb9ec3524a8ac80659757c9eb278d57cf27fe2634dc SHA512 f67bb14c4bed820bb809f385984d0838865f08617902272c1ac0d6b1ff064b20e7efb244a2a74dedfc1e01ec33592d9d3a146149ae4f45766cb3ab9907dddf66
 EBUILD transmission-9999.ebuild 3471 BLAKE2B a5628a172b969f68f69f265599b72e7dc296c2d29040b890c48be19f39ba58fa1206e09d89b93879c5f93bb9ec3524a8ac80659757c9eb278d57cf27fe2634dc SHA512 f67bb14c4bed820bb809f385984d0838865f08617902272c1ac0d6b1ff064b20e7efb244a2a74dedfc1e01ec33592d9d3a146149ae4f45766cb3ab9907dddf66
 MISC metadata.xml 564 BLAKE2B 708f42109f5c57d776242ad935684b78a7f6cc72c439e2bb76d2fb29fb770f5054c6765df0665244c650bc930eeb312957f4749967a9b2771b8a6d032767d3b0 SHA512 22f2e75b57b24f1367cdcfe28600cfa09dab9d741ff1ab84a25052dc455272b9d9d6d62d297bdbd23e9955d41cabb540f0348c0554c465371e81175525be1ddb
diff --git a/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch b/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch
new file mode 100644
index 000000000000..63d8ca2fe274
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-3.00-horizontal-progress-bars.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/878099
+https://github.com/transmission/transmission/issues/3150
+
+--- a/qt/FileTreeDelegate.cc
++++ a/qt/FileTreeDelegate.cc
+@@ -49,7 +49,7 @@
+     if (column == FileTreeModel::COL_PROGRESS)
+     {
+         QStyleOptionProgressBar p;
+-        p.state = option.state | QStyle::State_Small;
++        p.state = option.state | QStyle::State_Horizontal | QStyle::State_Small;
+         p.direction = qApp->layoutDirection();
+         p.rect = option.rect;
+         p.rect.setSize(QSize(option.rect.width() - 4, option.rect.height() - 8));
+--- a/qt/TorrentDelegate.cc
++++ a/qt/TorrentDelegate.cc
+@@ -545,7 +545,7 @@
+         progressBarState = QStyle::State_None;
+     }
+ 
+-    progressBarState |= QStyle::State_Small;
++    progressBarState |= QStyle::State_Horizontal | QStyle::State_Small;
+ 
+     QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal;
+     QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon();
+--- a/qt/TorrentDelegateMin.cc
++++ a/qt/TorrentDelegateMin.cc
+@@ -218,7 +218,7 @@
+         progressBarState = QStyle::State_None;
+     }
+ 
+-    progressBarState |= QStyle::State_Small;
++    progressBarState |= QStyle::State_Horizontal | QStyle::State_Small;
+ 
+     QIcon::Mode const emblemIm = isItemSelected ? QIcon::Selected : QIcon::Normal;
+     QIcon const emblemIcon = tor.hasError() ? getWarningEmblem() : QIcon();
diff --git a/net-p2p/transmission/transmission-3.00-r4.ebuild b/net-p2p/transmission/transmission-3.00-r5.ebuild
index 2b31213bed1f..6a12e5a07a73 100644
--- a/net-p2p/transmission/transmission-3.00-r4.ebuild
+++ b/net-p2p/transmission/transmission-3.00-r5.ebuild
@@ -68,6 +68,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/cmake-unused-command-line.patch
 	"${FILESDIR}"/transmission-3.00-openssl-3.patch
+	"${FILESDIR}"/transmission-3.00-horizontal-progress-bars.patch
 )
 
 src_configure() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 114c5ef14914..574f93a1aa53 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 760063881022..9326a8c678e0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,17 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-10-24)
+# Non-free licence which prohibits any patching. Fails to build with Clang 16.
+# Removal on 2022-10-24.
+dev-util/sgb
+sci-misc/gt-itm
+
+# Sam James <sam@gentoo.org> (2022-10-24)
+# Fails to build with Clang 16 (code quality issues), no upstream activity
+# in 7 years. Removal on 2022-11-23. bug #874486, bug #791604.
+games-fps/qudos
+
 # David Seifert <soap@gentoo.org> (2022-10-23)
 # Dead package, upstream gone, GTK+2, fails to build with Clang 16 and
 # tests fail. Removal on 2022-11-22. Bug #741200, #875686.
diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020
index 9d1b5acb3f8e..099ce0c43e52 100644
--- a/profiles/updates/2Q-2020
+++ b/profiles/updates/2Q-2020
@@ -2,7 +2,6 @@ move dev-libs/yaml-cpp dev-cpp/yaml-cpp
 move dev-python/rnc2rng app-text/rnc2rng
 move games-puzzle/world-of-goo games-puzzle/world-of-goo-hb
 slotmove =dev-ruby/shoulda-matchers-4.3.0* 3 4
-move kde-misc/gmailfeed kde-misc/ultimate-gmail-feed
 move dev-vcs/cli dev-util/github-cli
 move mail-filter/pypolicyd-spf mail-filter/spf-engine
 move dev-python/mimeparse dev-python/python-mimeparse
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 015e6a8c4a79..82c6154fc7ca 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 333d1056cb60..45e7c8a90ed0 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -4,7 +4,7 @@ AUX openblas-0.3.20-fix-riscv.patch 3786 BLAKE2B 5ba65c1f44aa8cd8f1b88458dfe16ef
 DIST openblas-0.3.18.tar.gz 12619822 BLAKE2B 38a5e7b861eb0063a4494c1cfb6f7f5723741437ecdd5cb1fb42645eb73bceb472b3a8c11eec3d0ba4f676981ac89de4ff1ee0d7ea42d1e234746f34ce8fb6b8 SHA512 df9a14026a61bdc5285636bfd7a52dce244d24fcf4a0c870ef4e58b8b50e412849828ca5aeac2a2435f635e78e60559762e8bae22ea7bc5dff2e865a96d81152
 DIST openblas-0.3.19.tar.gz 12706050 BLAKE2B c29aa27faaf18e3330087f8d2ebed733f53878266d6865239dfbb1624a113f3cabc988bbfcc18a0aa5d971697bc68bb267795ef24e2d8e0e8d50f802cb817b57 SHA512 1fcbcfefb7744894b0b0c83c6071b342086ca311dc67f5c2745812d61dcc9d31ef7dd5e1215dfb2731ae7197d497dbdf8f8b26a432eb07d41a7db0983eb86a33
 DIST openblas-0.3.20.tar.gz 12742441 BLAKE2B 9ae808e2a7da39e28dbe26c7feb5da3c70275f3b48bd68455c22e3b16fc1f2d10b9d84c9593acff2c837fc1514f21f2bbc0e87708075c5fe13514d0d47cf0b5a SHA512 0742d40b74b11b781021280fd627fa5798e6856b49f2ba1111a5927aac1a7823bcb8162187555f4cf3a4dd7eadf5b1f2a4685c0b5e189847b2869166d1bc7391
-EBUILD openblas-0.3.18.ebuild 5779 BLAKE2B 851a9cb092537a519d15db945762b876d698bbf4bee13cccc1a4fd33daaf22713f36b22c0308340f8355bc0f765661554e1aff4184fbffc0045847972e1ad41d SHA512 0b3cebbd102011506335d5b76becadb5bae701442e3cf3aa13670f775a113c16c998e12d9088ebcff01798e4386fe4c21384d173bf86c29ebc949bc7df5d7f0f
-EBUILD openblas-0.3.19.ebuild 5779 BLAKE2B 851a9cb092537a519d15db945762b876d698bbf4bee13cccc1a4fd33daaf22713f36b22c0308340f8355bc0f765661554e1aff4184fbffc0045847972e1ad41d SHA512 0b3cebbd102011506335d5b76becadb5bae701442e3cf3aa13670f775a113c16c998e12d9088ebcff01798e4386fe4c21384d173bf86c29ebc949bc7df5d7f0f
-EBUILD openblas-0.3.20.ebuild 5882 BLAKE2B 84a0e9f32f6a529ca73a3385914de515ee6cad9def3d54013f08aeb13a6900c4918e0e383fbe6f5e7979370a643287daf405b2fb94101327219d955a5072af62 SHA512 75298d119f27a89c64fbace665917d54838bb27f7bea5aa6e51713b59c1be872f1c970045890cf6a1dbfdc273488264aa1d2b864d227d1031c8f0a81d207fc4b
+EBUILD openblas-0.3.18.ebuild 5778 BLAKE2B 20eacb6dfeb8114f77c9c63ee7962a4180bc029e8b950c4049b2d4d12cc81d666fd42ae13565cc9c1d9841510672308b8142ddcf898b795422c417e415ee3a9d SHA512 6155bff0b7bed8bff2db6eb3fc7d41be2eb1ae5638954825d6dea963a714067547bbd8459bbc438bad7c730e5607688bf8fc14fb6154c6a5065e87ea2012964e
+EBUILD openblas-0.3.19.ebuild 5778 BLAKE2B 20eacb6dfeb8114f77c9c63ee7962a4180bc029e8b950c4049b2d4d12cc81d666fd42ae13565cc9c1d9841510672308b8142ddcf898b795422c417e415ee3a9d SHA512 6155bff0b7bed8bff2db6eb3fc7d41be2eb1ae5638954825d6dea963a714067547bbd8459bbc438bad7c730e5607688bf8fc14fb6154c6a5065e87ea2012964e
+EBUILD openblas-0.3.20.ebuild 5881 BLAKE2B 2ea307644937c15bc745e218af6b8f3b0471c994379ef6c369977abc3097730df3167abded5c7bc48075f0043bd08f8984bddf8bb0ced2cfe9e0f8774e89bf08 SHA512 9471ed4cf44ef4ce988f9280e84e3cb30937cb0cf7fe0b02e21433b48dd9dd589a93f862b70aee56103e31a9520fb9184940a5c4a42f6d71393ba4bd7130ad33
 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48
diff --git a/sci-libs/openblas/openblas-0.3.18.ebuild b/sci-libs/openblas/openblas-0.3.18.ebuild
index ec15a244d0b8..31488ab8cb0d 100644
--- a/sci-libs/openblas/openblas-0.3.18.ebuild
+++ b/sci-libs/openblas/openblas-0.3.18.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+HOMEPAGE="http://xianyi.github.io/OpenBLAS/"
 SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/OpenBLAS-${PV}
 
diff --git a/sci-libs/openblas/openblas-0.3.19.ebuild b/sci-libs/openblas/openblas-0.3.19.ebuild
index ec15a244d0b8..31488ab8cb0d 100644
--- a/sci-libs/openblas/openblas-0.3.19.ebuild
+++ b/sci-libs/openblas/openblas-0.3.19.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+HOMEPAGE="http://xianyi.github.io/OpenBLAS/"
 SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/OpenBLAS-${PV}
 
diff --git a/sci-libs/openblas/openblas-0.3.20.ebuild b/sci-libs/openblas/openblas-0.3.20.ebuild
index 01fd54d252c4..9752701c1849 100644
--- a/sci-libs/openblas/openblas-0.3.20.ebuild
+++ b/sci-libs/openblas/openblas-0.3.20.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+HOMEPAGE="http://xianyi.github.io/OpenBLAS/"
 SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/OpenBLAS-${PV}
 
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 915b714c288e..a93c129ee6b5 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/gt-itm/Manifest b/sci-misc/gt-itm/Manifest
index 4c256aa734d3..b14c07897d02 100644
--- a/sci-misc/gt-itm/Manifest
+++ b/sci-misc/gt-itm/Manifest
@@ -1,5 +1,8 @@
-AUX gt-itm-implicits.patch 2731 BLAKE2B b8aaea5e6016d9c3e6badc3a5f02f83188830bbe79501183dbfea9453d3af51479d46e83a7053eb86241a203c3a808f8e9a0d78cb350c01eb9d6c6483be4bc91 SHA512 64dc41be9d914e1df68780576300c54aa8091862b37ae44b5530312b8eaafbda76d97021f62544bce7c57e447959eea5a83c72074a714b4894bf4fddc79b5fe7
+AUX gt-itm-19961004-Fix-build-with-Clang-16.patch 7513 BLAKE2B 9b4be914570a254041be29b123c5d9300eec49d4cf374f3206d310af373b6344f7eb26cee593f4cdc92b2c611ccd7edb0fdd1eb14acb4f60b2b9e9c2985d58e9 SHA512 37f8d381a0a0df4f55d13e4670d01c461883966ab1b2398b5232fc409e3e199515749731e13d70b1f67dbd60cf218bc129cadb388176a7b045ec34c28c21d695
+AUX gt-itm-19961004-Fix-musl-build.patch 1980 BLAKE2B 9ffa9c0f0153bd085a4d79512b4be4348571c4e8251e8e04e686d7d9b32e86e1160786922d53ae1fff3bf32daf1637e3b7512b7c2f6855f35258355d93e5e6aa SHA512 6b9f15bf1d475f60c8fb163a9f4bd6f5f0ec285e26f1ecaec55a8564aea0058b3a33115f8bb237faa72412d17702f3c9f7e98338cb96fa789cdbbb1dde9d89c6
+AUX gt-itm-19961004-gentoo.patch 4963 BLAKE2B 868fe349939591b7632ee1162a98d40bf1aa98e759f56660a8b685a8ff05b94a0ab7c368145ad1f8fdb003fc367dba3b9feec28b1ec8280aa2f40281d0f87cc1 SHA512 da4ee372c6337169539a63d3d6d3975c7847af44dcf6f57fee2e6e5c71c541f7239146b8f27a044168c83cf5b0f8d84e8efa94afadcdf9c1674fc2ca964ce4c3
+AUX gt-itm-implicits.patch 2687 BLAKE2B 8c86224a94152919c18d6743dd8049c6b8261f816459e3fd218fbd268bfb5245031737f2741880639c4d714c2cd606d32160bc8836a12153742d8583bbfb6dc6 SHA512 4a47a552efadb6dfaf1d5f7030c51c8cb94793cd8cd0fc0e80bb79c71ab60db501e06cb01247b1ec35c61af66199671f2a5e65d501a78c0bcc3eb7acc5de6dca
 DIST gt-itm-19961004.tar.gz 623345 BLAKE2B e9cf712d6a4411cbb66faf9bbd803bb3753ebbbd05174c02581c9b606e02f1c7132b0b96f483e3f273a28aebd64a8ede046de7397ddb9606efccad59ba137524 SHA512 e775ac475d40fc753a27fb619f262d701818190fa3be90d587f95e215610918b56b9d67783d4e7e2f55d0064e5b2d2ce911042353b29bce1e4dbcf407ff9fabc
 DIST sgb2ns-19961004.tar.gz 50635 BLAKE2B b669d9def20c7e149de33072467183190f85b7fb30662cad83c53c1d9317532a1bd95174498eebd13b98eccf2ac693159793a40b667cdc97a6f15fbd027e0975 SHA512 77ec6fdad61f43bf078851852aa03dfea02df235a78853e477dacc8e2b94c0d8bda9772fc00d18fdaeabc419b2780c016b7a64a1a06ac0be2c8c2aa6608c06cf
-EBUILD gt-itm-19961004-r2.ebuild 2122 BLAKE2B b61ca4dfe47cdf2aea1f16ff6f1dba4a675df22fac8dd8c64591416353df63b97a77c244045949b4108930ff29d0c24ee33ff9559eda2307293f430c9abb9689 SHA512 ff636d79efa007527027e5edae75610ce26e436f3ac1a0bb0c2df03a8c5770bd5ef70e1036d0c8f8a10e457dee89eaf9e5e5d83874baa08ea2c3af86daae4bdd
+EBUILD gt-itm-19961004-r3.ebuild 1586 BLAKE2B 2f142c67389bfe0d82ee882b6e402a8449b16c71452cd1ad60d2e9253e46d530a009070855bd647693f37f882c4908ac514f7ee80011410e2747d26f414d2129 SHA512 b855b16c1ca7c7290dff67403bfd93d4c2913db31a25cd6f439ecb35871bf6c84044cb36cf431dea6c889c7691d7071da410866092383de41a64a4d41b7902ce
 MISC metadata.xml 250 BLAKE2B 53ce4a2ec047c91819ecc665bad106707e80e4fbd9bd20cca22843c536beea3d124922de22b9c7986e39d232fb8b1f4752d4c8ee09933fe16383b475db861126 SHA512 667b310c205f016e11407f3e3fb0ad6fb1e530651b32da15e034523b0138e5fdf93b29d64311146bfdfa5bc5108f75e238136641f366e1e0b01e995ddae36aa5
diff --git a/sci-misc/gt-itm/files/gt-itm-19961004-Fix-build-with-Clang-16.patch b/sci-misc/gt-itm/files/gt-itm-19961004-Fix-build-with-Clang-16.patch
new file mode 100644
index 000000000000..e13a035e1950
--- /dev/null
+++ b/sci-misc/gt-itm/files/gt-itm-19961004-Fix-build-with-Clang-16.patch
@@ -0,0 +1,326 @@
+From 960d73fb2149340e39acc23741ede9dee52b8778 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 18:47:48 +0100
+Subject: [PATCH 1/2] Fix build with Clang 16
+
+Bug: https://bugs.gentoo.org/741582
+--- a/gt-itm/src/dfs.c
++++ b/gt-itm/src/dfs.c
+@@ -23,7 +23,7 @@ int dfs(Graph *G,int n,u_char *vis);
+ 
+ /* check connectivity of graph g                        */
+ /* uses depth-first search.                             */
+-isconnected(Graph *G)
++int isconnected(Graph *G)
+ {
+ u_char *vis;
+ Vertex *vp;
+--- a/gt-itm/src/edriver.c
++++ b/gt-itm/src/edriver.c
+@@ -51,9 +51,7 @@
+     		   } \
+ 		 }\
+ 
+-main(argc,argv)
+-    int argc;
+-    char *argv[];
++int main(int argc, char **argv)
+ {
+     int i; 
+     int min, max, sum, bins, *ddist; 
+@@ -63,14 +61,14 @@ main(argc,argv)
+     char outfile[MAXF];
+     char *dstr = "-nd";
+     int plen, idx;
+-    FILE *ddf, *evf, *pdf, *fp, *fopen();
++    FILE *ddf, *evf, *pdf, *fp;
+     int prdist = 1;
+     enum Field f0, f1;
+     int first = 1;
+ 
+     if (argc == 1) {
+ 	printf("Usage: edriver <filestem> [-nd] [-<f0><f1>]*\n\n");
+-	return;
++	return 1;
+     }
+     /* determine whether to print distributions */
+     /* determine where in argv the field pairs begin */
+--- a/gt-itm/src/eval.c
++++ b/gt-itm/src/eval.c
+@@ -201,10 +201,7 @@ int bicomp(Graph *g,int verbose)
+ }
+ 
+ 
+-void twofield_sptree(g,u,f0,f1)
+-Graph*g;
+-Vertex*u;
+-enum Field f0,f1;
++void twofield_sptree(Graph *g, Vertex *u, enum Field f0, enum Field f1)
+ {
+ 	Vertex *v, *t;
+ 	Arc *r;
+--- a/gt-itm/src/geog.c
++++ b/gt-itm/src/geog.c
+@@ -33,7 +33,7 @@
+ static char geogId[]="$Id: geog.c,v 1.1 1996/10/04 13:36:46 calvert Exp $";
+ 
+ long fdiam(Graph *g);
+-void die(s);
++void die(char* errstr);
+ 
+ double
+ distance(Vertex *u, Vertex *v)
+@@ -75,7 +75,7 @@ printparms(char *buf,geo_parms *pp)
+ void
+ randomize(long* a, long size, long mean, int iters)
+ {
+-register i,indx;
++int i,indx;
+ 
+    for (i=0; i<size; i++)       /* initialize */
+         a[i] = mean;
+@@ -149,11 +149,11 @@ geo(long seed, geo_parms *pp)
+ {
+ double p,d,L,radius,r;
+ u_char *occ;
+-register int scale;
++int scale;
+ unsigned nbytes, index, x, y;
+ u_long units,pertrange;
+ int mallocd;
+-register i,j;
++int i,j;
+ Graph *G;
+ Vertex *up,*vp;
+ char namestr[128];
+@@ -319,7 +319,7 @@ int
+ edge_level(Vertex *u, Vertex *v, int nlev)
+ {
+ char ss[MAXNAMELEN], tt[MAXNAMELEN];
+-register char *s=ss, *t=tt, *b, *c;
++char *s=ss, *t=tt, *b, *c;
+ 
+ nlev -= 1;
+ 
+@@ -359,7 +359,7 @@ geo_hier(long seed,
+ Graph *newG, *tG, *GG, *srcG, *dstG;
+ long *numv;		/* array of sizes of lower-level graphs */
+ geo_parms *curparms, workparms[MAXLEVEL];
+-register i,k,indx;
++int i,k,indx;
+ long dst;
+ int temp,total,lowsize,otherend,blen,level;
+ long maxP[MAXLEVEL], maxDiam[MAXLEVEL], wt[MAXLEVEL];
+@@ -614,7 +614,7 @@ char vnamestr[MAXNAMELEN];
+  */
+   {
+     char buf[ID_FIELD_SIZE+1];
+-    register char *cp;
++    char *cp;
+     int len, nextlen, left;
+ 
+     strcpy(tG->util_types,GEO_UTIL);	/* same for all geo graphs,	*/
+--- a/gt-itm/src/itm.c
++++ b/gt-itm/src/itm.c
+@@ -56,7 +56,7 @@
+ char *delim = " \t\n", *nonestr = "<none>";
+ static char  errstr[256];
+ 
+-void die(s);
++void die(char* errstr);
+ 
+ char *
+ get_geoparms(FILE * f, geo_parms * pp)
+@@ -298,7 +298,7 @@ geo_parms	parmsbuf[MAXLEVEL];	/* make sure MAXLEVEL >= 3 */
+     return NULL;
+ }
+ 
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+     FILE           *infile;
+     char	   *rv;
+@@ -306,7 +306,7 @@ main(int argc, char **argv)
+ 
+     if (argc == 1) {
+ 	printf("itm <spec-file0> <spec-file1> ....\n\n");
+-	return;
++	return 1;
+     }
+     while (--argc) {
+ 
+--- a/gt-itm/src/sgb2alt.c
++++ b/gt-itm/src/sgb2alt.c
+@@ -24,7 +24,7 @@
+ #include "gb_save.h"
+ #include "geog.h"
+ 
+-main(argc,argv)
++int main(argc,argv)
+     int argc;
+     char *argv[];
+ {
+@@ -36,14 +36,14 @@ main(argc,argv)
+ 
+     if (argc != 3) {
+ 	    printf("sgb2old <sgfile> <altfile>\n\n");
+-	    return;
++	    return 1;
+     }
+     fout = fopen(argv[2],"w");
+ 
+     g = restore_graph(argv[1]);
+ 		if (g == NULL) {
+       printf("%s does not contain a correct SGB graph\n",argv[1]);
+-			return;
++			return 1;
+ 		}
+ 			
+     fprintf(fout,"GRAPH (#nodes #edges id uu vv ww xx yy zz):\n");
+--- a/gt-itm/src/ts.c
++++ b/gt-itm/src/ts.c
+@@ -76,7 +76,7 @@ int stubs_OK(Vertex *snp0,Vertex *snp1);
+ long
+ fdiam(Graph *g)
+ {
+-register i,j,k;
++int i,j,k;
+ long **dist, **ldist;
+ int changed,mallocd;
+ long diam, ldiam, newdist = 0, otherend;
+@@ -174,7 +174,7 @@ Arc *a;
+ } /* fdiam */
+ 
+ void
+-die(s)
++die(char* s)
+ {
+ fprintf(stderr,"Fatal error %s\n",s);
+ exit(1);
+@@ -187,7 +187,7 @@ exit(1);
+ void
+ copyedges(Graph *fromG, Graph *toG, long base)
+ {
+-register i, indx;
++int i, indx;
+ Vertex *np, *vp, *basep;
+ Arc *ap;
+ 
+@@ -245,7 +245,7 @@ long i,j,k;
+ long indx, diam, totalnodes, base, dom;
+ char dnodename[ID_FIELD_SIZE], snodename[ID_FIELD_SIZE];
+ int dnamelen, numtries=0;
+-register Vertex *v,*dnp, *snp,	/* domain node and stub node pointers	*/
++Vertex *v,*dnp, *snp,	/* domain node and stub node pointers	*/
+        *ddnp, *fp, *tp, *tmp;
+ 
+ Arc *a;
+--- a/gt-itm/src/sgb2alt.c
++++ b/gt-itm/src/sgb2alt.c
+@@ -32,7 +32,7 @@ int main(argc,argv)
+     Vertex *v;
+     Arc *a;
+     Graph *g;
+-    FILE *fopen(), *fout;
++    FILE *fout;
+ 
+     if (argc != 3) {
+ 	    printf("sgb2old <sgfile> <altfile>\n\n");
+--- a/sgb2ns/sgb2comns.c
++++ b/sgb2ns/sgb2comns.c
+@@ -80,9 +80,7 @@ void print_flat_nodes(FILE *fout, Graph *g);
+ void print_edges(FILE *fout, Graph *g);
+ void print_hdr(FILE *fout, Graph *g);
+ 
+-main(argc,argv)
+-    int argc;
+-    char *argv[];
++int main(int argc, char *argv[])
+ {
+ 	
+ 	int hier_flag=0;
+@@ -102,7 +100,7 @@ main(argc,argv)
+ 	g = restore_graph(argv[1]);
+ 	if (g == NULL) {
+ 		printf("%s does not contain a correct SGB graph\n",argv[1]);
+-		return;
++		return 1;
+ 	}
+ 	
+ 	if (hier_flag) 
+--- a/sgb2ns/sgb2hierns.c
++++ b/sgb2ns/sgb2hierns.c
+@@ -47,9 +47,7 @@
+ #define HUGE   655536
+ 
+ 
+-main(argc,argv)
+-    int argc;
+-    char *argv[];
++int main(int argc, char *argv[])
+ {
+ 
+     int i, 
+@@ -89,7 +87,7 @@ main(argc,argv)
+ 	    /* for the purpose of scenario generator, need to return a list of transits
+ 	       & stubs and num of nodes in each - hence the optional third arg topofile */
+ 	    printf("sgb2hierns <sgfile> <outfile> ?<topofile>?\n\n");
+-	    return;
++	    return 1;
+     }
+   
+     fout = fopen(argv[2],"w");
+@@ -101,7 +99,7 @@ main(argc,argv)
+     g = restore_graph(argv[1]);
+     if (g == NULL) {
+ 	    printf("%s does not contain a correct SGB graph\n",argv[1]);
+-	    return;
++	    return 1;
+     }
+ 
+     fprintf(fout,"# Generated by sgb2hier-ns,sgb2hier-ns generated from sgb2ns\n");
+--- a/sgb2ns/sgb2ns.c
++++ b/sgb2ns/sgb2ns.c
+@@ -41,27 +41,25 @@
+ #include "gb_save.h"
+ #include "geog.h"
+ 
+-main(argc,argv)
+-     int argc;
+-     char *argv[];
++int main(int argc,char *argv[])
+ {
+ 	int i, j, nlink;
+ 	Vertex *v;
+ 	Arc *a;
+ 	Graph *g;
+-	FILE *fopen(), *fout;
++	FILE *fout;
+ 	char m[420];
+ 
+ 	if (argc != 3) {
+ 		printf("sgb2ns <sgfile> <nsfile>\n\n");
+-		return;
++		return 1;
+ 	}
+ 	fout = fopen(argv[2],"w");
+ 
+ 	g = restore_graph(argv[1]);
+ 	if (g == NULL) {
+ 		printf("%s does not contain a correct SGB graph\n",argv[1]);
+-		return;
++		return 1;
+ 	}
+ 			
+ 	fprintf(fout, "# Generated by sgb2ns, created by Polly Huang\n");
+--- a/sgb2ns/ts2ns.c
++++ b/sgb2ns/ts2ns.c
+@@ -55,7 +55,7 @@ main(argc,argv)
+ 	Vertex *v;
+ 	Arc *a;
+ 	Graph *g;
+-	FILE *fopen(), *fout;
++	FILE *fout;
+ 	char m[420], name[40];
+ 	int transits[HUGE]; 
+ 	int p,q, total_transits;
diff --git a/sci-misc/gt-itm/files/gt-itm-19961004-Fix-musl-build.patch b/sci-misc/gt-itm/files/gt-itm-19961004-Fix-musl-build.patch
new file mode 100644
index 000000000000..3826661bd9f1
--- /dev/null
+++ b/sci-misc/gt-itm/files/gt-itm-19961004-Fix-musl-build.patch
@@ -0,0 +1,69 @@
+From 15670744cc6a182cf0d2a4ed16748255ac1ff5c8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 18:48:48 +0100
+Subject: [PATCH 2/2] Fix musl build
+
+Bug: https://bugs.gentoo.org/832835
+--- a/gt-itm/src/dfs.c
++++ b/gt-itm/src/dfs.c
+@@ -19,22 +19,22 @@ static char dfsID[]="$Id: dfs.c,v 1.1 1996/10/04 13:36:32 calvert Exp $";
+ 
+ #define NBBY 8
+ 
+-int dfs(Graph *G,int n,u_char *vis);
++int dfs(Graph *G,int n,unsigned char *vis);
+ 
+ /* check connectivity of graph g                        */
+ /* uses depth-first search.                             */
+ int isconnected(Graph *G)
+ {
+-u_char *vis;
++unsigned char *vis;
+ Vertex *vp;
+ int i,nbytes;
+ 
+     nbytes = (G->n/NBBY)+ (G->n%NBBY?1:0);
+ 
+     if (nbytes < STACKMAX) {	/* for small amounts we use stack frame */
+-        vis = (u_char *) alloca(nbytes);
++        vis = (unsigned char *) alloca(nbytes);
+     } else {
+-        vis = (u_char *) malloc(nbytes);
++        vis = (unsigned char *) malloc(nbytes);
+     }
+ 
+     for (i=0; i<nbytes; i++) vis[i]=0;
+@@ -54,7 +54,7 @@ int i,nbytes;
+ /* trivial depth-first search. */
+ /* Returns number of newly-visited nodes in subtree rooted at node n. */
+ int
+-dfs(Graph *G,int n,u_char *vis)
++dfs(Graph *G,int n,unsigned char *vis)
+ {
+ int nvis, i, nextn;
+ Vertex *vp;
+--- a/gt-itm/src/geog.c
++++ b/gt-itm/src/geog.c
+@@ -148,7 +148,7 @@ Graph *
+ geo(long seed, geo_parms *pp)
+ {
+ double p,d,L,radius,r;
+-u_char *occ;
++unsigned char *occ;
+ int scale;
+ unsigned nbytes, index, x, y;
+ u_long units,pertrange;
+@@ -189,10 +189,10 @@ char namestr[128];
+     nbytes = ((scale*scale)%NBBY ? (scale*scale/NBBY)+1 : (scale*scale)/NBBY);
+ 
+     if (nbytes < STACKMAX) {	/* small amount - just do it in the stack */
+-        occ = (u_char *) alloca(nbytes);
++        occ = (unsigned char *) alloca(nbytes);
+         mallocd = 0;
+     } else {
+-        occ = (u_char *) malloc(nbytes);
++        occ = (unsigned char *) malloc(nbytes);
+         mallocd = 1;
+     }
+ 
+
diff --git a/sci-misc/gt-itm/files/gt-itm-19961004-gentoo.patch b/sci-misc/gt-itm/files/gt-itm-19961004-gentoo.patch
new file mode 100644
index 000000000000..12b8579ece95
--- /dev/null
+++ b/sci-misc/gt-itm/files/gt-itm-19961004-gentoo.patch
@@ -0,0 +1,201 @@
+--- a/gt-itm/sample-graphs/rand/r10/Runconvert
++++ b/gt-itm/sample-graphs/rand/r10/Runconvert
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2)
+-   ../../../bin/sgb2alt r10-$i.gb r10-$i.alt 
++   sgb2alt r10-$i.gb r10-$i.alt 
+ end
+--- a/gt-itm/sample-graphs/rand/r10/Runeval
++++ b/gt-itm/sample-graphs/rand/r10/Runeval
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2)
+-   ../../../bin/edriver r10-$i -nd -hh -ll -hl
++   edriver r10-$i -nd -hh -ll -hl
+ end
+--- a/gt-itm/sample-graphs/rand/r100/Runconvert
++++ b/gt-itm/sample-graphs/rand/r100/Runconvert
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../../bin/sgb2alt r100-$i.gb r100-$i.alt 
++   sgb2alt r100-$i.gb r100-$i.alt 
+ end
+--- a/gt-itm/sample-graphs/rand/r100/Runeval
++++ b/gt-itm/sample-graphs/rand/r100/Runeval
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../../bin/edriver r100-$i -nd -hh -ll -hl
++   edriver r100-$i -nd -hh -ll -hl
+ end
+--- a/gt-itm/sample-graphs/ts/ts100/Runconvert
++++ b/gt-itm/sample-graphs/ts/ts100/Runconvert
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../bin/sgb2alt ts100-$i.gb ts100-$i.alt 
++   sgb2alt ts100-$i.gb ts100-$i.alt 
+ end
+--- a/gt-itm/sample-graphs/ts/ts100/Runeval
++++ b/gt-itm/sample-graphs/ts/ts100/Runeval
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../../bin/edriver ts100-$i -nd -hh -ll -hl
++   edriver ts100-$i -nd -hh -ll -hl
+ end
+--- a/gt-itm/sample-graphs/ts/ts600/Runconvert
++++ b/gt-itm/sample-graphs/ts/ts600/Runconvert
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../bin/sgb2alt ts600-$i.gb ts600-$i.alt 
++   sgb2alt ts600-$i.gb ts600-$i.alt 
+ end
+--- a/gt-itm/sample-graphs/ts/ts600/Runeval
++++ b/gt-itm/sample-graphs/ts/ts600/Runeval
+@@ -1,5 +1,5 @@
+ #!/bin/csh
+ 
+ foreach i (0 1 2 3 4 5 6 7 8 9)
+-   ../../../bin/edriver ts600-$i -nd -hh -ll -hl
++   edriver ts600-$i -nd -hh -ll -hl
+ end
+--- a/gt-itm/src/Makefile
++++ b/gt-itm/src/Makefile
+@@ -9,10 +9,10 @@
+ # 
+ # For Solaris: uncomment the next two lines
+ #SYS = -DSYSV
+-#LIBS = -lm -lgb5
++#LIBS = -lm -lgb
+ 
+ # For SunOS: uncomment the next line
+-LIBS = -lm -lgb4
++LIBS = -lm -lgb
+  
+ 
+ IDIR = ../include
+@@ -35,29 +35,22 @@ EH = $(IDIR)/gb_graph.h $(IDIR)/gb_save.h $(IDIR)/gb_dijk.h \
+ all:	itm sgb2alt edriver
+ 
+ itm:	$(GO)
+-	$(CC) $(CFLAGS) -o $(BDIR)/itm $(GO) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/itm $(GO) $(LIBS)
+ 
+-itm.o:	$(GH)
+ 
+-geog.o:	$(GH)
+ 
+-ts.o: $(GH)	
+ 
+-dfs.o: $(GH)
+ 
+ 
+ sgb2alt: $(CO)
+-	$(CC) $(CFLAGS) -o $(BDIR)/sgb2alt $(CO) $(LIBS) 
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/sgb2alt $(CO) $(LIBS) 
+ 
+-sgb2alt.o: $(CH)
+ 
+ 
+ edriver: $(EO)
+-	$(CC) $(CFLAGS) -o $(BDIR)/edriver $(EO) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/edriver $(EO) $(LIBS)
+ 
+-edriver.o: $(EH)
+ 
+-eval.o: $(IDIR)/gb_graph.h $(IDIR)/gb_dijk.h $(IDIR)/eval.h
+ 
+ 	
+ clean:  
+--- a/gt-itm/src/eval.c
++++ b/gt-itm/src/eval.c
+@@ -159,7 +159,7 @@ int bicomp(Graph *g,int verbose)
+ 			if (u == &dummy) {
+ 			    if (verbose) {
+ 			    if (artic_pt)
+-				printf(" and %d (this ends a connected 
++				printf(" and %d (this ends a connected \
+ 				component of the graph)\n", idx(g, artic_pt));
+ 			    else
+ 				printf("Isolated vertex %d\n", idx(g, v));
+--- a/gt-itm/src/geog.c
++++ b/gt-itm/src/geog.c
+@@ -6,7 +6,7 @@
+  */
+ 
+ #include <stdio.h>
+-#include <sys/types.h>		/* for NBBY */
++#include <sys/param.h>		/* for NBBY */
+ #include <alloca.h>
+ #include <assert.h>
+ #include <string.h>		/* for strchr() */
+--- a/sgb2ns/Makefile
++++ b/sgb2ns/Makefile
+@@ -8,11 +8,10 @@
+ #       uncomment the two Solaris lines below, and comment the SunOS line.
+ # 
+ # For Solaris: uncomment the next two lines
+-SYS = -DSYSV
+-LIBS = -lm -lgb5
++LIBS = -lm -lgb
+ 
+ # For SunOS: uncomment the next line
+-#LIBS = -lm -lgb4
++#LIBS = -lm -lgb
+ 
+ GT_ITM = ../gt-itm
+ IDIR = $(GT_ITM)/include
+@@ -33,16 +32,16 @@ CH = $(IDIR)/geog.h $(IDIR)/gb_graph.h $(IDIR)/gb_save.h
+ all:	sgb2comns sgb2hierns sgb2ns ts2ns
+ 
+ sgb2ns: $(CN)
+-	$(CC) $(CFLAGS) -o $(BDIR)/sgb2ns $(CN) $(LIBS) 
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/sgb2ns $(CN) $(LIBS) 
+ 
+ ts2ns: $(CN)
+-	$(CC) $(CFLAGS) -o $(BDIR)/ts2ns $(CN) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/ts2ns $(CN) $(LIBS)
+ 
+ sgb2hierns: $(HN)
+-	$(CC) $(CFLAGS) -o $(BDIR)/sgb2hierns $(HN) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/sgb2hierns $(HN) $(LIBS)
+ 
+ sgb2comns: $(COM)
+-	$(CC) $(CFLAGS) -o $(BDIR)/sgb2comns $(COM) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BDIR)/sgb2comns $(COM) $(LIBS)
+ 
+ sgb2ns.o: $(CH)
+ sgb2hierns.o: $(CH)
+--- a/sgb2ns/sgb2comns.c
++++ b/sgb2ns/sgb2comns.c
+@@ -49,6 +49,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <strings.h>
+ #include <string.h>
+ #include "gb_graph.h"
+--- a/sgb2ns/sgb2hierns.c
++++ b/sgb2ns/sgb2hierns.c
+@@ -34,7 +34,8 @@
+  */
+ 
+ #include <stdio.h>
+-#include <strings.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "gb_graph.h"
+ #include "gb_save.h"
+ #include "geog.h"
diff --git a/sci-misc/gt-itm/files/gt-itm-implicits.patch b/sci-misc/gt-itm/files/gt-itm-implicits.patch
index 7618354469ff..70da0f568c65 100644
--- a/sci-misc/gt-itm/files/gt-itm-implicits.patch
+++ b/sci-misc/gt-itm/files/gt-itm-implicits.patch
@@ -1,5 +1,5 @@
---- gt-itm/src/geog.c
-+++ gt-itm/src/geog.c
+--- a/gt-itm/src/geog.c
++++ b/gt-itm/src/geog.c
 @@ -6,6 +6,7 @@
   */
  
@@ -18,8 +18,8 @@
  double
  distance(Vertex *u, Vertex *v)
  {
---- gt-itm/src/ts.c
-+++ gt-itm/src/ts.c
+--- a/gt-itm/src/ts.c
++++ b/gt-itm/src/ts.c
 @@ -8,6 +8,7 @@
   */
  
@@ -39,8 +39,8 @@
  /* fast diameter computation using Floyd-Warshall
   * Returns the HOP diameter of the graph, i.e. each edge given UNIT wt.
   * Leaves the LENGTH diameter of the graph in g->Gldiam.
---- gt-itm/include/geog.h
-+++ gt-itm/include/geog.h
+--- a/gt-itm/include/geog.h
++++ b/gt-itm/include/geog.h
 @@ -74,3 +74,8 @@
           geo_parms* toppp,      /* params for transit connectivity */
           geo_parms* transpp,    /*   "     "  transit domains   */
@@ -50,8 +50,8 @@
 +long idist(Vertex *u, Vertex *v);
 +int printparms(char *buf,geo_parms *pp);
 +int isconnected(Graph *G);
---- gt-itm/src/edriver.c
-+++ gt-itm/src/edriver.c
+--- a/gt-itm/src/edriver.c
++++ b/gt-itm/src/edriver.c
 @@ -35,6 +35,8 @@
   */
  
@@ -61,8 +61,8 @@
  #include "gb_graph.h"
  #include "gb_save.h"
  #include "gb_dijk.h"
---- gt-itm/include/eval.h
-+++ gt-itm/include/eval.h
+--- a/gt-itm/include/eval.h
++++ b/gt-itm/include/eval.h
 @@ -8,4 +8,7 @@
  enum Field {Len, A, B, Hops};
  
@@ -72,8 +72,8 @@
 +void dopaths(Graph *g, enum Field f0, enum Field f1, int *rmin, int *rmax, float *ravg);
 +void dodepthdist(Graph *g, int** ddist);
 +int bicomp(Graph *g,int verbose);
---- gt-itm/src/dfs.c
-+++ gt-itm/src/dfs.c
+--- a/gt-itm/src/dfs.c
++++ b/gt-itm/src/dfs.c
 @@ -6,6 +6,7 @@
   */
  
@@ -91,8 +91,8 @@
  /* check connectivity of graph g                        */
  /* uses depth-first search.                             */
  isconnected(Graph *G)
---- gt-itm/src/itm.c.orig	2010-10-12 17:11:25.748461793 +0200
-+++ gt-itm/src/itm.c	2010-10-12 17:13:09.237165705 +0200
+--- a/gt-itm/src/itm.c.orig
++++ b/gt-itm/src/itm.c
 @@ -42,6 +42,7 @@
  #include <stdlib.h>		/* for calloc(),atoi(),etc. */
  #include <string.h>		/* for strtok() */
diff --git a/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild b/sci-misc/gt-itm/gt-itm-19961004-r3.ebuild
index 295139f5bfc9..fb3284587034 100644
--- a/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
+++ b/sci-misc/gt-itm/gt-itm-19961004-r3.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Routines to generate / analyze graphs using models for internetwork topology"
 HOMEPAGE="http://www.cc.gatech.edu/fac/Ellen.Zegura/graphs.html
 		http://www.isi.edu/nsnam/ns/ns-topogen.html#gt-itm"
 SRC_URI="http://www.cc.gatech.edu/fac/Ellen.Zegura/gt-itm/gt-itm.tar.gz -> ${P}.tar.gz
 		http://www.isi.edu/nsnam/dist/sgb2ns.tar.gz -> sgb2ns-${PV}.tar.gz"
+S="${WORKDIR}/${PN}"
+S2="${WORKDIR}/sgb2ns"
 
 LICENSE="all-rights-reserved sgb2ns"
 SLOT="0"
@@ -20,10 +22,13 @@ IUSE="doc"
 DEPEND="dev-util/sgb"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
-S2="${WORKDIR}/sgb2ns"
+PATCHES=(
+	"${FILESDIR}"/${PN}-19961004-gentoo.patch
+	"${FILESDIR}"/${PN}-implicits.patch
+	"${FILESDIR}"/${PN}-19961004-Fix-build-with-Clang-16.patch
+	"${FILESDIR}"/${PN}-19961004-Fix-musl-build.patch
+)
 
-PATCHES=( "${FILESDIR}"/${PN}-implicits.patch )
 DOCS=( README docs/. )
 
 src_unpack() {
@@ -35,32 +40,16 @@ src_unpack() {
 }
 
 src_prepare() {
-	sed -ri -e '/^[[:alnum:]]+\.o:/d' \
-		-e 's|LIBS = -lm -lgb.*|LIBS = -lm -lgb|' \
-		-e 's/\$\(CC\)/& \$\(LDFLAGS\)/g' \
-		src/Makefile || die
-	sed -ri -e '/^SYS = -DSYSV/d' \
-		-e 's|LIBS = -lm -lgb.*|LIBS = -lm -lgb|' \
-		-e 's/\$\(CC\)/& \$\(LDFLAGS\)/g' \
-		"${S2}"/Makefile  || die
-
 	rm -f lib/* || die
 
-	while IFS="" read -d $'\0' -r file; do
-		sed -i -re 's|(\.\./)+bin/||g' "$file" || die
-	done < <(find sample-graphs/ -perm /a+x -type f -name 'Run*' -print0)
-
-	sed -i -e 's|sys/types.h|sys/param.h|' src/geog.c || die
-	sed -i -e '162 s/connected $/connected \\/' src/eval.c || die
-
-	# fix implicit function declarations
-	sed -i -e '/stdio.h/ a\#include <stdlib.h>' \
-		"${S2}/sgb2comns.c" "${S2}/sgb2hierns.c" || die
-	sed -i -e "s/<strings.h>/<string.h>/g" "${S2}/sgb2hierns.c" || die
+	cd "${WORKDIR}" || die
 	default
+	cd "${S}" || die
 }
 
 src_compile() {
+	append-cflags -std=gnu89
+
 	emake -C src CFLAGS="${CFLAGS} -I../include" LDFLAGS="${LDFLAGS}" \
 		CC="$(tc-getCC)"
 
@@ -70,11 +59,13 @@ src_compile() {
 
 src_install() {
 	dobin bin/*
+
 	einstalldocs
 	newdoc "${S2}"/README README.sgb2ns
+
 	if use doc; then
 		dodoc -r sample-graphs
 		dodoc "${S2}"/*.{tcl,gb}
-		docompress -x "/usr/share/doc/${PF}/sample-graphs"
+		docompress -x /usr/share/doc/${PF}/sample-graphs
 	fi
 }
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 090faa035451..406d4139b355 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index d28cb4a18352..3f90010671e6 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -3,7 +3,9 @@ AUX raspberrypi-firmware-1.20201022-cmdline.txt 108 BLAKE2B b7830fdaf1ffb64cb07a
 AUX raspberrypi-firmware-1.20201022-config.txt 1784 BLAKE2B 7f37f02c486e6db2767b108e5926dc056f558ef32ae8ac3debea2fe7a210b159a2e4721846be8719520667c9bb86dc5d15c7c815f90dfe2686748f4d474fac61 SHA512 0909fae9bf731417f732486f7823f92a142824f5cab490b1736a16e7f569c9ecd805828c533c238dd3c5d75efcd2679e0d3697d988388000e1475a966fa66f12
 DIST raspberrypi-firmware-1.20211118.tar.gz 193544570 BLAKE2B db6c7c2e247f668b02210fb181305c3244f3d8a30f923656bf15cf418cb26822844df5b39af62b483e9e49405e13a60e57d6826aa0f3c3698920e8fc568656e2 SHA512 54881fc31ca0c9de8d8ca41ad6418e9d149975fbadbc0409f4136d4a31e70d743d55a16d4c0942305077d463c952edaa48be56d22d015983ab672dcaf5f134e2
 DIST raspberrypi-firmware-1.20220328.tar.gz 195699471 BLAKE2B e39ae746b46eb4f63aa2043df9fb60ce23b966d172e2c2c311942425e62896fb8ef171689c420bf2545065514a331e46c3bfb4d028eab8eea251357ee4c947f3 SHA512 b9e8676a94dce4621af25b8ba563a2dbd93f6fad61f5c5fb8b57b0ff5262151ff61598ce56a5f952f99f6e37f7c9ebf801a51849ee45ee328a168ca88e2522f3
+DIST raspberrypi-firmware-1.20220830.tar.gz 184738723 BLAKE2B 3675488a4ad9e3e8570eecfb56af2fd77d35dcc0da1cb14892a18e2b8471011411f0ec063c76fe51a72170df4d2f78acec11c0473272d6ba5248785c339fa3bd SHA512 9f5682254bf2596556b8759dd7b6ab1292ba6a28bf582f100682a1f14a03b43ac6ece654392e7a17f27db3940e8073b9e8645bd66aba8504a820fc29a3a1c500
 EBUILD raspberrypi-firmware-1.20211118.ebuild 1889 BLAKE2B c381485a3cf3bf5812190158c90726a82a9b35edee84358b7feed0c1255b0ab61088a4255c734ea7fa0d56f8e21a45f8e74a37398b52b6ea0c97b7987dad99e9 SHA512 63fefccade1dcb9a109953b33c65b45b70b8d76caa673f35049480c3cfa32590466e851ea1e5653b8574d45f4293eacb2b7baa2bfeb0b6e63e020e11503d4dbe
 EBUILD raspberrypi-firmware-1.20220328.ebuild 1891 BLAKE2B ca43f4e2533f2938e1cac56e303ee91ae643b5d76cc2654846ff4d59fc4f1f57690d0effa252c98646f53d6a2c9dc6c43ef2bffeb335438616d4deb0c3f41f84 SHA512 c4cfff21db5ec5d502fd3883a13c82be2c9af1fc08163ce1ce9bd2c903894977526f8ff55bba7ce73876c8328d015e7cf46120117246aa1887af2f5aa9679634
-EBUILD raspberrypi-firmware-9999.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a
-MISC metadata.xml 505 BLAKE2B 79f9a89cea4ce9658dfc203b6dbcd5251973f747c25996457a0556fed4d21c9482aef195759453ad1e7f5631308b5e2b089a55ff7cd617f168b604bf9c3620fe SHA512 9e2432add5a42ae97e2dc4e09a638786256ca76d22b93c2073c929a79ee216784b9ae284d268025883f00b6ddb1d682a9a1cd20bfe579feee7e8dface013eba4
+EBUILD raspberrypi-firmware-1.20220830.ebuild 1891 BLAKE2B ca43f4e2533f2938e1cac56e303ee91ae643b5d76cc2654846ff4d59fc4f1f57690d0effa252c98646f53d6a2c9dc6c43ef2bffeb335438616d4deb0c3f41f84 SHA512 c4cfff21db5ec5d502fd3883a13c82be2c9af1fc08163ce1ce9bd2c903894977526f8ff55bba7ce73876c8328d015e7cf46120117246aa1887af2f5aa9679634
+EBUILD raspberrypi-firmware-9999.ebuild 1891 BLAKE2B ca43f4e2533f2938e1cac56e303ee91ae643b5d76cc2654846ff4d59fc4f1f57690d0effa252c98646f53d6a2c9dc6c43ef2bffeb335438616d4deb0c3f41f84 SHA512 c4cfff21db5ec5d502fd3883a13c82be2c9af1fc08163ce1ce9bd2c903894977526f8ff55bba7ce73876c8328d015e7cf46120117246aa1887af2f5aa9679634
+MISC metadata.xml 682 BLAKE2B 27e6782667f13403b8f513d7f9c4532d6ba62a56d2132b9271c1ff10edda3063670e00c0e11bf504ef61d32c7cdfe0b45076dec30f59228eeb88ac80ff4ce597 SHA512 fa0a6cf32c873ab59e81517a1bc4bfa8333295a9ebe4f518150825006c12c22d4ba38dab093f1d075a1377f0c438a2a36b0c9dbb4296ead8413cbe8b946757cf
diff --git a/sys-boot/raspberrypi-firmware/metadata.xml b/sys-boot/raspberrypi-firmware/metadata.xml
index 8dc8059c3a3d..5a079f400051 100644
--- a/sys-boot/raspberrypi-firmware/metadata.xml
+++ b/sys-boot/raspberrypi-firmware/metadata.xml
@@ -12,5 +12,7 @@
 	<upstream>
 		<bugs-to>https://github.com/raspberrypi/firmware/issues</bugs-to>
 		<remote-id type="github">raspberrypi/firmware</remote-id>
+		<remote-id type="cpe">cpe:/o:raspberrypi:raspberry_pi_4_model_b_firmware</remote-id>
+		<remote-id type="cpe">cpe:/o:raspberrypi:raspberry_pi_3_model_b%2b_firmware</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220830.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220830.ebuild
new file mode 100644
index 000000000000..595de0624e7e
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220830.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot readme.gentoo-r1
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~arm ~arm64"
+	S="${WORKDIR}/firmware-${PV}"
+fi
+
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+	if use arm64; then
+		# Force selection of the 64-bit kernel8.img to match our userland
+		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+	fi
+}
+
+src_install() {
+	insinto /boot
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
+	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		local msg=""
+
+		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+
+		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
+			msg+="/boot/config.txt "
+		fi
+
+		if [[ -n "${msg}" ]] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove (backup) your copies during install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
index 7fe926ad7820..595de0624e7e 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit mount-boot readme.gentoo-r1
 
@@ -59,7 +59,7 @@ pkg_preinst() {
 
 		if [[ -n "${msg}" ]] ; then
 			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove (backup) your copies durning install"
+			msg="${msg} Please remove (backup) your copies during install"
 			msg="${msg} and merge settings afterwards."
 			msg="${msg} Further updates will be CONFIG_PROTECTed."
 			die "${msg}"
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 0ebdd0cae945..6d312cf715d7 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest
index 4e90c0a8932c..2578bef06e4e 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/Manifest
+++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
@@ -1,6 +1,7 @@
 DIST firmware-nonfree_20190114-1+rpt11.debian.tar.xz 2038892 BLAKE2B a2d66e637cd26928c23855f5369c13b83e25b6b4353c82e9a62cb14b010a8c1fda566f6d200e0e7a706c7fb140238082238b7af80fe1f75fe3f07c815fc0eb6a SHA512 5ba6783dc3f3903f20321571a1fb2e11d7781de6d49689c68e6e1f194dad9cdddec90abc94a32a130323b2c8f9839af387c46aee895caf30ffb2f6dfe6d95b7d
 DIST firmware-nonfree_20210315-3+rpt5.debian.tar.xz 1743300 BLAKE2B 5de090eefc68ba34df43c58a08554891b8e98d1c8ebce37c63275af8ca438b42880d95dcddf902a1491e19007ccab8cec950f74f50c4f84df092c76e6ffb437b SHA512 8a2151b8c96b0ba806eb25fb0eed12c3b3b91d3386f8ed4ab8058dc5c5989ed5eee39c8c24ceaa8f343042a5031a8c4a2cd759b42cb12d76b58209de50c44083
+DIST firmware-nonfree_20210315-3+rpt7.debian.tar.xz 1755320 BLAKE2B d7d5a3a2a1f7fbf6f18c751a92012bb7018aab403091288c291d64dbc7c46b26053f3d8693253625d7603a3df9ef9ec8e5f27c365dd0e0904725f351c54931a7 SHA512 e0ae23a0306d941d0633be19e964dbaf657fe64d97bf767691558e8565814f71dbd4f45dad8219ccc8a8953bc8088f8a98e65a11d389e0d0868bf20349060ded
 EBUILD raspberrypi-wifi-ucode-20190114.1_p11.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0
 EBUILD raspberrypi-wifi-ucode-20210315.3_p5-r1.ebuild 2469 BLAKE2B e53483e6971e8a1a71ab50de3011eee09b5df84ed7526617fb7206504b5161860c470db9be1b07c7ccf521c3859cfb12e005443d99b853c0e80f3dc1da4305cd SHA512 8da229dcd2ba62f120abebb9273dcea1d962209082e0fc72d23dc6170d412f42f1f0a8855c69bf961170f6c83669f7ec58cd6ff7a886747da35e1d26cf1e06e1
-EBUILD raspberrypi-wifi-ucode-20210315.3_p5.ebuild 2437 BLAKE2B e27c8c4773a6c22bf3270ab969766868ae33ffd579bd593da1598baaf5c3c593442346262d4cc7cffd1420328d08f7f2812b3576a9cbbde63e328216dc040c28 SHA512 adf77ca6d9ee3eec6fad4fbbee2c6e628620d3e0dffec45600011631b3219d40a9b70e948fe145e91283e916faec8f13b3546b8a6a9fa862cc72a07358818b85
+EBUILD raspberrypi-wifi-ucode-20210315.3_p7.ebuild 2469 BLAKE2B e53483e6971e8a1a71ab50de3011eee09b5df84ed7526617fb7206504b5161860c470db9be1b07c7ccf521c3859cfb12e005443d99b853c0e80f3dc1da4305cd SHA512 8da229dcd2ba62f120abebb9273dcea1d962209082e0fc72d23dc6170d412f42f1f0a8855c69bf961170f6c83669f7ec58cd6ff7a886747da35e1d26cf1e06e1
 MISC metadata.xml 713 BLAKE2B 0440fb00ea20009509c7d0aeb24bb26aa0e982e69457fd7f325aef56f810c448b5776fee4ec4aec58c40e4b895a724e7d0cec605037dea44f19cc487a9b423c3 SHA512 6fbe06d1c2c3913d2d4c40b575b9b0178110184e89be41302a176b15beafa81c7dbc4f755d92fa045210869902b2a37fe5f42bbaae69760c860a63a42d1ab04e
diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p5.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7.ebuild
index 79f547877a9a..ce8516611329 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p5.ebuild
+++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7.ebuild
@@ -15,7 +15,10 @@ LICENSE="Broadcom"
 SLOT="0"
 KEYWORDS="~arm ~arm64"
 
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
+RDEPEND="
+	net-wireless/wireless-regdb
+	!sys-kernel/linux-firmware[-savedconfig]
+"
 
 pkg_pretend() {
 	local -a BADFILES=()
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index b745d78e0c43..e37b01b20163 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 9ddf20c187ff..67e3baba3d0b 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.4-223.base.tar.xz 5119600 BLAKE2B d2ad667a58be0061e5e94a885f3c
 DIST genpatches-5.4-223.extras.tar.xz 1812 BLAKE2B e0ebc78506b6ca3d8bc09164b26f15a8cc94495797fc17a36381a3f031dd81bf7870915a48b0deb4f58cfb43e5ec4a64e18e6ca6c00837bdfc5e4fab913752b8 SHA512 ce01405cfc355d6230e687c407c9a5e92d88c6f0837eda19d2bc23d3517df4c5159332d491459867841827e0dc3976c8229cf0d0cb1c9d39360ba67ea616a734
 DIST genpatches-5.4-224.base.tar.xz 5119576 BLAKE2B 3f5fa9712da6376491d9903759334ca4981a6fc9b24919ba6acb5114ce805333a26052570df1a192dc8e062ee77667b45dac62c309d37b02190e4f8a07640aea SHA512 d433e356e47f0a6be0ba3b41172618f0b9cce634e4227924d62a8487cb74af3ea0c4d3245ee4fd2936d39ed5eb839d52985866b9d796f7e7a84415a6b60f9b50
 DIST genpatches-5.4-224.extras.tar.xz 1812 BLAKE2B d28183946e63eedcde3ccc19d84baad11b74349abbba19501c0763ae4597150f2ad7397c19396ce07627643cae526e6ef216dfa2166d217e8452719887e7f2bd SHA512 6505c71e0da13992e0abf5ffd31b414b4bcbde4be78abee6e9d402c14eb329e212e85cca77cb79591ba6d66b3f3b4ae2014e57cd8a88b39373a5dc2403f37d26
+DIST genpatches-6.0-4.base.tar.xz 272160 BLAKE2B 3758714884e31f3ddb414d2011752cdf7fd2da9d54b6dd455e9b9ec559c0201fd7753df98a1cba0618f209552419a56ef8747ac0283f794a41769dc41b3844ad SHA512 ef8292b96f10586cbc9a9ba820bed3b3f30ab1e4b90d3452d94b5e44dd4c333818c99bf6cee1272416e83cda424942be84a7aa6f270687192d94a583e8a836c0
+DIST genpatches-6.0-4.extras.tar.xz 3808 BLAKE2B 42c2695cc364ed353e1ccfa945c6f69c2b3c81e32149de5134eeaf2a738b67a952ae33ace111122bf2c58083c81a4e056e8f666693d02c39f6631a7502c36038 SHA512 305cf01975f19237de99a40dfb2a395f0084809f00040296e5ec36ed949b4301cf7887dcd3f6e287945f8d92f3544e84f3ace2ba60d6720ae09458475159132c
 DIST gentoo-kernel-5.10.148-1.amd64.gpkg.tar 66600960 BLAKE2B 8aa2a893602b1f1b9b94e462c8e6588d04515e78f7ab41ce124db79ca46e890674bf2faff1245170cf27df0a8130b3229c9fa6b70975555b22f98c275216753e SHA512 eaed6a7c5a3f993d8023a05ce701303d2a3af7e4acf038a96ef90ff2fd05c1f1ff3b7ce58fc075758625fe0e3bddef69bc119b32717ba30bb65c30e85f69639f
 DIST gentoo-kernel-5.10.148-1.arm64.gpkg.tar 59760640 BLAKE2B 133644550ff4c86ab62eaef3dac0377d568765e0e5d25d2fe392b0950ac94e536ca9dca73bdf192d8994bcc326448529b76dcc8c55f4161c1960cd153b711470 SHA512 07b91fa83c509d62d05e1e6beb9ee80d0f3c68cbb2edf66b70d9646e190b5ea1bf162592c6d091c1699600285891f7abb8807d3d281086eb14c49ec3da457d3b
 DIST gentoo-kernel-5.10.148-1.ppc64le.gpkg.tar 55121920 BLAKE2B 764f413d2c48d9b1a6825ba7dc88ab24933fc08d5e949a41ade557d794a8f92a827b9211d76a0cfc67728490e2a9ba7152f0b2d0d27daf6bebcb13c9625834cd SHA512 0f469b0902d7849c9f77c489f005d64b1ff8ba6e26335188e9ab919732f9111733f603a5a86a22edee5c4e20738140f79e457a8631772ccf8c908f689a3c77f7
@@ -40,10 +42,15 @@ DIST gentoo-kernel-5.4.219-1.amd64.gpkg.tar 60631040 BLAKE2B b50c065ca4259719a0e
 DIST gentoo-kernel-5.4.219-1.arm64.gpkg.tar 56832000 BLAKE2B 75250e0407ea8b846658a59b0e53d9293112c7e109a004783ea9ac8e54534065a50ebfa22bd9f1f059f55129bb39ba8948cc53e5afab1527ca97ec23902738ee SHA512 2e55538b7f10def530abb3ced3dc042e0b6b4de173dea949610353e3e719136860bb7271e6164eb2dcf410486a2c249e4898f0bdf24bed3140d29963dba0e229
 DIST gentoo-kernel-5.4.219-1.ppc64le.gpkg.tar 54343680 BLAKE2B 28888b569baaca609212ac382b1a3ee11bf518587d00d3553118340e847c7a3e7f814bb4727a1931daa6c39afa8567579781fd05726b759f2df8d3a9b44f7ab1 SHA512 93a8bf9453f19222cf8c0e0ad399f3bab7aeaf0ebc1c8802fb53fa2277e150584203050aea9d0e549d1bbb96a88178b891552dfdba4c460b54e20f3629cf4435
 DIST gentoo-kernel-5.4.219-1.x86.gpkg.tar 52387840 BLAKE2B 9a91a823ff95ef19a88cba5d2c2992632edf2f8a8f88c42b43c0b7dc36bb67d4ac273b0661d96520caf92f69c871aab7a7d9db1dd2cceb2f628fe88557e600ad SHA512 aa1572341d40f80ed3136bb9efc1b0519cd67d71fee6a39307a1dbeda1c086b6eeed661ea5216a3f52125d3e4e89ecc421338d40d164520301747ae5b8f0e94b
+DIST gentoo-kernel-6.0.3-1.amd64.gpkg.tar 75898880 BLAKE2B 22fa37348aca6e271a09253e60ddf1bcc05a0a669c5eb6468a76e60e0c8a74714960a49d9d3ea98cb9c5f5df2d59d7fd357d03c811d948887fb76f98cac21407 SHA512 2a72a5bb597d5ffb31604d9d8d3ad9c70d10a2c9fa7d19ab38d26160f786097da65f5dbdc9aaa4e2b3a704cd23519852536260d2fc2f6314545467254ae76fb3
+DIST gentoo-kernel-6.0.3-1.arm64.gpkg.tar 68792320 BLAKE2B 0b823e99597f1f89e6753a41b9940eb65afbfd0c43b86c46ead94b81e82f9d1e2653ff2885691fcaf6c0f5e1dc2ebd047fa4fcc0d07a1a559cd72bfdec33d136 SHA512 8b991af4189f77a5c2afcfb1c3323fef4d743eb8243d6fe08202892db4ae77a2eac7b54c49aae649ab385818a85907731f61290541788dd6020246773018d477
+DIST gentoo-kernel-6.0.3-1.ppc64le.gpkg.tar 62126080 BLAKE2B f0ba8e04802ed6a1bc66f9965c83d3beb21b5ca016f3a77c9b0f15550fca521de395d410341d6d698053ab81bb454854a906774d2f819b5a0c04e1097286d5e8 SHA512 dee4eeeba7ec50148377e6912ee57c91715afc0161c14964d5d304446470587316ec61be2c084a524af2165ab6c66fadc89467d83c0a2c5bb299c4b027a687c6
+DIST gentoo-kernel-6.0.3-1.x86.gpkg.tar 65269760 BLAKE2B 87b2ebaf40b3d33d25da9db3ce6cbd045143b1f65e59dfd91854091b86eac7671f2b5464dac9da8b1ec5dbc29b64c3b01efddf57f5ac69d2a67186f18afd0468 SHA512 2ec2d81743c85a5b10bbd8796b6478899ff02f2e926ca38c1e65fa2811d060dc2537a3db7aa6f459d92cb1c3c58482d2547f39a853c9d935172f7583ab2f75a1
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 EBUILD gentoo-kernel-bin-5.10.148.ebuild 2999 BLAKE2B 93c1a0cf84370f61fe9ec23bcccad5e2421ac6206411610653a1d8484c835de9def37872c3838f875767032d4331a245beff6cd619ccf53a43312c8331d86d3e SHA512 e4ced34e4d178d478f71d3199615f6b4b6d28127783ece7b7a04bbf376427c533539d75b07baa1692edb43a53a71c0a738982f34d68f6de1e0ef9a3c4260f4d9
 EBUILD gentoo-kernel-bin-5.10.149.ebuild 2999 BLAKE2B 93c1a0cf84370f61fe9ec23bcccad5e2421ac6206411610653a1d8484c835de9def37872c3838f875767032d4331a245beff6cd619ccf53a43312c8331d86d3e SHA512 e4ced34e4d178d478f71d3199615f6b4b6d28127783ece7b7a04bbf376427c533539d75b07baa1692edb43a53a71c0a738982f34d68f6de1e0ef9a3c4260f4d9
 EBUILD gentoo-kernel-bin-5.15.74.ebuild 2999 BLAKE2B bf50105e6cc148a793b36139a419ac66f4f14b4a73394b21af62803ab61347d87f800f066ccf7c9e33951c2efbb6d6dd77e7b7f296293cee6b0b7f17f3d1e7e2 SHA512 85bce161a2af46e8b9a2a005200e29e30e1bffc8c2263b7db2a756a73d411168dfc0e7720df907e58ccafe059f72558a47d8c93d9240222c093990de08d7500b
@@ -51,4 +58,5 @@ EBUILD gentoo-kernel-bin-5.19.16.ebuild 3003 BLAKE2B 4ab34ea587fa8ccd865b3e236c4
 EBUILD gentoo-kernel-bin-5.19.17.ebuild 3003 BLAKE2B 4ab34ea587fa8ccd865b3e236c492fb68a9d0f39c17503fe507107af52934cc14ec4dcf1afe08b92a78f6e4515da77cee078872b631e0711126b8c5b5661ef74 SHA512 6face53807c8ee8f1c1f9129d692514344491fed96102dd6579fd1ab3b0bcd02a730487a50b6a64da5f64050879231696c4d35b0d9862dbf98f4166ec1d55c4d
 EBUILD gentoo-kernel-bin-5.4.218.ebuild 2999 BLAKE2B be5c5e139ee4da605dd15cf02c6251a762426d0da46ac2b75d46b79226e7c41c57429ed847e2e646735545fee33cb7ac45d62039158c0004380197255477be12 SHA512 b0ee61606614ca61b655b50a578efefd7fb49437014df935c4ea312ab1257dc415425684a05c6dac1e5dbeac5b1eac81071bf7cae4fec7bd68f8cae985b1c969
 EBUILD gentoo-kernel-bin-5.4.219.ebuild 2999 BLAKE2B be5c5e139ee4da605dd15cf02c6251a762426d0da46ac2b75d46b79226e7c41c57429ed847e2e646735545fee33cb7ac45d62039158c0004380197255477be12 SHA512 b0ee61606614ca61b655b50a578efefd7fb49437014df935c4ea312ab1257dc415425684a05c6dac1e5dbeac5b1eac81071bf7cae4fec7bd68f8cae985b1c969
+EBUILD gentoo-kernel-bin-6.0.3.ebuild 3003 BLAKE2B dc3e591b87f0b7c9137e29fdff1d2d36e4af887e61238788671903a6526136350e19e829180fc2ddcbae54cfce4dadaceb55cb95a38c36e43e3414d0a9a9378f SHA512 624e77b77f71fdfed7f50b0cb3a8f225fb2e1a27cf5c9b3d4d454aa782a6479d7e079e3bdd9f320023ad2215fea9b283648b7d6879929020caf8913135b93765
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.3.ebuild
new file mode 100644
index 000000000000..5f8769d381a6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 169c231eee51..cbc422588e90 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,28 +12,35 @@ DIST genpatches-5.4-223.base.tar.xz 5119600 BLAKE2B d2ad667a58be0061e5e94a885f3c
 DIST genpatches-5.4-223.extras.tar.xz 1812 BLAKE2B e0ebc78506b6ca3d8bc09164b26f15a8cc94495797fc17a36381a3f031dd81bf7870915a48b0deb4f58cfb43e5ec4a64e18e6ca6c00837bdfc5e4fab913752b8 SHA512 ce01405cfc355d6230e687c407c9a5e92d88c6f0837eda19d2bc23d3517df4c5159332d491459867841827e0dc3976c8229cf0d0cb1c9d39360ba67ea616a734
 DIST genpatches-5.4-224.base.tar.xz 5119576 BLAKE2B 3f5fa9712da6376491d9903759334ca4981a6fc9b24919ba6acb5114ce805333a26052570df1a192dc8e062ee77667b45dac62c309d37b02190e4f8a07640aea SHA512 d433e356e47f0a6be0ba3b41172618f0b9cce634e4227924d62a8487cb74af3ea0c4d3245ee4fd2936d39ed5eb839d52985866b9d796f7e7a84415a6b60f9b50
 DIST genpatches-5.4-224.extras.tar.xz 1812 BLAKE2B d28183946e63eedcde3ccc19d84baad11b74349abbba19501c0763ae4597150f2ad7397c19396ce07627643cae526e6ef216dfa2166d217e8452719887e7f2bd SHA512 6505c71e0da13992e0abf5ffd31b414b4bcbde4be78abee6e9d402c14eb329e212e85cca77cb79591ba6d66b3f3b4ae2014e57cd8a88b39373a5dc2403f37d26
+DIST genpatches-6.0-4.base.tar.xz 272160 BLAKE2B 3758714884e31f3ddb414d2011752cdf7fd2da9d54b6dd455e9b9ec559c0201fd7753df98a1cba0618f209552419a56ef8747ac0283f794a41769dc41b3844ad SHA512 ef8292b96f10586cbc9a9ba820bed3b3f30ab1e4b90d3452d94b5e44dd4c333818c99bf6cee1272416e83cda424942be84a7aa6f270687192d94a583e8a836c0
+DIST genpatches-6.0-4.extras.tar.xz 3808 BLAKE2B 42c2695cc364ed353e1ccfa945c6f69c2b3c81e32149de5134eeaf2a738b67a952ae33ace111122bf2c58083c81a4e056e8f666693d02c39f6631a7502c36038 SHA512 305cf01975f19237de99a40dfb2a395f0084809f00040296e5ec36ed949b4301cf7887dcd3f6e287945f8d92f3544e84f3ace2ba60d6720ae09458475159132c
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7 SHA512 44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.5.19.13-gentoo 246842 BLAKE2B 4a824d02999749a0404437cae28721576511e06a5eaa9ebb1b1479c74e2b54402c440be7ea9159bf304661d4baaa5381c36b266ac0bba0b9bf3820eb04c6e4e0 SHA512 8862cf24b177ef3871f118712ceace2b496b04a488b045bbe3d83ab22942f064995486f5534630321faaa96ce60e5f237c4ded24a5468bea6e365aa3ea9f09c4
+DIST kernel-aarch64-fedora.config.6.0.3-gentoo 249641 BLAKE2B 292106b52829469fb8761faf983aaa160218eaeb1811f3fda811a8252d2d588e7d46863cae88490cff7e3c6ad518642250c80120e7e0c99fb3fdf745ce67c0da SHA512 5a6ffc5786d850e280fc67cf6d149c235c5a6b4f74d1785303cc5e999dbd70389b9a1012ab8596b63f5cad5563bf4076b781371a9cf59c0e7fab504e90abbaed
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.5.19.13-gentoo 223571 BLAKE2B d56f8e019b0c58023b08ee358a9af46679ca0f734c075ba6cd65dd6e3277640c0b7683e5707c48f687644d815a3840eb58351c0dee84fe9ec1dcea525fb2e1e8 SHA512 0d9fa0592b6a9414f2967677c048a9e014a0e0d43274eea4fe10f8099befae7389bbcd033f4fb36c7c44bd30c2fb197e860151e27c10dc354fe9a86a8bb65e94
+DIST kernel-i686-fedora.config.6.0.3-gentoo 225842 BLAKE2B 507f389b83e0c84273cdabe39d9d319f34d07bea9ba5fa24d25f640f96f94c89aab806c78885c2a693cf7484dc4cacb73b2d6ed61e04dc9fcee6f6c9d517114c SHA512 0740d3e2830a35fe1f2c2bb0ae62ee0b1951a4dcccb27d19da96113dc48022396f2e5961e897a3546f67538b1b1552f7052639e00c0637a912704e2ebc9683ae
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.5.19.13-gentoo 213984 BLAKE2B 9abc1d2e03bb34908019dbbc4e54d3d176acddca6e7af72fe73461e60eb249486c4e8a81bfe2515849aa26939d9abef5e981deeaa55605b34bb59552cd3444fe SHA512 d857ce4178950a96ff029c3c9870211424e1c5e95dfef88d25d6d1d517493a6fd95d9d398f42b8a6cf72482b07789be38f674dd4a2b9855da57c8391b0c2708d
+DIST kernel-ppc64le-fedora.config.6.0.3-gentoo 215755 BLAKE2B a70566e48ded1bf85d41b776325f9a850b29e2238fc8e7b9d0ec2ba2ac2c51997d8565473c849ccaf7e2e81be3fe8a80b52c1e8fae48a524e1dc4f8563f5cc07 SHA512 015268d1ee705545f82e297c24ad49aa5f8f75aab5476a2bd177a1a0cc1594a4c2a142797f37517cef0670c7d374fbbf188cdf73e751b4606b41723c428bbe8d
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.5.19.13-gentoo 224246 BLAKE2B 6dd95fc7a8bd38387a3bfd6c00733220b34091961c8437cdac61e4376de8b35529808f3b8e2db91c1a0c90e1115395df153f94107e6f9884a61bf646cb40d25e SHA512 1393e6315581a4934a35f3e66146d014ad154025fbc71245bd4b6e7639952387449b69df41605df8590a4d363a5aab5111b442b1a9f56b4d2996ca416f7e5c23
+DIST kernel-x86_64-fedora.config.6.0.3-gentoo 226517 BLAKE2B 6cdbdd1d285e07a5c8866f90a035feb5d1123c5619005b489341ffdf6a860e253ed2883fea19fee89e22752e1b99a42cc8c14546066254928ec957fe97eef2ac SHA512 758e2674b67efabaa8b49349bcc00b70f69ee24f72a1b194384f0beb1da2ce207738cc8833fc4016029566561fb4f68a984c4e9eaff4ff156991bc7e84e1f4db
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 EBUILD gentoo-kernel-5.10.148.ebuild 3598 BLAKE2B 08ce2dc5719f68b0359e131864a5b4d27a9cd1ca35d5ac0e1f9092958d8923015f99da9361104fa0fb45649c2422c2d204f89b9f66a38214d83ead29aa7f9f06 SHA512 b054a9e9858f23ef6f7ba77e6bf19abd9aec489661718107e5c3562362fbf1353319be98a7d6d551f9f998ee60ab2554ea6baadc744ce4527fc0695b4f05dff3
 EBUILD gentoo-kernel-5.10.149.ebuild 3598 BLAKE2B 08ce2dc5719f68b0359e131864a5b4d27a9cd1ca35d5ac0e1f9092958d8923015f99da9361104fa0fb45649c2422c2d204f89b9f66a38214d83ead29aa7f9f06 SHA512 b054a9e9858f23ef6f7ba77e6bf19abd9aec489661718107e5c3562362fbf1353319be98a7d6d551f9f998ee60ab2554ea6baadc744ce4527fc0695b4f05dff3
 EBUILD gentoo-kernel-5.15.74.ebuild 3595 BLAKE2B 3f9177ab76f55b26f0b9785ca179df92d66c3faf2a875ea90c996834670cb22a0b0076549390f48058b71d5b3e352e2ab7c01003b1224f3b1380c5cb20ab6b47 SHA512 d2b6b3aecc1b3571043b19deeb89ae32c07cc62e81bb9385628de7fe7506d277cadcdab5d75a6af07c9f62a0bb88e9c80ec6e467b3ded7a9468ad858ffa4cd8f
@@ -41,4 +48,5 @@ EBUILD gentoo-kernel-5.19.16.ebuild 3860 BLAKE2B 83a9eb6186ac31ddcfcbb80401e078c
 EBUILD gentoo-kernel-5.19.17.ebuild 3860 BLAKE2B 83a9eb6186ac31ddcfcbb80401e078c150f2e1e1141e962e7f1891beae412391087764a48eab5ce0fc2f9b8bd00225e9122a95b2a15b320bf0de63622d98310e SHA512 345a88aa98de549dcba361e5def145e25eae6d715523cfc6b5adaa1782a5efbda2b415bb84c9541bae7ffb8cbe36f20ec41d11da72117122eb9d5303a95d4e0e
 EBUILD gentoo-kernel-5.4.218.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
 EBUILD gentoo-kernel-5.4.219.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
+EBUILD gentoo-kernel-6.0.3.ebuild 3858 BLAKE2B 45c32644ec54fb13b8aedf1c44a671ff8613b603265b05245996118156c7aa330c89a9d5e0fdc210647cbade3edf54d184eae2751d1c0f1ba10dbeddf6076784 SHA512 f4d60507210e73defb63a52f48c01999093177d940123db23b92903c60c38e99104eb6fb26d8097bfc31eb288e5c37da3de70d7eea3f15a780c1891b401227bc
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3.ebuild
new file mode 100644
index 000000000000..f494400b5148
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.0.3-gentoo
+GENTOO_CONFIG_VER=g3
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 566d73de4ed1..9a256ba310ed 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -3,18 +3,22 @@ DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b296
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.5.19.13-gentoo 246842 BLAKE2B 4a824d02999749a0404437cae28721576511e06a5eaa9ebb1b1479c74e2b54402c440be7ea9159bf304661d4baaa5381c36b266ac0bba0b9bf3820eb04c6e4e0 SHA512 8862cf24b177ef3871f118712ceace2b496b04a488b045bbe3d83ab22942f064995486f5534630321faaa96ce60e5f237c4ded24a5468bea6e365aa3ea9f09c4
+DIST kernel-aarch64-fedora.config.6.0.3-gentoo 249641 BLAKE2B 292106b52829469fb8761faf983aaa160218eaeb1811f3fda811a8252d2d588e7d46863cae88490cff7e3c6ad518642250c80120e7e0c99fb3fdf745ce67c0da SHA512 5a6ffc5786d850e280fc67cf6d149c235c5a6b4f74d1785303cc5e999dbd70389b9a1012ab8596b63f5cad5563bf4076b781371a9cf59c0e7fab504e90abbaed
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.5.19.13-gentoo 223571 BLAKE2B d56f8e019b0c58023b08ee358a9af46679ca0f734c075ba6cd65dd6e3277640c0b7683e5707c48f687644d815a3840eb58351c0dee84fe9ec1dcea525fb2e1e8 SHA512 0d9fa0592b6a9414f2967677c048a9e014a0e0d43274eea4fe10f8099befae7389bbcd033f4fb36c7c44bd30c2fb197e860151e27c10dc354fe9a86a8bb65e94
+DIST kernel-i686-fedora.config.6.0.3-gentoo 225842 BLAKE2B 507f389b83e0c84273cdabe39d9d319f34d07bea9ba5fa24d25f640f96f94c89aab806c78885c2a693cf7484dc4cacb73b2d6ed61e04dc9fcee6f6c9d517114c SHA512 0740d3e2830a35fe1f2c2bb0ae62ee0b1951a4dcccb27d19da96113dc48022396f2e5961e897a3546f67538b1b1552f7052639e00c0637a912704e2ebc9683ae
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.5.19.13-gentoo 213984 BLAKE2B 9abc1d2e03bb34908019dbbc4e54d3d176acddca6e7af72fe73461e60eb249486c4e8a81bfe2515849aa26939d9abef5e981deeaa55605b34bb59552cd3444fe SHA512 d857ce4178950a96ff029c3c9870211424e1c5e95dfef88d25d6d1d517493a6fd95d9d398f42b8a6cf72482b07789be38f674dd4a2b9855da57c8391b0c2708d
+DIST kernel-ppc64le-fedora.config.6.0.3-gentoo 215755 BLAKE2B a70566e48ded1bf85d41b776325f9a850b29e2238fc8e7b9d0ec2ba2ac2c51997d8565473c849ccaf7e2e81be3fe8a80b52c1e8fae48a524e1dc4f8563f5cc07 SHA512 015268d1ee705545f82e297c24ad49aa5f8f75aab5476a2bd177a1a0cc1594a4c2a142797f37517cef0670c7d374fbbf188cdf73e751b4606b41723c428bbe8d
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.5.19.13-gentoo 224246 BLAKE2B 6dd95fc7a8bd38387a3bfd6c00733220b34091961c8437cdac61e4376de8b35529808f3b8e2db91c1a0c90e1115395df153f94107e6f9884a61bf646cb40d25e SHA512 1393e6315581a4934a35f3e66146d014ad154025fbc71245bd4b6e7639952387449b69df41605df8590a4d363a5aab5111b442b1a9f56b4d2996ca416f7e5c23
+DIST kernel-x86_64-fedora.config.6.0.3-gentoo 226517 BLAKE2B 6cdbdd1d285e07a5c8866f90a035feb5d1123c5619005b489341ffdf6a860e253ed2883fea19fee89e22752e1b99a42cc8c14546066254928ec957fe97eef2ac SHA512 758e2674b67efabaa8b49349bcc00b70f69ee24f72a1b194384f0beb1da2ce207738cc8833fc4016029566561fb4f68a984c4e9eaff4ff156991bc7e84e1f4db
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.148.tar.sign 993 BLAKE2B 980955d55989336130219d93c49555ea5942c9922fdfb0b11243914a3749cb088c4ff21c7b9703cfaff9a4bd3caaee3bdda76b8f376f42787a37b8c687a5fcff SHA512 37f74ad7ab87ef35dfa11391aba91d635fa5479bf5525721e9fd3e5a8bf2cdf39cc583b6095ebc523e791773326254b125a5f8a2a599c3eee44df9188d657ab3
 DIST linux-5.10.148.tar.xz 120497176 BLAKE2B a2d356139a2549ed9f1bfc56cc0b2d61efea87f3a6e4a369c222820c0f5f36f99c0962fe52754f5d897566fa69cdea739536d2f98fa483ae1d7c7d04f25d3d89 SHA512 9cc354a14eac22cc41a0bcaeff0f6ef0a734713df45b15aefa120fa3eb5d7a6baf0e262cd702113ce37a2440ef826ee9b54117ec3976ad58bc6f5ba5286f755f
@@ -30,6 +34,8 @@ DIST linux-5.4.218.tar.sign 991 BLAKE2B 821db66087ca8264ce3499cae2113868341f8ee1
 DIST linux-5.4.218.tar.xz 112926060 BLAKE2B 4900ba1d0aabe61d2877d1b6ebda695e8ee5e1a4fd9ae3dab7010435f21a3cbd98fd36b8994f10eee1816b6a6561b958a2da176eeaf67309bf24fd90ff190df4 SHA512 51adf248105706eb30b611496baa7cc35be16857f890ac5ffb031373bf0538b6fdf3440c8b753b0d33aad6ec84ab2ef859585e79e65c470f5b4c9d728763aab4
 DIST linux-5.4.219.tar.sign 991 BLAKE2B 59380b43b19ae0521ea49ffb8aaf275e9b7f6b1317c31f9f8c8a179aedf32a053b8d9bbf4a424dd531dfe48e83c577936eb8968782c4d56a4909111d46054a69 SHA512 71141118cfbfd48a7b3e401bda0e75006efb5c4b935aa201fce2a0a94520ff30680e2db6852d89613d85b17f54e3073f8b6147be2cac27f69b01686759e202d5
 DIST linux-5.4.219.tar.xz 112952984 BLAKE2B 169d050a65f671467c2b874f0049789fe1fc15aec2654abdadc63a23e857408bb029beee6ce36c6048b87e1ed65f41573a56eeb92bb7f1b770aa15c022c5a440 SHA512 3eeffc922a154c44226f87bb55bf80fa24a1d9f5c3b7d58f6da07066795e757344c92c6e2351a30d2f6b5b63bd1f96648b745a1259e7fb9b70e81e069d6e2b43
+DIST linux-6.0.3.tar.sign 987 BLAKE2B 8c1796bdf0b846af4e1cae644930e6220a6ac2b628c6a53f505496457687e03f2afac6c3962fa5b37dd5c930e988589935164fc41d4cbdc36376dc4190d3f660 SHA512 27abba5616b4665ce040066038ad6af3a631208eb17f8273f99e30adf6af0741a4b9e361805eb2f9a9617a5acf05d5eadaf8d53a27a990bcc9497edb7196342a
+DIST linux-6.0.3.tar.xz 133903496 BLAKE2B 8ba900a7b98f22a208234cecc7813c4bd6125a6eb5a424b425c135a2de2780f2760a9d94da8ba3caa429c2ae4a9baf9407570cdc8aa9609e89787ba581a004a7 SHA512 953a4dfe46eeb5f4b7927c3e2af8e053b3a1a50a255f90bc33a7883fbcaa3a349044a2df1560ea2f84dab2668734ccf2cf4597b053950fd28bf07509e12f002d
 EBUILD vanilla-kernel-5.10.148.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
 EBUILD vanilla-kernel-5.10.149.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
 EBUILD vanilla-kernel-5.10.9999.ebuild 3234 BLAKE2B d1ae98cbcc1aa58bb90e787f61a60a3a1f5936fc7667d2ccf9d441c1445bedeec835e40609c28b586e199adb2ea75b68b01b1422d712eeef6d8129c516afa935 SHA512 304afe6d49b898671901bf8d8ebb380a4adb774d3263ddb19b8797d97708badb281e5cff02ef95392057be52e13004902d59fe5d91f5a2d7db0a734ec91a321b
@@ -41,4 +47,5 @@ EBUILD vanilla-kernel-5.19.9999.ebuild 3354 BLAKE2B 7d153d91d316f3f1a27a4f44d3b0
 EBUILD vanilla-kernel-5.4.218.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
 EBUILD vanilla-kernel-5.4.219.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
 EBUILD vanilla-kernel-5.4.9999.ebuild 2574 BLAKE2B 6a8f6619bc9a88b8076a80ad6158b8996544b2608a78571107ba0b7be09b5f35add48d99d54ab6a2232f110156df1cbf6f325da036be23c793b4f84bc0f995e5 SHA512 c95bf760e931180ca9cf09c91e7fe05039f2aa2d743ddc8aa3e14d765928d40fcea628754e0177cc66df3fddc0fa2fed54d962e8682c5aaa7fa416f0fe3ac323
+EBUILD vanilla-kernel-6.0.3.ebuild 3833 BLAKE2B ba32739ab7dab9b3a26798a39a2e2cd3f159648f7af56984292364b441ca55995dfa640625eeba053c045fd5143c8b21d1339972370f32ba790e4df78d7082f2 SHA512 a7a19990907b29b121982e245ccf5398468b8d51c5393f6a4fb46496c7e7601531b03c19e41b60d8c290903487d69b282ff4637ba2054e1148035783ea28f26a
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.3.ebuild
new file mode 100644
index 000000000000..a77bd2fb0699
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.0.3-gentoo
+GENTOO_CONFIG_VER=g3
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 39da624cdecf..bbdb3b8cd069 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index a80cd7e26655..7d669a4db22c 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -4,6 +4,6 @@ AUX cronie-1.4.3-pamd 231 BLAKE2B d993c025529e817435264c798bec757ead59d77540e1ff
 AUX cronie-1.5.3-systemd.patch 980 BLAKE2B dc11e7e1f072270f24e4ae420c2bde63412ec8d322d65972eb574cab2594388157c1ea4fb9297500de5ba4c32639792e810590e44dbc2650ae5bb5eab11c160b SHA512 a1e9fef4cff7503357785645ee91cccf54dcfd8433ed9d1fd22813849bcb47f0bb6f96b404a66450d865d586041415b480e53ef1599318df32331a657456b92f
 AUX cronie-crontab 476 BLAKE2B 7e2de210328ad714647b9ec50c611573ba166b63f68643aa001f8ca2d2c6e6a5b1300cbd8e1be2ba4374def366698abe6f990673b427e7db4883a9cb74bd06c0 SHA512 0d42a8e749db5c7f057b980678dbfada3dcf1418000168380097032a69a48ab4bc8fa228fb45c65c9c2a1a8d5290da3ca84816963fb7096fd13e293a68fea0c5
 DIST cronie-1.6.1.tar.gz 149913 BLAKE2B 7b563b90f386a8df09398661e2b3ddc1f83d6c0d19290a02c0622be461e1d160218572adf132d634c60ef8fd0a4bb100e830b90e26270c28c75a69591ccc18a6 SHA512 1e095df9670ec25d6629f4cf2cacd82c6c1cb1487a859815a7881a1d130e4f18f9976396f773abae24dadc232166bb6467bbaeac1cb0254209fcadf3530d5e6f
-EBUILD cronie-1.6.1-r1.ebuild 2587 BLAKE2B 1942016c49257749e54d0b13c1fa733cd6574cebeed5f89c80f0f9790f4bed5bbe353604bf22a22a0ca099f43b856062d861ef85cbf419b0e40bc3f4b599784f SHA512 4e9bc4893e734250efc61cc22540a6f197bfcfc82e0a736c25bb12999d1a615c9475fa38b7b79ed8539a5e1770b940b811e7330be950fec444c993d33e7eca53
-EBUILD cronie-1.6.1-r2.ebuild 2558 BLAKE2B 296c0c92c9703d75764af9800233abcb0f59581c8a58adeea9aa15892550f13aa9ab5eaf6bb116ba2caae5694dd0bb4c4f0aa92045b5f460a990f19f71eb648b SHA512 12b6f128ea53d80b5628d25dddfff3822cde4947aad33dabef0295be53cf0eef18d2ee4c4a50bfeacbaa8e87c9a35d2ce18b44f27ddf9325bc8c9f93eea46fc7
+EBUILD cronie-1.6.1-r1.ebuild 2611 BLAKE2B aec8fb9723cf37f4fc9aee4730699a5b148890667d04328c72fdcdfc4e9736a720ca33837ca3e6bc59268b9697f474fe8e5c482748ce5735260329ac05469392 SHA512 7195c78d7f8457afb9215bc4fc417798956a5bb56d199e110e07c8a5f734e8f42bb6111c9df34ec249e53f92a627c831d644f1bc129677ec686443d9e9646e96
+EBUILD cronie-1.6.1-r2.ebuild 2582 BLAKE2B 131d8221c05105e8d0e1ec9bb5d3105a03b0f6487da03de9af62d064303967369875c1a6080d131b7d1a21b08f5f640ce19ceab5895865996965aa2ab724ef6e SHA512 5bf03df820dc9ba2938d7ce955421c769c4939658455e120d349e356aff7c28a69f1ba0ea8aeafdd2a9fd4f19dcbacb15ba4866daae7cb2d9fb41c91f3252d9f
 MISC metadata.xml 821 BLAKE2B cb3c9d002c660aea2d9ebff9c48f32ca42e2dfb74b42dbd814b3acdd4afa71a9f6bf28fcd6df44492246b64f52a0537e5c24238bfd813f5b66c274242d4bc63e SHA512 2016c15fc50cb8766a8e701853f56f2823ee730e6cb0df122ba74526d0c0fa6909a3ed945a3a405d2d1c35933c4b80b44a9158ced8d8e68372954a740413dfe5
diff --git a/sys-process/cronie/cronie-1.6.1-r1.ebuild b/sys-process/cronie/cronie-1.6.1-r1.ebuild
index 97bb68713f7a..86e6ae54c2a8 100644
--- a/sys-process/cronie/cronie-1.6.1-r1.ebuild
+++ b/sys-process/cronie/cronie-1.6.1-r1.ebuild
@@ -13,8 +13,9 @@ LICENSE="ISC BSD BSD-2 GPL-2"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+anacron +inotify pam selinux"
 
+BDEPEND="acct-group/crontab"
+
 DEPEND="
-	acct-group/crontab
 	pam? ( sys-libs/pam )
 	anacron? (
 		!sys-process/anacron
@@ -23,7 +24,9 @@ DEPEND="
 	)
 	selinux? ( sys-libs/libselinux )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${BDEPEND}
+	${DEPEND}
 	sys-apps/debianutils
 "
 
diff --git a/sys-process/cronie/cronie-1.6.1-r2.ebuild b/sys-process/cronie/cronie-1.6.1-r2.ebuild
index 18db278ec2e5..9c847ae19872 100644
--- a/sys-process/cronie/cronie-1.6.1-r2.ebuild
+++ b/sys-process/cronie/cronie-1.6.1-r2.ebuild
@@ -13,8 +13,9 @@ LICENSE="ISC BSD BSD-2 GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+anacron +inotify pam selinux"
 
+BDEPEND="acct-group/crontab"
+
 DEPEND="
-	acct-group/crontab
 	pam? ( sys-libs/pam )
 	anacron? (
 		!sys-process/anacron
@@ -23,7 +24,9 @@ DEPEND="
 	)
 	selinux? ( sys-libs/libselinux )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${BDEPEND}
+	${DEPEND}
 	sys-apps/debianutils
 "
 
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 992871faa389..e33ae1dc4d28 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 6dd7157f43b0..92e0b0318141 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -5,4 +5,5 @@ EBUILD dist-kernel-5.19.16.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460
 EBUILD dist-kernel-5.19.17.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.4.218.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 EBUILD dist-kernel-5.4.219.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
+EBUILD dist-kernel-6.0.3.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-6.0.3.ebuild b/virtual/dist-kernel/dist-kernel-6.0.3.ebuild
new file mode 100644
index 000000000000..c2caefd6cfca
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 00600f04292f..55700aee0b3c 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 043775ecbc44..61799676c750 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,7 +1,5 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
-DIST mod_h2-2.0.10.tar.gz 681662 BLAKE2B f4a8f1947881e1913bb45723a4e95ce12ecc8a113b837082abfba1fda278c1de026f45ca60a8b80dfab857ccdb2f2f00b4313672674cd6713f29bf64b26141b4 SHA512 4ca0ef69bd367625846e4b7b9967c9ab112f17b6bd31db5d61bc7315fab0294551dcf36845f2aabfa6944dd25a34dd0137c63ba0a969913c4d65a10854062a9e
-DIST mod_h2-2.0.9.tar.gz 679900 BLAKE2B 56cdef908cc5f95b860b4603122c0e7a09eddb8ae8c5f3173aef90971324810b8a9cbed778eb8ff5510f6a1d9cf101ee6d845631dc6b59e90f559cf462bc150e SHA512 68007181bca0c250c21be4f35fbc90be15bac4b74f32ef537c52ef4a1adc6619d7925e20e5562bfce182b5bc12159382a402f3aad7b94ac174c5b80c948a73c9
-EBUILD mod_h2-2.0.10.ebuild 935 BLAKE2B 6c4ebc185351916c2a983f59c52c4c207b76f283068cd7a7de81c973e8c245112186a96b0e0815ea82adadf6f27301b10c6e38ac826873b5704f7f7f9246ab5b SHA512 1de444a765a898fc3f8203c8f5d4d441379375cfc59575403b7285e337f4f4f594d30242d56ec2376486d4567feed96795a57c7e6815d7de4c275ba25a1832aa
-EBUILD mod_h2-2.0.9.ebuild 935 BLAKE2B 6c4ebc185351916c2a983f59c52c4c207b76f283068cd7a7de81c973e8c245112186a96b0e0815ea82adadf6f27301b10c6e38ac826873b5704f7f7f9246ab5b SHA512 1de444a765a898fc3f8203c8f5d4d441379375cfc59575403b7285e337f4f4f594d30242d56ec2376486d4567feed96795a57c7e6815d7de4c275ba25a1832aa
+DIST mod_h2-2.0.11.tar.gz 681879 BLAKE2B e49de5c117c61fc462d6556602f6f975f61754feba6b33f331f391612d8bd447cf2ee8f546e6a5cc6dd766daee0b6678865fbf3e3ed5d670bf67008d14d337ad SHA512 b0dd3ac8e179b78141b2c523a79d9d790588b13988b853a91d99f0f30e4fe0207e17b7dd333d178450ddf4784dedd0fb88d3fd46b96272aa8af6ac7a38fb8d00
+EBUILD mod_h2-2.0.11.ebuild 935 BLAKE2B 6c4ebc185351916c2a983f59c52c4c207b76f283068cd7a7de81c973e8c245112186a96b0e0815ea82adadf6f27301b10c6e38ac826873b5704f7f7f9246ab5b SHA512 1de444a765a898fc3f8203c8f5d4d441379375cfc59575403b7285e337f4f4f594d30242d56ec2376486d4567feed96795a57c7e6815d7de4c275ba25a1832aa
 EBUILD mod_h2-9999.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
 MISC metadata.xml 326 BLAKE2B 200b47b41409bd7167132c55b5e77b5efa2ec18859520ea38d61a625a6e68bbb1cb0095dda3fd7d273e17114e7cc0ff2fe5c1bbb66ea3a90b4796490fc04a2e8 SHA512 6d45faf84382555d53dc9f38f8d7a23454d763025bbb345f51bece78b36287372d86e173c894038839092adce210e444389b8c41644f44bce0c912880d788080
diff --git a/www-apache/mod_h2/mod_h2-2.0.10.ebuild b/www-apache/mod_h2/mod_h2-2.0.11.ebuild
index 34f8a15777b3..34f8a15777b3 100644
--- a/www-apache/mod_h2/mod_h2-2.0.10.ebuild
+++ b/www-apache/mod_h2/mod_h2-2.0.11.ebuild
diff --git a/www-apache/mod_h2/mod_h2-2.0.9.ebuild b/www-apache/mod_h2/mod_h2-2.0.9.ebuild
deleted file mode 100644
index 34f8a15777b3..000000000000
--- a/www-apache/mod_h2/mod_h2-2.0.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-10-24 21:52:37 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-24 21:52:37 +0100
commit	7ae4e1d32a98b596d483a19ed94a21b560eb595d (patch)
tree	1c68a1258f5017984a7878d5e913d95d72544f59
parent	145ac95c683ecda55a9b2cafc84dced2e9c29e03 (diff)