gentoo auto-resync : 04:09:2024 - 12:28:34

37 files changed, 164 insertions, 730 deletions

diff --git a/dev-util/0xtools/0xtools-2.0.3.ebuild b/dev-util/0xtools/0xtools-2.0.3.ebuild
index d73227e1d32b..8f4e383cb9f6 100644
--- a/dev-util/0xtools/0xtools-2.0.3.ebuild
+++ b/dev-util/0xtools/0xtools-2.0.3.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/tanelpoder/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-util/0xtools/Manifest b/dev-util/0xtools/Manifest
index ffdbd96e9ca5..6bddfccedd9c 100644
--- a/dev-util/0xtools/Manifest
+++ b/dev-util/0xtools/Manifest
@@ -3,6 +3,6 @@ DIST 0xtools-2.0.2.tar.gz 5989710 BLAKE2B 5e4efd4d21e3ed1fc8b1eed5378d25af3170f2
 DIST 0xtools-2.0.3.tar.gz 5991280 BLAKE2B 26d71f43a0fbe72d38e675cc525fc91b4a738dd3a99ef6804f8855d15341a423d1b5c54ba9e015bea539d15617393d8994c1415a3ee0b74d2d49e97f6b243586 SHA512 012655d8d12fe5a853ccb9503471893ee09bf0fbbe5d3b3be52b5857cac965be63279546c240748d10d727abc2383b8cf2e91b07ffee69ae509494fb5c5d6767
 EBUILD 0xtools-1.2.4.ebuild 1359 BLAKE2B 16f5d4a8baf958a55eab1a130d18d39ac25d0e824889de9336abfc557e7980c9c8b74a438f00fb27846055ad749ca43d162124be26c376f1fd641c431a3b1be9 SHA512 ba018d77933c4e2e347a7817ace9f79ebb642b3f92080f09c386816fd3681b7a9d7a8d16526e29e2a63a6611ecf40362c37f15e0b37647c6bac0ca7a7fef4062
 EBUILD 0xtools-2.0.2.ebuild 1441 BLAKE2B 8de88d59aa58dac8b84dfbb5abb3ea617734ebeec66d40d7457e8a94de4b9d0e21dc60cc931e2dd3045b11eb09ebcc8223176d77e6fe5d4998a52cf139e49386 SHA512 b290b97c6469c902e25f7d72ef10e459d10e202f9dd4508ee41a89d8afae7e829b2c87a6e75115a4813c3a5a40627ad1119823a3f4a3a03308cbf4db236f6aae
-EBUILD 0xtools-2.0.3.ebuild 1442 BLAKE2B 3cae7b29f4f271fd2fadf7e63edd79255ccac5d81d985c06cdc67959ef940128a59a97fa965062dcb80c94e2007e74a51a2203b77392414a9d4199e87b25d9a6 SHA512 02b648a82c35c85eaeb574739418a241c6ae4584287888f1cd24d07934cd00ec1b7547fa5c83a8f83d4d3f5c5bf354a4bfb3a901fb6fc1c048fd554d69fd39e6
+EBUILD 0xtools-2.0.3.ebuild 1441 BLAKE2B 8de88d59aa58dac8b84dfbb5abb3ea617734ebeec66d40d7457e8a94de4b9d0e21dc60cc931e2dd3045b11eb09ebcc8223176d77e6fe5d4998a52cf139e49386 SHA512 b290b97c6469c902e25f7d72ef10e459d10e202f9dd4508ee41a89d8afae7e829b2c87a6e75115a4813c3a5a40627ad1119823a3f4a3a03308cbf4db236f6aae
 EBUILD 0xtools-9999.ebuild 1360 BLAKE2B 1a710510aeade291b21d2b1e124244ae2ce5e5666909198a45fb3a4544fe88bfa5f964fb6a98d510f3a0544336a10538e50396663c7d0e47394f02fcf4c4b2ca SHA512 7404eda4db8655977d3db08b594c9f2861937e3663faa57781f19e2697d57310a2ccb08db8df3f617b1ce6006f1caa7d07b79baa123d97e971fb703d6a29c089
 MISC metadata.xml 1292 BLAKE2B b7e2505d33b7af4424dc4336a7d8d1536ed70f92e4dccccf725a54473b109f7718adac34960b5238753336c6b2da5fd0e49def8ae249509c4b0c9e4bc42a89cf SHA512 0ecf2c2bab2cf03656f980788cf05849c3d2e5905f70753b03f76615da377a5463b3d30decddc3a97eaf83d9bef55e31ce104ca6cd459eb0f116c9edeba0edf2
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b31074432d88..841cf006ebb9 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/blueprint-compiler/Manifest b/dev-util/blueprint-compiler/Manifest
index d99f7b6333d7..d196828bd864 100644
--- a/dev-util/blueprint-compiler/Manifest
+++ b/dev-util/blueprint-compiler/Manifest
@@ -1,3 +1,5 @@
 DIST blueprint-compiler-v0.12.0.tar.bz2 90521 BLAKE2B 0c54f287c2d9e6869f323981eaff16785aa4fa7b1c600629bccde059205950f70f2202642130500133c69235ce42abfb5b5492a5727da561db9fe6c865939bb8 SHA512 c1f2f1ab02773b8c9c1d92035a51cd3b5c769a129ea028e02b8d2d88a7a9cb44f14edefd0f8718b90313a22134d8cbab4f699942f7049edd3146b41735e68f56
+DIST blueprint-compiler-v0.14.0.tar.bz2 95515 BLAKE2B e5e4c721f76a9455d0f53b54e5b981cbd918959c206cad2b6fa47ba3a85bb1bcacb11d65b848cbde01ae32faa6f09c1f80cf6150ee436e359e7b1e9044822bb4 SHA512 3c2c422c6c41c408aff2b4342186e7a20eeb37489aff396d48c936f7a856e9d946f3d6fb6ad64a0fd933bdfc6bce546571d67c95b8f01af591c562d531c246c0
 EBUILD blueprint-compiler-0.12.0.ebuild 1445 BLAKE2B 702652d856a4962b070a5a2f9b84bf02d513500f33adbfd1293e2cd4e3a14f6d6431232e8aa3847c226463e526576a5254b95993df7efce29284a11f394fd056 SHA512 affdbf96a7f35498a733dd31d22d2ec7330621cdfe0421ff04a0e3f9d4efe176685ff129e7e845862f514a1ae467aac1af6be606d09549fff237f82faa79f795
+EBUILD blueprint-compiler-0.14.0.ebuild 1448 BLAKE2B 1613ca093c16f0f741a4180a79ffd9054b60ff1de3dfd2e098f230d1a721bd5a6bd411555368937dfc2f058698668af90dcf294c83326e90da9bae0e744abc45 SHA512 0ce674adfee693432fa534164b1ffcf5071dd6e8ba9fc8ab5e706ea6fc85c18cd75970a728d77d3eb9308e87154e1de270762828011e95cc09d76546823d5ff3
 MISC metadata.xml 906 BLAKE2B 8426e8a64268f0c3310028be81cc727a63ddd67df842d59eae80c55b12c41f446107cc61ed11c115da8b4cc9a67bb16b1d5c9dc09e541f41901eac29611f3e9d SHA512 3af397704e2717cbba16c890af04066cd67f40c1cc477429d3c53b713c079101036a17e788c0f5e316799cbfc8329356686ad129bfbed409002d96df3159d480
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.14.0.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.14.0.ebuild
new file mode 100644
index 000000000000..0aae97c3e8e7
--- /dev/null
+++ b/dev-util/blueprint-compiler/blueprint-compiler-0.14.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit meson python-single-r1 virtualx
+
+DESCRIPTION="Compiler for Blueprint, a markup language for GTK user interfaces"
+HOMEPAGE="https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/
+	https://gitlab.gnome.org/jwestman/blueprint-compiler/"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.gnome.org/jwestman/${PN}.git"
+else
+	SRC_URI="https://gitlab.gnome.org/jwestman/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	S="${WORKDIR}/${PN}-v${PV}"
+
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/furo[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		gui-libs/gtk:4[introspection]
+		gui-libs/libadwaita:1[introspection]
+	)
+"
+
+DOCS=( CONTRIBUTING.md MAINTENANCE.md NEWS.md README.md )
+
+src_configure() {
+	local -a emesonargs=(
+		$(meson_use doc docs)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	use doc && build_sphinx docs
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}/usr/bin"
+	python_optimize
+}
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 62dbd84bd54b..89b7c387f215 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,5 +1,5 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
 DIST desktop-file-utils-0.27.tar.xz 80808 BLAKE2B 66708cd11d5f81824cad814846cdeac6c339e8e93a7f1dceaeed545d9dc1940523fd64ae890e54632b3d32cc91b258aabd41d6d467081539f978ae2993fdfb22 SHA512 81356239a92fb17885aa85a5192c84c2757ebb2e540920d0d41d07035795f08f4162f41b1a87bb2bfcf70ec61f19f1f158e4395a359f46b46f68cb9e24f259a8
