gentoo auto-resync : 02:12:2022 - 08:55:37

author: V3n3RiX <venerix@koprulu.sector> 2022-12-02 08:55:38 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-02 08:55:38 +0000
commit: 5a1e5a6812ca9c9555657cce48fe09d2ffa44401 (patch)
tree: 5c040bbee9184b24f26b05031a2448e62f6df38a /dev-util
parent: 2c4066122b66fa1eb3e37846f9a6e14529a553d8 (diff)
29 files changed, 26 insertions, 1319 deletions
diff --git a/dev-util/FlameGraph/FlameGraph-1.0.ebuild b/dev-util/FlameGraph/FlameGraph-1.0.ebuild
index d9461f2bb009..13949c99653c 100644
--- a/dev-util/FlameGraph/FlameGraph-1.0.ebuild
+++ b/dev-util/FlameGraph/FlameGraph-1.0.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 
 RDEPEND="
 	dev-lang/perl
-	virtual/awk
+	app-alternatives/awk
 "
 
 src_test() {
diff --git a/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild b/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild
index 3fb4cd530480..877d6bde3fd9 100644
--- a/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild
+++ b/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 
 RDEPEND="
 	dev-lang/perl
-	virtual/awk
+	app-alternatives/awk
 "
 
 src_test() {
diff --git a/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild b/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild
index 88f035e99fd0..2cc9d511e112 100644
--- a/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild
+++ b/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${PN}-${COMMIT_ID}"
 
 RDEPEND="
 	dev-lang/perl
-	virtual/awk
+	app-alternatives/awk
 "
 
 src_test() {
diff --git a/dev-util/FlameGraph/FlameGraph-9999.ebuild b/dev-util/FlameGraph/FlameGraph-9999.ebuild
index 63b0925c8c09..f92d7b48e0a5 100644
--- a/dev-util/FlameGraph/FlameGraph-9999.ebuild
+++ b/dev-util/FlameGraph/FlameGraph-9999.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 
 RDEPEND="
 	dev-lang/perl
-	virtual/awk
+	app-alternatives/awk
 "
 
 src_test() {
diff --git a/dev-util/FlameGraph/Manifest b/dev-util/FlameGraph/Manifest
index 79280a7d7d8d..5f085a6d4f3d 100644
--- a/dev-util/FlameGraph/Manifest
+++ b/dev-util/FlameGraph/Manifest
@@ -1,8 +1,8 @@
 DIST FlameGraph-1.0.tar.gz 1049627 BLAKE2B 4ac6669de754d5c17cd783a2f4aca956f48ef5f2d02740ee63c10629b940df70ea4ea66b8ea5ebbe3c1da5ca74987383ffd700409ce469ad43eedcb72d2e8a3c SHA512 0ae27fd14f76f0db7873a50079efb2bc4fd77ee6550700746b51eeee6813fbebb233d35d744e1b397734da9f89b25c4c0de3567f283cf1218ee7baee46e1b8e8
 DIST FlameGraph-1.0_p20210830.tar.gz 1057405 BLAKE2B 75669be86ace6e6ccb30bd3883c77aef9a3b6e9c1d5d62e4d22f4090d9934a37fa083fe7783e4514f5439448c7d39d3f1c3b839170ac523e44a3bca71597463b SHA512 16769c1e3e907f0b53fd544a55eb3f580a2f1af55dd22b594d6aac9f4ffa881a2cdc6ddfc3599a6479eb127c1d3aefe0052dff1932553a2bdc377aa6f995f26c
 DIST FlameGraph-1.0_p20220918.tar.gz 1061640 BLAKE2B 6d4b96a21eec5c5706e108f3e4314d75a38df8bf64e96d84caaf90c7021cff58384a42df65d6def555c1a242f44d347cd82ab2f3eea5c2cebb5f42f86e6e38cc SHA512 97d57a33f4759c122ec09fe421288b31cbd227c1d81b771c76379f33cd62e1e44f5ebbd1510483df18cf355cd3ddcfc44a7a47f9ae54f30ecdae34e776dc87f1
-EBUILD FlameGraph-1.0.ebuild 678 BLAKE2B fbf4e06ab5a18717f1e9a7492e087ed9de0a0ea8e62a96d0fa837adb7ae8b43725f71f026b916d3064d2fe0d8a05114589ea1dffcbf095e6867e94927b878387 SHA512 2e5e95daf3e80279a200a51cd4c30cb507c773413a8a857ebab1993c2a6cab3338c0963537810e56eb9dd12d31a72868e5df169ad3261482eb0e7cf8aee099a5
-EBUILD FlameGraph-1.0_p20210830.ebuild 660 BLAKE2B 884e8d1affb02003ecf0ef8f62848e269f1a1d9abc7487296f719f06846ef6681dd0384ec36d17eb350815de71bafdef60d519d92d8b7c66969132e07ca24366 SHA512 7e764f4c94195f8018a3ad8821c48f5d694e497822570e4dffec8ab65e74f9b68af21bc42739287a062eaab6f8f3f3bd7e1f0c139a283c32d37d353f2f00fdc8
-EBUILD FlameGraph-1.0_p20220918.ebuild 780 BLAKE2B 24bb716e9237b957d8758c52bdf6f207a39e5f4b95659f98f7b735d3810800cc8e35429395fca4c7a55c95bc921c3d7b1cc9da5eb0d452fcf52b59377ac439a5 SHA512 274b86454a0674af1f0c82c816456961522bb4de535f2093e9a1a47db94bc4b1ae02661d16acbf26f62ae7db712cd1e5604c76bd20c58454c2fb3a50e16301c3
-EBUILD FlameGraph-9999.ebuild 680 BLAKE2B e85386a2e7ca303e2216745b209a4b891b02b9a639492e495d1f326144bb722a2e8b61ff1c178156019e100611f25503a77b3f44c9fb7d0c31ab94523e5f26ca SHA512 408b8e67b97b73781783dd40a12ba4c1c2fd5a2414d12112d0b89fb3a6b967ecdf39dd2e53ad9fdb7d24658b98c7803d6a58a351af43d5aba47a2b1a47f64fea
+EBUILD FlameGraph-1.0.ebuild 687 BLAKE2B 8aae4b0d229f258c02be636a5f85e95bb21e7e1f8bed73b954ba843e59b1f5171848464819373339a107de2ac979eebc6f937708ed4f81b2397a6dfed03ce46b SHA512 a648faad2eaa9a0ba461debe379de968cd4eefdad6a4a77e317637c40a4b0bfec1daea5408fb171a8c947baad4ea62611da0327b767ce0af126f29b0b068ed92
+EBUILD FlameGraph-1.0_p20210830.ebuild 669 BLAKE2B bbb39895a9c0858f2c47048d9eeca2b65203edfb963093dac0395a4912e4f48ff6e46f3f8c55b866d38174e43d3170918c58ce2a4990c17d77677a714e1e4b6b SHA512 88360c97066f542ca2bef5e7d66b8c5ac38f6121d476659818cd17947b60bae42aa0070b5ec2e20e62b4b0cfb40af751e2a2bc3346b487ddb90aad987ba4a5be
+EBUILD FlameGraph-1.0_p20220918.ebuild 789 BLAKE2B dd3187092d6cf3a724eeef6987e4f7cd9098f092da9ab1cf2bbf5356f18879f60a87fe0086f6f92184133d42863d8fcedf10f4886309c465981f526558ab2075 SHA512 9ab72f598d8a35385f1f8a390df50467767c306a4bf9c44f61ba61ca81778e51e9a472ab1e7067e16afc1a7c3fa4ce22ca1a94539b29e7070dabffaf4d83c65c
+EBUILD FlameGraph-9999.ebuild 689 BLAKE2B 59642850636557277bd26347753fb0365f6e367c50acffb22e71d345fac3d6e32531f3b45470c09b1bdabcf4007d5e6d6bb082d6e160cd674c2b2a6bf44c557e SHA512 c1cf5a14edc17c1d00c4eb40f774b8a22e5b4a45d76d0fec4fa73baf528c1d88d6fc84ab72c99d5c6bd99f6449d58f0e3bb4ead54ade74091916b3c91aa37891
 MISC metadata.xml 335 BLAKE2B 763810bfc87b644b5559da3ebc79826e27b26f58c6be072da6c399e8f799d8a5f97cefa44b4b6d42af33dee63e53ef52660bd924619e90857290fa30071d9a25 SHA512 0acbd73fa02f69ff43015f2ad7b34a9d93e5423235111f2f93348889cb34f81a1a7980a507ab5628a18c6ab14895666391b1d3c555518df013b1eb245a18abe4
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d9594d2e0d97..e1beb6b5b5dd 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 41a3b66ff23a..95ae9a33767b 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -11,26 +11,16 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.23.3-SHA-256.txt 1452 BLAKE2B aa2e2dfb2757210688a5a9131ca1fffdf6617a52219d373fd908c08e52b7d77f0e980086561a083cabaf8d9f3e24b15064bb74ad2737fcbfe11c8aba5814eb4e SHA512 22808c050e8927867fc5d2daa6999d9eed53e99015f89d1f5bef61397d1b2a9888728e86fdca8716c47f8133e02b3fa726d0cc97c0bb4ab5f5ff16a1fc0ae82f
 DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7ae9cbfe17669107167b3ae72d0e337c63fb1c27a528dcda804323a1f0d4843b630e15427c33e0f5d5c568e27cea769d SHA512 75ff4b25fdd71bc05a7d6fec3c72ec5b8d6ed7ac980d533e6c820855c74a1a58f52d53c1a454dffe1a15568445c4c1c805891997e5709567c9e7709ba1c5e4d9
 DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632
-DIST cmake-3.24.2-SHA-256.txt 1646 BLAKE2B 3c48226c96844c5ddd8567637a61eca697425021735d5dc8613a1fd7a68887f6707b6030c1e4476af5e4bdb4830cc4ff3d8708f4bdf557ba94508086e0447030 SHA512 f7500d8c9a500c9ad2679a68d6343cbbbae1483014ab2cd48a056e1e9591b6edd0d712e9ff5441e19c05284696e6c52ebdc3cf1efc61432f2764da7703816b49
-DIST cmake-3.24.2-SHA-256.txt.asc 833 BLAKE2B fe6a3caa3db7b6be186e49ee5d86706f2cda9a45858bc964be5407f577195d0af74c10e66ea30faa0a35280f1c9f927732f9cc7fcb9dae8e521882955b6ef617 SHA512 a0fa1a002f2f23e8b3b8fb2689905ac618ca423b96f904bee172d6a62e6fb0c0a46394ce57474be9c9810e1d09abf3b192f595cb0e92d5c62d11b60f0c572b82
-DIST cmake-3.24.2-docs.tar.xz 492188 BLAKE2B 64e0d69ce8e739e6622b0cfde8956cb2bf67f9bf412b8d98afa1657bd30d8a2a1cf874e6422c78c222199616aac85d472ef398c83da29d5d64516384e9ed69aa SHA512 d0ef81dfe37ac2a225fe795fd3e6780e3b8fd5caa472a14ff8d036917172efd13126897c7a2a78d8269aa20e4f35c7b9be7bed14ecbfb24df332c332a4ff16c4
-DIST cmake-3.24.2.tar.gz 10396126 BLAKE2B fcfdbbce94ce6cdb3fa478afe591bc63ba25104a32edc3dd9395d7b6bd16e222f41428ef4f9982061d6d1e69b10efbc2a33cc9df4573400612b4b756b80ec348 SHA512 6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674
 DIST cmake-3.24.3-SHA-256.txt 1646 BLAKE2B 739503a16c2e333c9b05a3232e2dcc56105f6933414a4a2054a582b9cf53a12c2b1a37d2189077cbcd138b8cc2828ef1819ab0fc74ded926ef0df7c7ea8c79e1 SHA512 b670acc21b98d1da22b31743f83ba10d6dbfda60341457a02639ee6f15d50462ddcd90b5992eff275d77e7cce6f074aff72abd95c539d18f191682ad87d7884e
 DIST cmake-3.24.3-SHA-256.txt.asc 833 BLAKE2B f8797072c2d30facfbbebc972c68cd1a6510331e63c67e6b665bd97dd9013e354bab68e03d578698d2f9e50c173ff8e1cac40751c7a3645be294a717f4bfee3a SHA512 bc67eaf6dba935df85ae3d7c37600259b032579813b275087332d5cc4c72dd6bdf44762260729a15f237f69f772670291bb2f2dcc4b155fb17112e0e8fa01d6b
 DIST cmake-3.24.3-docs.tar.xz 492156 BLAKE2B 92edd031189673c46e8e13a5e1200917734b918651dc01d982c25602e48cd5d5f014fa8563bdc79b3d09d90ef07a52c9d5a570a5181c59c233ba5bf450cdd5df SHA512 75806743fca976098b9b7ee777c494478142ab5686dc8ccb18510b5938c7e88cf8b3bc47321022f55f33c04bb0a7f549d70be8c765d1ec143467e679c8863132
 DIST cmake-3.24.3.tar.gz 10399876 BLAKE2B 24e2ff8cf4f63ba182dd305c14367fa0163f6187da84f7ec10b1ad6241c7df5b48f329b67ba5f7b5d3b644cba89c7adb848a3ae7196bf5b4dbfaedf178dba250 SHA512 57edf2a8c1c9edeed7fd11271083f333d940b31e0e909d9c71671465961559c505e4e22f36e68bfe1a40a01eb05fe94bc8d37b062f9be613f959f864207e3764
-DIST cmake-3.25.0-SHA-256.txt 1646 BLAKE2B 0408c43f36777473c0df229059d6508990a01535f5b3b8d3ae3b1cda221abab5cc2d37dc655de44a581a4b18b3ef73e920c20921d649a9149b7307b9d548ba6a SHA512 8b73a55837e86fa2e166a12041558cc45d1910514c9a1d63398758a99d76687f13f0c8b5244b89297bd890776a5c286a20e278361eefa0bf8db136744ba76515
-DIST cmake-3.25.0-SHA-256.txt.asc 833 BLAKE2B 1424ff89c7ae68352daddbdb810e818020bdd0979fac32de98839cea510ffb8d30a517327f1853d59bf83f846ccde528d07ed624e55c1b1f185551e4f7bc47d6 SHA512 354f7fbb3597eed8f0d94a496cac13b8d9301576b23bf85fcd5d14b84f2848d96534e2c827f7311a00043da789b4160adad805717f110cfc4677d585691e7e55
-DIST cmake-3.25.0-docs.tar.xz 499744 BLAKE2B d6bfb6f58bab66e0b444206c93a03c10e084f7326c9ecdc7a1a2c5ccd79e4d6403eff92989e05883e5985782dd93e9daea19e773a7fefdfb3808deda0546288b SHA512 7c382bd837f808fbfe3c665c2294ba935f20f62acf24c46c760d79f252b3e26f7ff70c75cdd802bfe9fc65ef73a560ce686caa53a4516c1071800f1ce2285285
-DIST cmake-3.25.0.tar.gz 10560389 BLAKE2B 182983a7fc2eedcbd369fef1b1cd118044abcd1679870ca301f3aa8c0ddebd7cb509ae843d0f7a9847b2b54f79235c3407efd47b6a4684c010b6a3b030e1db4b SHA512 f6e527161b8501c72b71a95ff7a0cf304ae02a214086ff58dd686543243d939e83faf94780cda477b19e4d42e4b8f1ff96c52f98e8f7f717e102a5229f4dd44c
 DIST cmake-3.25.1-SHA-256.txt 1646 BLAKE2B b5ebf93e481b2bf63c5448875983f0b4d13f4e588eb226577969738f3b56c0ca14d9ab99ffc4dbcf8a2ab74a159de00368ce6ebf9667b90ef657083f351c4c01 SHA512 5e7618b27b0cdb674ee0ea7e1e6641ba31da6f4414ae1a08ed11691e105ebd89a39a307b53e04e2386785bcd2917e1b8d65755ef7c07a1d9f4f400dcb5385b44
 DIST cmake-3.25.1-SHA-256.txt.asc 833 BLAKE2B 3dce05d9ad5852165418726fc16de4fcc6c66aa379ce926a68c10515dcd87ed40b60ce345952fc2c83f342b5ebb0f02134af6c07b58e9dcf7e1757ad6294d8b5 SHA512 70ec7f1cef52d76ab6732556b663509de780648a2009608632a7df0de86c1d8b91fab874233413216a486fa97648d95de1556f89f48cea936408b609380c5aa4
 DIST cmake-3.25.1-docs.tar.xz 499680 BLAKE2B 0baac457fbde68046080a906093be96c6fe3d7a4b592125237258768eeb0f9c80d3e1e867e2850fe3ebd27a1284d2f47245ca73b8f5b6eb4c046f2afdab78e56 SHA512 02e1bf84be15a7c796a9a7535ee286ca3cddc478707daa1be076be44285f762a0c5eb620b34815e6713b7262a534d7c7fb48e53896c4706645792397f8da83e3
 DIST cmake-3.25.1.tar.gz 10561054 BLAKE2B 3aaf546ebc935caaaf6d15c61f99184964902a50004222ba29e17714488b219f8d8754008f2b2d701dd7befe8c0f4cd0edad92fcabb8ad37b981f31b2d1e37a2 SHA512 ec4203cac569e3c340bf6535d193d9ccff9c4e4d59a7a7ae5b9156172f647d9f9212bdc37b3c12cbd676b1351b9a64364c563aaa968a2f41e0f402410ed78d57
 EBUILD cmake-3.23.3.ebuild 7786 BLAKE2B 5157538dc24bf0f62f89c532d5cefa4725687e875780d10da41ac4c0f7c52e5f9008b8428c40da4a01ca1babc61a6fdde8656572dba67acff515e1477a789c7b SHA512 bad1b24104f29b4997800b775989a82bd5d4d7e3f26382a595f16021b98cd096ac345b4cbe5d67b7a243157d3c1dd0301594673192e06ce02579abd16827a3a2
-EBUILD cmake-3.24.2.ebuild 8809 BLAKE2B ead6e18dc3b681108680c13cde096e898cb0cfb0afddb85c52596dc8df0b5e2b7553889d6de59e53eec0fc76e27d4240355c6e9af7eeb2780af7e2f72d394896 SHA512 9131ae15daeffc6570fe433ce18de40237a7663fc9a45dc8fd91801f442b2a0eb91b55ab611e00c6db2c15726c7b7c484615d002b65ab22cc7f987e00767e148
 EBUILD cmake-3.24.3.ebuild 8809 BLAKE2B ead6e18dc3b681108680c13cde096e898cb0cfb0afddb85c52596dc8df0b5e2b7553889d6de59e53eec0fc76e27d4240355c6e9af7eeb2780af7e2f72d394896 SHA512 9131ae15daeffc6570fe433ce18de40237a7663fc9a45dc8fd91801f442b2a0eb91b55ab611e00c6db2c15726c7b7c484615d002b65ab22cc7f987e00767e148
-EBUILD cmake-3.25.0.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 EBUILD cmake-3.25.1.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 EBUILD cmake-9999.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.24.2.ebuild b/dev-util/cmake/cmake-3.24.2.ebuild
deleted file mode 100644
index 835f3a198d1d..000000000000
--- a/dev-util/cmake/cmake-3.24.2.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${CMAKE_DOCS_PREBUILT:=1}
-
-CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-CMAKE_DOCS_USEFLAG="+doc"
-
-# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-# ... but seems fine as of 3.22.3?
-# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-if [[ ${PV} == 9999 ]] ; then
-	CMAKE_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
-	inherit git-r3
-else
-	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
-		)"
-
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
-	fi
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CMake"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# Prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# Handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# Respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
-		default
-	else
-		cd "${DISTDIR}" || die
-
-		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
-		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
-		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
-
-		cd "${WORKDIR}" || die
-
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-
-		# Disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# Disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# Don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	# ODR warnings, bug #858335
-	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
-	filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	# Fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
-	local myctestargs=(
-		--output-on-failure
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
-	)
-
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.25.0.ebuild b/dev-util/cmake/cmake-3.25.0.ebuild
deleted file mode 100644
index 9491df325a39..000000000000
--- a/dev-util/cmake/cmake-3.25.0.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${CMAKE_DOCS_PREBUILT:=1}
-
-CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-CMAKE_DOCS_USEFLAG="+doc"
-
-# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-# ... but seems fine as of 3.22.3?
-# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-if [[ ${PV} == 9999 ]] ; then
-	CMAKE_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
-	inherit git-r3
-else
-	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
-		)"
-
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
-	fi
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CMake"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# Prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# Handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# Respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
-		default
-	else
-		cd "${DISTDIR}" || die
-
-		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
-		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
-		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
-
-		cd "${WORKDIR}" || die
-
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-
-		# Disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# Disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# Don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	# ODR warnings, bug #858335
-	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
-	filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	# Fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
-	local myctestargs=(
-		--output-on-failure
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
-	)
-
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 83631bea2bc4..8df796085990 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,7 +1,5 @@
-DIST cucumber-3.2.0.tar.gz 271886 BLAKE2B 0945336e2a4d14c21d22b3af18fb140663fa0c5acd7d29540cb6755fcc50b020640ffc573f4d4ed17af2758df3df410f93cf5067b736cb8005d9a6ae7fa4d397 SHA512 927ca314c56f83e270284921131ec62aa05053d29a77b230799bd1949751f64c964c0f87525c776d7fe260506ddb632b5cc8939df841d131f6a0af8a82110441
 DIST cucumber-7.1.0.tar.gz 410595 BLAKE2B ee1fbca606479f1f07d64a5434051d8466d7056a326424a0235a6e4f860ed3cdc7862495156874b38631e6a0a1b70bda40deb6f5310f7bd6bdafe72c5faa8f2b SHA512 7c124110634259e83ba1986efacf85a73e9a6f36a7c262ba9842e85e73e359a50b5090489f656e5b503cac68e3db9905dd1834db1bfae9ee55e3a4d1b31a4adb
 DIST cucumber-8.0.0.tar.gz 412254 BLAKE2B 8e86ca726a85afeb6d80799c3b2cf633e4949bacb9ad65b41d3baf37f642b9032d57b4e66cca15cbababcdbe5541ce2cd0d23b113897dedbd7cbfb5c85283a00 SHA512 33e9abeb33c7924c3eedfcf477019a782cd813a004e35dcdeb0878b6dea920ba870023b6c8a60c8de810ff231378fa67969208611ce8e9199ae2611d3f6f1f99
-EBUILD cucumber-3.2.0.ebuild 2837 BLAKE2B 8d76d4476b2e1c8d7bdd16c4c89f8d45eb04af571d7438a057ffb28f3b818388cc346b30b53606e8e96ce75b65fb59e9333433c343817e9a57c805128267cd24 SHA512 f0a0a344b0190d7751f9de8aebb8c5d2c93dec6ba41f6df288c67b1629649c2a0f510394b65e9d53074c8f9ce27dafaa6a469b97b03b69309fbcf17f0ac2b689
 EBUILD cucumber-7.1.0.ebuild 2536 BLAKE2B 87c54cd1ecd24e957c322f3994728417bca331b432ae19df61eb08d2d728a93d02199d541c60f407691e695b44684b3d166eaa0d9990d7584a27ad70520860f7 SHA512 0577e95e76824c679f1ff86f84aa357ed0f004fa07c8f780ce184d076423a3a050384e387f231bcd1ab36bb0448c1f46d4f2e9b6c30485cf7ed140bf0bfbdcec
 EBUILD cucumber-8.0.0.ebuild 2570 BLAKE2B f87aa63a8aff4ebd89ead22d5e47fc90873beaaea842cc5f9715b9d6f9d54f13c0039f07949159dce19828e9fc02f6b3885194b505f51ab3fc63a041d25bf386 SHA512 20b771f17a3b44867f492cc70f3de4e6453e73d605503a0be17259fb42d69254940cfc79bbca10861c94acfdbe5742f1e8df6da59af35528a16eba5a683f7003
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber/cucumber-3.2.0.ebuild b/dev-util/cucumber/cucumber-3.2.0.ebuild
deleted file mode 100644
index b5af4c5497d0..000000000000
--- a/dev-util/cucumber/cucumber-3.2.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		dev-ruby/json
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.2
-	>=dev-util/cucumber-expressions-6.0.1:6.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.3:0
-	>=dev-ruby/gherkin-5.1.0:5
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' \
-		-e '/nokogiri/ s/1.8.1/1.8/' \
-		-e "/json/ s/, '~> 1.8.6'//" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged packages
-	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-
-	case ${RUBY} in
-		*ruby24|*ruby25)
-			rm -f spec/cucumber/formatter/http_io_spec.rb || die
-			;;
-	esac
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index e81ab851663b..6263ca75a4e2 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,5 +1,5 @@
 DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042
 DIST dejagnu-1.6.3.tar.gz 622059 BLAKE2B d22d66a233c2643c98f45d260585790b4c1293de2bc84470e7942e0364e0cb15f55888a3b6ab13e82823f4e03198159c93e1904571a5df3fcd6f2da568078726 SHA512 1a737132bd912cb527e7f2fcbe70ffff8ccc8604a0ffdecff87ba2a16aeeefd800f5792aeffdbe79be6daa35cedb1c60e41002ca4aabb5370a460028191b76c4
 EBUILD dejagnu-1.6.2.ebuild 520 BLAKE2B 5d35364056aa60b443fef9785257ed648c3493e599c680cfc210e95153cf12282764d97e391d3e115bd5ecffea9f4c618baf90a1847eb2488be94ba8d69d61ef SHA512 d0d23efa9a108005965090718a4102c47c07c6186200d642cbafce55d0982a9e2f5bb1842aa383bf18a5d52a4ee34e87adaaa96a4e37daae061f1df25dd020cb
-EBUILD dejagnu-1.6.3.ebuild 586 BLAKE2B c7d802d3e1beb9c58c537a94750cb158058e9598985245cad7619f2bc45687f1976b41ddf4ee765dae0f3a3974cc9b5c4c0165604fab61a2c45363ef8812975e SHA512 18ade392af0889737cf07e45874a8696baf12e62c973efc72b4552907627564f511703a4bb82d3b2853b8e873859a1c55d3cfe989408a10f307e2fd6919f9432
+EBUILD dejagnu-1.6.3.ebuild 595 BLAKE2B ed7f69ec64cd0e83064330ce228844a0ed42f9ab9877626933e261c5f9df6b7ec9a956ea44ca6b9659485e16e2ed2f12f88f07c5445ff6dd21d385e7fe5a31a1 SHA512 acfc28fc9cd72edabd16b7d8986e5ca3b51849feb05afdab03f893ed2c52955bb72074ca408260331d4f20f1b6b43a781ef98e50180858906da30b31cb5303e6
 MISC metadata.xml 346 BLAKE2B bcd7b010b14ca00937b7241ff66ef048fc645e1724c33e18d12c3a91d6a117889535fdeba947d2c7071ee5b75b85c3354955014ed8b943685df39a3376fa764e SHA512 cc7e8b6ebd769fdf5fabe1009b7ab1fbd5884e6df686121df1e6fc58d1ebea51e3c15b1be7d6f455ddf3142a2e6ac57780d26a34b4421259df5745689ebbe1a8
diff --git a/dev-util/dejagnu/dejagnu-1.6.3.ebuild b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
index 039228517fed..4d4a2813baa1 100644
--- a/dev-util/dejagnu/dejagnu-1.6.3.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
@@ -17,4 +17,4 @@ RESTRICT="test" # needs fixing
 
 RDEPEND="dev-tcltk/expect"
 #DEPEND="test? ( dev-tcltk/expect )"
-BDEPEND="virtual/awk"
+BDEPEND="app-alternatives/awk"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index aa233c12e817..f9a55e99cf71 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,5 @@
 DIST diffoscope-223.tar.gz 3145330 BLAKE2B 47ebe733c6330c2c8a7a78dfaad4c364ac3570d5a691b889f3154dcc5f7bec7b97744f04433cf56544ca208233271bbbca8bb767ed43844786fca4e77505d95b SHA512 5f83177133fd4689a77fb08038222998f9597cd63b0f328d3ae55c2ef6f5136f55ab1f5841b70ce1f64a62d216e2332bb4cecb82a3edcc90a6a5841e95955d4c
-DIST diffoscope-224.tar.gz 3145263 BLAKE2B 918de272781a7829ad4a16f5db3f8d98e05fd1c7e342e18028bf448bf94ede09d5c475a3c1cadf255fa35f46bc8912374cb6cedf2cea878dcaf59380188b084f SHA512 2efbf2ea45e3a43a86eb6a3432852e0eb5a299d3745d8acb3f8857638cb4775d4322d844f2020ed718e4d28419c8a5ca8ab26f66b9bedeea15da57f33a008909
-DIST diffoscope-226.tar.gz 3164328 BLAKE2B 96fbafcd00c695fd3391122b8468abb0bb27936c45d97d01b2e0bb44bb1f18dc46b7ed2c7cf365993d6303c96a6cc8aeaa780808f23c6dfee5066e0cb377456b SHA512 59e8fd73fcf6e94a603c7e5fa8793f4746e770b0ff84d13379e155d3b4eb91defed79b688109785b62ae5cca1faf9b536454b3107ea93aa361eb511916601615
+DIST diffoscope-227.tar.gz 3163754 BLAKE2B 8a93b168e8ac404b6cfb08ebf9de5adf0288ae6e741653f8194a2d3d45e30b5826ca3d21a37b5db3867c73816e862f1d4593fe7a77487736f8a6e5f2b15057f2 SHA512 1e8a143006c4e734cf30d4110241ed164c3ee893801efa2a7b81a917146a0643dd8b38af0cac937847506a4338d59f4bb03211179742bb076fc4d4dd5f7cb585
 EBUILD diffoscope-223.ebuild 3444 BLAKE2B ace11e44d106488caa6e2e2014236e1d5889667c48348ef29b6b34b719f5b95392cc0f2aaf73ecf0a01085263e4dea21c3ba4280802abca4fe95ac2c2c018c17 SHA512 e9cb6a0ec3fe55146081dd3336409c49112b55dda2e7edb97c9c0b6269ca29f9706dbf9b1cc5061d4d0869f980824ea8ebe447e191d015510af58a50014f659b
-EBUILD diffoscope-224.ebuild 3446 BLAKE2B 24aa2e6955914e21505310a6c935ad141627be46c1a22505fe371e4c3e6623866a6984090967eaddbab9905391b299ea2fe1cc7714b2b7d2a9d068e105a45275 SHA512 562d8964cd5d939e7280ef1d69d7b034b76cf27072391b262536fb3502c9d915562cee2464dda4c5a3e67b210aa3cc8897aaa0616e50b6a04b9c433c93718b32
-EBUILD diffoscope-226.ebuild 3558 BLAKE2B 0b9aeb382a8bb6821e7b0e6a582fbc85564ef64e9d4931322e339c104d92a08d054958b0c604fc5688cb2ec6e5a1639aaf7700f97a203f12f17951f48cd661b0 SHA512 3ebd890410be2c423fc465f3cb149f98a4690ecaa5683b6c1dcf91a5c3c8423d5515ab516652d2c6e8a7ba2b8407d7830550244ded1fc5fc4d2cd91efb7a683e
+EBUILD diffoscope-227.ebuild 3558 BLAKE2B 0b9aeb382a8bb6821e7b0e6a582fbc85564ef64e9d4931322e339c104d92a08d054958b0c604fc5688cb2ec6e5a1639aaf7700f97a203f12f17951f48cd661b0 SHA512 3ebd890410be2c423fc465f3cb149f98a4690ecaa5683b6c1dcf91a5c3c8423d5515ab516652d2c6e8a7ba2b8407d7830550244ded1fc5fc4d2cd91efb7a683e
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-224.ebuild b/dev-util/diffoscope/diffoscope-224.ebuild
deleted file mode 100644
index c76f883a24b8..000000000000
--- a/dev-util/diffoscope/diffoscope-224.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-	tests/comparators/test_gif.py::test_has_visuals
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-
-	# Fails on ZFS
-	tests/test_main.py::test_non_unicode_filename
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-226.ebuild b/dev-util/diffoscope/diffoscope-227.ebuild
index e7f6e7cb72c0..e7f6e7cb72c0 100644
--- a/dev-util/diffoscope/diffoscope-226.ebuild
+++ b/dev-util/diffoscope/diffoscope-227.ebuild
diff --git a/dev-util/directx-headers/Manifest b/dev-util/directx-headers/Manifest
index f39d9cac3624..b20aad847683 100644
--- a/dev-util/directx-headers/Manifest
+++ b/dev-util/directx-headers/Manifest
@@ -1,4 +1,4 @@
 DIST directx-headers-1.606.4.tar.gz 352341 BLAKE2B 5b79e5fb0f807c7766708ac3467f0f8bbf82aa68e3aa71abc84c6791742ffe625a5fed4c36dceded9b372af5349e41e431266cadf21b173e4a659b39f840b41c SHA512 3fb4142f8ceedd8484f5f7dae5804a7a0012951de344936fbf22991d6ae659d4e5093e1627bfe51c3cb0859340b13171c4f6aa68377ec26ac05038acaad8c540
-EBUILD directx-headers-1.606.4.ebuild 650 BLAKE2B 9ba540c786a2d37cb6077cdd8ace5483c4cf042706afc262c09f6088946e4cf1186d6da31fd937d3d75f7953005cb54b274cf77335cb5818ed415f9e1987f104 SHA512 9cc4b43fc783d90679c17693afe5dfe51beeed88180c9a285f898bf608ede80164603333be6afb324116724131ca832c46382475154df5d2e6f16a59488cc5dc
+EBUILD directx-headers-1.606.4.ebuild 649 BLAKE2B dc2a1270d835f85959742cf81ffcec6f3ce2e9570b8bbd825c3920ddec9f838c806e6ec8d1c3b0fa9a015869bb060e5a1fbc619edce20d2f37f819487f98a997 SHA512 2ebb0da2c0b4475979a372a0bf0ee7d4812d4658b1285f5c04ca97fbae702c818031853aafe08e5543e5b80a504f202673ae139dcf69d5d8440b090e9dbb7c9d
 EBUILD directx-headers-9999.ebuild 650 BLAKE2B 9ba540c786a2d37cb6077cdd8ace5483c4cf042706afc262c09f6088946e4cf1186d6da31fd937d3d75f7953005cb54b274cf77335cb5818ed415f9e1987f104 SHA512 9cc4b43fc783d90679c17693afe5dfe51beeed88180c9a285f898bf608ede80164603333be6afb324116724131ca832c46382475154df5d2e6f16a59488cc5dc
 MISC metadata.xml 325 BLAKE2B 5f99ebc7e34bc34ed7ce7de68b4856195b45a4b482fa198972f3f054a4b945bb548a046b71e07ed2e89d3486b7259291bc1b5d09cfae739d0daa091d366a82e7 SHA512 f8ff1d6fafe3c2ed1837ab3db04a52351ccf851098046e0240c5619745682c2669aaa0791a792647d0af533cfc4f83b68171cc2afd05a30c532b918d42111216
diff --git a/dev-util/directx-headers/directx-headers-1.606.4.ebuild b/dev-util/directx-headers/directx-headers-1.606.4.ebuild
index e0d36de615c0..4314233e9802 100644
--- a/dev-util/directx-headers/directx-headers-1.606.4.ebuild
+++ b/dev-util/directx-headers/directx-headers-1.606.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/microsoft/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 6fe53c89df22..7ad0aa9f9b5e 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -12,7 +12,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B 1e017726c7d7f9879c96c744c63f950ff2837d3082e5e5f81202b9b6259d71d013285fb48e81a25d8cbdb81b1db8b2f6807f897ea83b9742a24c3c35ac9761c0 SHA512 6e626b26f6ed4c51e9b2c732de21a60d3a5db90ee57c890b40dd8a6c82f738d6e8bd7a02f8f7fe7cdb9cb067ead82513b3ce7d35e20210f10f4d525cb3baed77
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 272053742b016bf234e75bb6b05e4b113b1f8b34249e8a601842412216665cf00df1b93bf590815d1dd1a709ce5006671bddb92cda7d42a5d099f3cfc3968368 SHA512 91a303661ae706bde45a7d12da928735690fdbb48901a31d6477c2d8595a42a59d4e07dc0ffe4eeb64e0775c61c329b05c0f12ccdece7bed1d5a9093db690f34
 EBUILD lldb-15.0.3.ebuild 2716 BLAKE2B b4b4386fa20bb713bcefba2716a3a0c76a156c5d0b1e3119204662d262c4e76d08fc4e330ba5e1ff20bda3b684d78396a23d097869361776903c418942546437 SHA512 b6d0d29a828b38508f5814851bfc17914dbf668bf0207e8c6653b6df5fef631e9f25e38641e4786e34fe89b29138fabfa59bfe89a1267a95c310076a4b207de2
-EBUILD lldb-15.0.5.ebuild 2718 BLAKE2B 99e4f1154fd04f50199aa6510be2ce8b42c855a5fa37acbaf746e0689324fa0c0eadae85ff9ca6c00b31979665cbb31327a7372d61d3e0e3b006fcd24ca01356 SHA512 9c8a1ddbe6f22fab2f0f0f23b04475a73d3c88c21704de55997612b7b7455e47be5f5b16cb380e99e9313b92d90de464569fba9a5493452331b85fb4d2a98357
+EBUILD lldb-15.0.5.ebuild 2716 BLAKE2B b4b4386fa20bb713bcefba2716a3a0c76a156c5d0b1e3119204662d262c4e76d08fc4e330ba5e1ff20bda3b684d78396a23d097869361776903c418942546437 SHA512 b6d0d29a828b38508f5814851bfc17914dbf668bf0207e8c6653b6df5fef631e9f25e38641e4786e34fe89b29138fabfa59bfe89a1267a95c310076a4b207de2
 EBUILD lldb-15.0.6.9999.ebuild 2697 BLAKE2B d713c22a59e74b93d059ca32c71555d89dc5e414994a07fee5a77440753385de23e59d09d4e7424f205adb9d06b639d4ff2ceadf6a074113b7c31c00c293e892 SHA512 d9ab075e295b873b1aad46f495d6e40d36114b7402df3fbb4360897d9d9c946fb6580cd4034fbea48e74ca3b27de925e4ecfdf1c3ef6bc024ecaaabe26ce1965
 EBUILD lldb-15.0.6.ebuild 2720 BLAKE2B d2efa1b35e353a9824ddd2126a2219c01087b8946349315ed1c4a390b6950e3fdc8bd2035d202044e88148fa789f25940064e7ead5d9a8c5574e56bc7c70183b SHA512 0d526d2549dc50da21c203657188bf378cd3b2beaf6d105abe9e073cb789749445d21806d820d84205cccdccfac20534d3a1a778ad4712cf302087f41646da49
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
diff --git a/dev-util/lldb/lldb-15.0.5.ebuild b/dev-util/lldb/lldb-15.0.5.ebuild
index bfee209b5ab8..09d417102b7d 100644
--- a/dev-util/lldb/lldb-15.0.5.ebuild
+++ b/dev-util/lldb/lldb-15.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="debug +libedit lzma ncurses +python test +xml"
 RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index fa08ec37e54b..3133b6b9e9cc 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -52,7 +52,6 @@ DIST cargo_metadata-0.15.2.crate 18528 BLAKE2B cb80318d0cf7316fa57badcaa05027372
 DIST cbindgen-0.24.3.crate 195698 BLAKE2B f5c65e9c77a7c2f98a44382a6e4b852071b70bd832a3da3220bb8a7c4729a44b5964e651cd63577f555c5bf4e6594b1148a5afd96dc1d3f599b2fd1d523b54d4 SHA512 3a39be67a87aa7a4dd9baaf6b803215f4587bd7925c4315c5ec93954e021471919fa977ad2084f099c606daa392350de3557bba56cef77806def99c40318ef05
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cc-1.0.74.crate 59410 BLAKE2B e53e0992395e6ae54a732ece8af7a7713afeec3488a303c545b4ec50459d049609cebe8652ed595bf86d4f3c23a16d7a19c7f73e6f6f42b13b1567cb34ea6078 SHA512 0cea38466818473b0c3b3c304eda797b018dbf644c084cdf07539c63557be4c38346fd10afc20fa65a099aa83fdb423972c987a080c68205abd9ef04166a8d3b
-DIST cc-1.0.76.crate 60132 BLAKE2B 9e8dabe8cb64a8ef7bb4a91d4e601a9175712da00644125e0e625b0a10a4815ed1a3c93f32eb773d0c2215c74b8f0d73a35831291195dff65d1ae79b8e423d8a SHA512 9a31f5a78859f7272cba9289d0c1b7fe01cbbe5ccd20a729141a751df7f5a576726e2b7e038cb7142e63c59a5ce7cdb83b93c32d5b5f3f45bb297ecdc1b9e983
 DIST cc-1.0.77.crate 60723 BLAKE2B 93720cee6c5721ec43b3f502b0879043afc44049e2ce528addebd8b6cf182a8e370143d67e32a965f1ef4fc07e55c87aaf95c0b1b5f9b85eb4e743a95b17bdf5 SHA512 38a421818bbb22fa6a6bd871a7d69add88932db68683ec91d1b4ce1ba68ea2b9272c42c35f437030614cb522f43db964e3a8f1223dcdef9158090b00d17afe2b
 DIST cfb-0.7.3.crate 63277 BLAKE2B 5d0d4124421d26c1e3dbfabaf741c407f346d62147b12bbf889ef5b4c25350c02d09919e332e1ca18ade34a4e6d2895fc835161f7062c0c0bb56f104f94811a6 SHA512 a5c8d5da5ac009dd7d19320237ea516a65c9b1780bec3403fdbfb6ffa13bf7d05a896baeac5760c3e9aead9f4bd66cf969ab12bbd2938cbe479b1d2266e80b8f
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
@@ -199,7 +198,6 @@ DIST lzxd-0.1.4.crate 21891 BLAKE2B 8271b79bdf6c65a17b5fe77a4d8b7d3a96ccf1752d21
 DIST mailparse-0.13.8.crate 36008 BLAKE2B 8112658b4ceb5b3528375f4f8a178a26c18b5494ba582c333e09de6263769869b5a4903ec2d62cab7a032635fa5d28f00f3f80337b968221e386e252f842cf36 SHA512 c7557f741c170c421d5ccef8cb771fce544b3f3da0475b170f82116c00cdd7522fe29fc8bb4dfa20735345b2c72e12af0bcc4317d9ada412b59f9ff4266e14ac
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST maturin-0.13.7.gh.tar.gz 335508 BLAKE2B fef8ad495208109b867d1ca9700cef149b799bdb372d5110480a035ee5ed52b569f5cb3ca7dffa7d69db3fd4a593d3b894027eb1538e25deddd68146640cdde7 SHA512 509564719aa7b25c1464036b6830518129b24a285075ef551fbb65c42aa2e3c2cfb1bfcefa55cd9b99c7dcec07795ea08fef0a33a55c14030f49afb392face7d
-DIST maturin-0.14.1.gh.tar.gz 373011 BLAKE2B bfbc99aa15cd0109dc3ac0855f144d1150385e8a0f6055f963ce295bf0c852398948af28fb024757837b4f660b4d6d923307424502f4e99ae7018a5d1385e2b0 SHA512 b4f929bb857cc27362a21e0f714d3870ce9d764062613ecf47468160c01af3c1546c1728d4ebf8b1f0d028e0a3272ddc79d23bd51bc92fbb6985cfda92a58ff3
 DIST maturin-0.14.2.gh.tar.gz 373223 BLAKE2B 3b4916430fde07ded175e564d3ce445a35412a840eaf1a030d715af6c7911d6eac10d9fbdbb9073440dbf5ff1f0c852f9f36b361b017e56049f65b6d62d3302e SHA512 fe621bcf077be5ba374cd2910cacb38457a2f6225162ff9c95251b38dd1394670e5209a901daeaa86d9d7ee315e5d945d7536b3fa385d9eec546188b750dbfa5
 DIST maturin-0.14.3.gh.tar.gz 384759 BLAKE2B c787ad0311c4a497f53615bd19e6ec9f37c5acd20ac0dedc5c18a12011ae7191e5ca3b9c0fa2f94c405260ea2805c7c1c32e0453f1c21beaa719d66079083539 SHA512 6a2d8cf0284e0cd4a118be0ec3c7e02baf9852881b12558f78a3c91a88e8fdd2a873ad69449254d3ce5166f6033871d214c08b5f3e6edbd632a6fa2c2501ecb4
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
@@ -358,7 +356,6 @@ DIST serde-1.0.148.crate 76637 BLAKE2B 41a88a684e96df8e7eec41602a5eb1e97b54799ed
 DIST serde_derive-1.0.147.crate 54861 BLAKE2B c758a3c854f1474dd3fadd66d60a59408e30d5b658cde4c7ceb10c8d4b4210c8069cc13618f83f1faf36de928feeeb82b2f7011b457e8b9003a15177714f9c0f SHA512 434d65dc0d78c7c1c3f8832221389dc4b0c5d74d605ce1d2d660c2df9a92f5e5d0c6d543763e1462c58d6ea18001c823ca594e3dac92a47d8fe48319a5c52e59
 DIST serde_derive-1.0.148.crate 55562 BLAKE2B bfde4fb3eaa7d4fb0a96f744612d7cb249325281902d3fc03aaab2bdf55aea22fea2f63b14d00ebeccdb402ecf79cae6060065068af06be427df5cb1204ebdbb SHA512 c011e252ed1fa7578a51241a6147ddfdd462f3e1171666c193895691a295f72766cc48e325f14d389a128a8c146ef16454a7f257a52abae45e83fe5f23dffa12
 DIST serde_json-1.0.87.crate 144383 BLAKE2B 357ee30245611b15bf98ba719266dedc75211a80a660105756b20d52f50bf4032385b366c3272cfc1c7f34022e818cb6a6af799faf76f8d5969c256a02f9187c SHA512 77b90340aaaa0fb477b33e6628ed2ea0fb53cff1e2b5724a3474e24b2bfc9bff077633d9581e41dd96b2a0e167549e992d238bb09c627fb5680996b39583c4cc
-DIST serde_json-1.0.88.crate 144528 BLAKE2B ba14e2634a9bf718a08e0dd525e1bbdaf98a5c1d5c99129e4904c886285f40e6fce08699efcda34766860f2899f0db011ef2032298ad647072d73a1c8bfd248b SHA512 a09e4a26c5177d0faeb9190e668b72813ec1f6a318459480419c8471c1e0ef65310a6879d9b26f11cb8c161d84ff911f5d81e7a4aeb683757620c2e5c6541eb0
 DIST serde_json-1.0.89.crate 144638 BLAKE2B e296fd2fd3054b81349f246d207de4f7f8072e480a34f1c39afc2d46cdb6b861d1514a8bb64f2f68920e8db43b642814f7f4e989dab95cee62485ca2f8db2e8d SHA512 4bafa5693977e129f5787f2ff10f914e2a7740bf7e631bcdf51b27d0d9e5517873184b56649914371e1881107e7ed0a8fedf487617db334d4a7a4bf95c6c16a3
 DIST serde_repr-0.1.9.crate 9695 BLAKE2B ae28d645e12998ce971bface40e7bac688d0f6347149e7be7e7ea40e46b1bee5b6f28b592f981138ac1ddef02c6c62856b98f9aa2f126848307b57e5a2ae8977 SHA512 987d197c4e8326853281f4f8e3f1831c4591d0687429fc08191a1d39edf88261668047100156fe08b2beddc3b01fdcaba5a2a4e45eddffd19fe5cf3e6052f2bc
 DIST sha2-0.10.6.crate 20558 BLAKE2B ceae6f1e28606371f93f5e4fd617b2cb057ed9aa4aa2d81bf4c6af4ca47d639a51f50d0fe4fa77667022c770056d6d711beb4835b2341ae0a8d667f11a4a51a3 SHA512 38dea4c300ea8dee22587ab0af6d66dbde824e1cb071e02e7790bf978efff6bdb6d4076d61c5acb38e86e69261a65811a7bd0182299d53ef053202ee54d2b05c
@@ -491,7 +488,6 @@ DIST zip-0.6.3.crate 61785 BLAKE2B aa59cfa836cdac9cda7e5423cf7146a8fa2be74a4a2f7
 DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc715b1395cafe6386553a52e9a72d08c3a599bc08d5f563ea71324f1e7d60db2797c3ad1ad23a9c322a3939346 SHA512 48227afe709c1cc54cb70b4d9ae26e7f836559b4b11a68136d7720d01bacf757c1f5f40cad9de634fa27e196e4942df69c33a7de1334bb23ca995ea34690c5ba
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
 EBUILD maturin-0.13.7.ebuild 9173 BLAKE2B d1c7190275e939df29e9879e60cccfd08a3fe03a96aa1e7770109fd4fb14f0545d5906ba6622a9626a389c6b94734ac7222aeb13663ca03cfa3b83286180c543 SHA512 4ff95ab86d1dfcd50c70cc8f8f31c58342cf010e38f004f8d714970e7f884e74cd45fe47f04c8da1b6a19c0113d624ed47906b497bc91d65497858be74022c8d
-EBUILD maturin-0.14.1.ebuild 9938 BLAKE2B a6d6a5f613e89df7899e2b23459bd9e26081a3c62a0f14225f0e2242b6f239b174b1320592b8f397ae242cd86e0ec57a488d14ebf8392c31ae1399d70109db87 SHA512 a6521a64dabdc14391ad8bb7110b09931bdf4164f69c4100411a106419a76c0a410b51cd8643f996ad633872a9fd7efb5ee1fa2e2c925e54d0be6044c3019083
 EBUILD maturin-0.14.2.ebuild 9988 BLAKE2B 7f9be6233f8604d9d4148b66019b362fcacf2ff42f59f3bb4249335f80280b31ae42509b05b1bf743cbf53dab356d56663d5616f7aad1c13bdd157b799ecaab6 SHA512 5537b337ccaa134e56a9cad8f2a1959fe39d73ee68ed59410cd53f23487a91a6a78cc80dac920fdd989045e61e7ab2e22ace5131a14e61132a8da7e24065d222
 EBUILD maturin-0.14.3.ebuild 9994 BLAKE2B 65f8cb2a7f132c7a662080bc7e2cacbdbcd329ac8486b6e28fe14195a3673a5bcd7eb69cd817f6fc4c8f7703c22463897b22345d9f026302f9a92fd905138d85 SHA512 291465733b58abe1e52207e11379742b64cfc3d965e477d971e19ff81f968f1ded11931a6c78711040d41b9d26697b1d5242e818b3ce18ba592c9307dc09ec12
 MISC metadata.xml 581 BLAKE2B 9fd4c9b9ef68199ef36af2d3799e3c16f819e89a2858bbfefbedb35575f5018c44ccf6b851f1bd367adefec1e8e6dc4a817bd431037b2ee8d1c01e3638d81541 SHA512 93e477343b707475d8b5bd043575a047e7247998e62daaed232216a9a3bfaa9dcae0ac02ec8489e847018495b31f9ef1811d528498e0e129dde99b06712ef7f7
diff --git a/dev-util/maturin/maturin-0.14.1.ebuild b/dev-util/maturin/maturin-0.14.1.ebuild
deleted file mode 100644
index d0484742c7ce..000000000000
--- a/dev-util/maturin/maturin-0.14.1.ebuild
+++ /dev/null
@@ -1,478 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line-0.17.0
-	adler-1.0.2
-	aes-0.7.5
-	ahash-0.3.8
-	ahash-0.7.6
-	aho-corasick-0.7.19
-	anyhow-1.0.66
-	askama-0.11.1
-	askama_derive-0.11.2
-	askama_escape-0.10.3
-	askama_shared-0.12.2
-	async-io-1.10.0
-	async-lock-2.6.0
-	atty-0.2.14
-	autocfg-1.1.0
-	backtrace-0.3.66
-	base64-0.13.1
-	bincode-1.3.3
-	bitflags-1.3.2
-	block-buffer-0.10.3
-	block-buffer-0.9.0
-	block-modes-0.8.1
-	block-padding-0.2.1
-	bstr-0.2.17
-	bumpalo-3.11.1
-	byteorder-1.4.3
-	bytes-1.2.1
-	bytesize-1.1.0
-	bzip2-0.4.3
-	bzip2-sys-0.1.11+1.0.8
-	cab-0.4.1
-	cache-padded-1.2.0
-	camino-1.1.1
-	cargo-options-0.5.2
-	cargo-platform-0.1.2
-	cargo-xwin-0.12.2
-	cargo-zigbuild-0.14.1
-	cargo_metadata-0.15.0
-	cbindgen-0.24.3
-	cc-1.0.76
-	cfb-0.7.3
-	cfg-if-1.0.0
-	charset-0.1.3
-	chumsky-0.8.0
-	chunked_transfer-1.4.0
-	cipher-0.3.0
-	clap-3.2.23
-	clap-4.0.26
-	clap_complete-4.0.5
-	clap_complete_fig-4.0.1
-	clap_derive-3.2.18
-	clap_derive-4.0.21
-	clap_lex-0.2.4
-	clap_lex-0.3.0
-	cli-table-0.4.7
-	combine-4.6.6
-	concolor-0.0.9
-	concolor-query-0.1.0
-	concurrent-queue-1.2.4
-	configparser-3.0.2
-	console-0.15.2
-	const-random-0.1.15
-	const-random-macro-0.1.15
-	content_inspector-0.2.4
-	core-foundation-0.9.3
-	core-foundation-sys-0.8.3
-	cpufeatures-0.2.5
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.11
-	crossbeam-utils-0.8.12
-	crunchy-0.2.2
-	crypto-common-0.1.6
-	crypto-mac-0.11.1
-	ctor-0.1.26
-	data-encoding-2.3.2
-	derivative-2.2.0
-	dialoguer-0.10.2
-	diff-0.1.13
-	digest-0.10.6
-	digest-0.9.0
-	dirs-4.0.0
-	dirs-sys-0.3.7
-	dunce-1.0.3
-	either-1.8.0
-	encode_unicode-0.3.6
-	encoding-0.2.33
-	encoding-index-japanese-1.20141219.5
-	encoding-index-korean-1.20141219.5
-	encoding-index-simpchinese-1.20141219.5
-	encoding-index-singlebyte-1.20141219.5
-	encoding-index-tradchinese-1.20141219.5
-	encoding_index_tests-0.1.4
-	encoding_rs-0.8.31
-	enumflags2-0.6.4
-	enumflags2_derive-0.6.4
-	errno-0.2.8
-	errno-dragonfly-0.1.2
-	event-listener-2.5.3
-	fastrand-1.8.0
-	fat-macho-0.4.6
-	filetime-0.2.18
-	flate2-1.0.24
-	fnv-1.0.7
-	foreign-types-0.3.2
-	foreign-types-shared-0.1.1
-	form_urlencoded-1.1.0
-	fs-err-2.9.0
-	futures-0.3.25
-	futures-channel-0.3.25
-	futures-core-0.3.25
-	futures-executor-0.3.25
-	futures-io-0.3.25
-	futures-lite-1.12.0
-	futures-macro-0.3.25
-	futures-sink-0.3.25
-	futures-task-0.3.25
-	futures-util-0.3.25
-	generic-array-0.14.6
-	getrandom-0.2.8
-	gimli-0.26.2
-	glob-0.3.0
-	globset-0.4.9
-	goblin-0.5.4
-	goblin-0.6.0
-	hashbrown-0.12.3
-	heck-0.4.0
-	hermit-abi-0.1.19
-	hkdf-0.11.0
-	hmac-0.11.0
-	human-panic-1.0.3
-	humantime-2.1.0
-	humantime-serde-1.1.1
-	idna-0.3.0
-	ignore-0.4.18
-	indexmap-1.9.2
-	indicatif-0.17.2
-	indoc-1.0.7
-	instant-0.1.12
-	io-lifetimes-0.7.5
-	itertools-0.10.5
-	itoa-1.0.4
-	js-sys-0.3.60
-	keyring-1.2.0
-	lazy_static-1.4.0
-	lddtree-0.3.2
-	libc-0.2.137
-	linux-raw-sys-0.0.46
-	lock_api-0.4.9
-	log-0.4.17
-	lzxd-0.1.4
-	mailparse-0.13.8
-	matchers-0.1.0
-	memchr-2.5.0
-	memoffset-0.6.5
-	mime-0.3.16
-	mime_guess-2.0.4
-	minijinja-0.26.0
-	minimal-lexical-0.2.1
-	miniz_oxide-0.5.4
-	msi-0.5.0
-	multipart-0.18.0
-	native-tls-0.2.11
-	nb-connect-1.2.0
-	nix-0.22.3
-	nom-7.1.1
-	normalize-line-endings-0.3.0
-	normpath-0.3.2
-	nu-ansi-term-0.46.0
-	num-0.4.0
-	num-bigint-0.4.3
-	num-complex-0.4.2
-	num-integer-0.1.45
-	num-iter-0.1.43
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.14.0
-	number_prefix-0.4.0
-	object-0.29.0
-	once_cell-1.16.0
-	opaque-debug-0.3.0
-	openssl-0.10.42
-	openssl-macros-0.1.0
-	openssl-probe-0.1.5
-	openssl-src-111.24.0+1.1.1s
-	openssl-sys-0.9.77
-	os_pipe-1.1.1
-	os_str_bytes-6.4.0
-	os_type-2.6.0
-	output_vt100-0.1.3
-	overload-0.1.1
-	parking-2.0.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.4
-	paste-1.0.9
-	path-slash-0.2.1
-	pep440-0.2.0
-	percent-encoding-2.2.0
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	pkg-config-0.3.26
-	plain-0.2.3
-	platform-info-1.0.1
-	polling-2.4.0
-	portable-atomic-0.3.15
-	ppv-lite86-0.2.17
-	pretty_assertions-1.3.0
-	proc-macro-crate-0.1.5
-	proc-macro-crate-1.2.1
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.47
-	pyproject-toml-0.3.1
-	python-pkginfo-0.5.5
-	quote-1.0.21
-	quoted_printable-0.4.5
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.4
-	rayon-1.6.0
-	rayon-core-1.10.1
-	redox_syscall-0.2.16
-	redox_users-0.4.3
-	regex-1.7.0
-	regex-automata-0.1.10
-	regex-syntax-0.6.28
-	remove_dir_all-0.5.3
-	rfc2047-decoder-0.2.0
-	ring-0.16.20
-	rpassword-7.1.0
-	rustc-demangle-0.1.21
-	rustc_version-0.4.0
-	rustix-0.35.13
-	rustls-0.20.7
-	rustversion-1.0.9
-	ryu-1.0.11
-	same-file-1.0.6
-	schannel-0.1.20
-	scoped-tls-1.0.1
-	scopeguard-1.1.0
-	scroll-0.11.0
-	scroll_derive-0.11.0
-	sct-0.7.0
-	secret-service-2.0.2
-	security-framework-2.7.0
-	security-framework-sys-2.6.1
-	semver-1.0.14
-	serde-1.0.147
-	serde_derive-1.0.147
-	serde_json-1.0.88
-	serde_repr-0.1.9
-	sha2-0.10.6
-	sha2-0.9.9
-	sharded-slab-0.1.4
-	shlex-1.1.0
-	similar-2.2.1
-	slab-0.4.7
-	smallvec-1.10.0
-	smawk-0.3.1
-	snapbox-0.4.1
-	snapbox-macros-0.3.1
-	socket2-0.4.7
-	socks-0.3.4
-	spin-0.5.2
-	static_assertions-1.1.0
-	strsim-0.10.0
-	subtle-2.4.1
-	syn-1.0.103
-	tar-0.4.38
-	target-lexicon-0.12.5
-	tempfile-3.3.0
-	termcolor-1.1.3
-	terminal_size-0.1.17
-	terminal_size-0.2.2
-	textwrap-0.16.0
-	thiserror-1.0.37
-	thiserror-impl-1.0.37
-	thread_local-1.1.4
-	time-0.3.17
-	time-core-0.1.0
-	time-macros-0.2.6
-	tiny-keccak-2.0.2
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.0
-	toml-0.5.9
-	toml_datetime-0.5.0
-	toml_edit-0.15.0
-	tracing-0.1.37
-	tracing-attributes-0.1.23
-	tracing-core-0.1.30
-	tracing-log-0.1.3
-	tracing-serde-0.1.3
-	tracing-subscriber-0.3.16
-	trycmd-0.14.4
-	twox-hash-1.6.3
-	typenum-1.15.0
-	unicase-2.6.0
-	unicode-bidi-0.3.8
-	unicode-ident-1.0.5
-	unicode-linebreak-0.1.4
-	unicode-normalization-0.1.22
-	unicode-width-0.1.10
-	uniffi_bindgen-0.21.0
-	uniffi_meta-0.21.0
-	untrusted-0.7.1
-	ureq-2.5.0
-	url-2.3.1
-	uuid-0.8.2
-	uuid-1.2.2
-	valuable-0.1.0
-	vcpkg-0.2.15
-	version_check-0.9.4
-	wait-timeout-0.2.0
-	waker-fn-1.1.0
-	walkdir-2.3.2
-	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.83
-	wasm-bindgen-backend-0.2.83
-	wasm-bindgen-macro-0.2.83
-	wasm-bindgen-macro-support-0.2.83
-	wasm-bindgen-shared-0.2.83
-	web-sys-0.3.60
-	webpki-0.22.0
-	webpki-roots-0.22.5
-	weedle2-4.0.0
-	wepoll-ffi-0.1.2
-	which-4.3.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.36.1
-	windows-sys-0.42.0
-	windows_aarch64_gnullvm-0.42.0
-	windows_aarch64_msvc-0.36.1
-	windows_aarch64_msvc-0.42.0
-	windows_i686_gnu-0.36.1
-	windows_i686_gnu-0.42.0
-	windows_i686_msvc-0.36.1
-	windows_i686_msvc-0.42.0
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_gnu-0.42.0
-	windows_x86_64_gnullvm-0.42.0
-	windows_x86_64_msvc-0.36.1
-	windows_x86_64_msvc-0.42.0
-	xattr-0.2.3
-	xwin-0.2.8
-	yansi-0.5.1
-	zbus-1.9.3
-	zbus_macros-1.9.3
-	zip-0.6.3
-	zvariant-2.10.0
-	zvariant_derive-2.10.0"
-# additional crates used by test-crates/* test packages,
-# `grep test-crates tests/run.rs` to see which are needed
-CRATES_TEST="
-	cargo_metadata-0.14.2
-	cc-1.0.73
-	cc-1.0.74
-	indexmap-1.9.1
-	libc-0.2.134
-	once_cell-1.15.0
-	parking_lot_core-0.9.3
-	proc-macro2-1.0.46
-	pyo3-0.17.3
-	pyo3-build-config-0.17.3
-	pyo3-ffi-0.17.3
-	pyo3-macros-0.17.3
-	pyo3-macros-backend-0.17.3
-	python3-dll-a-0.2.6
-	serde_json-1.0.87
-	syn-1.0.102
-	target-lexicon-0.12.4
-	uniffi-0.21.0
-	uniffi_build-0.21.0
-	uniffi_macros-0.21.0
-	unindent-0.1.10"
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-inherit cargo distutils-r1 flag-o-matic
-
-DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://maturin.rs/"
-SRC_URI="
-	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
-	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
-
-LICENSE="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD
-	CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 openssl
-	doc? ( CC-BY-4.0 OFL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10} pypy3)"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	doc? ( app-text/mdbook )
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/boltons[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# used to prevent use of network during tests
-	cat > "${T}"/pip.conf <<-EOF || die
-		[install]
-		no-index = yes
-		no-dependencies = yes
-	EOF
-
-	# TODO: package-agnostic way to handle IUSE=debug with setuptools-rust?
-	use !debug || sed -i "s/^cargo_args = \[/&'--profile','dev',/" setup.py || die
-
-	# setup.py handles most for non-tests, but ensure rustls is disabled except
-	# on arches where ring crate should work (keep in sync below, bug #859577)
-	if use !amd64 && use !x86 && use !arm64 && use !arm; then
-		sed -i '/^if platform.machine/s/^if/if True or/' setup.py || die
-	fi
-}
-
-src_configure() {
-	filter-lto # undefined references with ring crate
-
-	if use !amd64 && use !x86 && use !arm64 && use !arm; then
-		local myfeatures=( upload log human-panic )
-		cargo_src_configure --no-default-features
-	fi
-}
-
-python_compile_all() {
-	use !doc || mdbook build -d html guide || die
-}
-
-python_test() {
-	local -x MATURIN_TEST_PYTHON=${EPYTHON}
-	local -x PIP_CONFIG_FILE=${T}/pip.conf
-	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
-
-	local skip=(
-		--skip locked_doesnt_build_without_cargo_lock
-		# relies on 80-chars terminal output but ignores exported COLUMNS=80
-		--skip cli_tests
-		# avoid need for wasm over a single hello world test
-		--skip integration_wasm_hello_world
-		# fragile depending on rust version, also wants libpypy*-c.so for pypy
-		--skip pyo3_no_extension_module
-	)
-
-	cargo_src_test -- "${skip[@]}"
-}
-
-python_install_all() {
-	dodoc Changelog.md README.md
-	use doc && dodoc -r guide/html
-}
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index 41acb31951a5..cb60ada4fdd0 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -2,5 +2,5 @@ AUX statifier-1.7.4-clang.patch 344 BLAKE2B 6e5d2f48fa20c34c999cf898f943e9e61133
 AUX statifier-1.7.4-fix-build-system.patch 2104 BLAKE2B 019248feff682a75b90d1aca7eea425aded1b0f01e8dff4bd24410a474ef1350ed8215803915cb52df53866f6dc996428742d0a9187f55bbff17ce30894dd6b3 SHA512 a9bf5adf1206bbca84084df0680785e1f31902fb7ce4d455593ee35e0195ef9546de641d2f5372843afb7c8584fb04b1b13ee7973813ee8561a2282f2162cc87
 AUX statifier-1.7.4-musl.patch 673 BLAKE2B 1b1d46c44ae7675dd757219a40d0f255455308c27a0515c32ebdc629cbb6e1777e4a7d673c51cba42b7b82b4608ed1e69ab3d2aa7bda93b4171c0e9670e608db SHA512 285ed4d06080188b45a10c3e5da83c7e28e198cbe2f20dc84befa4d4b83850278c4f8e444898f6c419b8e13e41140875eb1e7960d9633a03b396a716c53bd03e
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4-r2.ebuild 1232 BLAKE2B 671eec9b49075f7c655c0a97635985a1c71cca4272fcf68c57b84d03c9cb348a36ad136ff1155ab7badfe27233f29ac6675a892695d43ee545151aba00116656 SHA512 c80e913de1bb3f3c4dd6a7693cfaf9feba50f449920677f77e182f4596b5a6ee46e2e1e08f1adc86700bed98173655d12f9e3f34a2f803b3867a8f15b37f6e5d
+EBUILD statifier-1.7.4-r2.ebuild 1241 BLAKE2B 04afc0f30405b28b5c83f8de6dbd5104367217fa26ce12450e4234ddca43078ca93a52d0400bb30d6d67f143f1b75c782e2e7e9acaafb7c4c767c365957b6787 SHA512 6554f5d160054ad7527efaf971b1b79ced93c7b8347885560bd0f1bc37e40c23d5a9750fd14c62747db6fc0fadb0e52c50bb827296e302052a238ec35bf1b686
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/dev-util/statifier/statifier-1.7.4-r2.ebuild b/dev-util/statifier/statifier-1.7.4-r2.ebuild
index 0c00e2573e74..4207ebc917d0 100644
--- a/dev-util/statifier/statifier-1.7.4-r2.ebuild
+++ b/dev-util/statifier/statifier-1.7.4-r2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 RDEPEND="
 	app-shells/bash
 	sys-apps/coreutils
