gentoo auto-resync : 20:10:2022 - 01:59:18

author: V3n3RiX <venerix@koprulu.sector> 2022-10-20 01:59:18 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-20 01:59:18 +0100
commit: 9ed0c42eb618229fa6f45e10155ee535e1f605a2 (patch)
tree: 1cee221ce6610b86c942bdb5bd12aee04ac18642
parent: adab5aeec61fe929e5a817ec8034d98caab9ddbe (diff)
178 files changed, 1250 insertions, 2600 deletions
diff --git a/Manifest b/Manifest
index dcc4e688d78c..a737923a17c9 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29613 BLAKE2B 3b7740a32c7198b49cdda7e440050c655083b4f27f70754d1af7cada5ffa5df319a26f40207f40196ffeb953f1044d41ea630c3c7d5e61dfa20edcd8e5ff183c SHA512 59712a87e3fb0a7164a36c81067b6ec47d405e43cb32041ddcdb696f7e3622eca01af527edeeb0c458b6d6b85c938ee822d346a6ecc78ac1f69f35cd21d21c00
-TIMESTAMP 2022-10-19T18:10:07Z
+MANIFEST Manifest.files.gz 29612 BLAKE2B a8d8fe45791d25959ed013b227f93566bc41cc2867281780126f6fc40696d359d4c22703e5948d5947493fe2ea20d23d7716e9e4eff6a23bc2a25f1ef4b76287 SHA512 150ea983094a21a81e784b616809380049d39bbf6d59eed5653d6ab12f9bb38c5022cb6b8646ea6e947b09d6d63580d09bb7a34e923bd6942896e75359e18a98
+TIMESTAMP 2022-10-20T00:10:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNQPX9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNQkdpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB9uQ/7Bv1kpWKgWdazxuy4YHoUnvNyd5k6jJq19kfYQe3CQCBIwBQpqEUYlG7j
-mY9M9N5loIaU84hs+fXnJfZ0TrKzrmndbevoHKpRlT392e82hWePtPdWTnBA6OJj
-ramJYn6Wp9kNkPhbyDeYFcI4EqmVT11FXpSvzg9azhQwaw7eK6p+g6GjTyPjR/gY
-IG5fTBVdqytmcn1luvCicVfJxCV2BmkKuJeFT1LqDt+oK+R9voSq6nVh7b0q3x89
-S/QMeSOdi/G8VBDftGDdPUjzp8OqhW9SBaeiNHZxIOYnyLxSiep5aMNRVEQAEtjs
-zeIVWE7mOecoBeieHbWHwWblXdBpWYc7N2SNVNwHcxrmUByx/x8uugr5AvJYIT2O
-lZ8GWUj/qGwA6jLnEHWR2OFkSP6LuEQgHYy5+e7NnPXf9CRoRYBKxnZ/OkVqEzFt
-gVIb6q9ZnoLobx/bXBQwKMxTBwZcGKH6c32jvpwJzlgAPkwZRbk9t3XHKN+iJK9s
-klsA+PQ7HRY4NVIQtfoq661o5EoCPQJ6RaG8MKrTbnhqqFyd9/oU33pOSypwmG3t
-Ssn6gTBO3oqKRhsZXGGk+rMOiBUPjQ/YI+BG7zFPjjezU8LdRLjocdSbJhucVcy+
-y4nVM/vccXTdIFoa2SsPLZUmPLHB7t3x3fdzY8eQKT/joaSBGNY=
-=+RIu
+klCOsQ/9EL9SG6TrHgHpixqQdvmz5sboTBh4F/X9rOGFT0Op5iqqkPJOSF67GW5c
+4Ings1b1dId/Qmo5HOgbvXqJTXsh4Kc56+MRwUonVL5XKucluRJxS7XpLoTY4tAd
+iZoWUQDC8GUPcS9gywHo1jPRz1fAGD72Mb6sZEsjLmtFSXTHcD7IoRbNnLLk0zCw
+e1dH/USWiv+JreCna0/OHQL9GZLNBvRsm7NSL8hsyv/p+ewnCUvp2kMEX9OlhtBw
+D2DsGRMoiRq/bVulG/yA0/OWp8BCiXo1UTpqxIqDiZ/UawHHrNp2fRD9C4Wbmg68
+Uy1WMP+1M6GPlRHya8VV/uLAs0yWqqESeygdYfx48yNWl1NaGFcpvGL4uXPv197D
+emOBf1Krkveewx2Wxie8twkLIk1qpLE216xPz9FtQDHq/DH4uvZdPPAMFGnlhaP6
+ATtUkncm49ui4zCco2yfBkcAuvI3wrqQswdxTJlGerOW+SgMRhTwozDlaWyi1XGr
+osX7Zy5Z/EbhD+lWepwC6lNUkOYdGUtFroLXl06UpVAWwj+2mpiy9wYDcYVxO0Tw
+1Z1u0XkkQf98QUa9gIg39DJcJbuUJ12f5EWaNGYNtBFRmtn6tKWYtG95q3dYuuNp
+O6bVT3xfrzc0mwmbwD+Zd5jJnwzPJsPD6VRLal1FImqmRbpLoGk=
+=h9RO
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 301893b0b12d..889c6d2a64a9 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 12f5a6fc0522..992ab73021b4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index c35771829264..5afd1f03ddb9 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -3,8 +3,8 @@ AUX ansible-lint-6.6.1_test-module-check.patch 1169 BLAKE2B e1dc222e82063ed1ade9
 AUX ansible-lint-6.8.1_test-module-check.patch 1576 BLAKE2B 4a5959f8528e7a9679a1fee76573a0e1bab602900efcd8c785473b9fa048cb0b771e58e3286b2353b800db42f78e05b2ee38b9ddf9b3b1dfb8af670a7770a754 SHA512 c8616dfdaec597ac914cd21598cb2e77af4422bae4ffb3d019715f9d825a13c4d7f2e5ec173b1f8bed025ac69b264cede8dd9362326390998dfc2d54ae287f24
 DIST ansible-lint-6.5.2.gh.tar.gz 248425 BLAKE2B 02fe3f0cb410831ee7913c5f5ae434678ff183f9c60f0355988d69b516324513fd417439f9ceee4a38192c1e593d7bc00c8fd1aafdff6ba904cdb4ba56257657 SHA512 36a8d7b746bbb0c0f4d85a63180432b9165b1e59ff9da07f6b9477aa02d8998c5c682a317a04c4971a08f0691a10f420d9fd0e7d396d7d1b7f49979c7faf41f5
 DIST ansible-lint-6.7.0.gh.tar.gz 275573 BLAKE2B 56788efbd44f6c2d8f1dd946d26f4c784c5c9e077355823d143a7b95196a3b5ce672a987639da6f051832320585fe7106d92c293a0707c9886142eebdaa812f5 SHA512 39d5292c5d262a6ee6fe60b41d531d362c95b466fe28524d314c0f2554e50906db050df93c7dc6374b99e6ef283754844e08484d24570bbbaf637d08e0af4ae2
-DIST ansible-lint-6.8.1.gh.tar.gz 287839 BLAKE2B 21421d7254a63b1460ce3f36529967a988c2835761f7ff1973b62c3210fffabc0eb95ede09fc5e582586782f7e258bd0b7534cf786671bc628631bf8d815644c SHA512 cd368d568f33a9711299b8a563f99f3d5eb6bed8334cb63e60fa43239716013a7d47e42e059c521a687d2e7cfc4c6d60621f1123050428f9ede0865c60d3ace0
+DIST ansible-lint-6.8.2.gh.tar.gz 288616 BLAKE2B 4ae9c344d834a3d69a05689df296c7915e6eb7cb2a85b773f3adcc4efd898c3e1c9f32d8b1efda31afb7a5466d1966aa754cd5529c7dcfd6c1f45517d39e1750 SHA512 101be050772f6df827a697faa5ff9650c98959d9bd6e7a025a19c0ac94faa6b06e114b9122ae8f09f650be565b226189f4706ef8dd0f27548774664adccf3d18
 EBUILD ansible-lint-6.5.2.ebuild 2749 BLAKE2B eb63cfb774f451e410ad1c5ae5fa3be86f5d63a59fc7524262816150bfadd7378aa901a65d91b63cfc1f20f87acc9c1b537cb8bcbf4c7568541a4034d400c192 SHA512 2d33e1edb4d6c7bf69724689fb3787edcfe4d117a420dda3bdb187e91df3f0d32e522854b59f4ce3a5ef632b7d711ae0e13d8f1557d54c400455728536954364
 EBUILD ansible-lint-6.7.0.ebuild 2749 BLAKE2B 1376aa9a508034f257287c6395eb956290293ca3e0959ee36c3be6ff02568e90136dc6ffedcd2e645e3cbec7c9d343f05cfe3ef74edcbc84cd352287473c5882 SHA512 ad8d34d1afa854ec2cef5f00665babefbc8a3d92a2dbbb022f9b1575c2fb35112731e840ef6827d047b414d83cd091c4f20171510669f50655735333d8ab2dc9
-EBUILD ansible-lint-6.8.1.ebuild 2917 BLAKE2B 09272587c91cc17ffb56a53105ddc695ace1dff261dc53341172f965b475282c4b091f1926c8aeea9c27dd8297b70596ba6c29691e06175e739d033a3ff02dc1 SHA512 2d2823d6c73ae8115fd857c013acafd1de5acf68ba5b1c59068bf7c6475191bbf3e1e0dd445a1cd0208fba025b06fc1172ab7503f243c97fea896070c271ae8a
+EBUILD ansible-lint-6.8.2.ebuild 2917 BLAKE2B 09272587c91cc17ffb56a53105ddc695ace1dff261dc53341172f965b475282c4b091f1926c8aeea9c27dd8297b70596ba6c29691e06175e739d033a3ff02dc1 SHA512 2d2823d6c73ae8115fd857c013acafd1de5acf68ba5b1c59068bf7c6475191bbf3e1e0dd445a1cd0208fba025b06fc1172ab7503f243c97fea896070c271ae8a
 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36
diff --git a/app-admin/ansible-lint/ansible-lint-6.8.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
index 1632b2104f54..1632b2104f54 100644
--- a/app-admin/ansible-lint/ansible-lint-6.8.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 420aa1282654..595bedb6ca09 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,27 +1,23 @@
 AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
 AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
-AUX rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch 1010 BLAKE2B 2d6984874bd1b5ceb92d8f4fd76e4ce1e8a804b345c1251f664fbadd6dd240066d4c4843d6fefb9e0b6ebc4c5b4ea4aad4c533394c72157eef26a802e8b5296b SHA512 c1eb6c47772afcc16b9253cf5e1b6838d4ebbd84cd504c34c947c7e2a5857b671582b4a711c6fc119026062fef2eb1eaea60f210f6b1cafc394a7450975a863b
 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
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
 AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686751bd88db5263c912e60a7be1e90fa50ecd3b10b14d046f525227b1feb39528ef488b8879d58ba84 SHA512 5d11cfe47ca797941815f51f08d4e8e308e4827bed9235ddf1174f3357d7279a3c8151e02f1cbd3cf3a6d2f7d5e2f68061d3e17fab6a0291f01c32f88e995039
 DIST rsyslog-8.2102.0.tar.gz 3123684 BLAKE2B f5c4e00d68ec82ed3f7b89dd5e888bebda9c4eb38185dfd8ecd96c1bf77380385aaddac73ab1de8364e1239a3de746f160c18b0f135d006f473f9e40be2c18a1 SHA512 281b0e5d5cb548c39a6e514e5fd5b1bdbe8ca0bdd9234f4fea581ed7679f76d2d75b65d14c3c5e799f86f91600074ff75b467aa1ff27cdbec0f4197261c5aec0
-DIST rsyslog-8.2110.0.tar.gz 3217225 BLAKE2B df239609b7a5e08d2a5b1ab5823d45868ac75e1359876e032d4de633165878310f43bfacabab2df4b5657789f77dd2d93814d2fe2aa39e18b267b9bb9234c975 SHA512 b3ec40a272e1fee3034fb24a21ae6c773878b013c04bd01279f6b3bba65a98287c3497a3c4c3e46f8c91311117b3dc491a11a7e193f7ee0347b769c4162b48aa
 DIST rsyslog-8.2112.0.tar.gz 3230105 BLAKE2B deee27f0b1e2b9783bef4d90e396c92c772465156ae8242172548794d628edb5d1e9a95d9ee2aeb2b301ec4b691572391ea7db7b1e8fdb1d14c65e3857857799 SHA512 32ee475d4ef34a68aa43997a97472d21f45c27052c528c1904786df608977189a53e8bb88f310dc2ebe3bf11857824e4e2188c5b85591a005b6977f90a6b17c3
-DIST rsyslog-8.2204.0.tar.gz 3242825 BLAKE2B 1e7a75f151053c28bf8e1215f8f1da58ee2232127b4edae6c1a59ff236b2ff0aea57fb175bcdde9a3bd3ce516015422a2eda1f857fdeb56489555de27cf2deda SHA512 d26ab950788b8931b895719f7d8a42509f709b69a76e4188df16f72be050863ee402310ad9300840fed4ac089638497725d67433172778be7b2932fa82210472
 DIST rsyslog-8.2206.0.tar.gz 3246829 BLAKE2B cfe88f12821146011914610e33cb907bd96f19b6e67c0eb3f9bd88b749eebd3a91ae27e445688842a806719cfe9757778d3f9705cd2d6a497d358015c9ddf36b SHA512 000d2a05ef4823879e615a347f62f76d3af7d43cddb119e7f57a8470aade00139475368579385ba008a1d5979082128ef6148e0fac2478f6e0ccb26e68d317b7
 DIST rsyslog-8.2208.0.tar.gz 3262298 BLAKE2B c13920c755a24d8060335f3281a349d2f32c3c99de7351991e09e62302f6d9f61f4390b7945e30816c7d28afe5f757f6a49b2855e40e3f2f518a423662196b1b SHA512 e63f2465011722eb1bc99676ef6afd66e655af4fb9d751b3d8776499d054c422b195c65fef9ea6b9012d9fb334b7ed8a1c918167fecff389cbb79aa6b74acb73
+DIST rsyslog-8.2210.0.tar.gz 3266727 BLAKE2B fc94e7d9b7d828c35e6117ff44d40aa421b79ecd9072cc143177cb77ac6e84adaa5e2b9ae9a66e4bb70d8b93411715f63f0e3707e53c965ef892d9146ec43c92 SHA512 c665b7f7a3c5ef31c9b62b50f815cfbb52db0cbe4a06934f4f1c3cd2a56fb49c319d33857ee92ab843aa5894cac16c16b8eccdf83714f31ab57a95049c4af231
 DIST rsyslog-doc-8.2102.0.tar.gz 6419104 BLAKE2B 134c7ccde6f7435b35840fa37f5774223ac1ebd7dc10db961900a7b1600483156518433c7f70d0981e96ea750e1916ab53e346abacf58066bf141e85c719ae00 SHA512 a5dc4fb9bd8892fac693c5692b926c8d7d9fa36667d6b4c6eccba750713af88d4317f6232efc2a16de38c2e58c4a8bc4d04c9ebb2e7ebc3b0878d53eef20dd2e
-DIST rsyslog-doc-8.2110.0.tar.gz 6533014 BLAKE2B 16670903ddbbc14ef5ebc726964d1fa879849294401825a4e2c65e0ca06924830c2c882b98ab6eb6c2f639dfcf683b8c7659b49965b4280d441935126364ce9c SHA512 f0081b28d7394af30d4e1873a040208ec358d45c7336c69e99e2d6d4a2aae86a25a65d3c803b6570668e24625e50e01d5af3f9fa90f1c8cc82b45b1b6bd7a7e0
 DIST rsyslog-doc-8.2112.0.tar.gz 6545985 BLAKE2B 4f6cfbbf8062a70faa67dd7168ad35bcbe2c81f80560ddb48229a332ce8ac861efe3bdaa1baeddbdd086c3e9ac8912746ba58bc64ab62f3caba8b8cc1b0014fd SHA512 8588d5fd1a79fce785db85ba162ed2fa9e5375590ee8e6d8569e75334d36683a1b977e930c096a6b3dac15596c066b46fc3105fcc5e8232ab11cf43c6eed3a55
-DIST rsyslog-doc-8.2204.0.tar.gz 6553264 BLAKE2B b4691a6bba44ec37bf310c4f7b307f85bc5d30954296ad62f77ff0f5041badf5fc40fc5680b940f6f3929da8956928dea890f7f2547f7db5e1e4141ef0855b48 SHA512 361528b95c1f02cdc2b2ca8ba5252c8215996e81ef1602e08c46be4e1fd8c1c287dd7d52ae9b2b58c0ec7fe38d7079a89e10642ac3f34fe0b6c5737968999fb4
 DIST rsyslog-doc-8.2206.0.tar.gz 6553532 BLAKE2B 51288f5e819393ad6b5af1acfa030b262c1a97c9cc791606c16792201eb8f7bbc9750bb004e7592a99fa1261b971911a6c2bbe6c0b82a6c3bb067b077ce22641 SHA512 23d686241bb6422146602420e21a53208ff82f39f76258d7147dc0b5c06863f8229e1e2df06bfcae63408d06e70b68f7a0b0d216671b78302527d436091a698a
 DIST rsyslog-doc-8.2208.0.tar.gz 6563848 BLAKE2B ec68684f1d7d895833f656ba6224a8013213a12b1bc7a28a268f2f629c25a3fbac7c379091f17eae24b6d71278c087e4a4cbed1656554de743fe5616a96559bf SHA512 428c2fe9e5025928d4a9d33f05f4eb20ac1bbde052b7fa2a8a0e45bfffe111eecc94eb2b6ec129de1011f0eabb106b4fb41d402b2a270e4148d3b1081e3b1da0
+DIST rsyslog-doc-8.2210.0.tar.gz 6572454 BLAKE2B feb865e3585ee441117f38de61748a6ca99767dae113cfcf2cd0d0a124cc692889be713134163fc91f4ab43b9fe530e3c7c0b84e4bd4e70081c4539297ae1406 SHA512 e7847a9307a91fdf87d6cf91d2391eb75869679905b9598310c456fb3fe1864fc06dbdc649778f5b3788e47ffda0a6d89cb894258e55db441f7df7e74b0ae9f4
 EBUILD rsyslog-8.2102.0-r1.ebuild 12864 BLAKE2B cdbbbe6c4b582c5d899318ebffc5a3eb0469eb3326db85fd152c1288e1494456bddca5e891690b7331c5e852db3cb7ec092471f42ece1e12ad71b92f894efd7e SHA512 7d20f94c6f7730c3644f1aa90035cc79dc3c945549e03d7e7bdaf2f062c701b5d42a21688d837134bb8b7e4bcdd871ef8c48af0bd3edf9d33b890e5a74172e5e
-EBUILD rsyslog-8.2110.0-r1.ebuild 12990 BLAKE2B 556a0641ea0dc1bf634a3e2eb67bf4ad98be01988b92b268d4319bee2fb044976c8c0e659f203b20583d82e9b9c2aeb78347077f32bd95d133cb4500ce66fd8c SHA512 c630700d84ed9462eaa2f56245d2bd4f4720440f686fa6c3559dcc1fb8609de440d80305ee3d8e0b75cbc21fbcf17f2e7076764b8c1d31761eede3a6de0c5870
 EBUILD rsyslog-8.2112.0-r1.ebuild 12918 BLAKE2B a6b90c61486be47ed3b22a9bb5c7cc8b7837f56db21d88353403c50ef427fa4cf364a964db74d0a07fd15f4420cd87441a4d51edec4ff19dfbce7ef7d4c787f1 SHA512 a9b6313794a45610b62a0ff700c89db057c9c825445a124ab7b10826e379333fa236fa9376f4c4c798519f163ced12c9d753a63f48c1840e1d705d218bbb329f