-EBUILD desktop-file-utils-0.27-r1.ebuild 687 BLAKE2B 6e23adfa5e3d873d57df9d6ebfff52be30943439a23cb65e0ec4fd9b0158906b9992db41356710a6e761f2989105537bd4eb30f8f717c9fa7b50a01296d649f7 SHA512 c3442f46e158281c84b23a6cd6e6506eba89c52101b3b2c0743603de26da914ff30f2d5b73369c0e7d1385e65ac04c2db024c9f8e0fc7db8f4cf05a3a24ad168
+EBUILD desktop-file-utils-0.27-r1.ebuild 683 BLAKE2B fefabdff9b7702d88e76a7832c178adf8d6234f6ec334549beb04950cc6ae426ba309915a2c78cfbf7e49470431212fea68e0b8be1ec41f02791fc56b0acdb71 SHA512 92d26c733d0ee51f156712014a8513cbe1304f9e608d3a819824f6c78e11c6ea93ff283a2cec42b3fa009a1e58a9eff12f4ca465058704a86a7654446999d0e8
 EBUILD desktop-file-utils-0.27.ebuild 1138 BLAKE2B 663705e02f3db2d6ae263e7369b5486ac0ea72a1278a5194492f76abf226fba159f46014cce32e442fdce91a47fbb6010ffa10ef1d007f0c402fca80a1d33b93 SHA512 b7cfff1f16bc53f53e9ca288d617f91d7fe18b4cc38cf0bb36b4a42c7a3b8442b54505bdeac273c3e9e9a5ee7313e8da7032a0f1654d4cb9848afa5585ac328f
 MISC metadata.xml 225 BLAKE2B 293ebc97ac40be7df2825c558f7def8026a2c8b49af06c8a5fc0dfb58657ee3093306f2a6b90bce5f7fc10f9c3165eee3cd77b58fcea8d293dacff5ba2f04657 SHA512 6f3645f7fe9f5362268973d150b122dcaef666c61e30ddc96917485c617568105aadf7b8d78bf06e402f8592c90369fdc7d949832b9fda13258b4693f1c4c6f3
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
index 4e192a93a3f6..abbb47dc6211 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/glib-2.12:2"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/gitlab-cli/Manifest b/dev-util/gitlab-cli/Manifest
index 05622e3cf9c4..5c1a3eaf76a0 100644
--- a/dev-util/gitlab-cli/Manifest
+++ b/dev-util/gitlab-cli/Manifest
@@ -1,25 +1,7 @@
-DIST gitlab-cli-1.28.1-deps.tar.xz 36252544 BLAKE2B 8c7d4ef554bec4c7e8216bffd8ff138dfaa4aca5ede0d8e68d9291f296121f77bb0e607629dbeadd854ddc767ece394e8e22100f52776d704bd1908e1f0ac5e6 SHA512 6e6d2283a19ef1160ac933399cc497ea92075d7fc0bbc2bc998614b5c077b0331796a224f472139a4f6f273a2e1271ac70ea5ab7c0a479bb749055980e31e2e9
-DIST gitlab-cli-1.28.1.tar.bz2 16781342 BLAKE2B 0b59e60d0f8b7f1e95bbdf1aff8c22017dbf54eae2a72848a5416c35bee893341c1606249eeeaee1ffff1aa72500a8fe91389358abdf066339d9218a6ecdc648 SHA512 57b9d6e2b527bcaf227d8c07101129749a80203db061ac757adc84bda72576e35f6404d80972ffcecb6fecd2e9b644b0e5c9a06b6135a7e3a68c46af82de69b1
-DIST gitlab-cli-1.29.4-deps.tar.xz 38656412 BLAKE2B fcbb787a1fb893ae8d3452919e9e540f011ce0d35827a383f083e1492018a335f80089f2f87315329afb42bebdd1014ef6dc59e6673b930d4397edfa57384513 SHA512 12382eb22cf71cf11ebdfacf834dbcd08d6dc5fb02f7f705772240d896b907e8054a1847976a1ba9105b765df194eb5581dbd8d77fc191ac01b63257f1e76370
-DIST gitlab-cli-1.29.4.tar.bz2 16787326 BLAKE2B d0cc93c92cfb9ae01b9acfec04341c1e06a1bce36f666abec46c6bd0eab6700e2b6ea4f8cc27606da499b8246795c145a402dbf32c8f94074c0feaae34b8ec8a SHA512 a212f73fb06849c1d197efac1a7cf33a09fc94a3b8d954de1d442462deb59e52ff1a89c68e6ce4deb0a1472367890947ccabebfd459fd6e172142a9931c68df1
-DIST gitlab-cli-1.31.0-deps.tar.xz 38653264 BLAKE2B 79ebd6c213a03a7c4a45de602f3074098fc9d20fa0359d27608eb345676e02c6d302d11df3486bd275b4b4e826312d3bde80f0aed3aaf6418ad8d176ff0c26fb SHA512 6cdacd95acfc607a49d1b47b3b975c7234a4249a5f544a262d462d222211dca4ba0553f3dc5d9e2c4e025e630aee6cfc972c41f51abc23b3c4fa5e50adfbfa94
-DIST gitlab-cli-1.31.0.tar.bz2 16794522 BLAKE2B 72051d063be5b4108fec878d7b51cfd0680274e6a3e5e1eab3a992dd0838ff00ca19196e80a5651895dc261518bb93a0f0c5c4f2db2a99dc8e7f9b332af7022a SHA512 4020e7e62c7f3b420c0988712b61ca0a89733cfe8c370faf2a5c21d3983bba69283e85dcff98b3c5a8c6cb18319fb85101789490435d2f38a704ae9eed9aedb1
-DIST gitlab-cli-1.32.0-deps.tar.xz 36780836 BLAKE2B 2f83b28fb1096a1eb265100100691ec0e69d9049b4c37fb7a29360dec07eaa05449bf2ae5b7c3dd4f07e5071ee05435f3ef040ce8f7b8607a7d6721027fe21d2 SHA512 b47a487d01ff83775855cb527457bb0245346af3a36c030ce73d6ed228a5a6307369ab562a9ac71525447d23f83458445c817ccfdf2cf2722fe02d9a9e2d887f
-DIST gitlab-cli-1.32.0.tar.bz2 16799762 BLAKE2B 70c0942713fd4449dd0ba5310c012be71c880934abba6d91cb05820cf4905910638fcbf8d577627c4f5867364dafc19e701a2bea2614986231dd06db47be1219 SHA512 1d00495c852c53284f4d6e25d58a0731aa3b2ebeeecdbea0b4c6ce4f75ce552fd5ba5ad5b9c3daacd30e64fec6a9f23b2b27c0c85d22d7ac51cae575cd3b514a
-DIST gitlab-cli-1.35.0-deps.tar.xz 47876656 BLAKE2B b76ba63c98fdbbbbeffe383407227827cdd02a4640cb2cd32b440d6a9f45f26e8d45b78b52c4b14c8834fa895ea15ad3f4b444493286ec5e1f44a85c18f1540a SHA512 666ee00c95e62a8b2f0cea59cb489699eba2649cfb5e85510508cf3721060d3d40db57162413c6d5905a3e3c8a627940a705a6c335ac79735b1fe29820a7c818
-DIST gitlab-cli-1.35.0.tar.bz2 16809995 BLAKE2B d0b90c8dac6f27b21f740c2538b1c9b70af1a0bb29c852233c3b0d8f694e95823c29ed17b2e0f45ca7b27fdd388ebeeb0e8b3574f694d14f0cb5ba9f78b3b571 SHA512 fb462914cd7004508a247a81d52a9812b70ecd51286a1a06aafa6d1c63ed086ae6bff8aa6311d279da6a23a0efff623280abb68df2c2fc91678f877783325249
-DIST gitlab-cli-1.36.0-deps.tar.xz 47874044 BLAKE2B 6d0c2a70a22c4baffe0bd015f10de302e6866e8c05b76aefdcf83123ddd7b8b1f30c3a23474c9364e0ea2bec96f770ab86bf26b3424048750210995ec6cb7a56 SHA512 903aed99128bc4b34cc51125e78cdd28f52ca2468ceaa792d3ce76280631a51078e7ad55198c98aa7ba3d24421ba1faf4a3ebed2b418557a54781423844ea3e0
-DIST gitlab-cli-1.36.0.tar.bz2 16818985 BLAKE2B efae5cd8e9a1851f61259d463b3b772035cbc07c4904b202c259e56af45d22ab5d3ae4865a5d3af781185800f45002249bf2d31065120d36365fdc2942bc6896 SHA512 77114f90f9cc5752761e3dc54590f6886a343484a24738068c78341f4625802e2ae2aea7e183ed568916c5beb9863a09698762945e6b8eb2fca9abc7292a5426
 DIST gitlab-cli-1.41.0-deps.tar.xz 16529512 BLAKE2B 263d605ad70546e47984e2ef229f5ebd1ef2709c6f7e1ccb07f60807c16e0f6cdc6881d698454688718da54eb1b386a3f4eabcd9aa09008cf3eddf2fd34c5f52 SHA512 d6565eaac2dbe443080c6846fe0bbb42214ad52414d6885cfe91ce53c93f6d49e29cd2706d650f3a7c34a7d095d1a23336846571ce903faf292e85d983ae5cf2
 DIST gitlab-cli-1.41.0.tar.bz2 16825512 BLAKE2B bdb6b271ae78b43fb721f48cc5e2ed272b5fc95b0f2f24b83b5816fa73a6eb276b677dca57ce207453fec696d89b6518846b10be9cf8cfb87a0e964a8fcb5bb5 SHA512 349393cc5893d1a703aaa8bcd933fb2981ed56a071fed662fe775524132b8c09326a61fc626b60733694146f0cf42cf71a0f3cfe45161135a15025c1f3d2969f
 DIST gitlab-cli-1.44.1-deps.tar.xz 18136428 BLAKE2B 9fafde045efac7a00029170ee3b9fad61b2d4cf8facb61ae11c1b6e922f5a88627e5c9dc9d127e232c7ad635b2e7a58c65a29f26b5953d5b252580596ac72030 SHA512 aa5b97b361b18cbbb03abf33ee4249ea66e4374f2ca000dcd037758770b62b3fd45d9f2837b98cf2a6507fb509a1f5e1917456663159e0238d30d743a3ec2052
 DIST gitlab-cli-1.44.1.tar.bz2 16841236 BLAKE2B 3a9ab7b0ca02c6a4a0652a268364785a6514c7bda688137947f11add4688e30ea547fe211b92a2543b765b8a82dc9ac85a7e189697bdc51c39cf62e82eaef42f SHA512 8b4bc19f78054104ae4551efacade8c2a1e86cf538dba2b31a9e7127cd6a792b8bf00d788a93aa26ba3f9a03684db0dbf67968e66d6048168cec6a512d90b18c
