gentoo auto-resync : 08:03:2025 - 01:47:44

33 files changed, 670 insertions, 1061 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 34879e51fc5d..709ee71455c9 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 4c7edef932ff..a10141edbf81 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -2,8 +2,10 @@ DIST diffoscope-284.tar.bz2 3149578 BLAKE2B 4969e394a32d076101d59c0ca730d4e3515e
 DIST diffoscope-285.tar.bz2 3151919 BLAKE2B ad7c20368f8d3747b8b092d8761d6596809e39ee6ba09115e15f3b6c32da7e3cc590eed5628fb07cfc1fcf2f3b56ee7a4c3fd920c413e7f9e7a0522dfc6c721c SHA512 4b2eb41ddfee687408377185fb0ff5e88d6956c09a4dfceceb7c136596a3b00192be949c141f16f47e90f58da2f9ee1f51cd020f688e1bd6048462f357f14a03
 DIST diffoscope-286.tar.bz2 3155046 BLAKE2B 20676f44d6722962aed53351c006a538d2ac1d20bb2f38edc6f4bbf0e09d28de80d72045db3f9c1ed95c3b3156f40f995962a8510e8c01e0c21900df9a335489 SHA512 42d47801f0dc6cf66f3261639040dd82c5fde73656ab1a33dad325383e4bc6351d03c7509661172c946f554136ea23bf9b6787ba736138461690e507097dc133
 DIST diffoscope-288.tar.bz2 3157674 BLAKE2B 546cf9cca9ca1f81470cfa347517054cc00a5195eb90b3aa72b6fdfde23e1385d4264f6c2c3b3c462a8ef4547fc136c6c758e240423deecb0689721057786bac SHA512 c93849f6bfa7173981b783e68114dfda44938629d5152ce67751b341ce3153c9dbc188dbf95c6d3bc69bfc3d303ab081db70ac37c5e30def3b364351ffd9d88b
+DIST diffoscope-289.tar.bz2 3157044 BLAKE2B bd7c705098857251883a4506d483e23c24c845ecc624e7487afc111e01a8aee710862abf0ea1638c9c2455812d4cf6a2f491e63bfa6389d4dc9ff053a30de30b SHA512 e47538aed4136ef0891d569a0723c45d294757592762f20281fe6061aa52a4f926f49e7e491cb0a746f6f60bc14834762d1de968879db49b8a9a3b0e01a1ffc6
 EBUILD diffoscope-284.ebuild 3937 BLAKE2B 38da064a3715a2c13b3a674416dc4ef91b39024e81ee13e01ff1ef788a988a5c946ec363df8d6b62cf11609a830c592e68c84a04f0f7d2fe9822e37c9d4be28d SHA512 97537df18723a72b2e91390bf7f4406b38b864ac695795597874686f360307841ea570a3d60ca11c94c0efe0fe13ec888699fe46d7fee21e639ef0674b4ce9c2
 EBUILD diffoscope-285.ebuild 3937 BLAKE2B 38da064a3715a2c13b3a674416dc4ef91b39024e81ee13e01ff1ef788a988a5c946ec363df8d6b62cf11609a830c592e68c84a04f0f7d2fe9822e37c9d4be28d SHA512 97537df18723a72b2e91390bf7f4406b38b864ac695795597874686f360307841ea570a3d60ca11c94c0efe0fe13ec888699fe46d7fee21e639ef0674b4ce9c2
 EBUILD diffoscope-286.ebuild 3937 BLAKE2B 38da064a3715a2c13b3a674416dc4ef91b39024e81ee13e01ff1ef788a988a5c946ec363df8d6b62cf11609a830c592e68c84a04f0f7d2fe9822e37c9d4be28d SHA512 97537df18723a72b2e91390bf7f4406b38b864ac695795597874686f360307841ea570a3d60ca11c94c0efe0fe13ec888699fe46d7fee21e639ef0674b4ce9c2
 EBUILD diffoscope-288.ebuild 3938 BLAKE2B 1fe168439f96d6c496b2ebcc7352b6d35a7d4f9348e86639e93825a15d7aaa1564f89ce67d58ec31848d64f19d8f48266b5b57c20f121d0a0f3bc2e8fab0a820 SHA512 a580e39916e09c66bb9d243347654cb69850d2feaf64e7144254b07be4a614bfec562e952bed52cec7d81fbf7f8406e9d72f5ab2d99f888655c8ed6552336e2e
+EBUILD diffoscope-289.ebuild 3938 BLAKE2B 1fe168439f96d6c496b2ebcc7352b6d35a7d4f9348e86639e93825a15d7aaa1564f89ce67d58ec31848d64f19d8f48266b5b57c20f121d0a0f3bc2e8fab0a820 SHA512 a580e39916e09c66bb9d243347654cb69850d2feaf64e7144254b07be4a614bfec562e952bed52cec7d81fbf7f8406e9d72f5ab2d99f888655c8ed6552336e2e
 MISC metadata.xml 2086 BLAKE2B 75fdcf3b9bb7b9dd6222f07a04a96b2166c9a819ca5c6358daf4451bf73951b443596e05548ebdc163338eafbc75574e47635b3920ee8125690a310bf5185cf2 SHA512 552933e0c0e9cf23a8f3435a2587c6738f26e5153d773a745159ab1623ad5f39ef5d2647368918b9fdb25d61aab6a02a860c0f815740c1b70c973aa0a48a11ce