-EBUILD rsyslog-8.2204.0-r1.ebuild 12922 BLAKE2B 7190afdac273d3d1be851dafb59e4a0dcebe368eff979340cd48b177ad8d896467b84b6ec33aa3e20c1310af2242b6b00d5bf2f66f5a3a20e4017486a136ff9e SHA512 730f72c6bc668aa550851dac2e7954cc35e21180adf212cdc5cbbabe367093f15e5946985ed8ad98dea456c708314eac8b966108411e99905359813129543511
 EBUILD rsyslog-8.2206.0-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
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch b/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch
deleted file mode 100644
index 88b4a6f6c6c0..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 440fd1d51c5aa7763d3d810b542a7e373a6738eb Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl@debian.org>
-Date: Tue, 19 Oct 2021 23:00:50 +0200
-Subject: [PATCH] testbench: skip omfwd_fast_imuxsock.sh if liblogging-stdlog
- is not available
-
-Fixes #4712
----
- tests/omfwd_fast_imuxsock.sh | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/tests/omfwd_fast_imuxsock.sh b/tests/omfwd_fast_imuxsock.sh
-index bb35b58d18..10f9f19c18 100755
---- a/tests/omfwd_fast_imuxsock.sh
-+++ b/tests/omfwd_fast_imuxsock.sh
-@@ -4,6 +4,13 @@
- . ${srcdir:=.}/diag.sh init
- skip_platform "SunOS"  "We have no ATOMIC BUILTINS, so OverallQueueSize counting of imdiag is NOT threadsafe and the counting will fail on SunOS"
- 
-+./syslog_caller -fsyslog_inject-l -m0 > /dev/null 2>&1
-+no_liblogging_stdlog=$?
-+if [ $no_liblogging_stdlog -ne 0 ];then
-+  echo "liblogging-stdlog not available - skipping test"
-+  exit 77
-+fi
-+
- # export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout"
- export NUMMESSAGES=100000
- 
diff --git a/app-admin/rsyslog/rsyslog-8.2204.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2204.0-r1.ebuild
deleted file mode 100644
index 5deb90e1c973..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2204.0-r1.ebuild
+++ /dev/null
@@ -1,490 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-
-IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
-IUSE+=" systemd test usertools +uuid xxhash zeromq"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? (
-		dev-libs/apr-util
-		www-servers/civetweb
-		virtual/libcrypt:=
-	)
-	impcap? ( net-libs/libpcap )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? (
-		>=dev-libs/hiredis-0.11.0:=
-		dev-libs/libevent[threads]
-	)
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		>=dev-libs/openssl-0.9.8y:0=
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-4:=[drafts]
-	)"
-
-DEPEND="
-	${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	BDEPEND+=" >=sys-devel/bison-2.4.3"
-	BDEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without dependencies
-		--enable-imbatchreport
-		--enable-imdiag
-		--enable-imfile
-		--enable-improg
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without dependencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmtaghostname
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		--enable-fmunflatten
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmdb2diag
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis imhiredis)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable imhttp)
-		$(use_enable impcap)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	if ! hash certtool &>/dev/null; then
-		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2110.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2210.0.ebuild
index 425135a780ff..87f42ed5e63c 100644
--- a/app-admin/rsyslog/rsyslog-8.2110.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2210.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
-PYTHON_COMPAT=( python3_{7..10} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools linux-info python-any-r1 systemd
 
@@ -16,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
@@ -41,6 +42,7 @@ REQUIRED_USE="
 "
 
 BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
+	sys-apps/lsb-release
 	virtual/pkgconfig
 	test? (
 		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
@@ -112,8 +114,6 @@ if [[ ${PV} == "9999" ]]; then
 	BDEPEND+=" >=dev-python/docutils-0.12"
 fi
 
-PATCHES=( "${FILESDIR}"/${P}-skip-omfwd_fast_imuxsock-test.patch )
-
 CONFIG_CHECK="~INOTIFY_USER"
 WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
 
@@ -187,12 +187,14 @@ src_configure() {
 		--disable-generate-man-pages
 		--without-valgrind-testbench
 		--disable-liblogging-stdlog
+		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
 		$(use_enable test testbench)
 		$(use_enable test libfaketime)
 		$(use_enable test extended-tests)
 		# Input Plugins without dependencies
 		--enable-imbatchreport
 		--enable-imdiag
+		--enable-imdocker
 		--enable-imfile
 		--enable-improg
 		--enable-impstats
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 690ca62613bc..e78b9d623885 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index dce20925088b..cdbe7f8088f4 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -3,6 +3,8 @@ AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 DIST podman-4.1.0.tar.gz 10904727 BLAKE2B 6d01a65b13494dc948c0667147eca6f250a81056f1bcf6eda6285566b8aa7aa526794ea96a571aecad642a8b1d3d1877cd31683ccf46662f8681a2afac083b5a SHA512 4d5f240423f21b1224ce44853a2265359dacee0d921f0ea53a7fca34f9076ebfaa49f4327a59ac51f5bf5b9dafb47dda3a9bb8e609237cc69f833b42b95bcd0a
 DIST podman-4.2.1.tar.gz 13047683 BLAKE2B 968dc88164c846108d920dfbd3796078b6e7cde6c6d884ac5ea3379abe9a3d0ea72a78b10eea644a1040d1d564c13f05fe69112c49084344e95095c50ff537d5 SHA512 a8a6e3228c1cb6860bb27515bd081b5c395a17bd69fab8797758b84631d08d2389e554621080e66ecc04818c1c4d132ea6ed0edfedcfea6d7886a70ebc95297d
+DIST podman-4.3.0.tar.gz 12672944 BLAKE2B 530b5484abe774aacdb107162a68d98f15c0b5af7cf5c8a862fe9cb701cc3a57d2ed2bafe09517d3a3f9e09fa196b28eed6c6e2dabadaf663ad5ff0d1de97475 SHA512 b5b70e83a67ccfea149cb7df87a452d51fbb5e87ab3d1c6b4f623ba0f8f8a25442cee6ae8b8d31ea844f08c3ea4962e865ddb90e61c185dfad29d3b23aa8338f
 EBUILD podman-4.1.0-r1.ebuild 4782 BLAKE2B 057db822cd7588941c59d8efd32d2170d42ef4f95880eefa23dafdcc834d377e3df5ca8a3cdc9757d37fe133960225251884316688ec04e921de0e3baa0d69b8 SHA512 64b1c4dfa38678b81f5e563c2634fe78cb41b1d98e893091a405c47a3ea13bb8411b376fcf1ff1794ac24fcc7efe704e4daa6c9aeba92f0bba2498415103c9c6
 EBUILD podman-4.2.1.ebuild 4784 BLAKE2B f0b71f8b5c64a44a511783f45d8a6d42786e5f40c6fd2edf7ac5e31e48af29c90d814603d776fe89da9d5599351c436abac176b070bdb26190b8ab234febd561 SHA512 a7e38f492a2c6cd3e0d8f47138b1c35bcfdcfc322c089b2149025b5c066061c01187ed5a19202ef2a95173e9aa63d9eff76269efc9fbb110de939cb0c3fcf417
+EBUILD podman-4.3.0.ebuild 4784 BLAKE2B b15c7824f91fcd558f5f5a6b653cdf883c72bf45a0ddc312636a7e6363e85352f1d0f20e2724bcb48ec693f679c38cfcf3e1e2754a9cfa7f2282c9aa32a6ffa4 SHA512 b321b4386d8e14e4b48f72099ebcaa80eacae154333d9a2fa4c5a8e30b9a29e6c700ea693e5d584037470cf2241812b7af312b6fbca0caaa52efb0b21d181b6e
 MISC metadata.xml 1309 BLAKE2B f4e08317d4ed405eca3964b49bbc3a5b8a915245bc5e2b3912d254ee3e75e6475d44879b1118a34bd3fe7568d9be9f4747303eba821cda94d97a16d693f71b49 SHA512 ebabde88fb088061c48400021521c9b8b35f1c5af6a3bb8194f8eb1f4bad2506b77ed8ee8a30e76eb4e262c3d132e03930d23feb43a82604499a5c49ee35886f
diff --git a/app-containers/podman/podman-4.3.0.ebuild b/app-containers/podman/podman-4.3.0.ebuild
new file mode 100644
index 000000000000..98eb5c251dcf
--- /dev/null
+++ b/app-containers/podman/podman-4.3.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGIT_COMMIT="ad42af94903ce4f3c3cd0693e4e17e4286bf094b"
+
+inherit bash-completion-r1 flag-o-matic go-module tmpfiles
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/podman/"
+MY_PN=podman
+MY_P=${MY_PN}-${PV}
+SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-containers/conmon-2.0.0
+	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
+	!cgroup-hybrid? ( app-containers/crun )
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	>=app-containers/cni-plugins-0.8.6
+	sys-apps/shadow:=
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	init? ( app-containers/catatonit )
+	rootless? ( app-containers/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+	fuse? ( sys-fs/fuse-overlayfs )
+	selinux? ( sec-policy/selinux-podman )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	local makefile_sed_args=(
+		-e '/^GIT_.*/d'
+		-e 's/$(GO) build/$(GO) build -v -work -x/'
+		-e 's/^\(install:.*\) install\.python$/\1/'
+		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
+	)
+
+	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
+
+	sed "${makefile_sed_args[@]}" -i Makefile || die
+}
+
+src_compile() {
+	local git_commit=${EGIT_COMMIT}
+
+	# Filter unsupported linker flags
+	filter-flags '-Wl,*'
+
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	# Avoid this error when generating pkg/varlink/iopodman.go:
+	# cannot find package "github.com/varlink/go/varlink/idl"
+	mkdir -p _output || die
+	ln -snf ../vendor _output/src || die
+	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
+	rm _output/src || die
+
+	export -n GOCACHE GOPATH XDG_CACHE_HOME
+	GOBIN="${S}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${git_commit}" \
+			GIT_COMMIT="${git_commit}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	insinto /usr/share/containers
+	doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
+
+	newconfd "${FILESDIR}"/podman.confd podman
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	dobashcomp completions/bash/*
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/*
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/*
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	PODMAN_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process podman.conf
+
+	local want_newline=false
+	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+		elog "You need to create the following config files:"
+		elog "/etc/containers/registries.conf"
+		elog "/etc/containers/policy.json"
+		elog "To copy over default examples, use:"
+		elog "cp /etc/containers/registries.conf{.example,}"
+		elog "cp /etc/containers/policy.json{.example,}"
+		want_newline=true
+	fi
+	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 98a6b184fc8a..6fe56a1b1df1 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index b1bf9c88a7ec..012973e4a786 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,4 +1,6 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.3.4.tar.xz 737072 BLAKE2B 64e698135f02bf115269203d44a53d40449be1620487340551c1e45f66f042132beb2cfa2363d1249f92de3ffd670f1807219cb3ce3d6e7c05afd8c22242b703 SHA512 af27338b5c018d39c8c745b63691dec3914e29ff79347ab338f4391ee1dc9832d158b222bc9ef6c7681cf4b2893a38829a4daadf1d53622d6947de2efeb880a8
+DIST qca-2.3.5.tar.xz 741036 BLAKE2B 3948dc9b58a8ef03eec246cc14c7582d30e2513ea4b8f457a44d4a0c8f91fdb10af041f7cc342a0c8d9540a43cb47b4ca5b35641dfc3716c065fc3a1d6ff227a SHA512 656e44d4f30c3c0e1a8c04f2703484e3cff2d962b12c6ff9891b9f28127cd61ed30dcd248c059bf9066ac645bf53a9b7c14bdb413a7766c8b3f3d37426478d96
 EBUILD qca-2.3.4.ebuild 1892 BLAKE2B 0620945a65e38a93e5660e68a313c15faac3f0f060a0cffa4f9588d2527f22f613421a47e2b7f0591aa4a5d5bf5c35114016387be911ba009a9b26d88978478a SHA512 b1945152b3c5292cb0bac97dd7008afbd67adb4a547e350eaba7fc75a5bd26eb109bbe0a019dc5f0d71a85b58fb5ba322f308c8bc7ad1aa894e52ca4307b4be3
+EBUILD qca-2.3.5.ebuild 1895 BLAKE2B 0e0fb28a7f83253f3ba2e8b4200246ecc2822be09e73d63fc28684f111028b1206823354629226e9dc71caa8af6459ba9d99a65bd6b17b9675593ff36ab8336a SHA512 91d31576e271089031a3844ea4abc8cf092d3252826ac24879160f42a34e4dbfcf710eff597a8fb9d9247e18b037658791da95a80d356f984c06b3c7755e1001
 MISC metadata.xml 832 BLAKE2B 9044b545fa732c5f86c7dbb026630b4946a538ba77369eae28e894bf636ca60f6a31d7aad258fa19aee4c433d6d5a8e2a34a7c2850eef3a40d44261e592032b0 SHA512 b01bfe83343fdc265abc25922300cdc67f556a9a6f6db16918b0b3ee44c4e83db524695c5cb8952278f3e1f2e5d60a49bcc9312b35ab95f0ecc42e03764fb6bd
diff --git a/app-crypt/qca/qca-2.3.5.ebuild b/app-crypt/qca/qca-2.3.5.ebuild
new file mode 100644
index 000000000000..ad521368b563
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake kde.org qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="https://userbase.kde.org/QCA"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.14:5
+	botan? ( dev-libs/botan:= )
+	gcrypt? ( dev-libs/libgcrypt:= )
+	gpg? ( app-crypt/gnupg )
+	nss? ( dev-libs/nss )
+	pkcs11? (
+		>=dev-libs/openssl-1.1
+		dev-libs/pkcs11-helper
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	ssl? ( >=dev-libs/openssl-1.1:= )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+	)
+"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		virtual/latex-base
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+
+qca_plugin_use() {
+	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
+		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
+		$(qca_plugin_use botan)
+		$(qca_plugin_use gcrypt)
+		$(qca_plugin_use gpg gnupg)
+		$(qca_plugin_use logger)
+		$(qca_plugin_use nss)
+		$(qca_plugin_use pkcs11)
+		$(qca_plugin_use sasl cyrus-sasl)
+		$(qca_plugin_use softstore)
+		$(qca_plugin_use ssl ossl)
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		pushd "${BUILD_DIR}" >/dev/null || die
+		doxygen Doxyfile || die
+		dodoc -r apidocs/html
+		popd >/dev/null || die
+	fi
+
+	if use examples; then
+		dodoc -r "${S}"/examples
+	fi
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 15622d3b71b1..023ea0009564 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
index 6284fb0156eb..c0a064feac12 100644
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@@ -1,9 +1,9 @@
 AUX 50buttercup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 AUX buttercup-1.24-properties-equal.patch 1596 BLAKE2B 384adba33517c2f6677e10aac40c5a939914f74a936d7891e52eb4b706d33c0005f1ce63e0ba8b9672fdad403f6ec36e3191246c252c30574c448408ce24a1aa SHA512 a7dfe3a0d9df701b47287afd8718fbe01886870ab0665cfb73ba240b03facae5b1dc53d5e07ac2cbf21823a203e46a038e64025a82d627d2e8a516997bc8e654
-DIST buttercup-1.24.tar.gz 85337 BLAKE2B fb40d0899f68aff5f2fdb989b2c0e42005e6667ecfe8a4ca806ddb4139f497f0eed5328ba6407136b757a0f13bc6ec5ee488792da3de1e84edba394a781c410c SHA512 0a436f5e5bcf386a3675ef281ac6c9f0125917058de88a5557d879004bbf7cd4298086aa3fb86f2bd807f46c166b0fb02e248cc485878891293147656525f8ca
 DIST buttercup-1.25.tar.gz 86763 BLAKE2B ccf7ba797517710e66b666cc121766d29886e0e1a8fd5ad63cb8b5fa4ee2d2a0d2644cd413c1095f37b1ba60467c012e507230787e1daaca3e869a4072e61bb4 SHA512 1eb45485fb1de638837da4d97f6043a64e97d167c8c130d9c5ba6ff67a5e0bcae272c8247779ab1c9427668468a3b94e91af07426b5465a7c3f9c54433a0433e
 DIST buttercup-1.26.tar.gz 87554 BLAKE2B ee5d37360b6c9daa8b790f7ea6ae5bf7ff4266b1fcbe913877aefd4ede2e7d6561e48eae533c17c906e19b498d9d127692597ee728bd1fa791430f5f6ab508c8 SHA512 fb491e1db33ffaeca52529630c538040487a7bdf7766faab2c6a1bc39d1060c5bbbb7a259006b741abbec9b9a6911f8390b2513e0a4dddf856b79274ed24307c
-EBUILD buttercup-1.24-r1.ebuild 804 BLAKE2B 209c2c4c9c1f1cf00c60cf08d50fc56ca5846716de74f8f628233c04737f6622b8839756fa05c54e74bfb32eee0180040f22d815d83fa639504c710de7dca10b SHA512 b231b7049a5b9ef1fb8033bbafc727c02ce5723a7d7255a8f7f84e9a784b4b9f29c376d449247a31feb9f3d14a6f153af1613276f0cc717a9b2738ddd54f9c44
+DIST buttercup-1.27.tar.gz 87761 BLAKE2B d372e3285bb80a0005e79142dc95d219a2219959974039083df502ceeec10281aaeaa57f97c8bf45ec1d31b530934faf03b24d2a40e94f09f1cce4a986ae602b SHA512 537c1cc1fc560000537f3894f0917738ab344a4b117eac927b290bc8b5d01b6ad1df1caad63e1f339edc8f4bcaa9cdf483995e2730661481b53dd5e693a33f34
 EBUILD buttercup-1.25.ebuild 668 BLAKE2B 58d00b943b8634db5dfcd694b3d5d3dcb12f2b99e18434d1c31b9f50acb9aec669d6aac0d3fbd38eca545ceb5cdb926dcb274e6a91a0e7e184bc0a084d37129e SHA512 8b0ab6cd74f243390c88004c5b75e58a9461723b3830bf29a20741d13f2f284989d5da06405864a238be40a37f8cff2cc6c4c506c968fa3be1d0cfcf9b643f47
 EBUILD buttercup-1.26.ebuild 664 BLAKE2B 077b0052dc38e92fc20ae97d938cc8c4a4d60a258b02b97324d4d0c9667659fa6ce808aac28d3089c870de086e81c6998ad7917b2703408c2a077dda7f456d0e SHA512 14e30df54ed3ae39a27c793b5c8f02fdda1f2d3020d4bc2440b188fc060934d87364d5af0e35f0a9f372ad962452c603d079faf6037305b82b064a7a7a917f66
+EBUILD buttercup-1.27.ebuild 668 BLAKE2B 58d00b943b8634db5dfcd694b3d5d3dcb12f2b99e18434d1c31b9f50acb9aec669d6aac0d3fbd38eca545ceb5cdb926dcb274e6a91a0e7e184bc0a084d37129e SHA512 8b0ab6cd74f243390c88004c5b75e58a9461723b3830bf29a20741d13f2f284989d5da06405864a238be40a37f8cff2cc6c4c506c968fa3be1d0cfcf9b643f47
 MISC metadata.xml 392 BLAKE2B 365eddee8c36962902e64b476ca9f21b34bf1faf9dd5ff2ad28d799a8079ea81cfea23adfc81e0a40edee9d4a6551affabaec91c9b931cfb161cf8a5bfbb024f SHA512 899c734fc6bae680c7d44dd0750d0a55a74ef2a5408be0e3a33a920ed283535c1136fc6b04bca86e85304ee1a3972413f18cc047be1e1565ce6c2a7940e087f5
diff --git a/app-emacs/buttercup/buttercup-1.24-r1.ebuild b/app-emacs/buttercup/buttercup-1.27.ebuild
index 58f468512d73..cfebece4d7cc 100644
--- a/app-emacs/buttercup/buttercup-1.24-r1.ebuild
+++ b/app-emacs/buttercup/buttercup-1.27.ebuild
@@ -14,13 +14,9 @@ S="${WORKDIR}"/emacs-${P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# https://github.com/jorgenschaefer/emacs-buttercup/pull/210
-PATCHES=( "${FILESDIR}"/${P}-properties-equal.patch )
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DOCS=( docs/{running,writing}-tests.md  )
-ELISP_REMOVE="buttercup-pkg.el"
 SITEFILE="50${PN}-gentoo.el"
 
 src_test() {
diff --git a/app-emacs/consult/Manifest b/app-emacs/consult/Manifest
index 527f63dc3a2d..7fc27692e38f 100644
--- a/app-emacs/consult/Manifest
+++ b/app-emacs/consult/Manifest
@@ -1,8 +1,8 @@
 AUX 50consult-gentoo.el 82 BLAKE2B 3443827f490db8caacfe842cc7f1d1315f3889dec007210f451909576a76139f70ac5795346a7a1b11befccd3152874fd3c86ad7a20c0fbf84f793f8deb595cd SHA512 dd2ba1149c847d95d6c54265bc03de36e198dfecedc10336f6879fb3a1fc9d92e2c6de190d4f9aaab6c3d15f268fb80e082b49b6e96165697ff786333a50a601
-DIST consult-0.15.tar.gz 90201 BLAKE2B 1652d5a2c1f559c67f6899fe26b221bfdf0599a20af7309e2dc57a4701a795c8decd2f878056297204611d045829ee1aa24ccb665e36c15f6a2a3a14eb81f382 SHA512 2b8926638c13633e2ccf48d63a3a76245d075694f046e20575e8c9bcce983a3610ef648374b01dbff4dbf97d116830040c8e76d9d75d05ca23278253e68138e5
 DIST consult-0.18.tar.gz 93440 BLAKE2B cc67e8cbc49846964114a8e01a10d41454fde2e4a2e98e3af315092fab5631ea1418f649eb92ca798672c0ea153dd2862b555aee6530a1baa84ac4050df7a3c6 SHA512 74005c211ba7af0cf3c0a06fdec8d85da111ea84edb4eef2c60d231ae6eb87905298ee8bbbcdac8bf8b13a21ed9070422383b93433e422d6ad6b743c8bc80938
 DIST consult-0.19.tar.gz 94673 BLAKE2B a0bfacd0eccde14a332e85d31ad37092f418b5d250db8bc5a674881828d198fd2b26d66be1574539c33fcdc70f7165f4be84a4f920f1eb62b6bee0048b46ac54 SHA512 b1f023d57f29ec9443add83aca818a0f7f2c4954e8d5f53246fbb5a2525c03c20c71d69d8e748fe6fe6044393849b33f9589428528d2d0837e5848aab2724f4e
-EBUILD consult-0.15.ebuild 456 BLAKE2B cc4edada3d2a580436f812bcee60e56015f354d10442fc63a9e48d4c57c77cae8f5bea75828478009b28049d715ba46e5042d37e8633f53fdadf70b98b4994d4 SHA512 9ec27b2cbc037a83b5ef583ca0d997863f1c993a6f200feadd9c0f914cd875b29d0194fdc118988e9345c233d0aba3cb869324cbe69016b3dd3bea3eb736e6cd
+DIST consult-0.20.tar.gz 96288 BLAKE2B 41d35655b75c6f3901b5b20f743bdf5119d0347a2d2a0dd6884cbf3856146ed30a224da75147063a93f4274772d54bbb6f91d4deb9fbda5f93d57d1b70083ef0 SHA512 d9f847f086e2921a769e84b10439512e0b614b87c424d6b206ed1007bbd67360072e02441a4249ac31ea6aa9ad5d36a042af27c0ebc935de3889e31d604ac8c9
 EBUILD consult-0.18.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
 EBUILD consult-0.19.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
+EBUILD consult-0.20.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
 MISC metadata.xml 359 BLAKE2B 569bd0c5fe81610f0b67c94e8c431edddb5060800a6e22d0833a4d5f120df34545dc49c879c12a6522ccbe791472df47be42af97fbb228498e79d9e0893697f3 SHA512 8e01b569f019ea43209f43c783fd41b9661a7235d300363a9441179058b10921629cf8b891874c706d2c1ec106248f6c1e0a3501df7bfcdd02000d08f7997c29
diff --git a/app-emacs/consult/consult-0.15.ebuild b/app-emacs/consult/consult-0.20.ebuild
index 71aa4f98c4be..d2a809943fab 100644
--- a/app-emacs/consult/consult-0.15.ebuild
+++ b/app-emacs/consult/consult-0.20.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-NEED_EMACS=25
+NEED_EMACS=27
 
 inherit elisp
 
@@ -14,6 +14,9 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RDEPEND=">=app-emacs/compat-28.1"
+BDEPEND="${RDEPEND}"
+
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
diff --git a/app-emacs/corfu/Manifest b/app-emacs/corfu/Manifest
index 91b152190515..2f489432e414 100644
--- a/app-emacs/corfu/Manifest
+++ b/app-emacs/corfu/Manifest
@@ -1,8 +1,8 @@
 AUX 50corfu-gentoo.el 80 BLAKE2B 030035947690cded0580337466f06e7561c996ef27d6dce32cacf28249e71f3a99083e1dcd68e8fb1e2d0bcff75a70881ca88c7f41128123876e6f34230235fa SHA512 cde0d90e0b8bafffafd8d79c6fb4bc7957d1c7e5a6eb86b2c2cdeb73910bfddb6b8b2985bd46af406e5d3f3d1e1205b37ac2bf8cb26aa3d052b06054ae7ba00e
-DIST corfu-0.25.tar.gz 38366 BLAKE2B 297c8c556d32ee9f0a42265bbcd9b7cdd19881b8d85a9c92b6be84cb52e5558996cb16da596d13349fd1c9c72c7b6247e003ab48fcc41fd4acbe2d151b8e2e90 SHA512 602a9072cfa6a75672e1879e8da95b59355cc720482c8946311446c5722d13d0db6171eab8d899b689a689fe306d11f9b063e6bdc07dc710d9ee8f6f15b5aeee
 DIST corfu-0.26.tar.gz 38840 BLAKE2B 47dfcd2430cfd37c912cc2101760692bb1e4ef788bafec64760c81b02412119156b99d57a129e31d7109a62a073dfeb836453076f8bc59ece835015b4ec19ac0 SHA512 3996528e5ee9992462bc2cb241c36b7a05aeca460de0a04db542e6cd9eb7352067283ea4d8c668053003a7afc2dacc97e3b634842b847c05450fd8472ae8249a
 DIST corfu-0.27.tar.gz 39034 BLAKE2B efc1d2477bfaa891d32516d69aeb5179bfcb9332b579609319f832a7ff03416ef5836cf5124bf9ad9c8f75ad4a6c4183a17257037f6271801515636dc5bfd132 SHA512 fd143b4fe63080e6280be98b93ef84f4b12c5c1211cb1a9294ea4fddde61466f29f68e9aa24dce74c5316d7938c91fdd0b28775c688b451386daf041ac745b82
-EBUILD corfu-0.25.ebuild 521 BLAKE2B a4caf9986c9ee8edf59147fd748765f18c3dce07b6b573c6c8f9b79147449216aeba2ea33578789a10cdb491bd3714cdcd5ed6e0bfa82a2e956952ee821d113b SHA512 4efb8703c33148f8b9c508f5787594c6519e8dbed90cc4e3389d12d7ce3ad4fdae4687f19eead535183a791605fb2b55ef4202a82ac7e73cea34daa94a902d5f
+DIST corfu-0.28.tar.gz 39100 BLAKE2B 70deefdbe6768efa0c9a8c86b441f177f1c0e6f7c344f9290fd82dd1f02752c4dea5e8810b475e73709c89cc5d62d07f3beb70814f744828700d2d30edc0956c SHA512 85de7be79cc979cd877f9f9fa0e9546f40716215393e8bfa6cfc8e8f71d1289a59702230f8051c3bbb4b968732423b1adc124fae4f661523fb4f5a78591f0c46
 EBUILD corfu-0.26.ebuild 521 BLAKE2B a4caf9986c9ee8edf59147fd748765f18c3dce07b6b573c6c8f9b79147449216aeba2ea33578789a10cdb491bd3714cdcd5ed6e0bfa82a2e956952ee821d113b SHA512 4efb8703c33148f8b9c508f5787594c6519e8dbed90cc4e3389d12d7ce3ad4fdae4687f19eead535183a791605fb2b55ef4202a82ac7e73cea34daa94a902d5f
 EBUILD corfu-0.27.ebuild 544 BLAKE2B 8e7b2e689f65d4dcca4934c53564bb8435dae6f06c364d445fce382229231e5e8553d13e25c4451359b00ed453e140a4d1286c8f5584e683474bdc0e12efaf64 SHA512 2f80fc7697c70ab5be781034220f24067b7cc9b648de2520ff159de3c87c6abca72fd7c86739767c58d5ed165525f6b2dc48c3652a60b01f01962e917621ac10
+EBUILD corfu-0.28.ebuild 544 BLAKE2B 8e7b2e689f65d4dcca4934c53564bb8435dae6f06c364d445fce382229231e5e8553d13e25c4451359b00ed453e140a4d1286c8f5584e683474bdc0e12efaf64 SHA512 2f80fc7697c70ab5be781034220f24067b7cc9b648de2520ff159de3c87c6abca72fd7c86739767c58d5ed165525f6b2dc48c3652a60b01f01962e917621ac10
 MISC metadata.xml 357 BLAKE2B 4a324f2913cf600a98085a72ffc69263205068f54b191101ed2825d3e3c84f951e58af8ebcab481bd50908685dc3603cdba3156772f153bf5a565ab43831b201 SHA512 038f5605bc71c57700f5d34539c8474c667f4434261cdb7dacb28c1dd80a64e656c395dfc2c84329d36e6cee28aaa9986d3cceb25f46d887bf8fdc1cbb348b8c
diff --git a/app-emacs/corfu/corfu-0.25.ebuild b/app-emacs/corfu/corfu-0.28.ebuild
index 7cc6d4bc7c42..3374986f6f57 100644
--- a/app-emacs/corfu/corfu-0.25.ebuild
+++ b/app-emacs/corfu/corfu-0.28.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-NEED_EMACS=27
+
+NEED_EMACS=27.1
 
 inherit elisp
 
@@ -14,6 +15,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+DOCS=( README.org )
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
diff --git a/app-emacs/marginalia/Manifest b/app-emacs/marginalia/Manifest
index 6e4741b2eec8..56a542e4e4f6 100644
--- a/app-emacs/marginalia/Manifest
+++ b/app-emacs/marginalia/Manifest
@@ -1,8 +1,8 @@
 AUX 50marginalia-gentoo.el 133 BLAKE2B 9924046f0683974aba9bf9bd0939058eab78abc131b0eebd5d2aac17c0653e0a578c062fba7a363797e6455b8bc85149e79778f8abd4185eec68dd61206b8216 SHA512 e5cd461343454dfc9de75f15e5c35337780ecbc96d844a160c3f9cfcfd5382232b4359191b382741839700224493adc6f4d3218c050c3214b49af0dc85feb135
-DIST marginalia-0.12.tar.gz 28459 BLAKE2B f18dc11368f181bbf0bd92ba5abefd065181d2f3f2d7c27adab12e0b7baae69e8bf4d74e7e75687805773024fbc06eb0da49de2a14271cda125ffc2d6b01f049 SHA512 c6650f94e45fd82ddbbe0a58a4e816ebe55837ef8102c6a4871952b0c84ee44ab868bde41a864a06d03428a00cabf3a8a5e37addaa8bb81e3ea45271b8ad53ef
 DIST marginalia-0.13.tar.gz 28803 BLAKE2B 396656d93ee85d0b4ad216c2b27de5f2415ae0b54198eacf327eb035f4753a74389734353dd19913f6778d4cf9bfd82b1ee359105d7527d95fe9675afa368655 SHA512 08c6fd3ff744c3112e76a44786d5422b04d0fdf3e08342b1903578b80922df28b2fadd8f0af612f32dfd9c607786c12b6508b6996acbc671ba4d542c9a67d52b
 DIST marginalia-0.14.tar.gz 28890 BLAKE2B 801f9c6a83f564f74a03466b1de0a9d7403d7c0d3fcbb597a3f6f824f3156f44d4267623bc21ab7c2e8f6ef6363add730c8dfe5dbbe5b050240a32ae8f14753c SHA512 efc98387572df01b9a45133587023ce33654a4f8c87d33ccd55ad42a26c6bb2418d388995167b2bdb3276c6f961100f12774743670933467dfdc8060beeeafe8
-EBUILD marginalia-0.12.ebuild 399 BLAKE2B 6b87ae5eddfc9d7e305e5244b279d152718f85dfa210ed451cf1782713b1ecfe2aea8b8e43fa9304f8a4cd7230ff66cffa2bee0e884e3f72d65488107aa8a1e8 SHA512 5659efc316b5a4bdb537b2b05459850e27e006a96612b1ad00a7ccc6f5b4196217bfc0f79c4dacb38029ea7cb91c4a68463d06107cfe233183e79660c69493bd
+DIST marginalia-0.15.tar.gz 28952 BLAKE2B 80d89d0dad5d3c4494dfbe888763f3e1712ae575ee5e5d392ca4b0691ea3fcfa8b1da9ada6afe75f7e936e1d9d46b32e13b541ac7521fbd009f5ef5322e9b3cc SHA512 bdd06de527a3d5849c776a55c704a8c41c086a5bc4d69f980194484f6f7aa3202b0dec8ffccaa0de5e7c54d1d93476d6d5fdb66c62a507cbe368696e4a0ee84c
 EBUILD marginalia-0.13.ebuild 399 BLAKE2B 6b87ae5eddfc9d7e305e5244b279d152718f85dfa210ed451cf1782713b1ecfe2aea8b8e43fa9304f8a4cd7230ff66cffa2bee0e884e3f72d65488107aa8a1e8 SHA512 5659efc316b5a4bdb537b2b05459850e27e006a96612b1ad00a7ccc6f5b4196217bfc0f79c4dacb38029ea7cb91c4a68463d06107cfe233183e79660c69493bd
 EBUILD marginalia-0.14.ebuild 399 BLAKE2B 6b87ae5eddfc9d7e305e5244b279d152718f85dfa210ed451cf1782713b1ecfe2aea8b8e43fa9304f8a4cd7230ff66cffa2bee0e884e3f72d65488107aa8a1e8 SHA512 5659efc316b5a4bdb537b2b05459850e27e006a96612b1ad00a7ccc6f5b4196217bfc0f79c4dacb38029ea7cb91c4a68463d06107cfe233183e79660c69493bd
+EBUILD marginalia-0.15.ebuild 399 BLAKE2B 6b87ae5eddfc9d7e305e5244b279d152718f85dfa210ed451cf1782713b1ecfe2aea8b8e43fa9304f8a4cd7230ff66cffa2bee0e884e3f72d65488107aa8a1e8 SHA512 5659efc316b5a4bdb537b2b05459850e27e006a96612b1ad00a7ccc6f5b4196217bfc0f79c4dacb38029ea7cb91c4a68463d06107cfe233183e79660c69493bd
 MISC metadata.xml 362 BLAKE2B 170d321c62f5b92b3fda03c4c6a1dc8438023211ae2f9261c997ce1300e4d24fde6588ed57ee766b2637e31c186e11aefdae58b083fd19ec15cbfe2846475bf6 SHA512 99a6cc13efa79095c0fe1bbcd2661fcd56bce0b3cfc9da0af6f90248b8e1ff27e78e0984677df5aba4c383530cc8446c5748296b35e07d6d2d81bda26b5433b4
diff --git a/app-emacs/marginalia/marginalia-0.12.ebuild b/app-emacs/marginalia/marginalia-0.15.ebuild
index 87470ff0f45d..87470ff0f45d 100644
--- a/app-emacs/marginalia/marginalia-0.12.ebuild
+++ b/app-emacs/marginalia/marginalia-0.15.ebuild
diff --git a/app-emacs/vertico/Manifest b/app-emacs/vertico/Manifest
index 1c0755e49573..25e4915b8820 100644
--- a/app-emacs/vertico/Manifest
+++ b/app-emacs/vertico/Manifest
@@ -1,8 +1,8 @@
 AUX 50vertico-gentoo.el 82 BLAKE2B 89e0376cb0361d71ad40318455820607ac23fe004dbc80c77c9943a94426c47ee409956e0770a1f8c3157b50f0f105275337b0c94b597755dac59baeac29eecc SHA512 ea5c77218cab48e770cf56d1732b8101bbe453fe5e98fccf92c6adf53fd3aa8c1c3fd4d33e02fcb02d7ef44c56661e9c593588ffefec0852ecd43c00da30a5dd
-DIST vertico-0.25.tar.gz 42765 BLAKE2B cb87a0226b741f2e7b1e90b339debfef3caa4abc89dc5aecaee1c7a76ac7db6fdc4f13019ba6993f696735d4b020aa06caabf497f6e9b2047b24dd4e434a176a SHA512 aa2ae45f93412e45ed9da0382ce69a2a7a18196f80789915bfbf9edb1593f5d5ae3370d2f0c03059ef7eb38cb664052fb0a49172f51e304bc389df439a51ad61
 DIST vertico-0.26.tar.gz 43410 BLAKE2B d8967dad143066dcf288d9cb103d9a66732262598867f4d7184e6c2b1c7fd98629b0e0fe012f7c9960a3e194656507ff3150bcc372258b0c45c839aae2506ae6 SHA512 a4246169db6f8f8e2f65e8b8f1c3c5a52e29d226b92cf30ff968a44f9293e4c6dceaf567516066e3d1e5212edf7c4a25825719072d3c2bbffca9967a500e7605
 DIST vertico-0.27.tar.gz 43417 BLAKE2B be9fcd53c836e16f6ee3380ed8f727fbc62153a87a759dee7091b959f3ad0a940a6c1fe176a2073db153ae855b42a64ee92f57e7f3be4538c2f8a13606443d06 SHA512 cce90065473cf8440567b591544bf74af71752e476b667d7bc7d77bb83c8d43e38f2170f5e66f4723dfe29e6228d4933be2cb0d899cb8b56843a6a1ecb07f6a3
-EBUILD vertico-0.25.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
+DIST vertico-0.28.tar.gz 43472 BLAKE2B 4c2771104960ee95ac7dffebecdf30ddfcc42bb91377dbbf27f245e9f93eb392dfa16a9fdd45f34ef739b4f9364cdb3d5c9dca9dd2a111a0008b726bc31df117 SHA512 3844f16184056210cadc755e52d5886c9c6ed0b00278d5c1b0d30e2d13dd8b63215026305e62d69873aaea720aadaeb772b29161d98d2e080b302565bd1f1d4a
 EBUILD vertico-0.26.ebuild 541 BLAKE2B 6347254d174ec26a92e276298d0435e8755ad19e63d1ab98234a21b0d4ff3579996216c0c6f4df13d8ef858a75f7c221ed56123f58206e507d8bea1ca2ef19f0 SHA512 e598c9178f90151355a50c20f9f9701b53885b4b96f4c658ad67d89a377e46270c9b66f28ab8a8332f99d2d28c64324d1a2f81164fda00f8ede6801cb8ca9167
 EBUILD vertico-0.27.ebuild 541 BLAKE2B 6347254d174ec26a92e276298d0435e8755ad19e63d1ab98234a21b0d4ff3579996216c0c6f4df13d8ef858a75f7c221ed56123f58206e507d8bea1ca2ef19f0 SHA512 e598c9178f90151355a50c20f9f9701b53885b4b96f4c658ad67d89a377e46270c9b66f28ab8a8332f99d2d28c64324d1a2f81164fda00f8ede6801cb8ca9167
+EBUILD vertico-0.28.ebuild 541 BLAKE2B 6347254d174ec26a92e276298d0435e8755ad19e63d1ab98234a21b0d4ff3579996216c0c6f4df13d8ef858a75f7c221ed56123f58206e507d8bea1ca2ef19f0 SHA512 e598c9178f90151355a50c20f9f9701b53885b4b96f4c658ad67d89a377e46270c9b66f28ab8a8332f99d2d28c64324d1a2f81164fda00f8ede6801cb8ca9167
 MISC metadata.xml 359 BLAKE2B d5d9e7f1c0ec1dc75d7fde73aa75f364f15740857e6a2bf39b3374424c3fcff4e79ceda481141598fee17c694b4c3538059f5bf95186aad6d535eacabcdb3341 SHA512 93e435f0f7bdb4d26a48525109688b964049a0b61d4b5633bd61dfd14ab68a5bd7e367d0cb7e45f5f1a57d73b8b63a9b2f8b0da9ac289bd4242da3b6f434b987
diff --git a/app-emacs/vertico/vertico-0.25.ebuild b/app-emacs/vertico/vertico-0.28.ebuild
index d2415e174e28..eec14ff439d5 100644
--- a/app-emacs/vertico/vertico-0.25.ebuild
+++ b/app-emacs/vertico/vertico-0.28.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 NEED_EMACS=27
 
 inherit elisp
@@ -14,6 +15,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+DOCS=( README.org )
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 7d2fe4e3d144..1584e4f73b79 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index cea8d9c5e8c5..2232aa068742 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -4,4 +4,4 @@ DIST go1.19.2.src.tar.gz 26534465 BLAKE2B 9b1eb84a8d840facf69dde8f6263d08239b67b
 EBUILD go-1.18.7.ebuild 4798 BLAKE2B 8857c2432424a27febc299a46ca61bfd267d9a1d2fad7116096e5938a519410d35bf90b61a1827e2ad769986b9406ecd0bf1b9197e64b8a176e0a8d9dbb600eb SHA512 9e2efbcb8652fd203e239626f2ace311dba12c591829ce00e4204f28c3d908adeca69d1a17855c2544f2f8bc5d88a636a3d1c806d36542788c1949204b5535b8
 EBUILD go-1.19.2.ebuild 5054 BLAKE2B bfbc428b87f2e9f73850027eca19f0b4ea1faf02d25b73e45cf7b60a4c517b3aa84eebf8ce7134fd43a14084f56c8117c3327d67a642ee825e8a9f61a90d1e9a SHA512 f48209444e188c0d44a133f9a983787fbe99b8a6eadcd9c16d2e131683f0bcf88cb2299315c2aaff5c5e70ffb0e5ecc49f7f87697fd8dbae7c852b54678d50eb
 EBUILD go-9999.ebuild 4798 BLAKE2B 50daca174e8bc89f747432e96bc7d66e6c7dd50320d0b4c97754bb90267d62b700d34c250a892fdf60c907fa5eb881dd7adb3e64eba7ceb240740bd90c399f83 SHA512 051671c9a99efe554f9ed66423a20d053546ba68fdbf8a900e4ef0a365622bf8fcc976c678e393ade4a5475e01ccc53668d61d98e1b976e69de030662498273a
-MISC metadata.xml 537 BLAKE2B 8017fd0edeef2ec4b17f75e8686f6014ce3c3e39b7083c347f601de9b15f34896305d6041edd0bc2b6a0687a69827c9dcecb2f07ca5994f29a3c0f8014c0604b SHA512 5f6b42721e1602efab24f33955806c33ace6433e17b41755dbee47abea79a2744292148c330d6e5a04612b0b451545c32241236cc8f211c5e7cf22c8cdebc778
+MISC metadata.xml 590 BLAKE2B 56da63bdc350df5c6ef3b511a386627f4020f655027ca88da6a83ecb09581d3c3055c836eb8fe98a383412b3d431a77a9935ad753fe2d8392afa37cd613c15b0 SHA512 5d78adbae30c3a805194567bbb1af2ad59b78487819e7841a040d2a4d5db02f5b5d1d58f7cfc7a37f39e5e9bcf332dda4d336456e33e36c33caef792ac45d48b
diff --git a/dev-lang/go/metadata.xml b/dev-lang/go/metadata.xml
index 65e430387e9d..fecdb64e9339 100644
--- a/dev-lang/go/metadata.xml
+++ b/dev-lang/go/metadata.xml
@@ -11,6 +11,7 @@
 		channels and a clean syntax.  
 	</longdescription>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:golang:go</remote-id>
 		<remote-id type="github">golang/go</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d0bed6bf8085..fff4c7659380 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 3c1ff55a1014..426eddb318d2 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -13,4 +13,4 @@ DIST mpfr-4.1.0-patch12.patch 6768 BLAKE2B 15ce68eb9941ac5d6544ee18a062cb12026e0
 DIST mpfr-4.1.0-patch13.patch 3344 BLAKE2B 1239cf16dfe32a71bb6fc7b156978cd451bcbe4e1b04842fdb3549352a43607d44d58120e38bf448ffd33e36bab7f7cfd4ab65b2eb3aac2fe9bbd86d8f425f5a SHA512 ddd5f54d12584b6e10fd4eba12b8568c5286dba10bd3b5cdd429415b78bc827bd0ed3957bd06ca4c2c63a2f5e877fd9d86eebade8929d61aafe84ace8454d016
 DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
 EBUILD mpfr-4.1.0_p13-r1.ebuild 2700 BLAKE2B 46afea4da633c055ece8404cfabe6171abb568061a33445a58a961b55a3eb23ed28f08011efc001de2fdccc79c3ab34cc2d798be48928b74d2d1a302b8273cf2 SHA512 2e088ffc2e2343d8ce54b62ff625df579ea9236e31981f893c478f1e2b14e19d3bfa332d98fe9c486793a23acf76b231abf8ada2c1f4e7319bafa9ace3daf2fa
-MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
+MISC metadata.xml 344 BLAKE2B b7a0bcfbcf945ce2b6d58a9a2078c823c12de5ef8261ec009612b58a833deecb7caaf864f0b55e0c46aac004c58feb7a1f88f6d78b584c2e25c403cfb1de96a0 SHA512 8b8b5ae00a4f9ba76c193c5d84f27cce973963f4db109219394efccba3a8e8bebb7f241658a0b682331e34c66ee99332f871d826abf6ec5a4ced4f3dce381fe9
diff --git a/dev-libs/mpfr/metadata.xml b/dev-libs/mpfr/metadata.xml
index e9de1423720b..27009fac6749 100644
--- a/dev-libs/mpfr/metadata.xml
+++ b/dev-libs/mpfr/metadata.xml
@@ -5,4 +5,7 @@
 		<email>toolchain@gentoo.org</email>
 		<name>Gentoo Toolchain Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:mpfr:gnu_mpfr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index b830c05f911a..09461ae02824 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/base_bigstring/Manifest b/dev-ml/base_bigstring/Manifest
index 15dfe1f12219..d2b730578a97 100644
--- a/dev-ml/base_bigstring/Manifest
+++ b/dev-ml/base_bigstring/Manifest
@@ -1,5 +1,5 @@
 DIST base_bigstring-0.14.0.tar.gz 16579 BLAKE2B 4708fc425b9a4fb534b10b3536eca11bfd4ed8374319f9be09aa981d1a2a24433a25b62cb3faae459a0a633a2ebe6c15a28c2c15251f2ec9505c35528715de16 SHA512 d60bfd1989a29e4c1359722d4c0e2ec382c6d4f3c763b9b80980f38b51419bdf9d30bd9f8ca9cfbc33064458415e227c9f4077d9746ffc13cb4cd5ec8e221fc4
 DIST base_bigstring-0.15.0.tar.gz 17266 BLAKE2B f557fd8d46ad33afb89f50f914c76b287b19c8ee33a620c6a1def5379d59dd7f73b531c4077a3c7ce9e2cefbf6f71c7e49b3dd21213c68507bd19b0c90c44bf5 SHA512 d8311312ea1b3dc3a1a30c87ba4984438ca2c81f8da9cbb7f111dd74fb9b16ad8226166ae2fc2b572a989af15099b07294a667646b0ab22130de4406da53230b
-EBUILD base_bigstring-0.14.0.ebuild 570 BLAKE2B 5bf996b482f5a85c15dc979f8508baad3f62dc4221279b14f917c8fc66eaeb23f70eab0759400cb8c4047078d6be4e83496ad280090476e86617335552cb2ed2 SHA512 39db0d55a9ee07a50f01bb482497533926d93d1c1836420cc418bd942f2bd39ab182206859fd0ea2a33f9773cdf3495a3e82eaa584ff2b5eff93c0bbb7c08e88
+EBUILD base_bigstring-0.14.0.ebuild 1001 BLAKE2B bdf7a42226a6d53ee3f05f8ff43b5a1a1651e8eb550a6cb6f3431f62ab14c436c5c2cb9c8ac019e497b0bdb5426c4e8aebb95363b44e13f5a8bb2148dfa2783f SHA512 5293036194feec3af8861c581117740c96e6630d7561c6999a62863818ea37a1c1c4e43966add9d9527f88b2d645ab132c769912a8e4c9656fecb3aba63c96d4
 EBUILD base_bigstring-0.15.0.ebuild 505 BLAKE2B 5145ab4b7aa4be0039f37dbb48438da26c3b7b674292d6d787ed52b13f7a64bee4775ce86f46ad1d9c1f9dfeded44c3ecc8d55acfcdd6d538f001abc52dfcfb8 SHA512 f93c712dc7a991e9952d384e7a9c2eb0c9b6abbf489f3cddd6b5be58f0508e2cdb2805d5a7c8a1f91297c2ab4cd15dec8cff5f4cf02c065d53ba84a9788cc141
 MISC metadata.xml 323 BLAKE2B 3729ce1b400ce788ad528fc85ab4c404b3a02a35051f1d73059878ca255fccdbca77cecc62dd1f1172452c4879b5dfa633acc4e5cfdfa3275f7fc4eab80db3e1 SHA512 a1f3fde83f77f720641d14178a1711ce34bae7e4de33a40aa26dd2d56042722019bb5f71011a6a516874013fd7925407fbf2f60ace38b006e00bf45b54c75f13
diff --git a/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild b/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
index f6a9882fea4b..e1836a43e908 100644
--- a/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
+++ b/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
@@ -17,7 +17,25 @@ IUSE="+ocamlopt"
 DEPEND="
 	>=dev-lang/ocaml-4.08.0:=[ocamlopt=]
 	dev-ml/base:=
-	dev-ml/ppx_jane:=
+	dev-ml/base_quickcheck:=
+	dev-ml/ppx_bench:=
+	dev-ml/ppx_bin_prot:=
 	=dev-ml/ppx_compare-0.14*:=
+	dev-ml/ppx_custom_printf:=
+	dev-ml/ppx_expect:=
+	dev-ml/ppx_fields_conv:=
+	dev-ml/ppx_fixed_literal:=
+	dev-ml/ppx_jane:=
+	dev-ml/ppx_let:=
+	dev-ml/ppx_module_timer:=
+	dev-ml/ppx_optional:=
+	dev-ml/ppx_pipebang:=
+	dev-ml/ppx_sexp_message:=
+	dev-ml/ppx_sexp_value:=
+	dev-ml/ppx_stable:=
+	dev-ml/ppx_string:=
+	dev-ml/ppx_typerep_conv:=
+	dev-ml/ppx_variants_conv:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest
index d80fc411ba76..2446da0ed0ef 100644
--- a/dev-ml/base_quickcheck/Manifest
+++ b/dev-ml/base_quickcheck/Manifest
@@ -1,7 +1,7 @@
 DIST base_quickcheck-0.14.0.tar.gz 66736 BLAKE2B eeaa92ec0eec4736be911128f46b8e4698034b2cb8afa131b31ee96a6edb5db0f28cfd611c101e4417305ee5a1babc2f869f4690b266218562a8fc50f5830acf SHA512 52333bee2591531665b8f8ad0fac1cdaa607b448d0a33b9b905cf98e00df5a700bf0a4ee3cdf3c06d7fcb2b5190363dd5908cc743b2854af9ce5c8d743e3fd58
 DIST base_quickcheck-0.14.1.tar.gz 66827 BLAKE2B 2a274fc0edab3daf7e3d671f7ea24912ecf273cf2b4cb4ab2bd74171a8848163526f97ed860b44aeaa9f3f3faabb22f4598bf604b33c8401733faa22ca7a3c93 SHA512 5d5a3a070a6903ffdd1e13754721d48a9df164f78bd569d3a18b3fd808354550e4603b76d5e48eaa6a4c4d3433f18bb29888478d640fde9ea004619448c3d7d0
 DIST base_quickcheck-0.15.0.tar.gz 73702 BLAKE2B 0f671b6e48d38ac92b8e5150c1b6f7c4a1326cf12fcf3c14edf7ef376ca1769f8d708755a3b6cfc69a4d74de8d84affbc14838fc9385f487f2053936f1f116fa SHA512 e5362d70469c085239efaabbca6ca2558cb1609dfd2c3715d5c31047c8ae34b8304b9d28636806305f226929b0f9e3518b409de08f42f389963378f2aee6b351
-EBUILD base_quickcheck-0.14.0-r1.ebuild 791 BLAKE2B 62e59e6e2141b588c85545e2f06a81aa40449d58f307060d519a821ff87a6e6870cc093f0be8a6eda490edbc9cd820f68e4b3c2b9e6d20e5ff231f368fa89d5a SHA512 47c3f6ce692bd6d3544b25e1108aa5446595216a29f51b586632d697be9e57115b127a26ebd7a4c28fd9330a267efd6f49ae6bf3f748c707ce38953836bd57f7
-EBUILD base_quickcheck-0.14.1-r1.ebuild 778 BLAKE2B a339d559bc1d66f6f65cf0669c5b6b5c6ba84199f530658cb7e7618a14345d937f2174796d52fb3cc02e7077157fa0e32c6c83fc274db9aec33b7f1bc1eeadbd SHA512 c2ce56a2c1e8028b14bb51491a73f6aca4caf40de178e84335b6e5fed0aad3e6af3782315a22209fb004e9a5f62000acbe86439f2a347a7f30da74fb7f5012a5
+EBUILD base_quickcheck-0.14.0-r1.ebuild 810 BLAKE2B a304e470c32c2398c0b192f7a0e855d111080cbd37e9473f885784cbb3f62286fed610c4ac7f4a4c9aeb5bd552b6f838e6a13562e991f77a45ad74376731d27e SHA512 da77414509e79c78719cd15a1a04119fe26904eee3ed1ed4dac10f039973f91add34e5c50c1496f45bd7a85d256f8f22e69c3e3b0d1849ba6ab4340aa6f386be
+EBUILD base_quickcheck-0.14.1-r2.ebuild 797 BLAKE2B 3dbaffdc1a50fdfd24408b503cc4ffa45caf2d26436f529e40b43ae8e1193d9b6c7767fbb415aaaa71ba321a984288430f1caeac55b939543f6c7c237d330c68 SHA512 02485cd73f239c346e33ccb4c4f34b9e9179355e6808ee0f417feffbd4c3bd3bf583b86be7f21a3f31a21365d320fff08c4b28127070cafa2a3d50aeba3d79c6
 EBUILD base_quickcheck-0.15.0.ebuild 636 BLAKE2B d68a8c4aa0505be44f0440628576f5c20623a13fca7ccfcf363650261b94c04a874b97be418fda5a0b09e85fd31c19322a4810121e90b46a15ecc08075e753a0 SHA512 e0c9ffc2e5af701535fed02a1781fd464f3acc9a3dd24e5ed76dfb714dd6da1bb533b0561d9ea2c45788615fe78d6c703343207d5409e4c2a94e5dd30c4967a7
 MISC metadata.xml 429 BLAKE2B bcecd0f055bdd4431614c5d927d7390f8b7ae6cf26a97c851495694618286a117b9e8e0cb37d3ece84d1f55671ab13dcfcf50d54113f4ce824c4c7e16e9ea1cf SHA512 b94bfb5483d4f9f1d7a0c77fac4b06a5c3ac7bf94b0068e49ab57456c2492218278df28cb66c877d551792f8849e34262be81712b4e32195049673f1ccd96147
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild
index 9b40b75bb28e..2edb781f920b 100644
--- a/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild
@@ -26,5 +26,6 @@ DEPEND="
 	<dev-ml/ppxlib-0.22.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r1.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r2.ebuild
index e7de61345336..13b91a9e745e 100644
--- a/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r1.ebuild
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r2.ebuild
@@ -25,5 +25,6 @@ DEPEND="
 	>=dev-ml/ppxlib-0.22.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_bench/Manifest b/dev-ml/ppx_bench/Manifest
index 9acf5f580190..e0ce5bc65dec 100644
--- a/dev-ml/ppx_bench/Manifest
+++ b/dev-ml/ppx_bench/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_bench-0.14.1.tar.gz 9132 BLAKE2B d8590c0b80bbde553ec28514017df6f5deaf93fc693f3c1f102a0ad1f7e616a9308b51d0fb2535f1f8279ddfb9760bdf6b546acaa06bf6181848b3f93771061d SHA512 f359ebf33b1efe91dad9c844a16a0629cd079423a10da39d093af1e1d3c94872328de9a9272a741bf8f4bca5945556d5bc70a0f8994886a934eb933959c5db63
 DIST ppx_bench-0.15.0.tar.gz 9530 BLAKE2B d001817a4e912f7a9345e94a1f5104d0f1b6c35420892cb5cbf7eb7d9e7130de3406a9c9803b6dce9bd17e300d34a3df3dc5fd87d240637c3e3a8667b3191c87 SHA512 f3ab84c7c820735c429ae2250462226efc61d7099071a91dd9471d2052b807dca57c07661336d7f908e2104c1bc0095512429865b2528749cbc407e314e845df
-EBUILD ppx_bench-0.14.1.ebuild 621 BLAKE2B 78a6cf5ddf0787872f7f9518ff542870f53c2a5f750a65bbab719b8a704f73d7e46e7116beaca75778c3af12c021a019d29c9e6854f7997071b00a344dd5dbc1 SHA512 edce8d06de1780244eba4690cac2bd1018dd39f7db71e973c098bd58fd9713188b4d890547c1e275f6d5968b916cc1cb1f0744d2ccdc472de2d59c82f3beb315
+EBUILD ppx_bench-0.14.1.ebuild 636 BLAKE2B 5393e0021bd6378b54f964a8dfadf8bfc5233f0f352f2996ec7213f44d44752f06ab2ec51cb89d304015a28e2a390f9d077db7c61b714d2fb72eaafcf8626b19 SHA512 f7225df5379c8222b1947eda12a4c7eef7c03200a9223197c939026c6f0e8becc1328ec7db599ac8c9f64e6aa703c7cf056d2de521f30d415f5f9d024f6deb96
 EBUILD ppx_bench-0.15.0.ebuild 515 BLAKE2B f4289cf370c99d55cb999d9e958d8293bcf4444ddb3b514b5711ab9161eb828ad1eb56fe5973e06137e3aef19d9ddcae010c8c863d64194133145f44596e9989 SHA512 c5328a7e4bc5d5230ad3879aa1450ec87b817c91bff180f855d42110e534591c620759455268e3b46784ecc9a9d24c0d39d37fe5798e5781d8730bdf53760e61
 MISC metadata.xml 423 BLAKE2B 1f546cea4e8ab41b622172efc189c72fdbc95a90ca26081651c28faafa0dde9e969c5f224f62e5872e636cb53cee8ddf8489c81b816a2fd8f3b3161957686bf4 SHA512 688bd50cd38d6847f4d6a54a501f23e555213800217ed78918e8ca56639a9d9131081fd93efee8a1953c0029d2dc3e106e445427a7e56b341f36e411486ba283
diff --git a/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild b/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild
index 49dd39a57db3..29bdabd5db75 100644
--- a/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild
+++ b/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild
@@ -17,8 +17,9 @@ IUSE="+ocamlopt"
 DEPEND="
 	>=dev-ml/ppx_inline_test-0.14.1:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/stdio-0.14.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/stdio-0.14.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_bin_prot/Manifest b/dev-ml/ppx_bin_prot/Manifest
index 7f506c632000..376dd6a640b6 100644
--- a/dev-ml/ppx_bin_prot/Manifest
+++ b/dev-ml/ppx_bin_prot/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_bin_prot-0.14.0.tar.gz 36642 BLAKE2B 6a80f574fad5e3ba2bb1adad8e6af86a9bd463ab7ed8976901234694a56f9e17c04ccc74f0bd4a18c75f1a4ccd81848218078bb387f8ff2f5df337c5f2492226 SHA512 7d61624d18fd76daed5a5d60d16ac0a3fd658ef650ee6ae4b65346e96d1718a044deb3ca6fbb63c69176505f64d0d1b6becd8419061cfb69466d45e16964329b
 DIST ppx_bin_prot-0.15.0.tar.gz 37045 BLAKE2B 6ec039c1b18c759a676c1da30f02d70799e93d77dcd530844b2a448e4f2a58fbdf9c88f0d4a802a34070959586e7b9c7b1be1b51de9d29d34ea57fba9c7938cf SHA512 3fdc7e9431458b752d553f093762e3ed3c96af3a789eceeb94895284de961a887e358d137c21da372cadf6c0e6329628f6c698499581f672e0e1913b3274cc14
-EBUILD ppx_bin_prot-0.14.0.ebuild 714 BLAKE2B 98aa4e6038976bd25f1124cdfffef6bca4ef689e7c4e8717a734c5b766ac8f28b042139d57c12060dfe43bd0bacc3caeee0900aadc6caac13703bf5f29ba2d6b SHA512 caee02752d21621a2102bc5d43e41caf2d725dbf4a36fdb09a319ded33bd8915523599ac9110bccfd5027db24770a32bffaa5163ec8477e2c01cd693a71a4cb9
+EBUILD ppx_bin_prot-0.14.0.ebuild 733 BLAKE2B 239464fbcd36aee924dc1134ca377da89c06c48e8e5dc5d480fd898bbdfc27f73a826dd8838eb1a2bd89c5eccb2b0cedd173d6f72299629c375ea918a8e05d26 SHA512 e5dbd5234a292e92a5bf853c40664441d69f130fb089ba12a240be724aee3796a7206ed3fb42c08b1f9829c623c26cb227e994e8af60be197c4cd417c298e351
 EBUILD ppx_bin_prot-0.15.0.ebuild 595 BLAKE2B 5c1c706f605fb6751b719afdbc4a8aa0f3ffffa77cc341de9fa01b0df77aa8ebd0a29d8dd3f309492b58c2d4469f72b6d1c405e85d2199764a25440262aaa09a SHA512 35e3fca50fefc1f0dec7463e1dae3c425a87e4d4b04dffea73331c570c1370b72b2ac12840ed27050a29c002e341e5038f845d98651d0537ea84c23946028575
 MISC metadata.xml 426 BLAKE2B bc7dd48ac95ae6881adece07a325e072c1c6f20e1deccea747255c455df93c66f7395d8e90374d91e6a28e42fba763865b3751fc239b8a0cc92f4df3936faaff SHA512 13e96dbcccebd75d1b17099120226a5639b3d6409ac63fa2ea2b4edadac9acbc052ad1f9e67e972f46d7b52941c855b4036e9fd75b3a51a2a03f6ce636dc0f83
diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
index 41ef683e28d6..09c3fc426cd0 100644
--- a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
+++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	>=dev-ml/ppxlib-0.18.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 	"
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/ppx_fixed_literal/Manifest b/dev-ml/ppx_fixed_literal/Manifest
index f250ad55987d..b60b6c1be877 100644
--- a/dev-ml/ppx_fixed_literal/Manifest
+++ b/dev-ml/ppx_fixed_literal/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_fixed_literal-0.14.0.tar.gz 3643 BLAKE2B 7b84dda448f179e778356c3fd5cfdd1dbcb479e03d4e6a9bbd6d2b47c748d0795c18605a86e13e5680bcf23f383d99513408a441fc1fba188d66dad0bd58e875 SHA512 5e30c5238c20a4b6f164ebe29b5f6d4bc074f03fb62aac30a1d129c4fb466124bb163c45e6cc95ad34385ee2e621cf3a1366d3bd9b224438fc575f862f6f73c2
 DIST ppx_fixed_literal-0.15.0.tar.gz 3655 BLAKE2B 3599a5eea1cc691dd16feda7bb95867ad32976df511d6618e6e655deda4ebb6a6a44f30856e9dca26f7ac878b1beaa8086a5dfc241ed6a354a8d064c7d9bd09a SHA512 3842162928f6a87b39abaea15cbed8c8f59349b20711d6f8af011cd0dec48a75f59e422db6907425203fc98f438dd758a3e8973900844b60cbf47f27bc9ac394
-EBUILD ppx_fixed_literal-0.14.0.ebuild 635 BLAKE2B d3a69daab9065a6cf74673af6b56848efb935472bc32f18063b5f2c8ee9d6c16be7d2a8a6be97c96b1a74192584f544899e70c13789b3490f36f1b2ac9066f3e SHA512 54a0b09f87d22eac4da1e0707062d53670408717c5a43bdf923f9dfdd285f05cb72edf17b4f453b44d9ec0711d40efa34c728ef6b48023399d903f175a7e1882
+EBUILD ppx_fixed_literal-0.14.0.ebuild 650 BLAKE2B 563572aa68ea0a52874bc294e237fae6c151831fc951afc78a346d52f673976fb392e7da4c1ac77e07b94c73a77faf8dce5a8c23e850760cd8179a04f3dc8069 SHA512 c8385cda8f0435e796ea16a508822b7bfce2cb69a4cc4c0afe48dbdf15b220f6f4226975adcae0f79ef9b148e600e009833dc1dce8a51217ffebf0cc1aaef3da
 EBUILD ppx_fixed_literal-0.15.0.ebuild 583 BLAKE2B 9396c6d6670ae047ed531aff492b736681a6de370a1a4c9d3c8b5329b6e3455a8f0dbc7a99f259822c710ad87c2533176c698ea34f48a3b37b85fdf18388d504 SHA512 fb601b9e8724506f380a8bacbeada13b000be8ef93cec2c0461b3e5bf39e8785dc0594a7626265aff7b2daf47aaf637710136ff31992892bb6e1bd73c4dd3814
 MISC metadata.xml 338 BLAKE2B 25aa7007ff99aab5a7777f31df31300c2f11cd158a2bc100498dd6d3a09f8ae8c3c79db89715e2abd8bca55fa846ef01b4a3e3b3321afba6d1628a37125a8a1b SHA512 5fc102d7e9bb6000d9dd8bc027a09af5fc108d057231e6b1fcd9ac0f72ece68e5a6b30463416777e1fb352f2d32aad9c761cddaee31db3eaba90ece756809475
diff --git a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild
index 6fb9d4346e9c..873fd1cc8927 100644
--- a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild
+++ b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild
@@ -18,8 +18,9 @@ DEPEND="
 	>=dev-ml/base-0.14.0:=
 	dev-ml/findlib:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-compiler-libs-0.11.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_let/Manifest b/dev-ml/ppx_let/Manifest
index 49f50a98b65f..31edeb83e500 100644
--- a/dev-ml/ppx_let/Manifest
+++ b/dev-ml/ppx_let/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_let-0.14.0.tar.gz 10822 BLAKE2B c1dc155afb0bc52bb22d65c2c19536d41d53e4cf10d39b70ebadf1cf8cfb37ff1c25d9fcfb48f9421a0c55887acc2c6ce72d531593a61654146d3196fa83499d SHA512 79f2dcf2c76308b5993d1b9dad5c961b816dcc4ae43d856c51c196a67eb21b2f51135762e52d512afa9b45aca30002abbca76036ebcc117464a4823d1c40ed0c
 DIST ppx_let-0.15.0.tar.gz 17400 BLAKE2B 3276944addb1dd01c1f461512452ee2bf32fee0cfc3b3772aa7da2a427786a100b36678539fc7fb2beb98ad0bac3b82071b8ebe5d4e5374c5b8bc57a239488ca SHA512 5a22117407c93755df5fe55feded9d7061a8bf953aecc83d2e04de648aff973b1c380b44a26fa68888e90e7486b91a1c665c033c01e2af456a7de3b0b63775d3
-EBUILD ppx_let-0.14.0.ebuild 599 BLAKE2B 41864c3d3c8ddee67c4b4498c6852a0ce158403748a6919ff4a358ccc6ac6094bf0d6865836edeccd96c9add3ffd422cb16edb1193999e253ca953c53e0a9987 SHA512 600deeeba6fbac4640380934be9022a24a429c61015fe590f3a6c6b258f6e0fbafc7732c9a9dd1663fd088f8adef80178246316a0f9779e68acb5c7983fab171
+EBUILD ppx_let-0.14.0.ebuild 614 BLAKE2B b8eaea758368a049092176e3256df0be4bf7e210a159e3fc8f9822bc87e3985af5d6d7237070cfe606c710956d9e3209405ae5782ac735ec631837fede92b612 SHA512 62264f5614d60af924c8629d787c0a7eec888144200aaef99bc88a2f2a51a787810f5922b68e522efb37324b57f3899c321678c64a7532e278950b894b41ec02
 EBUILD ppx_let-0.15.0.ebuild 566 BLAKE2B 636d386e589aac6a31622d2e75d1a3338a6b69eb98fe3fefedfb8367ff6557bfc84d3c5a01abe49fbfc8585ff92d46b7ffe2003670dcdf8bf1a679a5de522a20 SHA512 ad6f752a10dad2168397384b78fa37c6b5aa030e4e8d63c0a888aa7b6c02cd8422b393c2be0ae6f4788ff05c19bcce4e430ad0c59705a260652fe39215e5221a
 MISC metadata.xml 421 BLAKE2B 3218e22b207916610f692322896619aac5efe3a6426af89496d94a03be826e71e97580c8dd7a9bcc9dcbe8554c803a1c82e3d1177cb1e839bb2edd447d789007 SHA512 127f62efd16a6629dc8a9aae5e48a79cf03a7519f939e31255b79549768cd09904cbbe569159da96754818878b274dfbe5761936802a49b1d37d0de11bc08eac
diff --git a/dev-ml/ppx_let/ppx_let-0.14.0.ebuild b/dev-ml/ppx_let/ppx_let-0.14.0.ebuild
index a1f70cc1d6f0..c3c9d816b27b 100644
--- a/dev-ml/ppx_let/ppx_let-0.14.0.ebuild
+++ b/dev-ml/ppx_let/ppx_let-0.14.0.ebuild
@@ -18,8 +18,9 @@ DEPEND="
 	>=dev-ml/base-0.14.0:=
 	dev-ml/findlib:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-compiler-libs-0.11.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_module_timer/Manifest b/dev-ml/ppx_module_timer/Manifest
index b6fbdadd3797..86a154340ac0 100644
--- a/dev-ml/ppx_module_timer/Manifest
+++ b/dev-ml/ppx_module_timer/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_module_timer-0.14.0.tar.gz 7262 BLAKE2B 6fafc6b4b449071f4a95619d078814b0c3ace3574df46585b72549e5db349ab476124c217f46c6903c7c8a059f779dc62cc8a079eb1ef6b4854646fdabdf04bf SHA512 cd9b6bbd6461b7408a31a0f6ca010a3c755db1f4a22150645c530e7b4a0a4c76a308ad0f8aeddc54914a116f6d74bd738604cfd9d9d255197f9ea18904d715e7
 DIST ppx_module_timer-0.15.0.tar.gz 7242 BLAKE2B 66c2bfbfcfc594ab568dd30cf874fea213fe8d72f23dbd9b56957ba95a8a01bcb8cb8f98ea42b399bad3afdba1c14edb5087a95720c87e22c865538166af4cf6 SHA512 4cd55dce6872cbed1d34c34043500651e605c406747914173584cee1d8f3ff298a75efeb8a4beb7840df76b5d7c7db98d15399d3c4a3a5dca2a11d57339df6de
-EBUILD ppx_module_timer-0.14.0.ebuild 700 BLAKE2B ff6d6c8b391da96fcee6ca32828106c6f84b69c0c7f51c69e96693c9cf0fde7da425240196ddb92199d4c6df4e9350a5529c0cdc9173a6be6abcad73b17ba6cb SHA512 e3ca3926e6c1b0d90aaa95e9c8bf1405afec4bfdea761f3bb0f27fb83f879d3d31d4c919a7e561f0cdbeb3d6ed636989efacbf311d1219db883f393f82d877cc
+EBUILD ppx_module_timer-0.14.0.ebuild 715 BLAKE2B 356a257c57e9c96a0617de02c6456e6775585018c82b1e6ca48038143ad71399cd4d54677873b3c18db5e9a49dd57ef0b07aaaba9cbd665cd58d904f0d8242f0 SHA512 35724b8c078856b6703f2052258b1806157e65cf22861fea2e2597a04847f5037ce8f49a8b3a983461627a5d936467f3aebfa108479988438f21c251f98c2ac3
 EBUILD ppx_module_timer-0.15.0.ebuild 504 BLAKE2B 5aded0fc0b1013c14ae87291f8963bf95e1183e046cd2d7b1acf6f74a1977b80c3c04e8db37c832eaefa4895e271e8db78d8e9d93081219bd0b10e195fe34160 SHA512 60af0ea6211cf6162a56bb41aee4da3add7694a8537e8438ae8ce58485892f58d7401bd4a84dc0578d023d8f8697ad84a34b21a6b10102c4859432b105e03247
 MISC metadata.xml 337 BLAKE2B 640fbe6342dcc1785c158cfa83a47781b61a521b80c927d9c850fa0d02dc14f1d309b7f8df1693eca143bef8920845d3ab5254fe142e29392c11cc9a3b6591ae SHA512 db5073f371a41795a500656cc3b5587488d12a9f53eb03e9b2a67744c76be49f423a1562f756aec3b6924c90cf835cdea73fdfaf08f251a60a62ab49dfe1368d
diff --git a/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild b/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild
index b76f4079b10b..d88e7dcaf0f2 100644
--- a/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild
+++ b/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild
@@ -20,8 +20,9 @@ DEPEND="
 	>=dev-ml/stdio-0.14.0:=
 	>=dev-ml/time_now-0.14.0:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-compiler-libs-0.11.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_optional/Manifest b/dev-ml/ppx_optional/Manifest
index 88278af4a3c0..10355578741c 100644
--- a/dev-ml/ppx_optional/Manifest
+++ b/dev-ml/ppx_optional/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_optional-0.14.0.tar.gz 6090 BLAKE2B 99c5ed7ab6b6c555477eaf468786cc175ff8c8ac4d0c6abb8110637da57396ed599d5c10bd35f3d5ff27a41b00314ca355596e4158c4d792fcb37d547455b90d SHA512 70ed28a974ea1bbcb3fe2e54911e355da54fafd6dff3e74c471126a824c28e9a180777e96e17c4a7a52be4be507fbbc0fa3e92310346dbaf5ab8711845e92e40
 DIST ppx_optional-0.15.0.tar.gz 6090 BLAKE2B 89752ec6175f0334b922689b2f1b47ee078be0eb5f0432b9de18ac966a6e75e4bb36e4f5f4ab4e7be669de5805f2db8e35cf723cbc22e724451d748bf5437553 SHA512 a2cd8390877c9ec256523c796995a5ade2f97f396afe86493ac46ca1bd1fe15264423986f5a27d5b88908b92673305405e508e744335205ff17f6c2b7d7d0809
-EBUILD ppx_optional-0.14.0.ebuild 531 BLAKE2B 5d48636025515f144853b786261d17ba03358694335bfaf279330f1a51f90871d2cdf305e64b928a363d77b3a61ade938a3aad15159b7e672e1a1fb53663066e SHA512 12b695e389ce5a7f29833fcf6230abfdaa5f6ad0d9da59a5069c112c1e1718f66179cd47ff3fd4ea24a8662492d1b904f0dd4fedc4baafad40eb1fd3b69c59e6
+EBUILD ppx_optional-0.14.0.ebuild 548 BLAKE2B bc3ee17937fa1c3060c0ade1fd1348f69c13d3876bec06d09eadf63c0fccac5fb75cd6e7ae0a6621652de6360ee7cb55ba0a7134322057a11667417302a6cbf2 SHA512 60c61bcc1bfa597276d80b1d4728ee415e035245457d1a1dd3eb7cb197d163d7435070addb019f80744643db680c280354798fe25bb7e65733533b995d935643
 EBUILD ppx_optional-0.15.0.ebuild 524 BLAKE2B 6bf49fdaabf722f44ba0488b75162dbb17d74f07ab3cb45336de6c23017a3c618f3f79c51d69dddd66be671aa2325f42c43f8c42df929515bd3d137913ca49ef SHA512 22bfb03fd6fe022b6dcfe4218ffa8cb7ae48a7d8a9e8411d82c68d8ba76a23922a466832f8a39ea5c16dee356f15195c7315383e52cf8b8ab614fb2fbe23455b
 MISC metadata.xml 426 BLAKE2B 9fabba8035f75668823c0cc2df9c5c3dc5d6f74ec409c70fc356d396f46845bccc742aa60260dc2b7c743eaa18bb33b741ccee16c322ca7f3fff343701e51936 SHA512 ca968cc640b2486e5ffb67fdb8c3597843c625391456c6b8fc072dc3a28e77f05de2a37df0eeb9680badc4312f7b67f642fe1fe4e8355215fa814e9e715e7898
diff --git a/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild b/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild
index c2135f01b6e9..fde2b028fbcc 100644
--- a/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild
+++ b/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild
@@ -17,7 +17,8 @@ IUSE="+ocamlopt"
 DEPEND="
 	dev-ml/base:=
 	dev-ml/ppxlib:=
-		dev-ml/ocaml-migrate-parsetree:=
-		dev-ml/result:=
+	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/result:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_message/Manifest b/dev-ml/ppx_sexp_message/Manifest
index 32fb874f305f..92ed413aa8ae 100644
--- a/dev-ml/ppx_sexp_message/Manifest
+++ b/dev-ml/ppx_sexp_message/Manifest
@@ -2,7 +2,7 @@ AUX ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch 1680 BLAKE2B 0e5af99fccc4cbce9ed
 DIST ppx_sexp_message-0.14.0.tar.gz 7738 BLAKE2B a00577faf55b0816991bfe6f11fdc21d9b56893c29e67036483adce56c095cb8a2ee9014f9f0768ab96bbd28fe2f46b262e8a6122cf66ccb2740af7be890db0d SHA512 627f8e52914ef228277ff31a0d2262de823767fa0b510b1a29cbfc754c7cbc84cabe7c94de3e3a72d888d19e23584ebcc46c16997ffd7cdae41378cb44b2bc23
 DIST ppx_sexp_message-0.14.1.tar.gz 7734 BLAKE2B 44eb3af754031c8fc85215d6837de80ddf9c79040e5309f07437f09a4c3985c9f4103d2b8004fc28a9254529adc54e206b17822d55caac84c5efc48751490114 SHA512 4d4644964fe2d99f2b2a433b7d942df1ba64f4229f07a297116a56de09d2567d5a907019ee124a8accb74c46d025a5204ddbbe1c72f12827cf33c10f6f059d1f
 DIST ppx_sexp_message-0.15.0.tar.gz 7772 BLAKE2B 98b763f54cca6a1eb700cc11edfa5a908dd121c7f952628f65b7d9aba7cc081d88bca587c0664c1065f416c6fb9f1eaaed7df818920380e6109f75cd83be811e SHA512 2b671a1fa020c785ffb02b67998653dedcce892ab68fc23665ce8c88534ae9f5e1df2f148e1f9ea965444f4a48d896735e2bdc313db2787101a5aee2e5f9f025
-EBUILD ppx_sexp_message-0.14.0.ebuild 747 BLAKE2B 4ad25e496d87f18314f256add11ee18cd2ad88dfd9a4608a2bf7ab16e4fb97dec9a1fa2da224f2e1038bb96a78ad7b641ed389c900decd876f5352bc3e913240 SHA512 8c8ee4543998d59e0dec6cc9c06cb77991b00a0586d22fabcfc7ec91ed3f6a2c77aa2462ee8b31fb9dd89c2d6569febd4529f47d9c0ab5dc37a1342d38ab3b6d
-EBUILD ppx_sexp_message-0.14.1.ebuild 703 BLAKE2B 4a6c117a958c544645fc85c34b7f8d7d0166917e2e420859a996ed2058dd8aaca11e47b5cae4768ee3df8b938d2be8d7118cf47b302adcee055b01114f694ed5 SHA512 8bba890ece908feb0106de8ba205242c5309b22520bc37d16f5ce3100f5b2f66a08a1e8350a173c7205304572ec533632c91333f620bd76a2214ddefc54f0386
+EBUILD ppx_sexp_message-0.14.0.ebuild 762 BLAKE2B 7b9685e172165c7de18b76f2d3707897ac9e02f5cdd4f5698eb1d4b86f263e403bd90b50df9caa55690605b615888cb03e00a8f0d95c07bf745ee6378b1ac0f2 SHA512 9f97eee48929478700a35552a44ca8d532b3ca09775b995d4c9195385fdb1c90352754534c6e6e2f14346f6a7cb9e143468876cf7e44618caa0be84c14480853
+EBUILD ppx_sexp_message-0.14.1-r1.ebuild 722 BLAKE2B af67dc51a5e6bc3525371ca196d4f99c2574d99138f70e311dba075429a5229c7a24f703bb6d4eea272a01d11208ecc54a7072d2f236005cb6feff03bd4c94c1 SHA512 f6dd7f8c94be9b7b5f2f815c552a034d34c227caa41c97eceded04d78acbab07d9d59076cb110c09e1ec37b01a696820bfdd9627710271da8dcc59c558875232
 EBUILD ppx_sexp_message-0.15.0.ebuild 540 BLAKE2B a1ac8b2b55fed3fb05a7813f8855ca0e1cf70229cadd3281e711ad262dad636aebe5e4d893fe869533d360898a6195fbd724350e60baa59c21485f81cb8176ea SHA512 266344b2ceaebc28c64fd70e85c6649f21c3f5ac18ade51e51b8874a668bae33f2b28fa261dea054c6ce2622690fe0ff49efbd4206d2e2ccd91ad2ae2adf3d6b
 MISC metadata.xml 430 BLAKE2B 9905f37da1f2c2a896de913f78a70cdf1ecaddcbe27ac8da012831229d400a6251acabb102337c4ee8c9b36b85865057df8d65ce89e4b65925cd4f0b718a7f53 SHA512 13bda4043722afaecf33fa5f3789d0e8b52aa6f29fb02d07c96d3b7fafcef5a50b1e1ba57ca984a6e54bf78f5c7cec95e5192b3898994d4ddddb8246458401ed
diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
index 4f454b18f7f4..4a57b981ed48 100644
--- a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
+++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
@@ -20,9 +20,10 @@ DEPEND="
 	>=dev-ml/ppx_here-0.14.0:=
 	>=dev-ml/ppx_sexp_conv-0.14.0:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-compiler-libs-0.11.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.1.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.1-r1.ebuild
index 273b3948c5c0..6893ad882026 100644
--- a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.1.ebuild
+++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.1-r1.ebuild
@@ -23,5 +23,6 @@ DEPEND="
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_value/Manifest b/dev-ml/ppx_sexp_value/Manifest
index af01fab1148f..d4d5d43ca033 100644
--- a/dev-ml/ppx_sexp_value/Manifest
+++ b/dev-ml/ppx_sexp_value/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_sexp_value-0.14.0.tar.gz 7740 BLAKE2B f495d0b9032a73cd6a62292185e77cfe6206bb06564e663c04a20c9430dd4188da529bef6428a7a07309109ec7fc51d3909ac58d5760c1fab618f59eee8a6b63 SHA512 d33ed503025e07588a21ca6796004dd53ddfb9f67f3527d066c4767734fb8723d0a9d31082d285ba82996d8b69faecb624f116046ea8048637f05773ee3e89a8
 DIST ppx_sexp_value-0.15.0.tar.gz 7839 BLAKE2B 72ac20f7bae60979f2b90c2103773549af655fff9c291d8f0afbfb773495ea2e387ce8149e782fd87db484ea882b9a35347a80472f37d9d1ab6f26bbff845db3 SHA512 b6eb67114c8d63b7eeeb63c5ce1c043a4c8879bd6502733449b3b1d665d345c9685ffefc0f8b0a3203b31e169f238f7decc882e72b0436601d1461e86b0f5d03
-EBUILD ppx_sexp_value-0.14.0.ebuild 663 BLAKE2B 08eb4a05cafb4cfd5e408bc0b516b5741311d84609b5acbd65e18a2e385f636551f6f8fb8444873b4acac86285eecb2d695ba72ae96f541c2d7151ff50ba3ba0 SHA512 063ede7b5620774616ea1f63fc27201f564904be1e8f9d3af404b4881633e36a1337c53a129cca1aa84b2430ea2d8cf664a304cd3b361c37e511075abb7f7f75
+EBUILD ppx_sexp_value-0.14.0.ebuild 678 BLAKE2B b3137693608f525ca6fa7e3c26e5bdc918f91539f19ae348491cb7f17498a1194f3d4be3dd3f483ebb78a0b2106eb6cfd46bbb18640aee869ca68bd94715e587 SHA512 283764c18ef9570737f351ab461f8303969e897627262235c4285b4835045d4d65129eb5eeec538b4bf05c030896b8b4cb5c25281059324935a724dc50ba76f9
 EBUILD ppx_sexp_value-0.15.0.ebuild 519 BLAKE2B 4f5e833e22a66acaae7a774c96713684229e350dc257c6b494cf3eb88ae11b3e04415f22b1f67397c09b77ac09aebb7ffb3f1718529431b0e6d4f9a20188a841 SHA512 5063d21048e70424c17a22b6b70b5633fbca1a6b65d5c35e1357d1fff730bc55800f3eaaf7f5cdc9f83f554dac40723feabea477ebc686e82a4c0cdcf22e5d18
 MISC metadata.xml 428 BLAKE2B adb77f08aa347d6fbd80d03652fc17993977b12b4f9f75d83aca93ca4f7a5299043866b83fc484bfdfa8474f616458d8e3b0020ee8b619b4c626a3a1a28cc2aa SHA512 cb6cb7d9e8e6cb112b3844544b55edc99cafdf6e263bf4616072ff17aac37fda15613c8194d8e5a5b42c591d54b5791ed6c185c8b0e7f1b612d9c99c5d13ea5c
diff --git a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
index f0cfc2381a22..d69e19265924 100644
--- a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
+++ b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
@@ -19,8 +19,9 @@ DEPEND="
 	>=dev-ml/ppx_here-0.14.0:=
 	>=dev-ml/ppx_sexp_conv-0.14.0:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-compiler-libs-0.11.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_stable/Manifest b/dev-ml/ppx_stable/Manifest
index 253630caad60..902c296cdb10 100644
--- a/dev-ml/ppx_stable/Manifest
+++ b/dev-ml/ppx_stable/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_stable-0.14.1.tar.gz 12031 BLAKE2B 837a53206d3a8d651d53f665daebbcfde3a1b5d55f1ed13d3ac8feecbd9ba0fb24ad7bb1cf24a0bfa00a41a46c3ef0f84385bc8792685f42ef18facf88ce348f SHA512 1c99a61537a2ce7d40208c64efbf71c54726b228d3746f2afaf9e813b3fed9c8016bb2eb859be24993c7c922a34f574e1028db8e7ee922d4772336dc0496df74
 DIST ppx_stable-0.15.0.tar.gz 18143 BLAKE2B cfd317f98c7683bd2faf29eb386939f07b30798f16e43abdfe9361f9f3d373d4b64ed13aa87f300e5f14052ad1bc636d402af84c9f15d9e26d7b2dc976c812af SHA512 1be50f061d55ea0fcb8bd846955da3ceb07b97986d74a06b41c0f6b5c0dfb3a55f9e39e47f64ae227ecce89dd31dc3b03082031748982419d4ce9a14b5cdb436
-EBUILD ppx_stable-0.14.1.ebuild 591 BLAKE2B 41ba707767d4fbc0482bb78666489d34583de4bf0af4f2591cf9876d0181ac022a06adccca4cdded1fc22aa8e14de1f02a631af32404762c03207caf1c8213f4 SHA512 3eb936d5315aa00e1e82d7720dba0aebe28d4884d8a3fa19f203da0b23880b1c0ee86780698d5aae00658b09111165aa39f43e82804b85646bbf00d9877e905f
+EBUILD ppx_stable-0.14.1.ebuild 606 BLAKE2B 9a37f7b5cda5bf05b9517823575ab9f403dcded17d8f52e87060ebb6b4fcca7042ca10b349d90a308cc6e39d412df8df748c711fac02d8c9b3a8176d475e69c2 SHA512 c7bb5ae253f5521358faf6300282e4fbd37824054db3d5bdf8d90150c50ed9a8f59e9427b0703d8928727b2ec99fcd22d559dd67b47d556ff7af32a8b163b12a
 EBUILD ppx_stable-0.15.0.ebuild 539 BLAKE2B 1fbbe18c5d519c4b99f243029a7e0785d5ebbd02043edb6762a830ca2f3a8efd6424c371b5d1d1952bcc8d1135c716b9f4981226b4089745bd7b208a77a061be SHA512 43acd087d12da6258a706bb042d5b18a4664a300e3cb3939d7e5fcc0b80e375b5fa3f9ad2ed0954c5a390b8647081a28f2f21c5c89e22e2abba6a37e1115948b
 MISC metadata.xml 331 BLAKE2B 2638c7e2cf93f90420a27d3ae184e99b82951e323f8834eb381d0a78d188bc0b2436b23136f92dfd260c8cbc6c9f6852afdc29e38ed2e361abc97e224b7dca6c SHA512 ae92eb190a1570c33f60f4c382d8df3a150f8a24bb0deec0c88a3581209080dfe4e8a74514e09e261b14c137e25910ef3e3987abdf2e80dd1a5587ce4a331df2
diff --git a/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild b/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild
index 711ba43ee52c..db88c196e937 100644
--- a/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild
+++ b/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild
@@ -17,8 +17,9 @@ IUSE="+ocamlopt"
 DEPEND="
 	>=dev-ml/base-0.14.0:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-compiler-libs-0.11.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_string/Manifest b/dev-ml/ppx_string/Manifest
index 73e4bff0073e..3e3388f9e5e1 100644
--- a/dev-ml/ppx_string/Manifest
+++ b/dev-ml/ppx_string/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_string-0.14.1.tar.gz 4807 BLAKE2B 2ce5cf2d5dd913f05e66c24ea5be2ce4a56c59b7e5faecf003a573274bfaef3834935276e110fba1d0af3a3ef9d6ca730622dc780ab6063945a01aa3d6900a43 SHA512 2b570ca3d248f89ee1903e6ea40fbcd9c5c72809ff1f42dc67e9d41f6c297465ae47ffdbeda9f263dddf14c9c460bbbdee01243cef838d0ec49493c3b5644aee
 DIST ppx_string-0.15.0.tar.gz 6071 BLAKE2B 06e4761732db5aa5ee0214c68ac8ff95a85a38e6d62abaa45cc630d19036b0ed38ec0198a45871068d8bcc4f40176ac072da67e8f339cef3be3d64ace7a22e69 SHA512 bb1819017a6c25d581854e8487a0e5535fe282ec421c91e662c310c0d0aa7704be65484b3f2e721b29409e0eb68f72528e60380e036af066b3b1f1f11ea6cd5e
-EBUILD ppx_string-0.14.1.ebuild 660 BLAKE2B 757f4b94b9dd7321a75bd0be9cf40cfd7bff44b880cb8e6d078c46d1054ddfaf4c2c9a3069f608a54a12450d87cd153e8e3de2f1c0d548c6eabdb101c832d188 SHA512 9ff0e04e84ccb424067eb5bbdb0115b1be6172b20f5bad249dc23ada29ef1379afd12c1ce9aafa53f5b14485fb20dbdca7282aa9e7846de4e5b52fc4ed62e671
+EBUILD ppx_string-0.14.1.ebuild 675 BLAKE2B 9695ec5c36068ab29ba12283604fb9607354940da97d00a5cb5f889e8f4b2521a88d1d41f48b702d7010eb35d12ccd75ea12bf7a37e8391180180c176a891352 SHA512 e412b9a1a39fc8ae807ad422c1c32928388d6ad57b30126f5ed00c18e337421ed10b9e03f02adb58118d8b70a815049cafa90f49f3f0830ba567cf26f96a222b
 EBUILD ppx_string-0.15.0.ebuild 516 BLAKE2B 74f242c749802bdb553c81e88e70aacb21ebae212108108f0a37fc17b7f1445c5989c1883245558fd278d0cf39f5d4cf0e21caca8ca1ba1ae1350344fa9b74ac SHA512 9e6a4eedbd12de4a5bbf0e1f3e4c4354130233b472eb41132ff4cdfc188f0ed12d38b6490a50b8b940c8e6e1f9b74fc270ac03cfe51c13037ed95a2675b82cc3
 MISC metadata.xml 331 BLAKE2B 1d60a54e1b3bc26c9ad6e497cb396a105c8eb00a1b05b7ef59e71674fcfdb3241172e487bfa654ff01e2fcdea6d9d29d1de858dec78885821518e55ae8aeae65 SHA512 436694c8e8f66f48b52b1997d94f7224ebb2805e04aa81b908d0505b54e9c3f1590c4d91d99c1fb73c7991bd74327f9e3ddb217d9b7ea3b95d620757bffbd915
diff --git a/dev-ml/ppx_string/ppx_string-0.14.1.ebuild b/dev-ml/ppx_string/ppx_string-0.14.1.ebuild
index 916db55cc6c2..2538526368d1 100644
--- a/dev-ml/ppx_string/ppx_string-0.14.1.ebuild
+++ b/dev-ml/ppx_string/ppx_string-0.14.1.ebuild
@@ -18,9 +18,10 @@ DEPEND="
 	>=dev-ml/base-0.14.0:=
 	>=dev-ml/ppx_base-0.14.0:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-compiler-libs-0.11.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 	>=dev-ml/stdio-0.14.0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
index e98c9df2919d..cba86b1b7d86 100644
--- a/dev-ml/ppx_typerep_conv/Manifest
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -1,7 +1,7 @@
 DIST ppx_typerep_conv-0.14.1.tar.gz 9453 BLAKE2B 4acafdd51df0659746697283aa3240f1b1403e4e9f9b5fafa6c4b09f4c76f6ac645e2ccab53cba7371b5b004edba38d24198334d10b295d90c8ba5814a602a23 SHA512 6e32f6c2cf6c370fcb8d3b341dbd797c3b7c2557c8604253d744b266c9a3f4984e62ffe6ec5717044378f81e5b78e7f206a7f0f4b43c0dda97a4e7ece745d26d
 DIST ppx_typerep_conv-0.14.2.tar.gz 9474 BLAKE2B 7a7ff6669d9af2ced905e5b104058d26ffe06e3784af366a1a4ce753337eeb87c9bfe02d1a6fddaac6c387105d2583194cbd06b915eb35d16e06b1d4ab977e2f SHA512 9372f13cb3f62b3732af4f8ddc00314dd71869bab5599ae0a112d32669de300346781b7fcd2bd649ccedfde54fcd86fb6186812eeb528858048bcd9d5ad443dd
 DIST ppx_typerep_conv-0.15.0.tar.gz 9392 BLAKE2B 3f7d9ac373048434ea55deab18b25bd74da77116b20db841c412c3304f318a1b820708c3f9cb6eab1f92fda399d3e6168fc8b3cc0546501f4fc6b57da5f74414 SHA512 3f5bb2c70674e5f6219daa883fe948023a60558c9560c5d8e6b187e0420adf8767ce4f5cca06fe7edccd52e531b2e79d962f7fdc7502cb63280c364627621c73
-EBUILD ppx_typerep_conv-0.14.1-r1.ebuild 654 BLAKE2B 994237337affb6ee6e48ce03a683a2cb2bed92bac57d44fece10bb1a474845a99dee03a56901d6f29aea3fea0476ed8a2b0ea038238fbae4895c3b8b57f1af71 SHA512 f501ee6f9a98f99cc387e3277fc899ff004ba6f04195a0d13a449699af82a3b97738bb0f0c7109bcd583b476bbf3b9d555073f3bc5180d42c644f2445b27445d
-EBUILD ppx_typerep_conv-0.14.2.ebuild 636 BLAKE2B 7bf467d5b59075a17734470c8ac83a1c7d9716e22651b18da852a1c060c8cf868754dc48ae2a907635bfc666f21ca61e7d61fefb67dcb79b978f0190059534c0 SHA512 9ebdb3f927c1c4c7cf2ef161608073b894f05b5ef4fbb4ff52d8c2903b4a3c38f0648434a9462334008489aa1967c7eba8f4c3092188b7fd2436f04d90f2edc3
+EBUILD ppx_typerep_conv-0.14.1-r1.ebuild 673 BLAKE2B f5941755ad27b1e2fab3022501133d2660f712f8de6e459dc954fbf35d83ea702683779effd0125058d01df00f6bd4b221c7a20862489ea55b06cf17645e1c51 SHA512 757c2973bdedde54f43148b9bab8f06e22747333079e69dff4b6714742517cf13ee93fe5cf7984960c28facd6427d54fcd27f5653371d0e72b0f7c16dab7575e
+EBUILD ppx_typerep_conv-0.14.2.ebuild 655 BLAKE2B 296353eb65f47d1c5d568b0128d900870203566787f0bea0e696922814bf5fdfa682242547b48a98b0ce5ebfe63d95ce04b0efcb3ec54f4f4232f79a49fce89a SHA512 cf516d4bbe3e9406a9744e68182b3e77c5886a3c5d3918919a52d1c692d07593f4f80d27ecc9da430b0a732c6efde77551dd91ed7ee8efc089c4679c9aa03cbc
 EBUILD ppx_typerep_conv-0.15.0.ebuild 564 BLAKE2B 81a05cfe65816dc128596573ce6316de4c36b53427dfbc583d4d5326897aa3e0de5ed836ad8cd61ec369bca245934c3f36b1d164274f9d6eff0953711328d314 SHA512 6ebc3227c075d41a2bc6265bc7ea71c09ef6e8818a09ca1dafaf7fd51e0d5d2a22165ae221c0dc78f747adb308a1e85f6af308e716711197308b1bababd04c5c
 MISC metadata.xml 430 BLAKE2B 1f8c9b9c75af8dde9e6180ce99665d6504abf4d86eda54e7104ba92c69bfd32d95ba21aa8292aa038d6827c5f73fc4e2cd6b3294ba6984b5931f5e1d29e3d2c7 SHA512 0f0f1ae7a2cecd2eb6544a8219bfd19d8e5ac638d68753ab64b34f8759e1a71d51ee9a74dc7e28b37d8ff749a131c5f701aa7ec18644aa65d99df5a3cac73d3f
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild
index 288b817a674b..0df0cc4ce894 100644
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild
@@ -22,5 +22,6 @@ DEPEND="
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
index 5928e17db8ae..3162827ca211 100644
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
@@ -21,5 +21,6 @@ DEPEND="
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_variants_conv/Manifest b/dev-ml/ppx_variants_conv/Manifest
index 34a85ec0a8a8..6fffdd4ad125 100644
--- a/dev-ml/ppx_variants_conv/Manifest
+++ b/dev-ml/ppx_variants_conv/Manifest
@@ -2,8 +2,8 @@ AUX ppx_variants_conv-0.14.1-ppxlib-0.23-compatibility.patch 983 BLAKE2B bbc00d0
 DIST ppx_variants_conv-0.14.1.tar.gz 9640 BLAKE2B a73241a8dfc1cf41d2ad184f7e321484525794e66a1e881c822616aca6f8d221e9e699464716410a71ae3cbd542eef6315e0d183447e5e0e49bdb02935876375 SHA512 2ee21751de1595e56b151d87413554af5c0aaf92053ddd2834cadea812f1f59fcd078f6f4a9e9894eca9ffbf211ed2de996df065534c84256dc9670ee8fcbed5
 DIST ppx_variants_conv-0.14.2.tar.gz 9626 BLAKE2B 1effb717e72237ec5522034d5885e6f2919eb80d16266b14cb4c2b9bf6b2d6e8792f3a8232130de7a1b6c51233add4984add36f8da74dd526d9e3cbbe0f14cd7 SHA512 1ae714bea76ba4856c5ab1a7266b28f0ca4462dea26afefe6953eae1ac683f98748cb6281155cc89380d25c81311f78afa6f44e39413fafa63bf043623538a48
 DIST ppx_variants_conv-0.15.0.tar.gz 10530 BLAKE2B 5947ce3056639ae54f7fb7aea16f1657997ef631f4544baae849023b3d9cc29c8711cc3913e3583b58db99afea793d4cfe13c189e3f0ca44e5ddb0e9515a0507 SHA512 549b8d7af75cb98bc6cfe3bc53d43a9bee5c767de149905faf76c0a97c5be86d14d784377805c3932423d4dc698375edbd52f1cf508a4d0f3ea8e79f7e284224
-EBUILD ppx_variants_conv-0.14.1-r1.ebuild 739 BLAKE2B 6cfd302aca4698039f5bcba86d5f608ee5e147623f2d943ae4d417ab3ecb3ad90a44d8cffec76fe0e4154158f81d3e58d55b2e6636edb78e536c0a1d173d0909 SHA512 41a6d2deebe1979f02edcb3c401dbb09c5b047168f8a35a765c7fc15df17ec01a5ec8e54f239de1406b992721dab2afd44bfc902437d9e580325682a87521116
-EBUILD ppx_variants_conv-0.14.1.ebuild 665 BLAKE2B 92e5849f7a25b790540c4bb2633bbb110ab89aa6f247e6228518b581b063debae8e21eb92c856b5a23d646c8b319480c2adf46f574e56a904b2c4075fa5e78fe SHA512 edab590477d7319cef1b7b954ac22c62a3cea7b56969cdb901a57ecbf38494c3de3cc6be1bbe04029b0af437fa64b3481b4a9780e5c8e9af6c228cd0c93dc15d
-EBUILD ppx_variants_conv-0.14.2.ebuild 673 BLAKE2B e47d87fbe738a4f7dc6466f1d2bb554ae7175d3a46fa90078b9b39983dfa25ce567ff52e44e77719286698037ab8578c14afbbfc27d2b91581f34a7c1ae365f7 SHA512 7a53d40590089f36a35c0c0c70e579d8359455acc9ffc922354ca01ab70ab5abca7f32f82b4118e784a59da2cf262c990d5caaff0675c9bbe2b1c4e2515f0d56
+EBUILD ppx_variants_conv-0.14.1-r2.ebuild 758 BLAKE2B 5ebf81aa63cba68579023bb9e5e53e8b6397b32106b25b8c435f6d7e398a5c443311063f30e608e1a64ce710e7848cc4bf4e1bda081c475e0942097ab8ec9209 SHA512 dd520e69a03f3016bc7398d05311619d650d564c3b05725a6ae8c87900789509b95ee03a4ceb95a8b5234caa0a3f3cac3c108de638e94cd6ab4bf68edf5ed723
+EBUILD ppx_variants_conv-0.14.1.ebuild 680 BLAKE2B bf34ab8896761a334ee543c83e3ab04e7851b59b608924bb7fb10d44e12e8b351da093d15cb6071e992237641366fdc22f8db1e5cd00de0a591728e85b5a0b5b SHA512 8a36a802de55ba3ef6329506295d2fafb35f4376df63070731418086a94235982aa3c0f688a11029453e13b6eb9967f449779f276170bd0c9f7b19f7d9d4845b
+EBUILD ppx_variants_conv-0.14.2-r1.ebuild 692 BLAKE2B 10b77e795cce83c20a0fc7072a25bc38a27ec91dc3c330d2c35395f29e0367a62cc79c8f2932ea6af98319f91ecbc2f03c5c3468db94c8144626f18a439a11a5 SHA512 fd498d576f831ba09f16cef1f0684b65d8881c618a97128c8252cbd4f7e09da67e321b51a7773e1babcdefff2a7563b29ace9bfecf0fe20c4a0380aa004a17d8
 EBUILD ppx_variants_conv-0.15.0.ebuild 596 BLAKE2B a435c66eff0e7207bd700cf63d9962bd944eca5d41224d9ef970d4170a6614f3cb65df4b1c13cff5c1181d7f181abe60a5537149471a3531cf1858a4803609e3 SHA512 0b866c522f183a649034c4faf3d2310f113cbe891389def3aa2af0b251a3a1468852cbd74abcde77b04470ff9690cd77b9c543b8566d6181c1f616f0eca1db96
 MISC metadata.xml 431 BLAKE2B 83c405af5f5545235e34f693d30cb519fc076516c1ce567589f1b4944c67df76cc959370b65fecba7b5be8fd9cc17fab164ee4886be1a760af3b7d65c7678af6 SHA512 21e04b3f4d77d63737123d349a57917a99a57b927d83a3020cb2b9455ff9a3bd3d53f11a4bc8a20a0ad7494484f393df1ab0c14ae39ca85e2558cb91296fbe8c
diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r1.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r2.ebuild
index 8915cf1f56d1..71698f6d63b8 100644
--- a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r1.ebuild
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,6 +21,7 @@ DEPEND="
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
index 885558db88cb..9b11db646f6b 100644
--- a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
@@ -18,8 +18,9 @@ DEPEND="
 	>=dev-ml/base-0.14.0:=
 	>=dev-ml/variantslib-0.14.0:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-compiler-libs-0.11.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.2.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.2-r1.ebuild
index 83ae31926ca9..68cb649a48fe 100644
--- a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.2-r1.ebuild
@@ -21,5 +21,6 @@ DEPEND="
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8e78ea3752a5..5e59cc138c3c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index e9cea12718f3..0ebcbfea6077 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,3 +1,3 @@
 DIST python-rsa-version-4.9.gh.tar.gz 59238 BLAKE2B 077679131fcd29a0f396ad9db45db9a6891be45afe96a328f66191d747f10d36a3248b0929d5c8270ff32a39d08a9c15d80973ba3af83f7368e792cf003f186a SHA512 0b49c1e5ffb6235ccb9e34c81ad717276c04956e21dd54c08b5cae7dd28ecc115235b2793c8bfc2fbb46a260e574d35cab23729567efeee108b79544793e60ad
 EBUILD rsa-4.9.ebuild 767 BLAKE2B 5181c8381bfba94610bd72f4ddfebcbd593cafcc98f60f3d57f6efff757b7e51935e8501f41da60d6f2b4521a2cbbe60707e9f0fd6721ed22cb2eacce94890a3 SHA512 89fc7151041c3524914bc56b69cf18a5706c3d60f17326b3ca62d3eb4923cec942a236d64ade37a79a3395a7cc4c5fe6ed46c7a1d73fa7ab698d911ca8e7edf3
-MISC metadata.xml 407 BLAKE2B 11c7f12e753a502ea5b508e0ca88f824819c3a2dbfbaec31532fbbe9bfdbda5c75ad853b14945a3f5baa4b1eb01a0c9526d3957eed0a573bd63ac792b93bc5da SHA512 df4960d9d61726ae45490adc1d682780539bf7f053a6db9af97e453261f1866a3e8ccb956c5c769b115e90ef3c336654a85114eac1b1256dab95fed7bdb88961
+MISC metadata.xml 463 BLAKE2B 79c674f37808820e4b946f0686545ebc2cdc2358934681a9f0d4cd300716a7bf0f0477c4c9af5ae4e054ef3f25cb4b115609f5f867cb8d4182120e8bd7cbee1a SHA512 07344efe5f1f670fa6e20ffa2308cd80376f9dc990d720f681d79a93c404490bbad319a0f9636bb0d7fea30167b9d139f2dd11b367c8a79b0a3d12ed8d1be8f7
diff --git a/dev-python/rsa/metadata.xml b/dev-python/rsa/metadata.xml
index 6ed96a28b558..c4ede2ebcb97 100644
--- a/dev-python/rsa/metadata.xml
+++ b/dev-python/rsa/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
+    <remote-id type="cpe">cpe:/a:python:rsa</remote-id>
     <remote-id type="pypi">rsa</remote-id>
     <remote-id type="github">sybrenstuvel/python-rsa</remote-id>
   </upstream>
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 96788ec5adaf..40c3a35d825a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index abb25bb9eb69..3ccadc560708 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -1,11 +1,8 @@
-DIST github-cli-2.11.3-deps.tar.xz 76137064 BLAKE2B 6b8a224f8e0b05c32c8be83b4f5a0b05febb44b230c06ce0d14dfb5a814faf0361d24f32a5feb1ec348e9b80dd35635249bdf1febf6cd6202ba5ea1e3e6a3168 SHA512 f72909be8798a7efed8cb2ee2c37f51216056901fd285b4e2c894ebfc2f08194b99d846f2f0080da4c1c3359b47e36f7eece11b4bec93485da5330ad38c073f1
-DIST github-cli-2.11.3.tar.gz 716386 BLAKE2B dcb07cda11e03ffe75a9ec2fcb0ed33c1f2c6bb7599ed1b47ee9e1e0df609fa21ae2dd043be417cfee75dcb3686290f510c0fdffc0b1df08f816ab2ac79d940b SHA512 952cd7c2a327c7169e201a4aa7c26a0e5c09a1ecef51b8d7c620fa9a849c2e8cc61447333f785851487a68d058b869e10bb290188594bd2fb00b0384297bdfd8
-DIST github-cli-2.12.1-deps.tar.xz 76485020 BLAKE2B c2d7e31a2fba9c34fc75c8d8f6836accbd2029b8f6be51c4ffda3d96ec06b9f331700573ac8478550676ed9385b8bc34ffa02a81d91aec3bde4bece0addae668 SHA512 1aa684d5aad6c5da45d4e0d8fe2c282a563890d7f48260668b393b0e93674b5c75862a84c421c8600c92d09ebfe655baaa42e3e7a4dc2f7a0792384ea555b2fc
-DIST github-cli-2.12.1.tar.gz 717685 BLAKE2B b9782846185b8fd5295651cfdd082b987555edd0c3ae2ef7e0d69e100f331ea89e5ae9b8824af013f008677df2a0e8313b52cd7e0d95110884a62eb9e6e5c32e SHA512 508f02cfb12bec485a6123bf04056e879832a762d7563c73d1f006f4c382cad75cfb73ae74f66f9ed90b0cfd68956434f2100bab1dd7c93ec6d0d7b3a9d2c13f
 DIST github-cli-2.14.3-deps.tar.xz 77143036 BLAKE2B 7f06905270a7c9b17bbe8a83353c57da84cb365283fbb4bc488f2ce8873de79494adcf9d34aacd057d7610c3a68107f7fa19fcf74e885025a5e9f44ba49890a0 SHA512 da2b7d57160d22645b491fa8ffc93148c096a10b65aa9d4d4b8b4b1837460f3c5296d704e6f4fa0fd709d3f7c590cdf39c4c637c38b255c8b389ef106c35fb90
 DIST github-cli-2.14.3.tar.gz 716098 BLAKE2B 7b45f97859501be4e639584e287d2114b9ed87402d3f35cc56eebdef8bf2b3cf8b9ecff633cf44a822edf20a5000c38a5b1c38822b0bf670d6c4c9c4e5e1a052 SHA512 460f3c053c1f0bea458f7a891f2b1a4cbd68b754bc165e3b097215748fc220f96138cf010608092702c86403d4551b288faba4349a69ae0e92b93ef4564825b5
-EBUILD github-cli-2.11.3.ebuild 1624 BLAKE2B 8b7de36ee128f9873dca1923cc771036753b5ecd75de1b5e5a012e0fc25a79d4d866a5e113f86fd4d8ae04b7899c6709b200628950746635a4daa9789380cf7a SHA512 43f1b208a78258c22783d370e5133baf484402f2c7edfec2bfa90f81ceaf3e9ddbe19feeadbed523a63cd499bb80d29969d1c42cdefcf733951ac56b8057986e
-EBUILD github-cli-2.12.1.ebuild 1624 BLAKE2B f402ae15556c62bceac735cfed5691e0b4eaaea716f07b3e00b35c5190fa35613438c1a57024863b0cfae1fc1718219e83b183d5c426fc350733c94dd143db75 SHA512 e32dfb4c32a912da7ff5b10b752573408bd980fbe5318639fb36beff23830a2204ad1c743aea5377a140bff35bddefecc1080b38af8b8aa15258fd52096a2ae0
+DIST github-cli-2.18.0-deps.tar.xz 98885904 BLAKE2B 2ba1252ca1ddab0e0dda6dbbd6b262d19a701b6cb2a82420a29da5b08dab4369671f40adcdfb34760344d4d220bd91263cdefd7d57b92ce5770b2e682c6e4b44 SHA512 e9b1f87d4ec1c1e9d689df87c8a5d30180b0d60e074e292d262d0f204dc921bf09f13df8589892dccfde9ffd5579bd9c1c83169e36f6dc25b23ba3bfb2aa01be
+DIST github-cli-2.18.0.tar.gz 738480 BLAKE2B c56adae59ddbfa6693dff569c265db615e9609f7fee9942c349cb202d64f44ea1e2cccdb89632e65ebb954e133939e54053933b77782c741d768742403975e65 SHA512 3522d42016b165a8ffa5620bd2352023affceabb26d6c14ba5f5eeb5f42e3cfc002c71e7f0c1acbf4d626f0c3588c1609255802aabd1f4f700875ada82ef6826
 EBUILD github-cli-2.14.3.ebuild 1631 BLAKE2B 0534fbee7d0866ccf6b1c56dd7f4a61104403e83c54ac22a4d13617aeab22193adda2de47203d3876ffd3b9dae82b5db8fda5633145c3c109b2cc051e95c0114 SHA512 55f9c9df94a9c8ad27d1eb319988633e6f1809d4dad3a8b8d4785a6b47b79e85dc292d7d8309b8fc330f86d2057a2281898d26bcb2cbd43c8ee55657e0873ed3
+EBUILD github-cli-2.18.0.ebuild 1631 BLAKE2B 0534fbee7d0866ccf6b1c56dd7f4a61104403e83c54ac22a4d13617aeab22193adda2de47203d3876ffd3b9dae82b5db8fda5633145c3c109b2cc051e95c0114 SHA512 55f9c9df94a9c8ad27d1eb319988633e6f1809d4dad3a8b8d4785a6b47b79e85dc292d7d8309b8fc330f86d2057a2281898d26bcb2cbd43c8ee55657e0873ed3
 EBUILD github-cli-9999.ebuild 1617 BLAKE2B a87729766ea2024b042cf2da4d5eeae4ef982631aa6f33ba3eb17b339d662b58f48922d6a02c0570fb22c9124c382c81ed582e772f9c6162b6f481cd291fe963 SHA512 76004565ee008af52491dc297b2507a4dd0e1384a428daea01a2bb544daca450a661a49089897696fe0537ed60651a69f44f45378326d226297d93a1c1f4133d
 MISC metadata.xml 331 BLAKE2B 1ffd21cb61a7db81d5c8f1b3731dc6a23aa98e6db92e2af3101eefd99b18862a89bb42993cb770bc26307eb70c96966abee1bba45c73de31c1e47300caf170b3 SHA512 2a90a401ff9f5646bcb0a8e1b38bd95629f7b69d4fd485de5f5c32063cceb0d223b30696181d328e09c6f8191e8fbaabf81370f42577312c2eb8d22d9509d1b9
diff --git a/dev-util/github-cli/github-cli-2.11.3.ebuild b/dev-util/github-cli/github-cli-2.11.3.ebuild
deleted file mode 100644
index fdd2db7e3689..000000000000
--- a/dev-util/github-cli/github-cli-2.11.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~riscv"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-RESTRICT="test"
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Filter '-flto*' flags to avoid build failures.
-	filter-flags "-flto*"
-	# Filter '-ggdb3' flag to avoid build failures. bugs.gentoo.org/847991
-	filter-flags "-ggdb3"
-	# Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-	unset LDFLAGS
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
-}
diff --git a/dev-util/github-cli/github-cli-2.12.1.ebuild b/dev-util/github-cli/github-cli-2.18.0.ebuild
index 77fd1c37e6b9..834906664386 100644
--- a/dev-util/github-cli/github-cli-2.12.1.ebuild
+++ b/dev-util/github-cli/github-cli-2.18.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
 	S="${WORKDIR}/cli-${PV}"
 fi
 
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index c9b12ac524b3..8cce4f473850 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 70e897a3f387..39e9335b3702 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,4 +1,3 @@
-AUX 0.15.0-59b9518f.patch 3473 BLAKE2B a90910cb8be97f3c030afb3fcab3613fcff29acdface938165b33801a5e72366b1bdd77210262ba0eb803a489f8947b36d5a875fbf8fe20c9e8dd100b4637f9d SHA512 252ff3eb1ae8ad6d06d52e69f3703dbd98abd3491f2871d2f00f72b05e48ada78ffe8bad84a0e3df5e708d2e5a41cd75b5fca2f99378bf57e5a12439519d6a88
 AUX wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch 2877 BLAKE2B ff492af5cf7b5c866e49ce1bf78286c57e54eb4d3a6c60d4b1087a796b081618b6fe87afc4efd79aec5b4b3ecdb749027cfc74f09500211a086550a5db9d70d6 SHA512 52a6cf0bd22a514adf427d9f02768f5ecc24d1c83cecd51eda89938bdd79dee50e11103ae9fa2ededfcacb5a485415453308026c68fe1e3ffdb447503696535d
 DIST wlroots-0.14.0.tar.gz 505461 BLAKE2B d2fa28f64014ef9d840838cb5938af23f6f6b211b62dc352d0d5bb824ccaa7d7a85531e1eca14feeb06d31d59955ff9a913e40a73cad21ed1ebfe76ada39d558 SHA512 83f001133cb4b11a72bb9532b7321655428826662848f67de8e3220a33d9dff4d37c859602bdc319929949d387d014a257b0347039a6649944d7b084c76bb611
 DIST wlroots-0.14.1.tar.gz 505840 BLAKE2B fca4d259cdde62da0c196344ce1d0f5dd679d012ff33e3ceb5385b9374667e16d91059a2ba6a318153e79ac2f0a6464e3066e614a13398f8c433f442560d84d2 SHA512 4f557c827f9673eccf208a3644954de80e7355b95cc374cc5e851a47087b227f196e0936c0913d21a6c776c29b74de2d028a100931264e41934c747568d8ebe0
diff --git a/gui-libs/wlroots/files/0.15.0-59b9518f.patch b/gui-libs/wlroots/files/0.15.0-59b9518f.patch
deleted file mode 100644
index 95ca0becd618..000000000000
--- a/gui-libs/wlroots/files/0.15.0-59b9518f.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 59b9518f072527ac59593e51df7f5d5331a34f0e Mon Sep 17 00:00:00 2001
-From: Thomas Hebb <tommyhebb@gmail.com>
-Date: Wed, 5 Jan 2022 00:16:59 -0800
-Subject: [PATCH] render/gles2: don't constrain shm formats to ones that
- support reading
-
-commit 44e8451cd93e ("render/gles2: hide shm formats without GL
-support") added the is_gles2_pixel_format_supported() function to
-render/gles2/pixel_format.c, whose stated purpose is to "check whether
-the renderer has the needed GL extensions to read a given pixel format."
-It then used that function to filter the pixel formats returned by
-get_gles2_shm_formats().
-
-The result of this change is that RGB formats are no longer reported for
-GL drivers that don't implement EXT_read_format_bgra, even when those
-formats are supported for rendering (which they have to be for
-wlr_gles2_renderer_create() to succeed). This is a pretty clear
-regression, since wlr_renderer_init_wl_shm() fails when either of
-WL_SHM_FORMAT_ARGB8888 or WL_SHM_FORMAT_XRGB8888 are missing.
-
-To fix the regression, change is_gles2_pixel_format_supported() to
-accept all pixel formats that support rendering, regardless of whether
-we can read them or not, and move the check for EXT_read_format_bgra
-back into gles2_read_pixels(). (There's already a check for this
-extension in gles2_preferred_read_format(), so we're not breaking any
-abstraction that wasn't already broken.)
-
-Tested on the NVIDIA 495.46 proprietary driver, which doesn't support
-EXT_read_format_bgra.
-
-Fixes: 44e8451cd93e ("render/gles2: hide shm formats without GL support")
----
- render/gles2/pixel_format.c | 14 ++++++++++----
- render/gles2/renderer.c     |  6 ++++++
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/render/gles2/pixel_format.c b/render/gles2/pixel_format.c
-index 31bb3908..b155bbbe 100644
---- a/render/gles2/pixel_format.c
-+++ b/render/gles2/pixel_format.c
-@@ -98,6 +98,10 @@ static const struct wlr_gles2_pixel_format formats[] = {
- 
- // TODO: more pixel formats
- 
-+/*
-+ * Return true if supported for texturing, even if other operations like
-+ * reading aren't supported.
-+ */
- bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer,
- 		const struct wlr_gles2_pixel_format *format) {
- 	if (format->gl_type == GL_UNSIGNED_INT_2_10_10_10_REV_EXT
-@@ -108,10 +112,12 @@ bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer,
- 			&& !renderer->exts.OES_texture_half_float_linear) {
- 		return false;
- 	}
--	if (format->gl_format == GL_BGRA_EXT
--			&& !renderer->exts.EXT_read_format_bgra) {
--		return false;
--	}
-+	/*
-+	 * Note that we don't need to check for GL_EXT_texture_format_BGRA8888
-+	 * here, since we've already checked if we have it at renderer creation
-+	 * time and bailed out if not. We do the check there because Wayland
-+	 * requires all compositors to support SHM buffers in that format.
-+	 */
- 	return true;
- }
- 
-diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
-index 527d85bf..67b8ead4 100644
---- a/render/gles2/renderer.c
-+++ b/render/gles2/renderer.c
-@@ -441,6 +441,12 @@ static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer,
- 		return false;
- 	}
- 
-+	if (fmt->gl_format == GL_BGRA_EXT && !renderer->exts.EXT_read_format_bgra) {
-+		wlr_log(WLR_ERROR,
-+			"Cannot read pixels: missing GL_EXT_read_format_bgra extension");
-+		return false;
-+	}
-+
- 	const struct wlr_pixel_format_info *drm_fmt =
- 		drm_get_pixel_format_info(fmt->drm_format);
- 	assert(drm_fmt);
--- 
-GitLab
-
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index df4882f304e9..cf574ae1d987 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 31741eafbdb9..82484e8b1d1f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 19 Oct 2022 18:10:03 +0000
+Thu, 20 Oct 2022 00:09:58 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 9128e908a030..64db39a0aa1b 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-19T18:10:06Z
+TIMESTAMP 2022-10-20T00:10:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNQPX5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNQkdlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDLghAAk40McG0wq1lrPFZ3WOtTnz6l/jgwa4qKobjQP2uJH4FksuOe0jBY/7eO
-FAvLP8IaLGusPEMxyeOQP0UOL105bitVhxDzkuVqhmDkBSlOaTxB/YpnTUOQmt7q
-AYJQ9oJPUoHVuxpwIqTv+ZdRH7sP46yrOFFSLIUgqNWvZ/4q9uM4iPzrF2O0cO9T
-5GgqOO5X3zqPR0aIoUdTyH+2TQq5a/9QNMLTPajuVNPyaIsjrEHnMfld7IShCmzh
-A0A8ke6z2XMgtvjJmM0jpNHJV2cdRopv6NCe9BQptyFb0/tjmp6ms1zipk/EcYxI
-pQQSRa6kkBrKaVNr2wTvWzvR3xRllIZUGSfJ6AFgAdrX2eGrZZqpk6+0Hby2n17e
-oxrB/hUC+LgEs259kXRQbtwiJ7GsaL752GMVX4Yo+45ntDIGrx/E/+iHHwmrl7kE
-AJVob1KbGpKI6xk6ARAZAhHtmiNvIyLF35JbqCl16sL2CDXhaWny1XKrKpuMVD8k
-nOTDWL91i5jVCjLc4ffd+qQZKw1ANCRZSodH945nPdgyr3NxwHAiyJ7be+mkQu8Z
-RZKIxqFSpXyTkkOt2zx6kgrIVJpcBuKJy7XUCQoJJOFUYpmEqmSu1VtEjsf/2Rpb
-sPgV8XEJ3DFg2noxuTJHSomR/7J/ZI+rFTyvPwXrNEvFDE/MpmM=
-=m8Zi
+klDKIg//R232HjrG/49Kp/njD6kAr/So7ooyn9KWa/2XXQUIgWZHN33pZ5Dh6vft
+U+PEIcVcqC6Y+4SpACo/I28b1lhchXGy+wI/8UZ7rglhYAmyI1hnrfe+ShTDmIgb
+e4cQpGHwyq2DRmmkJQrGssBP7oVRnAOhY67Tx2hTff/QqWrzD3OrhQZMSIzRM4YD
+lwEMkQSvm671MiYvUMomyuaa6VDFDnfPFk65jKi7BUGBUx+bt8tudauIR+mz8wxd
+Ygi7/+g8yIA4SOsA3xuAoTpkU4lq9wXU2W4ZXapJCmAHJKerzf42ZtOVLpKUwWDL
+FFWdKZYrWzL4uOBlY5JR6jEWfGqf39RpQ6v7K21Pxy0nBjATGz3y1vNO0eBerpHI
+MWOIYMR5r/YfUgt15g+figPE8Qr2iD2yY7MuSctC4bnfa5ikUEziP8wMa+9xktpl
+XiBo9T2xt3C7uFrAzedlVd1lxCr8h0rZUvlJ1CyMDtVnKJfsgU9GWXYD+HggtMhB
+DNKJZrooJKczUnOAw4MCs+hKYmJRVNF+RRxDvSurQU5jDulQvkqKnqApd052hJB3
+t/PIG6llkSp3l3uXtr3B8Xd5k15Nv8zJlTVyiOSn8YGZoRuyorhqF4ViLtg3Kdg4
+ddUkvJBGrwwQsCQ2NMVFa8Je5ny371VwzJ9sgOIy5zaOsku90eU=
+=UJSA
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 31741eafbdb9..82484e8b1d1f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 19 Oct 2022 18:10:03 +0000
+Thu, 20 Oct 2022 00:09:58 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index d20a73d097e9..0dfd1821b158 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 1eddd5778bb9..c68375e97249 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-lint-6.8.1 b/metadata/md5-cache/app-admin/ansible-lint-6.8.2
index 5cf17ce442d6..c7085c2bdb87 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-6.8.1
+++ b/metadata/md5-cache/app-admin/ansible-lint-6.8.2
@@ -11,6 +11,6 @@ RDEPEND=>=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targ
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ansible/ansible-lint/archive/refs/tags/v6.8.1.tar.gz -> ansible-lint-6.8.1.gh.tar.gz
+SRC_URI=https://github.com/ansible/ansible-lint/archive/refs/tags/v6.8.2.tar.gz -> ansible-lint-6.8.2.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=fb74f4ff41e1376dde0c22357279de3f
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2110.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.2110.0-r1
deleted file mode 100644
index b95edfac22f0..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.2110.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone )
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=8
-HOMEPAGE=https://www.rsyslog.com/
-INHERIT=autotools linux-info python-any-r1 systemd
-IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2110.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2110.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_=0d0e1e999f52d6a14d3c3eba0221da47
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2204.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.2210.0
index 25a859182867..21f1608a902d 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2204.0-r1
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2210.0
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
 DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.rsyslog.com/
 INHERIT=autotools linux-info python-any-r1 systemd
 IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3 LGPL-3 Apache-2.0
 RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
 REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2204.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2204.0.tar.gz )