-EBUILD gitlab-cli-1.28.1.ebuild 761 BLAKE2B eeab83c2137cf556cf9ecc1f97941fbb808c3df1ce7d9137fb62eb86e2ed574bf454eced1be24b785a00d4cdd004e2921c96863b632e17c62599ca52754a0316 SHA512 5759b1f9cf1e6a84a3a854aeb310cefdfb84a07bf9290082e365d34f6de8d40cb24d5180a422c0c544b16ee6e56d6cd378fb528b157bfbc8ea1ee8bda2643fe0
-EBUILD gitlab-cli-1.29.4.ebuild 761 BLAKE2B d325afadbda01c64d8d94f4f9a4aecc22b0a0bf85ecd288f60ad2e276da2679cfd586f8b9f1c529880fe44ea9988820f799d570789739dc56f46e596643bfeba SHA512 4d96944fb2c67a7883d7866a296f74aab42d7037dbb14bb94a70d5e2eec7f86181ec65440046c30a7c59cfce5abbf0f2af3d2d556d856e71554a66c1fd7f7338
-EBUILD gitlab-cli-1.31.0.ebuild 761 BLAKE2B 065e135dbff8ca709739ef3c09c5fda33b373b1d1ccfbc63a55bf54e1ece89150a4678d304c5b6e739064ac44108669830e22151df22aac974b82fc38805b089 SHA512 2f19d72ea968638b2169365fb5c6d98e05be121dabe353a2ca72049e2e87796ada6b6f0a4b75aabe205f80fc547587c9c380213443190286343601dd172ffa11
-EBUILD gitlab-cli-1.32.0.ebuild 761 BLAKE2B 512f1fce3fcd970be1f1ccf1cfb429d542d2739177c9f4e5c9563ae0f527099b3258bc3d5713c2dd9539574a4d1d8e13e7bfb20b88587aed40bda53fa3b3e8ab SHA512 39bb47f3921c079677c2974179b43fac0f82d8c0fc4442cbcda26402b6ae86da1c09c62f2046918afd99ab2c92c6d6ce57c87741bbb3e9ad67e8f0d969dd2932
-EBUILD gitlab-cli-1.35.0.ebuild 761 BLAKE2B 32afed6826918498de1846b7ec6c9fb46baebd0c87050539f2952014b4df7ddc406598023d4893c1a4d25a76d033bc0d076152305faa88e249cd04bc9261e819 SHA512 6f3b7301127f283824c5eb973428f83859f7858857491406726f575bb567e812981b9368a65fcfe5a0dc19c27df558022cb4f7632e89b64ee10eddd32c190dc5
-EBUILD gitlab-cli-1.36.0.ebuild 766 BLAKE2B 8ab209b3378b94ad542dfd429030b08a09ba7a607ff3de6430017407c37a962ddf3885c3875db75244c6c6cc08ceed69117f8e6f6cce79921aafb926d4d0fcc9 SHA512 48eb71898f9c039c317bdcb01a5aa8c9000be2b28c40341072c78adcec3e1d9e7e9e648d523009a9ec8dcabd4a6571b6178221fcec811a6ca48db5f70180d92d
 EBUILD gitlab-cli-1.41.0.ebuild 766 BLAKE2B 82a738b6c9811cf69b160a052d8deabb3fbc1e637787c96b4834d7c549881c6f21b36974a7a7d45f994d5ef640769ae1e5f14fcdda6819711fe42aa7e86aaeab SHA512 4f6a4c48eadd103ab066fce1aaf2be943b0e11ba5e22fc22ad057de5dd2c710e2a03233ad9d17d0f9d46789e338bfc8ad3ee364ff99ad9c5292267ce4488e1cc
 EBUILD gitlab-cli-1.44.1.ebuild 767 BLAKE2B 8c3e8b2f4c1617b017c6ef7c5ae268a4adf9942391e842c58cb33dab451d524c11c5f63e1a64395bb021779f2cde5522d0cba936bc636cee903ae8f49fa70847 SHA512 60dd05ce01c09c092ac7ad2a289603b10867d61566abc639958aee7d04a00a83a4f9bef4de8fd01bd3a942c2301d2cea4e19fc0dd3d7cef1248bca70838617c5
 MISC metadata.xml 328 BLAKE2B c15cee65978853695fcc911a6beb02ac29f8e82d7a82417989e497a0c014a2c5c2c22503cf2c099600e0885399496d0e7ce3b3590c8b8cfa0f6ecc6a63988d46 SHA512 4df241882ef7e722711132110271b672ef49913a92e9d70972857968e7d12a8403f5b19b5079fd78f3f08fb4aab8e615b51a6073db2c460aa2ae3ec31d8e3a28
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.28.1.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.28.1.ebuild
deleted file mode 100644
index bac5430a1390..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.28.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=815d2622473028a14de7db77728a6d7cda467946
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.29.4.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.29.4.ebuild
deleted file mode 100644
index 10e6e59a82ab..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.29.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=654ae7c117d2d93fc4621b58a8cfb5388ba485a0
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.31.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.31.0.ebuild
deleted file mode 100644
index 0562e5401e38..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.31.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=1f8464b403a4611ef689a89893cb700718abdb20
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.32.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.32.0.ebuild
deleted file mode 100644
index 0ea07f8b73f6..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.32.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=9fdb6193c89e86786707279c16472632665f4918
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.35.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.35.0.ebuild
deleted file mode 100644
index d35e08bce252..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.35.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=3b9454da754254b4a72658f1de84bd3da70f8d67
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.36.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.36.0.ebuild
deleted file mode 100644
index ab6e8625f0f9..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.36.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=078e3f1dcb0cd48294f97ed2924b5149bc3874f6
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index 0c61e0baf917..dec5f04f0611 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -6,9 +6,9 @@ DIST gitlab-runner-17.1.1-deps.tar.xz 86652408 BLAKE2B 2dd00989f0b0cf3802ed8c018
 DIST gitlab-runner-17.1.1.tar.bz2 1373122 BLAKE2B 01763963374705f22d1a396785838aa4fdc3eb2a2343264824e4dda606fd190875b34f52e128fd581044fe83689d600c74bf42fedd1347e58dced044f1168462 SHA512 161661fecb415267bb580cba1fb6be12b6adc58a0a6a03e75f7ea8e3dc3f6ca6169ca90e202444e7923444cb17d5e3a7007aec526666ead8ee5c962c04228ce7
 DIST gitlab-runner-17.2.1-deps.tar.xz 86661500 BLAKE2B 96700ef116677e2fa0d2233475906563b54d7d422ff25612439f0b6530592e24f472b9645d4faff4dd2f98ea37d0f8ad1242ee7ef532a6d7204d582925a50ae3 SHA512 f40317a3d3e9c873c8ba486d6b4c82d233166fc175ed7f8e6563d8a217d80b806f730b4f22e5879568528035961a6fc120b87ce8e9ea2eb9232ba8623b7e407e
 DIST gitlab-runner-17.2.1.tar.bz2 1378845 BLAKE2B 649217da0c358e8db87758c72bd69897b1d9edd0b9e9d92c9a42ce7b39b5fa8bef7a07faf107584d90aae8ce292e0625b2a021294cd9b8cff73c02d086a5cda7 SHA512 3c14643da0884bc6bdf1eebfababb1ffa7d2ecf93ec1b0e708aef143b8a9519bc7d27fb6a3fdf6f6fb5b04511a8f1cfd9622c9c5db4365c879dc30c8a4d59cb6
-DIST gitlab-runner-17.3.0-deps.tar.xz 86640820 BLAKE2B e2775c0f370c4dc13053e11b07a0217e76066f760af4499a2c4a439b43d3a931f059b7f8db8a6f99de9776e30d17fc734b87f91295bd098cf51e833fd80dcb23 SHA512 8cfc550044316f7102f92bf207b677d802fd978fbd338c3ee946a2d2f2376aa029ddbe16a61774cbf08cb736c30cab47d1b861b66d76015cda2ca1167e31ba98
-DIST gitlab-runner-17.3.0.tar.bz2 1383866 BLAKE2B 3e13880ca06225834fd4050efd4225034ae865bfe3b80833e2910bf4a5b705795d5af424ce0736af1f8166f95939aa57e1123339336aa9e41404e58aa1060e05 SHA512 f2a9150045a09b2fd746c3ac69d94beabd664d613f9ee539821edfc0c069aa4368f62381ed8c499ddcabf6bb8c8ecde2d23f5e4a26d816f2dd319d76a50f75f0
+DIST gitlab-runner-17.3.1-deps.tar.xz 86653516 BLAKE2B e7ac6d3218528f5a33f727a3e27a435fc2cb676e36e952892e656122f9c9e986806a1023ce8b03e4bb07e5829b7595f8ebc8a184456fe5f067745b55d1550a8b SHA512 c28edf4af1e1cb0966eb45e2d1f3b7b0f1312892e20d2cf87321e29eacbdc37b4e6b3d92f02c7b8a4cd0b4f8fc3e85d58f6ce208e4650400547fd093efa84715
+DIST gitlab-runner-17.3.1.tar.bz2 1382824 BLAKE2B 58086f5964776ecc08d25c817e4460f5874f4b8def14aaab46f7e94157a2b801f42e0656c13190c3272fb43b3213ac253ed329563cf67e292a57f48d1fd0e7ce SHA512 67be67ed3e3c5136f6adad17c85080d6470f8a7082080fe7026609b42868de454dd1f8aa750087ecf23a02fdd1c2d00d7797638d0f9be070103574ea1a1c491b
 EBUILD gitlab-runner-17.1.1.ebuild 1679 BLAKE2B 9390458d7a75295551b2d388fd40d490ed78897b0b39e92f37bb23f0a6b15d637de1fdd17956ba04f52458bf6a5665735967043365a7ef15f457374b16c3823d SHA512 a3436df6f2d3c2a7aaedb93c74527e924252c844cb4ac6afcf6efc5cfdf9a443c6e3a959faef7b48c7115467ff9ecebee2dbbbd520015700b9e2b12b320a1194
 EBUILD gitlab-runner-17.2.1.ebuild 1679 BLAKE2B f1bf44ea5b70dbaa63ba5842650f0a73cfe37e0235f48afc411cae9bdef0e985f7f6ce2655b6f10dc83a6eadbccb8149a6d5ec06c2eb4a433356113923279b47 SHA512 656329e01389f97a8a6af6c29da086b866c2f1b20140084321f853e510fe83c45226d3f894fb14605f274db8ea2d88333d2ebff93c46952a8448a291c16c3928
-EBUILD gitlab-runner-17.3.0.ebuild 1679 BLAKE2B 76ee69355c7e883b0b8ae79719c26a7933560db44c2a6395f3f44e3b9b17d346c49151ca169d734991dca90b3a222d6ff0bdb4b453bf34fcab0b46b5f520139f SHA512 1982eaf368c4cd95f42a6567cd1e58562dfa83635e16a53607ee2234d94d1a980a8fab7eebe5dbabb352ea6dd1aa13717e7b1c3e58ec345d849b7513f0c08bdb
+EBUILD gitlab-runner-17.3.1.ebuild 1679 BLAKE2B 84c832ae8e4dbec721fead3ac4765f6007df518062ef8309cbf42b8351ac5cc453cd28f70954d36ca8f60314e37ea272f351785d76fbd8284f1d28fb9463f19e SHA512 e1893ae44e0d9cd5f1af1f87dbb29dc48f1c280f7bc20976e799d03d5df3a4433320e0cd9502d40ea861a0a872833183044672ae00cd3dc18f339dec61195629
 MISC metadata.xml 338 BLAKE2B dfdcaaee18d3e5492674d3b4055002201342fa4d5b713f88240753002de2bde6244469fe42fe514cb82544d15deacd235cd031dcf71d661a24b26f422c67c392 SHA512 b12a8270df4f07c6b4359150a3b7341d3913a93598153824ec758384758e69667a89de20066735ccc24aea7af07b5c1bdd444fca3193be5402bce5154f90ec79
diff --git a/dev-util/gitlab-runner/gitlab-runner-17.3.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-17.3.1.ebuild
index d4d56e244f0e..7edbd2cdc811 100644
--- a/dev-util/gitlab-runner/gitlab-runner-17.3.0.ebuild
+++ b/dev-util/gitlab-runner/gitlab-runner-17.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 inherit go-module systemd tmpfiles
 
 # make sure this gets updated for every bump
