gentoo resync : 04.05.2021

37 files changed, 423 insertions, 441 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index b628b0db9249..5bf980d01341 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index e0e7a9596062..e09fbcf726ab 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -63,27 +63,26 @@ DIST patch.4.7.25.1 2072 BLAKE2B 773fb96f9c5995cee22931fcd504b9962d0c3407f7b4239
 DIST patch.4.7.25.2 2210 BLAKE2B 3e9727a4e006fa8e4502f1481a44144458401d0df0eeea26eb135b1979f330f354cd5016f56b86400118f13fe29a92798b0dcf19581738d3e9cf83b9be1ebb6d SHA512 d57746a527574966606955a8ad6b97742ff3979e85a0d087ae0c33b64b4fc2fd854f3ac145e2efc061b3479de5ee8172a02183cf54ada91fce3e331ab948ff18
 DIST patch.4.7.25.3 8442 BLAKE2B 666b643b3bf0d1e5ef5e445ae03228f436a5528bc197338c3c9bd468d7002bc81a16e295cf34fe6b38903e7f65c2c5c3cd9be0a3227f1122aeda22afc165e2a9 SHA512 815560c45c9c8491fd58d881a0bc1d23a82a13298d4757ed7d2ae4df4b88b278b8e4d6063eb46349a8f6f11ca9aa5b8555f3ce01df025715c2579dfa36241238
 DIST patch.4.7.25.4 5647 BLAKE2B 60ecb24fb137f7aeacb9689d8edc41791f78f96d1aa15c7fa47032371533d668c5dc12a5e1641945402f0e21f4e596cebb5010ac170ef462279b2efb887be020 SHA512 df9810034773a9d0556cbd174e4f131f0461402bf3f476ae5da1deb92f3e2e9ef789687c5cc5c2df6385f6b14251e893be225ffacd895d71dfb305b9de32567e