+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_=b2b28264df83711b09444854b5dafb90
+_md5_=1f3916f987a0cd8b57a94eadf3dbe8f9
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index bea87aea0b23..4315f27a138c 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/podman-4.3.0 b/metadata/md5-cache/app-containers/podman-4.3.0
new file mode 100644
index 000000000000..d34ae0be2f59
--- /dev/null
+++ b/metadata/md5-cache/app-containers/podman-4.3.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install postinst preinst prepare unpack
+DEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=app-containers/cni-plugins-0.8.6 sys-apps/shadow:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
+DESCRIPTION=Library and podman tool for running OCI-based containers in Pods
+EAPI=7
+HOMEPAGE=https://github.com/containers/podman/
+INHERIT=bash-completion-r1 flag-o-matic go-module tmpfiles
+IUSE=apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=app-containers/cni-plugins-0.8.6 sys-apps/shadow:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) selinux? ( sys-libs/libselinux:= ) fuse? ( sys-fs/fuse-overlayfs ) selinux? ( sec-policy/selinux-podman ) virtual/tmpfiles
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/containers/podman/archive/v4.3.0.tar.gz -> podman-4.3.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=e448a500a76bced374ca5bcda68a9d53
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 611d21781f65..4a11e2627be8 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/qca-2.3.5 b/metadata/md5-cache/app-crypt/qca-2.3.5
new file mode 100644
index 000000000000..92a6ab989a56
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/qca-2.3.5
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] virtual/latex-base ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.14:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( >=dev-libs/openssl-1.1:= ) test? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 )
+DESCRIPTION=Qt Cryptographic Architecture (QCA)
+EAPI=8
+HOMEPAGE=https://userbase.kde.org/QCA
+INHERIT=cmake kde.org qmake-utils
+IUSE=botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtcore-5.14:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( >=dev-libs/openssl-1.1:= )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://kde/stable/qca/2.3.5/qca-2.3.5.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=be837396dc26a01b48c14d74564f60fb
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index ec80e748f7c1..8aae83a978dc 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/buttercup-1.24-r1 b/metadata/md5-cache/app-emacs/buttercup-1.27
index 7896d8488227..2849405ab7c4 100644
--- a/metadata/md5-cache/app-emacs/buttercup-1.24-r1
+++ b/metadata/md5-cache/app-emacs/buttercup-1.27
@@ -4,10 +4,10 @@ DESCRIPTION=Behaviour-driven Elisp testing
 EAPI=8
 HOMEPAGE=https://github.com/jorgenschaefer/emacs-buttercup
 INHERIT=elisp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