-GIT_COMMIT=071ba93d
+GIT_COMMIT=66269445
 
 DESCRIPTION="The official GitLab Runner, written in Go"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 950769757178..074e71f5a214 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -2,6 +2,6 @@ AUX glslang-1.3.283.0-gcc15.patch 804 BLAKE2B 213603cd66e19c02691964b30ac53de71f
 DIST glslang-1.3.283.0.tar.gz 3846095 BLAKE2B 9a5f7c80671ab391d72d1e924f92bfdb850611e594c170365927c4b06adc596fc788d2f365f43fa2ca5ad54dbde7206c6a137dbb4b2875afced6b0dc64331273 SHA512 297fb9c91d17c80d0f6a9812a2c785179ad58ebff2d12d5c57f7d4d2c37bab96a31656f430b97914c39d0c23e21f96718fd13437233a40d80bd4e001579facda
 DIST glslang-1.3.290.0.tar.gz 3854382 BLAKE2B 02f781c318fe8ec47dae646c45ec6567e7cdd266ca8f8cacfd165fe29b5cd37b4d44f8b7b46d4b0175b2cb63ddc29d20652b27a78194c3922441744b45e5a8b3 SHA512 1dbea2d90864c02e4cd95eef0577bc7954a10608dffb19e49f803195153d082e67e71da4ba673dcd857d3c8e12628a9504385eaa3241f3f06c4de12cbdb3dc1e
 EBUILD glslang-1.3.283.0.ebuild 1115 BLAKE2B 5c22816e35aa6b8c837a318f5069ad21dc24937e4a550fabb6198823b8c0238429f222ed856bb166ee37287fdb5369ac4d48602683d9a53cbf576de8f67dae85 SHA512 f2cff2d29e015f555b50ebb146c8abf578eac4013d28ab9fe296868f0535bba830e7198e63cb80c22db20c1c957c50eef7a88a87c5bc253eb894bb7ad6a3837c
-EBUILD glslang-1.3.290.0.ebuild 1121 BLAKE2B e26fe22c6522598a5148170ab8a66737dc725efaf925e8f57eacf392c6d09c2f8235e34ff2f266f8d74a0a16bb497153e741f630f797f80ae9588349f4272994 SHA512 48d43055072f2cd53048a439322db20bdac79b1700147a8fdd48f1848a4e4355fbe40fb5b183f3c61157c800d810fa382b83ec2a344dca8833a6e351cfe9990a
+EBUILD glslang-1.3.290.0.ebuild 1118 BLAKE2B c3f6fcedc0d917b2cddd122d3331f1160a0b98c80e52ea92fa5c8eaae5221f5eb2e853a2955706998565b2a23e106f7027a5cf6fd9d045c12e373d1a763163c1 SHA512 768e3941d14e57a75ea5a21605e67164d0bbbc11e8fc4a4833afe67f685d446f714bdf6b4da4de7f4cbc08188c3e6f5947ade14d69f902cf375dd48a3244dbef
 EBUILD glslang-9999.ebuild 1065 BLAKE2B e79ae4cd9f63772df7e596efad9cab3545da780a67842cc5505054543082c7c8eec3ee3375cf504adc7bff74f3883f26a61f21d935ff47a071d2a065dd93a41b SHA512 3e9aa9a790ca8f90bf3555d568c658d9071d21879fa22d0cbde28e59d9eb3aa6aacf826dab60f9cae5592c725f88d566b6464d8216ae94c8b82eea05cb305fd2
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-1.3.290.0.ebuild b/dev-util/glslang/glslang-1.3.290.0.ebuild
index 17c757b7934a..d215b45b0d9c 100644
--- a/dev-util/glslang/glslang-1.3.290.0.ebuild
+++ b/dev-util/glslang/glslang-1.3.290.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	GIT_COMMIT="vulkan-sdk-${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
 fi
 
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 08f2a8ea6476..f71dc62d7236 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,5 +1,3 @@
-DIST mingw-w64-v11.0.1.tar.bz2 10057401 BLAKE2B 3222eed35522bf95a571b11dc52ea23153068b32497676dbb2837306ba52a78e6d1c9c44a4d64d314e64583b54f6fe86dcff3e467e101acf71cebb7d2a963963 SHA512 568702100bbbb11f7f9c9596dd70df3fb2577492459cf55da38691af1504b91127cb5f3eff268850dcbaa461fdc72e4e2379f7a576fd4a0e537ee1fe42531c01
 DIST mingw-w64-v12.0.0.tar.bz2 10474283 BLAKE2B 6500045f7d77f7de01dea0f4e03f3e4ddf6154586c5e3ee9718ee2c7ef1cc83ce3cbd644b6f1dc293ae6e0bfb55a6b68d439622bd1cfdefefc4cc547317f1943 SHA512 949b2bfab8763ab10ec4e9fdfdaf5361517a4ab787fb98ab419b38d02694061c2e821ebbf6e2e4b39d92bdf17419d116daa8e63afd9e01d11592f39df4da69d7
-EBUILD mingw64-runtime-11.0.1.ebuild 4662 BLAKE2B 35460f47ab5dd4258518e51e2f0d75b628b23dddb30d50468b20acd8cff0a78265173b6d1163471a30ddb9b48dab3034f4e46c07ee6fbc08354b3daf74c2f3a3 SHA512 f6a2df205d562c946fdb2c86828303e7365f0d31edf26926481cad0b5c1d47599a5a2fbafbd3ea91e341356d02a69eb8f1cf55ec52789ac1d97bcd8521a00f75
 EBUILD mingw64-runtime-12.0.0.ebuild 4820 BLAKE2B 7e8ffc483847fba669108cc61df8fafbf8f80ee7f7e7d2104c2ba9efe25f2f83439417730ae6b7041b812aeccf579bb28eb0f47c0a63c31b3d07fc76ed4b1ad2 SHA512 2a2b9a857386fd1ab48ba4499138fa96eef717e65dca50e0ae6fd83078b9402eb9474afbc346485c9525fc5f6bc484365576a524a5a4bb6e1649f5190f811d86
 MISC metadata.xml 904 BLAKE2B b7b42242ff7a39ba87ec4889295bb1229122bd20f34c163499423d989120569d5b6c69ed9490f328aa1af8a9dd3ff2ec0f07b85910e7d2eb401f40dbd670d366 SHA512 80bb5c58cf80d7233599e772a1e615ec4b4f16bd9387539a684d11e0b7196e7a3d21f1b56d18271b9a4b0544253e3fec4130ff70702ba4cf5684941ff8d49a51
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-11.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-11.0.1.ebuild
deleted file mode 100644
index 15f76259b1af..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-11.0.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit crossdev flag-o-matic toolchain-funcs
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="https://www.mingw-w64.org/"
-SRC_URI="https://downloads.sourceforge.net/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-S=${WORKDIR}/mingw-w64-v${PV}
-
-LICENSE="ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain tools? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# default-ucrt: enabling requires to be done during the bootstrap process
-# or else will cause e.g. undefined reference to __intrinsic_setjmpex
-# libraries: needs working stage2 compiler (bug #665512)
-IUSE="default-ucrt headers-only idl libraries tools"
-RESTRICT="strip" # portage would use the wrong strip executable
-
-pkg_setup() {
-	target_is_not_host && MW_CROSS=true || MW_CROSS=false
-	[[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] &&
-		die "Invalid configuration, please see: https://wiki.gentoo.org/wiki/Mingw"
-}
-
-mingw-foreach_tool() {
-	use !tools || use headers-only && return
-
-	local tool=widl
-	if use !amd64 && use !x86 && use !arm64 && use !arm; then
-		einfo "Skipping widl due to unsupported platform" #853250
-		tool=
-	fi
-
-	for tool in gendef genidl ${tool}; do
-		# not using top-level --with-tools given it skips widl
-		pushd mingw-w64-tools/${tool} >/dev/null || die
-		"${@}"
-		popd >/dev/null || die
-	done
-}
-
-src_configure() {
-	# native tools, see #644556
-	local toolsconf=()
-	# normally only widl is prefixed, but avoids clash with other targets
-	${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- )
-
-	mingw-foreach_tool econf "${toolsconf[@]}"
-
-	MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it
-
-	# likely cross-compiling from here, update toolchain variables
-	if ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]]; then
-		unset AR AS CC CPP CXX DLLTOOL LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
-		filter-flags '-fuse-ld=*'
-		filter-flags '-mfunction-return=thunk*' #878849
-	fi
-	local CHOST=${CTARGET}
-
-	# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
-	# strip-unsupported-flags miss these during compile-only tests
-	# (primarily done for 23.0 profiles' -z, not full coverage)
-	filter-flags '-Wl,-z,*'
-
-	# -mavx with mingw-gcc has a history of obscure issues and
-	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-	# crashes with -march=skylake >=wine-8.10, similar issues with
-	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-	tc-is-gcc && append-flags -mno-avx
-
-	strip-unsupported-flags
-
-	# Normally mingw64 does not use dynamic linker, but at configure time it
-	# uses LDFLAGS. When -Wl,--hash-style=gnu is passed __CTORS_LIST__ /
-	# __DTORS_LIST__ is misdetected for target and binaries crash at shutdown.
-	# Note: typically also stripped by strip-unsupported-flags, but not during
-	# USE=headers-only and potentially other configurations (kept as safety).
-	filter-ldflags '-Wl,--hash-style=*'
-
-	local prefix=${EPREFIX}/usr
-	${MW_CROSS} && prefix+=/${CTARGET}/usr
-
-	local conf=(
-		--prefix="${prefix}"
-		--libdir="${prefix}"/lib
-		$(use_with !headers-only crt)
-		$(usev default-ucrt --with-default-msvcrt=ucrt)
-
-		# By default configure tries to set --sysroot=${prefix}. We disable
-		# this behaviour with --with-sysroot=no to use gcc's sysroot default.
-		# That way we can cross-build mingw64-runtime with cross-emerge.
-		--with-sysroot=no
-	)
-
-	if use !headers-only; then
-		conf+=(
-			$(use_enable idl)
-			$(use_with libraries)
-		)
-
-		# prefer tuple to determine if should do 32 or 64bits, but fall
-		# back to cpp test if missing (bug #584858, see also #840662)
-		local b32=true
-		case ${CHOST} in
-			x86_64-*) b32=false;;
-			i*86-*) ;;
-			*) [[ $($(tc-getCPP) -dM - <<<'') =~ __MINGW64__ ]] && b32=false;;
-		esac
-		${b32} &&
-			conf+=( --enable-lib32 --disable-lib64 ) ||
-			conf+=( --disable-lib32 --enable-lib64 )
-
-		# prepare temporary headers install to build against same-version
-		mkdir ../headers || die
-		pushd ../headers >/dev/null || die
-		ECONF_SOURCE=${S} econf --prefix="${T}"/root --without-crt
-		popd >/dev/null || die
-
-		append-cppflags "-I${T}/root/include"
-	fi
-
-	econf "${conf[@]}"
-}
-
-src_compile() {
-	use headers-only || emake -C ../headers install
-	emake
-	mingw-foreach_tool emake LDFLAGS="${MW_LDFLAGS}"
-}
-
-src_install() {
-	default
-
-	mingw-foreach_tool emake DESTDIR="${D}" install
-
-	if ${MW_CROSS}; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	rm -r -- "${ED}"/usr/share || die
-}
diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index 92ab3c0162d2..9943a707c2ee 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -1,12 +1,8 @@
 AUX gcc-12.2.0-drop-cflags-sed.patch 1077 BLAKE2B 4e0ff834cbfd4597c67d9adf2e287f2e40b746a6a6b31c52b95ab4b20292aad1931a1f64ffabd2bef611af85b643718e5a4a280d1e3b54e0a9f73b086d0dc39e SHA512 35647183fdf82bc179d94504d22a5e00a955121e888b5419a0033b7723a7e385c196096c64bf9ed59ad2c72188cb4792049ce423b226bfeb40ed379c355b91b8
 AUX gcc-13.2.0-libcxx-17.patch 1158 BLAKE2B c6ea274e12b06ee9c806b6790cdaffc3bafeb555ba4487f1903a129af4329e1c80e23cfe69924acb7fbf2c0ab3f3acbad49f17436da2c8a0e364388ce8589ffa SHA512 d87824ed42aa797265cb41b93a86d01bb373730156e5f98109a6c9f7519da7c39f9c97b14bd47e0f90febd505bb029e3356a04b8911fbd6b590be06cea1aee10
 AUX gcc-14.1.0-no-omit-fp-ice.patch 595 BLAKE2B 543c4c4288f305f68eeba1df0d8e11b1539fbd063f0f9feac8f1731de50950f6b454ed90aecfe2efa854b1de3dda994ce1c31bdd443dd6f2d09f033775fe57a7 SHA512 30e48a0bf4fe5c40f2296307f2f16a80a42153fe2fc9a11516cab468cf3d9bccae7b66b8081837cc6f4b119fb3aeff36bc955ea6d24e2fe4f8e70180ce1a088a