-EBUILD db-1.85-r4.ebuild 1307 BLAKE2B eeec9e6466a0f172cf6a9692782ab6d6b5cabfdb72398b985f34f53151a2a8d3c3990ba9d263c9ed9e780ea464d1369143c0e1967465a52eb0d70d1072be2b3e SHA512 afed650be1e2f2e5de7b7088d536640af2148279b31f89982abcbbcc61813c84c76bffafd32a5cdf28bdce5ee043c37b3aab1ac54e8d2114a88d1d029d5a0f2c
-EBUILD db-18.1.32.ebuild 6945 BLAKE2B 5380160ea7ea9ad794f7b355d84ef95aa4e246d20d9736da50f44dd741613b49ca401871e5c32bb755cc9a8849a9468600549f46d22dd99f38682b19acd15969 SHA512 85e360cb0f32652493a04a7ba53dbb5dd63c9514cdcc08ac780b18991f5812402a59907de271d4caad4ced096f26d402fc821c93cc302cd81912bfbad320be62
-EBUILD db-18.1.40.ebuild 6877 BLAKE2B ae43f4356f053b3fcfe754b263a56053152d255c60d9c912d9ad76b3c8b3d8affde5174ef256b5fbf3de8ebb5e50ebdd1503afa67627e744aa445c68cc1c4bb3 SHA512 a68f87ad07bdce70a3254801b3f700a54fd807db87bbe9c0039c70b7dbe756710c8d4ff7ad20439734271d7e4c07d9187bea4f3a2652e2c1a87b462eae4c71d0
-EBUILD db-3.2.9_p2-r1.ebuild 4899 BLAKE2B e1d4e490297d6b67a5eb6256dbcece49145e4d945eea7657299cf66c40de1cf568c225352b242b49c0b074e562a70f120d8a59e5466df12f89c8dedf98e8cd51 SHA512 b04f69b18482850065876efb507a8d418d9ee710d1e90caa80f1e894cb33baa875d86666809708e1b1577b0bd96afab6ba08279d78299b78da7725fa931b6b5a
-EBUILD db-4.2.52_p5-r3.ebuild 4640 BLAKE2B 9a35cb4990ca0891879f45df80f6681b244f9836a177630f43efca8e37f5df47bc6de5929bcfc035f8e4fe4591ddfbeaa6a5ba9de7242a8e9fb14f6107c8334c SHA512 bde537497192d33a6399c1f6ccca4f33fcd0b51bdbfa79efc0cf5ada23eb5525b0ab1e2860c50f4fa165c6c24527586997a51e04be1f410c826022d51bd59d09
-EBUILD db-4.3.29_p1-r3.ebuild 4510 BLAKE2B 9c0f28d7dd36f70b52c8230a4316186ee798fb691e774fc806443e3bb9a861dd66af827e16b06f32ed4270fe774089c07e823ca48a3169807da9a6c10707bc54 SHA512 baedf9357c28eb0b9a34bfd3b2a6c9766e9e2822b21c8a2ecba73ce42b4f5491237c49f35936a0b960a5d570cca45854c406d22789368df839e06fdabbc10673
-EBUILD db-4.4.20_p4-r3.ebuild 4398 BLAKE2B d22e57832389b5c87075e0a56e4780ed910182603ba597a566c455c51df3a3aa9ee2ecf2a8ebf0489aca6725c14b46ab9b1bbb162df5f7d07dc34c6b2a229d9c SHA512 42dd713000e20885212e6a89d975dc4846576a26210b471ef151ed69ecd1405106583dee17f991d900d65ca872fdd68dad7ebd7151873d7dc9848260a1484e82
-EBUILD db-4.5.20_p2-r3.ebuild 4638 BLAKE2B 2e44e957e1a95497c81f23cf56927c51b4dfb42726b0ede4be331bdb45e642f1041f97aea52ee56f43932a1957232ee2e685aaf15d0908976d24a8160458a75c SHA512 a4dcdf4c85ad346a96ad43f0b2e67f085b784e4901cd880a192a7a11c57f2f481728d65a2ac3639805ae65132e40b06edd17f695e58e94ecf7a2ab729a2de7be
-EBUILD db-4.5.20_p2-r4.ebuild 4731 BLAKE2B 27698b3ff04d725be7c7da46d6794f3112c1c0f5efcbed48d1416dcb30400738aa86859e4adc96c45e71028654bb602ee9b0b31afbaae5e332cd52e12becaed7 SHA512 2c746dab898419f5982b7f8a02aa6a5dac19417c106fcd594f832fd2c67fe5ea2c8943b3ed32d0dd50551fa61f43d777a0685300cb51af6e0f7cf35358c72d3e
-EBUILD db-4.6.21_p4-r2.ebuild 4360 BLAKE2B 93bbf582dda813cbfc04ed8c404a5e94ed969d25918dcf39dd300f09319d0d678843675735ce07747bf60ea452133acc64b843281a02960a4b275242fdc5ec66 SHA512 36d5ffa42e3cbda676dfe7f80ca1de01ac5ecb37df792a91c6381293ca8453c237a3f586ee92e2cba0a95455a1397cf24907f2bbdc52a7e4d512e69c2dba86bc
-EBUILD db-4.6.21_p4-r3.ebuild 4453 BLAKE2B 5abe5f330275a3004c315f7ead9f1ae1c70f5e0ca208d6eb9d5b6914f75b8afa39938b36827530ff23ad93f8829c2d660f746f97c5ba25787c479106de58aba6 SHA512 44f0198ba923418e0153be75b7e5f179a379919175c3dc8032c0115d20f8c10de3c89dcbe4ab741e7db28d3da40944868dafaaff6abf19264716cbaaa82e91f4
-EBUILD db-4.7.25_p4-r2.ebuild 4686 BLAKE2B 34b3f1b47be03abe89ec088b14d56a91161175e8ea811b5f74aeee65d0df5299dc841fe3d688c75729517afa63902252b232a8f954635a09fe77b732a3eeb5e4 SHA512 cf4e050a35e2c71f6d6b7c1f438feb8bc843f6614efa85d3398bbc339acb9d9828890f4511b90cfd23090f469e9e941baba1b059d48d6ec549a290aaa7028e7f
-EBUILD db-4.7.25_p4-r3.ebuild 4779 BLAKE2B 3b9ac03ca9e321f4d3d3805d4cc51fc38ede6d30805e1b73bf359637cab48c4dced6c1a8963550b829537092cf5414d35ba163a93c76ee9a8e2ce542553a6e8d SHA512 827dc6bc25d88f4628eead0c133703c309f9afde19740a6e5222acb75aaaa26e1ac1404e23313ce973717e5fdba1fcb4be5f9b66679d728fa4ef55e432eadec7
-EBUILD db-4.8.30-r3.ebuild 5182 BLAKE2B 80f6b5a6de5dc97dbaa42867d6eae7b3ebc9cd0cd8e42f41a1f7a78c37b4bf4ad69f1e1f96f3c2cb8cc6ffd6482ca7ff1d4b3f023d6c22fd8e7a09e5497c3b2a SHA512 4cd1881d3fb175a86ece7b06e58c198ff354e7cfe755680cee7eb7e100d12148eb75332315f2468cc7b7f7cccf73657830ae7c9f6cf8ec2697e124cd2401caf3
-EBUILD db-4.8.30-r4.ebuild 5275 BLAKE2B e636f2f29ad613afbb8b020f43d6be3327bbb404bd47f00d3650855bff8e2c3d25867f6992449b800a6c6a2b18bf916733860078e902c818dac52520d9ceaedf SHA512 57bdfcb2e5da6497aeba9089cb0fba08d86702b3e6323e9095adb8388cdb2bab77157f849e4de63b55fe053a31163ebf52e29e9ae72e15a64ece76e87f6fe833
-EBUILD db-5.1.29-r2.ebuild 5828 BLAKE2B 4a856ff3ebb4ca33a8349f0ea753766c034fd88e97340cad4ec7c4ef32606a744c18c0177d06c20646c5159f871732f2a3395e0597000367efad2803b7d43e22 SHA512 d027f886b27db0691c0a3f99abc6edc47d31bcdc2a7a1c2dae10023c88b06bbdfd1d44a48a62ffc5b71ace72f71005a8e476465386db2b884b9e979d3a47fee5
-EBUILD db-5.3.28-r2.ebuild 7139 BLAKE2B 0c40259c05a61910f482b0af34f0422df073e13eb770ec6bd484c88b094a231aa369591a0aeae724026c4a4d121238fc39dae778e9d7c8837601bddf89880d1a SHA512 1c9d8d9d3ab31c7652aaa03c0775371b9a34c34abe82d57dd71371f815fb13b30aa36f050436e5e40a91bdd3498d3591ad2f3140d80dd418f27ace042996a241
-EBUILD db-5.3.28-r4.ebuild 7108 BLAKE2B 2efbc2566ce164a6b38163dbb561c020ac25e58489cd2f77b46674f1a509bff787530105d5b0111476f6150346dc6f259d4067b3d00003beb9fd733852cd48dd SHA512 b243defee9d5ed5c0892182533dea7ae91b91c659bc74f124d162c6a8742b3170a012450fb1d48b02f66973214dc5cb54a33428cca89f4361804414abae23092
-EBUILD db-5.3.28-r5.ebuild 7199 BLAKE2B eb1a269cc68b6ba53e6829cc92fbd45a2c825e63d409c4dd98504f6632aede6d0938659b7cfd6eb7cc8d61231f92d6f7abac9aedde5da0a93784184738d79777 SHA512 c37de3183d6c3a1f2abe07b46e6f841cee535f00f9bc18af312b79946faad1014de974e4c75eeb35e28a07bd3950bb6d92b3760e00a044b6f517112aadb3001e
-EBUILD db-6.0.35-r2.ebuild 7109 BLAKE2B 852eb1f3a8ada53e5c5d876caad77f979e113f8d768c3f95373b4cfa0c386f6cbbba43cb6ec7bcdda7dc3bf90c0d1530c01b9e06f69a2fb4078abf7c04c27c96 SHA512 9120421a13a76cbc1b0e76640b761593b8e0ec3dd035aa1a04f8fbed596afd25c6cb98b9bf05718ea2e3de11dc7179c058a7a8c0b039fa21b6349cfbdf2cffd3
-EBUILD db-6.0.35-r3.ebuild 7194 BLAKE2B 09fb3e9e47182ca1a4582613345abdcf19f408aba107369c3e5bc6f15f0a54c1bf74d9a6361cda4ef148b67f342c9a590f8a79bcfd5d7d1f62dc9d3577338553 SHA512 6879cdaca7f58cec87ab4afde513e02b046d57f8247763c836af26ffc470d1e776358ddd3b3dc795ef9912106dac07f686b3eb9a6277b54b48c1eecc37ae5d65
-EBUILD db-6.1.38.ebuild 6994 BLAKE2B 818881c98104bd9d20d6e311ad471e93053453132cc9488c0f6e9e92769a85f99ae0399585d0440495bf3d1774fdc8b5fadb2b18c572631fb43d8916d98373dc SHA512 3e7d56c05059077a83e06fd6a2f0d3455b609c31aee4542dabac3936cb0928da0028369b25d5ecbdc6bd0052059cbd798e0ac2fb0bd564b3af493bd8730341c4
-EBUILD db-6.2.38.ebuild 7174 BLAKE2B 1000e9ccefa1c20d93d2fc8f76554c476ef320813e68a57c09def632ef139d69c04c1288e45a5af4e8551e9d4fcba257715c5459efe187525ed56f4a9af5c810 SHA512 75cdad8e2392c20046a29d1a786306cf8245c8e1b37e6bebacd97b1cd893706a6e9e5d0e94eac8e96a3020d2037667cd850c7a7157fcb39d936ccac1c4dd4636
+EBUILD db-1.85-r5.ebuild 1307 BLAKE2B eeec9e6466a0f172cf6a9692782ab6d6b5cabfdb72398b985f34f53151a2a8d3c3990ba9d263c9ed9e780ea464d1369143c0e1967465a52eb0d70d1072be2b3e SHA512 afed650be1e2f2e5de7b7088d536640af2148279b31f89982abcbbcc61813c84c76bffafd32a5cdf28bdce5ee043c37b3aab1ac54e8d2114a88d1d029d5a0f2c
+EBUILD db-18.1.32-r1.ebuild 6945 BLAKE2B e881cc49d0a16735af5c94d790ced1ccdb68c0c0877edf0e3285e1c3e0866a1105bf416cd2afe7038a613ea70173bae506a775c81da1e09878268237b4311383 SHA512 6a0474f69e6933f442bb7b9cdbae707f393b328c770258ba7b9254d1720e9baf26456b7e24502a8bf176c199f1d8d070b744f231932447d019c1660339965b2e
+EBUILD db-18.1.40-r1.ebuild 6877 BLAKE2B 9d71572f1b2aad96b324b178ccece60ca5c0a11cbd540584fed6cb0ee1f66577c14ca685c0431c3f9b75207bfa0a05a0debb183ca277f3c91503b25bb408a553 SHA512 6fee61949c5a8b28c2ff446069edd4a2ae3fc651ac3c39e3b3a43ccf312252f4927f27639ab382b920bfa2aa8a821c75ac3fb480b923ae5204c1e2c23c0b4579
+EBUILD db-3.2.9_p2-r2.ebuild 4899 BLAKE2B e1d4e490297d6b67a5eb6256dbcece49145e4d945eea7657299cf66c40de1cf568c225352b242b49c0b074e562a70f120d8a59e5466df12f89c8dedf98e8cd51 SHA512 b04f69b18482850065876efb507a8d418d9ee710d1e90caa80f1e894cb33baa875d86666809708e1b1577b0bd96afab6ba08279d78299b78da7725fa931b6b5a
+EBUILD db-4.2.52_p5-r4.ebuild 4640 BLAKE2B 75d2682fa7ba0276391079b38ee7b7f2809de12d65d344ebe0a9972eaa2aeaac86a2600be95aabbe37de8f08a6ab9f59c2d8c822141d5c79ca5f2e0abead9be9 SHA512 ee4349300aa26b0456f3d4cc959c4a0285df699ee723f1e6393c667689ed25bf6e0e0db4836ac8a4c7ee65e20331b385c4b3411aaca1fba9b8442b406c2627e4
+EBUILD db-4.3.29_p1-r4.ebuild 4510 BLAKE2B 35b4742c38626b3caaafc16c4424321ca603b7fcf1c3e987d983e6e17d124e8008922a2987c05439c2628d94918251204d17bde5cf45a9e0dae30c5a10c1f4f4 SHA512 144c0095632395b6ab7f9279f4e00f40a7f823fdefa28f39ee54cc4019c631b91e3f2e1da8bd9d7afe46378647424a29c86356fd27394d1e19be53ced97038a3
+EBUILD db-4.4.20_p4-r4.ebuild 4398 BLAKE2B db3ddc7a2b706889692d2c06063215128cc71da6b6ecd4488a87c8b363f6b26bb3f795df602ad1b19202d930f9e2bc0eb9b5ef9d0fad3e7b896ff99fe60d0826 SHA512 219b0d8fd4e8c12a59d5856f71b6dd3f8b6b53229ea86b774967a5c082715e215ac73962a747802f1804b30d152581434d2a75c4521b84483f688c2871b69a21
+EBUILD db-4.5.20_p2-r5.ebuild 4638 BLAKE2B bb3dcfd57bbd3be6e6d0a199f83a46d6ad709665100aad59854cd7914bec63fbe16fb76945d2f0ea6ec5fdc8d5215b27e72d7e6a2ec520eeeff257ea5f4bfd5d SHA512 0a0d8b5cf67fe9073331e14f4402a1eeaa2e274f2459291c76f52ab4fd5f566301919bab26688a30e49504c85b1f6e643a11c0464ab9378c2c778ada4537c21d
+EBUILD db-4.5.20_p2-r6.ebuild 4731 BLAKE2B e6cadc392a5c172a8549d365a9f517bfae1e02bdf9d7b70251fbde385a6e8c74144406374ec7bcb75aaea3e255be17eeecc0546642e64a679c8c99bf89d8c380 SHA512 82245f88bd06c5b8a11efe10cdf6c7d9cdcc08bbb20d4ec038159b5298e49b819376a9a7db2e335a2068272b55874e193877c555c1a6c6cd2f49e76aef00816b
+EBUILD db-4.6.21_p4-r4.ebuild 4360 BLAKE2B 1bd0a69c3f1f099f96471b9f8633db6847096d55aca14862e1136d59efba1557958ebf5af2b7aa6d32e93d1aec1da32c11ac70b96180fdd586fffff1f28a8379 SHA512 cbb70c4687aae61ed8c8c523cedb60cdd7664e1fd62b2d8d171758fe08611dd01483e573ba44a90594d9090c8adaa0246ddd95600e670ce211f5c3b54555e138
+EBUILD db-4.6.21_p4-r5.ebuild 4453 BLAKE2B ee2092f72e4b259eab6357af0cfb3f44e3923cfa426fa55603bfd88826760ae9dc0eef27fb025640655a9f97df5fdda42b47ede22680c73a5437c391d4d57b45 SHA512 f921dba6ef09c563e31d05ef784398a6ece1d06e7956df0deea5e709ec986d01e15d814f90e4877eb825355a1b3f592848ab4ee339dec779545f36d8f7ed6a68
+EBUILD db-4.7.25_p4-r4.ebuild 4686 BLAKE2B 452bc3e8e62c91843a58a69e77d4678daf23a749124f54aeff0b7bc20bd621d008cdeb79e21db92a4a072c7df67e7631d27e1868930222896ce3b44ed8298038 SHA512 ef7db867c191686d9ad538b12df98bab7c4c56d0a26a3b1bbb17051208f0163645566aa76bf98de95b92fe788540e81b697b747818f1e82220a1f4f407049678
+EBUILD db-4.7.25_p4-r5.ebuild 4779 BLAKE2B ec785c0278fe330e0cbf54f5f363de66f8627e2954d75e29aeedfbb45d606cdaf6cee5daf54e3f05e5a05d7518b94ab5e9fcdc34d791acf46ee21148cf2ad865 SHA512 c852ef9399511f80a80fc2fc8d9a4ef455484781cb9f6e45ee2ef2a0788e8e10ecff8a98ba23c2654c1c7c695a42471f5d8ff4d3e22def7ebe3123bddc854271
+EBUILD db-4.8.30-r5.ebuild 5182 BLAKE2B f977515df746d0c59fa2914f33b4b9e53c80d0085da522b2f547101a72524a784de854561b4d6b065f8cb2c4d7e228bd85bd073bed0c618ee0185df7802f4767 SHA512 2efd06d524a24846f50363311aa3957a6b1ad5fe6816d44343d303d41673922cced9acc1cf418fd72a4802c3eef9e2434559965aaa61853e8182ea52d1e5376b
+EBUILD db-4.8.30-r6.ebuild 5275 BLAKE2B 264b58a8b576872bb8d0b78739a526d03da1f28e076a8157542f33226e9990f97791805d5c7fffaceb1ceb40d5065469676172820058b57b2a1d1c2c6f2258be SHA512 d4f046a0e6c77b728eb919189bcbb7fba2879834825867bb3cf9687fdf794885acfc406845f7128d03961a787a0173e2a4d8dd567b3daf6411ca604184522f5b
+EBUILD db-5.1.29-r3.ebuild 5828 BLAKE2B c6c95e2ca50f73ac706130c111c3e6522cc7472ea34add7c7edac1578a872a6660fb7d5621051f8cd2cc04d165ee9667fd1ce3785c870602347f934832e824ff SHA512 ccab98198f26be0be79b82c715cd6f773f246af4c8cb61150c5af25ae954fc0e48d5aeec26309dbe5669b0fd1ed516f7e56f42d49fbba6012e0e466e24e9071b
+EBUILD db-5.3.28-r6.ebuild 7139 BLAKE2B 508d61e239e3c06b2f3f44fb785bb422730c3a4e556d5551def14a6415a6448892dca5579bfa9f800c2a5f4c2963951312491a43f462249f3be0e371ae1039cf SHA512 df7c1cb37380acd7cf7f0ad61a80d95749c677cade232578a6a76fc5aa5170bdff273d419145ca29ecb788739c3818d4ee31b905ea3edf7beceddb66dcbcdd61
+EBUILD db-5.3.28-r7.ebuild 7107 BLAKE2B f12a047d497b4f97aadaa6793fc44b6a0cde50a2c57dadc915758e0960fe6e7dcc91b55c0c108d8446d3f8792d47a8197be7a8cf022be99c702d70e395f15370 SHA512 db7f69e1f612211ce4611b986a06a05c5b7e5dfde66c4bf24647ebdad98d76f7582297d79aa6f3fe57f1ace72ba28346d71079dcb2cf18e9a97154f4b9fd616f
+EBUILD db-5.3.28-r8.ebuild 7199 BLAKE2B 6f3449bd1a5485480e472a888b65541278ca7b93406496a3f2e943def6764d91fa8095350c97a7f518ee4a1b89d3fa0e9bf6a6a0355d9589e4c8f89dc0f3ba8d SHA512 77763f2da4ca9ef43d739e3dcc49a12dd7ea4a34b69c9ee20376bef56d1a7867a787094b7f0542be456d958612abeda3f3017456416b3e55cd91c69df7f75f07
+EBUILD db-6.0.35-r4.ebuild 7198 BLAKE2B 62bc1e62fe26328d845bd5109fbe4a01d97c30cb276f28da565d36637c2e98cee559f04162ea6b4b1a27939c7447267768ceb6308b0bdb9d6e22268c8c79a075 SHA512 76dd5be13a23950e0740a75d713024cb2cd558cb549cc6f98c090ebd2e3c9a742faf34ea00fd7de20af0e95913fd22ffcf07ae5b86bb4430bbf4a7aecd5380c1
+EBUILD db-6.1.38-r1.ebuild 6994 BLAKE2B 56473fd89c18fbf475bb95802c19a9ecba67b9bc4749f986a684f39da755e3509d183252bca1c4afd73c84db35758b91cc33f9cbaaa6434ce938e48447836253 SHA512 3edfc11463f76723f179f5a683cab25ca67b3a4dbd38a1d0f0b149879b420fbf2c328f622269a63e113a7e542e3454f2ee3b350c8bfa75f65a635ae671508456
+EBUILD db-6.2.38-r1.ebuild 7174 BLAKE2B d66ce4b678328c88a8c97f899780177e3ba3a369f42ab50bde09d1097434cd9210639356797559cd88069f70d69d40e98a82c964c84b8ad6966ae5b18fb9ba2f SHA512 59bd01603384927a3a45846b9064a3a63522113ff3d9f9384d4b6eb7c1edbe272495104b4c45582e2e35aef295ea80f81a25e3346bac4a8264eef7d0a3f034ad
 MISC metadata.xml 1260 BLAKE2B e98fbefa3a80d0fa577c4b5afdda7652db360f86026c356e2f52581189d63a492747857acd8b8f2627a184580a6a98b3c6d144d209e08850cd6e89581e169a68 SHA512 63b883d28b987d8fdc58399d6ed5d942fad361c75cfb62a39dce7d50b155ecba82c17139542d1311effb061e535077a1903052b7f5c2bd3700464af77ef39fa0