-SRC_URI=https://github.com/jorgenschaefer/emacs-buttercup/archive/v1.24.tar.gz -> buttercup-1.24.tar.gz
+SRC_URI=https://github.com/jorgenschaefer/emacs-buttercup/archive/v1.27.tar.gz -> buttercup-1.27.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=acec500445d5ee71a1c9d1a64e84b13a
+_md5_=c5da25ef5f8b295d465b18e5f9ef2764
diff --git a/metadata/md5-cache/app-emacs/consult-0.15 b/metadata/md5-cache/app-emacs/consult-0.20
index 0d71aba2f3d0..438bc44db835 100644
--- a/metadata/md5-cache/app-emacs/consult-0.15
+++ b/metadata/md5-cache/app-emacs/consult-0.20
@@ -1,4 +1,4 @@
-BDEPEND=>=app-editors/emacs-25:*
+BDEPEND=>=app-emacs/compat-28.1 >=app-editors/emacs-27:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Consulting complete-read
 EAPI=8
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/minad/consult
 INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=>=app-editors/emacs-25:*
+RDEPEND=>=app-emacs/compat-28.1 >=app-editors/emacs-27:*
 SLOT=0
-SRC_URI=https://github.com/minad/consult/archive/refs/tags/0.15.tar.gz -> consult-0.15.tar.gz
+SRC_URI=https://github.com/minad/consult/archive/refs/tags/0.20.tar.gz -> consult-0.20.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=190e3facfad622f7db37de1450833dc4
+_md5_=5eafdaaa2b81a75da888a151968486c6
diff --git a/metadata/md5-cache/app-emacs/corfu-0.25 b/metadata/md5-cache/app-emacs/corfu-0.28
index 0edebcd92ebb..d95262138163 100644
--- a/metadata/md5-cache/app-emacs/corfu-0.25
+++ b/metadata/md5-cache/app-emacs/corfu-0.28
@@ -1,4 +1,4 @@
-BDEPEND=>=app-editors/emacs-27:*
+BDEPEND=>=app-editors/emacs-27.1:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Completion Overlay Region FUnction
 EAPI=8
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/minad/corfu
 INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=>=app-editors/emacs-27:*
