gentoo resync : 25.09.2021

82 files changed, 1720 insertions, 2020 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 66594d244411..913be3a7c4f4 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index dc33546cb78d..6b62036e2a04 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,68 +1,23 @@
-AUX automake-1.10-ccnoco-ldflags.patch 901 BLAKE2B dee96c3d931011c9f30ab803ce039ebe48bb89a923c614eecfe05eb6b4d39409db0dbb8e9b7bf333a3f8e198fd8750bd4b9234d16d605498cfb08ff93b95af8f SHA512 bc823b9387277c06944faef1abc4277c4f6e8024cf9cdfdfb2b9f333d578cedb6c5071fbf49ee420dbe696e8a8bda4583829e3eca225e9ba7f5d0ca0e2639ca3
 AUX automake-1.10-perl-5.16.patch 3555 BLAKE2B 8128b27ade89b12445b02532d9837ff469e6d0e1be3ebab6969d8d68c3a57a27e25ff89db82ed8abf3eff6d392bbd3b91a0b5b6b0827e7eec1279bc5345dc024 SHA512 050d66f3f1b4aed6482a234b32bbdbe231ddea0c9f4fb2ff97e963095ad69a487fd65986189fd659fbe8d8d011f3f866e92e506e653fd832d2adaf3263ed33fc
 AUX automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch 3016 BLAKE2B 8dbc2ae72f8d687e785be6dde22429305cdbbb2b441a05ad268d5a7f019b087e090d7b93cb5ff033d004a8344fc9056172f1a16bd0bfa98501e1c55cf6933c54 SHA512 0f6c6ee15c895b64742113156f9864396daa6d7680897e4795909c78cb300df0d96c63091a39e901c2d62e76852fcbb49a5be747cb4b381c4346b81c0c570149
 AUX automake-1.13-dyn-ithreads.patch 2126 BLAKE2B 13fa89641077b7e9e7052441b84b756d7ddbd1ac3b87857028ccb34feb4528d774400fc411bf4fa54bbed697d8be6bf948d774d474f0638611c52f8d98696951 SHA512 7a3795cb8b14b347a296abd410f3a740401e796a06317e52fa1ef8b0866099f71965f7fb12fd85db2ccc7445f310a4dbff6870d8a63e72c49ed6f8ca9da97277
 AUX automake-1.13-hash-order-workaround.patch 529 BLAKE2B 92706c8c87aa1722de4ee4bbffd815720dfbc3d124776f7118ca57d682bbb9475174357412bb7e9f79c98adeb03651087cb095b52e682aa14447ab012945ca6a SHA512 2899c650664ead4c5fb4fdae79605b665cad52c3ecda0f8192e2ca37dbfdb42eb5937f9a24622e6463d4c003d70186b8a4c1404a47bd387de36d9f0db03e5593
 AUX automake-1.13-perl-escape-curly-bracket-r1.patch 1127 BLAKE2B 18664d2af473845f6ae91ab566651a53cbcf16df598adc3812f6d40f774c2c571c20dada4f23193b2b39ddc36c5fe9fea0449f32231540477fbf2260a7052c51 SHA512 25d94503572f70a5f9ab808057ca1ad7080cba89cf98c2b1664da2dc347f8ada1db6a97138a9b3ee12ffa54a37a34307a9fded4c069e1eb20e490556ad4f46d3
-AUX automake-1.14-gzip-fix.patch 2689 BLAKE2B 589f5261936f1d54f1345dccc284381373bef942d8fc484c3df1394109bb0cf9b425c28cf21f9c798d9dc9b7e095289a3b9547c6fbd3b4b0f1116d106e78d299 SHA512 aa5f25cc036a5b27a7066c9a0daeb862b739cfe6b32e029e1c76ef3a0816629e09d26f08137f07e52be9c6dce616f758e51030eef0109a17de1ec94b33a40d68
 AUX automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch 3015 BLAKE2B a0a7afb76c8cd8a5dce60bcb0a7a59a7957bcfe2b70f541889d5677005f4c9a295cf0459eaf4626314ce75031716028fe0a91db00f416e2aef8d17d8e31009d0 SHA512 34a061b72993290ac9fbf7957da89d0ed0ded70f304db0983ffff557887434dba01f5ca40cfd13dccfc648af7ade9b94d45895bac33dd560d550e3f1b24b6a55
 AUX automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch 3672 BLAKE2B e967579e81e3da85c9a5026a829be9dae93fd7d452c67bf94383787a7e7b46b62ba605112f3aaa5b4ee38d06727320ab8df017fc0b3a957e8fe0ba8e91883d52 SHA512 cfb9a11d82641b4f5b8e43d6a97fc20d012ce9ba6c4ab5fa3bae8c33da980867e3bad35229fbd5f2d811cfd849b275e83ecd0b80d25cff78695f700ebfc92cdc
 AUX automake-1.15-perl-escape-curly-bracket.patch 1129 BLAKE2B deb9f842d4d0fd8735e7da0a8344a8c48521097db06cf8c37705046dfdeedc913fcc8fe9c462a7f0dc9089f2548fdfb86a26e19edeb966d3d769a396faca3fae SHA512 d6c2078e7eebd4e5104e7c9d9b5623cab322689b520e28b788a0e6fc52d795ef24e246f72ada9be6aae7d4904e34e4a6f2b6dc94abb3ed70b338d89985ed2164
 AUX automake-1.16.2-fix-instmany-python.sh-test.patch 676 BLAKE2B b4368612ef22de981e56c633b6993db5bc7fc1c84f9be002018d4dd25c13bbc36ef7378940680b3c73a559100134e2356e7d626cdc24d91497e644e8e27268a1 SHA512 41d0d797cf25f2e080a57f57bee041cc02ea9e0a7f1ee8aa55af112f43e02c58b867d778b79d82b909d13c55ac0326718f1716947c9022e035e4631d7dbe85a0
 AUX automake-1.16.2-fix-py-compile-basedir.sh-test.patch 985 BLAKE2B 9a07629d107316ed765990ef2e1356a16dfb6231829315bab704dc7fdb4716dce9320eef4baaef3ab76db2908b9071c4cb35c6607be8b984896b2cfbcdb8b474 SHA512 22c1db04dcb71a6d1519c0d54e18c40f0ad5d4ada82edf606c8c0da6a3fb6dadcd7ec5289da2373b17c063211cb1ef6c85b5a6a7e355f906ca660bc402ce184b
 AUX automake-1.16.2-py3-compile.patch 2412 BLAKE2B 20a3ce66047ad5106f0cafccce19fc8acd47ee0ba01882d1ff18c1a15592ef68b9c3debb61df78a31f238938a93ca4dc281b358b588727864673b09b11167131 SHA512 3bb9769d37b02e89373612752f127c582f948347a6f54e8b24dba262e14ca860e8fa507d96c0d51f0d64587371b9da17eb270dd5b7695091181731e35e5b9c2d
-AUX automake-1.4-CVE-2009-4029.patch 2186 BLAKE2B 6a33684f950b1e932418e2b7d8d6676fc27792e354f3b72502d5149e9ec9db6fb984e5bb168a465ad97e13d0f1d84b6b8acc0ca04ef51612577196f67441cad3 SHA512 cf65172ee59f91869b13292204e9744fb385a2cf13a17dab0e1dba5b1f403da55d1bd73448b00d81f46de2c9e7de1347e7b6868cd6f4b5e97e255a5c206d2d31
-AUX automake-1.4-ansi2knr-stdlib.patch 176 BLAKE2B a62062f56aa89108f851d8f51d4774b36d639a11cf88d20c8dc0df3593531ed053d2374112ce61157a043bb3b5803c896c2f0cac0ecf2d3d5081aaf73a29b2ef SHA512 fa8de19294b53adbcafdf551e2611e842df610bfb6bfd1d11022c44870a7b0a6ac8c53c4ff78a6cb36f8994d2e0bd6ab3aafbd7ce74a33789585e58419966634
-AUX automake-1.4-libtoolize.patch 496 BLAKE2B 966b85c9c7d9d87506d01d55e08a019167a368058784ed2fcb627f79f91d69313ca8bae68d10b522400782bcce553a25a9ddfa3d196d3e4df6ea6bfe8dc48b60 SHA512 8cc4ae889552ffe431adbfa2b0d599416c049072b54e2f9a145342eccaa1c526cfb125315b3549957b41e0b4407ca6c96ad5bd120b75ab09221cf6efdee6ac05
-AUX automake-1.4-nls-nuisances.patch 750 BLAKE2B 9b7d33971fbc96d653e98f439f157f97a32226af36f04dd43f92c21edcedb47ed5293e9a0e39a12d7608d712ff8ecdd6a52af6e1c087f9b53012f411454e2fde SHA512 ca77a877d040f81271fd7241165748b169b8690b7e4a53b63f6c17de6f2bd2eb0a23af6ab2c3333f7f4a203dc29b7c428909b137f91efd24920d29f4dad04807
-AUX automake-1.4-perl-5.11.patch 839 BLAKE2B 6af1a5bbef79cf7938486ebfcf5b46cc3d10817a64344c824258dab187286af34ff64ef9fda7dda679b9d988a8bbc22dfaea1ab28df94cf05d853a5fabc3cd00 SHA512 f604c8334a942c345c4f63a07a18d91123f840a66d9314d99853a3133caf032f8dd6ad65b124f78f89c9494451babb3245a8ed7e771dbc9e479c302938fb62d5
-AUX automake-1.4-perl-dyn-call.patch 738 BLAKE2B 5bd553905fcedfa58cf57db2f188317d31199044670696d21f61087b0c81d9270d8ae7f23e373536c1c6961dc67ee1c3dece6e7b73cdcb4a6a8de4942155c8b0 SHA512 69a1d2ff4265e2cc3935313e95337b3b4c3b52210888ef15c15a83aa35e2b564e04f03bb8c8bca6877913abb2ccc5ea4351eb245b4b6e5f48f19f8010941e24c
-AUX automake-1.4-subdirs-89656.patch 944 BLAKE2B 98db6654bc5fdec52c05695d628dad8b2d1d3bb0acf607a8b0b69c13a4c4fbce013818c279c19857d39933fd9b23ddd6574c13f9dd18214409cd91f0b540cee2 SHA512 3aa2d98bf64294f608c081df2c316064ae86d7d7b05b60f79a571049e8d125a91309771edeb460ff8d29bf2536e0fe0542c0c247764338be9af37c0d32686670
-AUX automake-1.5-CVE-2009-4029.patch 2316 BLAKE2B 7c90e68fc679f3431ed17fc456281adb9bae25c0d3652d940ee3299780f580c975012ad4cb90c072bf4f770b895c8ed11a9541f227edabb9cb6c4b7fc88cab26 SHA512 2961ce03774e55623362b041214e8b1ecc98c193ca1b080938b848c3069e25438fd023a41ac73ca6aaf51d537e836fa8bcfbbd3e6e32494ba758ecbcbe2458ee
-AUX automake-1.5-perl-5.11.patch 806 BLAKE2B 2391683a15f82728e1992d1ec066d3ce5bd9016e633efb44e1ad4b61792f2730b2f88ddc06f49dce72d1b2031fa33501081fccbb99d9f5c96e6681e657dc7031 SHA512 1eb9314be86d7e775c1bbdc35d86d3f0e8b5ca81e4c170a6fec63dea3895c81c770e101660e4337a942fa2c34aeaa6b8b1e7eaed3d310921c23292dbcd25febe
-AUX automake-1.5-slot.patch 1045 BLAKE2B e40fb233fddf1fb8f6e31450b6146da1455a76154aae9c6707f0ba9ece429cdd7acebcbc5375e6b6314a6c10d633df8332cdfdc8c2c227af4def87b5365da654 SHA512 ff77ccc31c1db5e4abaf27ec103790ea9e362bc06e6f07b399a0b8fb3122bcb2ef60a428c1387a2c1f9ed6f9a005bae4a7fe2f36b590fc7c167794c9d925e864
-AUX automake-1.5-target_hook.patch 878 BLAKE2B 88c775ee47e76ff7aa1db9c5da275e4c33ef335e90bfcd1f34b3f3b105793400e591ddeba3b72922ed2d8d329a400563f532a86f1933375cc223fa070f27b51b SHA512 0a6e13aa9ac5e467ea2afc1e7cfc4707cf80e845596ac01869e2d58395a5a9058f2c160b9717fd0f6a2c8eec9ee4c9a922a0e3af7337061e6a99980ff69d4fc5
-AUX automake-1.5-test-fixes.patch 1300 BLAKE2B 87a853e32a34419e48d8a6514f2c404d7e77c6ffcd703d2d493546c6e355b4d431733a7f00be370c7ad2188c6589d1c4b42d885d7cda7f294a66f3e54a717c39 SHA512 5642985801c0786678062f50fbc8090c4994c53b989727e274e4054d37dd9efc0de44b160bb5eae71fbdad289daf406812963d941a68953d1f6314089196f0f4
-AUX automake-1.6.3-test-fixes.patch 723 BLAKE2B 9d54674ae2964702cc1965e8d977ab5e6cad42dde4ae053ada2999e1cc8decdb40d58c108962d87b2d27e9b9e2acaf482fb2e4106e761bcfd2ca5016511645bc SHA512 6f3b97d87412906a812febd813a4303b1dde51454732256e4b483388eb602b471262f79822ad222e738199d9583ae3d91e266197385d9a265306907a696d8b93
-AUX automake-1.7.9-infopage-namechange.patch 524 BLAKE2B 791a81fea03fc88f8709a9745f4d94a3a8be970631531f321fd1fff5f3767beeca2f0024c9a6da508754f0842bac42dd49dfa02384579d902667e83fdb93646c SHA512 a96d27e04012fd43f722740dcb600b33039c76a400019e414903b9c4778b588436c375262dcac8723fc0f6cd0cd3b409d11b7e479c8ef774cc5f0b234d11ee38
-AUX automake-1.7.9-libtool-2.patch 859 BLAKE2B 3ef296b4cef6e21888c5c704342bbabae4c52b9e0f5b14f938086f2a5f0c695a06dba9856ef802242f30d8c5fcb99b20daaba83a89a727b91d5b37208453c4ff SHA512 1e571d20a0a8d5928c938e3892e5cc5d76abb678f726ee85afb5d29417ccd2167c249a8c252496312277e8dfbf9b0f7c5c6b77cec1e861a02400dddb5d4711b4
-AUX automake-1.7.9-test-fixes.patch 1159 BLAKE2B a805acac10b8895cf97804d44217d20ad6f15bfee7118c4ac9ce7744437a15925b79bf2cfc998edd3f7bc934ba292a76116d93d246983ebbeb5a8fb0980d6dee SHA512 ea4a6ded1a6f605dbcb3cf3da1c6f369c2dd4abf3739185df723ffe52eb88ef93ff1e9b23323c7a94c477301250873dbeea2af2cac1affdfde9d67ce7d38a679
-AUX automake-1.8-perl-5.11.patch 784 BLAKE2B 5bbd4f9b5dd03233a7b06f230cedc5693afdb4a9d5d6a88a36cf7f245c63f40efbe1ccea037238f364ffeefab6fd98b7237883a04734ae915df0a146e27d530d SHA512 ab574c2af5a4b1c734d547611e74057984092b7058e638344f3c2350858a8fd45fcdd5c8a7631d6d54777458d6d6f79f922b0b94c653f3370a386c035ff9eb32
-AUX automake-1.8.2-infopage-namechange.patch 1131 BLAKE2B 535a92ce58929485880b978a914cdda42e3310d40fdc0d59d9c9e1fd4a15008765589561379c19a7e7763bac7837d9fd85ed2d55466be64858b3b5cf42c7ec6b SHA512 cf39407187264c1db540701c9e1164c5204b4cfdec02f93e91298b582b13e0fe77c5d272801df9bb50f2cda5dcd14114386f9f445eda28c51bebc1f61fb828ea
-AUX automake-1.8.5-CVE-2009-4029.patch 2256 BLAKE2B c6c0c9624d7bbf5648efabd6ef3a8a1448f018f8e13ae68955285ca6f0ef9e0630e92a133df629f6d5472e33ad3a21d1c7fb18e6a13e4dd77be0b144da936d4c SHA512 e7043688eb420facf38efddc745d57f2adb519bf85eb5a525a99b495b67347a476aab06570f4be1c8585cc07ef4c3d43468c015fbc103a0e34123510c3f84e35
-AUX automake-1.8.5-test-fixes.patch 1068 BLAKE2B 5e72e237ba972be5c35e3630e9c673e0fce07af7aa260eeeb1a8363a0f35c7da7655f2b31d7fc726a2c564b7cbc8afc2124e4883469b8147405afe1760ede340 SHA512 703c40549542dcd55af05201e3c40118ee138398da6dc87ce7b880ee71a7bf15ad1063d8ebcf9807c2849c8a981367d2cc5f9f5b14c060ce36303250ec792685
-AUX automake-1.9.6-aclocal7-test-sleep.patch 1102 BLAKE2B 63a4b56f2c88d290072cd88e1939323845db3b24c0cfbcc28ee6af06846a9bfb92a18fd9de3282b20ce5a1887855ec2f4bac210966f96852f8a7dca964b1ec46 SHA512 9ac24b6ff41b1fe17cf36d10c9b3e7a52b35cf7384ddbb03328a4593da76918707a47717a21257a86fa28c39e6c7648d0309ef7bb71be65744151704919dbb16
-AUX automake-1.9.6-ignore-comments-r1.patch 618 BLAKE2B da53e3798ed97625f2e92e215d4da2d60f94f972d0a7df299f65561ea8f7a62a2f8d6847b7ebeb7de138336eb47b609fed9212edda0d4dc4f8913d46d4a0bb43 SHA512 0ecb4ca8dcb4cc13e5b7b90d59b9f1e5165adb90bbe06a297b89904d3a1de058cde5b448b842f04e1ba6ec642334b159e0c9983b81f5186fb4175227f8996ae5
-AUX automake-1.9.6-include-dir-prefix-r1.patch 1110 BLAKE2B d3e81d86b83eaa6734201ef6ad238243332180352b593713a40544c2a73bd10d4b0162a0a1b2a3572a2cb89490de13871db4bdc2ebfb55b0e8dc88db2d939e3a SHA512 30f251c017de861d4a704b79043bb32b4a1cffc2a7888902218360b730a1103e076950637704d14db684e3f69d11a0c60359ff68d307bb2bd024e27a5751b450
-AUX automake-1.9.6-infopage-namechange-r1.patch 1160 BLAKE2B 01a83d16f7b262d47075f146cc0c1452249b049e06bfd059649184601cf53582a7fcc3b988d5abbf9e2a98c6ded93d0fe7f85f0a706d2233460187c7fc60b158 SHA512 12696d6af2f6f7d8db3ca0b94532c8c9a170462dfbea52e92e127619a1af4ae87e063a47b34f675bc25e7591ce94713f5739a887a22ce4d2977a7d00e90009ed
-AUX automake-1.9.6-subst-test.patch 1332 BLAKE2B c7a882b592835a4bf9625435aa508975d7d8945f501dcc273947abca0bb22fe4a0a939777574bf7102b8c4c0c83d49a6e13e7e89a7e8d84a9c45f2427ae9c883 SHA512 f5e8106e96f5976d8f958665b53cdf1088d0620f7d4da3b9f5a73766ddc32c4eff13d39f245a8a01b90567c364949a94bc7ecdcc4b8214b43d2f7f6b1740a891
-DIST automake-1.10.3.tar.bz2 957505 BLAKE2B e17dc5b4b1b70ed03fb12b48bef9ff7f1dd9d641ace5ba96ace8e76d2aa129deb272a2eebca1df599b2db9ce6e1c7a11ac866dc578aa703a6fb87bf06658db36 SHA512 4f4172c53f31103a93baa794bb498c8b42c1a06e5e0c909063863cdfee3f768016bdecf46e64417a8e362d4c524907b48c0c1b24f510d26aa66bcfd85d0b2598
 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