diff --git a/sys-libs/db/db-1.85-r4.ebuild b/sys-libs/db/db-1.85-r5.ebuild
index 3efe710bb3e8..3efe710bb3e8 100644
--- a/sys-libs/db/db-1.85-r4.ebuild
+++ b/sys-libs/db/db-1.85-r5.ebuild
diff --git a/sys-libs/db/db-18.1.32.ebuild b/sys-libs/db/db-18.1.32-r1.ebuild
index bc3dafe46b95..ba0c4dac5df2 100644
--- a/sys-libs/db/db-18.1.32.ebuild
+++ b/sys-libs/db/db-18.1.32-r1.ebuild
@@ -38,10 +38,10 @@ REQUIRED_USE="test? ( tcl )"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
+	java? ( >=virtual/jdk-1.8 )
 	>=sys-devel/binutils-2.16.1"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.8 )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
diff --git a/sys-libs/db/db-18.1.40.ebuild b/sys-libs/db/db-18.1.40-r1.ebuild
index 6b02ee829b53..0ec531491511 100644
--- a/sys-libs/db/db-18.1.40.ebuild
+++ b/sys-libs/db/db-18.1.40-r1.ebuild
@@ -39,10 +39,10 @@ REQUIRED_USE="test? ( tcl )"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
+	java? ( >=virtual/jdk-1.8 )
 	>=sys-devel/binutils-2.16.1"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.8 )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