+RDEPEND=>=app-editors/emacs-27.1:*
 SLOT=0
-SRC_URI=https://github.com/minad/corfu/archive/refs/tags/0.25.tar.gz -> corfu-0.25.tar.gz
+SRC_URI=https://github.com/minad/corfu/archive/refs/tags/0.28.tar.gz -> corfu-0.28.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=696d4a3283d8b7451a1c7a0820dc74be
+_md5_=3f22940e280e7b8f4220299fb0cc70b6
diff --git a/metadata/md5-cache/app-emacs/marginalia-0.12 b/metadata/md5-cache/app-emacs/marginalia-0.15
index b3c28591a5ae..78db4ffe9561 100644
--- a/metadata/md5-cache/app-emacs/marginalia-0.12
+++ b/metadata/md5-cache/app-emacs/marginalia-0.15
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26:*
 SLOT=0
-SRC_URI=https://github.com/minad/marginalia/archive/refs/tags/0.12.tar.gz -> marginalia-0.12.tar.gz
+SRC_URI=https://github.com/minad/marginalia/archive/refs/tags/0.15.tar.gz -> marginalia-0.15.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5d2549f894b0eeda316b2e0831fa17e4
diff --git a/metadata/md5-cache/app-emacs/vertico-0.25 b/metadata/md5-cache/app-emacs/vertico-0.28
index c301c5369be4..1a5925a4d322 100644
--- a/metadata/md5-cache/app-emacs/vertico-0.25
+++ b/metadata/md5-cache/app-emacs/vertico-0.28
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27:*
 SLOT=0