-	virtual/awk
+	app-alternatives/awk
 "
 
 PATCHES=(
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index 8781af0960b1..02c29a2ee74a 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -108,5 +108,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD tree-sitter-cli-0.20.6.ebuild 2926 BLAKE2B f92a2937d094f4f357aedad06f6bd714f7c881b521a4e5c9b360dcc288844b11343b0d7bee922502e4d0fbd64df96ff74298289b333f2f63d483a8c98841edde SHA512 7472165b035d24e7108ed13e4cea1e75bd686d5ad32c9320ec45ae0c4c5ae047489861cf0607b6a1890fedf966625df83148fd692ed66b12ce658a29459bce2c
-EBUILD tree-sitter-cli-0.20.7.ebuild 2934 BLAKE2B 193c8aa33aae24287eeb81210fff705f22b419e76cdcabb562ea06bbd38a52c9be30107e0b69e3ebc546e416e518e3d7bebc218fe75726dd7f228222804a792a SHA512 af376217826657f1e5f7d99d14ddda481e0cfa75ff213c67fa694325d191acc87f984e0217d0ab857c586f4f042b295bf7f09e8ff60334a0a52abaccf9fd5441
+EBUILD tree-sitter-cli-0.20.7.ebuild 2940 BLAKE2B 425847106b3ca58b17dc9e4fe915c72f8b17990f0ff08aee70e01cc79ffdb68f4672fd0ac80cf02b536646361c9b968600c2d2b1f74357f1fae23d4591b1b571 SHA512 74a4717f1c5bff7f82a7d6269992af5deec4375898d1945f6090270cc526bfacbd5aaa4ea227c367967fe2f03531a03247c8fceee628dacd37af8deb18b8ad57
 MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
index a0f1b334cf70..a6ee59daa11e 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
@@ -124,7 +124,7 @@ S="${WORKDIR}"/${MY_P}/cli
 
 LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Test seems to require files (grammar definitions) that we don't have.
 RESTRICT="test"
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index 174e6baa2c96..c5bf1041e6fb 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -2,6 +2,6 @@ AUX wiggle-1.0-cflags.patch 561 BLAKE2B b2daf7fe766800733dd8b22f8e56dd97d9ffabec
 AUX wiggle-1.2-cflags.patch 1104 BLAKE2B 6ce9fbf3a78516b0302dc19d281a8c295867954302c50d011def60568791c7507d35ad3502d8782a2e37fc4e1e99785f0f0c6e705f78699c862a414ad85457ce SHA512 a314dff5ce1610103366a5ad243df29a73f7a4efaaa1eba654ca6d6b2df7ec55d667350bca56c088efb24e5fc4d6bae35fced5d26dfcdf23dabbee72d6a4a0cb
 DIST wiggle-1.0.tar.gz 868216 BLAKE2B 7241cbbde488b5cbf8970feb1cc258deb04c935347d793796f34993feba3e82870c9ac2aa7d5039f4739308cd0b20b4b104fb50c5ce64a5c66381ff3f6c545d4 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3
 DIST wiggle-1.2.tar.gz 847391 BLAKE2B 5e2e3d76e8d5a0ee25cb0957fed1faf0f41bf14a7e7ced9a4547c300154a835df3ade2a94c1d28eb7878e608bf0f48fcd827387d87fe614a95bfea4261b3df01 SHA512 655525a05c0ebc08cb2e4dc33c0b40f893814976e493ea4bcf87cf703738310af2e71c43a15a6e56c948472bf0bd981a5b95f6d9a91a3a377d580928a86bcd58
-EBUILD wiggle-1.0.ebuild 1528 BLAKE2B 84da92153a66c06105451c5d46261d0dc5dd52633506b8ab26ebed2ad8b25337c350c3a60ff2136f9e650028b71ce74322238ae02e24e8ac138af0dc70f0f91a SHA512 7c1286f62a60d97033defab7aa6e19a0cc07134c7d9a757774a12ef077684d3e83d6a8b28a29dc120d354258075bfc599e6e24f57795e2c39b18a70ed23b1b74
-EBUILD wiggle-1.2.ebuild 1529 BLAKE2B f6da44432392b049812905f67051baf80b00c23d7f951957532f066c09d9e626bcc25fba6b3b158586c80f5a1ea4e25af8878b1774a212f76bbab365385186c3 SHA512 582217676c539d6f008bd7ec33cdde11e0d4f0dd4e9d8f34cffdecfd2f2d4e14c4f23c2310ce33808ea018657108bf95ad5235c611013f060a72c34aae5e41c9
+EBUILD wiggle-1.0.ebuild 1537 BLAKE2B 8e2a1f5601f5b3762425a60edac904cad1240055c6e73824b6efb1880bd8132630128f770130c8da055ae4dbbfaea92d7ce5f6fc236edc78a20edbd9208ce906 SHA512 c79fd1555ae5b4a96bd3e5c4742224a2ecf985256d9ed98694a373f7b7853b66645b532e2491db683e05cb81bb9e6fb09a1dee92bf22c4fdefc317ff46654f83
+EBUILD wiggle-1.2.ebuild 1538 BLAKE2B 9c0fc9536844c6d63e5eb4b5e2e0e2386057df42b7884ceb579443afae08bf79ca6196f6fec9dd1686f4b0eec8a3c70f339a5ff2a0754fb0ba8ed96d42edf894 SHA512 605a10bc1b09c8e61d88ec0e81f69560187f28569d8e8d1e048b7aaa726f56872b87f9f796f280b1a9941b27721b503e5253988919e1b5620eb0c844b62a76c4
 MISC metadata.xml 342 BLAKE2B b388fcafbff2724b63fb8d68f6a5862c2b776beb4cbc36c214806b3461cfce8e3f365b6daa60c98458087f5e3ad322f7cbee49c0e499582980ae20b2eca02f53 SHA512 1a2b8f28bcb95a4e30b4e3ebefcd29e6ab085935c2e25425797c1320d6f8ca93183dbf8cab8e15d1969effdd1f644f74f598937c53a2219cad7a9056ac6ccd58
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 2a259f966e52..0f3c7e80a92b 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-util/patchutils
 	sys-apps/diffutils
 	sys-apps/findutils
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/grep
 	sys-apps/less
 	sys-apps/sed
diff --git a/dev-util/wiggle/wiggle-1.2.ebuild b/dev-util/wiggle/wiggle-1.2.ebuild
index 0f7322c3e7de..900ebe3deb12 100644
--- a/dev-util/wiggle/wiggle-1.2.ebuild
+++ b/dev-util/wiggle/wiggle-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-util/patchutils
 	sys-apps/diffutils
 	sys-apps/findutils
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/grep
 	sys-apps/less
 	sys-apps/sed
author	V3n3RiX <venerix@koprulu.sector>	2022-12-02 08:55:38 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-02 08:55:38 +0000
commit	5a1e5a6812ca9c9555657cce48fe09d2ffa44401 (patch)
tree	5c040bbee9184b24f26b05031a2448e62f6df38a /dev-util
parent	2c4066122b66fa1eb3e37846f9a6e14529a553d8 (diff)