diff --git a/sys-libs/db/db-3.2.9_p2-r1.ebuild b/sys-libs/db/db-3.2.9_p2-r2.ebuild
index 09e4131d8b99..09e4131d8b99 100644
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r2.ebuild
diff --git a/sys-libs/db/db-4.2.52_p5-r3.ebuild b/sys-libs/db/db-4.2.52_p5-r4.ebuild
index e31ffdfadaac..47066904ed2e 100644
--- a/sys-libs/db/db-4.2.52_p5-r3.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r4.ebuild
@@ -32,9 +32,9 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-4.2.52_p2-TXN.patch
diff --git a/sys-libs/db/db-4.3.29_p1-r3.ebuild b/sys-libs/db/db-4.3.29_p1-r4.ebuild
index e4bdf106da58..c8c2b701e139 100644
--- a/sys-libs/db/db-4.3.29_p1-r3.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r4.ebuild
@@ -32,9 +32,9 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
diff --git a/sys-libs/db/db-4.4.20_p4-r3.ebuild b/sys-libs/db/db-4.4.20_p4-r4.ebuild
index 7c080be4429c..f2d903b73540 100644
--- a/sys-libs/db/db-4.4.20_p4-r3.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r4.ebuild
@@ -33,9 +33,9 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
diff --git a/sys-libs/db/db-4.5.20_p2-r3.ebuild b/sys-libs/db/db-4.5.20_p2-r5.ebuild
index df21a49880a9..c8677a2f0a4d 100644
--- a/sys-libs/db/db-4.5.20_p2-r3.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r5.ebuild
@@ -32,9 +32,9 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-4.4-libtool.patch
diff --git a/sys-libs/db/db-4.5.20_p2-r4.ebuild b/sys-libs/db/db-4.5.20_p2-r6.ebuild
index 47bd09277278..5d76d20b0084 100644
--- a/sys-libs/db/db-4.5.20_p2-r4.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r6.ebuild
@@ -32,9 +32,9 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-4.4-libtool.patch
diff --git a/sys-libs/db/db-4.6.21_p4-r2.ebuild b/sys-libs/db/db-4.6.21_p4-r4.ebuild
index 10a378826ba3..d753b5db0f64 100644
--- a/sys-libs/db/db-4.6.21_p4-r2.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r4.ebuild
@@ -32,9 +32,9 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-4.4-libtool.patch
diff --git a/sys-libs/db/db-4.6.21_p4-r3.ebuild b/sys-libs/db/db-4.6.21_p4-r5.ebuild
index e424bff8ea0a..d69c3c32c2a1 100644
--- a/sys-libs/db/db-4.6.21_p4-r3.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r5.ebuild
@@ -32,9 +32,9 @@ IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-4.4-libtool.patch
diff --git a/sys-libs/db/db-4.7.25_p4-r2.ebuild b/sys-libs/db/db-4.7.25_p4-r4.ebuild
index 4f6c58ec0a7a..7b7ac90fe7a2 100644
--- a/sys-libs/db/db-4.7.25_p4-r2.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r4.ebuild
@@ -35,9 +35,9 @@ IUSE="doc java cxx tcl test"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	test? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.5 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-4.4-libtool.patch
diff --git a/sys-libs/db/db-4.7.25_p4-r3.ebuild b/sys-libs/db/db-4.7.25_p4-r5.ebuild
index 791f144c7d93..a4d8f87a8e48 100644
--- a/sys-libs/db/db-4.7.25_p4-r3.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r5.ebuild
@@ -35,9 +35,9 @@ IUSE="doc java cxx tcl test"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	test? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.5 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-4.4-libtool.patch
diff --git a/sys-libs/db/db-4.8.30-r3.ebuild b/sys-libs/db/db-4.8.30-r5.ebuild
index 20f5227a5f68..598b13dac88f 100644
--- a/sys-libs/db/db-4.8.30-r3.ebuild
+++ b/sys-libs/db/db-4.8.30-r5.ebuild
@@ -37,9 +37,9 @@ REQUIRED_USE="test? ( tcl )"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8-libtool.patch
diff --git a/sys-libs/db/db-4.8.30-r4.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild
index f8233b07a27e..80ec7706ca17 100644
--- a/sys-libs/db/db-4.8.30-r4.ebuild
+++ b/sys-libs/db/db-4.8.30-r6.ebuild
@@ -37,9 +37,9 @@ REQUIRED_USE="test? ( tcl )"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8-libtool.patch
diff --git a/sys-libs/db/db-5.1.29-r2.ebuild b/sys-libs/db/db-5.1.29-r3.ebuild
index feeee909bc10..7a6a8cb141cd 100644
--- a/sys-libs/db/db-5.1.29-r2.ebuild
+++ b/sys-libs/db/db-5.1.29-r3.ebuild
@@ -37,9 +37,9 @@ REQUIRED_USE="test? ( tcl )"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.4:0 )
 	test? ( >=dev-lang/tcl-8.4:0 )
-	java? ( >=virtual/jdk-1.5 )"
+	java? ( >=virtual/jdk-1.8 )"
 RDEPEND="tcl? ( dev-lang/tcl:0 )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.8 )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8-libtool.patch
diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r6.ebuild
index 337084237488..a89dd6db5986 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r6.ebuild
@@ -37,10 +37,10 @@ REQUIRED_USE="test? ( tcl )"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
+	java? ( >=virtual/jdk-1.7 )
 	>=sys-devel/binutils-2.16.1"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.7 )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db5.3/db.h
diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r7.ebuild
index 25079725abbe..9e789e440c02 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r7.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
@@ -37,9 +37,9 @@ REQUIRED_USE="test? ( tcl )"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )"
+	java? ( >=virtual/jdk-1.7 )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.7 )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db${SLOT}/db.h
diff --git a/sys-libs/db/db-5.3.28-r5.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild
index 81350c2f3cea..6a25488eddc3 100644
--- a/sys-libs/db/db-5.3.28-r5.ebuild
+++ b/sys-libs/db/db-5.3.28-r8.ebuild
@@ -37,9 +37,9 @@ REQUIRED_USE="test? ( tcl )"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )"
+	java? ( >=virtual/jdk-1.7 )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.7 )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db${SLOT}/db.h
diff --git a/sys-libs/db/db-6.0.35-r2.ebuild b/sys-libs/db/db-6.0.35-r2.ebuild
deleted file mode 100644
index 5d1ee090cf51..000000000000
--- a/sys-libs/db/db-6.0.35-r2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO="${PV/*.*.*_p}"
-if [[ ${PATCHNO} == "${PV}" ]] ; then
-	MY_PV="${PV}"
-	MY_P="${P}"
-	PATCHNO=0
-else
-	MY_PV="${PV/_p${PATCHNO}}"
-	MY_P="${PN}-${MY_PV}"
-fi
-
-RESTRICT="!test? ( test )"
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/build_unix"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="AGPL-3"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc java cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db${SLOT}/db.h
-)
-
-PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
-
-	# sqlite configure call has an extra leading ..
-	# upstreamed:5.2.36, missing in 5.3.x/6.x
-	# still needs to be patched in 6.0.20
-	"${FILESDIR}"/${PN}-6.0.35-sqlite-configure-path.patch
-
-	# The upstream testsuite copies .lib and the binaries for each parallel test
-	# core, ~300MB each. This patch uses links instead, saves a lot of space.
-	"${FILESDIR}"/${PN}-6.0.20-test-link.patch
-)
-
-src_prepare() {
-	cd "${S_BASE}" || die
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	default
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r \
-		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		-i dist/RELEASE || die
-
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		-i dist/Makefile.in || die
-
-	cd dist || die
-	rm aclocal/libtool.m4 || die
-	sed \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		-i configure.ac || die
-	sed \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		-i aclocal/programs.m4 || die
-
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
-
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
-	. ./RELEASE
-	local v ev
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		ev="__EDIT_${v}__"
-		sed -e "s/${ev}/${!v}/g" -i configure || die
-	done
-
-	# This is a false positive skip in the tests as the test-reviewer code
-	# looks for 'Skipping\s'
-	sed \
-		-e '/db_repsite/s,Skipping:,Skipping,g' \
-		-i "${S_BASE}"/test/tcl/reputils.tcl || die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-compat185
-		--enable-dbm
-		--enable-o_direct
-		--without-uniquename
-		--disable-sql
-		--disable-sql_codegen
-		--disable-sql_compat
-		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
-		$(use_enable cxx)
-		$(use_enable cxx stl)
-		$(multilib_native_use_enable java)
-		$(use_enable test)
-	)
-
-	tc-ld-force-bfd #470634 #729510
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if [[ ${ABI} == amd64 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf+=(
-			--enable-tcl
-			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=(--disable-tcl )
-	fi
-
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	# Don't --enable-sql* because we don't want to use bundled sqlite.
-	# See Gentoo bug #605688
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf "${myconf[@]}"
-
-	# The embedded assembly on ARM does not work on newer hardware
-	# so you CANNOT use --with-mutex=ARM/gcc-assembly anymore.
-	# Specifically, it uses the SWPB op, which was deprecated:
-	# http://www.keil.com/support/man/docs/armasm/armasm_dom1361289909499.htm
-	# The op ALSO cannot be used in ARM-Thumb mode.
-	# Trust the compiler instead.
-	# >=db-6.1 uses LDREX instead.
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
-}
-
-multilib_src_install_all() {
-	db_src_install_usrbinslot
-
-	db_src_install_doc
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED}"/usr/bin/berkeley_db_svc \
-			"${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -r \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	-i "${S_BASE}/test/testparams.tcl"
-	sed -r \
-		-e '/multi_repmgr/d' \
-		-i "${S_BASE}/test/tcl/test.tcl" || die
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -r \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		-i "${S_BASE}/test/tcl/test.tcl" || die
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S="${BUILD_DIR}" db_src_test
-}
diff --git a/sys-libs/db/db-6.0.35-r3.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 8a7daad00b0d..9e9b623e0489 100644
--- a/sys-libs/db/db-6.0.35-r3.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -37,9 +37,9 @@ REQUIRED_USE="test? ( tcl )"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )"
+	java? ( >=virtual/jdk-1.7:* )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.7:* )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db${SLOT}/db.h
diff --git a/sys-libs/db/db-6.1.38.ebuild b/sys-libs/db/db-6.1.38-r1.ebuild
index c7be4d257f66..9c01f35ac797 100644
--- a/sys-libs/db/db-6.1.38.ebuild
+++ b/sys-libs/db/db-6.1.38-r1.ebuild
@@ -37,10 +37,10 @@ REQUIRED_USE="test? ( tcl )"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
+	java? ( >=virtual/jdk-1.8 )
 	>=sys-devel/binutils-2.16.1"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.8 )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
diff --git a/sys-libs/db/db-6.2.38.ebuild b/sys-libs/db/db-6.2.38-r1.ebuild
index 18760f06459c..786041b37bd1 100644
--- a/sys-libs/db/db-6.2.38.ebuild
+++ b/sys-libs/db/db-6.2.38-r1.ebuild
@@ -37,11 +37,11 @@ REQUIRED_USE="test? ( tcl )"
 # the entire testsuite needs the TCL functionality
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
+	java? ( >=virtual/jdk-1.8 )
 	kernel_linux? ( >=sys-devel/binutils-2.16.1 )
 	kernel_SunOS? ( >=sys-devel/binutils-2.16.1 )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.8 )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db$(ver_cut 1-2)/db.h
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 895b0eaab20b..e376ca554eeb 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,3 +1,3 @@
 DIST gwenhywfar-5.4.1.tar.gz 2373780 BLAKE2B bc2666145d958c5ab9c5600be65bcdd4a2ea6e35f3bd83a5ba9a2380dcc8788e91038733c49c1c16ff00d27eea999a0c0f4a02a70f30180d54a1541dbb951131 SHA512 78ec815374410bb3ebbbcc5c18120b47bbc2460aa8a620fae068f3c6aaeb16351139fe0e28e8dc7037ffb9eaa449011d2483dde3c99ecd0fed7bb2c9f97f89a0
-EBUILD gwenhywfar-5.4.1-r1.ebuild 1806 BLAKE2B 665ebdd3d35c0977dd038a90f3ae67c4e2c13bd38d0927b35ed48016d3b8a543c69851c9921eb4cee054b6fdf2a91dc257306ce16d19fe0772719da3bca710b6 SHA512 b016f5fa1d30a359018fd9e270a17b7f30af497e446ccc00e13e5d3b980c0e8befff7f4cba800c9324020cd70afa7296be6995e7771f47157b6fd9ba240ad487
+EBUILD gwenhywfar-5.4.1-r1.ebuild 1746 BLAKE2B 9f84d2087035de065dc8024d1fe280d9eda3e8e898647b3b02c3ebcb87a362c4f0c257522f1157af73c10914647a4f25b5bb89cb69950e9a9e618fb59a342fc0 SHA512 c1e5c6f0af937d1cc4f2fa176004d114e79367c0786dc7933df714d9d268c0071f2ab544099f4f7917ca2300dff8f8fc9c7ea543ce07a6c064ee30a5124a59db
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild
index 6b3526e8dbcf..7a39fab60949 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/344/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/79" # correspond with libgwenhywfar.so version
 KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="debug doc gtk libressl qt5 test"
+IUSE="debug doc gtk qt5 test"
 
 BDEPEND="
 	sys-devel/gettext