-SRC_URI=https://github.com/minad/vertico/archive/refs/tags/0.25.tar.gz -> vertico-0.25.tar.gz
+SRC_URI=https://github.com/minad/vertico/archive/refs/tags/0.28.tar.gz -> vertico-0.28.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=a21f11f2d111ef98b890cc7961a8bb1a
+_md5_=fa56ad84232a6cdecfe80203c7bb7395
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 6c14a9ad2279..466c3a093dd7 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/base_bigstring-0.14.0 b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
index dfa984248914..bc42487ae96f 100644
--- a/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
+++ b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt=] dev-ml/base:= dev-ml/ppx_jane:= =dev-ml/ppx_compare-0.14*:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt=] dev-ml/base:= dev-ml/base_quickcheck:= dev-ml/ppx_bench:= dev-ml/ppx_bin_prot:= =dev-ml/ppx_compare-0.14*:= dev-ml/ppx_custom_printf:= dev-ml/ppx_expect:= dev-ml/ppx_fields_conv:= dev-ml/ppx_fixed_literal:= dev-ml/ppx_jane:= dev-ml/ppx_let:= dev-ml/ppx_module_timer:= dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/ppx_stable:= dev-ml/ppx_string:= dev-ml/ppx_typerep_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=String type based on Bigarray, for use in I/O and C-bindings
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/base_bigstring
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt=] dev-ml/base:= dev-ml/ppx_jane:= =dev-ml/ppx_compare-0.14*:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt=] dev-ml/base:= dev-ml/base_quickcheck:= dev-ml/ppx_bench:= dev-ml/ppx_bin_prot:= =dev-ml/ppx_compare-0.14*:= dev-ml/ppx_custom_printf:= dev-ml/ppx_expect:= dev-ml/ppx_fields_conv:= dev-ml/ppx_fixed_literal:= dev-ml/ppx_jane:= dev-ml/ppx_let:= dev-ml/ppx_module_timer:= dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/ppx_stable:= dev-ml/ppx_string:= dev-ml/ppx_typerep_conv:= dev-ml/ppx_variants_conv:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base_bigstring/archive/v0.14.0.tar.gz -> base_bigstring-0.14.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=792cfcc5ab703292b35ff8fe641e646c
+_md5_=416a548852d6bcd0c38bfe234bd37ab1
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1 b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
index b4b8f48dd43f..500a68e54ad7 100644
--- a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
+++ b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Randomized testing framework, designed for compatibility with Base
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/base_quickcheck
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.14.0.tar.gz -> base_quickcheck-0.14.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=f97ba92d99c963af1c3edeab5fb8f571
+_md5_=7e26967ab55c96b9817cdf096409652b
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r1 b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r2
index faac71b41f62..469b43a82226 100644
--- a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r1
+++ b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Randomized testing framework, designed for compatibility with Base
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/base_quickcheck
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.14.1.tar.gz -> base_quickcheck-0.14.1.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=e03fe86698184f578e2afc42f6accf6c
+_md5_=24792dbc518bf6095db4a4530a3dcfc8
diff --git a/metadata/md5-cache/dev-ml/ppx_bench-0.14.1 b/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
index 7e5a84f98116..7ca7d973d1c3 100644
--- a/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Syntax extension for writing in-line benchmarks in ocaml code
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_bench
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_bench/archive/v0.14.1.tar.gz -> ppx_bench-0.14.1.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=dfd981f1cb0324022a7d64d4ce445527
+_md5_=04f41002166c5fa5320ff81555a65b1e
diff --git a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0 b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
index 0cf22b260e83..7b77c13c0f12 100644
--- a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/bin_prot-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= test? ( dev-ml/ppx_jane ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/bin_prot-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= test? ( dev-ml/ppx_jane ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Generation of bin_prot readers and writers from types
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_bin_prot
@@ -8,9 +8,9 @@ INHERIT=dune
 IUSE=+ocamlopt test
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/bin_prot-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/bin_prot-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_bin_prot/archive/v0.14.0.tar.gz -> ppx_bin_prot-0.14.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7ddfd6a4cf5cfbe2647c22396cac3d07
+_md5_=0652a188f674a769797d1c2299badb05
diff --git a/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0 b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
index cc434890394a..f99a30ac4d51 100644
--- a/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Simpler notation for fixed point literals
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_fixed_literal
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
-RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_fixed_literal/archive/v0.14.0.tar.gz -> ppx_fixed_literal-0.14.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7d46e1641932d27f0f1a2157bf4dd013
+_md5_=c26babcb6156a6b45cb624701cdf2bca
diff --git a/metadata/md5-cache/dev-ml/ppx_let-0.14.0 b/metadata/md5-cache/dev-ml/ppx_let-0.14.0
index f3130c4f4c0b..0bb712c05f82 100644
--- a/metadata/md5-cache/dev-ml/ppx_let-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_let-0.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Monadic let-bindings
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_let
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_let/archive/v0.14.0.tar.gz -> ppx_let-0.14.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=eca990080ad0aa93eaccb31afdeb77f7
+_md5_=b1a4ecea9c800c8e505d655fb6a2f1f6
diff --git a/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0 b/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
index a43b65b35a14..2d93632065ad 100644
--- a/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/time_now-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/time_now-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Ppx rewriter that records top-level module startup times
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_module_timer
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/time_now-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/time_now-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_module_timer/archive/v0.14.0.tar.gz -> ppx_module_timer-0.14.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=667843787229656fde2017a93c6d7b82
+_md5_=669a2cdffa9662fbd4cc6663eca4ee87
diff --git a/metadata/md5-cache/dev-ml/ppx_optional-0.14.0 b/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
index ab69727ce44e..70926d9d930e 100644
--- a/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Pattern matching on flat options
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_optional
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_optional/archive/v0.14.0.tar.gz -> ppx_optional-0.14.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=c661c3afed8c6192d5d44391882b0d6b
+_md5_=09e3284f4348f7d37e1c98ffda908b2c
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0 b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
index ac1520234335..acff317ad123 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=A ppx rewriter for easy construction of s-expressions
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_message
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_message/archive/v0.14.0.tar.gz -> ppx_sexp_message-0.14.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=fd8664e98335ffc3ae11159f282f1021
+_md5_=9f87e038abddac205748a76cb17f40f5
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.1 b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.1-r1
index c2fd833a039b..00ad5dcad5e6 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=A ppx rewriter for easy construction of s-expressions
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_message
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_sexp_message/archive/v0.14.1.tar.gz -> ppx_sexp_message-0.14.1.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=86d41b60d71963ad825399129edcde90
+_md5_=6c5f80b1ce1339e1127da8dc71d8f665
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0 b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
index f6bb5e241d88..1b4f405dc595 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Standard library for ppx rewriters
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_value
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_value/archive/v0.14.0.tar.gz -> ppx_sexp_value-0.14.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=c75d106f25fa3dd98a47f90d37c75a73
+_md5_=2f8c4c018d5517fcbe7a17fb813a9926
diff --git a/metadata/md5-cache/dev-ml/ppx_stable-0.14.1 b/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
index 50b628a5487b..5856b2ccca54 100644
--- a/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Stable types conversions generator
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_stable
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_stable/archive/v0.14.1.tar.gz -> ppx_stable-0.14.1.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=0486b64e8b7d05bacae937f03ab7f244
+_md5_=f486e4b821b57b580b2ca12f764844a6
diff --git a/metadata/md5-cache/dev-ml/ppx_string-0.14.1 b/metadata/md5-cache/dev-ml/ppx_string-0.14.1
index 6712d1ef34ea..caf2f2fa8180 100644
--- a/metadata/md5-cache/dev-ml/ppx_string-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_string-0.14.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-ml/stdio-0.14.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-ml/stdio-0.14.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Ppx extension for string interpolation
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_string
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-ml/stdio-0.14.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-ml/stdio-0.14.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_string/archive/v0.14.1.tar.gz -> ppx_string-0.14.1.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=43df13ea0b0ac1b1468d9ac400f55d55
+_md5_=a85e1a240167fa98aa351314853e8cc4
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1
index 8512d8fc0354..21ed667a9151 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.21.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.21.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Generation of runtime types from type declarations
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.21.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.21.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.1.tar.gz -> ppx_typerep_conv-0.14.1.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=dc02ca0a246724ed5b953e4363baee44
+_md5_=3e261ee574e9b0937e504bdcfe440aa2
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
index c75aff170967..aee25ca7a431 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Generation of runtime types from type declarations
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.2.tar.gz -> ppx_typerep_conv-0.14.2.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=3cf5b13c6821552e0eb17d979d1087e0
+_md5_=6800ae45488db121721a8bc2d4102393
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
index 48ccdc1f0c05..5359be94bce2 100644
--- a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Generation of accessor and iteration functions for ocaml variant types
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_variants_conv
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.14.1.tar.gz -> ppx_variants_conv-0.14.1.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=b6c445f5f4d909355d66daf64fa4975c
+_md5_=4e5d75da0e0fa581971ed5e414042f8c
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1-r1 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1-r2
index 31c120024c4f..22865125a2dd 100644
--- a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1-r1
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.23.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.23.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Generation of accessor and iteration functions for ocaml variant types
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_variants_conv
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.23.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.23.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.14.1.tar.gz -> ppx_variants_conv-0.14.1.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=46e73ac53783d04668cd7ab01d9be85b
+_md5_=0e74804e11bb50a97280042b7aae5584
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.2 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.2-r1
index 3f92c4308c29..945cfb630531 100644
--- a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.2
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.23.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.23.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Generation of accessor and iteration functions for ocaml variant types
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_variants_conv
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.23.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.23.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.14.2.tar.gz -> ppx_variants_conv-0.14.2.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=2ca8a096e65832e46b06972115c9b97d
+_md5_=d590757de6ab44e0645507ba036c6466
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 1b7060607e41..db23de10bdd6 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/github-cli-2.12.1 b/metadata/md5-cache/dev-util/github-cli-2.12.1
deleted file mode 100644
index d1baa9237a23..000000000000
--- a/metadata/md5-cache/dev-util/github-cli-2.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=GitHub CLI
-EAPI=8
-HOMEPAGE=https://github.com/cli/cli
-INHERIT=bash-completion-r1 flag-o-matic go-module
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
-LICENSE=MIT Apache-2.0 BSD BSD-2 MPL-2.0
-RDEPEND=>=dev-vcs/git-1.7.3
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/cli/cli/archive/v2.12.1.tar.gz -> github-cli-2.12.1.tar.gz https://dev.gentoo.org/~williamh/dist/github-cli-2.12.1-deps.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=01fc8095d442fafc8cf584a8ea2961ec
diff --git a/metadata/md5-cache/dev-util/github-cli-2.11.3 b/metadata/md5-cache/dev-util/github-cli-2.18.0
index 92c3cd5f9154..6d17f027110e 100644
--- a/metadata/md5-cache/dev-util/github-cli-2.11.3
+++ b/metadata/md5-cache/dev-util/github-cli-2.18.0
@@ -4,11 +4,11 @@ DESCRIPTION=GitHub CLI
 EAPI=8
 HOMEPAGE=https://github.com/cli/cli
 INHERIT=bash-completion-r1 flag-o-matic go-module
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv
 LICENSE=MIT Apache-2.0 BSD BSD-2 MPL-2.0
 RDEPEND=>=dev-vcs/git-1.7.3
 RESTRICT=test strip
 SLOT=0
-SRC_URI=https://github.com/cli/cli/archive/v2.11.3.tar.gz -> github-cli-2.11.3.tar.gz https://github.com/ran-dall/portage-deps/raw/master/github-cli-2.11.3-deps.tar.xz
+SRC_URI=https://github.com/cli/cli/archive/v2.18.0.tar.gz -> github-cli-2.18.0.tar.gz https://dev.gentoo.org/~williamh/dist/github-cli-2.18.0-deps.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b0b16fbae29da95bc883a08b2c23f61e
+_md5_=2fa0bebaf3465e1bda1cc7856baeeb8b
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 890cef11d258..8bc61b36d36c 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/nodejs-16.18.0 b/metadata/md5-cache/net-libs/nodejs-16.18.0
new file mode 100644
index 000000000000..c2625f47265e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-16.18.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-lang/python-3.8.13:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=8
+HOMEPAGE=https://nodejs.org/
+INHERIT=bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0/16
+SRC_URI=https://nodejs.org/dist/v16.18.0/node-v16.18.0.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b9175d6052754425536d3a08de65cc03
diff --git a/metadata/md5-cache/net-libs/nodejs-18.11.0 b/metadata/md5-cache/net-libs/nodejs-18.11.0
new file mode 100644
index 000000000000..d2527a9a2ff6
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-18.11.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-lang/python-3.8.13:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=8
+HOMEPAGE=https://nodejs.org/
+INHERIT=bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0/18
+SRC_URI=https://nodejs.org/dist/v18.11.0/node-v18.11.0.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e513d6efc048efa2b88346c49840ee28
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index f03bf397b39f..b0e14b37d13f 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/nicotine+-2.2.2 b/metadata/md5-cache/net-p2p/nicotine+-2.2.2
deleted file mode 100644
index 3ed924738ede..000000000000
--- a/metadata/md5-cache/net-p2p/nicotine+-2.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-DESCRIPTION=A fork of nicotine, a Soulseek client in Python
-EAPI=7
-HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
-INHERIT=distutils-r1 xdg-utils
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] 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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/2.2.2.tar.gz -> nicotine+-2.2.2.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2007941ec74b38f26ac3418c5f583c8b
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.1.1 b/metadata/md5-cache/net-p2p/nicotine+-3.1.1
deleted file mode 100644
index fd61870c80b2..000000000000
--- a/metadata/md5-cache/net-p2p/nicotine+-3.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-DESCRIPTION=A fork of nicotine, a Soulseek client in Python
-EAPI=7
-HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
-INHERIT=distutils-r1 xdg-utils
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] 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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/3.1.1.tar.gz -> nicotine+-3.1.1.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=67d81ce9285b2471aef6f98b1a1f1415
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.2.0 b/metadata/md5-cache/net-p2p/nicotine+-3.2.0
deleted file mode 100644
index 04c41b85cbfc..000000000000
--- a/metadata/md5-cache/net-p2p/nicotine+-3.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-DESCRIPTION=A fork of nicotine, a Soulseek client in Python
-EAPI=7
-HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
-INHERIT=distutils-r1 xdg-utils
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] 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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/3.2.0.tar.gz -> nicotine+-3.2.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=67d81ce9285b2471aef6f98b1a1f1415
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.2.1 b/metadata/md5-cache/net-p2p/nicotine+-3.2.1
deleted file mode 100644
index b050ee1b7ab9..000000000000
--- a/metadata/md5-cache/net-p2p/nicotine+-3.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-DESCRIPTION=A fork of nicotine, a Soulseek client in Python
-EAPI=7
-HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
-INHERIT=distutils-r1 xdg-utils
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] 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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/3.2.1.tar.gz -> nicotine+-3.2.1.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=67d81ce9285b2471aef6f98b1a1f1415
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.2.5 b/metadata/md5-cache/net-p2p/nicotine+-3.2.5
new file mode 100644
index 000000000000..a61eaf409a3d
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/nicotine+-3.2.5
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] 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/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 postinst postrm prepare test
+DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] 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 )
+DESCRIPTION=A fork of nicotine, a Soulseek client in Python
+EAPI=8
+HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
+INHERIT=distutils-r1 xdg-utils
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] 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 ) 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/Nicotine-Plus/nicotine-plus/archive/3.2.5.tar.gz -> nicotine+-3.2.5.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ffeeb5e4d836d980a4f6e617d2ef33e6
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index f82368d2cd63..619c55a56687 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/systemd-252_rc1 b/metadata/md5-cache/sys-apps/systemd-252_rc2
index 72c7231c95f9..c0e065600c73 100644
--- a/metadata/md5-cache/sys-apps/systemd-252_rc1
+++ b/metadata/md5-cache/sys-apps/systemd-252_rc2
@@ -12,6 +12,6 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
 RESTRICT=!test? ( test )
 SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v252-rc1/systemd-252-rc1.tar.gz
+SRC_URI=https://github.com/systemd/systemd/archive/v252-rc2/systemd-252-rc2.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=09ba98ca7b8c5fbebf70885dd2f7c959
+_md5_=0e289c36798f3a6c74237c7ae801435f
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index a0c09b1dc14d..289dea10c6f3 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/RyzenAdj-0.11.1 b/metadata/md5-cache/sys-power/RyzenAdj-0.11.1
new file mode 100644
index 000000000000..4da5b77d49ad
--- /dev/null
+++ b/metadata/md5-cache/sys-power/RyzenAdj-0.11.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-apps/pciutils
+DESCRIPTION=The power management tool for mobile and desktop Ryzen APUs
+EAPI=8
+HOMEPAGE=https://github.com/FlyGoat/RyzenAdj
+INHERIT=cmake
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=sys-apps/pciutils
+SLOT=0
+SRC_URI=https://github.com/FlyGoat/RyzenAdj/archive/refs/tags/v0.11.1.tar.gz -> RyzenAdj-0.11.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d86f552423d988506958f1fb50054326
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 2ade919c4f71..9baf7082a0ee 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/nginx-1.23.1-r1 b/metadata/md5-cache/www-servers/nginx-1.23.1-r1
deleted file mode 100644
index 4a798595d3ff..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.23.1-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=8
-HOMEPAGE=https://nginx.org
-INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite pcre !pcre2 ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.23.1.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/openresty/headers-more-nginx-module/archive/d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz -> ngx_http_headers_more-d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.7.7.tar.gz -> njs-0.7.7.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz -> ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz -> ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz ) nginx_modules_http_security? ( https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v1.0.3.tar.gz -> modsecurity-nginx-1.0.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz -> ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.7.7.tar.gz -> njs-0.7.7.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=72479b837f6429137c6b6d150935096c
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 63acdcc11678..7fcdadb59dbd 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-fonts-1 b/metadata/md5-cache/x11-base/xorg-fonts-1
deleted file mode 100644
index 28c3f29870cf..000000000000
--- a/metadata/md5-cache/x11-base/xorg-fonts-1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=X11 fonts (meta package)
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=optfeature
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=metapackage
-RDEPEND=media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-adobe-utopia-100dpi media-fonts/font-adobe-utopia-75dpi media-fonts/font-adobe-utopia-type1 media-fonts/font-arabic-misc media-fonts/font-bh-100dpi media-fonts/font-bh-75dpi media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi media-fonts/font-bh-type1 media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc media-fonts/font-daewoo-misc media-fonts/font-dec-misc media-fonts/font-ibm-type1 media-fonts/font-isas-misc media-fonts/font-jis-misc media-fonts/font-micro-misc media-fonts/font-misc-cyrillic media-fonts/font-misc-ethiopic media-fonts/font-misc-meltho media-fonts/font-misc-misc media-fonts/font-mutt-misc media-fonts/font-schumacher-misc media-fonts/font-screen-cyrillic media-fonts/font-sony-misc media-fonts/font-sun-misc media-fonts/font-winitzki-cyrillic media-fonts/font-xfree86-type1
-SLOT=0
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=d86d98c11d1a98cfc9f057cdc14c2085
diff --git a/metadata/md5-cache/x11-base/xorg-fonts-2 b/metadata/md5-cache/x11-base/xorg-fonts-2
new file mode 100644
index 000000000000..f8c7d4682b59
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-fonts-2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=X11 fonts (meta package)
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=optfeature
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
+LICENSE=metapackage
+RDEPEND=media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-adobe-utopia-100dpi media-fonts/font-adobe-utopia-75dpi media-fonts/font-adobe-utopia-type1 media-fonts/font-arabic-misc media-fonts/font-bh-100dpi media-fonts/font-bh-75dpi media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc media-fonts/font-daewoo-misc media-fonts/font-dec-misc media-fonts/font-ibm-type1 media-fonts/font-isas-misc media-fonts/font-jis-misc media-fonts/font-micro-misc media-fonts/font-misc-cyrillic media-fonts/font-misc-ethiopic media-fonts/font-misc-meltho media-fonts/font-misc-misc media-fonts/font-mutt-misc media-fonts/font-schumacher-misc media-fonts/font-screen-cyrillic media-fonts/font-sony-misc media-fonts/font-sun-misc media-fonts/font-winitzki-cyrillic media-fonts/font-xfree86-type1
+SLOT=0
+_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
+_md5_=cedf66dbd15b51c283bb53ddc7eb0702
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index f42bd8a034de..61776475589f 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.9 b/metadata/md5-cache/x11-misc/imake-1.0.9
new file mode 100644
index 000000000000..113b311b8ca8
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/imake-1.0.9
@@ -0,0 +1,14 @@
+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 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-base/xorg-proto
+DESCRIPTION=C preprocessor interface to the make utility
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/imake
+INHERIT=toolchain-funcs xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-misc/xorg-cf-files
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/util/imake-1.0.9.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	38a663574d97f06b6b729046865c8fb6
+_md5_=750bc51ef9a0085b911a8c7652db3dea
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 7547c9eae187..5831bcc77de0 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-19T18:10:06Z
+TIMESTAMP 2022-10-20T00:10:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNQPX5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNQkdlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBZhg//VINt1m3fZSmyiNVPMuUrMc42R67O7u4EQnvjW8tpJOMvbTzeI62mgKxG
-fSisEo7535gU0dG+rFtEsCe8aeDu9c+v+dDfB5BA5JQ9q6iWwAId3+IyNbjTf9SM
-6AD41npNuyyY8aYNbTnSH/HL1sua3SMq/Rwfb+RF0d8u9PtFXJ1ZBH6XGR+NpFw5
-wtnQ7Ni2+NxmYqQa3VwuSE+Q9amewmMekCpSeqihiDLOsKrkJq17ie+Xz0WLwKA6
-OlHCL9MPxwdAI+ydwp6Mc5OpNGXtXMRYlsUn+fiBbmw/cZnCMZMf9VWi7l5hJsPi
-e2vSyyHoh/zCW1+OgLVTtSh9hDMG9mo7fI0Wsv64AHj7b4WwJ9UhXfCa5nvDYZMg
-7sKwj1uyLDDsBNUZkW8H5dQn2a1eQ4LoA8YMP/L7KHSaRAwJyCgDJGdo/9SGKVuh
-40TJ45EjJhY4q24kD6CL9v+zfRhbu3vfO74/tPVSXpLyD/p3gNJicb22qwIuN8Aw
-xeieA4/9MxjKqY/nW1EO3QXl0TZimlwhNEcLoqYQThk+bqDmxnBcJc8C6zKVx9tW
-5pFa9ZI+wCPq5n2fbP/tEuM9sGMFZxUBd7ShWj85nJegDR3aRozwmyLCNL6jHuZE
-fGpS3tHb3UwZF6PfMpJxTvyjAYLGzgGWiahlGSXvq/fVdCikbko=
-=VfkC
+klCzAg/9E2CiWGDF+Aw3i2dT2Deon2+kswK6Ksdt3RcIuzEp+NHBkRHPtrny0wa2
+rcOm0LcIlsM+LrMSdN3jYFx8PWevYX07alE72Qztt986qqLqzyaCHsX1F7Nlhhgv
+s+pZZ6RNF9g3afWWywzZ/XPlm5QNZbUPvmv5B6Uv+zIna4BAe7OGG59jNhyVBsRl
+NK+9Wz05h56e/bJfXeRK2DxdLIzmQDqRiGqdf32N99L9jrFNYIP4pLejtkekZiIS
+tttQExxPRqQCGdngD3Irkp7c3qycCY3DtvirBq5AM9Ze1oFsS+kE48fGdGEnQ7ba
+ngCPGCQJ93LooBaY5gqqXfzYqAIhS3otJHIOkipuGZF20o04ZR3/cefODcw1irzL
+xEaltmftiAukQskoq/KbsxO08O/F75Fzu4Nuj9nP0E5SxCioPFWO7P8PgVoG+DVa
+uWKiqIQBslokaZJPpcQuuYgbf3/YIiVF3nnvnLzt9S6+v+Og5LkRgMPaWkScRXED
+7g328k/NKcGvjp7GzIx2+rnH65vCSNORYLGNvnTbr4dfHOl1MqxL9tszCgSftpIF
+ljmAr0YBk/WIYJPq4985g80zJ7HXuiLTELzyyEe9Oec/0Ug+kERolmECNXzB0ZIm
+09vrBJc3ujH9rn2MnI2pF9wYYn8jjEZZjPfurBSbiELMd6yAQVw=
+=9/O4
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 31741eafbdb9..82484e8b1d1f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 19 Oct 2022 18:10:03 +0000
+Thu, 20 Oct 2022 00:09:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index dd710784b913..dcf4f165c954 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Oct 19 06:10:03 PM UTC 2022
+Thu Oct 20 12:09:57 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1a0d7dd1196f..18745ed4ff63 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 19 Oct 2022 18:15:01 +0000
+Thu, 20 Oct 2022 00:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index a7419f5ba2cc..3f19c22aee7b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-461ec17f9840d0fb3159d0fc9a795339f8c1f01b 1666202721 2022-10-19T18:05:21+00:00
+6e114cc38eb7cb4d434e366d6fff10281b483827 1666224177 2022-10-20T00:02:57+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 172b18f762a4..397b9a0e3cfc 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666203001 Wed 19 Oct 2022 06:10:01 PM UTC
+1666224601 Thu 20 Oct 2022 12:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 31741eafbdb9..82484e8b1d1f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 19 Oct 2022 18:10:03 +0000
+Thu, 20 Oct 2022 00:09:58 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 49ba2acb8786..0fc0171bc954 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 26d72bc565af..fa0c5fcd7ef0 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -7,11 +7,15 @@ AUX nodejs-16.4.2-paxmarking.patch 4257 BLAKE2B c088deb4f9207d0cfbc43d71111230ec
 AUX nodejs-18.3.0-paxmarking.patch 3303 BLAKE2B 627ef3dac873d7967181cbe44b3566080b98bbc08ff7d75dfcf0cbded2e71e8af2ec6ccf2386b4d67ee20f612a49b03d2d81d50c845a5e5447194d94146ae035 SHA512 59be93e86373993fcd5235b7b6fa9fe85df3e2bdd9e61e2374cedccf69a6a36263bf1ce10f3294fdb9bf04a85a6f0dba209d4d7f9dc24b52af83bce48f51b22c
 DIST node-v14.20.1.tar.xz 34482880 BLAKE2B 3d21645c94e194c4a9a499544032643a2b14f507642c8d01bd54b3446c691c6d59109c08713a4b2e210c7418baded496b80308687b31830d2ccee5f8c9a06178 SHA512 27186e6b877189c7976fe566cbc4f5e961941f74af7e2f96a0829d6061b880569095666da70545f61a017f1b520050ab6ef5fc98e2e71e72253633f88a9264fb
 DIST node-v16.17.1.tar.xz 35661452 BLAKE2B 1fd9fad86f4f5161b2e06199a18f4df431b95ca03214cedefa4b76a9703e7153120c8c3f0f9b07fce825015533d2f52cc29e5737308c69d809c3e6edbc0eacee SHA512 f9aefcc72a260cbdc162db8db01885a93b1b2248ff0c20c6e9b98819b8b5e599f7da89eeeb7cfe202764cca3974b6ca48610351176f6767ef6ad630ca7ee8cb7
+DIST node-v16.18.0.tar.xz 35849580 BLAKE2B 42de388144a1bf66bdacf9c0561596b7a6624dec9a48d417a0ba22eb28a87ba97b6af5707d7f9584b937e86f01baf50db83aaa2b4ecd56aa493f1509c43764ae SHA512 4bcd1fd7aeea8ba87c419d6cfacfdc3415205a44ddaf7a744e1457254de6cafe51b6f28071071e2e66834164bc6eb1e956c8124cc63a06fc3bf69a17476f1c05
 DIST node-v18.10.0.tar.xz 38364672 BLAKE2B 0746f9c8bba75a996987c77e6e4c328e56a54517b768280254edf2feffa7d6b578ead54ec86753dd84f764ece6d4b8d22567670d51ef70e70a22d99fc2a835fb SHA512 7dbdb75786a8b85b66a8258ec1754aeaaaed3fed086b6a6caf46940c57fec16305a34931f27c33ed6ac036f16a7dbf010f17a6eec26316d71f3b3086626cf68b
+DIST node-v18.11.0.tar.xz 38437152 BLAKE2B 836af1d07493017fc9863a21a7b38fc7118ec94b0eae5089291cc9819637c40332c21676ddc360af28dbf98c48fc83acd035c6ac5e5f4eb62e0043f340eda311 SHA512 dfb36f438e59913cde540c8bc429bf856078c174a53406de851ac59337f70efbd5988e6a969bd16ab8cb2a197871c6f7353c3ccbdaf492a4c047fc11ede36a78
 DIST node-v18.9.1.tar.xz 38315220 BLAKE2B 515ab64db023c5809c476c1248e2d47a49d46ed273ee0f91ac803791b0e7a51f3dd2f0ee7f30901d9a1fbc9172dd971c9845c86a703c6194bc8f983d3f81567c SHA512 fc570dbd41197363d0f9bc3f329fbdffd0cb5b7382327e206d40b3b4e42a80fa65debb172abd501021bcc5082d8d99fc5f6faa05cf87066170c87be1b15e8734
 EBUILD nodejs-14.20.1.ebuild 7114 BLAKE2B 94d3c03bf705b1eb513f7cfb33ccf55a556114f8147628c6479e609723425bdd33535655dc61d817fdb4fe08050a4f6688923e2696a22ebd7cad5d852a4dc4b4 SHA512 2610f1985f4089096809bd6d7ca8e84e35a869f437dfe512b876c7f9291ffe50257635dccf72302822bc1d195d158eae54285b95d1e53b3e9fff57a51d30cdba
 EBUILD nodejs-16.17.1.ebuild 6728 BLAKE2B 6b42c92e8cb0bdf283c6eff5548eab9321ce0d045cf8499b059cb9708b394ca64e34f16faeddc68076629c922d9b02b363edd37c223bae327f02828dea4c239d SHA512 f4f45fcb35639382a0c13cb6ed9717fb0ab08815738c0e07f8f2ff5d7d8e8c3bda7050df567fdeff754a1adc57fafcfff705eba2dbb03e047719d36f44591ff2
+EBUILD nodejs-16.18.0.ebuild 6733 BLAKE2B f22acbdda582845a79560c5deedb44ab8d5989de4992cda35074d34b548c0a6ecc8c40b213f2cd5d0ba69cffc7ae65fbac2297ff0050d4c08438f17b3022b990 SHA512 cfd0e78387fb05b6a1cd59ae631bee3ce5da601390c686bceb606766eec7c6989ceded8a48a727686c48fae9bba3b81407cbd2e2cf3b04c70d9010d74af6dcde
 EBUILD nodejs-18.10.0.ebuild 7492 BLAKE2B b4c56a266693fa31370785937c5f898631e3134b7830e3bc675c480f2cc048857612621f2f9962bc29b544bb3875392b2ef654863ce9fc6490dd617d148d01fb SHA512 c7bd59aef5b76beb67c070b5619aab15b9971c68b7414d7eece64dc31668f7b41708eec46985f3a4c522889f37d0d89a174a0fc743c12e7a1973e5fb7c57bb27
+EBUILD nodejs-18.11.0.ebuild 7492 BLAKE2B b4c56a266693fa31370785937c5f898631e3134b7830e3bc675c480f2cc048857612621f2f9962bc29b544bb3875392b2ef654863ce9fc6490dd617d148d01fb SHA512 c7bd59aef5b76beb67c070b5619aab15b9971c68b7414d7eece64dc31668f7b41708eec46985f3a4c522889f37d0d89a174a0fc743c12e7a1973e5fb7c57bb27
 EBUILD nodejs-18.9.1.ebuild 7487 BLAKE2B 9af8d590bc94a6500045d43ad407b2c3cb3d66f78148079a4576c301ca9d4f94aee8c54e16393d9e21d537de79cd9c263d011c680827652414bd3cb171891b7a SHA512 ef3a5116f04b6e9e5087bf21d0f5643806a9df503487a8dc95f86373add12892a9fc7d05cc3fb58445dcfb052047691f0597bb50342c47e9493b1d3091762841
 EBUILD nodejs-99999999.ebuild 7492 BLAKE2B b4c56a266693fa31370785937c5f898631e3134b7830e3bc675c480f2cc048857612621f2f9962bc29b544bb3875392b2ef654863ce9fc6490dd617d148d01fb SHA512 c7bd59aef5b76beb67c070b5619aab15b9971c68b7414d7eece64dc31668f7b41708eec46985f3a4c522889f37d0d89a174a0fc743c12e7a1973e5fb7c57bb27
 MISC metadata.xml 898 BLAKE2B a67e85ea95c272b8d18746254894b058433267a74b5bad66bac7d78c7db4cec297e06bc87fad3ee836fc91749aaee2c11c88b48b6ba033c36fa79132552faa81 SHA512 d498b288058e7282c5e9a28d4ba192a2ac5ef796eb1edf644aea41cab2d0eb6036426b188dd9af7eeb2eaf04b84011460cb3c3695ca8dde5667add21d9963c97
diff --git a/net-libs/nodejs/nodejs-16.18.0.ebuild b/net-libs/nodejs/nodejs-16.18.0.ebuild
new file mode 100644
index 000000000000..60ccb02f3246
--- /dev/null
+++ b/net-libs/nodejs/nodejs-16.18.0.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CONFIG_CHECK="~ADVISE_SYSCALLS"
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9:=
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.2:=
+	>=net-libs/nghttp2-1.41.0:=
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	sys-devel/gcc:*"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-16.4.2-paxmarking.patch )
+
+	# All this test does is check if the npm CLI produces warnings of any sort,
+	# failing if it does. Overkill, much? Especially given one possible warning
+	# is that there is a newer version of npm available upstream (yes, it does
+	# use the network if available), thus making it a real possibility for this
+	# test to begin failing one day even though it was fine before.
+	rm -f test/parallel/test-release-npm.js
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+	# nodejs unconditionally links to libatomic #869992
+	# specifically it requires __atomic_is_lock_free which
+	# is not yet implemented by sys-libs/compiler-rt (see
+	# https://reviews.llvm.org/D85044?id=287068), therefore
+	# we depend on gcc and force using libgcc as the support lib
+	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		lp64*) myarch="riscv64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		keepdir /etc/npm
+
+		# Install bash completion for `npm`
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	if has usersandbox ${FEATURES}; then
+		rm -f "${S}"/test/parallel/test-fs-mkdir.js
+		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
+			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-18.11.0.ebuild b/net-libs/nodejs/nodejs-18.11.0.ebuild
new file mode 100644
index 000000000000..6c803a2495ee
--- /dev/null
+++ b/net-libs/nodejs/nodejs-18.11.0.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CONFIG_CHECK="~ADVISE_SYSCALLS"
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9:=
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.2:=
+	>=net-libs/nghttp2-1.41.0:=
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	sys-devel/gcc:*"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+)
+
+# These are measured on a loong machine with -ggdb on, and only checked
+# if debugging flags are present in CFLAGS.
+#
+# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
+# limit for memory usage. Disk usage was 19.1GiB for the build directory and
+# 1.2GiB for the installed image, so we leave some room for architectures with
+# fatter binaries and set the disk requirement to 22GiB.
+CHECKREQS_MEMORY="8G"
+CHECKREQS_DISK_BUILD="22G"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.3.0-paxmarking.patch )
+
+	# All this test does is check if the npm CLI produces warnings of any sort,
+	# failing if it does. Overkill, much? Especially given one possible warning
+	# is that there is a newer version of npm available upstream (yes, it does
+	# use the network if available), thus making it a real possibility for this
+	# test to begin failing one day even though it was fine before.
+	rm -f test/parallel/test-release-npm.js
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+	# nodejs unconditionally links to libatomic #869992
+	# specifically it requires __atomic_is_lock_free which
+	# is not yet implemented by sys-libs/compiler-rt (see
+	# https://reviews.llvm.org/D85044?id=287068), therefore
+	# we depend on gcc and force using libgcc as the support lib
+	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case "${ARCH}:${ABI}" in
+		*:amd64) myarch="x64";;
+		*:arm) myarch="arm";;
+		*:arm64) myarch="arm64";;
+		loong:lp64*) myarch="loong64";;
+		riscv:lp64*) myarch="riscv64";;
+		*:ppc64) myarch="ppc64";;
+		*:x32) myarch="x32";;
+		*:x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		keepdir /etc/npm
+
+		# Install bash completion for `npm`
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	if has usersandbox ${FEATURES}; then
+		rm -f "${S}"/test/parallel/test-fs-mkdir.js
+		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
+			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 025c4e7ffecf..2093fb866fb6 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index 8be16ab13a6b..7d8565d2be71 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -3,4 +3,4 @@ AUX rpcbind.initd 414 BLAKE2B 38636c24567ab930a5222711112bb197f7bdf2289773adda1e
 DIST rpcbind-1.2.6.tar.bz2 124590 BLAKE2B bb0e9f81e4747f8a732c9e25af561e79f2b6cd1c1955db586833871901b6da73f4b7ef32149a81b75daa81359b9c0554726670460b28857042dd66a2f861cac2 SHA512 fb89c61be4c533fe2e6057749d97079a2d1c9fac0d35d6be1a159a0edbf86092b3fc121f19fa920e75aac5ecdd3f59f5978e6401d5cad16cd438c977736206a7
 EBUILD rpcbind-1.2.6.ebuild 1500 BLAKE2B 2d3a7beb13bd43138c5b7d6a21a3f1772a2faa17428fbaa031d5596f843795e130d5f8dad612df285ab9c2244ab7f32e0fff3ff6cfa300ba84a8bf82c57db681 SHA512 2cfea53a9dfac29dac95f6f33418ccbaf6a31038436a9321e73127d4271aa37c35f0ec11e7913882bc11c90d9e9446ff61faa0dd84c81232c315395882fa7eda
 EBUILD rpcbind-9999.ebuild 1495 BLAKE2B dd6f81064866d04bef23c668e589b612ab7d9a7f01c3bfc24e3a23c210ceef37496df7061d369f5b71d236116690b9378f5f4b84a7144034058cfd6a4fb72263 SHA512 edeaa4c058963be5384c65bfdf1d22db71c206a2f28cc86d88c078e3bddda507594360edb76c36dfbb2085fb69a0bb1e10030e12f40021c911964c8b5833844b