-DIST automake-1.12.6.tar.xz 1400336 BLAKE2B b1d9befdda70f9caab881c1159921ea883a790c24919fcff2a4a03d10cdb3883f7f2ec866b3f64e94b27f0aee771d04cf364eb48734a074259ec00162190d7a2 SHA512 ddcd664ef8f52a44c0adbe908e3a5a2844d8768932211d75dedf262827ffa411b5c3599f93a212f1c979108122cd14bbea5e672218596dd7c934a25d805aae5c
 DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1aac59bdc0d941077fde9be7742da0f57b48d678169e7a0e8b652c3ef46c314cdd3efb0fc489c389852fed1c39a02 SHA512 c9b145c1b822a4d83f2899f4280a76ccae932301b273f4c9718dc7f53161aa03dc1be2c1fb1a61083c54186e1908ae2c8284250aa1d8f6dea484767aca1344d3
-DIST automake-1.14.1.tar.xz 1488984 BLAKE2B a4c9b1f2c5ca35fba62e57423be2b6c060c63df8198d06a904a236745053072cb14ca4b333fb6cf370ef73378ee8771f4c10bcc111dcbd69e40f75abc16475fa SHA512 5de971159dfca2ec74c3c9a2f1368331efc437b146d675740c8735fcb0d32a30d0560fd29df64c3279efdf9278152c82a9ff09040b3e64d84743aaf25b26ce69
 DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
 DIST automake-1.16.3.tar.xz 1590708 BLAKE2B ab6001a1b09e171ec83bac07155a77ab0fc29f5185116616aa3080b27e8bbf759472cd0dfb75630b26f7ad8d0741e668662d00b370ef79cf5ef6c62e945c94da SHA512 7265aeb7f82a8a205761d76e6ade7b7e97831c283349fd80f86e511f4b0b3e17f429d1506fca84c76079f63781e5dbf5ca81455d6bf6cda27d2e5c3d23b0d1aa
 DIST automake-1.16.4.tar.xz 1599336 BLAKE2B a74bb444e7074e7dd7cf920a94a86756a5e6dec24a9eeb669ee629a1d3ab667efef0005d488fe6d9d8b33a680ada54f098ca334b63da4a739b0fec7c630a65aa SHA512 5a8883657e73b75bfa1ee59ab04af6bf4d43f390ab62fb7a9e8e2ac66159dfe4947b2ac7bc1028afffe6a09d88f388339500e03f6cdfa1226985be45ec033246
-DIST automake-1.4-p6.tar.gz 375060 BLAKE2B 681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69 SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e
-DIST automake-1.5.tar.gz 526934 BLAKE2B 4b613c81f933d550cc9e5e40dd9ce1160f49c388f4e9292b1a8843b0f4cfc57d72a3dc10bce03260cffa61ab8d67a5b27d781bd7a4c2d842764135158dc2b54f SHA512 b9dbece18935b6c08f7d17c456b0359a17362dc030692629cf5d66db675e46a5f24d60dfd20a50780e4096163454f1922d4281c4bb7af336d61e527b579e3bfc
-DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c631375898568b442cc5d3561a618ad3f15b6103f55539487dcbf4088a6f75887dce5d00851bc4c09c5db45012d6bc2f1 SHA512 8407ea7d51a238622326d89c22777050c2a49d456e3e33c53985f40e4108094ef149693568d926cd1e9b2ddbdb5693c0d0ec6220e0f7bbae4341b6be9f0d060f
-DIST automake-1.7.9.tar.bz2 577705 BLAKE2B 0fdd9eec855f79dba2067374d2fb902d92fa4c2ec1e3fe292376383b3f8cef62799d880610af51b7b31b4a17812b9cd25d1bbc8687fd30ee98de88d4e7625f53 SHA512 372f326cdf9c893a016473b959f0d3b92a7a82a13978e3950a887a79c93856a635549ebc63945faafba30b8be6db1c4cd68385f7dfe1cbb36386400acb2aa7a2
-DIST automake-1.8.5.tar.bz2 663182 BLAKE2B a1488fe8653517d16e69e64655829119283ae9f49d5a29c4886100197fb08d6893abf2701000125fcbaa9923c76a2466de25e056ffcf856eb2878c34284c00b6 SHA512 862f9fe8dd4f0fd51b97d80b767304b982d9c9307bf66933298187bf121f5c827f0b4880eab92f07d16e0c1d41ff5179923c7ae8d8aabd635db8574d4a3021b0
-DIST automake-1.9.6.tar.bz2 765505 BLAKE2B 078d4dff44be18d93a8b1b30367a6010fff0be890a61a23926910ac2d92ac87672e7fec8f3548815eaa72310b3c4e042ce0f5df0250423446b39924eee4d044b SHA512 6aa8824876003bcac804e88d58f014a2449c7e1d824e46b5e971d3e2d070bc6ac0a3881e8eaae12e2f7f310c6b81dfb83ad4647d58785fc7e6759aa37478784e
-EBUILD automake-1.10.3-r3.ebuild 2389 BLAKE2B fa0de8651505dad7d433f8d25fa46c5d78bf7a4d51a22092016e4e54f7a2f57fae3bb44ff03812386c922d7a5ee16f502b51354487d5fb63ad875246eef3e486 SHA512 05c6fbf4eb1293b770605d3f295f2bffbed76ed225f19a1270eb5ea6f7c87d0777009305a5f283242c9ce703a8bac358b25bdc2f5a65e0cb75801b7a0d6316e9
 EBUILD automake-1.11.6-r3.ebuild 2566 BLAKE2B c1e28e5349f89560b320f0fb61d63a18e13c3aac2a1962e6e8d31f2adf5f22136b9e949ff397c05c0781724aa40580f3217e7991fdbe8ac3c3d533f8e1262e7e SHA512 c4290cffa2dd4ce49949ba7e4db2a9ca7e07e22e6c26d814b1876583732ebd31954bbfed95e516125f12083a080209357872af2c7ccdafd4712fb30f922f9da7
-EBUILD automake-1.12.6-r2.ebuild 2421 BLAKE2B 6c605916889c8388fd8fd40d0aeb75ac58f2f4d4cfa2caef0e23709a9da611aa5a34eb851984fb2786566c29ea6c19f6518a6fa3133e96f6474f82a2a49e7809 SHA512 47ae0b3f8ffaabfbb8b2704ba97806e6cdff8e48ca0379181da3aca72263f8682b0653e311b11ffce4d3360a8c0cd295079449c341fd20c31b88328aac72e793
 EBUILD automake-1.13.4-r2.ebuild 2643 BLAKE2B cfb0517a6dbee72711d8f25f4a86c8cfd73ba821f3ed58ca86035d380d5b03102f1a56037257515a21247f1e42d74637df2cd71496a74e5bc47c798c72d9699b SHA512 41dd36863935300680001619afe6fa931521bde40e07c1b226899a09a5ed7ed67603074bfeb2dbd1f51dc0d3a3c968e83e4e64c9ab732406a0983e87c95ad79d
-EBUILD automake-1.14.1-r2.ebuild 3022 BLAKE2B e2cb5bc89a7e4626eb22704c4df87c043dab8bc3d35a0a9db040497afc9495a1803128650647bd656986e99d02ccbd239473d70c6877496c2a851287b12d3229 SHA512 1e4d32f7e40460be205d26bd9902e4e6326ed24e1896064ea6d81af1de69b8ca8e844ca96a3e38aa279a0611b8f19b2bfeaba8e06e194dd115b1fbb5abf338c2
 EBUILD automake-1.15.1-r2.ebuild 3192 BLAKE2B edd43338af2e12fdc25c419bcf452e014a64f23aac91d57d727d61a4125dcc047406a954b8d3b5d02a6232b528b25dc2b4d210e9caf76814453f9793d1a7ca7c SHA512 6de009d30ad3126f93f1c3b705ef44181a385e042488aa206cdc5a9aa7e518da79e80d5853e8f4f73fb3b3c682882afc48bec625ea7a881c63ca7d675a605c2d
 EBUILD automake-1.16.3-r1.ebuild 3518 BLAKE2B fa4a284c5f1564170e2d2ba0dc6f7e414d0a947b05c8b59e53a9622f93827add33d4551de53fff5fefd0e85b2fe7d9ddbe7e9032fee21b7ba6cf6a27cf217c02 SHA512 6c45e29f1304a2d219774359025c23c7a8bd20b99317c6a2c6275ab15eba935ac716da256411d002622574c4a48de9684f6fed2c4e4f6cb9e0bae1d27f8725c0
-EBUILD automake-1.16.4.ebuild 3526 BLAKE2B 2983d453d694de228a3206e1e2e95798768c7101af3b59287e16b0bbf2563c12deba911d9dae7a2bb0a62c2f23bb90e571a0788ebe41570d299afb860aed7691 SHA512 859c9074b0be85ffadf4c0791faee51ab4153c31a5ad99bbad0811856011f2218ea2b028f9d3ea5698fc41d7f0d36c08be5357784b75507d470f9fb205fa1091
-EBUILD automake-1.4_p6-r2.ebuild 2470 BLAKE2B aaa71b7b5c7b6a3f8102b0838a00500e8319db8e691aed3834f544586a15c174af4c69417810e138d045c35c8c7822fcab912f2d5909d450b3916d1e2adae249 SHA512 ab1d60e86d761eb80bc0bf97c930d499ba9b63e85906f8b6b2c6c909fa85fecbe21bbdf3e3a882bfad5b89f94ac31bcb7a159578b9e0a306614226d9a63e7512
-EBUILD automake-1.5-r2.ebuild 2244 BLAKE2B 0fcf4acbc952d6c4e614c047db8450626f6a3942e2231209173f22934e1f36ee76d684c0588b8aaa7144dea11d3342241c8c9add5cc60ad9234c7be6cf267d21 SHA512 043f262714a4e52851837b01066044681b7cc57e6482a9daa1877ae7134e5c917930e4490afb943392e04a57707f513f10d85465cd0f5c12ee0b9bc0a9cee382
-EBUILD automake-1.6.3-r2.ebuild 2046 BLAKE2B 96c80209c1df50b2e4b47e45783f3b55dd253b41e917a4fee75556ce1b340103648280ab2a5b9435c17322cd5e6e01fe9bbd06ba3c1314874049eaca6019a023 SHA512 932954baa0b8af349b374ee07e179976973751626e8168162168d6dd855a8264b3ea0b79a4ea48a973c0119ec9a0d1fc3dbea859557003a62a965ff8c81ebff2
-EBUILD automake-1.7.9-r3.ebuild 2180 BLAKE2B 0c17bea964b87b3b675213a072ffc75c13ac338520405d6eafe3153ee01292d7c575706f8917569d2985c9b52e5fadfc8cec836fb756498cd8663d38a63f147a SHA512 c6862dfe39091fba2fd7e4fc9920f44c8692d4c817ed11b4b103e657a59e84cd9d66dadb37b8e717495a812233af68220a188cef8cc1eb14284842fbf221cca4
-EBUILD automake-1.8.5-r5.ebuild 2207 BLAKE2B 57ed7fc04c7cf2b44b9e7fdce38efa8b32e6a3990f244c04cb2446b294bb4a605e15ee076b09c2b8eda7c438662703a0653e08cebc5fb27512f5bc74a5de3a94 SHA512 2643bd139f75b30b3f6c8c404c340e00884645c569b18fa16296913de3a4bc5d90fc2d594ef5fa820019ed35fdd10e2bd28e56ddd1feda9eeb00d1c476480640
-EBUILD automake-1.9.6-r5.ebuild 2421 BLAKE2B f72af55efb0fb127cd7f964b950eb10131d2ea01933e83e82c677b89d11838a7a931e133352cee131101fe22156004b0028064237d8450383d40a2bab3d736f3 SHA512 23b5ae30b89b97a60955d6a97adb3c197fe6b7a7fd8c0e930be7a4ca26e90a901677261cea965ad95e173d3445596536f4770758dd49f3d12e8362a4afad9726
+EBUILD automake-1.16.4.ebuild 3520 BLAKE2B 8c9f6e221b6a2e24a4684176df3c52afdd32d0b75983c2d2b19e74a64da0ba08366d7d8d0d67ca52257e59fc1a07bc3e2ed9abab60188ca3c90a54f67eb774a8 SHA512 08a7fe18d0579713291abfa6c3e19731ede6801c99a6620f49cc81e7b2c1cc096643e2df983a3b6ac0e5203bf6f57a69a8b8b304d6236d2fb501c1e6e51e605f
 EBUILD automake-9999.ebuild 3438 BLAKE2B 120512bd6dafdd2c420159c87ebb547f3fc9fb2fc7614bd6334032a6402e76e3b4dc6a39f9e331ecc5b8eac354af5bf3661697973bbeaa42ee77215dc5f039e8 SHA512 a0c14464bc86c69ca843333db6cb8c154219c1493ec49dfe53cea86b2681962f51a65aea1e80490f81bf04b2d1983fa0322608f7d4d0839b4f883594a2c3eaa9
 MISC metadata.xml 332 BLAKE2B d33ce6b379d5d8d44ae9104f3e5c5a0b5b25682072f7222bdd6dd92b97123b3cc011ed078178a8d2cb9e3e3d1da03dde67b3a844374819fdb67b879341a8a5fa SHA512 ad4477b610e680468526c77df5550b44f8d0558237aac887312a463d4da29216a63db372710398d0eb478550550507e81421d1deee272038b3658c38b84e5b06
diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild
deleted file mode 100644
index a85f4c5a1e3b..000000000000
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
-	"${FILESDIR}"/${PN}-1.11-install-sh-avoid-low-risk-race-in-tmp.patch
-	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-	slot_info_pages
-
-	# SLOT the docs and junk
-	local x
-	for x in aclocal automake ; do
-		help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
-		doman ${x}-${SLOT}.1
-		rm -f "${ED}"/usr/bin/${x}
-	done
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-
-	# Avoid QA message about pre-compressed file in docs
-	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
-	if [[ -f "${tarfile}" ]] ; then
-		gunzip "${tarfile}" || die
-	fi
-}
diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
deleted file mode 100644
index c5b185148183..000000000000
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
-	"${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-
-	# Avoid QA message about pre-compressed file in docs
-	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
-	if [[ -f "${tarfile}" ]] ; then
-		gunzip "${tarfile}" || die
-	fi
-}
diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
deleted file mode 100644
index d9af1685d569..000000000000
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV/_beta} == ${PV} ]]; then
-	MY_P=${P}
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-else
-	MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
-	MY_P="${PN}-${MY_PV}"
-
-	# Alpha/beta releases are not distributed on the usual mirrors.
-	SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14-gzip-fix.patch
-	"${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
-	"${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-
-	# Bug 628912
-	if ! has_version sys-apps/texinfo ; then
-		touch doc/{stamp-vti,version.texi,automake.info} || die
-	fi
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-
-	# Avoid QA message about pre-compressed file in docs
-	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
-	if [[ -f "${tarfile}" ]] ; then
-		gunzip "${tarfile}" || die
-	fi
-}
diff --git a/sys-devel/automake/automake-1.16.4.ebuild b/sys-devel/automake/automake-1.16.4.ebuild
index a9dc19ef2b08..6f14fab673f1 100644
--- a/sys-devel/automake/automake-1.16.4.ebuild
+++ b/sys-devel/automake/automake-1.16.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	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"
+	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"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P="${P}"
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.4_p6-r2.ebuild b/sys-devel/automake/automake-1.4_p6-r2.ebuild
deleted file mode 100644
index 47f6590cfc3b..000000000000
--- a/sys-devel/automake/automake-1.4_p6-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4-nls-nuisances.patch #121151
-	"${FILESDIR}"/${PN}-1.4-libtoolize.patch
-	"${FILESDIR}"/${PN}-1.4-subdirs-89656.patch
-	"${FILESDIR}"/${PN}-1.4-ansi2knr-stdlib.patch
-	"${FILESDIR}"/${PN}-1.4-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.4-perl-5.11.patch
-	"${FILESDIR}"/${PN}-1.4-perl-dyn-call.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	sed -i 's:error\.test::' tests/Makefile.in #79529
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" \
-		pkgdatadir=/usr/share/automake-${SLOT} \
-		m4datadir=/usr/share/aclocal-${SLOT}
-	slot_info_pages
-	rm -f "${ED}"/usr/bin/{aclocal,automake} || die
-	dosym automake-${SLOT} /usr/share/automake
-
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.5-r2.ebuild b/sys-devel/automake/automake-1.5-r2.ebuild
deleted file mode 100644
index 740ac091ff4c..000000000000
--- a/sys-devel/automake/automake-1.5-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/automake-1.4-nls-nuisances.patch #121151
-	"${FILESDIR}"/${P}-target_hook.patch
-	"${FILESDIR}"/${P}-slot.patch
-	"${FILESDIR}"/${P}-test-fixes.patch #79505
-	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	"${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.5-perl-5.11.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-	slot_info_pages
-
-	local x
-	for x in aclocal automake ; do
-		mv "${ED}"/usr/bin/${x}{,-${SLOT}} || die
-		mv "${ED}"/usr/share/${x}{,-${SLOT}} || die
-	done
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.6.3-r2.ebuild b/sys-devel/automake/automake-1.6.3-r2.ebuild
deleted file mode 100644
index 2f2920295686..000000000000
--- a/sys-devel/automake/automake-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-fixes.patch #159557
-	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	"${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.5-perl-5.11.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-	slot_info_pages
-	rm -f "${ED}"/usr/bin/{aclocal,automake} || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.7.9-r3.ebuild b/sys-devel/automake/automake-1.7.9-r3.ebuild
deleted file mode 100644
index 8ec3a1b1d3a4..000000000000
--- a/sys-devel/automake/automake-1.7.9-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-infopage-namechange.patch
-	"${FILESDIR}"/${P}-test-fixes.patch
-	"${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
-	"${FILESDIR}"/${P}-libtool-2.patch #257544
-	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	"${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.5-perl-5.11.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-	slot_info_pages
-	rm -f "${ED}"/usr/bin/{aclocal,automake} || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.8.5-r5.ebuild b/sys-devel/automake/automake-1.8.5-r5.ebuild
deleted file mode 100644
index 6c6447a52c01..000000000000
--- a/sys-devel/automake/automake-1.8.5-r5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch
-	"${FILESDIR}"/${P}-test-fixes.patch #159557
-	"${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366
-	"${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
-	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	"${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.8-perl-5.11.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-	slot_info_pages
-	rm -f "${ED}"/usr/bin/{aclocal,automake} || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.9.6-r5.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild
deleted file mode 100644
index ef506d0fa073..000000000000
--- a/sys-devel/automake/automake-1.9.6-r5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	>=sys-apps/texinfo-4.7
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.6-infopage-namechange-r1.patch
-	"${FILESDIR}"/${P}-include-dir-prefix-r1.patch #107435
-	"${FILESDIR}"/${P}-ignore-comments-r1.patch #126388
-	"${FILESDIR}"/${P}-aclocal7-test-sleep.patch #197366
-	"${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
-	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	"${FILESDIR}"/${PN}-1.8.5-CVE-2009-4029.patch #295357
-	"${FILESDIR}"/${PN}-1.8-perl-5.11.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-	slot_info_pages
-
-	local x
-	for x in aclocal automake ; do
-		help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
-		doman ${x}-${SLOT}.1
-		rm -f "${ED}"/usr/bin/${x}
-	done
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch b/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch
deleted file mode 100644
index f48c6304bdc2..000000000000
--- a/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://bugs.gentoo.org/203914
-
-From 6e86514729c6dccb6213fdde8d93d7061c8108a5 Mon Sep 17 00:00:00 2001
-From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-Date: Mon, 7 Jan 2008 21:53:38 +0100
-Subject: [PATCH] Fix ccnoco.test for uncommon LDFLAGS settings.
-
-* tests/ccnoco.test (Mycomp): Use a tighter match for -c -o,
-to avoid matching for example `LDFLAGS=-Wl,--sort-common'.
-* THANKS: Update.
-Report and analysis by Carsten Lohrke and Mike Frysinger.
----
- ChangeLog         |    7 +++++++
- THANKS            |    1 +
- tests/ccnoco.test |    6 +++---
- 3 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/tests/ccnoco.test b/tests/ccnoco.test
-index 8b37fe8..ca75922 100755
---- a/tests/ccnoco.test
-+++ b/tests/ccnoco.test
-@@ -57,8 +57,8 @@ END
- cat > Mycomp << 'END'
- #!/bin/sh
- 
--case "$@" in
-- *-c*-o* | *-o*-c*)
-+case " "$* in
-+ *\ -c*\ -o* | *\ -o*\ -c*)
-     exit 1
-     ;;
- esac
--- 
-1.6.3
-
diff --git a/sys-devel/automake/files/automake-1.14-gzip-fix.patch b/sys-devel/automake/files/automake-1.14-gzip-fix.patch
deleted file mode 100644
index 39c201aba656..000000000000
--- a/sys-devel/automake/files/automake-1.14-gzip-fix.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 749468ac63042820bc3da85ece5bed64b0c15d62
-Author: Paul Eggert <eggert at>
-Date:   Mon Mar 28 19:44:19 2016 -0700
-
-    automake: port better to future gzip
-    
-    * lib/am/distdir.am (dist-gzip, dist-shar, distcheck):
-    Port better to future versions of gzip, which are planned to
-    deprecate the GZIP environment variable (Bug#20132).
-
-diff --git a/lib/am/distdir.am b/lib/am/distdir.am
-index d4dd8cc9b..87c6730f5 100644
---- a/lib/am/distdir.am
-+++ b/lib/am/distdir.am
-@@ -309,6 +309,16 @@ endif %?TOPDIR_P%
- ## We order DIST_TARGETS by expected duration of the compressors,
- ## slowest first, for better parallelism in "make dist".  Do not
- ## reorder DIST_ARCHIVES, users may expect gzip to be first.
-+##
-+## Traditionally, gzip prepended the contents of the GZIP environment
-+## variable to its arguments, and the commands below formerly used
-+## this by invoking 'GZIP=$(GZIP_ENV) gzip'.  The GZIP environment
-+## variable is now considered to be obsolescent, so the commands below
-+## now use 'eval GZIP= gzip $(GZIP_ENV)' instead; this should work
-+## with both older and newer gzip implementations.  The 'eval' is to
-+## support makefile assignments like 'GZIP_ENV = "-9 -n"' that quote
-+## the GZIP_ENV right-hand side because that was needed with the
-+## former invocation pattern.
- 
- if %?TOPDIR_P%
- 
-@@ -316,7 +326,7 @@ if %?TOPDIR_P%
- GZIP_ENV = --best
- .PHONY: dist-gzip
- dist-gzip: distdir
--	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
- 	$(am__post_remove_distdir)
- 
- ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2
-@@ -352,7 +362,7 @@ dist-shar: distdir
- 	@echo WARNING: "Support for shar distribution archives is" \
- 	               "deprecated." >&2
- 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
--	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
- 	$(am__post_remove_distdir)
- 
- ?ZIP?DIST_ARCHIVES += $(distdir).zip
-@@ -412,7 +422,7 @@ endif %?SUBDIRS%
- distcheck: dist
- 	case '$(DIST_ARCHIVES)' in \
- 	*.tar.gz*) \
--	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
- 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- 	*.tar.lz*) \
-@@ -422,7 +432,7 @@ distcheck: dist
- 	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- 	*.shar.gz*) \
--	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac
diff --git a/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch
deleted file mode 100644
index 42aef8c8e1bc..000000000000
--- a/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-http://bugs.gentoo.org/295357
-
-(Makefile.in mangled a little for 1.4_p6)
-
-From 449d20aa12e13fefd848604225fc83d0c39c61d0 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@redhat.com>
-Date: Tue, 1 Dec 2009 22:48:15 +0100
-Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs
-
-* automake.in (handle_dist_worker): Do not make all directories
-group- or world-writable.  Instead, use 755.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
----
- Makefile.in |    4 ++--
- automake.in |    4 ++--
- 4 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 93da407..59eb9f4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -456,7 +456,7 @@ dist-all: distdir
- distdir: $(DISTFILES)
- 	-rm -rf $(distdir)
- 	mkdir $(distdir)
--	-chmod 777 $(distdir)
-+	-chmod 755 $(distdir)
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
-@@ -477,7 +477,7 @@ distdir: $(DISTFILES)
- 	    test -d $(distdir)/$$subdir \
- 	    || mkdir $(distdir)/$$subdir \
- 	    || exit 1; \
--	    chmod 777 $(distdir)/$$subdir; \
-+	    chmod 755 $(distdir)/$$subdir; \
- 	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
- 	      || exit 1; \
- 	  fi; \
-diff --git a/automake.in b/automake.in
-index 8eceea7..8f48236 100755
---- a/automake.in
-+++ b/automake.in
-@@ -2336,7 +2336,7 @@ sub handle_dist_worker
- 	# Create dist directory.
- 	$output_rules .= ("\t-rm -rf \$(distdir)\n"
- 			  . "\tmkdir \$(distdir)\n"
--			  . "\t-chmod 777 \$(distdir)\n");
-+			  . "\t-chmod 755 \$(distdir)\n");
-     }
- 
-     # Only run automake in `dist' target if --include-deps and
-@@ -2468,7 +2468,7 @@ sub handle_dist_worker
- 	     . "\t" . '    test -d $(distdir)/$$subdir ' . "\\\n"
- 	     . "\t" . '    || mkdir $(distdir)/$$subdir ' . "\\\n"
- 	     . "\t" . '    || exit 1; ' . "\\\n"
--	     . "\t" . '    chmod 777 $(distdir)/$$subdir; ' . "\\\n"
-+	     . "\t" . '    chmod 755 $(distdir)/$$subdir; ' . "\\\n"
- 	     . "\t" . '    (cd $$subdir'
- 	     . ' && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$('
- 	     . (($relative_dir eq '.') ? 'distdir' : 'top_distdir')
--- 
-1.6.5.4
-
diff --git a/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch b/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch
deleted file mode 100644
index 62a076107ee5..000000000000
--- a/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ansi2knr.c
-+++ b/ansi2knr.c
-@@ -132,7 +132,7 @@
- 
- #endif /* not HAVE_CONFIG_H */
- 
--#if STDC_HEADERS
-+#if STDC_HEADERS || HAVE_STDLIB_H
- # include <stdlib.h>
- #else
- /*
diff --git a/sys-devel/automake/files/automake-1.4-libtoolize.patch b/sys-devel/automake/files/automake-1.4-libtoolize.patch
deleted file mode 100644
index 3e818ca960ba..000000000000
--- a/sys-devel/automake/files/automake-1.4-libtoolize.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch from redhat/fedora which made it into upstream.
-
---- a/automake.in
-+++ b/automake.in
-@@ -6882,9 +6882,11 @@
- 		    $suppress = 1;
- 
- 		    # Maybe run libtoolize.
-+		    @libtoolize_args = ('--automake');
-+		    push @libtoolize_args, '-c'  if $copy_missing;
- 		    if ($seen_libtool
- 			&& grep ($_ eq $file, @libtoolize_files)
--			&& system ('libtoolize', '--automake'))
-+			&& system ('libtoolize', @libtoolize_args))
- 		    {
- 			$message = "installing \`$errfile'";
- 			$suppress = 0;
diff --git a/sys-devel/automake/files/automake-1.4-nls-nuisances.patch b/sys-devel/automake/files/automake-1.4-nls-nuisances.patch
deleted file mode 100644
index d84d29698e64..000000000000
--- a/sys-devel/automake/files/automake-1.4-nls-nuisances.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -46,6 +46,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
diff --git a/sys-devel/automake/files/automake-1.4-perl-5.11.patch b/sys-devel/automake/files/automake-1.4-perl-5.11.patch
deleted file mode 100644
index f0423a64fbb8..000000000000
--- a/sys-devel/automake/files/automake-1.4-perl-5.11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@redhat.com>
-Date: Sun, 29 Nov 2009 20:35:03 +0100
-Subject: [PATCH] avoid a warning from perl-5.11
-
-* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
-"/d" modifier.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
----
- ChangeLog            | 6 ++++++
- lib/Automake/Wrap.pm | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
---- a/automake.in
-+++ b/automake.in
-@@ -5126,7 +5126,7 @@ sub pretty_print_internal
-     # character counts for eight.  So we count the number of Tabs and
-     # multiply by 7.
-     local ($fill_length) = length ($fill);
--    $fill_length += 7 * ($fill =~ tr/\t/\t/d);
-+    $fill_length += 7 * ($fill =~ tr/\t/\t/);
- 
-     local ($bol) = ($head eq '');
-     foreach (@values)
--- 
-2.1.3
-
diff --git a/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch b/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch
deleted file mode 100644
index 9a140aa50510..000000000000
--- a/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-at some point, a perl update broke this syntax.  use a newer style that works
-with at least perl-5.16.
-
---- a/automake.in
-+++ b/automake.in
-@@ -983,7 +983,7 @@ sub finish_languages
- 
- 	# Compute the function name of the finisher and then call it.
- 	$name = 'lang_' . $lang . '_finish';
--	do $name ();
-+	&$name ();
-     }
- 
-     # If the project is entirely C++ or entirely Fortran 77, don't
-@@ -1144,7 +1144,7 @@ sub handle_single_transform_list
- 		# Found the language, so see what it says.
- 		local ($subr) = 'lang_' . $lang . '_rewrite';
- 		# Note: computed subr call.
--		local ($r) = do $subr ($base, $extension);
-+		local ($r) = &$subr ($base, $extension);
- 		# Skip this entry if we were asked not to process it.
- 		next if ! $r;
- 
diff --git a/sys-devel/automake/files/automake-1.4-subdirs-89656.patch b/sys-devel/automake/files/automake-1.4-subdirs-89656.patch
deleted file mode 100644
index 7500fc98d9ac..000000000000
--- a/sys-devel/automake/files/automake-1.4-subdirs-89656.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Patch from redhat/fedora which made it into upstream.
-
---- automake-1.4-p6/subdirs.am.subdirs	2001-07-16 22:47:36.000000000 -0700
-+++ automake-1.4-p6/subdirs.am	2003-04-25 08:24:35.000000000 -0700
-@@ -27,7 +27,7 @@
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \
- check-recursive installcheck-recursive info-recursive dvi-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -55,7 +55,7 @@ check-recursive installcheck-recursive i
- ## bombs.
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
- 	dot_seen=no; \
- 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  rev="$$subdir $$rev"; \
diff --git a/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch
deleted file mode 100644
index d91139b30178..000000000000
--- a/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-http://bugs.gentoo.org/295357
-
-From b1c42762931e9cd03aee3e4b4284dc2920c9eabc Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@redhat.com>
-Date: Tue, 1 Dec 2009 22:48:15 +0100
-Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs
-
-* lib/am/distdir.am (distdir): Do not make all directories
-group- or world-writable.  Instead, use 755.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
----
- Makefile.in       |    3 ++-
- lib/am/distdir.am |    9 +++------
- 4 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index ebbfd2f..76991db 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -379,7 +379,8 @@ distdir: $(DISTFILES)
- 	$(MAKE) $(AM_MAKEFLAGS) \
- 	  top_distdir="${top_distdir}" distdir="$(distdir)" \
- 	  dist-info
--	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	-find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-diff --git a/lib/am/distdir.am b/lib/am/distdir.am
-index e808966..0a01c4e 100644
---- a/lib/am/distdir.am
-+++ b/lib/am/distdir.am
-@@ -127,11 +127,7 @@ if %?DIST-TARGETS%
- endif %?DIST-TARGETS%
- ##
- ## This complex find command will try to avoid changing the modes of
--## links into the source tree, in case they're hard-linked.  It will
--## also make directories writable by everybody, because some
--## brain-dead tar implementations change ownership and permissions of
--## a directory before extracting the files, thus becoming unable to
--## extract them.
-+## links into the source tree, in case they're hard-linked.
- ##
- ## Ignore return result from chmod, because it might give an error
- ## if we chmod a symlink.
-@@ -144,7 +140,8 @@ endif %?DIST-TARGETS%
- ## the file in place in the source tree.
- ##
- if %?TOPDIR_P%
--	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	-find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
--- 
-1.6.5.4
-
diff --git a/sys-devel/automake/files/automake-1.5-perl-5.11.patch b/sys-devel/automake/files/automake-1.5-perl-5.11.patch
deleted file mode 100644
index 1ee36468c319..000000000000
--- a/sys-devel/automake/files/automake-1.5-perl-5.11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@redhat.com>
-Date: Sun, 29 Nov 2009 20:35:03 +0100
-Subject: [PATCH] avoid a warning from perl-5.11
-
-* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
-"/d" modifier.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
----
- ChangeLog            | 6 ++++++
- lib/Automake/Wrap.pm | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
---- a/automake.in
-+++ b/automake.in
-@@ -5277,7 +5277,7 @@ sub pretty_print_internal
-     # character counts for eight.  So we count the number of Tabs and
-     # multiply by 7.
-     my $fill_length = length ($fill);
--    $fill_length += 7 * ($fill =~ tr/\t/\t/d);
-+    $fill_length += 7 * ($fill =~ tr/\t/\t/);
- 
-     foreach (@values)
-     {
--- 
-2.1.3
-
diff --git a/sys-devel/automake/files/automake-1.5-slot.patch b/sys-devel/automake/files/automake-1.5-slot.patch
deleted file mode 100644
index 640e73c7b794..000000000000
--- a/sys-devel/automake/files/automake-1.5-slot.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/aclocal.in
-+++ b/aclocal.in
-@@ -33,5 +33,5 @@
- $prefix = "@prefix@";
- # Note that this isn't pkgdatadir, but a separate directory.
--$acdir = "@datadir@/aclocal";
-+$acdir = "@datadir@/aclocal-1.5";
- 
- # Some globals.
-@@ -116,4 +116,5 @@
- 
- local (@dirlist) = &parse_arguments (@ARGV);
-+push (@dirlist, "/usr/share/aclocal") if (!grep(/^--acdir/, @ARGV));
- &scan_m4_files (@dirlist);
- &scan_configure;
-@@ -203,5 +204,5 @@
-     if ($print_and_exit)
-     {
--	print $acdir, "\n";
-+	print "/usr/share/aclocal", "\n";
- 	exit 0;
-     }
---- a/automake.in
-+++ b/automake.in
-@@ -32,7 +32,7 @@
- BEGIN
- {
-   my $prefix = "@prefix@";
--  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
-+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-1.5";
-   unshift @INC, "$perllibdir";
- }
- 
-@@ -127,7 +127,7 @@
- my $VERSION = "@VERSION@";
- my $PACKAGE = "@PACKAGE@";
- my $prefix = "@prefix@";
--my $libdir = "@datadir@/@PACKAGE@";
-+my $libdir = "@datadir@/@PACKAGE@-1.5";
- 
- # String constants.
- my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n';
diff --git a/sys-devel/automake/files/automake-1.5-target_hook.patch b/sys-devel/automake/files/automake-1.5-target_hook.patch
deleted file mode 100644
index 5f3bdb1f06c0..000000000000
--- a/sys-devel/automake/files/automake-1.5-target_hook.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-*** automake-1.5/automake.in
---- automake-1.5/automake.in
-***************
-*** 1941,1945 ****
-  
-  	# Let the language do some special magic if required.
-! 	$lang->target_hook ($aggregate, $object, $full);
-  
-  	if ($derived_source)
---- 1941,1947 ----
-  
-  	# Let the language do some special magic if required.
-! 	if (defined $lang) {
-! 		$lang->target_hook ($aggregate, $object, $full);
-! 	}
-  
-  	if ($derived_source)
-*** automake-1.5/m4/depout.m4
---- automake-1.5/m4/depout.m4
-***************
-*** 13,18 ****
-  for mf in $CONFIG_FILES; do
-    case "$mf" in
-!   Makefile) dirpart=.;;
-!   */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
-    *) continue;;
-    esac
---- 13,18 ----
-  for mf in $CONFIG_FILES; do
-    case "$mf" in
-!   Makefile|GNUmakefile) dirpart=.;;
-!   */Makefile|*/GNUmakefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
-    *) continue;;
-    esac
diff --git a/sys-devel/automake/files/automake-1.5-test-fixes.patch b/sys-devel/automake/files/automake-1.5-test-fixes.patch
deleted file mode 100644
index 8f34a793e450..000000000000
--- a/sys-devel/automake/files/automake-1.5-test-fixes.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Fix the tests so they don't fail :)
-http://bugs.gentoo.org/79505
-
-insthook:
-update the head/tail syntax since coreutils has deprecated the old style
-
-dirname:
-just disable the pos
-
-ccnoco:
-rip patches from fedora
-
-depcomp2: #181484
-fix false positive when using newer autoconf -- it throws a warning based
-on dataroot which causes a failure when there was none
-
---- automake-1.5/tests/insthook.test
-+++ automake-1.5/tests/insthook.test
-@@ -17 +17 @@
--test x$lnum != x && tail +$lnum Makefile.in | head -3 | grep install-exec-hook
-+test x$lnum != x && tail -n +$lnum Makefile.in | head -n 3 | grep install-exec-hook
---- automake-1.5/tests/dirname.test
-+++ automake-1.5/tests/dirname.test
-@@ -1,2 +1,3 @@
- #! /bin/sh
-+exit 0
- 
---- automake-1.5/tests/ccnoco.test
-+++ automake-1.5/tests/ccnoco.test
-@@ -39,7 +39,6 @@
- }
- END
- 
--$needs_autoconf
- gcc -v || exit 77
- 
- cat > Mycomp << 'END'
-@@ -51,7 +50,7 @@
-     ;;
- esac
- 
--exec gcc ${1+"$@"}
-+exec gcc "$@"
- END
- 
- chmod +x Mycomp
-@@ -59,6 +58,10 @@
- set -e
- 
- 
-+# Ignore user CFLAGS.
-+CFLAGS=
-+export CFLAGS
-+
- for conf in configure.1 configure.3; do
-    cp $conf configure.in
- 
---- automake-1.5/tests/depcomp2.test
-+++ automake-1.5/tests/depcomp2.test
-@@ -17,4 +17,5 @@
- cat > Makefile.am << 'END'
- SUBDIRS = subdir
-+datarootdir = @datarootdir@
- END
- 
diff --git a/sys-devel/automake/files/automake-1.6.3-test-fixes.patch b/sys-devel/automake/files/automake-1.6.3-test-fixes.patch
deleted file mode 100644
index 666517754a96..000000000000
--- a/sys-devel/automake/files/automake-1.6.3-test-fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix the tests so they don't fail :)
-
-depcomp2: #159557 #181484
-fix false positive when using newer autoconf -- it throws a warning based
-on dataroot which causes a failure when there was none
-
-man2: #159557
-grab update from newer automake
-
---- automake-1.6.3/tests/depcomp2.test
-+++ automake-1.6.3/tests/depcomp2.test
-@@ -17,4 +17,5 @@
- cat > Makefile.am << 'END'
- SUBDIRS = subdir
-+datarootdir = @datarootdir@
- END
- 
---- automake-1.6.3/tests/man2.test
-+++ automake-1.6.3/tests/man2.test
-@@ -23,7 +23,7 @@
- $AUTOMAKE
- 
- # Let's play with $DESTDIR too, it shouldn't hurt.
--./configure --prefix=''
-+./configure --prefix='' --mandir=/man
- DESTDIR="`pwd`/=inst" $MAKE -e SHELL=/bin/sh install
- 
- test -f ./=inst/man/man2/foo.2
diff --git a/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch b/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch
deleted file mode 100644
index bb1c21175175..000000000000
--- a/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -199,8 +199,9 @@
- 
- .texi.info:
- 	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
--	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--	 -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+	cd $(srcdir) \
-+		&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+			`echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
diff --git a/sys-devel/automake/files/automake-1.7.9-libtool-2.patch b/sys-devel/automake/files/automake-1.7.9-libtool-2.patch
deleted file mode 100644
index ad1d75d8caa9..000000000000
--- a/sys-devel/automake/files/automake-1.7.9-libtool-2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-fixup tests w/libtool-2
-
-https://bugs.gentoo.org/257544
-
---- automake-1.7.9/tests/libtool5.test
-+++ automake-1.7.9/tests/libtool5.test
-@@ -45,5 +45,6 @@
- END
- 
- libtoolize
-+[ -e config.guess ] || libtoolize --install
- $ACLOCAL
- $AUTOMAKE
---- automake-1.7.9/tests/ltcond2.test
-+++ automake-1.7.9/tests/ltcond2.test
-@@ -73,6 +73,7 @@
- echo 'int main() { print(); return 0; }' >main.c
- 
- libtoolize
-+[ -e config.guess ] || libtoolize --install
- $ACLOCAL
- $AUTOCONF
- $AUTOMAKE
---- automake-1.7.9/tests/ltcond.test
-+++ automake-1.7.9/tests/ltcond.test
-@@ -62,6 +62,7 @@
- mkdir empty
- 
- libtoolize
-+[ -e config.guess ] || libtoolize --install
- $ACLOCAL
- $AUTOCONF
- $AUTOMAKE
---- automake-1.7.9/tests/ltconv.test
-+++ automake-1.7.9/tests/ltconv.test
-@@ -111,6 +111,7 @@
- EOF
- 
- libtoolize
-+[ -e config.guess ] || libtoolize --install
- $ACLOCAL
- $AUTOCONF
- $AUTOMAKE
diff --git a/sys-devel/automake/files/automake-1.7.9-test-fixes.patch b/sys-devel/automake/files/automake-1.7.9-test-fixes.patch
deleted file mode 100644
index 00854886d66d..000000000000
--- a/sys-devel/automake/files/automake-1.7.9-test-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix the tests so they don't fail :)
-
-exdir2 man2 transform: #159557 #162565
-grab updates from newer automake
-
-mkdir-tests.m4:
-when mixing newer gettext with this automake, the tests bomb out
-as AM_PROG_MKDIR_P is not provided properly
-
---- automake-1.7.9/tests/man2.test
-+++ automake-1.7.9/tests/man2.test
-@@ -41,7 +41,7 @@
- $AUTOMAKE
- 
- # Let's play with $DESTDIR too, it shouldn't hurt.
--./configure --prefix=''
-+./configure --prefix='' --mandir=/man
- DESTDIR="`pwd`/_inst" $MAKE -e install
- 
- test -f ./_inst/man/man2/foo.2
---- automake-1.7.9/tests/transform.test
-+++ automake-1.7.9/tests/transform.test
-@@ -56,7 +56,7 @@
- $AUTOCONF
- $AUTOMAKE
- 
--./configure --program-prefix=gnu- --prefix `pwd`/inst
-+./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man
- $MAKE
- $MAKE test-install
- $MAKE uninstall
---- automake-1.7.9/tests/exdir2.test
-+++ automake-1.7.9/tests/exdir2.test
-@@ -23,7 +23,7 @@
- . ./defs || exit 1
- 
- cat > Makefile.am << 'EOF'
--html_DATA = zot.html
-+quuz_DATA = zot.html
- pkgdata_DATA = qbert
- EOF
- 
---- automake-1.7.9/m4/mkdir-tests.m4
-+++ automake-1.7.9/m4/mkdir-tests.m4
-@@ -0,0 +1 @@
-+AC_DEFUN([AM_PROG_MKDIR_P])
diff --git a/sys-devel/automake/files/automake-1.8-perl-5.11.patch b/sys-devel/automake/files/automake-1.8-perl-5.11.patch
deleted file mode 100644
index 0808174f0102..000000000000
--- a/sys-devel/automake/files/automake-1.8-perl-5.11.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@redhat.com>
-Date: Sun, 29 Nov 2009 20:35:03 +0100
-Subject: [PATCH] avoid a warning from perl-5.11
-
-* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
-"/d" modifier.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
----
- ChangeLog            | 6 ++++++
- lib/Automake/Wrap.pm | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
-index 09a135a..66213d1 100644
---- a/lib/Automake/Wrap.pm
-+++ b/lib/Automake/Wrap.pm
-@@ -55,7 +55,7 @@ sub tab_length($)
- {
-   my ($txt) = @_;
-   my $len = length ($txt);
--  $len += 7 * ($txt =~ tr/\t/\t/d);
-+  $len += 7 * ($txt =~ tr/\t/\t/);
-   return $len;
- }
- 
--- 
-2.1.3
-
diff --git a/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch b/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch
deleted file mode 100644
index bc7d58ed35ec..000000000000
--- a/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- automake-1.8.2/doc/Makefile.in	2004-02-03 21:59:01.585999688 +0200
-+++ automake-1.8.2.info/doc/Makefile.in	2004-02-03 22:04:03.893042032 +0200
-@@ -175,29 +175,10 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- .texi.info:
--	restore=: && \
--	backupdir="$(am__leading_dot)am$$$$" && \
--	am__cwd=`pwd` && cd $(srcdir) && \
--	rm -rf $$backupdir && mkdir $$backupdir && \
--	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
--	  if test -f $$f; then \
--	    mv $$f $$backupdir; \
--	    restore=mv; \
--	  fi; \
--	done; \
--	cd "$$am__cwd"; \
--	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--	 -o $@ $<; \
--	then \
--	  rc=0; \
--	  cd $(srcdir); \
--	else \
--	  rc=$$?; \
--	  cd $(srcdir) && \
--	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
--	fi; \
--	rm -rf $$backupdir; \
--	exit $$rc
-+	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
-+	cd $(srcdir) \
-+		&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+		`echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
diff --git a/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch
deleted file mode 100644
index 9e42e52c80bd..000000000000
--- a/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-http://bugs.gentoo.org/295357
-
-From 4331fc7423036e68a9e480fb0ff56934b5d2be0e Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@redhat.com>
-Date: Tue, 1 Dec 2009 22:07:45 +0100
-Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs
-
-* lib/am/distdir.am (distdir): Do not make all directories
-group- or world-writable.  Instead, use 755.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
----
- Makefile.in       |    3 ++-
- lib/am/distdir.am |    9 +++------
- 4 files changed, 17 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f6971b4..c753eaa 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -389,7 +389,8 @@ distdir: $(DISTFILES)
- 	      || exit 1; \
- 	  fi; \
- 	done
--	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	-find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-diff --git a/lib/am/distdir.am b/lib/am/distdir.am
-index 0ed0593..91dbe6b 100644
---- a/lib/am/distdir.am
-+++ b/lib/am/distdir.am
-@@ -190,11 +190,7 @@ if %?DIST-TARGETS%
- endif %?DIST-TARGETS%
- ##
- ## This complex find command will try to avoid changing the modes of
--## links into the source tree, in case they're hard-linked.  It will
--## also make directories writable by everybody, because some
--## brain-dead tar implementations change ownership and permissions of
--## a directory before extracting the files, thus becoming unable to
--## extract them.
-+## links into the source tree, in case they're hard-linked.
- ##
- ## Ignore return result from chmod, because it might give an error
- ## if we chmod a symlink.
-@@ -207,7 +203,8 @@ endif %?DIST-TARGETS%
- ## the file in place in the source tree.
- ##
- if %?TOPDIR_P%
--	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	-find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
--- 
-1.6.5.4
-
diff --git a/sys-devel/automake/files/automake-1.8.5-test-fixes.patch b/sys-devel/automake/files/automake-1.8.5-test-fixes.patch
deleted file mode 100644
index 43290d1e0d4b..000000000000
--- a/sys-devel/automake/files/automake-1.8.5-test-fixes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix the tests so they don't fail :)
-
-exdir2 man2 transform: #159557 #162565
-grab updates from newer automake
-
---- automake-1.8.5/tests/man2.test
-+++ automake-1.8.5/tests/man2.test
-@@ -41,7 +41,7 @@
- $AUTOMAKE
- 
- # Let's play with $DESTDIR too, it shouldn't hurt.
--./configure --prefix=''
-+./configure --prefix='' --mandir=/man
- DESTDIR="`pwd`/_inst" $MAKE -e install
- 
- test -f ./_inst/man/man2/foo.2
---- automake-1.8.5/tests/transform.test
-+++ automake-1.8.5/tests/transform.test
-@@ -56,7 +56,7 @@
- $AUTOCONF
- $AUTOMAKE
- 
--./configure --program-prefix=gnu- --prefix `pwd`/inst
-+./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man
- $MAKE
- $MAKE test-install
- $MAKE uninstall
---- automake-1.8.5/tests/exdir2.test
-+++ automake-1.8.5/tests/exdir2.test
-@@ -25,11 +25,11 @@
- set -e
- 
- cat > Makefile.am << 'EOF'
--html_DATA = zot.html
-+quuz_DATA = zot.html
- pkgdata_DATA = qbert
- EOF
- 
- $ACLOCAL
- AUTOMAKE_fails
- grep 'pkgdatadir' stderr && exit 1
--grep 'Makefile.am:1:.*htmldir.*undefined' stderr
-+grep 'Makefile.am:1:.*quuzdir.*undefined' stderr
diff --git a/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch b/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch
deleted file mode 100644
index ea2b227b8d40..000000000000
--- a/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://bugs.gentoo.org/197366
-
-commit 8952f7248c2637426bcf83d38f07a8b02124a06e
-Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-Date:   Wed May 10 20:50:53 2006 +0000
-
-    * tests/aclocal7.test: Add `$sleep's between file touching
-    and automake resp aclocal+automake invocations, to ensure
-    they complete with a time stamp strictly later than the touched
-    file.
-
-diff --git a/tests/aclocal7.test b/tests/aclocal7.test
-index 787565c..f6d5e31 100755
---- a/tests/aclocal7.test
-+++ b/tests/aclocal7.test
-@@ -89,6 +89,7 @@ test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in
- touch fragment.inc
- $sleep
- touch foo
-+$sleep
- $ACLOCAL -I m4
- $AUTOMAKE --no-force
- # Only ./Makefile.in should change.
-@@ -101,6 +102,7 @@ grep README Makefile.in && exit 1
- : > README
- $sleep
- touch foo
-+$sleep
- $AUTOMAKE --no-force
- # Even if no dependency change, the content changed.
- test `ls -1t Makefile.in foo | sed 1q` = Makefile.in
-@@ -111,6 +113,7 @@ grep README Makefile.in
- : > sub/Makefile.in
- $sleep
- touch foo
-+$sleep
- $ACLOCAL -I m4
- $AUTOMAKE --no-force
- # Only sub/Makefile.in should change.
diff --git a/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch b/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch
deleted file mode 100644
index da3f288d739e..000000000000
--- a/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/126388
-
-2006-03-16  Mike Frysinger  <vapier@gentoo.org>
-
-	* aclocal.in (scan_configure_dep): Ignore ## lines.
-	(scan_file): Remove dnl and # comments.
-
---- a/aclocal.in
-+++ b/aclocal.in
-@@ -227,6 +227,8 @@
-   foreach (split ("\n", $contents))
-     {
-       ++$line;
-+      # Ignore `##' lines.
-+      next if /^##/;
-       # Remove comments from current line.
-       s/\bdnl\b.*$//;
-       s/\#.*$//;
-@@ -311,6 +313,10 @@
- 
-       $contents .= $_;
- 
-+      # Remove comments from current line.
-+      s/\bdnl\b.*$//;
-+      s/\#.*$//;
-+
-       while (/$ac_defun_rx/go)
- 	{
- 	  if (! defined $1)
diff --git a/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch b/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch
deleted file mode 100644
index a1cc613e880c..000000000000
--- a/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://bugs.gentoo.org/107435
-http://lists.gnu.org/archive/html/automake/2005-09/msg00088.html
-
-2005-09-27  Stepan Kasal  <address@hidden>
-
-	* automake.in (handle_single_transform): Direct suffix rule preserves
-	  the directory prefix, so the generated object name should contain
-	  it, too.
-
---- a/automake.in	2005-09-17 15:05:39.000000000 +0200
-+++ b/automake.in	2005-09-27 17:10:47.000000000 +0200
-@@ -1755,6 +1755,10 @@
-             # This is probably the result of a direct suffix rule.
-             # In this case we just accept the rewrite.
-             $object = "$base$extension";
-+            if ($directory ne '')
-+            {
-+                $object = $directory . '/' . $object;
-+            }
-             $linker = '';
-         }
-         else
-@@ -1824,7 +1828,7 @@
- 
- 		# For Java, the way we're handling it right now, a
- 		# `..' component doesn't make sense.
--                if ($lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
-+                if ($lang && $lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
- 		  {
- 		    err_am "`$full' should not contain a `..' component";
- 		  }
diff --git a/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch b/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch
deleted file mode 100644
index d99c442e93a2..000000000000
--- a/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/doc/Makefile.in.orig	2005-07-11 00:39:31.000000000 -0400
-+++ b/doc/Makefile.in	2005-07-11 00:40:46.000000000 -0400
-@@ -187,26 +187,10 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- .texi.info:
--	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
--	am__cwd=`pwd` && cd $(srcdir) && \
--	rm -rf $$backupdir && mkdir $$backupdir && \
--	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
--	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
--	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
--	  done; \
--	else :; fi && \
--	cd "$$am__cwd"; \
--	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--	 -o $@ $<; \
--	then \
--	  rc=0; \
--	  cd $(srcdir); \
--	else \
--	  rc=$$?; \
--	  cd $(srcdir) && \
--	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
--	fi; \
--	rm -rf $$backupdir; exit $$rc
-+	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
-+	cd $(srcdir) \
-+		&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+		`echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
diff --git a/sys-devel/automake/files/automake-1.9.6-subst-test.patch b/sys-devel/automake/files/automake-1.9.6-subst-test.patch
deleted file mode 100644
index 6b794b1e1377..000000000000
--- a/sys-devel/automake/files/automake-1.9.6-subst-test.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/222225
-
-Patch from automake upstream git-repo to fix "make check" with newer versions of autoconf
-
-From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-Date: Sun, 22 Jul 2007 09:06:23 +0000 (+0000)
-Subject: * tests/subst.test: Move the AC_SUBST into a macro definition.
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff_plain;h=3d85de7baa9edf21c56401db3d25ef8a8e8d7797
-
-* tests/subst.test: Move the AC_SUBST into a macro definition.
-Avoids an error from CVS Autoconf.
-* THANKS: Update.
-Report by Benoit Sigoure.
----
-diff --git a/tests/subst.test b/tests/subst.test
-index 33e925d..a72af85 100755
---- a/tests/subst.test
-+++ b/tests/subst.test
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
-+# Copyright (C) 1996, 2001, 2002, 2007  Free Software Foundation, Inc.
- #
- # This file is part of GNU Automake.
- #
-@@ -24,8 +24,14 @@
- . ./defs || exit 1
- 
- cat >> configure.in << 'END'
--AC_SUBST($1)
--AC_SUBST([$]$1)  dnl this is the actual invocation that was used
-+dnl This test used to have the following lines, which cannot have
-+dnl worked sensibly with Autoconf for years, however:
-+dnl AC_SUBST($1)
-+dnl AC_SUBST([$]$1)  dnl this is the actual invocation that was used
-+dnl
-+AC_DEFUN([FOO],
-+[AC_SUBST([$1])])
-+FOO([BAR])
- END
- 
- : > Makefile.am
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index ec9bf931eb96..79d431bd5f2f 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -5,6 +5,6 @@ DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a5
 DIST binutils-2.37_p1-patches-0.tar.xz 1392 BLAKE2B 128930a381022fea5d1fcb0695953e8dada2513b088b8540fe08d4e0da93ec18b6bf9c78acad6ec5a8982ae2c115d143462ef0bb7bfd63cfeb06c10ad472c2f8 SHA512 44666821f96349e96685ffcfd53a80a94659e38fc63eeeb980d0eed13aab03ae3e2d5059b4932cd9018f2f7698cdb5e15b443d60c01b2bd1385eeb0c698e0e24
 DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B a8aa0f386d03a5b1466166ac7c40989c228351ccf0949a9b462b4d4615d70ab7e1a45351299140a42baf39c317b8007733c253eb547ee1dfadb612addde11621 SHA512 46c297ec2a7a5b81d1c6e3f16486a6dc2860a07520fe2dd8871d1eb5160065bbe2cc6b0415d5352bf12284133e5817a4e429e6077182d615e969bd1a8f52ed28
 EBUILD binutils-hppa64-2.35.2.ebuild 12393 BLAKE2B 7c6521094cd088a4d9ddab7391c2994e9506a53083a269d1fcee519f5ad8ded88e53d6957656ba5287643c17a87ae7c584e49771aa635d573f40ff3c060c153d SHA512 5855d3967d920f93ed177626a9eb64348e951341751d42b3d67b98dacedea9b250473a5e3baee3d08510a8a3d2f8340ba775ee71207df125d1490b4a23dea281
-EBUILD binutils-hppa64-2.36.1-r2.ebuild 12394 BLAKE2B de0c3d4769e6f059de888475b266b0bdf26b27ae05d5f2441548051ef360f7e5ca0a06776507f771772e022c183a7eeed9eeaf8a1e9ff92ef947b3568f907a5d SHA512 8decd31c9b4aeacef4e369692c6e5dd7a6bf5a9223f11ce828742cfdcc229d3e6502187bb28d70814ee0e6b273d415c11b017338daa13b3da0ec3f34fce67bf0
-EBUILD binutils-hppa64-2.37_p1.ebuild 13276 BLAKE2B 5b69c5f9c34694f41f7b8c9f75ba5d6997e599d619829e0f2af3483c3c2ab1097acaf4d9b27d7b8c384ebab4451b86c2427ab3af0c12abb9d10d53dcc37a1721 SHA512 c01f890969109cfddb31166ef53ea641f56cea28eec73e5cd1792cc058cd8028daa2938279331228a7296435499fc0e5c31c23806808a1e925d86d8b73d5ca52
+EBUILD binutils-hppa64-2.36.1-r2.ebuild 12393 BLAKE2B e3e115594ce298f5a07dab3d6863ee96b73dc3986072806f58ac7e80b7391302a96ab675796145a1d055f0a6bf5172cc326cbcb5cdcb5a08c72638f56b79896a SHA512 5ff8c5926981f43ccf5b87695a92d8aa892e5fbdbe650e4be59b77af905050050551333576e4285413cd452ce7a8b68ac77d34bb5dee2ad914e4f0499bd5cc2d
+EBUILD binutils-hppa64-2.37_p1.ebuild 13275 BLAKE2B c4f63c1cb9632e648f4637a149132a7413cfe6fb781c17b2a5e8e8336d77ac1d6adbc6dd108904196f50f4ba311e3450751ac74ca8da24ceefd1bda1459064fc SHA512 56ba53ba8fcf221dddb488c4a5c573ae0e6e896ea4ea2d282e8799e4f562142b828781e7629eaf31687ba6763b582955629efc7ba334ecabf9b72536ce41cc36
 MISC metadata.xml 768 BLAKE2B 1cb2040748f903384539ed50518edd39be540f29b510d6dabe6e0d81e3ef4b726c92b40a06e75ff57b66b8b187e16ab8ad00875b91fdf2750b66f77be39d04d4 SHA512 756f93e299351c878b77043e6153db24b0c7f5a7ae4d62970955f4734428b54cb7726ca739157a18d40bdffacbcd292d5b28a9c2d7927ff5fba210ba0163099b
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1-r2.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1-r2.ebuild
index 9f5a705c45a7..e1769ee1b9b8 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1-r2.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1-r2.ebuild
@@ -35,7 +35,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(ver_cut 1-2)
-		KEYWORDS="-* ~hppa"
+		KEYWORDS="-* hppa"
 		;;
 esac
 
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.37_p1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.37_p1.ebuild
index 3b073ef9b5cf..6532ec4e9dd8 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.37_p1.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.37_p1.ebuild
@@ -35,7 +35,7 @@ else
 		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 	SLOT=$(ver_cut 1-2)
 	# live ebuild
-	KEYWORDS="-* ~hppa"
+	KEYWORDS="-* hppa"
 fi
 
 #
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index f46545b99df1..793d84c4f48e 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -21,6 +21,6 @@ EBUILD binutils-2.33.1-r1.ebuild 11909 BLAKE2B 7401764d65bb05f67b9892bbd6e1b66eb
 EBUILD binutils-2.34-r2.ebuild 12005 BLAKE2B 8455ac022e79d7099fa863cd969cff17aa6ff3e3a260120da75b2564bc8eaae3287b3f1242df8daa68f95bb47b491502552f67bb84d91ad9c11684663a4b86eb SHA512 36f794faedf862a43ae5e3895100506c18b12be46ba9e152d694be932a9f9f754539c4faaa9a72ffdcd2410b5555e97af22c1947233a26548242d8e5de37f152
 EBUILD binutils-2.35.2.ebuild 12886 BLAKE2B f917e60ca6585449a67d14de97f653617f0ae86a9fc7f5442443314ca25d4dae6b05338b7d76455a2b64ca5077a57837699417f56752a53678f21b2dc8174cf0 SHA512 963629da28ae4bc0ec436341269f03f2eaa7bf40d2ffa7d7c9a1ee4ac2c29ee8a8ded88cd3263b9155be7d66b6267f941dede3aa0246eb5540831a543b780db1
 EBUILD binutils-2.36.1-r2.ebuild 12788 BLAKE2B ce79b2adc7b9affff16cf23a5465007a1103aaeba4c6a97a73123028452a1ce51d9e305c1b3740c83c7ab291a93f9338eecb48ac3919c95d53e2522ca2326a11 SHA512 dacb6dbb601dd3f1ab214b6c8ab05d08c7f75cdf76024833a8766235ae058ad51394058c5bc357ac4fd323a51d28f360352e0bedc7f726e66cb362435a8e8322
-EBUILD binutils-2.37_p1.ebuild 13082 BLAKE2B 9d788932b05c4a1c7c40a8be44489f15a0850350b26da8f7ce4c2b17db0dcedc7b50a47ee77b4a6747426aeb51fec345711f51d1aa49bb382c0d7e878753ef3e SHA512 7ccdb1f12a05cfcbb993314ba4324531440d7ccd93c6d5a0cf2ac3064dfabc6193feb69dbfd043f3d4b382f2be0a6c09bf0681a338602f92ffeaaa76f9887d2a
+EBUILD binutils-2.37_p1.ebuild 13078 BLAKE2B 7d8f05e879958af8f91cfa71ec5825b3c66a31a71c52d8848c61befedcd712c51531988b24f98a6c93573c1d9a55eff1ed444f5cd0fc1518b3737389040b620a SHA512 2e716ebc38ac15722e2b7048a8e82dc15f50fabcd59fa2af39fb61629ecfd8064edecb07c48cbaa29b4b6a179ab0c6c3ce4e145a4b728ac5d4befa89681db65f
 EBUILD binutils-9999.ebuild 13083 BLAKE2B b1b5a0f27b8b960157962dc5ca861308d95e1ec95113168a815fc95428a4790a7db0b24290b0c95a3cb3a1da572dec5b8cc08c9def1deb53c8884baf8d3984f0 SHA512 b188d46e800f197cc18f62beec9ad72c3de53dd73176d5a4cfa30dedafccc41aaa520b0e0a58571de8cb417d751f1439cc818d02a823808bb04c7de86db968cc
 MISC metadata.xml 727 BLAKE2B 4ee6dbcec8f8ec7e5fe028344dcad9689e6d4edd1871a4b9f6b28952edafa2dd41df7e03f3a72d3fcf5853a791f7a77a5aa08108d24ae9589e7c0c98b564ddad SHA512 999c1f33f4a25ab6b8e1ede0862e9ad849dd44366236914f2558cc9377336d49989e592973625d9833ad238645e918d7341817e2170ff6a6029b40f7addb775c
diff --git a/sys-devel/binutils/binutils-2.37_p1.ebuild b/sys-devel/binutils/binutils-2.37_p1.ebuild
index 5ee7334398a5..e5e61cf28ee5 100644
--- a/sys-devel/binutils/binutils-2.37_p1.ebuild
+++ b/sys-devel/binutils/binutils-2.37_p1.ebuild
@@ -33,7 +33,7 @@ else
 		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 	SLOT=$(ver_cut 1-2)
 	# live ebuild
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 #
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index e4931c900464..e2b5a9ea685d 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,6 +1,8 @@
 DIST bison-3.7.6-patches-01.tar.xz 10600 BLAKE2B c7907a327c2bbb82a2e575a864e71400f91cd4349a84f95b187ecaadefc1bfd595a91bce6c8c47e42423cace9cf78a4041fde3fdc489a4824aa3c10ca73be7cb SHA512 8f2ddee79b9678b9fd9a7a34f26d44f7c4472d0fc55c9fef8b418d27949b6a27309b7aa5ac3f4a5ad27c90ad7d92d824ffe767c77b0ed81de6b2897c91cd7560
 DIST bison-3.7.6.tar.xz 2627180 BLAKE2B 2f1015b517e46ff0870378b4d0dd489c8c737f31b2b69146bd7fbbae1e3adcdff0e4837cfdf1d238e8660ecc2b310ce87ec8940ed4989278b3df6cbb2d464e54 SHA512 6c1c9b825fbd2c94b8903f03a7e68e6832599f7bbd8d3c49864537c11b038c45a15de02fd36128d662af314334c83515bbc132df84e9acc6c651e98649c65bad
 DIST bison-3.8.1.tar.xz 2800372 BLAKE2B 0b70ee1b3ab8075540d9254cffdc1dfc9a9fb354d8b9b79dd3b097bf9a2235f892e120736e4195ad21ce8fbf3831c63b2d1a267a20a7abf85f0d72cdcdac1820 SHA512 f87978c41eca4db22de4f64feb3be92e44862d412f75dd84980045faf0f9e7f5a41b25bef8d4acd90743638eab61a7ac111444969d958fef5fe3535bac416921
+DIST bison-3.8.2.tar.xz 2817324 BLAKE2B e211b61494c911f55b72a8b70b5a48cdf4000ce9e675a1f1f52735bb8f57d93a3f8075341451263af9c9c531004907ae2b62b1873e7e4664c2cd26fa3b12271c SHA512 d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444
 EBUILD bison-3.7.6.ebuild 2433 BLAKE2B 0ed0bec877079f60e821b335f829182a23d564111df453066ba7d312c9c943bd944cf095b6c4aeb8756efcf6299fd7e8fcbcdba0befc8b8804d629fc5f21c6d3 SHA512 2ad813a961f85a7f120f95b1a6d37cc217368a660ae763b2fdc1c61c85ba99ca26a92bca932591ea73d7ca69c8ce1902d0d1a3317fd44b30a89cf6f3dacea07e
 EBUILD bison-3.8.1.ebuild 2492 BLAKE2B 9a7c6514cb839e0ed4d86652aeff12b309f80dad54253c2791acd66744cadec894357ac2a106e9fe92dfb0c5fa8f9c749c4c9816e031a822ae8c5e4eb0148796 SHA512 75ef8593d1884d207a7fe5bf82741e5c73d59e4be299afba037ffd741135154734aa6d8c4c4611eddeaaba3bc397052c51326a66949edb82ca15f9336d217102
+EBUILD bison-3.8.2.ebuild 2492 BLAKE2B 9a7c6514cb839e0ed4d86652aeff12b309f80dad54253c2791acd66744cadec894357ac2a106e9fe92dfb0c5fa8f9c749c4c9816e031a822ae8c5e4eb0148796 SHA512 75ef8593d1884d207a7fe5bf82741e5c73d59e4be299afba037ffd741135154734aa6d8c4c4611eddeaaba3bc397052c51326a66949edb82ca15f9336d217102
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-devel/bison/bison-3.8.2.ebuild b/sys-devel/bison/bison-3.8.2.ebuild
new file mode 100644
index 000000000000..21002c007b81
--- /dev/null
+++ b/sys-devel/bison/bison-3.8.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
+HOMEPAGE="https://www.gnu.org/software/bison/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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="examples nls static test"
+RESTRICT="!test? ( test )"
+
+# gettext _IS_ required in RDEPEND because >=bison-3.7 links against
+# libtextstyle.so!!! (see bug #740754)
+DEPEND="
+	>=sys-devel/m4-1.4.16
+	>=sys-devel/gettext-0.21
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/flex
+	test? ( dev-lang/perl )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) # ChangeLog-2012 ChangeLog-1998 PACKAGING README-alpha README-release
+
+src_prepare() {
+	# Old logic when we needed to patch configure.ac
+	# Keeping in case it's useful for future
+
+	# Record date to avoid 'config.status --recheck' & regen of 'tests/package.m4'
+	#touch -r configure.ac old.configure.ac || die
+	#touch -r configure old.configure || die
+
+	#eapply "${WORKDIR}"/patches
+	#default
+
+	# Restore date after patching
+	#touch -r old.configure.ac configure.ac || die
+	#touch -r old.configure configure || die
+
+	# The makefiles make the man page depend on the configure script
+	# which we patched above.  Touch it to prevent regeneration.
+	#touch doc/bison.1 || die #548778 #538300#9
+
+	default
+
+	# Avoid regenerating the info page when the timezone is diff. #574492
+	sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		$(use_enable nls)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# This one is installed by dev-util/yacc
+	mv "${ED}"/usr/bin/yacc{,.bison} || die
+	mv "${ED}"/usr/share/man/man1/yacc{,.bison}.1 || die
+
+	# We do not need liby.a
+	rm -r "${ED}"/usr/lib* || die
+
+	# Examples are about 200K, so let's make them optional still for now.
+	if ! use examples ; then
+		rm -r "${ED}"/usr/share/doc/${PF}/examples/ || die
+	fi
+}
+
+pkg_postinst() {
+	local f="${EROOT}/usr/bin/yacc"
+	if [[ ! -e ${f} ]] ; then
+		ln -s yacc.bison "${f}"
+	fi
+}
+
+pkg_postrm() {
+	# clean up the dead symlink when we get unmerged #377469
+	local f="${EROOT}/usr/bin/yacc"
+	if [[ -L ${f} && ! -e ${f} ]] ; then
+		rm -f "${f}"
+	fi
+}
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 37b83bbcf538..ec5491402b83 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -3,11 +3,13 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
 DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
+DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
 EBUILD clang-common-10.0.1.ebuild 573 BLAKE2B a2e0ed9b70b470ade3c22d56ea097befd935702369dcb21b367f3baa95635e1edea1f62760ffe3b678a72410b8b20091167bc5c38d75350004f52b24d7497cae SHA512 da407fe94951d7b6edfe8a237d761bda0114a8e34fd3fe59933c4605851b6a414f9278204e6b7f83d3f6ac9334f80660a7733484b64291ad58c84364015585a4
 EBUILD clang-common-11.1.0.ebuild 581 BLAKE2B 3e7e2e6c0b0a7f177aaf610a7be4bebb6eb23aec0f4677263555a37c57eb6547d94078465939f9062b562f0b5cc59bda22b2e293e0b2f7907f66dd76c95fe554 SHA512 1ce397f6029bc8ee03c8d0aac13e14b7faf77cc446ab390f1435c8c028364620e565e73cb5e97bb6c0093e0a20c34e8a4ceab9591707687567520c0192264bea
 EBUILD clang-common-12.0.1.ebuild 593 BLAKE2B b67b21c9d61f523ab9f32d53114763ce95348100e985d96c9ccbae2b9d5ad698fbc174001091c4f9184ecdf904a4d00a9449c28cd09a1e173d885dd1e7759949 SHA512 707eca3a5b53a104c3350cc42f5fe01df9ef17ba4863dbd00093b685a052da67825b7e837820ecd23087759fe2057ae1fbb00b391c79653dacf2c94fd1261342
 EBUILD clang-common-13.0.0.9999.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
 EBUILD clang-common-13.0.0_rc2.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
 EBUILD clang-common-13.0.0_rc3.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
+EBUILD clang-common-13.0.0_rc4.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
 EBUILD clang-common-14.0.0.9999.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/clang-common/clang-common-13.0.0_rc4.ebuild b/sys-devel/clang-common/clang-common-13.0.0_rc4.ebuild
new file mode 100644
index 000000000000..03e4441b91b9
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-13.0.0_rc4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 2eda655eb1f2..7f8b46edd770 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -4,5 +4,6 @@ EBUILD clang-runtime-12.0.1.ebuild 704 BLAKE2B 5d728bf389420018e991091d36e5d289d
 EBUILD clang-runtime-13.0.0.9999.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
 EBUILD clang-runtime-13.0.0_rc2.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
 EBUILD clang-runtime-13.0.0_rc3.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
+EBUILD clang-runtime-13.0.0_rc4.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
 EBUILD clang-runtime-14.0.0.9999.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
 MISC metadata.xml 579 BLAKE2B bedb10265d687b5c8c6af5ff9a9612076e7c17c3ddd479c8fe9eccf6e13e74d55b182b4bcb17d213aaa55a57f4b29ee8f90287d6f08e7ebc20b9c4724773f376 SHA512 d872f42ab248387aeb61a42a9858ef80e0c278079e472ccd9d3099515d3c6acc6b38ea2e992ff58df31798a71baea2df19834523bcb64c609a842b8f0abad532
diff --git a/sys-devel/clang-runtime/clang-runtime-13.0.0_rc4.ebuild b/sys-devel/clang-runtime/clang-runtime-13.0.0_rc4.ebuild
new file mode 100644
index 000000000000..218cdb1426f6
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-13.0.0_rc4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+PROPERTIES="live"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 76e9f99cde0d..fe51b01ed299 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -6,17 +6,20 @@ DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11f
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
 DIST llvm-gentoo-patchset-13.0.0-rc2.tar.xz 5556 BLAKE2B e6c7ecfe8f842edc4d4f30a20c66973519182ecb46e21fb20b6c5fcb6d54cdef830fcb120a405b77f1332e3557acbbbbfa99170b20d17f137e0a63b2d0dc1258 SHA512 ddeaf1d07f0ba893ce93e5fe1eff1c0716769a7879fc503c397f4db7becb363f94747f59b6d53c204df73a93954fb0ca5aae6ad544ce55c964c4bf441a410cd2
 DIST llvm-gentoo-patchset-13.0.0-rc3.tar.xz 5012 BLAKE2B 5399feeffe73e8fbd099c8058f1cc41e2fcb2feb446acc1394589c0397167786895d328d45ff481fb30605f215774b9e51e332124c0b071e969a2f01c5943c04 SHA512 d4fb2b08e253d9fa89070045282b4309ca9938011bf7f9b5364cc69c5030ff9353abb1624895b4bfeef2cd8e2f8c9b9f93fc8196f98dc0970457bca7787270c9
+DIST llvm-gentoo-patchset-13.0.0-rc4.tar.xz 5016 BLAKE2B 021ba4e67904e4cf4dfdf1ecfc1cd1cc860c2f43db97e04c40ca7d95567f6235a27a2a919083c58b89b269eefa2d751cb9c324bda6518c22e9fc01007936a520 SHA512 dce61179dffafc5992fb0e18314bba2d5fbf2f0470a491bc1ffc036274b65d0a1de741b23e2de32e873250c856a53707e06f8c560bd29f8a54a6ae0c74267f43
 DIST llvm-gentoo-patchset-9999-2.tar.xz 4064 BLAKE2B 4b29234f10ea4ab2609e83c71bcd5f968cd93abd275c13366146ca899bbc576d55a3364432cc7db353739f5da5762529436689b848857e839e230425d551265b SHA512 c0d40a81bd11dc6018d7b3789e4ca7e1cd784992d44fab8d750b8b5281db39ad9092d320d125cae93164d2dddc42177a173b6d5e4158e4b62d7507db877acb9e
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
 DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
+DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
 EBUILD clang-10.0.1.ebuild 11423 BLAKE2B 865c3da940bea204f8e1136aa75409234523a03a6bcf2439a5dd6c0c7ec33888ba6a0738858e5dcd57fb1b804eb646a1c7d6ea87ecac4882ab7f2ee38a1a71b5 SHA512 7e1edacf288f45223f4db6555863287ca89759bb678eab91083422c1c1fe9d9b46c216c1afd5fe47817aff7bfcd86f841f6573a4a20049c47bb5d14f878d6166
 EBUILD clang-11.1.0.ebuild 11781 BLAKE2B e23c30f931cd121b8cc56687faa5900cacc71699a53b06ad2a9daa139537c9fb98bb2b1a0e9ab0dd997299f4afb013187e6f68e93942a0015a223332186ae082 SHA512 ce653ca4ebf0283e2ef9008d0781841a422703f81a9b6eaae61229a203fd65d6ee8ea58c577c5a917f8385c127ab246585b8576838d0e3c28d57afed834c7917
 EBUILD clang-12.0.1.ebuild 11934 BLAKE2B 475676d2f39c8fd4943613f38d370c38e54003843b3b9d66a36a8d922e61e284270ad0ce418e5654e3d68836e3e5a2da18f7632e6b7c69efb006ccf24cc1d04b SHA512 a0e45bb854a63cd79d10971d43c80a9db61b2841f0ff7d2ea74d4032ddd7cee1aa6cc46ab3774373310e005924fc92fe45ba0cd0dd2a3fbbd320bc4f2a7685b6
-EBUILD clang-13.0.0.9999.ebuild 11881 BLAKE2B 6095145bfb43808868cba7e800ad9b56946b19c096a98d3fab3ac3007074be73481186649b32f554ace9466717cdfa87610c58f6766e379f8787902014630d2b SHA512 55e1364e02f85ea797d4bc92d5886e5790c8d83653f1c7165a2c432d6a0bfbcab78db65237d9c4440603d83897a7a6066e0f0e6d469fc4ca6f1fa2f5c75c2cf6
-EBUILD clang-13.0.0_rc2.ebuild 11885 BLAKE2B 489cd552bec8991d63844b37d9ba1ce1c57198e6abb89759a6110ab192988a0b61e9b5d08627fbbfbe071d6e6fc38d6f15aa99886f1acd9aca0e3b55d16d275e SHA512 ea50254aac82a3c61f41376b210088bc3a21a47920f2a0a405d2e00b8bb6ec9880ab98cf993f888d66a5c8810d9965f950e6c361017512b105359128d094623d
-EBUILD clang-13.0.0_rc3.ebuild 11885 BLAKE2B 718e1d8b83243019c473df25bb8eb5e79d31ca5683c4d76bfee7e79db166c5d6d0f6fa2cd339e055056e51fb911748e44b52e88a14bde059677f1012685f4f02 SHA512 7d6beeaa09803cd82574cd2048dbbe3ee58419ccfe8fd1bafc6c2453357ff0d622183c675f509243ed3f13766150efd4221cbf2730f27f4d42ac31843a80874f
-EBUILD clang-14.0.0.9999.ebuild 11881 BLAKE2B 6095145bfb43808868cba7e800ad9b56946b19c096a98d3fab3ac3007074be73481186649b32f554ace9466717cdfa87610c58f6766e379f8787902014630d2b SHA512 55e1364e02f85ea797d4bc92d5886e5790c8d83653f1c7165a2c432d6a0bfbcab78db65237d9c4440603d83897a7a6066e0f0e6d469fc4ca6f1fa2f5c75c2cf6
+EBUILD clang-13.0.0.9999.ebuild 11418 BLAKE2B b974e7829f010dfda3cfd0918bc49641a06cccd5702e997cc1912f072e4cf190ebdc037863732059283083aa14f7b1a1d7702869391ba7956694169f6e5fee98 SHA512 62edc3b9368f456618cd1a74ddf8c95d5bf698f2b7d1c27194da8daf7653354522b133614388abf29e9c749bf445a1bda31c240c3d488727e06616f90585067c
+EBUILD clang-13.0.0_rc2.ebuild 11422 BLAKE2B a0199f2280543aa22d5e7bc6da47d0326d34e794acb75f4dd059c9506810cad53f74bfaefa8ac0684a8747921f1b4761f30bc3bb51f7df0c1af6084be31fc2e2 SHA512 511a09a8d88c856472845d03a993f93e99654b10d4442e2cf43183b62a6626d504ef1206c838b911a5e9e73d1b2c037249a08ac4395fc25f7fa3caedd0e29dea
+EBUILD clang-13.0.0_rc3.ebuild 11422 BLAKE2B b94064371dfec96cea89164338ac5f81e0f416c83fb20df55d89c06c8f196c7ad0e9de841296f60ab6d6ebca263c665e8d3b81a3e3296281db4da64bdead9005 SHA512 d1030c58e22c8720d3f6647524ca51fb5ebc79c126762711cb730164488d230395dab54d2d276cb5ac1e69b81db002b56eb3d1bd55025a71ea1b6ce86d6fa6ca
+EBUILD clang-13.0.0_rc4.ebuild 11421 BLAKE2B 3d9f22720aed21b22770f824b65f6ddc60c22d3ea1d7675e9be681002daac90e7161e84f5edf587b5fe9d02000b4a8869de9070ae9f22ea798d8f61fb794bd09 SHA512 ebb77eb6134fd5c3363d18bccee82b2ccd167fb3e75a0136dd424b421cc236ece79c57e41f2fa99361d34c501b75d7709ec819735d72605eed12d48f42ea10ce
+EBUILD clang-14.0.0.9999.ebuild 11418 BLAKE2B b974e7829f010dfda3cfd0918bc49641a06cccd5702e997cc1912f072e4cf190ebdc037863732059283083aa14f7b1a1d7702869391ba7956694169f6e5fee98 SHA512 62edc3b9368f456618cd1a74ddf8c95d5bf698f2b7d1c27194da8daf7653354522b133614388abf29e9c749bf445a1bda31c240c3d488727e06616f90585067c
 MISC metadata.xml 1337 BLAKE2B 5e4f7d63cd9f3b03600801cbe3b2963a1e6b2fb48e36fdb12862f467829222c182f5958d35b535d8fa8467ebaad05c9641cd645294706e3a0f4a078dc9c2f8cf SHA512 50c1a7c33414f9d6294873478f1017dfb21311b36c916e15a8b068cf2a968fe8d774b51515f61c3632d2b204f103cc7ae6853b14d582291087a0fb8e15c0b35a
diff --git a/sys-devel/clang/clang-13.0.0.9999.ebuild b/sys-devel/clang/clang-13.0.0.9999.ebuild
index ee05f41d1334..3c3e637a0d19 100644
--- a/sys-devel/clang/clang-13.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-13.0.0.9999.ebuild
@@ -10,13 +10,6 @@ inherit cmake llvm llvm.org multilib multilib-minimal \
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
 
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
 # MSVCSetupApi.h: MIT
 # sorttable.js: MIT
 
@@ -24,9 +17,8 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,11 +26,6 @@ RDEPEND="
 	static-analyzer? ( dev-lang/perl:* )
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
 	${PYTHON_DEPS}"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
-done
-unset x
 
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -65,6 +52,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
 LLVM_PATCHSET=9999-2
+LLVM_USE_TARGETS=llvm
 llvm.org_set_globals
 
 # Multilib notes:
diff --git a/sys-devel/clang/clang-13.0.0_rc2.ebuild b/sys-devel/clang/clang-13.0.0_rc2.ebuild
index 6fdeef8243e4..5003b7995d1e 100644
--- a/sys-devel/clang/clang-13.0.0_rc2.ebuild
+++ b/sys-devel/clang/clang-13.0.0_rc2.ebuild
@@ -10,13 +10,6 @@ inherit cmake llvm llvm.org multilib multilib-minimal \
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
 
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
 # MSVCSetupApi.h: MIT
 # sorttable.js: MIT
 
@@ -24,9 +17,8 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,11 +26,6 @@ RDEPEND="
 	static-analyzer? ( dev-lang/perl:* )
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
 	${PYTHON_DEPS}"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
-done
-unset x
 
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -65,6 +52,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
 LLVM_PATCHSET=13.0.0-rc2
+LLVM_USE_TARGETS=llvm
 llvm.org_set_globals
 
 # Multilib notes:
diff --git a/sys-devel/clang/clang-13.0.0_rc3.ebuild b/sys-devel/clang/clang-13.0.0_rc3.ebuild
index 47bd536e1017..6ed4a618f02b 100644
--- a/sys-devel/clang/clang-13.0.0_rc3.ebuild
+++ b/sys-devel/clang/clang-13.0.0_rc3.ebuild
@@ -10,13 +10,6 @@ inherit cmake llvm llvm.org multilib multilib-minimal \
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
 
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
 # MSVCSetupApi.h: MIT
 # sorttable.js: MIT
 
@@ -24,9 +17,8 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,11 +26,6 @@ RDEPEND="
 	static-analyzer? ( dev-lang/perl:* )
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
 	${PYTHON_DEPS}"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
-done
-unset x
 
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -65,6 +52,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
 LLVM_PATCHSET=13.0.0-rc3
+LLVM_USE_TARGETS=llvm
 llvm.org_set_globals
 
 # Multilib notes:
diff --git a/sys-devel/clang/clang-13.0.0_rc4.ebuild b/sys-devel/clang/clang-13.0.0_rc4.ebuild
new file mode 100644
index 000000000000..6fb09213aaca
--- /dev/null
+++ b/sys-devel/clang/clang-13.0.0_rc4.ebuild
@@ -0,0 +1,426 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org multilib multilib-minimal \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx default-lld
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? (
+		=sys-libs/compiler-rt-${PV%_*}*
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	default-lld? ( sys-devel/lld )"
+
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_MANPAGES=build
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+LLVM_PATCHSET=${PV/_/-}
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Frontend/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# headers for clang-tidy static library
+					clang-tidy-headers)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-clang-man
+				docs-clang-tools-man
+			)
+		fi
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-build-py
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# disable using CUDA to autodetect GPU, just build for all
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+		-DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+	elog "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/clang/clang-14.0.0.9999.ebuild b/sys-devel/clang/clang-14.0.0.9999.ebuild
index ee05f41d1334..3c3e637a0d19 100644
--- a/sys-devel/clang/clang-14.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-14.0.0.9999.ebuild
@@ -10,13 +10,6 @@ inherit cmake llvm llvm.org multilib multilib-minimal \
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
 
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
 # MSVCSetupApi.h: MIT
 # sorttable.js: MIT
 
@@ -24,9 +17,8 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx default-lld
-	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,11 +26,6 @@ RDEPEND="
 	static-analyzer? ( dev-lang/perl:* )
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
 	${PYTHON_DEPS}"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
-done
-unset x
 
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -65,6 +52,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
 LLVM_PATCHSET=9999-2
+LLVM_USE_TARGETS=llvm
 llvm.org_set_globals
 
 # Multilib notes:
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 34de8964d356..9bf524afbf50 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -4,8 +4,6 @@ DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07
 DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c835374113c6ff2cf1430a5568b3d1b27183e6de6751367c1e5720c85ac4c45132848888d5510c63f95e88a1f623b6bcf4000 SHA512 6dc435c8619a1532000fae843b9964d0d1e28d3cc9cc1962ab7391570a0cf1135424ea5c0b0d3d5ec5ea863f02e963be2ec4c94822f217fc692a1d808325404e
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
-DIST gcc-11.1.0-patches-3.tar.bz2 19670 BLAKE2B bd37b28beb8ee387d03466bdb8e81b6f8f8a4bec3cdd012db84439166855eb6f465e2232e0472f9369a74c240af2a035d1023abcdd5058a7d9e27b0cb1709716 SHA512 b18102b70b77ec1328eec7f9e03fd083649af97845a6ecd68bf3cac128571e3b25a99823ce29cede8c6bcb9b0f31288a2e5a8f5d59cfad2b1278c420bf9e2149
-DIST gcc-11.1.0.tar.xz 78877216 BLAKE2B fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed SHA512 fd6bba0f67ff48069d03073d1a9b5e896383b1cfc9dde008e868e60a9ec5014a837d56af0ecbf467b3fb9b37ec74a676e819a18b44393a0a3c4280175b5d7ad8
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
 DIST gcc-12.0.0-patches-2.tar.bz2 11564 BLAKE2B 5954ee8dd5edb30ecde54275d9ffd4d2f5671de82fe7789688d1220b181fbcdeed3d5305858d8af1fd016e627687ca6f2ebc76bb6b49e9b903e8d63c3de2baea SHA512 6299a1f46fc3f29934db7af20651c0c3e1266bef89b222fc9e3bc6a7e7cd2869301c5b227a4105157456474ae8a626ec550c15971bceb2f844476a9f5bc56284
@@ -19,7 +17,6 @@ DIST gcc-9.4.0-patches-1.tar.bz2 14012 BLAKE2B d5fbfd73d9c3a5b66be5b124d981fe5a7
 DIST gcc-9.4.0.tar.xz 72411232 BLAKE2B 4bb000d33d6bd2d6cc91c040713f27f79dcf726ef8ab1542c711e0c25651507628510b1373bc73aef71ffb660afddb2eb8d8c8540f5f1498ee243cfff6c0be67 SHA512 dfd3500bf21784b8351a522d53463cf362ede66b0bc302edf350bb44e94418497a8b4b797b6af8ca9b2eeb746b3b115d9c3698381b989546e9151b4496415624
 EBUILD gcc-10.3.0-r2.ebuild 446 BLAKE2B 2d0f1773e9aaa6710b7295b26ab55fe4d77653d85de88af392f7c8886db005b4aa47bfee8649cfb4d9f8f9aa447601d2aa97edd1e94f65b79e2600e4a5e3ed6f SHA512 f0c182f9fb60ad9dee98cbfa3f34e68d0a9101e9d583741e4147c168550d3e93f9d27236ea1dc59f42fb8179bfc115a7a89773a89b9aafb0f8e99052194f0cc7
 EBUILD gcc-10.3.1_pre9999.ebuild 649 BLAKE2B 7c2d1e2d939433104d3fb01de2dbdb12b6022a503d2252d8371f699577eb289276897440113bc70745deb7057819d63890be8c0fd0022c02cc6d565fb1c1307e SHA512 eaca9dd9ac89a354beae99d38d7df2004289d281236f4a41457afbba563dcc8f6c1bfe24e8ea9219019c2b7e1c9abb67f428c96389fc9f6b8263db2af66ff3ef
-EBUILD gcc-11.1.0-r2.ebuild 454 BLAKE2B e99d90cca50914b672f9462925c18484b55d73478e3cdfb45f9d9999333cbadb64047087aac25775e494c750159fa118fd0014843cc93d7b2046f6458ef80a52 SHA512 0209cbe81e71912fe53cbef3ca3bd048951b132f79c2d3a39b9a847032f3f172c1f5259d13f23b0a3d9bfec274c98807b233b06233333ebf28b4f00656e67285
 EBUILD gcc-11.2.0.ebuild 290 BLAKE2B 6b94604283cf63809aa912ab2984f6ca668571723e6a0526fd09ead95a3b79797f22a9c8b0bf5bb80733eadddc7320a602e81e1621a1e954758dd6ed134034ce SHA512 bb845cacc8b9b0e2032c2cbe9b2c9a304276ac6d1cb6aa72c625a3c1afba61fd73098f438e96e7aa647229fa9bbdca37001dcc79b41be416345d49c10b76045f
 EBUILD gcc-11.2.1_pre9999.ebuild 527 BLAKE2B 69ad8ded1819b6b584ddac3ad639750d5d13f465854bf88093d0a48f5f83f5919ff66014ff0ae67167e88d3282cb108291a0ffe86147f7f505396c77a887a017 SHA512 0011d0d43953cbcd1afa201005f52bc13bedffeab1a45469d6d7b60e2e04343b1a4385dd8bf684e442858ab80b314aa849184e3353e0e3adf44839c3753de4ad
 EBUILD gcc-12.0.0_pre9999.ebuild 367 BLAKE2B f4d4fae47ad12381f9f25e4c97964d7a155f7b1c186a324c8c96109559da063f5f568a168e32a078e1afe39bfa786260a7a3785bfed648c68156fe14ad3bce56 SHA512 2a4e545ba1ee6f16f0301a367097b0253dd9f786873b45b31be2b0284605dbb9bc8d6c34d4f0a2d7825e92fa6c8fcedca4b680e1cb7d4446574c0d993c8918c9
diff --git a/sys-devel/gcc/gcc-11.1.0-r2.ebuild b/sys-devel/gcc/gcc-11.1.0-r2.ebuild
deleted file mode 100644
index 0d4965f29fee..000000000000
--- a/sys-devel/gcc/gcc-11.1.0-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="3"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/21_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index e54019ccea7b..50b42a0b081e 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -4,8 +4,10 @@ AUX gdb-10.2-sparc-nat.patch 1683 BLAKE2B b5ef1ce44dd935ca8a69a6477cfea703109300
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
 DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537
 DIST gdb-10.2.tar.xz 21518900 BLAKE2B c5d31d80d2b454767d6f844e8471b012ad437c3872391b618fd7b14c5cf251b78e55d28c12e81382fd600f67e2f618ff5dbe3a7b737a5d5161ceb3542afbb90b SHA512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa
+DIST gdb-11.1.tar.xz 22040696 BLAKE2B 6a639f6533f4008bfb469c23a26c4fcd039f1bc5dd33745f4876344451beb595d7a8843caeb5db70214924624c5b999f8831237d459bebf1cb2d2866f8b41ee2 SHA512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46
 EBUILD gdb-10.1.ebuild 7003 BLAKE2B b98d23ee8b9ba2d9fa573e488fd8f4d941ff34b6e2afc4b7a6d2e7e74ec444f379ac2af9da840cd811aa823ebb5905e426200765bfaf0f0ada06574866ee768d SHA512 bfd8581d2d9cf4631769b1366997974cf08449d4b2166fc48d8b7a5ca9f56560a1350a4141e92946f98176b998780ca118c199d4e0873b3a5f59d1e7bc238c40
-EBUILD gdb-10.2-r1.ebuild 7096 BLAKE2B e4f5c8cc3898c26984ead3e57943e06b8789208bac631d568647b15aa13ddd6821709b5406ddfa79ec3cf84d920809b4548d7040e1a72a9e7c901eb5560ef033 SHA512 bfc029b116bc7d085481c6784a257aaf8bb7d3b72d30bd557f41cc8504ab892fc4a233e38b86308b127b7af7e276a14b7cf75a7d8520c04416f2f96a16488cd5
+EBUILD gdb-10.2-r1.ebuild 7094 BLAKE2B f958c527865171cd695f3da60857d8ece8cb44cbafa22a1760536170e6d556770e7204ae3e4063f6b29cf4ee3b1f75ef94143328b8011fc54c819fb3e53958d9 SHA512 d67c05ce13c341506e50fe5fd51d699f5416c6ccead0ece810893d1c0704c652e9f49939c1a815f93ca3e80d951027a5898aca4191c78d4018fdddcfa97f3269
 EBUILD gdb-10.2.ebuild 7047 BLAKE2B 2bcaea9fa86e92c1d3fc4579583f174fbfb48ee0c3acd1fae561111489b2aa0bac001b7b78bced7f27029ef527b4766d1ccf193cb32a770d95c1ce5853ead2ee SHA512 391f5552cc263c4d676a2d6aa144679f283f90744434a92654e4b3d320b9bc25e55cdf2efe8101e9e8cb46bf06b184972e92ff0b6287ee61fa00aa67aa7933b6
-EBUILD gdb-9999.ebuild 6974 BLAKE2B cbcb87d59aba0da99b4b033542bd7ea5e67e57912b46179558fab087e626a4f965e036129e123104eb0d6b69bb76535b34e2dcb92ff7fa5a2a6fb56dabbb95eb SHA512 4b16cc4cc0e62ef27469534c3d397e6f01d41df903b4a7a6fe8bb24083793a33dee1e8a01be3eb8f112ec396d655203fb2c5e2a42cf466a16e62a79c42fe44a2
+EBUILD gdb-11.1.ebuild 7009 BLAKE2B 1b660541d730d7e449b76d12f0ca05b8bdf4695721fe79344ee1630ec336137bb34f4f4fb3640f790fd218e1dcd5fc04dce2055c0ddb7ac8e4c92e1a122e15af SHA512 8da08ee0856f5550faec5a5e6d45f07a4c21766f39d425d65bd7ebc94bf138b83c4c53f16dc8bbd04a66be965a61ef7d3b17f83dc26561fe192e1d76a2050a4a
+EBUILD gdb-9999.ebuild 7009 BLAKE2B 1b660541d730d7e449b76d12f0ca05b8bdf4695721fe79344ee1630ec336137bb34f4f4fb3640f790fd218e1dcd5fc04dce2055c0ddb7ac8e4c92e1a122e15af SHA512 8da08ee0856f5550faec5a5e6d45f07a4c21766f39d425d65bd7ebc94bf138b83c4c53f16dc8bbd04a66be965a61ef7d3b17f83dc26561fe192e1d76a2050a4a
 MISC metadata.xml 1103 BLAKE2B e63ea2e52649ac2f4ac21381cadb7cc76525792e99a4a6581535475480b6c45e654c8222b0b58585435d4c858cf3eef00dcaecf7edecae2b2fd336f1b56e6e56 SHA512 f7f1b4da71b18cb68a2f32aa6faae6251528047069071c9bee1be504267d0baf2cbac4fb928e0cbe9df100e3a681e2c3b6c7be14514a45a2f52d30364a8626f4
diff --git a/sys-devel/gdb/gdb-10.2-r1.ebuild b/sys-devel/gdb/gdb-10.2-r1.ebuild
index e4c5d54029d8..e5672e27b028 100644
--- a/sys-devel/gdb/gdb-10.2-r1.ebuild
+++ b/sys-devel/gdb/gdb-10.2-r1.ebuild
@@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
diff --git a/sys-devel/gdb/gdb-11.1.ebuild b/sys-devel/gdb/gdb-11.1.ebuild
new file mode 100644
index 000000000000..8b1a81f909e0
--- /dev/null
+++ b/sys-devel/gdb/gdb-11.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+	9999*)
+		# live git tree
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		SRC_URI=""
+		;;
+	*.*.50.2???????)
+		# weekly snapshots
+		SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+		;;
+	*)
+		# Normal upstream release
+		SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+			ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+		;;
+esac
+
+PATCH_VER=""
+PATCH_DEV=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# ia64 kernel crashes when gdb testsuite is running
+RESTRICT="
+	ia64? ( test )
+	!test? ( test )
+"
+
+RDEPEND="
+	dev-libs/mpfr:0=
+	dev-libs/gmp:=
+	>=sys-libs/ncurses-5.2-r2:0=
+	>=sys-libs/readline-7:0=
+	sys-libs/zlib
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
+	xml? ( dev-libs/expat )
+	source-highlight? (
+		dev-util/source-highlight
+	)
+	xxhash? (
+		dev-libs/xxhash
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	virtual/yacc
+	nls? ( sys-devel/gettext )
+	source-highlight? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	# avoid using ancient termcap from host on Prefix systems
+	sed -i -e 's/termcap tinfow/tinfow/g' \
+		gdb/configure{.ac,} || die
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# gnulib's or gdb's configure.
+		--disable-dependency-tracking
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	# gdbserver only works for native targets (CHOST==CTARGET).
+	# it also doesn't support all targets, so rather than duplicate
+	# the target list (which changes between versions), use the
+	# "auto" value when things are turned on, which is triggered
+	# whenever no --enable or --disable is given
+	if is_cross || use !server ; then
+		myconf+=( --disable-gdbserver )
+	fi
+
+	myconf+=(
+		--enable-64-bit-bfd
+		--disable-install-libbfd
+		--disable-install-libiberty
+		--enable-obsolete
+		# This only disables building in the readline subdir.
+		# For gdb itself, it'll use the system version.
+		--disable-readline
+		--with-system-readline
+		# This only disables building in the zlib subdir.
+		# For gdb itself, it'll use the system version.
+		--without-zlib
+		--with-system-zlib
+		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		$(use_with xml expat)
+		$(use_with lzma)
+		$(use_enable nls)
+		$(use_enable source-highlight)
+		$(use multitarget && echo --enable-targets=all)
+		$(use_with python python "${EPYTHON}")
+		$(use_with xxhash)
+		$(use_with guile)
+	)
+
+	if use sparc-solaris || use x86-solaris ; then
+		# Disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}"/usr -name libiberty.a -delete || die
+
+	# Delete translations that conflict with binutils-libs. #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+	docinto sim
+	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
+
+	if use server ; then
+		docinto gdbserver
+		dodoc gdbserver/{ChangeLog,README}
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+
+	# gcore is part of ubin on freebsd
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		rm "${ED}"/usr/bin/gcore || die
+	fi
+
+	if use python; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# Portage doesn't unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index fde1ad992437..8b1a81f909e0 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -2,34 +2,36 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
 
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
 
 export CTARGET=${CTARGET:-${CHOST}}
+
 if [[ ${CTARGET} == ${CHOST} ]] ; then
 	if [[ ${CATEGORY} == cross-* ]] ; then
 		export CTARGET=${CATEGORY#cross-}
 	fi
 fi
+
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 
 case ${PV} in
-9999*)
-	# live git tree
-	EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-	inherit git-r3
-	SRC_URI=""
-	;;
-*.*.50.2???????)
-	# weekly snapshots
-	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
-	;;
-*)
-	# Normal upstream release
-	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
-		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
-	;;
+	9999*)
+		# live git tree
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		SRC_URI=""
+		;;
+	*.*.50.2???????)
+		# weekly snapshots
+		SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+		;;
+	*)
+		# Normal upstream release
+		SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+			ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+		;;
 esac
 
 PATCH_VER=""
@@ -43,23 +45,23 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
+
 if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
+
 IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # ia64 kernel crashes when gdb testsuite is running
 RESTRICT="
 	ia64? ( test )
-
 	!test? ( test )
 "
 
 RDEPEND="
 	dev-libs/mpfr:0=
+	dev-libs/gmp:=
 	>=sys-libs/ncurses-5.2-r2:0=
 	>=sys-libs/readline-7:0=
 	sys-libs/zlib
@@ -105,11 +107,13 @@ src_prepare() {
 
 gdb_branding() {
 	printf "Gentoo ${PV} "
+
 	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
 		printf "p${PATCH_VER}"
 	else
 		printf "vanilla"
 	fi
+
 	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
 }
 
@@ -137,7 +141,9 @@ src_configure() {
 		# But the check does not quite work on i686: bug #760926.
 		$(use_enable cet)
 	)
+
 	local sysroot="${EPREFIX}/usr/${CTARGET}"
+
 	is_cross && myconf+=(
 		--with-sysroot="${sysroot}"
 		--includedir="${sysroot}/usr/include"
@@ -176,8 +182,9 @@ src_configure() {
 		$(use_with xxhash)
 		$(use_with guile)
 	)
+
 	if use sparc-solaris || use x86-solaris ; then
-		# disable largefile support
+		# Disable largefile support
 		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
 		myconf+=( --disable-largefile )
 	fi
@@ -190,6 +197,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	find "${ED}"/usr -name libiberty.a -delete || die
 
 	# Delete translations that conflict with binutils-libs. #528088
@@ -211,6 +219,7 @@ src_install() {
 		done
 		return 0
 	fi
+
 	# Install it by hand for now:
 	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
 	# Only install if it exists due to the twisted behavior (see
@@ -222,6 +231,7 @@ src_install() {
 		gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
 	docinto sim
 	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
+
 	if use server ; then
 		docinto gdbserver
 		dodoc gdbserver/{ChangeLog,README}
@@ -245,7 +255,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	# portage sucks and doesnt unmerge files in /etc
+	# Portage doesn't unmerge files in /etc
 	rm -vf "${EROOT}"/etc/skel/.gdbinit
 
 	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 03af8ff8a394..e9b33c21610b 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -3,6 +3,7 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
 DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
+DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
 EBUILD lld-10.0.1-r1.ebuild 1178 BLAKE2B 52360dc17b7276276ead4183d47954a68f217f19fc0b52f36772cf28225df793b53e61b38a6c90b0dfade77c05270e5c4ade8696b4b29b56746b1b8e2a97f691 SHA512 6a313c7fe0719f32805f7eb3fdc601ec84c6a386ec25867ddafd05c71ec5a37ce1116ead22d8ae64b5f96dda944b34202a0e2eb03452daa9bff822442865ec74
 EBUILD lld-10.0.1.ebuild 1327 BLAKE2B c1933a141d5460f94cee3bdeac644760aec6d8e5906e3202e54a7a9da441a57d2de33b77d906dea4dcf6d7bac0bef97edd29c0a8d756093e9b56f81fbec07e01 SHA512 5901b7d0f5b2d07234d3287ab003e68b032a42e0887ab0d76fdd7a7af12feaea97a3ce07f06f3f1c428f7b5b4fa7f98daddf0909c8e3c0bf7ab2adc75363ed95
 EBUILD lld-11.1.0-r1.ebuild 1250 BLAKE2B befcc678c9eda33c73806c12b2c24bb8f3b8c9310303c42ceb87247e9816862f25bab546a5989bbe018f40118283c432c71f895e0b333a27a3e344d570e58102 SHA512 7a2046cc5bef8a7c0889fa6fb0bbf1eeaf776cd446ce3188df6c70898de097c0833e6d9293d4a7dad99fa1d6bf894440920549b6295ed442aa0c560149a71a58
@@ -11,5 +12,6 @@ EBUILD lld-12.0.1.ebuild 1666 BLAKE2B fd1f8a4601c74d8507996e8804663812816c161ebf
 EBUILD lld-13.0.0.9999.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
 EBUILD lld-13.0.0_rc2.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
 EBUILD lld-13.0.0_rc3.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
+EBUILD lld-13.0.0_rc4.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
 EBUILD lld-14.0.0.9999.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/lld/lld-13.0.0_rc4.ebuild b/sys-devel/lld/lld-13.0.0_rc4.ebuild
new file mode 100644
index 000000000000..68762b0a03cc
--- /dev/null
+++ b/sys-devel/lld/lld-13.0.0_rc4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)"
+
+LLVM_COMPONENTS=( lld libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 96cb530478e9..3218c233fa1e 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -3,11 +3,13 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
 DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
+DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
 EBUILD llvm-common-10.0.1.ebuild 588 BLAKE2B cd416d913d8ef3f7abc35f4d4db088cb116ba1881b6ce10760ad6a7302b91cc128c560ddf9b7d4ba0acbbbf9c88f2fdc57ddb15e117254d4feec03a601a7fb24 SHA512 c0e63e8e0b26e33133aa0982b21fef306e3d07ad07a9d9e6046e5dbe782162ec8ec701064d0db1aa741d61b6146854cd1de2a352938e6b579be22a21dde753fe
 EBUILD llvm-common-11.1.0.ebuild 603 BLAKE2B 0a7273b73b30e1cfb707d232c8634368edf0c10ec938c78544c65ee8553f0916a271fbdacbd358fbafc8d02f1f3e2d8f48dc4ff5b77ef9f5d5f80ef3d2e05eb3 SHA512 520efa24caa6415e82461362659b7db6ea11d4bc3b6b93105cbdd45ce0f46dc35f2b14151425e989a45656e93a5d7b9a3288ff55ef0d585b4b376dfcd5908067
 EBUILD llvm-common-12.0.1.ebuild 608 BLAKE2B e34ba1cdf1c8522f3622106a88a56dc7c6cd5bd227db31dd610d1879f39842052feec45235a197fe63f8834c8bb77a410632895746b448e50931abe31275b49d SHA512 83df951b72eb186aa705ffdc3b688df2d0bba4884f76c526e1ae4b4f7acf5afc4ec420038bdb89eed41938d84ed1feb52df8bcf4454fe9d72e5cdd0d48788253
 EBUILD llvm-common-13.0.0.9999.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
 EBUILD llvm-common-13.0.0_rc2.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
 EBUILD llvm-common-13.0.0_rc3.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
+EBUILD llvm-common-13.0.0_rc4.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
 EBUILD llvm-common-14.0.0.9999.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/llvm-common/llvm-common-13.0.0_rc4.ebuild b/sys-devel/llvm-common/llvm-common-13.0.0_rc4.ebuild
new file mode 100644
index 000000000000..53511a0a20e3
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-13.0.0_rc4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 64ac38a38794..320e19d9135d 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -6,17 +6,20 @@ DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11f
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
 DIST llvm-gentoo-patchset-13.0.0-rc2.tar.xz 5556 BLAKE2B e6c7ecfe8f842edc4d4f30a20c66973519182ecb46e21fb20b6c5fcb6d54cdef830fcb120a405b77f1332e3557acbbbbfa99170b20d17f137e0a63b2d0dc1258 SHA512 ddeaf1d07f0ba893ce93e5fe1eff1c0716769a7879fc503c397f4db7becb363f94747f59b6d53c204df73a93954fb0ca5aae6ad544ce55c964c4bf441a410cd2
 DIST llvm-gentoo-patchset-13.0.0-rc3.tar.xz 5012 BLAKE2B 5399feeffe73e8fbd099c8058f1cc41e2fcb2feb446acc1394589c0397167786895d328d45ff481fb30605f215774b9e51e332124c0b071e969a2f01c5943c04 SHA512 d4fb2b08e253d9fa89070045282b4309ca9938011bf7f9b5364cc69c5030ff9353abb1624895b4bfeef2cd8e2f8c9b9f93fc8196f98dc0970457bca7787270c9
+DIST llvm-gentoo-patchset-13.0.0-rc4.tar.xz 5016 BLAKE2B 021ba4e67904e4cf4dfdf1ecfc1cd1cc860c2f43db97e04c40ca7d95567f6235a27a2a919083c58b89b269eefa2d751cb9c324bda6518c22e9fc01007936a520 SHA512 dce61179dffafc5992fb0e18314bba2d5fbf2f0470a491bc1ffc036274b65d0a1de741b23e2de32e873250c856a53707e06f8c560bd29f8a54a6ae0c74267f43
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
 DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
+DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
 EBUILD llvm-10.0.1.ebuild 11490 BLAKE2B 40960dd1109655157b04396283d704ea1a0af35ffd09ec9bab2718d62fde888508246ea77a473cd7512c1818b5a3a8d7b72e5786d64faf43bd42ff823b765e22 SHA512 75767e94d55ca1f9f7a769abfc0c916388e69ccd51620c8083f8bb184bf9649d2b9c75efaed46d96f8e0932cb3e6beb71d51a3b1565243218a3efd5144238296
 EBUILD llvm-11.1.0.ebuild 12504 BLAKE2B 7f22ab387fab31e11d554667b1b183f5b66203f601096c130642500f877f2af473b31a0cba96da93d9c85d50e2fbafb7f46a0ff6bf2f96a0bd41266ddc04dc8f SHA512 716b8474077279b821140d2defa5f1dd5b2ab7cf09aeb27907410a184a701ecbf99f545622e68d0a81a762c3b5cbc6ff3b30415a331d38dac8fb72f37a3147bf
 EBUILD llvm-12.0.1.ebuild 12620 BLAKE2B 34f9ebd56f6381d3d88a82d98abc9cbec2c8ec7a35bf2fc297f9d82afb3927d991baecc95c3d76db35d1f47d171ffd6be0b1ac953b1c6605866b94aeeae9c9d3 SHA512 fbe11d194f5c049f1bfbcfb606351282e2cf5c74a58a1980f5b9b663d3d811bc6906e084d557e4169b0c15017e9d4c0c73c842116547e60946d883b91f38aae9
-EBUILD llvm-13.0.0.9999.ebuild 12589 BLAKE2B 44bca6c287c2d804f6701a8ac8a953624e8418d1ead94450b7b8b5f0ff5192bf6c027ca4f290c8a0e6bc96badd50be68e3fa2765f8cc535ddbd2bd8a39530b2d SHA512 b3e11ab52ca7309933d7cb66e3cb5c85c934c5e417e271d3c8c14879a1afc190b7a49f68a5abc2d847f1883a17f85cd3e9ab42b358b530424d4314707063fce9
-EBUILD llvm-13.0.0_rc2.ebuild 12593 BLAKE2B b1a89a4d89292e48f7bfb092c7b560cd8c8ee3d086e00e8ee1897023fbab48f43e81f89d44df263ace43ce71bc928f6357ac8bb75f80e325db169bdecc128e3e SHA512 e6de5707273c49c5141289dd8a08e3142de63c3c4cb6340465c6de41ebc9f46dcbaaa4944c1c2c1b41be21c9b457f2374d2a26a64469c393f5e2df0be9d949fc
-EBUILD llvm-13.0.0_rc3.ebuild 12593 BLAKE2B c321c612de12263b2e0b496946df8aeadaae36e604b9b96919258674966f2f25677e6936dab982a787787a6d86f26084ac4dbbf13abe9bb494ce70a573be7f6d SHA512 6e25eae84c9ba152edf7cc24687384163d841126b77c26cef25b1de6e1799469ea120bee5cebdcb3ca291ca19a3803742b03db1237dd239bc3a69969e4f248fe
-EBUILD llvm-14.0.0.9999.ebuild 12589 BLAKE2B 44bca6c287c2d804f6701a8ac8a953624e8418d1ead94450b7b8b5f0ff5192bf6c027ca4f290c8a0e6bc96badd50be68e3fa2765f8cc535ddbd2bd8a39530b2d SHA512 b3e11ab52ca7309933d7cb66e3cb5c85c934c5e417e271d3c8c14879a1afc190b7a49f68a5abc2d847f1883a17f85cd3e9ab42b358b530424d4314707063fce9
+EBUILD llvm-13.0.0.9999.ebuild 12097 BLAKE2B 5d514804e1296ab9f37e2da9fe2e1bb48f670f088ed9a472bb91ad42126785c444d6cd30ce172127d0146c3263e3a635570c633b06f90455bef2e3ace27f75a3 SHA512 8b9d9309a92d2b6319e467716725754810acddcc4a49daffe86177f0114687749611281a140eddc6562f06211afad852872abc7904517f816b04f54b9720ffde
+EBUILD llvm-13.0.0_rc2.ebuild 12101 BLAKE2B 3eedc6c4b114572bd5afff7e782d45b0494ea61dce46267b56defd2379d427096ffc462989bdf0486a3ea6bcfa412941083140e20c67dfcd79ab1ff9b04a8365 SHA512 e764117a06d6f5627c5873863bdec3138a3cf03f6dc528ab91b01265657104e0e4a601afacdcc5458ea688308d7f254985050a5aa48f0104f92fa8a3048ae508
+EBUILD llvm-13.0.0_rc3.ebuild 12101 BLAKE2B f7afccd0377ffa69fdfd00cfcb554b216e1b5f8a1f143409915a8fdbb7bb70b87aae5bf05860f8ea33da56cca19916ec49884597b056d8524e30a7dc54413c00 SHA512 67ee4262a435781484b716cf667700e86e9fcd505fdb7d7fca960494e2d6cc6a93e43c6f97f808c828aff417c75c5ecd2175ea824451d03e9ab3eda62854ebfd
+EBUILD llvm-13.0.0_rc4.ebuild 12100 BLAKE2B 6342babced2c7e2879fdc045e575976902970a8c5a40271a2a7c93041e0d5444c5e9faafccdab66f65b24142a525595864b597519aaacef5b2b8cab8bb37f3ec SHA512 124a9a2f996560063599bccebc84d4598940651a7068c403ca4978161e4014f552278505f16f66fc1b29503da2201d64a1bbf81c083ab6ccd345240903cd324f
+EBUILD llvm-14.0.0.9999.ebuild 12097 BLAKE2B 5d514804e1296ab9f37e2da9fe2e1bb48f670f088ed9a472bb91ad42126785c444d6cd30ce172127d0146c3263e3a635570c633b06f90455bef2e3ace27f75a3 SHA512 8b9d9309a92d2b6319e467716725754810acddcc4a49daffe86177f0114687749611281a140eddc6562f06211afad852872abc7904517f816b04f54b9720ffde
 MISC metadata.xml 2564 BLAKE2B c7b78f9245daf8990548c13cb0d2c773616b6b17713794f3887028a452649bf0b9aad10d6e9366839afec9d4fbd5a3fca923435cd91a738648d1e22e2b47c89c SHA512 57a6324a8b3c0780459fd37750532d28ba8e004885c7ca4b78c91d22e97e168e479a8ebddcf32803f8825a090eac2353ffa57775b95a49c08b821ae502c86218
diff --git a/sys-devel/llvm/llvm-13.0.0.9999.ebuild b/sys-devel/llvm/llvm-13.0.0.9999.ebuild
index ebe79aea74c9..84ccd0ebedbb 100644
--- a/sys-devel/llvm/llvm-13.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-13.0.0.9999.ebuild
@@ -10,14 +10,6 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
 
-# Those are in lib/Targets, without explicit CMakeLists.txt mention
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
 # Additional licenses:
 # 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
 # 2. xxhash: BSD.
@@ -28,8 +20,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+	kernel_Darwin"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -68,6 +59,7 @@ PDEPEND="sys-devel/llvm-common
 LLVM_COMPONENTS=( llvm )
 LLVM_MANPAGES=build
 LLVM_PATCHSET=9999-1
+LLVM_USE_TARGETS=provide
 llvm.org_set_globals
 
 python_check_deps() {
@@ -92,8 +84,6 @@ check_live_ebuild() {
 	for i in "${all_targets[@]}"; do
 		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
 	done
-	# reorder
-	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
 
 	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
 		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
@@ -102,10 +92,10 @@ check_live_ebuild() {
 		eqawarn
 	fi
 
-	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
-		eqawarn "ALL_LLVM_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
-		eqawarn "Expected: ${all_targets[*]}"
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eqawarn "Expected: ${prod_targets[*]}"
 	fi
 }
 
diff --git a/sys-devel/llvm/llvm-13.0.0_rc2.ebuild b/sys-devel/llvm/llvm-13.0.0_rc2.ebuild
index cc9415e5e563..31f75d41c825 100644
--- a/sys-devel/llvm/llvm-13.0.0_rc2.ebuild
+++ b/sys-devel/llvm/llvm-13.0.0_rc2.ebuild
@@ -10,14 +10,6 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
 
-# Those are in lib/Targets, without explicit CMakeLists.txt mention
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
 # Additional licenses:
 # 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
 # 2. xxhash: BSD.
@@ -28,8 +20,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+	kernel_Darwin"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -68,6 +59,7 @@ PDEPEND="sys-devel/llvm-common
 LLVM_COMPONENTS=( llvm )
 LLVM_MANPAGES=build
 LLVM_PATCHSET=13.0.0-rc2
+LLVM_USE_TARGETS=provide
 llvm.org_set_globals
 
 python_check_deps() {
@@ -92,8 +84,6 @@ check_live_ebuild() {
 	for i in "${all_targets[@]}"; do
 		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
 	done
-	# reorder
-	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
 
 	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
 		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
@@ -102,10 +92,10 @@ check_live_ebuild() {
 		eqawarn
 	fi
 
-	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
-		eqawarn "ALL_LLVM_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
-		eqawarn "Expected: ${all_targets[*]}"
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eqawarn "Expected: ${prod_targets[*]}"
 	fi
 }
 
diff --git a/sys-devel/llvm/llvm-13.0.0_rc3.ebuild b/sys-devel/llvm/llvm-13.0.0_rc3.ebuild
index 56d24237427a..6eaee99b46f7 100644
--- a/sys-devel/llvm/llvm-13.0.0_rc3.ebuild
+++ b/sys-devel/llvm/llvm-13.0.0_rc3.ebuild
@@ -10,14 +10,6 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
 
-# Those are in lib/Targets, without explicit CMakeLists.txt mention
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
 # Additional licenses:
 # 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
 # 2. xxhash: BSD.
@@ -28,8 +20,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+	kernel_Darwin"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -68,6 +59,7 @@ PDEPEND="sys-devel/llvm-common
 LLVM_COMPONENTS=( llvm )
 LLVM_MANPAGES=build
 LLVM_PATCHSET=13.0.0-rc3
+LLVM_USE_TARGETS=provide
 llvm.org_set_globals
 
 python_check_deps() {
@@ -92,8 +84,6 @@ check_live_ebuild() {
 	for i in "${all_targets[@]}"; do
 		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
 	done
-	# reorder
-	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
 
 	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
 		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
@@ -102,10 +92,10 @@ check_live_ebuild() {
 		eqawarn
 	fi
 
-	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
-		eqawarn "ALL_LLVM_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
-		eqawarn "Expected: ${all_targets[*]}"
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eqawarn "Expected: ${prod_targets[*]}"
 	fi
 }
 
diff --git a/sys-devel/llvm/llvm-13.0.0_rc4.ebuild b/sys-devel/llvm/llvm-13.0.0_rc4.ebuild
new file mode 100644
index 000000000000..ee6e126425ca
--- /dev/null
+++ b/sys-devel/llvm/llvm-13.0.0_rc4.ebuild
@@ -0,0 +1,511 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
+	kernel_Darwin"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	gold? ( sys-libs/binutils-libs )"
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/cmake-3.16
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+LLVM_COMPONENTS=( llvm )
+LLVM_MANPAGES=build
+LLVM_PATCHSET=${PV/_/-}
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_live_ebuild() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eqawarn "Expected: ${prod_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the live ebuild is up-to-date
+	check_live_ebuild
+
+	llvm.org_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwp
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-otool
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tapi-diff
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use gold && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/llvm/llvm-14.0.0.9999.ebuild b/sys-devel/llvm/llvm-14.0.0.9999.ebuild
index ebe79aea74c9..84ccd0ebedbb 100644
--- a/sys-devel/llvm/llvm-14.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-14.0.0.9999.ebuild
@@ -10,14 +10,6 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
 
-# Those are in lib/Targets, without explicit CMakeLists.txt mention
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
 # Additional licenses:
 # 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
 # 2. xxhash: BSD.
@@ -28,8 +20,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+	kernel_Darwin"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -68,6 +59,7 @@ PDEPEND="sys-devel/llvm-common
 LLVM_COMPONENTS=( llvm )
 LLVM_MANPAGES=build
 LLVM_PATCHSET=9999-1
+LLVM_USE_TARGETS=provide
 llvm.org_set_globals
 
 python_check_deps() {
@@ -92,8 +84,6 @@ check_live_ebuild() {
 	for i in "${all_targets[@]}"; do
 		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
 	done
-	# reorder
-	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
 
 	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
 		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
@@ -102,10 +92,10 @@ check_live_ebuild() {
 		eqawarn
 	fi
 
-	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
-		eqawarn "ALL_LLVM_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
-		eqawarn "Expected: ${all_targets[*]}"
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eqawarn "Expected: ${prod_targets[*]}"
 	fi
 }
 
diff --git a/sys-devel/slibtool/Manifest b/sys-devel/slibtool/Manifest
index 44e2713ddc12..1d0fb6cff840 100644
--- a/sys-devel/slibtool/Manifest
+++ b/sys-devel/slibtool/Manifest
@@ -3,6 +3,6 @@ DIST slibtool-0.5.33.tar.xz.sig 833 BLAKE2B dec6515251e85e91727ef85e31fc37097505
 DIST slibtool-0.5.34.tar.xz 79720 BLAKE2B 3a692d7485dcf2277f7ed99fe1ad67cf5fd33d8fe0a527d64634b0e7f956a5f58b92d812396f00d872ceb8509e058ae1a026f16a65feb2e79a9fff7bd60290da SHA512 3f7f6e4f45c4c2ae5ba5533152f08269cd77ca6fa2f3a515802bc23c7ac505b2d7340098fa98962c79035129cfd4077205596309f4acd1d634b9a1d6e2c0e96c
 DIST slibtool-0.5.34.tar.xz.sig 833 BLAKE2B 52df017d8ae3056e259a5283b0a4cea119a5ab4ce95e6c894d0d2e98fc10db101039a57c9a2a771f677c9d0afaad9273095ebdb078fca146a3d67ea25e9261fb SHA512 9f8415431a0b43e7be9a808dd6ed138a9b34b7b2c4af3ab406bdbc456ec31c877f13bc0b056ab9a50bec0b0cf1b654a133085f8523e70c8cb7d3851652d34ff7
 EBUILD slibtool-0.5.33.ebuild 970 BLAKE2B a25a6d8b11c6e789bc9d832142915ef32834b2c592dda30ae9946be637225ea4d611abf53b8164c4c873f2987c1c54c1e33490f93d9acb44a757241fba792368 SHA512 a1e017b88d9c10c770ae5f5ea541bcb6290b5df285ab0a3d95f4706f869b79f6ebc1a2c0a63e2fb32fc3ffe3506e7cdf9dfc64e40d47c704eb55eea3a8ff9bd6
-EBUILD slibtool-0.5.34.ebuild 996 BLAKE2B df5ff5a071d6b2ad52643af4bb7bd376cac0b440b7d8a3d5fc19e6a9d07b32639c9c7caa4a50dc43f35dff858735a4e733b5d857517452843c24eec44d00ff38 SHA512 1a8b71aa201c2e1c347b41022785ba32da3a41bc07f5a90e018d005526e93bdb976e40b9154b92502619cbf9f7bed5145ab24f1d4e9398078ba7be1695ed43e9
+EBUILD slibtool-0.5.34.ebuild 1002 BLAKE2B ce446e3115728bc6e94adbc4248b0f488b722b6f0529a7e41f07e87f65bcc604604ae9905d3b6d487f030ac96a4572fa6c840d29d02cc60386255d73ad648819 SHA512 5d850fe11ad4c2660bf62993f8e7080a6acc93eb395acf456a06f15ed18f37b4b5fc5e6d58aaa09568e98f308c2a4438c7e8f6d9acc1352c67edd2e873b935c1
 EBUILD slibtool-9999.ebuild 970 BLAKE2B a25a6d8b11c6e789bc9d832142915ef32834b2c592dda30ae9946be637225ea4d611abf53b8164c4c873f2987c1c54c1e33490f93d9acb44a757241fba792368 SHA512 a1e017b88d9c10c770ae5f5ea541bcb6290b5df285ab0a3d95f4706f869b79f6ebc1a2c0a63e2fb32fc3ffe3506e7cdf9dfc64e40d47c704eb55eea3a8ff9bd6
 MISC metadata.xml 496 BLAKE2B 8ee62c41383efeccd6d577cb031630f935810e45dd3887c93482b1880d03bf87a252f7a18ba3708b0b0521e2e2e0380d6871721672802189550173a1fe89229b SHA512 d707829a4daf977fb19facd83e5f1582ff422141e0c754867218edf9bc36b208c3ddc5d66159857609128c13a1ac3b51d497e5b89ab6cb0431e25cb7a43d48a5
diff --git a/sys-devel/slibtool/slibtool-0.5.34.ebuild b/sys-devel/slibtool/slibtool-0.5.34.ebuild
index 9802c66d83cf..b5e6c9d4e5fb 100644
--- a/sys-devel/slibtool/slibtool-0.5.34.ebuild
+++ b/sys-devel/slibtool/slibtool-0.5.34.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://dl.midipix.org/slibtool/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 	BDEPEND="verify-sig? ( app-crypt/openpgp-keys-midipix )"
 fi
diff --git a/sys-devel/smatch/Manifest b/sys-devel/smatch/Manifest
index 3b32718845b2..82cef4b41546 100644
--- a/sys-devel/smatch/Manifest
+++ b/sys-devel/smatch/Manifest
@@ -1,4 +1,6 @@
 DIST smatch-1.60.tar.gz 558479 BLAKE2B d5e564c32e33dc38847f9a258b4b47285f190652181db9b8850c832c0cf4d8a3302d989a7b42592e73a713927a29565565e83a9be1b0a5c9d10869fce278a0be SHA512 2920c9d4c500db36cfa60db5be70d157ed16abd729279462faef6f79e0756bd017ec91b8f857d19fdebd8a9d709b0555635700a2864cf0a84daa61cf2ca3eecd
-EBUILD smatch-1.60.ebuild 1348 BLAKE2B f0e1768ab5130967d8c75237f92f84a1ff7268e100bd74717c6ef16ece2bf9851bfd9a2a6526d33ba84109326e023595deb2673ff7c53b534c7398f4695ffc91 SHA512 3678290ac0da569f9bcc208b8b9fc951bafa680718e9099f2bb4df7e180d52f031b82d1a93952fe9454438af9547157c60afee942296435c174ac6b2cad4ec3f
-EBUILD smatch-9999.ebuild 1293 BLAKE2B 6627304cd071518654a9cddc1fa8784143941141218762c317dbb762e330d5892f6c219a4b3ad04037c081eee7cef44588ae736552b68637388110ec3d20c138 SHA512 78a7b402bbb94e8f57617e05e31b4416c2aa2c0c773fbd7daa86a7377d1a99404d60d6c3175504fe70e04f457cce71a92a1b6296dc45a80c457ecc4bd3842018
+DIST smatch-1.72.tar.gz 1431923 BLAKE2B ec4119fce985876afc9a46a74a0a56e8e8cb271a964c16496972c59ade95aa3d2df3a839a819e31cb081ca8a3b1f6bf6934ec97d73209091cfd86c87c1433557 SHA512 6d12e9ba85f332fcc56657296596e811cf3b75d4ad37007e07feb31baa4b315732361915972a2139ae13f75b8a73f953488ceb9de41529db9e84c81fb6fde77e
+EBUILD smatch-1.60.ebuild 1348 BLAKE2B f0269b8ecea230ac142052d84f73f026109e68c80a24ccb361a5f9623ab8fca396f74aa293fa93853093aa259b30239e8c15e3bc78a2c1bb34a46cad634062dd SHA512 12f44adb87283108a36f7803cd113e5def9aa5f878fe3367c2ba89dcfa418a4573cf8acf55fa59c5c7d00c22ac6b7566c0f964fbc3c8398417dd8c496af88288
+EBUILD smatch-1.72.ebuild 1342 BLAKE2B bb0e6d6d68b3d8a2d0cac1e6391378ed0e9d9bdb0e4e97269ca91078995d85a64e2bf405ce50ec525d8e23a87ff53e1278f4b1831183d983a35b2713b8850524 SHA512 5b98e177e11f7088d517561a6b39b331cf2967a6a93a74300918e07fe9ac9c81d8064c2fdebf672276999b84bf8aef163e0a12e0a4afe37180e3c09fe901c639
+EBUILD smatch-9999.ebuild 1342 BLAKE2B bb0e6d6d68b3d8a2d0cac1e6391378ed0e9d9bdb0e4e97269ca91078995d85a64e2bf405ce50ec525d8e23a87ff53e1278f4b1831183d983a35b2713b8850524 SHA512 5b98e177e11f7088d517561a6b39b331cf2967a6a93a74300918e07fe9ac9c81d8064c2fdebf672276999b84bf8aef163e0a12e0a4afe37180e3c09fe901c639
 MISC metadata.xml 338 BLAKE2B c4bb073c88d842934dd0574360a70707c86b4a484b6b7f57464919a6e53389c5090ed4fcf757c0ade3c3030e9f91505181f0ee2020d9956090fc075e22674593 SHA512 1b0c36ac40b06b6f5cd562925f29fbcbaff1b2cb2691345146705da186932dc5908aab29c2cd773d624cd29e51fd75c2729dfbcfd26762c30a6879af7e3fe488
diff --git a/sys-devel/smatch/smatch-1.60.ebuild b/sys-devel/smatch/smatch-1.60.ebuild
index 9423f1d108f6..4a6c5f79460c 100644
--- a/sys-devel/smatch/smatch-1.60.ebuild
+++ b/sys-devel/smatch/smatch-1.60.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
@@ -15,7 +15,7 @@ else
 	S=${WORKDIR}/${PN}
 fi
 
-DESCRIPTION="static analysis tool for C"
+DESCRIPTION="Static analysis tool for C"
 HOMEPAGE="http://smatch.sourceforge.net/"
 
 LICENSE="OSL-1.1"
diff --git a/sys-devel/smatch/smatch-1.72.ebuild b/sys-devel/smatch/smatch-1.72.ebuild
new file mode 100644
index 000000000000..cb53b5afd462
--- /dev/null
+++ b/sys-devel/smatch/smatch-1.72.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
+		http://repo.or.cz/r/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz"
+	# Update on bumps
+	S="${WORKDIR}"/${P}-7f4b936
+
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Static analysis tool for C"
+HOMEPAGE="http://smatch.sourceforge.net/"
+
+LICENSE="OSL-1.1"
+SLOT="0"
+
+RDEPEND="dev-db/sqlite"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
+		-e 's:pkg-config:$(PKG_CONFIG):' \
+		Makefile || die
+}
+
+_emake() {
+	# gtk/llvm/xml is used by sparse which we don't install
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		V=1 \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LD='$(CC)' \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		HAVE_GTK2=no \
+		HAVE_LLVM=no \
+		HAVE_LIBXML=no \
+		"$@"
+}
+
+src_compile() {
+	_emake smatch
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	# default install target installs a lot of sparse cruft
+	dobin smatch
+	insinto /usr/share/smatch/smatch_data
+	doins smatch_data/*
+	dodoc FAQ README
+}
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild
index 8ba49a55ed46..cb53b5afd462 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
+		http://repo.or.cz/r/${PN}.git"
 	inherit git-r3
-	EGIT_REPO_URI="https://repo.or.cz/r/${PN}.git"
 else
 	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/${P}.tar.gz"
+	# Update on bumps
+	S="${WORKDIR}"/${P}-7f4b936
+
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-	S=${WORKDIR}/${PN}
 fi
 
-DESCRIPTION="static analysis tool for C"
+DESCRIPTION="Static analysis tool for C"
 HOMEPAGE="http://smatch.sourceforge.net/"
 
 LICENSE="OSL-1.1"
 SLOT="0"
-IUSE=""
 
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 6aeb6472936d..395a4c2aa386 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,4 +1,6 @@
 DIST sparse-0.6.3.tar.xz 350676 BLAKE2B 5c8f54f3b7d2095df30b9a59a151e307ebedac5dbb6910ab5684b298c2b427e55dd43697e698fd289fb0d8e824ba4d72c2761772babb9f438e622f439ab3448d SHA512 33170065ea5967d7c640a7551acc78d7efee9f7aa6a9edf6afe2cdd8a04ea5cebe7b5dcdeebf791d384542b8bcdd4e818c75e7ae2e7aa4e1edbd56b68367b28f
-EBUILD sparse-0.6.3.ebuild 1419 BLAKE2B c9a7686c96484117a74f796a989f53842b3e6ca29b499606f691f95b212c699b80b8ef98ba0d6e50dae4d1f232b7667b86ad068025cff883817a689482c96837 SHA512 c0af873bb50d3637fdcd2d424bed611c3e4da8bd97bbc0c3e79419e76ae97626844cb607387d255e49c390e939d7de7095032c98863556468285248ac58a6b22
-EBUILD sparse-9999.ebuild 1419 BLAKE2B c9a7686c96484117a74f796a989f53842b3e6ca29b499606f691f95b212c699b80b8ef98ba0d6e50dae4d1f232b7667b86ad068025cff883817a689482c96837 SHA512 c0af873bb50d3637fdcd2d424bed611c3e4da8bd97bbc0c3e79419e76ae97626844cb607387d255e49c390e939d7de7095032c98863556468285248ac58a6b22
+DIST sparse-0.6.4.tar.xz 370840 BLAKE2B 4b21d26c87df65f08928438c311582a45f4cbbb5ed2bb399c3521d1e40630006d794b4f1e545693e82225f086968cf686c5bfb29059644a31812120f07caebe2 SHA512 4ada31e588469d15862579dd7eb926ce1ad717bf96d38d425b9153f2efe73949fdda5bc59d05d926614a08d70e656e4ff531a5f0a1cf8e7725c596dcdba169f9
+EBUILD sparse-0.6.3.ebuild 1410 BLAKE2B a5e87d572c849d53c00667753e2d0b291ca10a2f8a258e4bcaf5d42b110826b37ff2445e5d4fdff331b03c6d69dc4b99fc47f48d4836c4252e139ad815746c15 SHA512 33bc791fb336bb58a7a09046674d82983f2907e0b70d560ba1c58e376fbc869c8fcc7e81e6afda81da47b1d6d066f34356e4275b0deafcdc1c93f1d8723c2bf8
+EBUILD sparse-0.6.4.ebuild 1535 BLAKE2B d5bd38f9f55cbde8516198b94f636bb3e2d1122a93de3629fca5f5a65980a33e64d48938c4ac392516c7711c0c72051cf1363a09ad50b661f1bb884e8d6a3d29 SHA512 9059e3219f0489887335e4045974118962a737d487a930a8e2dec6c6fab382854cd37241649056fd0acd6712650519e0786e340aa9e7c20c36701266fd9d608f
+EBUILD sparse-9999.ebuild 1535 BLAKE2B d5bd38f9f55cbde8516198b94f636bb3e2d1122a93de3629fca5f5a65980a33e64d48938c4ac392516c7711c0c72051cf1363a09ad50b661f1bb884e8d6a3d29 SHA512 9059e3219f0489887335e4045974118962a737d487a930a8e2dec6c6fab382854cd37241649056fd0acd6712650519e0786e340aa9e7c20c36701266fd9d608f
 MISC metadata.xml 637 BLAKE2B e33b84c487b6ca16c65c0df9419fcc884df2eb8093af0996cc2d3973a3408a37cdea26a76b9c0217c52798fd0fb8a11d4b8158fe4f7e3c8303af8abc4fb92680 SHA512 a2ee75927fab2cdbf79389bc1790683120a6c419ff529f806a747ad99a7ce1481c2434dafc39b3fef57a6e0d964580d113817dbe656ba1307a42de24ea4228d2
diff --git a/sys-devel/sparse/sparse-0.6.3.ebuild b/sys-devel/sparse/sparse-0.6.3.ebuild
index 0fcda7847330..0c2099d4c278 100644
--- a/sys-devel/sparse/sparse-0.6.3.ebuild
+++ b/sys-devel/sparse/sparse-0.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit llvm multilib toolchain-funcs
+inherit llvm toolchain-funcs
 
 DESCRIPTION="C semantic parser"
 HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
diff --git a/sys-devel/sparse/sparse-0.6.4.ebuild b/sys-devel/sparse/sparse-0.6.4.ebuild
new file mode 100644
index 000000000000..6fbcc28e1552
--- /dev/null
+++ b/sys-devel/sparse/sparse-0.6.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=12
+inherit llvm toolchain-funcs
+
+DESCRIPTION="C semantic parser"
+HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
+else
+	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gtk llvm sqlite test xml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
+	sqlite? ( dev-db/sqlite:= )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="gtk? ( virtual/pkgconfig )
+	xml? ( virtual/pkgconfig )"
+
+llvm_check_deps() {
+	has_version "sys-devel/llvm:${LLVM_SLOT}" && \
+		has_version -r "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use llvm && llvm_pkg_setup
+}
+
+_emake() {
+	# Makefile does not allow for an easy override of flags.
+	# Collect them here and override default phases.
+	emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		CFLAGS="${CFLAGS}" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		HAVE_GTK=$(usex gtk) \
+		HAVE_LLVM=$(usex llvm) \
+		HAVE_SQLITE=$(usex sqlite) \
+		HAVE_LIBXML=$(usex xml) \
+		V=1 \
+		PREFIX="${EPREFIX}/usr" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+
+	dodoc FAQ README
+}
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index 0fcda7847330..6fbcc28e1552 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit llvm multilib toolchain-funcs
+LLVM_MAX_SLOT=12
+inherit llvm toolchain-funcs
 
 DESCRIPTION="C semantic parser"
 HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
@@ -21,16 +22,19 @@ SLOT="0"
 IUSE="gtk llvm sqlite test xml"
 RESTRICT="!test? ( test )"
 
-LLVM_MAX_SLOT=10
-
 RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	llvm? ( sys-devel/llvm:${LLVM_MAX_SLOT}= )
+	llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
 	sqlite? ( dev-db/sqlite:= )
 	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
+DEPEND="${RDEPEND}"
+BDEPEND="gtk? ( virtual/pkgconfig )
 	xml? ( virtual/pkgconfig )"
 
+llvm_check_deps() {
+	has_version "sys-devel/llvm:${LLVM_SLOT}" && \
+		has_version -r "sys-devel/llvm:${LLVM_SLOT}"
+}
+
 pkg_setup() {
 	use llvm && llvm_pkg_setup
 }
@@ -44,15 +48,12 @@ _emake() {
 		AR="$(tc-getAR)" \
 		CFLAGS="${CFLAGS}" \
 		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		\
 		HAVE_GTK=$(usex gtk) \
 		HAVE_LLVM=$(usex llvm) \
 		HAVE_SQLITE=$(usex sqlite) \
 		HAVE_LIBXML=$(usex xml) \
-		\
 		V=1 \
 		PREFIX="${EPREFIX}/usr" \
-		\
 		"$@"
 }