@@ -24,8 +24,7 @@ DEPEND="
 	dev-libs/libgcrypt:0=
 	dev-libs/libgpg-error
 	dev-libs/libxml2:2
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
+	dev-libs/openssl:0=
 	net-libs/gnutls:=
 	virtual/libiconv
 	virtual/libintl
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 1a9e45f2cc55..727273ae3853 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -8,6 +8,6 @@ DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835
 EBUILD ldb-2.1.4-r1.ebuild 2810 BLAKE2B 651d9396e96ecc9cd9aed25498dc39fb2a1ef14b3c570a6af6508ae64c89cfbe29e36d77dc9b00e57b78285d096d9b7e9f7e438bbc437f7dab7bc33dd94d07eb SHA512 068466a5d6523c6ebb8990786ac74b65e954d1bd5803cb73112d6e892a823984dc3c1507ad9b4f595d3ee6e2461b06fb1393dae344a58a2e14bb2b51cd0a7d31
 EBUILD ldb-2.1.5.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2
 EBUILD ldb-2.2.0-r2.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2
-EBUILD ldb-2.2.1.ebuild 2939 BLAKE2B 3f188e1b37a15ec4b5d5ee3e60ff39c0329e2d1f7f9a0d7b450b2fd6841b3fd64e8858a909d2de23c2f9ec03bcdae68e871d4636c65dd30bffcbd4b955a5373f SHA512 61543205c8c412d5b199ed1f712e205858400ffaf9fef46116cd061513dffab88bb76e2e165813feac96a8f01490443ddb5dd41ec75cab02c2601a017bba10b7
+EBUILD ldb-2.2.1.ebuild 2938 BLAKE2B de3cac0de4d7ea174a6834c54b3712993ab06596b37b4681d0e5e65376e6095779923c6b96e6ce2b629a426dddf342548d29d6cea8083691eb75a373c2012d9a SHA512 29ee94208e13245802250245694fd490f972c514cfd1bd3acf9b4ffd9fcc3f70986d148747f1f4d23569f117066117d37269df8285c4cc8c382ee7bfb20c5a0d
 EBUILD ldb-2.3.0.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/ldb-2.2.1.ebuild b/sys-libs/ldb/ldb-2.2.1.ebuild
index 6c300b134754..ee48524356ef 100644
--- a/sys-libs/ldb/ldb-2.2.1.ebuild
+++ b/sys-libs/ldb/ldb-2.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc +ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 331d53952773..67a32e1b1221 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -4,7 +4,9 @@ AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d3737337
 DIST libxcrypt-4.4.16.tar.gz 480694 BLAKE2B 0e93c2ff45a8148f82a80a67fb732a3ef42e87505d19258023f91d3352a382483204e77e2704e7a0de15f4f1e38a326d0867506a5580faf8c81857270588a4a3 SHA512 e1d3b1262c6be7c6c8847b8c4eb8191d9e5e482798be6f1186876c72f3d8c737124378ec45a38aa464f556e10a557b96f855bd371f03c3611eada27904bf6781
 DIST libxcrypt-4.4.17.tar.gz 519096 BLAKE2B 12cbe3d1f235baddd8d2ec8159f2a7514e75c2f91cf0db18ef909ec11c38ac19efebecec647a90cafb27c7ebc7e940da448ca8f3edd1c49e5cb9cc4407d5198c SHA512 94aaba6ccf9b6d1a32f9a571ee32261cecd393d5b8d8c6f18d740dc7bb29ac0fbd381124e7f0d84882559bb634208c08151b3dc05c9138fa0a229c4ba20fb6f7
 DIST libxcrypt-4.4.19.tar.gz 534269 BLAKE2B 22c27fe2bfe32a7752f7be495a072c774a5a9ab9a7616fb80ff05afae4d9ff1ecfd1a04b4bd7c850df46f60aa5850225684464cf65d2a145302f128285ac8a9b SHA512 f5bd2598b5d0de47f3d805bbd4a045439e456d361a39e8725c40e2e1f32cf392bdc20b51840528f53cec052dff98be1a009fcd70b92e288584bedf06ef94b816
+DIST libxcrypt-4.4.20.tar.gz 534367 BLAKE2B 9174bd342dc13db8fd724a13e3fbd222a0f5e2d058be2d7f511816e137fa61bd73d4b9482c85d81f27404d0e650be59c45f25d70ec3c506730d2422da4e97417 SHA512 66b1966003427728f96d5a83f75930a4b82d31133392bede3975cf9a1e1423d0312e73da598e40d0e3507f26fac5222cc92d7a5593f2b737d8557a5d4bf2461e
 EBUILD libxcrypt-4.4.16.ebuild 4191 BLAKE2B 64921e9c8bb070e5810504344ebda777acd45d685050e1b2dae8c0cf5530e1ef4ec148a13006be79a5d4252cf41ed08ff116e945bf75d7650ccf886b80ec5ace SHA512 0400b4078afff126f448286ca5f6285684278f1cb460ff536cfc71ac0aa5dafb843406cfdaeb2b465443d5bebd157d8264a073fb962d244c88ed270ceeeec957
 EBUILD libxcrypt-4.4.17.ebuild 4263 BLAKE2B 67b3d5d1561399d69c15912bfb4e3034e4a844e45ca31246acf12b0405e0dca26478e71d71e8fbd8df8c3aaa1eb09f687f20786fc8b92eaecf28ec0435b7c59b SHA512 dee010233c239ae089f211d908a706b1c6b5b4015e1ca80023d968b84a410a39aad4ea5b45efb27d7b32a9db280ec80d75ca1454eb32896cc6ff095c0f5cbbb4
 EBUILD libxcrypt-4.4.19.ebuild 4215 BLAKE2B 60b120aa9a9af60001c4180c2e7ba4bf9e0410b00a206aea3c4ce09e6c5af1c633b4a35e99d76a40435680e1be0a782dfed2c971a7d6d9d1b363d3f69a55e16a SHA512 0323090b8e5a909565000b7929174081a5a2fde35f08fc5b523a47c739375141c747b1d2d923f43fd80ef0913d02dc1d365eb23c8c082935560f87abfbc85acb
+EBUILD libxcrypt-4.4.20.ebuild 4215 BLAKE2B 60b120aa9a9af60001c4180c2e7ba4bf9e0410b00a206aea3c4ce09e6c5af1c633b4a35e99d76a40435680e1be0a782dfed2c971a7d6d9d1b363d3f69a55e16a SHA512 0323090b8e5a909565000b7929174081a5a2fde35f08fc5b523a47c739375141c747b1d2d923f43fd80ef0913d02dc1d365eb23c8c082935560f87abfbc85acb
 MISC metadata.xml 856 BLAKE2B e9fea1aa08f5b3f0abdd4d490973da2f133ea90e3a366d4549361233f51e674cc646b2fb6b4b15bca72d5a4e3b36be9a06e55afd3a4cb8f439d3958f09f8af25 SHA512 862cf3201efbecfc23167ecd1f6798f6729ba4e76749c174d17baf8aa4887f21d36f40234f35bc1b896e4384d110033b3f2260f01930b926f759e0243039adf8
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
new file mode 100644
index 000000000000..6284f32749c5
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild
@@ -0,0 +1,163 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit autotools multibuild python-any-r1 multilib-minimal
+
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
+SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/besser82/libxcrypt"
+
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+compat split-usr +static-libs system test"
+
+DEPEND="system? (
+		elibc_glibc? ( sys-libs/glibc[-crypt(+)] )
+		!sys-libs/musl
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-apps/findutils
+	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="split-usr? ( system )"
+
+PATCHES=(
+	"${FILESDIR}/libxcrypt-4.4.19-multibuild.patch"
+)
+
+python_check_deps() {
+	has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=(
+		$(usex compat 'xcrypt_compat' '')
+		xcrypt_nocompat
+	)
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+get_xclibdir() {
+	printf -- "%s/%s/%s\n" \
+		"$(usex split-usr '' '/usr')" \
+		"$(get_libdir)" \
+		"$(usex system '' 'xcrypt')"
+}
+
+multilib_src_configure() {
+	local -a myconf=(
+		--disable-werror
+		--libdir=$(get_xclibdir)
+		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig
+		--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
+	)
+
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			myconf+=(
+				--disable-static
+				--disable-xcrypt-compat-files
+				--enable-obsolete-api=yes
+			)
+			;;
+		xcrypt_nocompat-*)
+			myconf+=(
+				--enable-obsolete-api=no
+				$(use_enable static-libs static)
+			)
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake check
+}
+
+src_test() {
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	(
+		shopt -s failglob || die "failglob failed"
+
+		# Make sure our man pages do not collide with glibc or man-pages.
+		for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
+			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
+				|| die "mv failed"
+		done
+	) || die "failglob error"
+
+	# remove useless stuff from installation
+	find "${D}"/usr/share/doc/${PF} -type l -delete || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# don't install the libcrypt.so symlink for the "compat" version
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
+				|| die "failed to remove extra compat libraries"
+		;;
+		xcrypt_nocompat-*)
+			if use split-usr; then
+				(
+					if use static-libs; then
+						# .a files are installed to /$(get_libdir) by default
+						# move static libraries to /usr prefix or portage will abort
+						shopt -s nullglob || die "failglob failed"
+						static_libs=( "${ED}"/$(get_xclibdir)/*.a )
+
+						if [[ -n ${static_libs[*]} ]]; then
+							dodir "/usr/$(get_xclibdir)"
+							mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \
+								|| die "moving static libs failed"
+						fi
+					fi
+
+					if use system; then
+						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
+						# to allow linker to correctly find shared libraries.
+						shopt -s failglob || die "failglob failed"
+
+						for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do
+							lib_file_basename="$(basename "${lib_file}")"
+							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
+							dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}"
+						done
+
+						rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "removing symlinks in incorrect location failed"
+					fi
+				)
+			fi
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+}
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 545efc84a487..b2e82bf3ecc7 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,5 +1,4 @@
 AUX ldconfig.in 2552 BLAKE2B c94f9900e8582d707519171c4b61079c801b60c555677b1740b04adbdec9645578b9a8fc91f11413072568f316c795e46a332970f3d2dde5272b0c49a5d60a78 SHA512 59f1b57361196363d3f127366764f05d26c23dbe3d3dbcdba9bd3c8ca26a671fd713b96d31c509d22805c57ada2b596d979a3f5795bcf0a4d3ac7d168f3bf377
-AUX musl-1.2.1-CVE-2020-28928.patch 3787 BLAKE2B 25919e7bc18eef643a53bb1be1ed11b8385462c25a991ad306bc2275d523cb64e41a45f5e379de47ecfc59beac773cf8515b3130b68472905007dc49a9342da6 SHA512 07bd31861fa123e55800c9e685ee662b6d80892fdfed943893c22c5e4bd2c283d475a5714823db15c95f343af9ef2290543780fdeadcc2df79c7954a5b68de3d
 AUX stack_chk_fail_local.c 1798 BLAKE2B 380bcbb920bd40a5185246621ba93716f27d61cd0077cd796ff267e10c534c9cc64982b2a66c89b61395dc93d67dae77e8c59908f65f2903f16016180cf94bbb SHA512 bb0bdd7f205d57771920c7ea898c1f84a55d6f90ddd1f8203bfeed98d13ccefa6f68d5fd1c0761321b2732ca928ca81b425e3fe8321c936d1316dea6f1930091
 DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
diff --git a/sys-libs/musl/files/musl-1.2.1-CVE-2020-28928.patch b/sys-libs/musl/files/musl-1.2.1-CVE-2020-28928.patch
deleted file mode 100644
index 9797e92ec423..000000000000
--- a/sys-libs/musl/files/musl-1.2.1-CVE-2020-28928.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-https://bugs.gentoo.org/755695
-https://git.musl-libc.org/cgit/musl/patch/?id=3ab2a4e02682df1382955071919d8aa3c3ec40d4
-From 3ab2a4e02682df1382955071919d8aa3c3ec40d4 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Thu, 19 Nov 2020 17:12:43 -0500
-Subject: rewrite wcsnrtombs to fix buffer overflow and other bugs
-
-the original wcsnrtombs implementation, which has been largely
-untouched since 0.5.0, attempted to build input-length-limiting
-conversion on top of wcsrtombs, which only limits output length. as
-best I recall, this choice was made out of a mix of disdain over
-having yet another variant function to implement (added in POSIX 2008;
-not standard C) and preference not to switch things around and
-implement the wcsrtombs in terms of the more general new function,
-probably over namespace issues. the strategy employed was to impose
-output limits that would ensure the input limit wasn't exceeded, then
-finish up the tail character-at-a-time. unfortunately, none of that
-worked correctly.
-
-first, the logic in the wcsrtombs loop was wrong in that it could
-easily get stuck making no forward progress, by imposing an output
-limit too small to convert even one character.
-
-the character-at-a-time loop that followed was even worse. it made no
-effort to ensure that the converted multibyte character would fit in
-the remaining output space, only that there was a nonzero amount of
-output space remaining. it also employed an incorrect interpretation
-of wcrtomb's interface contract for converting the null character,
-thereby failing to act on end of input, and remaining space accounting
-was subject to unsigned wrap-around. together these errors allow
-unbounded overflow of the destination buffer, controlled by input
-length limit and input wchar_t string contents.
-
-given the extent to which this function was broken, it's plausible
-that most applications that would have been rendered exploitable were
-sufficiently broken not to be usable in the first place. however, it's
-also plausible that common (especially ASCII-only) inputs succeeded in
-the wcsrtombs loop, which mostly worked, while leaving the wildly
-erroneous code in the second loop exposed to particular non-ASCII
-inputs.
-
-CVE-2020-28928 has been assigned for this issue.
----
- src/multibyte/wcsnrtombs.c | 46 +++++++++++++++++++---------------------------
- 1 file changed, 19 insertions(+), 27 deletions(-)
-
-diff --git a/src/multibyte/wcsnrtombs.c b/src/multibyte/wcsnrtombs.c
-index 676932b5..95e25e70 100644
---- a/src/multibyte/wcsnrtombs.c
-+++ b/src/multibyte/wcsnrtombs.c
-@@ -1,41 +1,33 @@
- #include <wchar.h>
-+#include <limits.h>
-+#include <string.h>
- 
- size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, size_t n, mbstate_t *restrict st)
- {
--	size_t l, cnt=0, n2;
--	char *s, buf[256];
- 	const wchar_t *ws = *wcs;
--	const wchar_t *tmp_ws;
--
--	if (!dst) s = buf, n = sizeof buf;
--	else s = dst;
--
--	while ( ws && n && ( (n2=wn)>=n || n2>32 ) ) {
--		if (n2>=n) n2=n;
--		tmp_ws = ws;
--		l = wcsrtombs(s, &ws, n2, 0);
--		if (!(l+1)) {
--			cnt = l;
--			n = 0;
-+	size_t cnt = 0;
-+	if (!dst) n=0;
-+	while (ws && wn) {
-+		char tmp[MB_LEN_MAX];
-+		size_t l = wcrtomb(n<MB_LEN_MAX ? tmp : dst, *ws, 0);
-+		if (l==-1) {
-+			cnt = -1;
- 			break;
- 		}
--		if (s != buf) {
--			s += l;
-+		if (dst) {
-+			if (n<MB_LEN_MAX) {
-+				if (l>n) break;
-+				memcpy(dst, tmp, l);
-+			}
-+			dst += l;
- 			n -= l;
- 		}
--		wn = ws ? wn - (ws - tmp_ws) : 0;
--		cnt += l;
--	}
--	if (ws) while (n && wn) {
--		l = wcrtomb(s, *ws, 0);
--		if ((l+1)<=1) {
--			if (!l) ws = 0;
--			else cnt = l;
-+		if (!*ws) {
-+			ws = 0;
- 			break;
- 		}
--		ws++; wn--;
--		/* safe - this loop runs fewer than sizeof(buf) times */
--		s+=l; n-=l;
-+		ws++;
-+		wn--;
- 		cnt += l;
- 	}
- 	if (dst) *wcs = ws;
--- 
-cgit v1.2.1
-
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 4ed23ae09b00..53e302f33a46 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -9,6 +9,8 @@ DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a7657
 DIST readline80-002 1401 BLAKE2B a2f511272f6d651208469998330059d6bae17bb8b704b64468685bb0368b76df1ca5b1dcd8e5cb0019e80932130c8a92fd1a305679bf79f0b801532a94c4b4ae SHA512 a941d142a59fe592cc45c1cf4d416e2fc0ab543dd6a0496fb8b2ec6f651cedd6fb9e0c105f14880700b69b2d6912653b3f66371e45cbe4adc0cc9554801afd3c
 DIST readline80-003 2158 BLAKE2B d8910aef1b796a59500b255df8db71ad1738dd164fd69827759eade74b6d9806ecd364839cfa904fc2f2d48352342155f670e5ec43aac0693f36820fb7139a4d SHA512 85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca
 DIST readline80-004 1275 BLAKE2B ac260bab163f17ccc783e0c2a21351b05e9e86ad973383d228d10ec749f265df8588c38946c9da15e987192b50f1bcb81141c2f4e171f65455f58521e864a534 SHA512 301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461
+DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
 EBUILD readline-8.0_p4.ebuild 4844 BLAKE2B 911295cd0f230c2e08a5928b436c2a155304fae48a0c1cc9b797ada57addd7d0219f2d5dab1d7a03efd16c3a4b04ce7426f43f9916af2f21321707f096e0fa28 SHA512 dccdd6b34e34af2df1b04188360de701eb18b9701a73a6e4ec7b6529f3ea4316cfcdf307a4a8ab12f40f766676562378a8eb7d17689a93c611445577cd2b5a02
 EBUILD readline-8.1.ebuild 5383 BLAKE2B b262acbdd24af54859ccf1ac4e2cb84f845fd792c777f9ff1af154a5bb6b9a867bacba11fc63c99c689fc51729e8c19fa6eed0e6a40d99bedbf2abc39edb37d1 SHA512 f684d6ee7de81b95a88a23cb28c0f6f406b58d49428403ada8a1399c67ae9fd28b4bbec648b12044d2f13d49c7d8c3e523f88ee8a72265f0a9f617d2e14edf55
+EBUILD readline-8.1_p1.ebuild 5383 BLAKE2B b262acbdd24af54859ccf1ac4e2cb84f845fd792c777f9ff1af154a5bb6b9a867bacba11fc63c99c689fc51729e8c19fa6eed0e6a40d99bedbf2abc39edb37d1 SHA512 f684d6ee7de81b95a88a23cb28c0f6f406b58d49428403ada8a1399c67ae9fd28b4bbec648b12044d2f13d49c7d8c3e523f88ee8a72265f0a9f617d2e14edf55
 MISC metadata.xml 472 BLAKE2B 8d3717ac6980105677b10449a1aabca9f9347066f73802241b904101172690bb789b8071f3670dd91ad2af0223c7bc5fb4ed594dc8af3aff20b17bdd681f7630 SHA512 f19a6f0d6aed18903778adc5ad45fdae39c4388e4f09e7cb8a110b798e8cc7ab1739ff813a227ad08ef1166309e1ead57c200b7fe42499a06db97af9f4bce173
diff --git a/sys-libs/readline/readline-8.1_p1.ebuild b/sys-libs/readline/readline-8.1_p1.ebuild
new file mode 100644
index 000000000000..f9e927fcc6a5
--- /dev/null
+++ b/sys-libs/readline/readline-8.1_p1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	[[ ${PLEVEL} -eq 0 ]] && return 1
+	local opt=$1
+	eval set -- {1..${PLEVEL}}
+	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+		done
+	fi
+}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
+
+case ${PV} in
+	*_alpha*|*_beta*|*_rc*)
+		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	;;
+	*)
+		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+	;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0/8"  # subslot matches SONAME major
+[[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs +unicode utils"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+	"${FILESDIR}"/${PN}-7.0-headers.patch
+	"${FILESDIR}"/${PN}-8.0-headers.patch
+	"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
+)
+
+# Needed because we don't want the patches being unpacked
+# (which emits annoying and useless error messages)
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+	default
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline || die # for local readline headers
+}
+
+src_configure() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	export ac_cv_prog_AR=$(tc-getAR)
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
+		export bash_cv_func_ctype_nonascii='yes'
+		export bash_cv_wcwidth_broken='no' #503312
+	fi
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--cache-file="${BUILD_DIR}"/config.cache
+		--with-curses
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+		ECONF_SOURCE="${S}"/examples/rlfe \
+		econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
+			ln -s ../../lib${l}.a lib${l}.a || die
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if use utils && ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
+	dodoc USAGE
+	docinto ps
+	dodoc doc/*.ps
+}
+pkg_preinst() {
+	# bug #29865
+	# Reappeared in #595324 with paludis so keeping this for now...
+	preserve_old_lib \
+		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 7)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify \
+		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 7)
+}
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index 3361338b4ab7..3ee4d6e10bdd 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,5 +1,5 @@
 DIST talloc-2.3.1.tar.gz 638878 BLAKE2B 3d014a47639434c65f5dda2c51da3c6c28d5d60dbc9afdaca27b8ec903cde3433a8fa4ca33305750ff60911f7e43171d0d932d98c2d30ea38494aa532d6d9626 SHA512 064fc39a9aaace6e0209f3251c8ff198d8a318b4cf4198006ff9892ca6e15e7d817b2fda43e0444fbbf04d2c3e70d06523dff5d57cbb796d27317ef4759e062e
 DIST talloc-2.3.2.tar.gz 661344 BLAKE2B 957eedc4a367051cb99fa4d2edb8e778de8e0187bb5c0d84a1afef20aab122a8b7310d10c694e15ddd6a0a45194889fe3d26dae0ceb8e406d51512af95a23014 SHA512 c851a6f43025720453a3bff8734bfcfff0e29fb7cf2ffcc6c03b6ab8589098daf01d668deec61aa2f238d4df3eb3c47bd080e26eec760cf04a70e1afcad5c5e1
 EBUILD talloc-2.3.1.ebuild 3424 BLAKE2B 560a71b2392812d40361647d548ed8b5e99f4fa40ba85ee8d1fa88194b4f63722b28209247ac05b05fc5252c6fbcaa37ff934debe3a9c4604b69f4f4f7ca4c12 SHA512 de4dff8f5d23a3ea40ad1dfbfcb4d4766d34779a9884bad411559c91ec12dd2cff0e08a020a5e62e32bd3b96efc0328624ab3ee650ffa3b41b1b8640e8bf0097
-EBUILD talloc-2.3.2.ebuild 3430 BLAKE2B 15c3effe12347ea4f3795fac08f2195508a011593966ddf69cb102bfdeb3e86e2415f47b7e4e35e521f1d759000714d305f6b57266c97f40ffd2e205ac5d8b97 SHA512 3b49ce968168ee2c934bb9a92a95b8db2dee6bbfae25a94294dfaf16f1af1d44add4109598d6efb5d0d715eb937353da992cfa662273da4a8a7c4a1d2a999f2a
+EBUILD talloc-2.3.2.ebuild 3429 BLAKE2B 74567c2ac2f709681c461fcdaafe77d23fc163d310511ce6b56756c966fa5ca9934bd224582e43072f8a2f16cc9c9924928a0ba0e53d104e0305c6f7373ec487 SHA512 4b84db74540ba5f3295e53ac01ea7899a39a906d4ef26708862363b957d7303ee2159bbeb04a7db90fd65a6d4944391b21bdf6ccc96a0f0f37a3278670a7ddf1
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.3.2.ebuild b/sys-libs/talloc/talloc-2.3.2.ebuild
index c092b3fc0c14..f5099063c53f 100644
--- a/sys-libs/talloc/talloc-2.3.2.ebuild
+++ b/sys-libs/talloc/talloc-2.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"