-MISC metadata.xml 460 BLAKE2B 2e7352e45c26bd8e6a7bf73c0fa09bb13cacb818d761b24ff5f7a6a745a3c8cf9cebd9b4d1157f26e7089242736fa6c65bdfab55368973154a17bccf286ec0c1 SHA512 4d68eacefeffe672e6945661b33dae822ff9a8318e6fb3aa0e67cb7176f8f2e1ddf055a4089306659ce8a6adc28551f079b5791e39cb88b88948aba3c03fda39
+MISC metadata.xml 527 BLAKE2B 451142c3b3f6008a682a2dc4f4979984fc222db0d084be0347fe8b28f1c0895610a8e9164bfba1952dc07afaa470f3fb0a7e42f5c95253f9d05851548398ea08 SHA512 f24c74049072e223923075bb9dd60adf3f6bbf5ab942793e6c0d8bf4489371c9bf167eaee9d29a66252cfe249457382690861e8a4d33fbfad88b1311c78ab837
diff --git a/net-nds/rpcbind/metadata.xml b/net-nds/rpcbind/metadata.xml
index 7c87940b9c70..0f3a3d4aa27e 100644
--- a/net-nds/rpcbind/metadata.xml
+++ b/net-nds/rpcbind/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="warmstarts">Enables rpcbind to cache configuration for warm restarts</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:rpcbind_project:rpcbind</remote-id>
 		<remote-id type="sourceforge">rpcbind</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index b76b0cbf100c..c68ef9828602 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 79fea51771c8..184f69aa3f37 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,11 +1,5 @@
-DIST nicotine+-2.2.2.tar.gz 3373462 BLAKE2B 6dbcf4e9d7f85bb2e03194047c8ca9c374ae762967414d888e764e84b25682148245cf84c27ab967279f4ac5e3bad680a7920d3da7896e61d12413194c9ad207 SHA512 5d863b94d1a899701f3d6cd98d875a4ca782778b00d77fe3c490af59168592011a83f823feac6c0e71bdd4c5cfd743e023066d542d8778b68854344b73c322a1
-DIST nicotine+-3.1.1.tar.gz 2775643 BLAKE2B 9c595f8bf2bb4e7c79c3a5a57cadcfea8d2f0df6c89cd93f63f1e5c1117dbe5d85f98ac94c5f7e367e145869e136c701dbf61d1caa270959b29544ab5da17314 SHA512 28eaca5f270176ff5562f693906b4dfef180b91f0113332e3fc1659acaa6bb49e8f956b03612effab14f6833e9e7c00ebca75ca3c49906cd990d1e82e1bb5be3
-DIST nicotine+-3.2.0.tar.gz 3413614 BLAKE2B 8c63e5a1ee138dd4fbb27aaa160e381d40cf1bad95d86db454de4697ae5b0433309c33f9e6b6da1db2c862225159878fef483cd49f23d4cac14a98f17c43e4f9 SHA512 3c2299b9da44579060825a758cb45cd3a844bda405e99d411f714845c8dd662839d3158ac1ae3e197f4d1da68547ff161c3ed09dd35a95867e78faf0239b3b18
-DIST nicotine+-3.2.1.tar.gz 3515855 BLAKE2B 5d21c5e725f43e06ad7698909b3c5eaaa984a2aedcfe3fb73886d55a9253d38ab317402781fb9d3e680c89f3dac8865f691233b22b4a13c86cc6b9e88ffa69c8 SHA512 6566ccb2d1355f6dc882c6fe7144da641cd1fd299b1ebd352ccb7e0a770af3ea718d83245c26b38dd0aa4dcd246fcfc0a1e4a94e096c8946a3413b73afb390f7
 DIST nicotine+-3.2.2.tar.gz 2868677 BLAKE2B d066f6ca54af627eb20a6bd76db57ece77ce00ca084d7f70efb7168a786a2666121126dc6e62ec9eddebf28ba370e5768a3e771f4ea34cf2073e782b8b74d8e0 SHA512 e8e28b7452a31b7221135e145eb7ee91e30a927a4dbf42bafa7d3380835f2cde4cbf28adc77041b80b6bc4d20d7a5e37043822933468e81dc9ca3458b152666d
-EBUILD nicotine+-2.2.2.ebuild 837 BLAKE2B 275ed5b79caeb4a8a6090c25ea3a6ad43e03608700364dd3e17acbea2dbde07b3dd2c60a2913369da0a90b5107623445a0068caeb725778896edefe9af507e11 SHA512 41777ba58191572c64092300f2833e4868145fb12bf3e534eaaa41563a5e92586729b5e0690a03b92ec827c8971b2c15d7519e6f6c682b4059cf203f40d7e197
-EBUILD nicotine+-3.1.1.ebuild 837 BLAKE2B da3b55c3ca0285ad172f542556f95b43c3e3c185428f3e1769567f3814f55f89602e5a0596bdfd641c9db0bf1d205d98a90906f09b33cba3ee31d021fd1e35a4 SHA512 daf7ed4ae4353eee61f4132d3c31ad93f14614d8870451ed0b678b1f9bc2b6253114e3ea259b01c1f6023b9347916f311763093ddeec4e371bee731fb4e1db74
-EBUILD nicotine+-3.2.0.ebuild 837 BLAKE2B da3b55c3ca0285ad172f542556f95b43c3e3c185428f3e1769567f3814f55f89602e5a0596bdfd641c9db0bf1d205d98a90906f09b33cba3ee31d021fd1e35a4 SHA512 daf7ed4ae4353eee61f4132d3c31ad93f14614d8870451ed0b678b1f9bc2b6253114e3ea259b01c1f6023b9347916f311763093ddeec4e371bee731fb4e1db74
-EBUILD nicotine+-3.2.1.ebuild 837 BLAKE2B da3b55c3ca0285ad172f542556f95b43c3e3c185428f3e1769567f3814f55f89602e5a0596bdfd641c9db0bf1d205d98a90906f09b33cba3ee31d021fd1e35a4 SHA512 daf7ed4ae4353eee61f4132d3c31ad93f14614d8870451ed0b678b1f9bc2b6253114e3ea259b01c1f6023b9347916f311763093ddeec4e371bee731fb4e1db74
+DIST nicotine+-3.2.5.tar.gz 2966816 BLAKE2B d42c8a7d253a7b58c414f67a0abd67c6ecd7523e0ec0b649275751a34c661a49b01ff67578cbd37af74c68696cd0afe9b0ee8a184172ad3f2b5a29d655d956cf SHA512 a71d096e7a77c0e147cb5b3d62d194967ae903fb6263b8fcb0819c67ab551fdb72be72326223d846e9584db97a22afc721b695205c26d79d579c6fe957d20644
 EBUILD nicotine+-3.2.2-r1.ebuild 924 BLAKE2B c2f7c495d14d87ed3c6fe2d77c2f107a825acb2ac9e65895e06ca7c27ee483263aac599ea630da4e335170f7904f9e6ef0c54f28e200f847c4cfbe921398579e SHA512 bde6b8b8d56e668f3a446314d5f1bf3f1a65b4b77e694e3fceb63aedb6d1ffb2fb0de43c708c6c48c58877a3e5803a8adf1537b8e9d9c56eb7d148fa758e60b5
+EBUILD nicotine+-3.2.5.ebuild 844 BLAKE2B 0232582e4307fd2065e8a3e0ecd4ad4edade6ec2960efdbaefd7f3cc64ed419bddff7717a953a1965284503e79e2909f13d08e36625dbf9e29b6b8761b170f55 SHA512 b08ee74c0b987856c302c63e3423720f40a180f760b520424498cb38dedff2ebcce864dd1d576d4839b220e4d49272edc2bcb66818eaaacdc41430929edd60dc
 MISC metadata.xml 345 BLAKE2B 511ecb1a01b9dd891b37d035ec3a7e7835de48f147fd851e256a3c2cdfb356018f91c14a07f7ca4cf6f96ece8728454917fc02f70081ccaf142c32e8368a6a38 SHA512 a885286829ac4ddf04ccf11a9105d2b5ab5862a8a84eedaa547da4cf0c53b5b1c4957fe40826df87b23fd6de7f514a5dbf374b9f87f761c5f17385769a07dd8d
diff --git a/net-p2p/nicotine+/nicotine+-2.2.2.ebuild b/net-p2p/nicotine+/nicotine+-2.2.2.ebuild
deleted file mode 100644
index 20972ff1852b..000000000000
--- a/net-p2p/nicotine+/nicotine+-2.2.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
-HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
-SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	${DEPEND}
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/nicotine-plus-${PV}"
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/share/doc/nicotine" "${ED}/usr/share/doc/${PF}" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-p2p/nicotine+/nicotine+-3.1.1.ebuild b/net-p2p/nicotine+/nicotine+-3.1.1.ebuild
deleted file mode 100644
index 007eb217cc3a..000000000000
--- a/net-p2p/nicotine+/nicotine+-3.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
-HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
-SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	${DEPEND}
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/nicotine-plus-${PV}"
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/share/doc/nicotine" "${ED}/usr/share/doc/${PF}" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-p2p/nicotine+/nicotine+-3.2.1.ebuild b/net-p2p/nicotine+/nicotine+-3.2.1.ebuild
deleted file mode 100644
index 007eb217cc3a..000000000000
--- a/net-p2p/nicotine+/nicotine+-3.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
-HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
-SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	${DEPEND}
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/nicotine-plus-${PV}"
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/share/doc/nicotine" "${ED}/usr/share/doc/${PF}" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-p2p/nicotine+/nicotine+-3.2.0.ebuild b/net-p2p/nicotine+/nicotine+-3.2.5.ebuild
index 007eb217cc3a..66c30e2034be 100644
--- a/net-p2p/nicotine+/nicotine+-3.2.0.ebuild
+++ b/net-p2p/nicotine+/nicotine+-3.2.5.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..11} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 xdg-utils
 