-DIST binutils-2.41.tar.xz 26765692 BLAKE2B 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75 SHA512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374
 DIST binutils-2.42.tar.xz 27567160 BLAKE2B e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1 SHA512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6
-DIST gcc-13.2.0.tar.xz 87858592 BLAKE2B 0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2 SHA512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2
 DIST gcc-14.1.0.tar.xz 92265736 BLAKE2B 7efd6574b8bca081de6e31480ec0565c6d7fb773383e8e1fdcc17e35bba2bf44b3f4f995cdbcccd001689926e96a6563ef3d099902fe3b37ab09dcf553ab0596 SHA512 e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea
-DIST mingw-w64-v11.0.0.tar.bz2 10058657 BLAKE2B 3f7637bcc7c3f25b2141d35105ea086eab74e228d7275725ffb4f07e283fd75169dbe0900a9c29494fba9ddb2ea03bdd6ae26f06048311e9c93ae3e317c4c060 SHA512 bc1c9fd9d8593ead9375fcbe40950f06cf7616b94dc676db2793ac9b496fe3a6cc94b5793effda3b752942be0d7d01a1c37a8f221aaf178df0d4eeb0aa6d1f8d
 DIST mingw-w64-v12.0.0.tar.bz2 10474283 BLAKE2B 6500045f7d77f7de01dea0f4e03f3e4ddf6154586c5e3ee9718ee2c7ef1cc83ce3cbd644b6f1dc293ae6e0bfb55a6b68d439622bd1cfdefefc4cc547317f1943 SHA512 949b2bfab8763ab10ec4e9fdfdaf5361517a4ab787fb98ab419b38d02694061c2e821ebbf6e2e4b39d92bdf17419d116daa8e63afd9e01d11592f39df4da69d7