diff --git a/dev-util/diffoscope/diffoscope-289.ebuild b/dev-util/diffoscope/diffoscope-289.ebuild
new file mode 100644
index 000000000000..6f5fc7ca5b80
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-289.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+# We could use pypi, but upstream provide distribution tarballs, so let's use those.
+# TODO: verify-sig
+SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
+
+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 )"
+
+RDEPEND="
+	|| (
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		sys-apps/file[python,${PYTHON_USEDEP}]
+	)
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/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-alternatives/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? ( llvm-core/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/pypdf[${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? ( virtual/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="
+	test? (
+		app-arch/p7zip
+		app-text/docx2txt
+		app-text/html2text
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)
+"
+
+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
+
+	# Fails on (unreleased) LLVM 16 with minor difference
+	#tests/comparators/test_macho.py::test_llvm_diff
+	#tests/comparators/test_elf.py::test_libmix_differences
+)
+
+distutils_enable_tests pytest
+
+src_test() {
+	case $(tc-get-ptr-size) in
+		4)
+			EPYTEST_IGNORE+=(
+				# Needs fixing in Perl itself (bug #934443)
+				tests/comparators/test_epub.py
+				tests/comparators/test_zip.py
+			)
+			;;
+		*)
+			;;
+	esac
+
+	distutils-r1_src_test
+}
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index 196299f24182..e382874e25c3 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,4 +1,4 @@
 DIST drone-cli-1.7.0-deps.tar.xz 48810472 BLAKE2B 540ff9887344ada33cb851b333ddf505504266109e04017a1bfc8fa0d2c6b4c65f45d4afc286f5b635d523d35b6b2c5fb2b94dbd1cd88bed3f44b009af68787a SHA512 1d8112db3460af58cd88c931fb1759c86affc43582103c4c60ef6d6314c3e35a26d21c1f757661851bd5f0b3e292c328265ec7ae166c305fd1718f8f39fde48b
 DIST drone-cli-1.7.0.tar.gz 59347 BLAKE2B b8c0e3b9beea5dfca6abe705470012238ec6cfc0a88ff5145bac98697c9904aed332bda4c9ccffd5287f3e20954a11b36b2a4f22a96ec62101a2e608a120c691 SHA512 d7345d05a15f7ac8f3fc8406652b5303f6139baca49bef9f1c5ed69a61bce44a5154d20ffd9451fbb4d27deb3a3fbeba3ce8bac6370e6b050d8c066648fb2ad0
-EBUILD drone-cli-1.7.0.ebuild 620 BLAKE2B 2a621f72eb6ea132b0f2eb6306c575c99105b6b141bc715882bb2ce8d96311e36df3551fbbc7cee60cb701a5b9af1afc8777947e85f3fb5f9ea0f8e1f53e5ac1 SHA512 c17bb71581ef2b64e2fdede490c963e34477ceaa3d08a9e1cbf9a67f973630870c2033802873d46fe1808715561f0286c8017c48f2af39e18a641c1d0b2d3b19
+EBUILD drone-cli-1.7.0.ebuild 687 BLAKE2B d1d2fee98c893b4c70a673ccf27a192882ca58fac9258cbdc9d34aa36632aeae8e8942875509383229cf185ab8a42b84e2677d35adab32b3fede45f3a6b48050 SHA512 c6227b83c52983e80713b58986999d06a40a965a0519b41737bdf114d8c7021ff62e8e49655feae211aa94b30fc1ccde8d2561cf9bdfbf34a4678fb55895abdd
 MISC metadata.xml 329 BLAKE2B a776dcbb6cd5143660d0e97649ff778445ce0ce0df09d5ef12c51392aebbb5e4f4a0f6dbb7a7b05bc26dc33ff75bfed60baba7ded7570d0514950a4d6c01c845 SHA512 75bf4e3bae846b0246736e13f99efdee4d912f729027aeb1611704c959a9888628d7688beed9c6ecbbb009a5d2cc9bbea7986337c7c42a819890a310aa8a8f73
diff --git a/dev-util/drone-cli/drone-cli-1.7.0.ebuild b/dev-util/drone-cli/drone-cli-1.7.0.ebuild
index c71e573f9e5d..14c1de892f83 100644
--- a/dev-util/drone-cli/drone-cli-1.7.0.ebuild
+++ b/dev-util/drone-cli/drone-cli-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,6 +11,8 @@ SRC_URI="https://github.com/drone/drone-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
 SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
+# Dependent licenses
+LICENSE+="  Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/dev-util/drone/Manifest b/dev-util/drone/Manifest
index f7e3cfc122b5..28918bd35174 100644
--- a/dev-util/drone/Manifest
+++ b/dev-util/drone/Manifest
@@ -3,5 +3,5 @@ AUX drone-server.initd 715 BLAKE2B 914d9924af3eb64c8159720f90ad2a20e4571621bba86
 AUX drone-server.service 464 BLAKE2B a05794e0fe7e90626dac887109e25d263fdb8ec4bbd1d84c94052505ff5d7c1c1bb48fd6c1b1a75c612439781f6f685a9c85decb19b46623c20b7efd05b25313 SHA512 053f0eb039b603f9a66087462f34a8ec12713d182edb7b17bcde6bec08e77a9dc989d8d5f6ffaa8069e18bb9515ac86208672d31178705da212a918b79c84c30
 DIST drone-2.18.0-deps.tar.xz 141105460 BLAKE2B 2256bdf1dbe4782aa034c529d16d0fe97bc69880b06238a185954a8d49cd5338cb24fee266265e67e7ea25933a3205eb590de65c83c52cbd3fc667f5fb7760bc SHA512 866748cc49660efad1ca925c25055986065735d3f1f46f5a6958634bd63797c73b02eddc8a1eccbcd8c55d49630d692cb258ee94b2cf8cb30c9adecaf6490a95
 DIST drone-2.18.0.tar.gz 316382 BLAKE2B a60e9302a61edb1536f696e588011a38976d1ba31f7eed5c2f1d49c30769acae2dec8072f7f930b5e492dd3329b08a35bad087907d0818a5c487b5b6c24cb798 SHA512 c738d338056dc5758f4d589749513b832de1b68b1e81fbd8214bd69acf7f1d53b89b960cabc246edc369c02bd8900a01925279992b845f37a4a11573960a5696
-EBUILD drone-2.18.0.ebuild 944 BLAKE2B 8112f6f88797c1556c364a3877bcfbb7d7212a1dddf99c707ef9a572826467ea6366c87f910c155d8635f8c443ad5139cb81b09be24b6474005a21526259615d SHA512 02a583b6acda48f423bc8af7ed89970d56478c283166f7a490beb3d7635516684c9ff3e74f4f0fb7354933ed45b69cff986d58dba679315346e13d2deb8bc535
+EBUILD drone-2.18.0.ebuild 1011 BLAKE2B edfbe2df4c33eed501c8a6a8396d00609582c137b7e88ed61cfaedb4c1cd3d238343b571536ba79592d355180ecafd05517e808ce1a3a43f3d53841804c48c7c SHA512 ec244c5ad3053c151b47043ba635f27703c7d1f995d50de5bca41293a397956ec4e11e2b6bb901c7c117e8f4376da3414609fdea317b350ab5b090f242628c88
 MISC metadata.xml 325 BLAKE2B e29cd5b14fa52fff0abf8af7b26de07cb75c917c4580488cf9bf90424ff740bad995e78fd32373456f217b79235d6a37c621d84e63ca7e3537c72be550854821 SHA512 54c42d3b2acb06d3215b1e09e0274dae6b33e7771f1184da22a0fe386d31282e6c7bdd297e4fa1f0e8812cd65d1d8a1ce955e45a658d726bceb8fc515cbd8f75
diff --git a/dev-util/drone/drone-2.18.0.ebuild b/dev-util/drone/drone-2.18.0.ebuild
index 6f45d08d86b7..f3ca2ef56b80 100644
--- a/dev-util/drone/drone-2.18.0.ebuild
+++ b/dev-util/drone/drone-2.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,6 +10,8 @@ SRC_URI="https://github.com/drone/drone/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
+# Dependent licenses
+LICENSE+="  Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index f95ba8581aca..c148b11a4a79 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -10,6 +10,7 @@ DIST glib-2.80.5.tar.xz 5538308 BLAKE2B 3f17ff85a85d20858b69c2dccc1e5d6ffd92661a
 DIST glib-2.82.2.tar.xz 5555528 BLAKE2B 930fa7816082e6ba4b7f394985840bb6abf4fe9a4451286cddd3cfc8a4f3d4e3b4f06f09fbb34486f6fd47d0b72363b06a280ccae62d061724a7a2e00734bc4c SHA512 d5b761ec0c088496f2f9e5767568076a30ff492c272f21133560689f4e6a177d403c78d71ef85da63de331152c4d1f27b65d3e927ebfaf0fb63592f66e564ea1
 DIST glib-2.82.4.tar.xz 5556896 BLAKE2B 62caecc7570b1639f6ddf1deb9debb6d3d6180b74f497f2fcace5ce65d6e28996555d51e5b4980f500bdc3f811b5b6214521b1170f553f2fa1fd240fd0eec835 SHA512 5df0b3c56fe6cf6c94019e29afb408174a5864cdb97cf58d5a12a0f83990b5c2004a49c8e3b0e195f5808874b5911a4a7b3d6aea8718aada1b40561e623cd08d
 DIST glib-2.82.5.tar.xz 5554704 BLAKE2B e7853034be1137f8b793483df9e9ce1465dd10a990eb9b3cb9ac76c9f8f86ccc6fda85645b04b35963b28c33e0f6c02df4f3d03e06cc278b8515e588d6bd05f6 SHA512 a6b035c32a42b9d6f4c031a29da405848002619654b58c9205f2f78dbb9698cd5866f31ab213adc04aa214d2c48840a9592c0a1e9201e6851ebd435635f393ae
+DIST glib-2.84.0.tar.xz 5613328 BLAKE2B a482076d6b0c82824179094974110dbd10d47fce93f84f4626d0d3dbea528602c41ac4a7ab8feedc3d7cc5e404ef8bef30c6c744b6f0f4f3a764644e28210e28 SHA512 72b85e30c535c5da7d8598d1cec02b1b481c467e612dbb396a0a64ad1d37cf2f1802c6fa576885c99cf8a22f4f0fc7dfdf42a3f32f7f40394f72db588fdbebb7
 EBUILD gdbus-codegen-2.76.4.ebuild 2199 BLAKE2B f6dfe234b7e848d93e31ead1edee8f23eba5f5ed95284e5c3f2c2b9c67cd04a89737588cd66ec4b781ef5b8fbd50dab9ff2a06273130b222d9dffc07bcb1bcb7 SHA512 ea9cd4be38cd66f8ba90ce9a4745bfedc802e1dfe786213a82fff4ca6cee922ea78239beb128983cfb8b793092b9dfff697ab75fa9ad9ae76e605b4114e326ec
 EBUILD gdbus-codegen-2.78.3.ebuild 2200 BLAKE2B 7fa665d83f2ca80bcce80525f60110c5f3edac6e69c095feb2d7203c3af070eb46f21b702a6941e74553ab44260c5031ce817b718ece7d36e247c314fa64e80c SHA512 805cc19d25bc5502524147f420568d5ae15effab84b64867010c8f8f88f416b4bd8962dcdb4a8bf682535503c9e09383a0274a679f08a392ba9a00c8329e503f
 EBUILD gdbus-codegen-2.78.4-r1.ebuild 2319 BLAKE2B 179bda419a320539012376c75cea5a4b0d9b437591c2c20c62f7790e4d50d2b5a174f84ae5aea5ca54c30250f13ea8b5109ff54b8d823ffb9ec20057dfe64d33 SHA512 7884764456e514de73b81d2f7dd2d5f726c5a0eb56b860def24122c028029aca773bcc9f5591b29b71d9cc64e44e7b8091fdc9c0d67b98cd00440b97c678ad67
@@ -19,4 +20,5 @@ EBUILD gdbus-codegen-2.80.5.ebuild 2222 BLAKE2B cd21d90e2beb5de166b3689391e22fc6
 EBUILD gdbus-codegen-2.82.2.ebuild 2229 BLAKE2B 116f4290f956298c41ed89052c7bcf72bb85b8218f366f62c68a742ad55771459525532f3f9d08a48d38bf7612bae39acfddef821c384e638e19440dd8490eff SHA512 ceaeaf5c7fff1efa4ff9a8e7d4f6069ac28e7f11f40e801f8f332fbfc41e73a9f5b48ee076cf69121e4ea38fd22903dacd208a5d75d502659112057209b5b26f
 EBUILD gdbus-codegen-2.82.4.ebuild 2229 BLAKE2B 116f4290f956298c41ed89052c7bcf72bb85b8218f366f62c68a742ad55771459525532f3f9d08a48d38bf7612bae39acfddef821c384e638e19440dd8490eff SHA512 ceaeaf5c7fff1efa4ff9a8e7d4f6069ac28e7f11f40e801f8f332fbfc41e73a9f5b48ee076cf69121e4ea38fd22903dacd208a5d75d502659112057209b5b26f
 EBUILD gdbus-codegen-2.82.5.ebuild 2229 BLAKE2B e4bc87fb5606f41378c669a7270815e60313a44d8d3d2f0c9c0edef14251f8ddd44891eb1928cca2f10e202dab742363e80fee8a61e9cd6bbcc6119c261fab56 SHA512 ed7970c103713a2b17b37b0f6685895693fcf1cb4e83a156cc0712f0146a9c40d59a06e23fc22ca7f1ba36583f20288d11b342bd79b22134cf52a4535df32a6b
+EBUILD gdbus-codegen-2.84.0.ebuild 2229 BLAKE2B e4bc87fb5606f41378c669a7270815e60313a44d8d3d2f0c9c0edef14251f8ddd44891eb1928cca2f10e202dab742363e80fee8a61e9cd6bbcc6119c261fab56 SHA512 ed7970c103713a2b17b37b0f6685895693fcf1cb4e83a156cc0712f0146a9c40d59a06e23fc22ca7f1ba36583f20288d11b342bd79b22134cf52a4535df32a6b
 MISC metadata.xml 345 BLAKE2B 91a0526be5ce32d4aa4ea0827c78b2d2d45beae9a8d467916448a0a6b5459fd457e44ac900182654826328b34d37999bedb3ade42e80db92312e50f34d940014 SHA512 b11e427345fab56c77cb1f4f96473645b69054012e86840e2ca7dab221cf55041a1add1dfabce155274acf18488ac79de8149d405213daf39b807f679d4ac752
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.84.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.84.0.ebuild
new file mode 100644
index 000000000000..ae6bdba2add7
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.84.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	>=dev-python/docutils-0.21.1
+"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	rst2man \
+		"${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.rst" \
+		"${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 0e93de6cc38c..606f3f0738e5 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -7,6 +7,7 @@ DIST glib-2.80.5.tar.xz 5538308 BLAKE2B 3f17ff85a85d20858b69c2dccc1e5d6ffd92661a
 DIST glib-2.82.2.tar.xz 5555528 BLAKE2B 930fa7816082e6ba4b7f394985840bb6abf4fe9a4451286cddd3cfc8a4f3d4e3b4f06f09fbb34486f6fd47d0b72363b06a280ccae62d061724a7a2e00734bc4c SHA512 d5b761ec0c088496f2f9e5767568076a30ff492c272f21133560689f4e6a177d403c78d71ef85da63de331152c4d1f27b65d3e927ebfaf0fb63592f66e564ea1
 DIST glib-2.82.4.tar.xz 5556896 BLAKE2B 62caecc7570b1639f6ddf1deb9debb6d3d6180b74f497f2fcace5ce65d6e28996555d51e5b4980f500bdc3f811b5b6214521b1170f553f2fa1fd240fd0eec835 SHA512 5df0b3c56fe6cf6c94019e29afb408174a5864cdb97cf58d5a12a0f83990b5c2004a49c8e3b0e195f5808874b5911a4a7b3d6aea8718aada1b40561e623cd08d
 DIST glib-2.82.5.tar.xz 5554704 BLAKE2B e7853034be1137f8b793483df9e9ce1465dd10a990eb9b3cb9ac76c9f8f86ccc6fda85645b04b35963b28c33e0f6c02df4f3d03e06cc278b8515e588d6bd05f6 SHA512 a6b035c32a42b9d6f4c031a29da405848002619654b58c9205f2f78dbb9698cd5866f31ab213adc04aa214d2c48840a9592c0a1e9201e6851ebd435635f393ae
+DIST glib-2.84.0.tar.xz 5613328 BLAKE2B a482076d6b0c82824179094974110dbd10d47fce93f84f4626d0d3dbea528602c41ac4a7ab8feedc3d7cc5e404ef8bef30c6c744b6f0f4f3a764644e28210e28 SHA512 72b85e30c535c5da7d8598d1cec02b1b481c467e612dbb396a0a64ad1d37cf2f1802c6fa576885c99cf8a22f4f0fc7dfdf42a3f32f7f40394f72db588fdbebb7
 EBUILD glib-utils-2.76.4.ebuild 2271 BLAKE2B 1b72586abcd0fbb9a86d3cdee1cff05e61e52e03bd1dfb5b1a3405dfedaaa57ef2b07883383ce2a374556f9452c65153ecd04ab90a880923c310f1d33e804145 SHA512 a7ac9adba3cb94e74f72135b20e3d28333a31ebbc6847b2b6f85b1a7753a32b2f96e3fb33efa3e6704e9e3408a4b84217a602cabd8e6727728145beeeb820d36
 EBUILD glib-utils-2.78.3.ebuild 2272 BLAKE2B f7f4bf1e65cf4a61669b654c1b331c13d9bfea15bf587efe13df07d57b15ecb9bc49e687694dd326ca5b809d49d6036e1791a57521b89b8aa655ee467a161de8 SHA512 ca4dfefec438e94d371b156d5b99bb693837a6b23781534d36dc833280d8df3da900e8b7b38b0a18a6bc2c098f16933854f47abf497797f4b7c316cd6feb2c18
 EBUILD glib-utils-2.78.4.ebuild 2273 BLAKE2B 6094320e6c1a2dfd9b8df2a67d6dcc7437a389efa75aa117ab571837ae0e0eec332a08e395e3d1c8200641ec0ddb7aa152529bd5754d41a07503234c3c228416 SHA512 b3aecea991fbca035d2301156b03368d7d5eff2d4d626a3bd2587399461a9ea6282e0bc29ac8ceab91ba289b25ebdadf258290a1d60f5067ddb6de9564ee30d1
@@ -16,4 +17,5 @@ EBUILD glib-utils-2.80.5.ebuild 1848 BLAKE2B bf0776e849151f90ffe000cc32bda53a702
 EBUILD glib-utils-2.82.2.ebuild 1855 BLAKE2B 12b626909a06fbbd57a43a43e7b37de0cb44faa0a2f486c1336784fa84f96b70569a80efa25866c3603c59e4b8feb338fddc7901684ce1796641f0b214cd2d43 SHA512 27187371dc208edce161be5e1af64e6c3e87b2831689a6af1cf1ede11f889ba20ce4255b56a669c2a096276de99c719b7ee50a6fb12807278dda6c0747a101c6
 EBUILD glib-utils-2.82.4.ebuild 1855 BLAKE2B 12b626909a06fbbd57a43a43e7b37de0cb44faa0a2f486c1336784fa84f96b70569a80efa25866c3603c59e4b8feb338fddc7901684ce1796641f0b214cd2d43 SHA512 27187371dc208edce161be5e1af64e6c3e87b2831689a6af1cf1ede11f889ba20ce4255b56a669c2a096276de99c719b7ee50a6fb12807278dda6c0747a101c6
 EBUILD glib-utils-2.82.5.ebuild 1855 BLAKE2B b042e936ace304619aafc7be11693a4c161f2df7a6c51345c13d0d1162f7f786e801f9959bf44832176f528e557d1f44ac6a93755a5bf1b9de2076e6df925473 SHA512 1963ef74b534b47306ecbb0bf90098b1098c59587c0ff952ab4861b6fcec7dd2b2b140835ab5956e881c98e4f0377f4734f3c46aa11e2c92f621715aa763222f
+EBUILD glib-utils-2.84.0.ebuild 1855 BLAKE2B b042e936ace304619aafc7be11693a4c161f2df7a6c51345c13d0d1162f7f786e801f9959bf44832176f528e557d1f44ac6a93755a5bf1b9de2076e6df925473 SHA512 1963ef74b534b47306ecbb0bf90098b1098c59587c0ff952ab4861b6fcec7dd2b2b140835ab5956e881c98e4f0377f4734f3c46aa11e2c92f621715aa763222f
 MISC metadata.xml 401 BLAKE2B bdf1884a4dcf8ab8362a86ed6559bb887c026bc315bd8cbfca0b5d8def8102636965da5af0f1871096704309a4a0919028d02f168a91830aa4ed911c6583d103 SHA512 2eaaccd9c6bd6e059b3acf34c964857a9e541f2eedd191c0fa35eca3499242349184ab01becca40791ac1dcdf02ba4a75369ea9c69fa5c21f15d878b1c28c453
diff --git a/dev-util/glib-utils/glib-utils-2.84.0.ebuild b/dev-util/glib-utils/glib-utils-2.84.0.ebuild
new file mode 100644
index 000000000000..8b1ce3fe2794
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.84.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-python/docutils-0.21.1
+"
+
+src_configure() { :; }
+
+do_rst2man_command() {
+	rst2man \
+		--syntax-highlight=none \
+		"${1}" "${2}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_rst2man_command docs/reference/gobject/glib-genmarshal.rst docs/reference/gobject/glib-genmarshal.1
+	do_rst2man_command docs/reference/gobject/glib-mkenums.rst docs/reference/gobject/glib-mkenums.1
+	do_rst2man_command docs/reference/glib/gtester-report.rst docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 0b979e5e492b..a286fb238bd4 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,4 +1,4 @@
-DIST idea-community-2024.3.4-aarch64.tar.gz 991848711 BLAKE2B be42a1c5e4e097e606dbb8b55eb6ecb905e1f6dc2836d3eede762888d0d4696ae1ffe2112be6a4412938d0a7e755076510e548fa452df669019f1fc4ea875e75 SHA512 ee4086e1d232593a16f8a85f3ccabc803394f1a36898a9c295d0c12c8fb864c27768a21cd245ecf88a1e12029cff9665d6ebbfa97aabda1eccc10b85f72d79bc
-DIST idea-community-2024.3.4-amd64.tar.gz 991962918 BLAKE2B e8d8f3cb9ee7ae11b1354def2419ade686f69c574a120c306f84009b99ac89b1408c0595dc004f7fb1c6aedb25c7aa12454f08e59db36b7f7df5c2c0b8c5d24a SHA512 4bc6414a863ec5c6594f501b3419e80f0c0358ccca45147f94031f19ffb1a10c167a7a3b70cc8822867e1d732491ad764bf71db72574c286ac3745c91e2c6190
-EBUILD idea-community-2024.3.4.ebuild 5111 BLAKE2B c3b661aa268f2970cc9a4a11d59f9b09b693a0516ebf24230663ef7032f68504f5544606fff040e3b961c74560920bf57045fa8dccdfa0c257697c5b3527aae2 SHA512 3ad3d8af73e22ecf9fc8cdba945f89fd846dcf1a4231710c1d44618965fb59289a2f530c1b1c75a8c71454088127df1e34322bf4b30b4e3623ce02fb3ec11b15
+DIST idea-community-2024.3.4.1-aarch64.tar.gz 991760984 BLAKE2B f079761c70ea26e95f59f7ead9c210c9d42e4c2d5ebef0fe1e8012d65f4e2115d2843b5458159d6d6af2f047b11001cba10fd2d28b882117f8c0915f56c5c3f1 SHA512 58983d55e134bb1e341a8f42c6be82e332791ef2ba283a2ea94fa125db64005c7211cfb4f75275e06b5d4248e6daf96d003ef3391ea751583394c23e8d20f3d7
+DIST idea-community-2024.3.4.1-amd64.tar.gz 991888395 BLAKE2B e9fb1d8e7d231f415842a2caa526ecad0e0c731100728377f5fed0d8a7ce318444954e3bf8bbe8624efac04bd293a8520695f611c01ef818ad6d9833d3556918 SHA512 ac40e8888ec6e2f535f952b7e269aea546e5e71912ba2a383a7fe6061b2b4e8682ddb234286cb4d89fe2348c012aed43ea108b1896d9d39062a84c5fa5340177
+EBUILD idea-community-2024.3.4.1.ebuild 5111 BLAKE2B 978e3cd2d403affbe6dc1f0a74f1799cdbded3b3d4bd4d9adb4899e5daae1c58ac2c5f85c94233407fa17990e86c2219cc20ab90da34551afb3367a561e0f503 SHA512 220ddf1c102147bf65b306f4b9068c2ff9f81c12ff559657c51ee657859a3e9124de9f3753202b14ce3c26051de73e77e52ea5acd0529a5996fc3689e4ce4c10
 MISC metadata.xml 537 BLAKE2B 1b41a4099c46288757f1001d30171363df1a5536c5b3bcfc3cb2610e2c2b8b907a13abd969a3f711e4579a572414c881a97b3818bbe20b280084497ebbeb8c2d SHA512 0cf8c9625044d20e2d274a66c0c22785776b4b01cff484c9b32d6bb2d36db0c629413330fef8abeaf2530d079ae6c7da7c32ec8c597f8f39f9136719c22e27e5
diff --git a/dev-util/idea-community/idea-community-2024.3.4.ebuild b/dev-util/idea-community/idea-community-2024.3.4.1.ebuild
index 41f034fdb482..9171424c611d 100644
--- a/dev-util/idea-community/idea-community-2024.3.4.ebuild
+++ b/dev-util/idea-community/idea-community-2024.3.4.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 inherit desktop wrapper
 
-MY_PV=$(ver_cut 1-3)
+MY_PV=$(ver_cut 1-4)
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
 HOMEPAGE="https://www.jetbrains.com/idea"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index b8d4e030de0c..00cb93853119 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,7 @@
 DIST kdev-php-24.08.3.tar.xz 1093972 BLAKE2B 54b4e3a3f5fa83989f5692a0a2c2ad10b5d7b16e30be8c2754d1c0a17df9eef4909aa59fd1519d3b6a3eff29f0b1bba32d542618db32a95c353e2cf9482da3e6 SHA512 ef9f115c07a4c0021d797740888dfc0ad2889d87a45bcc44bcbbb55ac4de6960a2f997e67c64f57d225b0e721e643920d0043e7ac710337e83a5fa8e17106e61
 DIST kdev-php-24.12.2.tar.xz 1094476 BLAKE2B 91a9e3975c453c0c5824c2dc21010d37b33e21eb956455c9aa3a30ec522201d39d75b5a8efbf1f1a241d6f388cdc474d3f2625d0a0d671dc1b1b6c154f4c47f3 SHA512 cb6064d4c25371c704544c4628e1b9ae34e4676e8e80c2b95e6210667970d4e719905d6f8431944601836f04af12d6722067abfc519dd86311c1d46662099feb
+DIST kdev-php-24.12.3.tar.xz 1094472 BLAKE2B 629f4e0f71ebc59397074ac389a14cd49defaa48c7e60139870633fe58b3644b35c68eadf4d57c078301175d108f9ceb50a70bb3f41bc6c63888ac8cdab6b012 SHA512 2a8d1c91125655f68b5712370bb56bcd9ee7ed00c5056f2a8b6a1f0b57a06387f38da0ad48eecc6389b0e6522e8ea8ee2125b26da59380d5620f0f65c4a0d9f0
 EBUILD kdevelop-php-24.08.3.ebuild 1208 BLAKE2B 2cb782edc2551ccc26355baec8afec60cbbd32907fd4cd3af2ff6ea44a33268ce38bd533d692f78104cb94d4b827e6b7eb1718f722c078d9e6e61f63485919ca SHA512 e97a7506f281a454c677f69d5c51c9675954307d7e1b091198ac72f1c0bcb635b785cfb0bfba588677247e2138180816d14e75da7d81efbed305534f4ba59123
 EBUILD kdevelop-php-24.12.2.ebuild 1209 BLAKE2B f3594154b8f4f9f14f05fe7eec359e77032873804dbb6dab93ed0057b25b2f72c4bfe1663fb61b21084b99b27cead5a0b723178f135d6a9f7774df41ef4a2f8a SHA512 a53ff70d160cf81c833429ad3a965a0665b9c0558b599a80d5eb339f7f46268089f95cf2f861671c6081c504625be85cab6e5bf1b8a960d3c450e34c28f99232
+EBUILD kdevelop-php-24.12.3.ebuild 1210 BLAKE2B fde1a9d6919abfa1a9601ae248104b0b1ad4c61efa4e5af1108a1dd61adb6e5808ef3088b5fb2bd87a179eb5981463f80ae6b9670f2cc2a4d0d08ece5daaafb6 SHA512 20dae66a63052493530a061468360a87b24fa62fc106abe517810ac51b189808fd7fc169d87030e8ba58650c00001d8edf78a24dba2d4101390f5c801e797bfe
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-php/kdevelop-php-24.12.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-24.12.3.ebuild
new file mode 100644
index 000000000000..81243859e088
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-24.12.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-php"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# remaining tests fail for some, bug 668530
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	dev-util/kdevelop:6=
+	>=dev-util/kdevelop-pg-qt-2.3.0:0
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-util/kdevelop:6[test] )"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	ecm_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 4157ba0de762..31b4ac3766a2 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,7 @@
 DIST kdev-python-24.08.3.tar.xz 1101720 BLAKE2B 13e21a9b43b2a4fbd12224910fc33a26b6f6c4c32a9049a53d4726bcfca8d4f463fef92a802fd6249410c050000c0be9a228750fc7cea31370a9399e7323acc7 SHA512 a5459b00a1e2f2a86c87ecad2a12abb23e070838f7f802c1106371182feb1b2f2deca1a9864c3aafb3edf9dfd3c9f6b9120e552d46bb60c09c81c524fb590eed
 DIST kdev-python-24.12.2.tar.xz 1103168 BLAKE2B b9b9451382de33a99f03bb9fb2f60d29aefc3e1ef47651aff52243c946dc277e881a053f6277bb843153c06e5f02f12fedf68f04d99fd883d7a400f9220ca976 SHA512 f7929b0bb24bd4d194fb375a757f33e7141502a04e6121a4a25367cd1ad6f44153a39413e01b7fc84cc4e7d23e634ddf1c73d3ff12595016edc7f3608dce4f89
+DIST kdev-python-24.12.3.tar.xz 1103312 BLAKE2B e662dd23c26190585eab66876ca937beac9934cbfc2ab7346b96ae0fa2be30b2ea01c3d22c08425884c84f8d5d2c3942decc70e8a7152d589645a30292bae111 SHA512 6482bbe9730e56b4bb98a14df3d0f84cbb47b7606e6541877d5eab6b31c08b6e794957f17eca6532c80fb5de1e5cf3ebb8cc6482c536ffea48c5b7917f55afb2
 EBUILD kdevelop-python-24.08.3.ebuild 1119 BLAKE2B 455b6ab786d6de972d1a02f6faf855c2a80c9d87e7daa7947612627da8bd78e50b83c852016a20eefeabec415d60ca8988f80ab9cbae112c2b1f5096543c9588 SHA512 3fffed4e354b3041a1a7035d6826b5b439343b77ec9f94c0052276744bd2a69af0966668049c685c0f20f1066a2654af2eeee39856790293abfbdca3ca37279c
 EBUILD kdevelop-python-24.12.2.ebuild 1120 BLAKE2B 3a79c539b98e80912b8c273d0c4e154cbc9816bd74e4ba11dd5fd2b2326dda129bb6bba0eed7dbf5dc9ffc34c6b4bd374c200ec26798ddc3fb4696f4db3265a6 SHA512 5436ce1a4f4a575eb1e8acaf450434ee7aa934e83509f1a8da4b80958d37dc01f0919deb288d32f846c835abf7128b392c255abf65aff971b72e00e222cc0de0
+EBUILD kdevelop-python-24.12.3.ebuild 1121 BLAKE2B 6dc4497073b32679f645c8f41400a8041eaa63b0a9568fc70813716c3a8b7ea79de6633d9911de9fa76cd39ac59e9d715b62614bc6f5ae3910bbbd7e241ecc21 SHA512 b2b80bc1eb9c7c479b08333937c0377fb6af9f0cbca925aed46cda556027c25e0a62e44d036d1e730b7b3c9eb786a5bf3ff493a7a467ab5e351d2e4ab2d0fbb8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.12.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.12.3.ebuild
new file mode 100644
index 000000000000..ec3e77b4aa45
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-24.12.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{10..12} )
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://kdevelop.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	dev-util/kdevelop:6=
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index edb69ae6dc7d..2d1a27b66fb8 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,7 @@
 DIST kdevelop-24.08.3.tar.xz 8819060 BLAKE2B e15dc7ac0808c04e2d7752b6ceb984286be5ba43a183acafd68d60a53308d02cbf3e9b281bb2029754e41f107237c811395a8b9e27cb5b8b13141536cf3207ae SHA512 1a1ffc4186efec19e7dfca403c6b327bfda0ed96793186a44aaf52e0f8eab2e070dc4452c632f112f0a296f4182bd8d1ab38dbdd5fbd2a1c982ec694a10eae2a
 DIST kdevelop-24.12.2.tar.xz 8833936 BLAKE2B 92f7e413b9d47e5c6eb6b5e57afe88adc544ba7ce5edd7b856ab98780b6bd66af38b4e6013a0da1b4d91c21c1704d862d251cb4c546dee4e2f9a2b20f82f8015 SHA512 fadfa1b6f9ec83ae45bb9d5f909d33af15184a2f24e8a525b64c73f7e1f3c0534fa16b897ac59ce383c77780a5b182b55b924204ded373109227e0adb4715a98
+DIST kdevelop-24.12.3.tar.xz 8835256 BLAKE2B 36a3418f825814d5d45a8de3864dc126c5281e97e86066e3d0fadafa7ad831c05341056e7ea73cc1d67b23dcc0034ac3964bf25f9ce4baa96319cde6b7ce5970 SHA512 607ddc6e4c701f582dea8a2d9708edfa806d0c56b200949de0ee2a2b76bb0d845aaf069ec07b9944f148dc92f80330f59e87f57cb8fab43c6331d18bf718db03
 EBUILD kdevelop-24.08.3.ebuild 3700 BLAKE2B 538018aa5502928d015bdd80d757d81fb80f4bd46104bb9fea76036512fe1e3890de3193af7ab8cbd0821693b6602e9c1c8c59995e3c62b91d367878dd3445be SHA512 bbc7b8fd68985bcf62b2de47c6da8d2fb31ec276f79862248f76df7f750184c8ae70c0a14c75112ccbc9e521c10425d770da2c992b324bfc4039bf5e10f8ebfa
 EBUILD kdevelop-24.12.2-r1.ebuild 3711 BLAKE2B 21fc6cecf99c8beec46766d20125a445e1701dfd2179d733012df415c7aaf565b32d811ad20ec51d3f7ac49de2a13122c534f9b2404c285ecc7411731fa5ad07 SHA512 480b18cf0cb9320e50cd5ef69222dbaf1cbf5d3d0c0688cf2a8b71f211875c7663244c10f56a2b7ab2c4715b864dd1872f78829413eb6406aa3fb531c5b9856f
+EBUILD kdevelop-24.12.3.ebuild 3712 BLAKE2B b2e9f04df051b34c9dbc3d36da57c88dcc4c7284d58e2f169f86064c370ac5e7495fb8ff79717e7e621fd7010e7375135be91c4dc44b4b372e9c7740c80154bf SHA512 024dd9f98cc56e911ba0644ded420f824dbd19ac762ac74055f3426e7bd47f9d371713c0853aea72a25b03bae710f6c81ee665b71b15737d3e9c4e8e85bd8015
 MISC metadata.xml 671 BLAKE2B a67a7998eea115188a188dc7e225226f6b8ce68168ed1d43bf452cc7fd26f343d6d7c61367df45ddb5fea674c0aa3c5028287e16e791311bfb0d89488eed8935 SHA512 9ad5e98671886e809fe69e8ca9bedf05e417535798bd855a19b8a69ba510324862d5fd0d236c7827c4d4952305468709abf7a9d7ed1fe36e2b9bee6a4663179a
diff --git a/dev-util/kdevelop/kdevelop-24.12.3.ebuild b/dev-util/kdevelop/kdevelop-24.12.3.ebuild
new file mode 100644
index 000000000000..dfa91cbf7875
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-24.12.3.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KFMIN=6.7.0
+LLVM_COMPAT=( 15 16 17 18 19 )
+QTMIN=6.7.2
+inherit ecm gear.kde.org llvm-r2 optfeature
+
+DESCRIPTION="Integrated Development Environment, supporting KF6/Qt, C/C++ and much more"
+HOMEPAGE="https://kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="6/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="gdbui plasma +qmake +share subversion"
+
+# see bug 366471
+RESTRICT="test"
+
+# UPSTREAM: not ported yet, check plugins/CMakeLists.txt
+# IUSE="hex"
+# 	hex? ( app-editors/okteta:6 )
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qttools-${QTMIN}:6[assistant]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=dev-util/astyle-3.1:=
+	kde-apps/libkomparediff2:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+	$(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}')
+	gdbui? ( kde-plasma/libksysguard:6= )
+	plasma? (
+		>=kde-frameworks/krunner-${KFMIN}:6
+		kde-plasma/libplasma:6
+	)
+	qmake? ( >=dev-util/kdevelop-pg-qt-2.3.0:0 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+	app-alternatives/ninja
+	>=dev-debug/gdb-7.0[python]
+	>=dev-qt/qttools-${QTMIN}:6[qdbus]
+	kde-apps/kapptemplate:*
+	kde-apps/kio-extras:6
+"
+
+pkg_setup() {
+	ecm_pkg_setup
+	llvm-r2_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_ROOT="$(get_llvm_prefix)"
+		$(cmake_use_find_package gdbui KSysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake_use_find_package plasma Plasma)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package share KF6Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+	)
+#		$(cmake_use_find_package hex OktetaKastenControllers)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "konsole view" "kde-apps/konsole:6"
+		optfeature "static C++ Qt code analysis" dev-util/clazy
+		optfeature "static C/C++ code analysis" dev-util/cppcheck
+		optfeature "heap memory profiling" "dev-util/heaptrack[gui]"
+		optfeature "meson project manager plugin" dev-build/meson
+		optfeature "formatting configurations via customscript plugin" dev-util/indent
+		optfeature "formatting configurations via customscript plugin" dev-util/uncrustify
+	fi
+	ecm_pkg_postinst
+}
diff --git a/dev-util/kio-perldoc/Manifest b/dev-util/kio-perldoc/Manifest
index cc71877111a8..40d74741af21 100644
--- a/dev-util/kio-perldoc/Manifest
+++ b/dev-util/kio-perldoc/Manifest
@@ -1,5 +1,7 @@
 DIST kdesdk-kio-24.08.3.tar.xz 41764 BLAKE2B 2b42795d14dca876fd16590afff3ab93c868956b8f670ab3c4c4a652c5f0322bcbb4b515adac332a52d32cc5456762117ef94a1dd63e43c03b7432a61739eea3 SHA512 9851ca4a2b14c7f82c4b40e432b146b56d672bac8c5fef7047b8874fd511fc70388731f946c7b5250f0117eba8e09f9d9a5b878b7bc0aea8697ae7b4f53f9c8a
 DIST kdesdk-kio-24.12.2.tar.xz 41768 BLAKE2B 73e0794c948e3a376a625cbee511f7dcb1c81a5d17594f024241db42d6a004efccecc73ee0fad34a0fa4f130178dfd637477c6f21491eb65bb8041f15477cf6b SHA512 dd5efe33f8be182b5310240b62c169da1af6a2ea098c3154c04e10857189b980c8392b6e29c5c19291c9c874304d0d983f2f07658a33344be0c3d7b1b4705404
+DIST kdesdk-kio-24.12.3.tar.xz 41764 BLAKE2B cd74944c4cfdb33cc06a8d7b50efa7b0dc42fd111b0995731e683bd4b9e6c2071d242a0963430baa14714be2d3aba16c783ee1d332d2b643ba0c4b45412a6a9a SHA512 3a4a6834abef09dac5c6f75f99bb2d366b8e41f108c7ce3f67639c6455e4c3f14c31df6bc43f746ba7e7909efdb38e9128fb1223ec21912d0a0e85b3e8af1410
 EBUILD kio-perldoc-24.08.3.ebuild 490 BLAKE2B 3b4f01f28b5b3e062f18f722d0534e5c8e3f626d3a1a164288200271366868520e48ec246723239606aeb425f1e614eabe7c16d0e1228e7d89fe75e408aee5d6 SHA512 cb9945efddc173d239de4ab854500cf2fd6e55e1dd850e19c56dde642e4c3961071081fd6266f292f9d271a6527cfbfa564c26d2d06838fbda8e36419583207c
 EBUILD kio-perldoc-24.12.2.ebuild 491 BLAKE2B 75cded0bfb5157bdd40b08fa822549630ae7021d6a03f61478cae051dfcf4ca6e5d119d37e1002100b544f9567413b4b9011a60166c21bc4feeaadf15309adbb SHA512 d10d7a0629f827a3f1c6a408ce666d26e43fe92260288f164c22f7bdbb1bbc2277e8827fc5df10512906fe858942049ac36f552b327956827c724265fdd6d7b2
+EBUILD kio-perldoc-24.12.3.ebuild 492 BLAKE2B c57848f5d800f64beb9aa3fa3eae01d180abe74a8b671deb8a7fee74385d0daac59025a8d8cce315305d886520246cb70b1ff4f74f227392a14bb9a3e86cb028 SHA512 9e2e7ee45f2dc255e2972098dd2db10c7fb1d590b7c668aab9997343d790f74a45224be65d04d2b3b1d970c874ab7bbb54d480add9bfb1d9f46ac67e2bc4d12c
 MISC metadata.xml 376 BLAKE2B 973773b9cb2a2e9d2a7e187056409bbbe4a1f88bf97b791fe4b096beb1c638bbfef558abb19920383471641454784549ada0fe5aba4fcfb6ce762156711457c6 SHA512 e29785bf513fab36b159f7bdca1a339dc3e004e067b1e98ae5997f865494ac70ef4e27a74387cc65a486decd42f91926fe478143b6ac9906753a69f0b546617a
diff --git a/dev-util/kio-perldoc/kio-perldoc-24.12.3.ebuild b/dev-util/kio-perldoc/kio-perldoc-24.12.3.ebuild
new file mode 100644
index 000000000000..6633f4511d4f
--- /dev/null
+++ b/dev-util/kio-perldoc/kio-perldoc-24.12.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdesdk-kio"
+KFMIN=6.7.0
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker interface to browse Perl documentation"
+
+LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-lang/perl
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-util/massif-visualizer/Manifest b/dev-util/massif-visualizer/Manifest
index 8407b41da3ff..68f401083443 100644
--- a/dev-util/massif-visualizer/Manifest
+++ b/dev-util/massif-visualizer/Manifest
@@ -1,5 +1,7 @@
 DIST massif-visualizer-24.08.3.tar.xz 279480 BLAKE2B 7ce98cc243f78f41b5df36d50d0493682e4931f7f433da44f363978dbeec8ed2d9b6e5ec51403a31b88201911274b4a4c3073d48a97060ea5092901d7ada9ed0 SHA512 42c27437ed12f9d3f21f5a3dd65e049bb417151f55f552135d3bc5083522ed35c793923f6edcd62f337887fd63194f253f27e46c3d40199d41f59d87e567a25f
 DIST massif-visualizer-24.12.2.tar.xz 279540 BLAKE2B 5d849df393488673e299fc2e7a7086649893ad06a674ea0b06ad28a91a007b58f85fa54d7d107cdc7ce266ee861ae2288ffda1840f6a2b404d0c3dddf39cf359 SHA512 3647e134b3fe6553692c737903fa04755551d9a92ca52c07903a2377bb72b1406654578a99d945fc719e6e192ab2a21094717501f7468c8af989f9a088e41c1c
+DIST massif-visualizer-24.12.3.tar.xz 279440 BLAKE2B 921e8464f6869d490e9f5af085fe2dfc307c4d7cb0b42cec57880f84e844c97f02543510f19ac7d47addfe0e7a2eea2a25cc71ba94a6e7334507352d04e8dbf5 SHA512 c1b29f41aef42163d720007997d1b5b2644d29d3673d48894555e913637a58a836d939c2ec2430b8328e9c5614eb0ab196611dd385789b61b1a574eb63d16098
 EBUILD massif-visualizer-24.08.3.ebuild 1073 BLAKE2B 9c209395025d767db2e26a0df2e1dd668001c05f9f3ce08a51ded245383a26e96a1e284729cb272f27eefd52d1fee79628eac2e49004d40c9a8a08565fb0ebdd SHA512 a237276f8d51ed27e9328dfcbed5f9be66d2712e77a29c9130870e98a5e52a5d2e0f4dbc6db6ad56b5169e38e3fd03ef9246cc10e4928610e1bf9456be649f32
 EBUILD massif-visualizer-24.12.2.ebuild 1074 BLAKE2B 503231adc9b007d62b68a37225b20cedb396af79287271102a8923c687a62e6ff3e196969586760bcedef8105fbf8332a0788759a27c61d9c0f2a103210eaa68 SHA512 324dc3d9cd2bec2fcf7a2780ba62b6b5834571c89e89588a5431eb07e858f734340537036af250e5371a991f04096c018538172c0297c70f8cc4da169be40fd1
+EBUILD massif-visualizer-24.12.3.ebuild 1075 BLAKE2B 25b1e341982f63c72e04f29fd9136a997e94c76d3c9825ffb62fbdc696f882f5bed383bff60a38a5315d0e6cee5af488240bd6643a41f0538cf9d447e18486d7 SHA512 51f283e5d18df0764d07f27151d193387c14def66824b1aa1926dc4b31e617540bbeb2c0779a4e44a0ba4d7ed6e9d93af9b73d7a847232c831bdaee409f99ea5
 MISC metadata.xml 439 BLAKE2B 84769f8b1a94b2661706e00447a047ff287c06347f4f5571d8deba82147bc9fc35d67774c45abd3b40ed3a11ea6a7f8ebe0e535ceb824b98abda6b3d417578a8 SHA512 9c5869ac9741956f11163181eec4483ead5578e5de85c4ea6f1850423c2b94be7cfaaee6ee4634bffb2f9f2cdd9e29fc19bddb2b3113c876365b6fb7ba4ec630
diff --git a/dev-util/massif-visualizer/massif-visualizer-24.12.3.ebuild b/dev-util/massif-visualizer/massif-visualizer-24.12.3.ebuild
new file mode 100644
index 000000000000..8f249f66c29c
--- /dev/null
+++ b/dev-util/massif-visualizer/massif-visualizer-24.12.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Tool visualising massif data"
+HOMEPAGE="https://apps.kde.org/massif_visualizer/"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+callgraph"
+
+DEPEND="
+	dev-libs/kdiagram:6
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	callgraph? ( >=media-gfx/kgraphviewer-2.5.0:0 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package callgraph KGraphViewerPart)
+	)
+	ecm_src_configure
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 709e6f9ee2c8..828f271c243d 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -3,21 +3,15 @@ AUX nvidia-cuda-toolkit-glibc-2.41-r1.patch 3163 BLAKE2B a3d5dbc50898b1502a342c3
 AUX parse_manifest.py 8488 BLAKE2B fe4748e41727e717d99b3b7f294d7c8e67b44e3f352f27a76c386502870e6134217ead3d93714755f50b0393d514b9e317748aed89637c660e354d53354d1485 SHA512 ab90e614bfd729a0a90a7373d58fcf2f6e7ba3beb8a00841b87e8240c9386a678daf551f4fcc89040f10d46d159e316442978c60b1a8960070576cfb7a11d52c
 DIST cuda_11.8.0_520.61.05_linux.run 4336730777 BLAKE2B cfdb4a51c49ee504e56a4a95de4e477ef207b678527cbb633c1e83e667f1a62c0f67038befd0b10f7ae24cda9c8bc5c54293d06a05b2e45be6cf677e40f71f17 SHA512 e96e1389abed34b5093b3a1d4e6ae9f3d4f8406621b1475f378efae65868657efce22da03b5b4e0a548d9635e406b8690b18b17b186d03ecb3ca0703c5d5787a
 DIST cuda_12.3.2_545.23.08_linux.run 4368514070 BLAKE2B bfb6239b7669636e2ef424921f5a1dd99409a0351ea7d3453fcec3d484e714d87639e733cfae913b0f222d7af8acb7bebae340ea8af53fb7ab320805abb7b230 SHA512 dce569e42955fc351a6b52b2876948029d5183bb000754f0cdcba754673a280acfd4c9e4d8cf61d572ed045de006e0bbb0e8ff32012e6cc336be9c05fd529340
-DIST cuda_12.4.0_550.54.14_linux.run 4454353277 BLAKE2B da339a44ac21799a88b4573e9afc0866f11649707594383414cb0c729b36dc63d55032e5ccbbbe46e84c1dc88fc76e466067be7ef2ae3d131a74190c548d76ba SHA512 329b81c63dcefa5c6713eeb2dc5ccc223f5b456f4b7558bd3723d166357d8bb4c79d12082ea396aaadae8b5593b20584f7bd0cf617bb3494e4423b58726255a1
 DIST cuda_12.4.1_550.54.15_linux.run 4454730420 BLAKE2B 643513a673e72aeab2e0268c4f91b504132aee378e5e483c46803ed9b1b109274e23bce0cd1022de1220e81dbfb0442c9d84370ad9c6a17e14fe2aaff23ccf13 SHA512 340fab9aad2f3e03fb773c2ec1d4f2c3b1428b350c2072b02263f68f3c521b7ec42086ae7b5e66594a0b91862cc165d8519e4c92e428268bc1e98adcfe106d42
-DIST cuda_12.5.0_555.42.02_linux.run 4294677299 BLAKE2B ffefb576feb9f8e6ea8975bf74fe7277902364035e5dcb27f7b4bdc1d73ea44ce8e057087d670ec18eb49727a9343484bf3aa234c045b91684c70141cf8162e7 SHA512 84fa3ad278217a0fbea97d2d880f625e7e7074a12e98d50d664daaf8298d7d8dd7b222c6f5815636e484df8f1e75c062c70c09f744d139652d960ca8c064114e
 DIST cuda_12.5.1_555.42.06_linux.run 4311634770 BLAKE2B 3546faeb24687dd11ad0a61a4f02cfbd97119d9e3cd3e24ea294b81ed488de7dfef03607c69d7b5a8087db10cf794205936add7cfa8ccda207e3aca315be48df SHA512 604843e09717c2af0873b2d5a2e242ff1b99122d515b6a7a29e70c55ab605524744359781f5b642059550b4def57877597111914965efe7d3a1a1387c9dbb1a0
-DIST cuda_12.6.0_560.28.03_linux.run 4333105923 BLAKE2B 533e9080dbf087a661ab6e59548e48ca0d2b514f47c3e97ac89b628f79197875a7425ad69c4d271b5fa8243561c1ccba698e3bf322b194b29a5f7fa031ea8f06 SHA512 fe5710c168298d2283a3f636ad5e1e212970fe8d9554ab450aa61d786536f50efb9d9e9396b6ac59638bd4204faadb5a99ec8a8c02e2c57a18f479123aaff3c9
 DIST cuda_12.6.1_560.35.03_linux.run 4345714567 BLAKE2B 147c7f03e0d9ade4c603d93920d0cd6bb1706efc268797ae870b5244feaa8159393015f96e920c6255e93d8040dd5b046075804cfa7c5da18a645800d65b8c3d SHA512 514ec89f847457c3ba78cd0dc22c25aebf2a19a6bbd5a8d071f31519d1007889cde6ba888a01596434216a8a88bfba21059cdc8e3fa9397133c93d2a9f0c015e
 DIST cuda_12.8.0_570.86.10_linux.run 5412604598 BLAKE2B 21ea184fd428ea638934788847e023213c38c1079d489d04bbd1ca277d1c285d57a7ac9c02020cbd73970e703daeec9e806831cf54a427cff90fc036c4da7705 SHA512 7939552d38c39b184946df455233eb9ffe91051656b3091b0414b2acc2939bc35dd92724b584e507976c3b4cd51f489abee2e2d0da27bfebaf8999c3f2c2bb2e
 DIST cuda_12.8.0_570.86.10_linux_sbsa.run 4636253689 BLAKE2B 53df0ee05a9563bf9db1b813a75d4a81c391cf67c24bc0b9fadf74809ebf1534cbf5762317e2f04e4e7482adf97612d8d3f16d78146abe715a9dc4b8654a1bbf SHA512 bcd91a914d09e72a2f2320d9912a3928a491c8d7062f65d027bc172630944bc0fc319ef2ded10e3c4ade564cf2a4f9a166698dca1d493632ee7ef7ff5d7f1ad5
 EBUILD nvidia-cuda-toolkit-11.8.0-r4.ebuild 8044 BLAKE2B 54995f4f2a8a1998539a6798ff2a68bbfed1943c3e6da27eff58458853db006e105bb39e5bb1935b11971539dcc63fb552ce0b280860ba46ce04f04e98890568 SHA512 df7eb92e74e80302e0fd966ba1c2a97a38f97e3e6bba4bb0a1a389e1336c13d3c9a3603f7079a597d2ae723f7088e83ff708e8ef5d2ba503de0469bf25e1c1c8
 EBUILD nvidia-cuda-toolkit-12.3.2.ebuild 9504 BLAKE2B 6abf260006cfd3471665526df049d3f80d956f6a849e8e73c0914aa32faf86ff68d659aa8fcc5a4e95eb6890bf271a2d40edec67aeadd5154444d66e8d337c5e SHA512 3660334d48205d952fd73e688742d700db4b9594920d42d289c581d10af34af516fd8920993650dafacb983492ae72d6b4f3b0ce51d3301d66d6450b34c0c7a9
-EBUILD nvidia-cuda-toolkit-12.4.0.ebuild 9515 BLAKE2B 270c9952890a529d17355d5456d6d2422740f69eb9af1b88121e0c8b7a0a9632a39647fc69da4e3653cba4e4cd60f3afc20fce2095743ba128aae8a15f0676ab SHA512 949e4ad4b2d1758279bb620c5a2ba0ea90c93e852f862c448490c689d8d4f522891cb6a772a65894a4f9867be1c8dea1facf87616370bdd0f45987f9d437a3ab
 EBUILD nvidia-cuda-toolkit-12.4.1.ebuild 9515 BLAKE2B 2fdc866adfe7f552349bcce9b62c2a56186ef859efcc455d4e829f12f71a63cc1ef74eae08a9dc6bbb508aa398679e74a9668353dc3166109157b312fcb0c291 SHA512 58c85d9ee76f180039fd0ccf7e377a4f22bc2d9b92451a54909ddecc4e177c07fc95bb29cfc74b28c9472a64a4c167319be0bcccd6c536296d2105cd88775770
-EBUILD nvidia-cuda-toolkit-12.5.0-r1.ebuild 9535 BLAKE2B b8b50bede8a66a8bce76f6677991b0cf433c3338e89dc82597473dc63874810b9b7461de97d9abc55a471b38618445b7c6dc8e37c18caa8c7d0e3fb9cbdf835e SHA512 8f983c2dc5797fa82f144008ddce2b7eb4b2aaa66b1cf439be25a67fba4a0b4ff5af3480451d53bf0375917e1219facf48e69e7d213aca1e3acbb984595a4d41
 EBUILD nvidia-cuda-toolkit-12.5.1.ebuild 9535 BLAKE2B ea6b46070159a18d8f541af47d648a79b75f7f964d689418220e4eaf87c56fc000eb39fed84637c161aa5f18e5f7e03f0615cbec6670517fd2efefd83139a0a4 SHA512 47bca7b76aad3842f37d8da4fbbdf646a1ca2cc93bc7ae870d8e164a05f735974ca28d69a99a6d0ffcd331e5134025b3819360f27c65dc6c27338756bfc74ba8
-EBUILD nvidia-cuda-toolkit-12.6.0.ebuild 9535 BLAKE2B 984ec77cc39675ba22703339ecbd5596452a5631c7303e4db492bad0b80496ea13151cb25f87a7c0e39d9d2a173be7ad9469a91acfd785abb83632caae230297 SHA512 efbf2fcc39f60ca1f35f15202e924146618b4441c090d26e07048e10dee6ddd79f10640b1c6d8d2e84a218edb6a1382f2398eaf182a503d5dd6dbce250844af3
 EBUILD nvidia-cuda-toolkit-12.6.1-r1.ebuild 9685 BLAKE2B dbbfe46f57fc1a42a91d8a5b1e72651adb9d204abb05512945dd9af691872f4285c69918918a131adcfb749e7832c31bf8738321f8909a4656824c2727e899d2 SHA512 519dcf9c06f7a11a6405dac69b003e6b37d1d32007f3231038d3254c9901815a25cbdceb3401adfb783be77c683ce53acd76ea3722bb4b2c66d5e9265399967c
 EBUILD nvidia-cuda-toolkit-12.8.0-r2.ebuild 10531 BLAKE2B e348807f8ed3e64e17f94c5f099e1fe07c69af2a05e29cfd70a99b2dd0983c01869be38d848a94754226dc0fde3ad72ccd1b3d4a9ebd2bd3940ad48acaeecd20 SHA512 33fc3c60e95cc377557f4617a7879cfaf057e9632886b00d0896a8e89eda822cfb252b967e6f2d03eacb16774d607c8e2676846b7ed055d2e6f86ec63136e54c
 MISC metadata.xml 761 BLAKE2B a6ae653c6206cbc05349297499b6dde91bce6d543e10bd5ea915cfe9729dfa6f1eb954ae09c2e4d3997f51315ae090b38606c21b5099e750596ea66fdd93e817 SHA512 9133517d805201d25b651e48abed90394c88ef33a2571ab20b3b19d365f85a90478486c7c087c9150d7d9f6e4026873c5236c64ed649fd3bfc8f9b81479dcc59
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.4.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.4.0.ebuild
deleted file mode 100644
index 681a1840c4be..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.4.0.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs toolchain-funcs unpacker
-
-DRIVER_PV="550.54.14"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger examples nsight profiler rdma vis-profiler sanitizer"
-RESTRICT="bindist mirror"
-
-# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the
-# actual required minimum driver version are different.
-RDEPEND="
-	<sys-devel/gcc-14_pre[cxx]
-	>=x11-drivers/nvidia-drivers-525.60.13
-	examples? (
-		media-libs/freeglut
-		media-libs/glu
-	)
-	nsight? (
-		dev-libs/libpfm
-		dev-libs/wayland
-		dev-qt/qtwayland:6
-		|| (
-			dev-libs/openssl-compat:1.1.1
-			dev-libs/openssl:0/1.1
-		)
-		media-libs/tiff-compat:4
-		sys-libs/zlib
-	)
-	rdma? ( sys-cluster/rdma-core )
-	vis-profiler? (
-		>=virtual/jre-1.8:*
-	)"
-BDEPEND="nsight? ( dev-util/patchelf )"
-
-QA_PREBUILT="opt/cuda/*"
-CHECKREQS_DISK_BUILD="15000M"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	# ATTENTION: change requires revbump, see link below for supported GCC # versions
-	# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
-	local cuda_supported_gcc="8.5 9.5 10 11 12 13"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-	local pathextradirs ldpathextradirs
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install standard sub packages
-	local builddirs=(
-		builds/cuda_{cccl,cudart,cuobjdump,cuxxfilt,demo_suite,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,opencl}
-		builds/lib{cublas,cufft,cufile,curand,cusolver,cusparse,npp,nvjitlink,nvjpeg}
-		builds/nvidia_fs
-		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti builds/cuda_profiler_api" "")
-		$(usex vis-profiler "builds/cuda_nvvp" "")
-		$(usex debugger "builds/cuda_gdb" "")
-	)
-
-	local d f
-	for d in "${builddirs[@]}"; do
-		ebegin "Installing ${d}"
-		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
-
-		if [[ -d ${d}/bin ]]; then
-			for f in ${d}/bin/*; do
-				if [[ -f ${f} ]]; then
-					dobin "${f}"
-				else
-					insinto ${cudadir}/bin
-					doins -r "${f}"
-				fi
-			done
-		fi
-
-		insinto ${cudadir}
-		if [[ -d ${d}/targets ]]; then
-			doins -r "${d}"/targets
-		fi
-		if [[ -d ${d}/share ]]; then
-			doins -r "${d}"/share
-		fi
-		if [[ -d ${d}/extras ]]; then
-			doins -r "${d}"/extras
-		fi
-		eend $?
-	done
-	dobin "${T}"/cuda-config
-
-	doins builds/EULA.txt
-	# nvml and nvvm need special handling
-	ebegin "Installing nvvm"
-	doins -r builds/cuda_nvcc/nvvm
-	fperms +x ${cudadir}/nvvm/bin/cicc
-	eend $?
-
-	ebegin "Installing nvml"
-	doins -r builds/cuda_nvml_dev/nvml
-	eend $?
-
-	if use sanitizer; then
-		ebegin "Installing sanitizer"
-		dobin builds/integration/Sanitizer/compute-sanitizer
-		doins -r builds/cuda_sanitizer_api/compute-sanitizer
-		# special handling for the executable
-		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
-		eend $?
-	fi
-
-	use debugger && ldpathextradirs+=":${ecudadir}/extras/Debugger/lib64"
-	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
-
-	if use vis-profiler; then
-		ebegin "Installing libnvvp"
-		doins -r builds/cuda_nvvp/libnvvp
-		# special handling for the executable
-		fperms +x ${cudadir}/libnvvp/nvvp
-		eend $?
-		pathextradirs+=":${ecudadir}/libnvvp"
-	fi
-
-	if use nsight; then
-		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${ncu_dir}"
-		mv builds/nsight_compute builds/${ncu_dir} || die
-		doins -r builds/${ncu_dir}
-
-		# check this list on every bump
-		local exes=(
-			${ncu_dir}/ncu
-			${ncu_dir}/ncu-ui
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/OpenGLVersionChecker
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/QdstrmImporter
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
-		)
-
-		dobin builds/integration/nsight-compute/{ncu,ncu-ui}
-		eend $?
-
-		# remove rdma libs (unless USE=rdma)
-		if ! use rdma; then
-			rm -r "${ED}"/${cudadir}/${ncu_dir}/host/target-linux-x64/CollectX || die
-		fi
-
-		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${nsys_dir}"
-		mv builds/nsight_systems builds/${nsys_dir} || die
-		doins -r builds/${nsys_dir}
-
-		# check this list on every bump
-		exes+=(
-			${nsys_dir}/host-linux-x64/nsys-ui
-			${nsys_dir}/host-linux-x64/nsys-ui.bin
-			${nsys_dir}/host-linux-x64/ResolveSymbols
-			${nsys_dir}/host-linux-x64/ImportNvtxt
-			${nsys_dir}/host-linux-x64/CrashReporter
-			${nsys_dir}/host-linux-x64/QdstrmImporter
-			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
-			${nsys_dir}/target-linux-x64/nsys
-			${nsys_dir}/target-linux-x64/launcher
-			${nsys_dir}/target-linux-x64/nvgpucs
-			${nsys_dir}/target-linux-x64/nsys-launcher
-			${nsys_dir}/target-linux-x64/sqlite3
-			${nsys_dir}/target-linux-x64/python/bin/python
-			${nsys_dir}/target-linux-x64/CudaGpuInfoDumper
-		)
-
-		# remove rdma libs (unless USE=rdma)
-		if ! use rdma; then
-			rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-x64/CollectX || die
-		fi
-
-		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-ui}
-		eend $?
-
-		# nsight scripts and binaries need to have their executable bit set, #691284
-		for f in "${exes[@]}"; do
-			fperms +x ${cudadir}/${f}
-		done
-
-		# fix broken RPATHs
-		patchelf --set-rpath '$ORIGIN' \
-		"${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{libarrow.so,libparquet.so.500.0.0} || die
-		patchelf --set-rpath '$ORIGIN' \
-		"${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/{libarrow.so,libparquet.so.500.0.0} || die
-
-		# remove foreign archs (triggers SONAME warning, #749903)
-		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
-		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
-
-		# unbundle libstdc++
-		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6 || die
-
-		# unbundle openssl
-		rm "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/lib{crypto,ssl}.so* || die
-		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/lib{crypto,ssl}.so* || die
-
-		# unbundle libpfm
-		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* || die
-
-		# TODO: unbundle qt5
-		# TODO: unbundle boost
-		# TODO: unbundle icu
-		# TODO: unbundle mesa
-		# TODO: unbundle libSshClient
-		# TODO: unbundle sqlite
-	fi
-
-	if use examples; then
-		local exes=(
-			extras/demo_suite/bandwidthTest
-			extras/demo_suite/busGrind
-			extras/demo_suite/deviceQuery
-			extras/demo_suite/nbody
-			extras/demo_suite/oceanFFT
-			extras/demo_suite/randomFog
-			extras/demo_suite/vectorAdd
-		)
-
-		# set executable bit on demo_suite binaries
-		for f in "${exes[@]}"; do
-			fperms +x ${cudadir}/${f}
-		done
-	else
-		rm -r "${ED}"/${cudadir}/extras/demo_suite || die
-	fi
-
-	# remove rdma libs (unless USE=rdma)
-	if ! use rdma; then
-		rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/libcufile_rdma* || die
-	fi
-
-	# Add include and lib symlinks
-	dosym targets/x86_64-linux/include ${cudadir}/include
-	dosym targets/x86_64-linux/lib ${cudadir}/lib64
-
-	# Remove bad symlinks
-	rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
-	rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/lib64 || die
-
-	newenvd - 99cuda <<-EOF
-		PATH=${ecudadir}/bin${pathextradirs}
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
-	EOF
-
-	# Cuda prepackages libraries, don't revdep-build on them
-	insinto /etc/revdep-rebuild
-	newins - 80${PN} <<-EOF
-		SEARCH_DIRS_MASK="${ecudadir}"
-	EOF
-
-	# https://bugs.gentoo.org/926116
-	insinto /etc/sandbox.d
-	newins - 80${PN} <<-EOF
-		SANDBOX_PREDICT="/proc/self/task"
-	EOF
-}
-
-pkg_postinst_check() {
-	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
-	local b="0.0"
-	local v
-	for v in ${a}; do
-		ver_test "${v}" -gt "${b}" && b="${v}"
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt "${b}"; then
-			ewarn
-			ewarn "gcc > ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-
-	if use profiler || use nsight; then
-		einfo
-		einfo "nvidia-drivers restrict access to performance counters."
-		einfo "You'll need to either run profiling tools (nvprof, nsight) "
-		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
-		einfo "a modprobe configuration file "
-		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
-		einfo
-		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
-		einfo
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.5.0-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.5.0-r1.ebuild
deleted file mode 100644
index b20e4b0df6ac..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.5.0-r1.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs toolchain-funcs unpacker
-
-DRIVER_PV="555.42.02"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger examples nsight profiler rdma vis-profiler sanitizer"
-RESTRICT="bindist mirror"
-
-# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the
-# actual required minimum driver version are different.
-RDEPEND="
-	<sys-devel/gcc-14_pre[cxx]
-	virtual/libcrypt
-	examples? (
-		media-libs/freeglut
-		media-libs/glu
-	)
-	nsight? (
-		app-crypt/mit-krb5
-		dev-libs/libpfm
-		dev-libs/wayland
-		dev-qt/qtwayland:6
-		>=dev-libs/openssl-3
-		media-libs/tiff-compat:4
-		sys-libs/zlib
-	)
-	rdma? ( sys-cluster/rdma-core )
-	vis-profiler? (
-		>=virtual/jre-1.8:*
-	)"
-BDEPEND="nsight? ( dev-util/patchelf )"
-
-QA_PREBUILT="opt/cuda/*"
-CHECKREQS_DISK_BUILD="15000M"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	# ATTENTION: change requires revbump, see link below for supported GCC # versions
-	# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
-	local cuda_supported_gcc="8.5 9.5 10 11 12 13"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-	local pathextradirs ldpathextradirs
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install standard sub packages
-	local builddirs=(
-		builds/cuda_{cccl,cudart,cuobjdump,cuxxfilt,demo_suite,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,opencl}
-		builds/lib{cublas,cufft,cufile,curand,cusolver,cusparse,npp,nvjitlink,nvjpeg}
-		builds/nvidia_fs
-		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti builds/cuda_profiler_api" "")
-		$(usex vis-profiler "builds/cuda_nvvp" "")
-		$(usex debugger "builds/cuda_gdb" "")
-	)
-
-	local d f
-	for d in "${builddirs[@]}"; do
-		ebegin "Installing ${d}"
-		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
-
-		if [[ -d ${d}/bin ]]; then
-			for f in ${d}/bin/*; do
-				if [[ -f ${f} ]]; then
-					dobin "${f}"
-				else
-					insinto ${cudadir}/bin
-					doins -r "${f}"
-				fi
-			done
-		fi
-
-		insinto ${cudadir}
-		if [[ -d ${d}/targets ]]; then
-			doins -r "${d}"/targets
-		fi
-		if [[ -d ${d}/share ]]; then
-			doins -r "${d}"/share
-		fi
-		if [[ -d ${d}/extras ]]; then
-			doins -r "${d}"/extras
-		fi
-		eend $?
-	done
-	dobin "${T}"/cuda-config
-
-	doins builds/EULA.txt
-	# nvml and nvvm need special handling
-	ebegin "Installing nvvm"
-	doins -r builds/cuda_nvcc/nvvm
-	fperms +x ${cudadir}/nvvm/bin/cicc
-	eend $?
-
-	ebegin "Installing nvml"
-	doins -r builds/cuda_nvml_dev/nvml
-	eend $?
-
-	if use sanitizer; then
-		ebegin "Installing sanitizer"
-		dobin builds/integration/Sanitizer/compute-sanitizer
-		doins -r builds/cuda_sanitizer_api/compute-sanitizer
-		# special handling for the executable
-		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
-		eend $?
-	fi
-
-	use debugger && ldpathextradirs+=":${ecudadir}/extras/Debugger/lib64"
-	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
-
-	if use vis-profiler; then
-		ebegin "Installing libnvvp"
-		doins -r builds/cuda_nvvp/libnvvp
-		# special handling for the executable
-		fperms +x ${cudadir}/libnvvp/nvvp
-		eend $?
-		pathextradirs+=":${ecudadir}/libnvvp"
-	fi
-
-	if use nsight; then
-		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${ncu_dir}"
-		mv builds/nsight_compute builds/${ncu_dir} || die
-		doins -r builds/${ncu_dir}
-
-		# check this list on every bump
-		local exes=(
-			${ncu_dir}/ncu
-			${ncu_dir}/ncu-ui
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/OpenGLVersionChecker
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/QdstrmImporter
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
-		)
-
-		dobin builds/integration/nsight-compute/{ncu,ncu-ui}
-		eend $?
-
-		# remove rdma libs (unless USE=rdma)
-		if ! use rdma; then
-			rm -r "${ED}"/${cudadir}/${ncu_dir}/host/target-linux-x64/CollectX || die
-		fi
-
-		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${nsys_dir}"
-		mv builds/nsight_systems builds/${nsys_dir} || die
-		doins -r builds/${nsys_dir}
-
-		# check this list on every bump
-		exes+=(
-			${nsys_dir}/host-linux-x64/nsys-ui
-			${nsys_dir}/host-linux-x64/nsys-ui.bin
-			${nsys_dir}/host-linux-x64/ResolveSymbols
-			${nsys_dir}/host-linux-x64/ImportNvtxt
-			${nsys_dir}/host-linux-x64/CrashReporter
-			${nsys_dir}/host-linux-x64/QdstrmImporter
-			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
-			${nsys_dir}/target-linux-x64/nsys
-			${nsys_dir}/target-linux-x64/launcher
-			${nsys_dir}/target-linux-x64/nvgpucs
-			${nsys_dir}/target-linux-x64/nsys-launcher
-			${nsys_dir}/target-linux-x64/sqlite3
-			${nsys_dir}/target-linux-x64/python/bin/python
-			${nsys_dir}/target-linux-x64/CudaGpuInfoDumper
-		)
-
-		# remove rdma libs (unless USE=rdma)
-		if ! use rdma; then
-			rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-x64/CollectX || die
-		fi
-
-		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-ui}
-		eend $?
-
-		# nsight scripts and binaries need to have their executable bit set, #691284
-		for f in "${exes[@]}"; do
-			fperms +x ${cudadir}/${f}
-		done
-
-		# fix broken RPATHs
-		patchelf --set-rpath '$ORIGIN' \
-		"${ED}"/${cudadir}/${ncu_dir}/host/{linux-desktop-glibc_2_11_3-x64,target-linux-x64}/{libarrow.so,libparquet.so.500.0.0} || die
-		patchelf --set-rpath '$ORIGIN' \
-		"${ED}"/${cudadir}/${nsys_dir}/{host-linux-x64,target-linux-x64}/{libarrow.so,libparquet.so.500.0.0} || die
-
-		# remove foreign archs (triggers SONAME warning, #749903)
-		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
-
-		# unbundle libstdc++
-		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6 || die
-
-		# unbundle openssl
-		rm "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/lib{crypto,ssl}.so* || die
-		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/lib{crypto,ssl}.so* || die
-
-		# unbundle libpfm
-		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* || die
-
-		# TODO: unbundle qt5
-		# TODO: unbundle boost
-		# TODO: unbundle icu
-		# TODO: unbundle mesa
-		# TODO: unbundle libSshClient
-		# TODO: unbundle sqlite
-	fi
-
-	if use examples; then
-		local exes=(
-			extras/demo_suite/bandwidthTest
-			extras/demo_suite/busGrind
-			extras/demo_suite/deviceQuery
-			extras/demo_suite/nbody
-			extras/demo_suite/oceanFFT
-			extras/demo_suite/randomFog
-			extras/demo_suite/vectorAdd
-		)
-
-		# set executable bit on demo_suite binaries
-		for f in "${exes[@]}"; do
-			fperms +x ${cudadir}/${f}
-		done
-	else
-		rm -r "${ED}"/${cudadir}/extras/demo_suite || die
-	fi
-
-	# remove rdma libs (unless USE=rdma)
-	if ! use rdma; then
-		rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/libcufile_rdma* || die
-	fi
-
-	# Add include and lib symlinks
-	dosym targets/x86_64-linux/include ${cudadir}/include
-	dosym targets/x86_64-linux/lib ${cudadir}/lib64
-
-	# Remove bad symlinks
-	rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
-	rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/lib64 || die
-
-	# Remove dead gdb plugins
-	if use debugger; then
-		rm "${ED}"/${cudadir}/bin/cuda-gdb-python3.{8,9}-tui || die
-	fi
-
-	newenvd - 99cuda <<-EOF
-		PATH=${ecudadir}/bin${pathextradirs}
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
-	EOF
-
-	# Cuda prepackages libraries, don't revdep-build on them
-	insinto /etc/revdep-rebuild
-	newins - 80${PN} <<-EOF
-		SEARCH_DIRS_MASK="${ecudadir}"
-	EOF
-
-	# https://bugs.gentoo.org/926116
-	insinto /etc/sandbox.d
-	newins - 80${PN} <<-EOF
-		SANDBOX_PREDICT="/proc/self/task"
-	EOF
-}
-
-pkg_postinst_check() {
-	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
-	local b="0.0"
-	local v
-	for v in ${a}; do
-		ver_test "${v}" -gt "${b}" && b="${v}"
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt "${b}"; then
-			ewarn
-			ewarn "gcc > ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-
-	if use profiler || use nsight; then
-		einfo
-		einfo "nvidia-drivers restrict access to performance counters."
-		einfo "You'll need to either run profiling tools (nvprof, nsight) "
-		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
-		einfo "a modprobe configuration file "
-		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
-		einfo
-		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
-		einfo
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.0.ebuild
deleted file mode 100644
index 26415acb96db..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.0.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs toolchain-funcs unpacker
-
-DRIVER_PV="560.28.03"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger examples nsight profiler rdma vis-profiler sanitizer"
-RESTRICT="bindist mirror"
-
-# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the
-# actual required minimum driver version are different.
-RDEPEND="
-	<sys-devel/gcc-14_pre[cxx]
-	virtual/libcrypt
-	examples? (
-		media-libs/freeglut
-		media-libs/glu
-	)
-	nsight? (
-		app-crypt/mit-krb5
-		dev-libs/libpfm
-		dev-libs/wayland
-		dev-qt/qtwayland:6
-		>=dev-libs/openssl-3
-		media-libs/tiff-compat:4
-		sys-libs/zlib
-	)
-	rdma? ( sys-cluster/rdma-core )
-	vis-profiler? (
-		>=virtual/jre-1.8:*
-	)"
-BDEPEND="nsight? ( dev-util/patchelf )"
-
-QA_PREBUILT="opt/cuda/*"
-CHECKREQS_DISK_BUILD="15000M"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	# ATTENTION: change requires revbump, see link below for supported GCC # versions
-	# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
-	local cuda_supported_gcc="8.5 9.5 10 11 12 13"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-	default
-}
-
-src_install() {
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}${cudadir}"
-	local pathextradirs ldpathextradirs
-	dodir ${cudadir}
-	into ${cudadir}
-
-	# Install standard sub packages
-	local builddirs=(
-		builds/cuda_{cccl,cudart,cuobjdump,cuxxfilt,demo_suite,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,opencl}
-		builds/lib{cublas,cufft,cufile,curand,cusolver,cusparse,npp,nvjitlink,nvjpeg}
-		builds/nvidia_fs
-		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti builds/cuda_profiler_api" "")
-		$(usex vis-profiler "builds/cuda_nvvp" "")
-		$(usex debugger "builds/cuda_gdb" "")
-	)
-
-	local d f
-	for d in "${builddirs[@]}"; do
-		ebegin "Installing ${d}"
-		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
-
-		if [[ -d ${d}/bin ]]; then
-			for f in ${d}/bin/*; do
-				if [[ -f ${f} ]]; then
-					dobin "${f}"
-				else
-					insinto ${cudadir}/bin
-					doins -r "${f}"
-				fi
-			done
-		fi
-
-		insinto ${cudadir}
-		if [[ -d ${d}/targets ]]; then
-			doins -r "${d}"/targets
-		fi
-		if [[ -d ${d}/share ]]; then
-			doins -r "${d}"/share
-		fi
-		if [[ -d ${d}/extras ]]; then
-			doins -r "${d}"/extras
-		fi
-		eend $?
-	done
-	dobin "${T}"/cuda-config
-
-	doins builds/EULA.txt
-	# nvml and nvvm need special handling
-	ebegin "Installing nvvm"
-	doins -r builds/cuda_nvcc/nvvm
-	fperms +x ${cudadir}/nvvm/bin/cicc
-	eend $?
-
-	ebegin "Installing nvml"
-	doins -r builds/cuda_nvml_dev/nvml
-	eend $?
-
-	if use sanitizer; then
-		ebegin "Installing sanitizer"
-		dobin builds/integration/Sanitizer/compute-sanitizer
-		doins -r builds/cuda_sanitizer_api/compute-sanitizer
-		# special handling for the executable
-		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
-		eend $?
-	fi
-
-	use debugger && ldpathextradirs+=":${ecudadir}/extras/Debugger/lib64"
-	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
-
-	if use vis-profiler; then
-		ebegin "Installing libnvvp"
-		doins -r builds/cuda_nvvp/libnvvp
-		# special handling for the executable
-		fperms +x ${cudadir}/libnvvp/nvvp
-		eend $?
-		pathextradirs+=":${ecudadir}/libnvvp"
-	fi
-
-	if use nsight; then
-		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${ncu_dir}"
-		mv builds/nsight_compute builds/${ncu_dir} || die
-		doins -r builds/${ncu_dir}
-
-		# check this list on every bump
-		local exes=(
-			${ncu_dir}/ncu
-			${ncu_dir}/ncu-ui
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/OpenGLVersionChecker
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/QdstrmImporter
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
-			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
-			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
-		)
-
-		dobin builds/integration/nsight-compute/{ncu,ncu-ui}
-		eend $?
-
-		# remove rdma libs (unless USE=rdma)
-		if ! use rdma; then
-			rm -r "${ED}"/${cudadir}/${ncu_dir}/host/target-linux-x64/CollectX || die
-		fi
-
-		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
-		ebegin "Installing ${nsys_dir}"
-		mv builds/nsight_systems builds/${nsys_dir} || die
-		doins -r builds/${nsys_dir}
-
-		# check this list on every bump
-		exes+=(
-			${nsys_dir}/host-linux-x64/nsys-ui
-			${nsys_dir}/host-linux-x64/nsys-ui.bin
-			${nsys_dir}/host-linux-x64/ResolveSymbols
-			${nsys_dir}/host-linux-x64/ImportNvtxt
-			${nsys_dir}/host-linux-x64/CrashReporter
-			${nsys_dir}/host-linux-x64/QdstrmImporter
-			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
-			${nsys_dir}/target-linux-x64/nsys
-			${nsys_dir}/target-linux-x64/launcher
-			${nsys_dir}/target-linux-x64/nvgpucs
-			${nsys_dir}/target-linux-x64/nsys-launcher
-			${nsys_dir}/target-linux-x64/sqlite3
-			${nsys_dir}/target-linux-x64/python/bin/python
-			${nsys_dir}/target-linux-x64/CudaGpuInfoDumper
-		)
-
-		# remove rdma libs (unless USE=rdma)
-		if ! use rdma; then
-			rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-x64/CollectX || die
-		fi
-
-		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-ui}
-		eend $?
-
-		# nsight scripts and binaries need to have their executable bit set, #691284
-		for f in "${exes[@]}"; do
-			fperms +x ${cudadir}/${f}
-		done
-
-		# fix broken RPATHs
-		patchelf --set-rpath '$ORIGIN' \
-		"${ED}"/${cudadir}/${ncu_dir}/host/{linux-desktop-glibc_2_11_3-x64,target-linux-x64}/{libarrow.so,libparquet.so.500.0.0} || die
-		patchelf --set-rpath '$ORIGIN' \
-		"${ED}"/${cudadir}/${nsys_dir}/{host-linux-x64,target-linux-x64}/{libarrow.so,libparquet.so.500.0.0} || die
-
-		# remove foreign archs (triggers SONAME warning, #749903)
-		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
-
-		# unbundle libstdc++
-		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6 || die
-
-		# unbundle openssl
-		rm "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/lib{crypto,ssl}.so* || die
-		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/lib{crypto,ssl}.so* || die
-
-		# unbundle libpfm
-		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* || die
-
-		# TODO: unbundle qt5
-		# TODO: unbundle boost
-		# TODO: unbundle icu
-		# TODO: unbundle mesa
-		# TODO: unbundle libSshClient
-		# TODO: unbundle sqlite
-	fi
-
-	if use examples; then
-		local exes=(
-			extras/demo_suite/bandwidthTest
-			extras/demo_suite/busGrind
-			extras/demo_suite/deviceQuery
-			extras/demo_suite/nbody
-			extras/demo_suite/oceanFFT
-			extras/demo_suite/randomFog
-			extras/demo_suite/vectorAdd
-		)
-
-		# set executable bit on demo_suite binaries
-		for f in "${exes[@]}"; do
-			fperms +x ${cudadir}/${f}
-		done
-	else
-		rm -r "${ED}"/${cudadir}/extras/demo_suite || die
-	fi
-
-	# remove rdma libs (unless USE=rdma)
-	if ! use rdma; then
-		rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/libcufile_rdma* || die
-	fi
-
-	# Add include and lib symlinks
-	dosym targets/x86_64-linux/include ${cudadir}/include
-	dosym targets/x86_64-linux/lib ${cudadir}/lib64
-
-	# Remove bad symlinks
-	rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
-	rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/lib64 || die
-
-	# Remove dead gdb plugins
-	if use debugger; then
-		rm "${ED}"/${cudadir}/bin/cuda-gdb-python3.{8,9}-tui || die
-	fi
-
-	newenvd - 99cuda <<-EOF
-		PATH=${ecudadir}/bin${pathextradirs}
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
-	EOF
-
-	# Cuda prepackages libraries, don't revdep-build on them
-	insinto /etc/revdep-rebuild
-	newins - 80${PN} <<-EOF
-		SEARCH_DIRS_MASK="${ecudadir}"
-	EOF
-
-	# https://bugs.gentoo.org/926116
-	insinto /etc/sandbox.d
-	newins - 80${PN} <<-EOF
-		SANDBOX_PREDICT="/proc/self/task"
-	EOF
-}
-
-pkg_postinst_check() {
-	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
-	local b="0.0"
-	local v
-	for v in ${a}; do
-		ver_test "${v}" -gt "${b}" && b="${v}"
-	done
-
-	# if gcc and if not gcc-version is at least greatest supported
-	if tc-is-gcc && \
-		ver_test $(gcc-version) -gt "${b}"; then
-			ewarn
-			ewarn "gcc > ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			ewarn
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-
-	if use profiler || use nsight; then
-		einfo
-		einfo "nvidia-drivers restrict access to performance counters."
-		einfo "You'll need to either run profiling tools (nvprof, nsight) "
-		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
-		einfo "a modprobe configuration file "
-		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
-		einfo
-		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
-		einfo
-	fi
-}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 2cf69b8b08cd..41f20640337c 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -2,9 +2,11 @@ DIST pkgconf-1.8.1.tar.xz 302372 BLAKE2B 591961f0b1fd185834fd8e2a672199cffc03513
 DIST pkgconf-2.1.1.tar.xz 311956 BLAKE2B b59e57b1118bb75bc946a1e65e037a172c2ade3a7b9da8404b3598833cd091600045de151f2db06453b23563501b2dff7fdda8967e14c0c933ac50d28ddb3cd0 SHA512 cdf0998cd87f6d5e5a6560037eb847fd9613d237858d26eec321c42f54ca40ac72b6749c48c5b32611841d701393b1217bdb6c0cba5efd2c138be10d0e8fb32d
 DIST pkgconf-2.2.0.tar.xz 311920 BLAKE2B c2a89e932e7671785799f4b82beb75e92f246c152c03e88c847cedef39f2123da0544ff914d1c1512b8616f8b8cfd9f5115b33560042bcfa7ac5f78c0ceb2a27 SHA512 c4ff254c7323bdebc2595037df60e33f17fc5c222d7500a4b9d8b18c8b451ac35cd3ac90d31c920c23e9495ece2b82422de61e13286d43de3a5d1fe8211bd944
 DIST pkgconf-2.3.0.tar.xz 316160 BLAKE2B cca3476df0b79cdbca798ed3a067611414e9b422e8347d0f490e7c4d0c43cdd2c7b586ac11e028a8df365d4ea4194f46b1d9fc0acd0f5fd6b4a5548673a8f853 SHA512 869fe0a7a2e06e9da37ff672b991dad60a9a7c9df2c65b78b2aa70dba10920650fb946d5a9c8019ea54a510835acc2eb4244092fa36d0339bd6764ff84e8542c
+DIST pkgconf-2.4.1.tar.xz 320924 BLAKE2B c0c9ddd2d249e0a59bd36fe8413e781678fc39470c05344ad38ab51a6c2065ec1a829b166553d1cd52cfa59e38cecb041830cd14bf139b03bc740fe6eb311d70 SHA512 f8e5b17dfb247ac7402494758b722b069f404e3046f3127b1e0485d49d3ef1abcae73d2bef968f28a74a12e89eaf913c7e6b67b326735a168d75bee277c071e5
 EBUILD pkgconf-1.8.1.ebuild 1551 BLAKE2B 2b42672b35fe644eea22e86ad1b3cdf1631a23d2c1f8d10f190e3f70c7701202b8648be766ca850ee5e1dcd98c35acd3e8ddeb9a4dd6dd258d3ae3b9b7f21c17 SHA512 efdc1b8653af1cadcacd10be802886141601569a1a936dbeb0c18def909d667e22026b3af199e7cb1a4bdb32f640f0cf9b8841f13be9ad5bda3e479eb85e2105
 EBUILD pkgconf-2.1.1.ebuild 1621 BLAKE2B 867c6c220f3bec14a5b87edab790bcfbd273dbc34cd67a4ad0dc610229590ccc8ca3e5b6e2c0624637f007400fbfbdec6f0488f4c788dfa4238211c80038e270 SHA512 57e97efec973dad315f0789562ae6613f1e175ee48f8814394a1158a92c76b7f2f6f3af6c6f8428e909f38c04ba0042aec9ad79d5226e4bddf44e91feb248537
 EBUILD pkgconf-2.2.0.ebuild 1621 BLAKE2B 6ce0acecf10de80426ea609cc4793250e0b26c778dc0a82b6b5ae2137feec67f4d481863bc9deed9fcdaab327beb3bb97041d93bf476cac9ade6bfb85adeb828 SHA512 ee160fcbf02af08f8ac70c11542db76a94d653b980be6638e50d3071145552c597a367e278847d714473f31746a92ac008bdadf50a1999c122cbe1a7de403f1c
 EBUILD pkgconf-2.3.0.ebuild 1621 BLAKE2B 6ce0acecf10de80426ea609cc4793250e0b26c778dc0a82b6b5ae2137feec67f4d481863bc9deed9fcdaab327beb3bb97041d93bf476cac9ade6bfb85adeb828 SHA512 ee160fcbf02af08f8ac70c11542db76a94d653b980be6638e50d3071145552c597a367e278847d714473f31746a92ac008bdadf50a1999c122cbe1a7de403f1c
-EBUILD pkgconf-9999.ebuild 1629 BLAKE2B 75241cc2ea76b0775dc070f773d551c43fb8e07f6cb28e597b9fe01abb401a4f208581648ea22842b11403146e7ae23e7e65d4da3c5b6d66ff0b956ce629525e SHA512 00065b6c7745731f47f782d9b8ddda9b82f7931904d418dc80528d74382e737c233e10b3d62872b779cafb9011913fa16dab4c3093bfebd62b5d0f11f1e73fcb
+EBUILD pkgconf-2.4.1.ebuild 1629 BLAKE2B f5221f46b2116b319cc76a71e62d1dedc61b9be51364864216b2a57d5bbc34a8d5efebaeef0351c4a9487eea395cfea14ddab38835b48e5a4b6454d821fd7553 SHA512 3f7acfe2afeec99c6d221a36ccae91865ca47335edb571f98eb653f30f255e04f343bb343a808fec477548ea28369776b5cbf62ba7184ab55cb28a5839209509
+EBUILD pkgconf-9999.ebuild 1629 BLAKE2B f5221f46b2116b319cc76a71e62d1dedc61b9be51364864216b2a57d5bbc34a8d5efebaeef0351c4a9487eea395cfea14ddab38835b48e5a4b6454d821fd7553 SHA512 3f7acfe2afeec99c6d221a36ccae91865ca47335edb571f98eb653f30f255e04f343bb343a808fec477548ea28369776b5cbf62ba7184ab55cb28a5839209509
 MISC metadata.xml 667 BLAKE2B 38e2c6be57a2584630a634e98651c4cd6d86df6130cba3108c174dab434c5c0f0322a297543106fe543984c44e51c02eaeaa70a841f7fe1c5f70a48595d43b07 SHA512 30813cedabd5bb71c64e74c788d6c2c909d00aa78864a7fb1d2388ff9db23ddb4a8032dfc5767baa585467852a9b423b5c3b04ca22abf299030d196c1534f392
diff --git a/dev-util/pkgconf/pkgconf-2.4.1.ebuild b/dev-util/pkgconf/pkgconf-2.4.1.ebuild
new file mode 100644
index 000000000000..67f2eeb9a923
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-2.4.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2012-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
+else
+	SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
+HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
+
+LICENSE="ISC"
+SLOT="0/6"
+IUSE="+native-symlinks test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+RDEPEND="!dev-util/pkgconfig"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/pkgconf$(get_exeext)
+		/usr/bin/pkg-config$(get_exeext)
+	)
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-system-includedir="${EPREFIX}/usr/include"
+		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
+	default
+}
+
+multilib_src_install() {
+	default
+
+	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
+	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use native-symlinks; then
+		rm "${ED}"/usr/bin/{pkgconf,pkg-config}$(get_exeext) || die
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index d11205b46a0d..67f2eeb9a923 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2024 Gentoo Authors
+# Copyright 2012-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ DESCRIPTION="pkg-config compatible replacement with no dependencies other than C
 HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
 
 LICENSE="ISC"
-SLOT="0/5"
+SLOT="0/6"
 IUSE="+native-symlinks test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-util/sh/Manifest b/dev-util/sh/Manifest
index 0430cac4ee34..16531ea16d64 100644
--- a/dev-util/sh/Manifest
+++ b/dev-util/sh/Manifest
@@ -1,10 +1,7 @@
-DIST sh-3.7.0-deps.tar.xz 9776560 BLAKE2B 2376bba34d0b57897f748ce277b8c40da2ac98ad518e516868c442a521b24e4e19016b26dd0e889157781fa75cc7f945dea72a0451937a3bef24d65149d8de7b SHA512 3baf5276b1916e726a99b47dcf1319fb9a015e6096d8dbd430df478f9dbc1ecbcffcb82de72efbb455aa4a6dc17437e00287df27abd2e7e126253171d7024a9e
-DIST sh-3.7.0.tar.gz 219380 BLAKE2B 5de1f5576f3e92f5cc892da730b62640b0922f879005e844b3e0b0d84a4e8f1a5f76e89c53152dd3de11c67da20411c5bddd44627ab31b66a72f950b1bf03393 SHA512 5869b68d4bb59907ff7543019e02e8e1efee5963475763b2b2daf0b1ef8621d919d54978a50e52d865b5b76b188c821fecb673e6a9ce42b30cd9907a020e6387
-DIST sh-3.8.0-deps.tar.xz 3129756 BLAKE2B e8a7a6f4a699b55d2b2533065ff0030777fddcb444606889cbf0b811715e89af8f97fb28d1ed71e8bb9ee07517cf71930c03151c2f102c316902e6b55141ee85 SHA512 1bb8776d308aea471051002ba2c426d6a59b354e3615561e33f42938c55472e402b037651db8307d593be0489df30a0d99be3a4e0d75972a85266facebdab32e
-DIST sh-3.8.0.tar.gz 221631 BLAKE2B b2235c88d2601c0c223b8bc55682ee7490da7bf97696fdf3fa32787e5ef123bf4072e281daf29851695b590fe93f7bf180b03558974ad726fab10f799881ec92 SHA512 fbeba1883f9458c480663c31d51beaffb780205f5251cae956f6582d494109e21e062e444f7436db220fb647e833ec48498fa1f75daa7fa7ec88ba1f564d4213
+DIST sh-3.11.0-deps.tar.xz 3140668 BLAKE2B 42b3c30ad0722134b1284ef128b7c8613c7aea5820a641c4834c65f4d5ee9cd47544775a6724c00ec7afcabb5e6b7635515748fbd823ff919ffe1eef14e865fe SHA512 dfaf35f9873aebd71da1632822aa39c04d81da935185e631b605b72931ebd26d123a693ac5d5540fdb0f9a0e4bc8fd5ee1aeceebde59fac37674b89f65d3c603
+DIST sh-3.11.0.tar.gz 231996 BLAKE2B 0545d2955d55ee20707d773820488747e3302e5a032b5932616ffc9aff806082390c2fb5b2565dc7daf049f1bfa22bacb0561ebf90e2b6271b0a07918f7a4810 SHA512 eaa39732db8a9515bfd72ac5649021a1485545892a3b88e46f9188bd6311484eb864e21c593d57d0c7a9ee66e3ca2436187d5c7fc3148d897649870feb8f3d50
 DIST sh-3.9.0-deps.tar.xz 3099656 BLAKE2B 8ec6608ba97825e9d4589978c76464777c276d02a56d5a27e08469aaa88791e42e633618c6b01025c981e3ef4f819e27cd155765b7dce9547561ceb33dbd57f7 SHA512 78412277e7882b8d68adbc71011646e0b189371bd6e033ed783c4ee7bf48fce5249c5e6fc25b6c700634a000053b92b2e8fb2ebebeb7e8285183e59880fba74e
 DIST sh-3.9.0.tar.gz 224822 BLAKE2B b20e46fdc6db39efe54434a455dbd407af63e9b48dd616a895215047990ffcc42e0fabfd93607a0c4f5f50c64cc789616dfb5c8e685443451091cf2b99c7e64e SHA512 8e1ca255223d34fc5cdf8141b99029f1da5e3cdfdaea0c9838d68ed0eb9418b5bf7d363332919a632592c3d433fc40f1ae0b4df6bbfb20ff62d857325c4f10bf
-EBUILD sh-3.7.0.ebuild 1136 BLAKE2B ef6ba3861e8d11ae56f86813e34debfef3e1b41a01747008a3cf2fd9bf68dbf57fc88606a8be2df3b4ea95fdb3ef2dd83493c7892597125fa0d98e701f380dc5 SHA512 daf31cd0b5007e1be410c1839d9e96b8fd3b46515c7a009658834791974fda02bc1c694027b75a2accd227ff8846601f3ee8038547b79dde0db4f87d85eb2374
-EBUILD sh-3.8.0.ebuild 854 BLAKE2B 5d86ee4ae91a99632a0576c966efd0ffa65acf7851e4f31248d5275112a78ba42f11db1073f02f93f87d9c5b1ccdc98fc39cbe3241448ae95e8f8d866190d0e5 SHA512 51e1d900b3bc8785cf0afcb8e5258f242b13d8a277c72d2909bc9d6b8d14e10f7bee4161bf6e2fc928605582203e5cc6e957622ff6eb6adb27ed88331f99d636
+EBUILD sh-3.11.0.ebuild 892 BLAKE2B f8080dda1a2518525ebb75debf3ae513d45902011de10cd4c5e8eff18cf2fd16de4d14de160d37152d0d46d755f07258e1629b31122fd71069400bfdb636c0d5 SHA512 426c79f9ced88e2aeb6e740fc22c163f54bd433519902c16748f0d3022b18f7053a6b981adf60252b9ee32dadb296f269d7516dea4fc92f1067f35b6290b5086
 EBUILD sh-3.9.0.ebuild 854 BLAKE2B 5d86ee4ae91a99632a0576c966efd0ffa65acf7851e4f31248d5275112a78ba42f11db1073f02f93f87d9c5b1ccdc98fc39cbe3241448ae95e8f8d866190d0e5 SHA512 51e1d900b3bc8785cf0afcb8e5258f242b13d8a277c72d2909bc9d6b8d14e10f7bee4161bf6e2fc928605582203e5cc6e957622ff6eb6adb27ed88331f99d636
 MISC metadata.xml 717 BLAKE2B 0f9d6a11056a5a0ba6e297601a55b88ea86ee47d08dba0da2b4367c71f2a8e5876f0513f4fc31fd0b63905ad89a9da57b95a90ecb2efce8009ef1f23dc14a109 SHA512 b9ad5206fb1d1e3e22751c6619f998635d8f17d31b75b9cc4e99516eff8ce875b4dc8597c5c25b16cc684312b3e3b458a674f5be557f4c286cf3a374716c8863
diff --git a/dev-util/sh/sh-3.8.0.ebuild b/dev-util/sh/sh-3.11.0.ebuild
index 6aa0a0969770..710d050d71fd 100644
--- a/dev-util/sh/sh-3.8.0.ebuild
+++ b/dev-util/sh/sh-3.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,9 @@ SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
 S="${WORKDIR}/${PN//fmt/}-${PV}"
 
-LICENSE="Apache-2.0 BSD"
+LICENSE="BSD"
+# Dependent licenses
+LICENSE+="  Apache-2.0 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 BDEPEND="app-text/scdoc"
diff --git a/dev-util/sh/sh-3.7.0.ebuild b/dev-util/sh/sh-3.7.0.ebuild
deleted file mode 100644
index c85de409caf7..000000000000
--- a/dev-util/sh/sh-3.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="A shell parser, formatter, and interpreter with bash support"
-HOMEPAGE="https://github.com/mvdan/sh"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/mvdan/sh.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	S="${WORKDIR}/${PN//fmt/}-${PV}"
-fi
-
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-IUSE="+man"
-
-BDEPEND="man? ( app-text/scdoc )"
-
-src_unpack() {
-	default
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	fi
-}
-
-src_compile() {
-	# Not bothering with gosh for now as it's very new
-	# https://github.com/mvdan/sh#gosh
-	ego build ./cmd/shfmt
-	if use man; then
-		scdoc <cmd/shfmt/shfmt.1.scd >shfmt.1 || die "conversation of man page failed"
-	fi
-}
-
-src_test() {
-	cd syntax || die
-	ego test -run=-
-}
-
-src_install() {
-	dobin shfmt
-	if use man; then
-		doman shfmt.1
-	fi
-}