@@ -13,7 +14,7 @@ SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz ->
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
@@ -27,10 +28,11 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/nicotine-plus-${PV}"
 
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/share/doc/nicotine" "${ED}/usr/share/doc/${PF}" || die
-}
+EPYTEST_IGNORE=(
+	"test/integration/test_startup.py"
+)
+
+distutils_enable_tests pytest
 
 pkg_postinst() {
 	xdg_icon_cache_update
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e7e70ae02866..181556b5a2bd 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index ae472dda33af..194429d3a2f9 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -11,4 +11,4 @@ DIST kexec-tools-2.0.24.tar.xz 303808 BLAKE2B 8188602f1b843c1dccc0307131f8c9ec04
 EBUILD kexec-tools-2.0.22.ebuild 3265 BLAKE2B f73c0709212598dc834fe12567891266c3e07fb6efbbd3fb91a1b579faba10475d387a73a53ac7ce5b694db0c2d67ae6bb1fa602faae6902e42e0b0920d0e725 SHA512 05f74d84eadb72d9399a1769d69520191d98e057d137253c49d0faef523a0f6f2f7a85c582fc5cf60606cb3d91a15d7c813835ab668419d32fa3091ea63a5e1e
 EBUILD kexec-tools-2.0.24.ebuild 3267 BLAKE2B f93324b4be4091c0092424f0717a570d9f250adb1f65b48d25151b05e8ff5837699d20fa7ef69a0750f6cab43acb27cfef7cad9ac0b1a11fd9647b5f54e8a050 SHA512 9154ec583877c3ca6e68dd4877435f07c27ae44db63246869fe3eba265b0d644c9f7ba76be1b44bef09f9e90907a7e32456633428577395465d3cf60493420b6
 EBUILD kexec-tools-9999.ebuild 3267 BLAKE2B 69aca60481b1300d82a3d0198501423b6505570ff16da0dd54f7c516786fac11c15eb7fa2ba01b8d75d83c0eeea9934fb7c63816856d56699857483c1949e97a SHA512 9bc20ee9eb06df7d6f29f28e7b56ea8266b1fa01a61ee669c979c2cb00c9e86fb6a69f151265fcd1e33afae8dd77f6bfb3bcc44375caf71da176e400caba86d0
-MISC metadata.xml 491 BLAKE2B a47fdf282e096eb77748e23470df2a95cf2982e1e722ea74b9aee795f764e287a9364836139bba6462afd0a0f2a9d2f67c25ba1dd22a0a842a3f547a92cdd476 SHA512 a9f187f3cd1d63cfcfdcd93cdb50015b2d29eeb24558530febe440e6573464712d8e83a8743efc727c4c92ad61e1c36dc7d93cd33a222d751a4ec2b75d42f17d
+MISC metadata.xml 582 BLAKE2B 6d96093efcc418ad037915d1e2288cd853d2d154ed4e44b35ad5e47af8a2eb27178552ce0a83efc23ebf57f84072e57402bdd7dbf4eaa9637ef26798ba8f2d36 SHA512 51af0b4f17757fb2b067356f94d0fa764ed8c8a7f7276ecfc55ae811b9c372ae02d14f0a298786affed9c0eec100b1a5e9b0243835ff783988af21f4fb72c42b
diff --git a/sys-apps/kexec-tools/metadata.xml b/sys-apps/kexec-tools/metadata.xml
index d56b5de4df41..eef87b3eb99f 100644
--- a/sys-apps/kexec-tools/metadata.xml
+++ b/sys-apps/kexec-tools/metadata.xml
@@ -10,4 +10,7 @@
     <flag name="booke">Include support for Book-E memory management</flag>
     <flag name="xen">Enable extended xen support</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:kernel:kexec-tools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index a74f9dfc58ff..1801b2547f90 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,19 +1,17 @@
-AUX 251-glibc-2.36.patch 4101 BLAKE2B 79b05ed39a2c840358b2030fd5bba61a3c0786e376f7fc4dee133aa7539a55008ac57a58d5c11ef9e2a2f047b359b6ab2841ea0adc5977da066e5b6c2ae26cc2 SHA512 0c4a05129a3ce22432db6e189e87db71c73be517b7e4a10e2218a0b24f0fd5d8dff331249574e6e0e1958476db95315054320837b784ae6351473f5eecc20800
 AUX 251-gpt-auto-no-cryptsetup.patch 958 BLAKE2B 7067224e613433fcb139c38597552e080e07d33b207965a9c9a2b3d4e353c43dae38e6800d6ce28cadcba5f914b1b49e80fa48929df2c4bb96248bfeb6bf6aa5 SHA512 6a78bbdde3aae9a2ad4c4f824eb5281ca9ab24770516ad7c9a9e3daf7f39475bf9b4dd868c857a9833dd408db801393f949b8fae1700b2ad04ea822dc84e3429
 AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782
-AUX 252-rc1-cryptsetup.patch 10252 BLAKE2B 5a028463c40699a088859e6834d22a951357c93813f3045747679237420c165698cf7115fb8ddbf2adcad876439a2bd74a82f803cc875a00d6807afad2a6cad9 SHA512 d02d00491001a505f44015af5d5a8596acfdb34688415c7e72b7b5cb0083a3890a99ac89458c58a32164ce248b87af9c6395dd4ea1386b13433fc2b508db2b48
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-252-rc1.tar.gz 11718698 BLAKE2B 599c5c125c0fb0477ea71195491962db230cbaa2c610afbb14a475263f356f160a77ba7321f425cb6db837649ccbce971f80daaf5524ace03362777a71e7a9b5 SHA512 e249eb39da41aca1bc371c9e2b61f135227b0653e4e175c4c6453b0ca4e1cd50894c005d4ef267b5122af4f339cd9b5a4b90a98c4f84f998f96a7ca1ed637d28
+DIST systemd-252-rc2.tar.gz 11736313 BLAKE2B 58efe76846b034ec61136fe01f535b40aabc993ffee687d4a22a20d93a3952fd15e4ac46591934a441f4e74cffec29145f441d97a69a5c456e7a3caee92602cc SHA512 f67703dcd03b300cddc2e8bfbeb843ef66ba0b0c548973797a920c1bed9e3a14a740e08936f7d906141da714bccbae0d4fcb47a7ce13e69c8a2f17d7928e218c
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
 DIST systemd-stable-251.6.tar.gz 11448383 BLAKE2B 987ea88ea23662fd4119e3c796cc2e5f428fcce6cf0b033a5f8da7974c0026d41851f517e489354bbc22973b33c3932ac7280c56527f03a1fcbce3092148b638 SHA512 2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8
 EBUILD systemd-251.4.ebuild 15500 BLAKE2B c8ea106e1dbbf830fba008ed6f70486e36a62947cf390f436b2c45856a8f3fc74d819f67983dde5fa49b854cf91e3c76e4ccb7d99af9c9753cc7a0183d8bb0d3 SHA512 f97e89cbc1fad054b265878f0f55b7bbfccdecc1f907743d4373cb7a9783805ea1e5536ad5fe759da4e3b6954146c9b456ce4147fa86f41c61187b11333ee8ec
 EBUILD systemd-251.5.ebuild 15508 BLAKE2B dd89dde571cfd27fad856e2802c8b837d96b567f07fcae62af911f9dc6ebf6752ef7a287a7f1d695695a8f84cd43638a156101fcd53488fd25bdf43d65cb8560 SHA512 1c4b6a2dd35171dea0363d1331bfa67967fdb9bc8025cf4b3fea7b20af60748373473a3efed0710a8c86762ba53fb3bdcd0df62bb1e70a55a43a1ab722171ecd
 EBUILD systemd-251.6.ebuild 15557 BLAKE2B 124b3527e460ec93d8a1f5a5fea3f435aa8db9a6b25b729ef46480b451a89aa77800d7a6062b7ba94d817152951f6f22c58d68708e2fd0fafbf73841b23bb9a0 SHA512 09f4318b267ef45fcd92d4ce3f25d5c6e665f0d1662cb339796c60e38c48ab780977d93f816f80c8e7512f6cb2c9802e68914375b351a08d14d96d2ff30365e5
-EBUILD systemd-252_rc1.ebuild 15414 BLAKE2B c6b3bc91da656036ec15f274551c377f94eb95110d9fc7d8f94601e1f0c4cf48fa030fc62a0d3bb5242d3061d132c30ca70f4a6be1526212f9190169de92896b SHA512 286665b61d82ee988be640b10103f2f05bba2c0c8efabc9cd8cbd2271e27e4e24b1cbca7f3273632bf269488b0a4743082097e4cb2dfab0cc12c32d0e3a6958d
+EBUILD systemd-252_rc2.ebuild 15373 BLAKE2B 05086c1624ee74cc5942c0a3d861d8aaca5415ff3e28d9abdf7f405d50499789f8e61aa19308313715b77c55419be5e4735930921e9cd7fe0f3b175affe71213 SHA512 0e7cf6a4a5639554cc3c9d58bb61e03461a44a6e0eedfa36fcf586124b3705ecfb785bde6df136b560e12253963ab05aaae6439a7228284bcbbb64cb5fb5310f
 EBUILD systemd-9999.ebuild 15372 BLAKE2B f480ab02dd6910b271805ef126bfefd478b9c94487dd4d2134edebd5a15e780ecb9104ae16a0f50dd921f642cb78389ffb486cc9ea76ea3d4db863a0db12d63f SHA512 ee3c87a63e7295e02679364f7337985eaf073026e57672b6352bb65979224791e491222b4309ca66ecc4df6c1b312acb4b706419299800fa8c94e179c235f5c6
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/files/251-glibc-2.36.patch b/sys-apps/systemd/files/251-glibc-2.36.patch
deleted file mode 100644
index 65693d747ca3..000000000000
--- a/sys-apps/systemd/files/251-glibc-2.36.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-https://bugs.gentoo.org/863218
-https://github.com/systemd/systemd/issues/23984
-https://github.com/systemd/systemd/commit/3657d3a01c7e25ff86d7a4642065b367c4ff7484
-https://github.com/systemd/systemd/commit/0a58cd00454cc7b57b04f3a4a334584d743d7f7a
-
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Sat, 23 Jul 2022 10:38:49 +0000
-Subject: [PATCH] glibc: Remove #include <linux/fs.h> to resolve
- fsconfig_command/mount_attr conflict with glibc 2.36
-
---- a/meson.build
-+++ b/meson.build
-@@ -511,7 +511,6 @@ decl_headers = '''
- #include <uchar.h>
- #include <sys/mount.h>
- #include <sys/stat.h>
--#include <linux/fs.h>
- '''
- 
- foreach decl : ['char16_t',
-@@ -523,6 +522,17 @@ foreach decl : ['char16_t',
-         # We get -1 if the size cannot be determined
-         have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
- 
-+        if decl == 'struct mount_attr'
-+                if have
-+                        want_linux_fs_h = false
-+                else
-+                        have = cc.sizeof(decl,
-+                                         prefix : decl_headers + '#include <linux/fs.h>',
-+                                         args : '-D_GNU_SOURCE') > 0
-+                        want_linux_fs_h = have
-+                endif
-+        endif
-+
-         if decl == 'struct statx'
-                 if have
-                         want_linux_stat_h = false
-@@ -538,6 +548,7 @@ foreach decl : ['char16_t',
- endforeach
- 
- conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
-+conf.set10('WANT_LINUX_FS_H', want_linux_fs_h)
- 
- foreach ident : ['secure_getenv', '__secure_getenv']
-         conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident))
---- a/src/basic/fd-util.c
-+++ b/src/basic/fd-util.c
-@@ -3,7 +3,9 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <linux/btrfs.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
- #include <linux/magic.h>
- #include <sys/ioctl.h>
- #include <sys/resource.h>
---- a/src/core/namespace.c
-+++ b/src/core/namespace.c
-@@ -7,7 +7,9 @@
- #include <sys/file.h>
- #include <sys/mount.h>
- #include <unistd.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
- 
- #include "alloc-util.h"
- #include "base-filesystem.h"
---- a/src/shared/mount-util.c
-+++ b/src/shared/mount-util.c
-@@ -7,7 +7,9 @@
- #include <sys/statvfs.h>
- #include <unistd.h>
- #include <linux/loop.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
- 
- #include "alloc-util.h"
- #include "chase-symlinks.h"
-
-From 0a58cd00454cc7b57b04f3a4a334584d743d7f7a Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Tue, 26 Jul 2022 20:03:12 +0900
-Subject: [PATCH] home: drop conflicted headers
-
-Fixes #24117.
---- a/src/basic/missing_fs.h
-+++ b/src/basic/missing_fs.h
-@@ -64,3 +64,8 @@
- #ifndef FS_PROJINHERIT_FL
- #define FS_PROJINHERIT_FL 0x20000000
- #endif
-+
-+/* linux/fscrypt.h */
-+#ifndef FS_KEY_DESCRIPTOR_SIZE
-+#define FS_KEY_DESCRIPTOR_SIZE 8
-+#endif
---- a/src/home/homework-cifs.c
-+++ b/src/home/homework-cifs.c
-@@ -1,5 +1,10 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-+#include <sys/mount.h>
-+#if WANT_LINUX_FS_H
-+#include <linux/fs.h>
-+#endif
-+
- #include "dirent-util.h"
- #include "fd-util.h"
- #include "fileio.h"
---- a/src/home/homework-luks.c
-+++ b/src/home/homework-luks.c
-@@ -4,7 +4,6 @@
- #include <poll.h>
- #include <sys/file.h>
- #include <sys/ioctl.h>
--#include <sys/mount.h>
- #include <sys/xattr.h>
- 
- #if HAVE_VALGRIND_MEMCHECK_H
---- a/src/home/homework-mount.c
-+++ b/src/home/homework-mount.c
-@@ -2,7 +2,9 @@
- 
- #include <sched.h>
- #include <sys/mount.h>
-+#if WANT_LINUX_FS_H
- #include <linux/fs.h>
-+#endif
- 
- #include "alloc-util.h"
- #include "fd-util.h"
---- a/src/home/homework.h
-+++ b/src/home/homework.h
-@@ -1,13 +1,14 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- #pragma once
- 
--#include <linux/fs.h>
- #include <sys/vfs.h>
- 
- #include "sd-id128.h"
- 
-+#include "cryptsetup-util.h"
- #include "homework-password-cache.h"
- #include "loop-util.h"
-+#include "missing_fs.h" /* for FS_KEY_DESCRIPTOR_SIZE, do not include linux/fs.h */
- #include "missing_keyctl.h"
- #include "missing_syscall.h"
- #include "user-record.h"
-
diff --git a/sys-apps/systemd/files/252-rc1-cryptsetup.patch b/sys-apps/systemd/files/252-rc1-cryptsetup.patch
deleted file mode 100644
index 54b4ce1ea0aa..000000000000
--- a/sys-apps/systemd/files/252-rc1-cryptsetup.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-From bbf73b00697e77ca35ae60109418da77f257be52 Mon Sep 17 00:00:00 2001
-From: Daan De Meyer <daan.j.demeyer@gmail.com>
-Date: Tue, 11 Oct 2022 20:35:34 +0200
-Subject: [PATCH 1/2] cryptsetup-util: Always define dlopen_cryptsetup()
-
----
- src/shared/cryptsetup-util.c | 118 ++++++++++++++++++-----------------
- src/shared/cryptsetup-util.h |   4 +-
- 2 files changed, 63 insertions(+), 59 deletions(-)
-
-diff --git a/src/shared/cryptsetup-util.c b/src/shared/cryptsetup-util.c
-index da6dcb2f093a..401e7a3f9c7d 100644
---- a/src/shared/cryptsetup-util.c
-+++ b/src/shared/cryptsetup-util.c
-@@ -50,63 +50,6 @@ int (*sym_crypt_token_max)(const char *type);
- crypt_token_info (*sym_crypt_token_status)(struct crypt_device *cd, int token, const char **type);
- int (*sym_crypt_volume_key_get)(struct crypt_device *cd, int keyslot, char *volume_key, size_t *volume_key_size, const char *passphrase, size_t passphrase_size);
- 
--int dlopen_cryptsetup(void) {
--        int r;
--
--        r = dlopen_many_sym_or_warn(
--                        &cryptsetup_dl, "libcryptsetup.so.12", LOG_DEBUG,
--                        DLSYM_ARG(crypt_activate_by_passphrase),
--#if HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY
--                        DLSYM_ARG(crypt_activate_by_signed_key),
--#endif
--                        DLSYM_ARG(crypt_activate_by_volume_key),
--                        DLSYM_ARG(crypt_deactivate_by_name),
--                        DLSYM_ARG(crypt_format),
--                        DLSYM_ARG(crypt_free),
--                        DLSYM_ARG(crypt_get_cipher),
--                        DLSYM_ARG(crypt_get_cipher_mode),
--                        DLSYM_ARG(crypt_get_data_offset),
--                        DLSYM_ARG(crypt_get_device_name),
--                        DLSYM_ARG(crypt_get_dir),
--                        DLSYM_ARG(crypt_get_type),
--                        DLSYM_ARG(crypt_get_uuid),
--                        DLSYM_ARG(crypt_get_verity_info),
--                        DLSYM_ARG(crypt_get_volume_key_size),
--                        DLSYM_ARG(crypt_init),
--                        DLSYM_ARG(crypt_init_by_name),
--                        DLSYM_ARG(crypt_keyslot_add_by_volume_key),
--                        DLSYM_ARG(crypt_keyslot_destroy),
--                        DLSYM_ARG(crypt_keyslot_max),
--                        DLSYM_ARG(crypt_load),
--                        DLSYM_ARG(crypt_resize),
--                        DLSYM_ARG(crypt_resume_by_passphrase),
--                        DLSYM_ARG(crypt_set_data_device),
--                        DLSYM_ARG(crypt_set_debug_level),
--                        DLSYM_ARG(crypt_set_log_callback),
--#if HAVE_CRYPT_SET_METADATA_SIZE
--                        DLSYM_ARG(crypt_set_metadata_size),
--#endif
--                        DLSYM_ARG(crypt_set_pbkdf_type),
--                        DLSYM_ARG(crypt_suspend),
--                        DLSYM_ARG(crypt_token_json_get),
--                        DLSYM_ARG(crypt_token_json_set),
--#if HAVE_CRYPT_TOKEN_MAX
--                        DLSYM_ARG(crypt_token_max),
--#endif
--                        DLSYM_ARG(crypt_token_status),
--                        DLSYM_ARG(crypt_volume_key_get));
--        if (r <= 0)
--                return r;
--
--        /* Redirect the default logging calls of libcryptsetup to our own logging infra. (Note that
--         * libcryptsetup also maintains per-"struct crypt_device" log functions, which we'll also set
--         * whenever allocating a "struct crypt_device" context. Why set both? To be defensive: maybe some
--         * other code loaded into this process also changes the global log functions of libcryptsetup, who
--         * knows? And if so, we still want our own objects to log via our own infra, at the very least.) */
--        cryptsetup_enable_logging(NULL);
--        return 1;
--}
--
- static void cryptsetup_log_glue(int level, const char *msg, void *usrptr) {
- 
-         switch (level) {
-@@ -246,6 +189,67 @@ int cryptsetup_add_token_json(struct crypt_device *cd, JsonVariant *v) {
- }
- #endif
- 
-+int dlopen_cryptsetup(void) {
-+#if HAVE_LIBCRYPTSETUP
-+        int r;
-+
-+        r = dlopen_many_sym_or_warn(
-+                        &cryptsetup_dl, "libcryptsetup.so.12", LOG_DEBUG,
-+                        DLSYM_ARG(crypt_activate_by_passphrase),
-+#if HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY
-+                        DLSYM_ARG(crypt_activate_by_signed_key),
-+#endif
-+                        DLSYM_ARG(crypt_activate_by_volume_key),
-+                        DLSYM_ARG(crypt_deactivate_by_name),
-+                        DLSYM_ARG(crypt_format),
-+                        DLSYM_ARG(crypt_free),
-+                        DLSYM_ARG(crypt_get_cipher),
-+                        DLSYM_ARG(crypt_get_cipher_mode),
-+                        DLSYM_ARG(crypt_get_data_offset),
-+                        DLSYM_ARG(crypt_get_device_name),
-+                        DLSYM_ARG(crypt_get_dir),
-+                        DLSYM_ARG(crypt_get_type),
-+                        DLSYM_ARG(crypt_get_uuid),
-+                        DLSYM_ARG(crypt_get_verity_info),
-+                        DLSYM_ARG(crypt_get_volume_key_size),
-+                        DLSYM_ARG(crypt_init),
-+                        DLSYM_ARG(crypt_init_by_name),
-+                        DLSYM_ARG(crypt_keyslot_add_by_volume_key),
-+                        DLSYM_ARG(crypt_keyslot_destroy),
-+                        DLSYM_ARG(crypt_keyslot_max),
-+                        DLSYM_ARG(crypt_load),
-+                        DLSYM_ARG(crypt_resize),
-+                        DLSYM_ARG(crypt_resume_by_passphrase),
-+                        DLSYM_ARG(crypt_set_data_device),
-+                        DLSYM_ARG(crypt_set_debug_level),
-+                        DLSYM_ARG(crypt_set_log_callback),
-+#if HAVE_CRYPT_SET_METADATA_SIZE
-+                        DLSYM_ARG(crypt_set_metadata_size),
-+#endif
-+                        DLSYM_ARG(crypt_set_pbkdf_type),
-+                        DLSYM_ARG(crypt_suspend),
-+                        DLSYM_ARG(crypt_token_json_get),
-+                        DLSYM_ARG(crypt_token_json_set),
-+#if HAVE_CRYPT_TOKEN_MAX
-+                        DLSYM_ARG(crypt_token_max),
-+#endif
-+                        DLSYM_ARG(crypt_token_status),
-+                        DLSYM_ARG(crypt_volume_key_get));
-+        if (r <= 0)
-+                return r;
-+
-+        /* Redirect the default logging calls of libcryptsetup to our own logging infra. (Note that
-+         * libcryptsetup also maintains per-"struct crypt_device" log functions, which we'll also set
-+         * whenever allocating a "struct crypt_device" context. Why set both? To be defensive: maybe some
-+         * other code loaded into this process also changes the global log functions of libcryptsetup, who
-+         * knows? And if so, we still want our own objects to log via our own infra, at the very least.) */
-+        cryptsetup_enable_logging(NULL);
-+        return 1;
-+#else
-+        return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "cryptsetup support is not compiled in.");
-+#endif
-+}
-+
- int cryptsetup_get_keyslot_from_token(JsonVariant *v) {
-         int keyslot, r;
-         JsonVariant *w;
-diff --git a/src/shared/cryptsetup-util.h b/src/shared/cryptsetup-util.h
-index b1ce07ec8a50..b390dc9a5cbb 100644
---- a/src/shared/cryptsetup-util.h
-+++ b/src/shared/cryptsetup-util.h
-@@ -65,8 +65,6 @@ static inline int crypt_token_max(_unused_ const char *type) {
- extern crypt_token_info (*sym_crypt_token_status)(struct crypt_device *cd, int token, const char **type);
- extern int (*sym_crypt_volume_key_get)(struct crypt_device *cd, int keyslot, char *volume_key, size_t *volume_key_size, const char *passphrase, size_t passphrase_size);
- 
--int dlopen_cryptsetup(void);
--
- DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, crypt_free, NULL);
- DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, sym_crypt_free, NULL);
- 
-@@ -91,6 +89,8 @@ static inline void sym_crypt_freep(struct crypt_device** cd) {}
- 
- #endif
- 
-+int dlopen_cryptsetup(void);
-+
- int cryptsetup_get_keyslot_from_token(JsonVariant *v);
- 
- static inline const char *mangle_none(const char *s) {
-
-From 86bebe385f6e35ecec708e44dae2b896f5bfa770 Mon Sep 17 00:00:00 2001
-From: Daan De Meyer <daan.j.demeyer@gmail.com>
-Date: Tue, 11 Oct 2022 20:36:03 +0200
-Subject: [PATCH 2/2] repart: Always define VerityMode from/to string functions
-
----
- src/partition/repart.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/partition/repart.c b/src/partition/repart.c
-index a0f7d4164500..dd544d6415a9 100644
---- a/src/partition/repart.c
-+++ b/src/partition/repart.c
-@@ -255,12 +255,11 @@ static const char *verity_mode_table[_VERITY_MODE_MAX] = {
- 
- #if HAVE_LIBCRYPTSETUP
- DEFINE_PRIVATE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(encrypt_mode, EncryptMode, ENCRYPT_KEY_FILE);
--DEFINE_PRIVATE_STRING_TABLE_LOOKUP(verity_mode, VerityMode);
- #else
- DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING_WITH_BOOLEAN(encrypt_mode, EncryptMode, ENCRYPT_KEY_FILE);
--DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING(verity_mode, VerityMode);
- #endif
- 
-+DEFINE_PRIVATE_STRING_TABLE_LOOKUP(verity_mode, VerityMode);
- 
- static uint64_t round_down_size(uint64_t v, uint64_t p) {
-         return (v / p) * p;
-From 748367c72368031ca0ef32fadd394c4bcacc126a Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Wed, 12 Oct 2022 21:47:29 +0200
-Subject: [PATCH] gpt-auto: allow using without cryptsetup
-
-Fixes #24978
----
- src/gpt-auto-generator/gpt-auto-generator.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index 31377d877d5c..5584eb22af1a 100644
---- a/src/gpt-auto-generator/gpt-auto-generator.c
-+++ b/src/gpt-auto-generator/gpt-auto-generator.c
-@@ -571,11 +571,15 @@ static int add_root_rw(DissectedPartition *p) {
- 
- #if ENABLE_EFI
- static int add_root_cryptsetup(void) {
-+#if HAVE_LIBCRYPTSETUP
- 
-         /* If a device /dev/gpt-auto-root-luks appears, then make it pull in systemd-cryptsetup-root.service, which
-          * sets it up, and causes /dev/gpt-auto-root to appear which is all we are looking for. */
- 
-         return add_cryptsetup("root", "/dev/gpt-auto-root-luks", true, false, NULL);
-+#else
-+        return 0;
-+#endif
- }
- #endif
- 
diff --git a/sys-apps/systemd/systemd-252_rc1.ebuild b/sys-apps/systemd/systemd-252_rc2.ebuild
index 6d2654a50d90..2b38fab6fdb7 100644
--- a/sys-apps/systemd/systemd-252_rc1.ebuild
+++ b/sys-apps/systemd/systemd-252_rc2.ebuild
@@ -235,7 +235,6 @@ src_unpack() {
 
 src_prepare() {
 	local PATCHES=(
-		"${FILESDIR}/252-rc1-cryptsetup.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index befcdb063bb0..d2366d10566b 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/RyzenAdj/Manifest b/sys-power/RyzenAdj/Manifest
index 734ae5f32007..038828ee5422 100644
--- a/sys-power/RyzenAdj/Manifest
+++ b/sys-power/RyzenAdj/Manifest
@@ -1,7 +1,9 @@
 DIST RyzenAdj-0.10.0.tar.gz 125039 BLAKE2B 633f33942cd63ca664d52d49dd3590e1f7df099a26afc3a98b975ac52ff1ee831505e8eae9f6ab6b971d0e997e75ce1634056584fde397cad255c080c8888928 SHA512 4066b77963540014b6910d7da0e6465555a063b526a050c222c6c462ecce8eca31aadeaeb35e14836d0251df22c35ccd440e155a4d8c35b25ad61fd34299a965
+DIST RyzenAdj-0.11.1.tar.gz 125189 BLAKE2B c7b928c2b17720e792c028c11da4d5e74f92bb8a28bd92f4116e22bc8e5f054675f70ca97882f204a4e4b02edf0575fe6efaf5bddf32a76d1d0df6404b0528ac SHA512 b7c070d6d648e00fda87b2f780b1e369f2f62a24bddebce1b34983849e221923878fcc19e5e9ac1519428e26013248c1288e5df9f365ca5525d0d8f6ed6e22f7
 DIST RyzenAdj-0.8.2.tar.gz 122245 BLAKE2B 8a2bc25e1f3030c4e1832149c359cc31fee29303643db9724afc34f4cb5afa4076049ce7c8634034fa4415ace9b71b3bace8bacb55e7ee7630c65285b843e1f9 SHA512 740f3aa57b349e9ccba715aed45e6fdd61ad22ebf1050bba8a11da7c5d6aaa37a39b9c3b6a1762556da7f9424e3af63de19476eb5f6cb7593cd8edb4f5f4b248
 DIST RyzenAdj-0.8.3.tar.gz 122381 BLAKE2B 39cfaee1013eace362805acbc330ba791c03297d416484ddc96dd10553df1a78eb849ce8f90fea40415c0caf8fdcbe7059d7b27e21a0db9dcd04f99ebdf640a3 SHA512 57e3c9a0c85e194b2200ad2a265dd293bc04434bded8bf0cf61a9ae0ae08dbf993363e7fb7d02033b896828fbe6b637c6b23ab3cb0587d4f1d0108c9cdd3ea36
 EBUILD RyzenAdj-0.10.0.ebuild 630 BLAKE2B 5d038ea25e857ee485f06ca109cfbdee162dddc549f2ecd57c3ee503fa50e88492c36c346d6788b723c95b172a196feeb13aa854d3da19adb5d83275dd05dc0b SHA512 8c49b9c347e57fd4f82159b15f691f2345c3f15fa0ab5f4d2f2508cbb12ed1534fd50db207b17eb77e311e0b1a8e2208960509a64281e62cb0087e845f87665d
+EBUILD RyzenAdj-0.11.1.ebuild 630 BLAKE2B 5d038ea25e857ee485f06ca109cfbdee162dddc549f2ecd57c3ee503fa50e88492c36c346d6788b723c95b172a196feeb13aa854d3da19adb5d83275dd05dc0b SHA512 8c49b9c347e57fd4f82159b15f691f2345c3f15fa0ab5f4d2f2508cbb12ed1534fd50db207b17eb77e311e0b1a8e2208960509a64281e62cb0087e845f87665d
 EBUILD RyzenAdj-0.8.2-r1.ebuild 630 BLAKE2B 0ca340e101585d909cf95177eba3ecc7351baadb76755e498e3a7979033800de4a7ae7bab8b6c37d0fbfae3bb71526cd0297d4596badeef47ec3230342884b30 SHA512 5d919564b797ac384c1c2975b2cb096818c2f05667a111d8922c08451a2e028a217618e21ed3f1b790481b51823636ff2c4df95d587d546ccd6e1595e09387d9
 EBUILD RyzenAdj-0.8.3.ebuild 628 BLAKE2B 8da9401971d9380a176a1b800629be652fb9b7fcb57b05140a8c1f365ac60a4c7a94773bf37b8ba9f4ad75c98f12df869a119f6af4cf027c48f29a67786d43e6 SHA512 6411b1d85e9507ffb1cbefe62b3ffaa3ed1865a7cb70dad05ed455943f01395d20e8bbc5ab27ccb952cc0526e58783bba4c9901eca5e16e129683e414acdaebb
 MISC metadata.xml 334 BLAKE2B 89f591e3967c4f47202a753cb545c44647aa0f7a4cddc4cd50e2dd4b6f5b1bc4d34bd1d730a9908426b6fe4d1370872526e450d09295aefa138d749b1c2dc69c SHA512 8147f3611b4c8f85dbb5f9f9175d8aad39907be3f52514ec516085d08cfb313886dd40de103b54c1723b10df173a5911edc67ce03fd36c524a1d65fab05c5a78
diff --git a/sys-power/RyzenAdj/RyzenAdj-0.11.1.ebuild b/sys-power/RyzenAdj/RyzenAdj-0.11.1.ebuild
new file mode 100644
index 000000000000..dff6f45cdbed
--- /dev/null
+++ b/sys-power/RyzenAdj/RyzenAdj-0.11.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The power management tool for mobile and desktop Ryzen APUs"
+HOMEPAGE="https://github.com/FlyGoat/RyzenAdj"
+SRC_URI="https://github.com/FlyGoat/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-apps/pciutils"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_install() {
+	dosbin "${BUILD_DIR}"/ryzenadj
+
+	dolib.so "${BUILD_DIR}"/libryzenadj.so
+
+	dodoc "${S}"/README.md
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 130747a5ff98..7e1f1d229ed6 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 3ee46dfedf96..893a4f06e6e7 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -13,7 +13,6 @@ AUX nginx.initd-r4 2192 BLAKE2B b482b9cc473a1df06764d60c7ce5c99a3f680778028bf440
 AUX nginx.logrotate-r1 257 BLAKE2B d62c57377efd5259b6c776861d921b6e4ea026387157d618abd9e578f2e432ac0cf653a0f3842a0620d405759216bdc17afd50b33aaec3ad0c6757dfac3e34d8 SHA512 4892fc1700817c9a459a531df0320fe606a51be7f8b4e3ddf5852fe33def70dbff36fcefd2fce247c6846d6315ea92f3421eb21299a162d082b85fa27572cd95
 AUX nginx.service-r1 356 BLAKE2B 05d89efcc73b70a26655f306f1e074e61c81063cb4e949161efbe95dc375e63807233f38c9af6723801e8f653cfad08f62fbec225b061d1179b7d05fe761afc4 SHA512 e51f4e88abe10555afe79d4d029651a4de42a5dc1dddaf951f13c021453da00e0c56a3fa2129d08fcd090909a54564e76887c93fdf72952021f5a2b09f6097eb
 DIST modsecurity-nginx-1.0.3.tar.gz 34063 BLAKE2B 859a29eb7f67d53a818578f1008f0d0debbe37c205bb7c6e79594d8b1a6a0d93988880d35f607ef05ef6d73c9aa887baebfd2c54aca894969beeed4bfe576f37 SHA512 20495884c6b3594edf879a19fd7445f2e74a1628789decd146b3c712764b0507e440a84a64aab619461b044f98b8d641913cfad57a6d0002e7061716bdfe84fc
-DIST nginx-1.23.1.tar.gz 1104352 BLAKE2B 2c90b792ad7d9d685dc417e4c4d24ad68fa490da737574d25d526c70839fb64f69581e9093cf1c38010b7c404650e48c0fe8f9c1ef71c75d30be0be7e9ebd4d8 SHA512 62d6b3d5282f4e4cc23adf23b3dc26e06fc4574cae3c18381c406d0cf0f8c68e7dfa86af0c3c1c1485214c548f3b45015eb219e62bfe04e0aaa5edaad82e6706
 DIST nginx-1.23.2.tar.gz 1108243 BLAKE2B 0a6a556afe93c4326247e879e3bb2ad377cd734a572f471b52c91b1b2901a243a848cd74fea587bda5afa0ee91dec9635b5d2a468cb95abc7f361c42a32c9598 SHA512 4a5413c0ec251c02fb73dfb4d351045f857a36d45ebb7ae2c29f4a4f320a6543d0a049b147b08318de0b7b0406773c329dbf43bf98bb088f76e506ea532cd8ef
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
@@ -38,6 +37,5 @@ DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.7.7.tar.gz 609779 BLAKE2B 878c1a106237d42f03074051d12a2de409a1ce3088ec3fd8a43032183608b68e0a11f438668aaca3135ac2280875f248467d6fa801539fcfc6d1436db1579199 SHA512 3fd9e9b84e416e95dbdffced78eabd76a519cccec7c386d8acaccd0d891dea5ceeb702408d4450107c7e3909586753e4eeb5e38c06657cd8f273180beb8fae74
-EBUILD nginx-1.23.1-r1.ebuild 39598 BLAKE2B 9b63db4a3d1bc982ebc7329235745555004bcf6774c804281e6736f871bd21b9007e05f071763c1400412090324eb4542a62ae3bbd7bfc66b4242b7e05634991 SHA512 368372ac3a9f62791f5b50e9ab4d36440ba64f66c39a4025a3ae84595077960e9414a27073998e75870962c64825f366ef78dfcdaddf689c21330beb5b55cc07
 EBUILD nginx-1.23.2.ebuild 39690 BLAKE2B bc9ea5141f66d21cb003b09c37e9a23da3405323364cb3f9fab3c5f161e6b4d2a261a720a3b31e204906b98a6ba9c4da7d614a1e5732038fb6af482ae1664823 SHA512 d2df73e079653c42258661511df7c1ba4ea558cbd28f48b862d721d95726906c3e4e293f4c3f71cb97050b313eba11110091bc04191ba264c99a073ed18ad06a
 MISC metadata.xml 1012 BLAKE2B 5fe75eb9105a998668cfebf02c6976784f4ef3332edd0b6c21a23a5ffb0838b4ae8bc9e52f5157b43c3c0d060825ac46bccabc94bcf8b59447311e0f9ac94f29 SHA512 0d243d1d5271d05d51a46b5825fe32ac5283211434672e99e7314c57f5d1f1f88f48c189fffcdb12747c8d33c9dafe0c8df12376cbbec2912732da0ed6de0642
diff --git a/www-servers/nginx/nginx-1.23.1-r1.ebuild b/www-servers/nginx/nginx-1.23.1-r1.ebuild
deleted file mode 100644
index 874658a6e5c3..000000000000
--- a/www-servers/nginx/nginx-1.23.1-r1.ebuild
+++ /dev/null
@@ -1,1049 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.1"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="1.0.0rc"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="68b3ab3b64a0cee7f785d161401c8be357bbed12"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/openresty/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="d502e41996d24a382bd9c632e3ae3efa0a5fca66"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.4"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="b6d167cf1a93c0c885c28db5a439f2404874cb26"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-LUA_COMPAT=( luajit )
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.2"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# modsecurity for nginx (https://github.com/SpiderLabs/ModSecurity-nginx, https://github.com/SpiderLabs/ModSecurity, Apache-2.0)
-HTTP_SECURITY_MODULE_PV="1.0.3"
-HTTP_SECURITY_MODULE_P="modsecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${HTTP_SECURITY_MODULE_PV}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/ModSecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="8c02220d484d7848bc8e3a6d9b1c616987e86f66"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.4"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.7.7"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic pcre +pcre2
-	pcre-jit rtmp selinux ssl threads vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	acct-group/nginx
-	acct-user/nginx
-	virtual/libcrypt:=
-	pcre? ( dev-libs/libpcre:= )
-	pcre2? ( dev-libs/libpcre2:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	http2? (
-		>=dev-libs/openssl-1.0.1c:0=
-	)
-	http-cache? (
-		dev-libs/openssl:0=
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( ${LUA_DEPS} )
-	nginx_modules_http_auth_pam? ( sys-libs/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? ( dev-libs/modsecurity )
-	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		${LUA_REQUIRED_USE}
-		nginx_modules_http_rewrite
-		pcre
-		!pcre2
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_sticky; then
-		cd "${HTTP_STICKY_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-nginx-1.23.0.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre --without-pcre2 )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export AR CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"/etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${ED}"/usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	# Don't create /run
-	rm -rf "${ED}"/run || die
-
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{AUTHORS,CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX}"/var/log/nginx \
-				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index a01927be7342..00453ac554a1 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-fonts/Manifest b/x11-base/xorg-fonts/Manifest
index 579c8cae2773..ab98e3d38873 100644
--- a/x11-base/xorg-fonts/Manifest
+++ b/x11-base/xorg-fonts/Manifest
@@ -1,2 +1,2 @@
-EBUILD xorg-fonts-1.ebuild 1530 BLAKE2B 7a07c4114e18f49735673f48ae83f33b1ebdc04f10e56b6a8ddab506f540816d8ee255d4cb239020fd8e339ed3487826220f89a27dab2c5f39c58fef73ce45bc SHA512 cac653cda7de014bf85086f1320ecd7f260478c25ff70b2d72fc9d298ea5aceaeb07200565bab261ae1989cf5c6ef0126537c4ef800e37845d1f1f19d8a54b86
+EBUILD xorg-fonts-2.ebuild 1529 BLAKE2B db2d9fa2a98d1ca15dc0d357beb33cff2de140c5dbeb9680d7ff86084f962926df0d57951802fbe38a4508ae3f09445961ca3b84771dd73adae800b85ffa526a SHA512 0aa623e452c162248c36d3d3841e1018a99aaf3482a1ab941ca7cdf2f138b311d67780a56835407f51c212d2986e4751484f7fc826fa3d7a98a7d521ba2a56e5
 MISC metadata.xml 254 BLAKE2B a094e5e3c48db08be99b25c1f6529f16b65b1709d3d0d2b9235443c78fbaa0a66d4cd3d3ceef540c79889768c7743ce296b97ca2b57c1282f6b1e760257342e1 SHA512 8b33da34d0fa3f53d38e43f1e9e4fae36631c0da0c137dbba09e27f7570f975919383065f6bf3e85dee06b21daafbd6d623c39fc5f7fdf2e8816333d170c7bf1
diff --git a/x11-base/xorg-fonts/xorg-fonts-1.ebuild b/x11-base/xorg-fonts/xorg-fonts-2.ebuild
index 4ddf4a2e3f43..e5c0f149fb82 100644
--- a/x11-base/xorg-fonts/xorg-fonts-1.ebuild
+++ b/x11-base/xorg-fonts/xorg-fonts-2.ebuild
@@ -23,7 +23,6 @@ RDEPEND="
 	media-fonts/font-bh-75dpi
 	media-fonts/font-bh-lucidatypewriter-100dpi
 	media-fonts/font-bh-lucidatypewriter-75dpi
-	media-fonts/font-bh-type1
 	media-fonts/font-bitstream-100dpi
 	media-fonts/font-bitstream-75dpi
 	media-fonts/font-bitstream-speedo
@@ -50,5 +49,5 @@ RDEPEND="
 "
 
 pkg_postinst() {
-	optfeature "Bigelow & Holmes TrueType fonts (non-free)" media-fonts/font-bh-ttf
+	optfeature "Bigelow & Holmes TrueType fonts (non-free)" media-fonts/font-bh-ttf media-fonts/font-bh-type1
 }
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 38eb3d86216d..1e4f20e0cb71 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index a9a33ace9c7b..302c5534422c 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -2,6 +2,9 @@ AUX imake-1.0.8-cpp-args.patch 388 BLAKE2B fe6640775ff72b135f882d6e4c00a65716703
 AUX imake-1.0.8-no-get-gcc.patch 860 BLAKE2B 712c3c150ddcc57fea50d8eda31933c0cb039bcaad5da3e017c329c5123e8541a8380ff393d94839a3f1590836205f130d53da409c09902b81e435ba283d2263 SHA512 72e6617454378eae9a5b35356c15e3be7f9dddf294c937da6f70815cb33be5b775f05f51246e78fed0a17a2dfc95e14ffc578d6fd70a2b259471473e21bca3f5
 AUX imake-1.0.8-respect-LD.patch 379 BLAKE2B 1b031fc8cbc884cd975b338f57ef9de554a67a426a77a0c4733f5b7bed990b7a2e5e59e524ea907c7b215b2232cf9674dddfa29974a90768487ddfa97399ac21 SHA512 1e5034209290387b3e0320f85eab876a5ed571896072c3da940e6fa13eb4a2ecb6b325104125738ae3502f420b5aaf00797ca9b71a832dcfda72a911df5e5029
 AUX imake-1.0.8-xmkmf-pass-cc-ld.patch 461 BLAKE2B 643264da121725cd2424e3e6d3dc7af05d9068ada3a53ca5b92f6af7beb17caf7eb7de5bc4187a7ebdfed508f242d13bcba9876533d2d7cc52dbd0f9c80ab701 SHA512 c73feb329adcda1f08051965a0ce0ba6031a8b8aceef19d10d11e475a603337da661ff4af72620924e1efb76ed9347fc0535b31ac3e98707aee298a36e715bdf
+AUX imake-1.0.9-no-get-gcc.patch 1048 BLAKE2B 0ff949e2e12afcb59cefc81b60e9801d14bf9b98f19ebe62b6a5ad857ea3b1e1bd3244309953eb450b7f3e29ae9663c695ff790fbaa6a8d202dc062734c21381 SHA512 67f5e4789b739c4d53d331592e83b9455a1e01ff29f9b95db04a25225f70549ced920010dd09b6f9f6e1b70017e1864f7b344fdc4fcd8962f2a9a2853e0b0644
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
+DIST imake-1.0.9.tar.xz 153332 BLAKE2B d9de997016112833e50d1151448366c538b9796622630724552cc0476deed165621edc1a01318a83b577a85fcfc78b753e6fa9fbdf4c71413319abe542f1beca SHA512 e7587cf80369c8f4fcc1207c13bcb74a53d838b504ac8a7f3b98fb8f5f595cc7b8e5e9fad50cadcf40cf27bd02ef4eae7fe458854bbed7bea27d474d66520644
 EBUILD imake-1.0.8-r1.ebuild 676 BLAKE2B 9b48c875622fcb42052cc9b24e2b83f9ca52ba51013388b49666bf96cdce506417bff63b7254750e2815ce40c3e71f184ccf05b904db508b5eeba76c617abeeb SHA512 97a9f6a495354e3a32ecad68b7b3a6004e847d9152255a495bdcaaff42d18c98e4ea1ab27a3f68a359c177464f2f60184518d27b6413d94a04823c866ac9be7d
+EBUILD imake-1.0.9.ebuild 734 BLAKE2B 302e5578b0f9060af97a0d9c0b73c43d989792a02147509d37aa5a106d281ebc5ac3e2ec36fe0dbfccf0e2af0f765930aed20096936ce2b4e7958630a3f66656 SHA512 f709660250c8f57ff0fb80383db8fcb05a4e9f938b8c0f3f28aa5eef68f6255d0b2cd78065b999a6bde5432e5086af6dbefa9336593711cb547dcc772e3f8348
 MISC metadata.xml 337 BLAKE2B 33b94ed7ed8c8068a9fa1e2e3a49b51760e5e19003102a8ff5b76a0f449cc77fbf2aacaa8351a39caf2ab538645eca7862a383e7e4413a59efa69dabf8950c32 SHA512 9e59ae6ff8bef63e98e08ce8eff2d35a1ed3b815b60140523f07f85ea62a3bad952deea65a822393628db1605f2a8ac5ba35c3bb277e85a3cb64dba74936f470
diff --git a/x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch b/x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch
new file mode 100644
index 000000000000..131b7978165b
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch
@@ -0,0 +1,44 @@
+If /usr/bin/cc exists then get_gcc() is always true on Linux (and many
+others), but will fail in the event it's missing (-native-symlinks).
+
+get_gcc_version does not execute gcc and merely sets defines, so
+call it without using get_gcc(). Validity of using NULL should be
+verified if there's ever a new version.
+--- a/imake.c
++++ b/imake.c
+@@ -1331,6 +1331,7 @@ get_gcc_version(FILE *inFile, char *name)
+ }
+ #endif
+ 
++#if defined CROSSCOMPILE
+ static boolean
+ get_gcc(char *cmd)
+ {
+@@ -1384,7 +1385,6 @@ get_gcc(char *cmd)
+     return FALSE;
+ }
+ 
+-#ifdef CROSSCOMPILE
+ static void
+ get_gcc_incdir(FILE *inFile, char* name)
+ {
+@@ -1630,14 +1630,16 @@ define_os_defaults(FILE *inFile)
+       if (gnu_c)
+ #  endif
+ 	{
++#  if defined CROSSCOMPILE
+ 	  char gcc_name[PATH_MAX];
+ 	  if (get_gcc(gcc_name)) {
+ 	      get_gcc_version (inFile, gcc_name);
+-#  if defined CROSSCOMPILE
+ 	      if (sys != emx)
+ 		  get_gcc_incdir(inFile, gcc_name);
+-#  endif
+ 	  }
++#  else
++	  get_gcc_version(inFile,NULL);
++#  endif
+ 	}
+ # endif
+ # if defined __FreeBSD__
+-- 
diff --git a/x11-misc/imake/imake-1.0.9.ebuild b/x11-misc/imake/imake-1.0.9.ebuild
new file mode 100644
index 000000000000..90e00308d59d
--- /dev/null
+++ b/x11-misc/imake/imake-1.0.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
+inherit toolchain-funcs xorg-3
+
+DESCRIPTION="C preprocessor interface to the make utility"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="x11-misc/xorg-cf-files"
+DEPEND="x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.8-cpp-args.patch
+	"${FILESDIR}"/${PN}-1.0.9-no-get-gcc.patch
+	"${FILESDIR}"/${PN}-1.0.8-respect-LD.patch
+	"${FILESDIR}"/${PN}-1.0.8-xmkmf-pass-cc-ld.patch
+)
+
+src_configure() {
+	econf CPP="$(tc-getPROG CPP cpp)" #722046
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-10-20 01:59:18 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-20 01:59:18 +0100
commit	9ed0c42eb618229fa6f45e10155ee535e1f605a2 (patch)
tree	1cee221ce6610b86c942bdb5bd12aee04ac18642
parent	adab5aeec61fe929e5a817ec8034d98caab9ddbe (diff)