-EBUILD mingw64-toolchain-11.0.0_p2.ebuild 10880 BLAKE2B b5f3771c437e07243a53c097a0d032ae480879c52884459613b9c8e36e021c1156c54470a8312437cdcc5e7c4555968abecdaea7ca00b8616af51fed2e71ae52 SHA512 93fe213774132ea102b69b97926e2f3848fd362f7884ea632d9026e60b5cb0fbb6c3669d8a43234f6d3e748e7316be5141a93c1ad5520782a9b2eec426224193
 EBUILD mingw64-toolchain-12.0.0.ebuild 11832 BLAKE2B 9cfde2c04e42c506c07a13d53b331641fe10c648e0e9465bd56832e71cb1a8fa55ecd6bc60df3c02f117e9e3a5e991169e7885b740576a77ff6d7796257b5c03 SHA512 87e441a532babb56a4bffa69183b3914aa601eb12e5cd76c69999ca0b117c9a22430d030a146b0f39b16be47d8bea6f9f6bfe8bdc9eef36220f39ff9362bd09a
 MISC metadata.xml 639 BLAKE2B 40e8fb879c8f26b7ba49bf453f242fbfd2a7950a0ec07f41945172a97ae77bdcf3ddfda741c6cf9f436efc42e9f5e72ccef67b408f62ea41335383eab76761f9 SHA512 280133ff26c17f4195635d3ab124a60d73bec1a2d841c91d89821dab18058381d30c4661f621c586ba4af31955cd902f1ef042301e04ff056ce20d0c45b7c4eb
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild
deleted file mode 100644
index 1e512377b27b..000000000000
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit edo flag-o-matic multilib-build toolchain-funcs
-
-# Pick versions known to work for wine+dxvk, and avoid too frequent updates
-# due to slow rebuilds. Do _p1++ rather than revbump on changes (not using
-# Gentoo patchsets for simplicity, their changes are mostly unneeded here).
-BINUTILS_PV=2.41
-GCC_PV=13.2.0
-MINGW_PV=$(ver_cut 1-3)
-
-DESCRIPTION="All-in-one mingw64 toolchain intended for building Wine without crossdev"
-HOMEPAGE="
-	https://www.mingw-w64.org/
-	https://gcc.gnu.org/
-	https://sourceware.org/binutils/
-"
-SRC_URI="
-	https://downloads.sourceforge.net/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${MINGW_PV}.tar.bz2
-	mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz
-"
-if [[ ${GCC_PV} == *-* ]]; then
-	SRC_URI+=" mirror://gcc/snapshots/${GCC_PV}/gcc-${GCC_PV}.tar.xz"
-else
-	SRC_URI+="
-		mirror://gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
-		mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
-	"
-fi
-S="${WORKDIR}"
-
-# l1:binutils+gcc, l2:gcc(libraries), l3:mingw64-runtime
-LICENSE="
-	GPL-3+
-	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
-	ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain
-"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="+abi_x86_32 custom-cflags debug"
-
-RDEPEND="
-	dev-libs/gmp:=
-	dev-libs/mpc:=
-	dev-libs/mpfr:=
-	sys-libs/zlib:=
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	strerror_r # libstdc++ test using -Wimplicit+error
-)
-
-PATCHES=(
-	"${FILESDIR}"/gcc-12.2.0-drop-cflags-sed.patch
-	"${FILESDIR}"/gcc-13.2.0-libcxx-17.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	tc-is-cross-compiler &&
-		die "cross-compilation of the toolchain itself is unsupported"
-}
-
-src_prepare() {
-	# rename directories to simplify both patching and the ebuild
-	mv binutils{-${BINUTILS_PV},} || die
-	mv gcc{-${GCC_PV},} || die
-	mv mingw-w64-v${MINGW_PV} mingw64 || die
-
-	default
-}
-
-src_compile() {
-	# not great but do everything in src_compile given bootstrapping
-	# process needs to be done in steps of configure+compile+install
-	# (done modular to have most package-specific things in one place)
-
-	CTARGET=$(usex x86 i686 x86_64)-w64-mingw32
-
-	MWT_D=${T}/root # moved to ${D} in src_install
-	local mwtdir=/usr/lib/${PN}
-	local prefix=${EPREFIX}${mwtdir}
-	local sysroot=${MWT_D}${prefix}
-	local -x PATH=${sysroot}/bin:${PATH}
-
-	filter-lto # requires setting up, and may be messy with mingw static libs
-	use custom-cflags || strip-flags # fancy flags are not realistic here
-
-	local multilib=false
-	use abi_x86_32 && use abi_x86_64 && multilib=true
-
-	# global configure flags
-	local conf=(
-		--build=${CBUILD:-${CHOST}}
-		--target=${CTARGET}
-		--{doc,info,man}dir=/.skip # let the real binutils+gcc handle docs
-		MAKEINFO=: #922230
-	)
-
-	# binutils
-	local conf_binutils=(
-		--prefix="${prefix}"
-		--host=${CHOST}
-		--disable-cet
-		--disable-default-execstack
-		--disable-nls
-		--disable-shared
-		--with-system-zlib
-		--without-debuginfod
-		--without-msgpack
-		--without-zstd
-	)
-	mwt-binutils() {
-		# symlink gcc's lto plugin for AR (bug #854516)
-		ln -s ../../libexec/gcc/${CTARGET}/${GCC_PV%%[.-]*}/liblto_plugin.so \
-			"${sysroot}"/lib/bfd-plugins || die
-	}
-
-	# gcc (minimal -- if need more, disable only in stage1 / enable in stage3)
-	local conf_gcc=(
-		--prefix="${prefix}"
-		--host=${CHOST}
-		--disable-bootstrap
-		--disable-cet
-		--disable-gcov #843989
-		--disable-gomp
-		--disable-libquadmath
-		--disable-libsanitizer
-		--disable-libssp
-		--disable-libvtv
-		--disable-shared
-		--disable-werror
-		--with-gcc-major-version-only
-		--with-system-zlib
-		--without-isl
-		--without-zstd
-	)
-	${multilib} || conf_gcc+=( --disable-multilib )
-	# libstdc++ may misdetect sys/sdt.h on systemtap-enabled system and fail
-	# (not passed in conf_gcc above given it is lost in sub-configure calls)
-	local -x glibcxx_cv_sys_sdt_h=no
-
-	local conf_gcc_stage1=(
-		--enable-languages=c
-		--disable-libatomic
-		--with-sysroot="${sysroot}"
-	)
-	local -n conf_gcc_stage2=conf_gcc_stage1
-
-	local conf_gcc_stage3=(
-		--enable-languages=c,c++
-		--enable-threads=posix # needs stage3, and is required for dxvk/vkd3d
-		--with-sysroot="${prefix}"
-		--with-build-sysroot="${sysroot}"
-	)
-
-	# mingw64-runtime (split in several parts, 3 needed for gcc stages)
-	local conf_mingw64=(
-		--prefix="${prefix}"/${CTARGET}
-		--host=${CTARGET}
-		--with-sysroot=no
-		--without-{crt,headers}
-
-		# mingw .dll aren't used by wine and packages wouldn't find them
-		# at runtime, use crossdev if need dll and proper search paths
-		--disable-shared
-	)
-
-	local conf_mingw64_headers=(
-		--enable-idl
-		--with-headers
-	)
-	mwt-mingw64_headers() { ln -s ${CTARGET} "${sysroot}"/mingw || die; } #419601
-
-	local conf_mingw64_runtime=( --with-crt )
-	${multilib} ||
-		conf_mingw64_runtime+=( $(usex x86 --disable-lib64 --disable-lib32 ) )
-
-	local conf_mingw64_libraries=( --with-libraries )
-	local conf_mingw64_libraries32=(
-		--libdir="${prefix}"/${CTARGET}/lib32
-		--with-libraries
-		CC="${CTARGET}-gcc -m32"
-		RCFLAGS="--target=pe-i386 ${RCFLAGS}"
-	)
-
-	# mingw64-runtime's idl compiler (useful not to depend on wine for widl)
-	local conf_widl=( --prefix="${prefix}" )
-
-	# mwt-build [-x] <path/package-name> [stage-name]
-	# -> ./configure && make && make install && mwt-package() && mwt-package_stage()
-	# passes conf, conf_package, and conf_package_stage arrays to configure, and
-	# users can add options through environment with e.g.
-	#	MWT_BINUTILS_CONF="--some-option"
-	#	MWT_GCC_STAGE1_CONF="--some-gcc-stage1-only-option"
-	#	MWT_WIDL_CONF="--some-other-option"
-	#	EXTRA_ECONF="--global-option" (generic naming for if not reading this)
-	mwt-build() {
-		if [[ ${1} == -x ]]; then
-			(
-				# cross-compiling, cleanup and let ./configure handle it
-				unset AR AS CC CPP CXX DLLTOOL LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
-				CHOST=${CTARGET}
-				filter-flags '-fuse-ld=*'
-				filter-flags '-mfunction-return=thunk*' #878849
-
-				# support for stack-protector is still new and experimental
-				# for mingw and issues can also be harder to debug + fix for
-				# upstreams using it, if feeling concerned about security
-				# would advise to either not use wine or at least contain it
-				use custom-cflags || filter-flags '-fstack-protector*' #931512
-
-				# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
-				# strip-unsupported-flags miss these during compile-only tests
-				# (primarily done for 23.0 profiles' -z, not full coverage)
-				filter-flags '-Wl,-z,*'
-
-				# -mavx with mingw-gcc has a history of obscure issues and
-				# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-				# crashes with -march=skylake >=wine-8.10, similar issues with
-				# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-				append-flags -mno-avx
-
-				strip-unsupported-flags
-				mwt-build "${@:2}"
-			)
-			return
-		fi
-
-		local id=${1##*/}
-		local build_dir=${WORKDIR}/${1}${2+_${2}}-build
-
-		# econf is not allowed in src_compile and its defaults are
-		# mostly unused here, so use configure directly
-		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
-
-		local -n conf_id=conf_${id} conf_id2=conf_${id}_${2}
-		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
-		[[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" )
-
-		local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF
-		conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} )
-
-		einfo "Building ${id}${2+ ${2}} in ${build_dir} ..."
-
-		mkdir -p "${build_dir}" || die
-		pushd "${build_dir}" >/dev/null || die
-
-		edo "${conf[@]}"
-		emake MAKEINFO=: V=1
-		# -j1 to match bug #906155, other packages may be fragile too
-		emake -j1 MAKEINFO=: V=1 DESTDIR="${MWT_D}" install
-
-		declare -f mwt-${id} >/dev/null && edo mwt-${id}
-		declare -f mwt-${id}_${2} >/dev/null && edo mwt-${id}_${2}
-
-		popd >/dev/null || die
-	}
-
-	# workaround race condition with out-of-source crt build (bug #879537)
-	mkdir -p mingw64_runtime-build/mingw-w64-crt/lib{32,64} || die
-
-	# build with same ordering that crossdev would do + stage3 for pthreads
-	mwt-build binutils
-	mwt-build mingw64 headers
-	mwt-build gcc stage1
-	mwt-build -x mingw64 runtime
-	mwt-build gcc stage2
-	${multilib} && mwt-build -x mingw64 libraries32
-	mwt-build -x mingw64 libraries
-	mwt-build gcc stage3
-	mwt-build mingw64/mingw-w64-tools/widl
-	# note: /could/ system-bootstrap if already installed, but gcc and
-	# libraries will use the system's older mingw64 headers/static-libs
-	# and make this potentially fragile without more workarounds/stages
-
-	if ${multilib}; then
-		# Like system's gcc, `x86_64-w64-mingw32-gcc -m32` can build for x86,
-		# but packages expect crossdev's i686-w64-mingw32-gcc which is the same
-		# just without 64bit support and would rather not build the toolchain
-		# twice. Dirty but wrap to allow simple interoperability with crossdev.
-		mwt-i686_wrapper() {
-			printf "#!/usr/bin/env sh\nexec \"${prefix}/bin/${bin}\" ${*} "'"${@}"\n' \
-				> ${bin32} || die
-			chmod +x ${bin32} || die
-		}
-		pushd "${sysroot}"/bin >/dev/null || die
-		local bin bin32
-		for bin in ${CTARGET}-*; do
-			bin32=${bin/x86_64-w64/i686-w64}
-			case ${bin#${CTARGET}-} in
-				as) mwt-i686_wrapper --32;;
-				cpp|gcc|gcc-${GCC_PV%%[.-]*}|g++|widl) mwt-i686_wrapper -m32;;
-				ld|ld.bfd) mwt-i686_wrapper -m i386pe;;
-				windres) mwt-i686_wrapper --target=pe-i386;;
-				*) ln -s ${bin} ${bin32} || die;;
-			esac
-		done
-		popd >/dev/null || die
-	fi
-
-	# portage doesn't know the right strip executable to use for CTARGET
-	# and it can lead to .a mangling, notably with 32bit (breaks toolchain)
-	dostrip -x ${mwtdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}}
-
-	# ... and instead do it here given this saves ~60MB
-	if use !debug; then
-		einfo "Stripping ${CTARGET} static libraries ..."
-		find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \
-			-exec ${CTARGET}-strip --strip-unneeded {} + || die
-	fi
-}
-
-src_install() {
-	mv "${MWT_D}${EPREFIX}"/* "${ED}" || die
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that this package is primarily intended for Wine and related"
-		elog "packages to depend on without needing a manual crossdev setup."
-		elog
-		elog "Settings are oriented only for what these need and simplicity."
-		elog "Use sys-devel/crossdev if need full toolchain/customization:"
-		elog "    https://wiki.gentoo.org/wiki/Mingw"
-		elog "    https://wiki.gentoo.org/wiki/Crossdev"
-	fi
-
-	local cross_gcc=cross-$(usex x86 i686 x86_64)-w64-mingw32/gcc
-	if has_version ${cross_gcc}; then
-		# encourage cleanup given users may not realize if switch by default
-		ewarn "${cross_gcc} is installed, note that ${PN}"
-		ewarn "is redundant with the *-w64-mingw32/{binutils,gcc,mingw64-runtime}"
-		ewarn "packages and optionally only one needs to be kept."
-	fi
-}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index efeff070e1ac..564ee7440097 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-headers-1.3.283.0.tar.gz 472294 BLAKE2B b3d567006c3c584e6ceb8b0f28be62ac9c98bd1ee24152ecf4d8916e5140e4653b7940d86471f22fb1852abe73a3dff2963ce30c6a8615d04c59a91e99430b8d SHA512 2bb52f532a8a07d6eaf7e348fc79e798511740e3f6b3fb2d1de8834335598f57555c638e07e906935e94a26a1f71704f5ca1dd0dcc8d099b2d722d217f9591fa
 DIST spirv-headers-1.3.290.0.tar.gz 521685 BLAKE2B f6179e8666a66c2f512153a3574ea252925020903739956f06eb24972ab5dc063dc19692b5c5eee96a3106db6bce652b625209cbcfd587ee73cd95a960ddffdd SHA512 d3328cd4ddf87d075afacfb7ada01dbd16a3ff39b831e9ebe4ce3c32af0ff0c8822811b0e0d273a54b4acaba29b63b099efcf0150424bd9074d24d04a9974d89
 EBUILD spirv-headers-1.3.283.0.ebuild 779 BLAKE2B cab82b4ec21fbfe852e435b5768f91ea8740686020dc423ce2c85a2097a03a2680c0f51b4696340f4de9905b42c7679a16440a8e1d025f753fc6e061e5d5562d SHA512 eac6f8a3f8af8d13905f1931b6cc634617c3629e00055186ce8367600eda0ab54fb7bfa0ed7b44bcac72beec0cfc341a8898e361e8beddddc41a03e98d532090
-EBUILD spirv-headers-1.3.290.0.ebuild 785 BLAKE2B a45fecc5ec273ddc5b54b608b4e34b16e7b415e7d8d89b60a617d94c476799fa4ebffb8b931f823d95657afd1c35e1271f48e6de71bb47b2d1df033c56d6251d SHA512 0b84d9d4afb589ddfabcd5106949810a55c0d0824e887a752a92603d7facf906df089762996806624c21ef702ec77caf57113dc9c82dd8401e0f3449d1888e0b
+EBUILD spirv-headers-1.3.290.0.ebuild 782 BLAKE2B c25b2a9c07615ecba870faadd4dafc70c3a68708e076dae486b588985816187ac2ff7e2fb4b37ca075a9b5c16d9068c73096ce4b5021d96f8e23fc541f071ddc SHA512 3379a299f7f87b53434c80f1fc915a9e945a789d2c874c9bda9174b92511896a9e88f4961b67b174597bb40b0e9a2026de8d11e89ddb1d98d7f578ba4809a799
 EBUILD spirv-headers-9999.ebuild 785 BLAKE2B a45fecc5ec273ddc5b54b608b4e34b16e7b415e7d8d89b60a617d94c476799fa4ebffb8b931f823d95657afd1c35e1271f48e6de71bb47b2d1df033c56d6251d SHA512 0b84d9d4afb589ddfabcd5106949810a55c0d0824e887a752a92603d7facf906df089762996806624c21ef702ec77caf57113dc9c82dd8401e0f3449d1888e0b
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.290.0.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.290.0.ebuild
index d0ba40d7e45e..a4ee8e8891f2 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.290.0.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.290.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 8ea12daf2452..7a4a2f7d6380 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-tools-1.3.283.0.tar.gz 3177854 BLAKE2B 385ee01d6559d84711c1ba1a0256ecb91472bdfce920560011678e042df1a921378b234812a446ce49d46697549f202309382d10d69b1e29e53d0394ebbd3f23 SHA512 45c521307c8df2d74bdf811a50ff37028a45a77f58dcac910924f3490dfe3f8e9dacace77dab989d8d261528cd0f0a8e36ca7627dda608b9b09afb2e374736e5
 DIST spirv-tools-1.3.290.0.tar.gz 3170780 BLAKE2B 37609534f77e411ffb90e2904e847b2baec80332b5f3d3d3fb6950d835f9526fb95778d4c903574cf8be142370a69cace50d2e69d41e2eccf5f74a764464c148 SHA512 d4e8440c0843fb084dde4a576b95442783ab8204670b199798bd87f754d77f3c258bb69ab1d4dd7859c1d2c681ed8813309c76c6f70b5a7d8d21b6a48ef63b67
 EBUILD spirv-tools-1.3.283.0.ebuild 1147 BLAKE2B c2204a99fcd4bf40da0f0386e32faf2393df4586e83e0db848a099f1dacb052538da626dd6457c1765a7379314879d16d437a46f3540fbc6e38f6d87f970a50f SHA512 e258bb7ae9a89b7d0ddb984f13ce244238e36c2dd0a480cc19980b0c5d15cabf0e67c9b895c40def8c985ca9b45cbe34038002466f5e31660d3448e8882ef319
-EBUILD spirv-tools-1.3.290.0.ebuild 1153 BLAKE2B e82b880ff4d815d41885a444aac1f4412d852f789556952bfde1bae0e13fbd9a8e3e0676de360070ad12f4591154eeba2ffe1fe5e331afc44f855bbd7c0368b4 SHA512 42f8dd7d74746f2fc22d615759b37da862ca93b85890235637dd544309d8de8e5dad058a65ca83f2b979112585df412635323944cd4d91f7427138356697b28b
+EBUILD spirv-tools-1.3.290.0.ebuild 1150 BLAKE2B 2cff5333f4f26f73484127778361030fc67819334c853dc6162daa935df4de6672b48ab586211bbd6a3330a48fd0001645be55abe6dd1b1defb35c3b698d15f5 SHA512 5094dfbbf550ac87a9b7c6c12afb48fec58ae7730d4e3c8788a2844b7a213d862a564537061654a146dc58e349855b80f150ae3ff52676feb9f23dfd82865ef2
 EBUILD spirv-tools-9999.ebuild 1153 BLAKE2B e82b880ff4d815d41885a444aac1f4412d852f789556952bfde1bae0e13fbd9a8e3e0676de360070ad12f4591154eeba2ffe1fe5e331afc44f855bbd7c0368b4 SHA512 42f8dd7d74746f2fc22d615759b37da862ca93b85890235637dd544309d8de8e5dad058a65ca83f2b979112585df412635323944cd4d91f7427138356697b28b
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.290.0.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.290.0.ebuild
index 8c5305b6b291..b6de7dea96cd 100644
--- a/dev-util/spirv-tools/spirv-tools-1.3.290.0.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.3.290.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="vulkan-sdk-${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/tbump/Manifest b/dev-util/tbump/Manifest
new file mode 100644
index 000000000000..cee6fb411587
--- /dev/null
+++ b/dev-util/tbump/Manifest
@@ -0,0 +1,3 @@
+DIST tbump-6.11.0.tar.gz 28642 BLAKE2B 2e45fbf1d3e824b0f63f79db0928895488fb06a657c85335235d9aede8576f12bc2e8be58006e2883fb8d639d63029decdc7377dfaeda5d87475e505a4a22fe2 SHA512 3bcd6d34dab2f323dba45dd29053da5a75b5ec9f88aad1d50a2dd1a1d43fe7200bc58742c56249dd167b12e9dc599783eba93adac52e7d87aaa2e7e74f43a532
+EBUILD tbump-6.11.0.ebuild 1016 BLAKE2B ba8a464c10bcf929998c03f3fadefb52d6d930e256477b2d431649ee02ac83683f0da2a0d9072a93e8403a28c565f481f050554c7aa33e9538125133fa0d0f63 SHA512 aebb0368260e000d7da6dcaf60627e843329a6e733a11f00ccf0163a4f0b2f0df9199fdf25e23e84408e9b555dd5e0298f8a3f2c8807e827d7907338a0800e4c
+MISC metadata.xml 555 BLAKE2B 605a19bbcf3288b89c7dd196a067d2be04ee1dcf3456405b15c7b9dd6c1f00afcb243014f1b41cbdbfd0c7137a6a993a06c84a2c0aecb76f0708ae9b37e1f1f6 SHA512 6c37e2bfa631281347f76f9ea89bd265ecc7e2364f1f5276ff3f2ef5ab8914483ab7914c2d4bf8d40ab247d466e0b3b620b49a85083f6c02920b072185d003c9
diff --git a/dev-util/tbump/metadata.xml b/dev-util/tbump/metadata.xml
new file mode 100644
index 000000000000..59e126ffa3be
--- /dev/null
+++ b/dev-util/tbump/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/your-tools/tbump/issues/</bugs-to>
+    <remote-id type="github">your-tools/tbump</remote-id>
+    <remote-id type="pypi">tbump</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/tbump/tbump-6.11.0.ebuild b/dev-util/tbump/tbump-6.11.0.ebuild
new file mode 100644
index 000000000000..b0ca5dc36fb9
--- /dev/null
+++ b/dev-util/tbump/tbump-6.11.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517="poetry"
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="tbump helps you bump the version of your project easily"
+HOMEPAGE="https://github.com/your-tools/tbump/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/your-tools/tbump.git"
+else
+	inherit pypi
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/cli-ui[${PYTHON_USEDEP}]
+	dev-python/schema[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+EPYTEST_DESELECT=(
+	"tbump/test/test_api.py"
+	"tbump/test/test_cli.py"
+	"tbump/test/test_file_bumper.py::test_file_bumper_preserve_endings"
+	"tbump/test/test_file_bumper.py::test_file_bumper_simple"
+	"tbump/test/test_git_bumper.py"
+	"tbump/test/test_hooks.py"
+	"tbump/test/test_init.py"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/volk/Manifest b/dev-util/volk/Manifest
index fe59f5197e34..20e868a213b8 100644
--- a/dev-util/volk/Manifest
+++ b/dev-util/volk/Manifest
@@ -1,6 +1,6 @@
 DIST volk-1.3.283.0.tar.gz 62563 BLAKE2B 08e7b1f442970a51b2a621e0eb0e0fc0b52a814aacfbb6e1bfbd670b9b1c2de043043620ac682e53bd1bde4436760cfa4ea32aadc5f24ab6631733e370ed57fd SHA512 c3c69bfd899bab6b6447534b0c7c82392679c903a5ed2cabd7506ccd96135f332735888f6e2fa71787f6c1eec930bd51aa014db84955d51b5f068af95dcaec4d
 DIST volk-1.3.290.0.tar.gz 62571 BLAKE2B be7495fa0b5509f10259842b5394a651a2b57eb6d607a04b69a43faac2ab10ccc259acbd8445970d12d4111362806b20bf9acc2459438ff15c903d3978f395d7 SHA512 1af3933ab18120ab9418282069ee5a1ba86e8333b6fb1cfc04c85132f9c54ba1d21bbd833fa9e35cfd08edf2867982f19c536c0744569c6a91b0be8b54986e09
 EBUILD volk-1.3.283.0.ebuild 806 BLAKE2B 5ff99f912d5d9381218c0bb0d5ef9c173df362aa70e703bb43c0a98ad8d42a5a369bef79bfad1235aa6424ecf3cfcf4a9b24760ba825e53d4feb34354459f340 SHA512 2ec2e4b82b891f60cbcacf48ae643bf66099c95e435fadc338c86cac5fb257d8bc2e9afec46bd64710a8c52a6d7ef327e9fcfefc305b17b3d2fc8a228dbccd58
-EBUILD volk-1.3.290.0.ebuild 811 BLAKE2B b3ed30b113af2be33ab08e6b84f36c994716f27298d20b13d9cab13104d09cb28ebf36b5595f41c99a3b1824875df07a82c8b96bca4fd0b3e9591a66880581b7 SHA512 788456d71718f59801cc526ca19a20e39626efb36274ab893b858f20d5f53aa00c46b136d0e36b55a00564e4bb7ccc9048ce62f1d523c50e4c3f749f0edf8416
+EBUILD volk-1.3.290.0.ebuild 809 BLAKE2B 0afa24d488a710011801b5481a28ee3f71834e58c102e525c8ec6ef07ba8be6bc95b855c960751cfdab979e55321e1b7f7fbc3a8d20a1c79a25bb30c46923eae SHA512 17ab1b2136e7db93ab99cad5b783c5f67b44b9c9f2d4a9cea08ad2ccf0af95746d88500d4e72f16b9229b47f8366376138d2ab0b8facb3a5e2666e6f8c3a7687
 EBUILD volk-9999.ebuild 811 BLAKE2B b3ed30b113af2be33ab08e6b84f36c994716f27298d20b13d9cab13104d09cb28ebf36b5595f41c99a3b1824875df07a82c8b96bca4fd0b3e9591a66880581b7 SHA512 788456d71718f59801cc526ca19a20e39626efb36274ab893b858f20d5f53aa00c46b136d0e36b55a00564e4bb7ccc9048ce62f1d523c50e4c3f749f0edf8416
 MISC metadata.xml 414 BLAKE2B 90b89b8f8cbc812c68d865df6379c29414f3a329ab31c5e56869d585570125835ae0961dae037bde864562bbb2f78736f0e023a3fad5757690b27d382ca7c7bf SHA512 2add3d201004761e26d8a05f878f221f350daaa6c804fabb856ea423d7fd8ae5a8da49f23c7a402b49db9ec19096736a88b4faf1d6ec44bfc49d769d8ab2bb93
diff --git a/dev-util/volk/volk-1.3.290.0.ebuild b/dev-util/volk/volk-1.3.290.0.ebuild
index dfe258834e94..e60b36e0c518 100644
--- a/dev-util/volk/volk-1.3.290.0.ebuild
+++ b/dev-util/volk/volk-1.3.290.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="vulkan-sdk-${PV}"
 	SRC_URI="https://github.com/zeux/volk/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
 	S="${WORKDIR}"/${PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 4e7968cfbde1..3abaa77cc8ff 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-headers-1.3.283.0.tar.gz 2271561 BLAKE2B 3701754f9d40f4078da491713310d0c615ae0df494b793a8e9ab0db5930a73dfa7876de16d2a93a3e128c922bfceee7651cbda8e51603ff32c687cfa13d300f1 SHA512 317a8b6051da86822c67c110ab41dcc222822e5502391813618c6258ba08e50d8b047605e4567421f47b4bc82f2c1b396bc6d8f2f0a3e202dc164d6c8db96627
 DIST vulkan-headers-1.3.290.0.tar.gz 2284263 BLAKE2B d0013a88fd6336fcd191931952a44b543647f70b1b8b4fc656e271468e94b3aa1f12b7031aac9750cb2792c55f17b520a2c5c93920802449c2e7a1eb114361d7 SHA512 2bba1b9f3b97e22066ad89bce48a999dd253baf47ed3c76575777e7fc03199c67b1f8b301c1e152eaf4ce63351af9901bcea3a34f2d8cdcea81c25648bfb4706
 EBUILD vulkan-headers-1.3.283.0.ebuild 610 BLAKE2B 8d052a5d7de6a22ef9cf55324cd248b93f6d6e38a9c971179a6b050f446e97d7c610c4e709f8a2f30b1ac4e0e2aec7e758c7623d8fdaf92ec93c83cb86e78a54 SHA512 ad1b048e79fd3acf1ac6c80ba12956af781c32fc6afc3f3b9aee9690d487aa586fcc03c5186c628822d87236c0c989d74f9e9aa5b177a34ed9d69157616225df
-EBUILD vulkan-headers-1.3.290.0-r1.ebuild 720 BLAKE2B 76fbfa07703519b41c904cbbab451fb45cfc637c139010f60e81114d8f44f417e5a533f470f7dbb675f845e84cc6bf976310eedab47b1f054c506129d599bc77 SHA512 b77c4cf9b62b5483399a06adc086f5fb3cc16cf3988f2e122147c40f844827f17af157ef3c886a39e2ce5305185b2827db858f25596ba7802bb703e146688247
+EBUILD vulkan-headers-1.3.290.0-r1.ebuild 717 BLAKE2B bedcd7610e8c09e4a85a8a8ca91faba926cacb1a24faee7fd0d64f118cdead71ff42c7fac7eb6a2bfdb9e04b26a683326cce1f266309e265de32056ccfab7773 SHA512 6a416bb71154922f916bc2f2d58ef77c33744f3f91d9832225f11a7d203d2fc748fd30245c05318a0e31ae2fd5dc7f0eb6eed9365c27a258df9f0dfa200337a8
 EBUILD vulkan-headers-9999.ebuild 720 BLAKE2B 76fbfa07703519b41c904cbbab451fb45cfc637c139010f60e81114d8f44f417e5a533f470f7dbb675f845e84cc6bf976310eedab47b1f054c506129d599bc77 SHA512 b77c4cf9b62b5483399a06adc086f5fb3cc16cf3988f2e122147c40f844827f17af157ef3c886a39e2ce5305185b2827db858f25596ba7802bb703e146688247
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.290.0-r1.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.290.0-r1.ebuild
index 43831b775de1..d161cac1f880 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.290.0-r1.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.290.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index e0634ad244c8..ff62507597b0 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-tools-1.3.283.0.tar.gz 753022 BLAKE2B dbd636186d7674c954f8237e7943f3cb89d172f870d0771d84d5615caec3013f284700a2c07b33a74f12e310e9c1bdd50ef8e93f459b73ace318fb68f33c7503 SHA512 714e2ff89cbd4171dae5c5825b71210572571965ba86c68f38c1ea62c9ff512e1c0dc278c02786d45d3a775985b40e8c1bd47ab37d22668105fd2e09d7524656
 DIST vulkan-tools-1.3.290.0.tar.gz 754806 BLAKE2B 322763f930660b52ac1fd4b56f5b7cd133b49da7a5ecf4f6d36712029dfba44edaa61ab65eaf4f9771ec5e5fac159e8d30b46b0f057b3d9b61220e58dab07ff8 SHA512 e5f6daa12ba2e8098f939cc06e732efd89f616fd9babf00d2fb8b9a73671143961a4c5b84879a4f9c4a7312bb393874f065222602e3619db5ad7fb9f8b868422
 EBUILD vulkan-tools-1.3.283.0.ebuild 2067 BLAKE2B 3c9209c0d62c15724a711a426483b33938ce57661b79cc8434964d70fbaf0baec07c0bac572804ada6a8a8f1e8157efaf21d4f647e0aabf629285ebabff3041a SHA512 3ffe1e3ab44b872f9d7d0e2e3acf7e3acf9011cbb40649f8f473ca4631c71cc1ecf5968fa7403a0e1ad9a7f61b9cb7749a3823c52669ac8e47b1d06bac4ae155
-EBUILD vulkan-tools-1.3.290.0.ebuild 2072 BLAKE2B bb479503cd72cc680496635a6254675c0013334f119f9697bd2eaac1ee27a1ac423c4940f0d3841f332b2a5ad085a7e3d939a636111d6484de3ebe1fedf5b067 SHA512 3dfe92bb9b8bae8cc62518c6f1f7af5d88528aa01cb12e1c805a8e8d767a49e47722c29b3d695bc3fa0786700339c57f925e04efc2cc7bb547a65f835b697986
+EBUILD vulkan-tools-1.3.290.0.ebuild 2070 BLAKE2B a382f9c8488e3177ebc3117bf1372b385659368f00842512d211acc16ef429392719167494a6bcfc900377393d9f489afa2f02b0dc53e6fc025e92005c120966 SHA512 5ee2d8b0ce8f686ade6f53b3d38fd31d010f2eab8eaebab384e8d60bcda33ee055c4f5c34024a3983d5d8d1894c4168204c87b9f211606fbc08d8f987a976d92
 EBUILD vulkan-tools-9999.ebuild 2072 BLAKE2B bb479503cd72cc680496635a6254675c0013334f119f9697bd2eaac1ee27a1ac423c4940f0d3841f332b2a5ad085a7e3d939a636111d6484de3ebe1fedf5b067 SHA512 3dfe92bb9b8bae8cc62518c6f1f7af5d88528aa01cb12e1c805a8e8d767a49e47722c29b3d695bc3fa0786700339c57f925e04efc2cc7bb547a65f835b697986
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.290.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.290.0.ebuild
index 1c19288ef980..5ececf3ff04a 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.290.0.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.290.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
 	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
diff --git a/dev-util/vulkan-utility-libraries/Manifest b/dev-util/vulkan-utility-libraries/Manifest
index fc41ae739b00..623943a1669f 100644
--- a/dev-util/vulkan-utility-libraries/Manifest
+++ b/dev-util/vulkan-utility-libraries/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-utility-libraries-1.3.283.0.tar.gz 538236 BLAKE2B 2b3b24fee507b6687685414805759802046241473dd93d7cc21b74957d5db17f6823f3f9cbf532c42de141c7da44c258a08305e25e63622b87f0e5ca8c2d903b SHA512 5f9ca8b54a2da85f0096c5834d13829fe5675a8f2de1d7c10901a6539880b5215d22af3f000db7bdda3ea8ad9d5c6c83aa74486f299f5293cd65aa95da7523d7
 DIST vulkan-utility-libraries-1.3.290.0.tar.gz 542854 BLAKE2B 669cb85d05fff69aa14461feb84848ef3f1667e79fc740d20ed1209f58a8972aba547f9dedffce4e304c157d6fb8bd63e270c796d927c00729c5c5a62ed638b5 SHA512 73637d7fb511aa00b267d415e4bef780f8b3ffc206a6da4c3447472fbb3e358de6c1ea15601e4c951b6bfb49b736c2449d58dd257f2870388b5b3f9fd396dc62
 EBUILD vulkan-utility-libraries-1.3.283.0.ebuild 1061 BLAKE2B afa01f095afff189f3049dd761ef9602fcbeacba80df0385062a69c3f49864d736930e0a5b369539d0586d06802e2df1ea441968e020b09bfcb94a22e55fd364 SHA512 19eb092822dbe9e47b359144d5761a2cd9f72c8c49ed5c19de3f7ffc35f3221642e2aa6ec772eca1d8a41350a07e88b417ca8e86a9e7030df97ec6ff6a52e421
-EBUILD vulkan-utility-libraries-1.3.290.0.ebuild 1067 BLAKE2B 3129972e6413494e6d09548229480a604e3a688b3318848ef8385c86ba489b5e4c736a9a1c3266810094cc03345b422e5cb42171d967bd6b161f0a57a205a3fa SHA512 0ad154aa3bbc2a5e5c29477fa6c68d154861e231b728c37cea75314533d37205c136d6351224a586fb355030598a1064c79bc700de73ca1ff00c32ed3dd017c9
+EBUILD vulkan-utility-libraries-1.3.290.0.ebuild 1064 BLAKE2B 3af093a83cb4cb4e6a2c0cf0bab9d5bb0ff08bf73885a1955d17bfb91f724975511c9f514740b7fc80df54f7d96902a5acad9e3084579897b2b86c4c5bd2c9ed SHA512 e71dba65728bb3ee534b82a764a795ea54bfdf942710ea7e4504471ba454b2714a31ce4bd3485d94d62815e311fb07cf7d83aa7c896044928c342b6033654c58
 EBUILD vulkan-utility-libraries-9999.ebuild 1067 BLAKE2B 3129972e6413494e6d09548229480a604e3a688b3318848ef8385c86ba489b5e4c736a9a1c3266810094cc03345b422e5cb42171d967bd6b161f0a57a205a3fa SHA512 0ad154aa3bbc2a5e5c29477fa6c68d154861e231b728c37cea75314533d37205c136d6351224a586fb355030598a1064c79bc700de73ca1ff00c32ed3dd017c9
 MISC metadata.xml 442 BLAKE2B cd315d7e91cf05f2d05be32c171ef6145e818f9868d17886cc7b5a2cb5e5fb8d58961414f585b15ca6c9d989244c0004c366d022464bd3b3b70ea451a2b67c7d SHA512 3e059e27de852aa76dbfdcc3dac69f0f472f496c64e1ca2a9053799f090b9091800e397a92012b7e546fa8240702546a5ca0dd6b2be6cfee356f539e73439c94
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.290.0.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.290.0.ebuild
index 82dd22dc1006..118c2315c3cd 100644
--- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.290.0.ebuild
+++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.290.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="vulkan-sdk-${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi