gentoo auto-resync : 19:07:2024 - 12:29:09

21 files changed, 508 insertions, 334 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 08a7cde3f326..e6496e058d18 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest
index a73ffda6957d..5c404d6d0838 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -1,6 +1,8 @@
 DIST mesa-24.0.9.tar.xz 20197892 BLAKE2B 3c68e544898031fe76a57ea754f46ede5b105c259d13dd484eaa63fe51b7d52cf76a4084529b11a586c4d8d06f4cb32f993fd1ea4e6ccc4cbc91e78fe755743a SHA512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5
 DIST mesa-24.1.3.tar.xz 29086488 BLAKE2B 2e8e4ee98f904aa02f304a6c3cbbb81d04802203e270e6b8ad2b7a62b334ac28f5e91687d7a92501f66b0043255a533d024537ff5ef3f2f03d986e46a7272eeb SHA512 db4071ac80747397023762d6e0355b001f4e942cdc706c67f8aced80e162058667c02a0dc0804a45afc2656cb65d8b16e17148bc03f0a1692067ec170f193c1a
+DIST mesa-24.1.4.tar.xz 29106920 BLAKE2B 2109fc604858a0927271d7b1edb76a24514acac6117e564c6999c99f068624964f5cf0b7d022cac5726e432353a32a5278b3aa00b64dd4118bb2f0b7123c3b41 SHA512 0293f1493685888e5d2f0e616645c937e5a9c348fcb654b050b7c42bfdade1518c508920e456cf8be0033dceab4570a916db87dbb454174e425d91e9c05d0748
 EBUILD intel_clc-24.0.9.ebuild 1741 BLAKE2B b4fc7184409bedcfec1cd559149b7d57b9a5bd708cc4aea847c47573cd194804e3435a15120914fadc4bd5f9172e946d93a9164a875809feae2cc7589a36f74e SHA512 d9825be298668fb6bc933ff6131c5a2d18b76bbcb9b6ca2176512d7a4273cf42f5fe00097478a4cd3e9c678fa53c8a95f83115c4f569ac37eebe940749ba340e
 EBUILD intel_clc-24.1.3.ebuild 1747 BLAKE2B 4cb4efc5074e18226021fc2b9233b03544ae56b0e84c1678e0ac809ace3295eda50c952cd991eda23b0ea22eec659abf617ccb1faa5edb57058b6e6c10a5fba2 SHA512 9a21ac0d5656f43eb721c1b5f7aa90b0fa95333f18f68bdd3936a7b9452f00bbe53db37aa7626c910d7be9f953128ead58307b0e4272eb0e88705151b5dcd8aa
+EBUILD intel_clc-24.1.4.ebuild 1748 BLAKE2B 1546870b9ef18aeaa21da10acf8edd2875015453e22dc15ee3c2bf6e37afab1454f83040af343c7fec75d5fcdd8819e4ff0a8f56f27691b6a78c6d5438601efc SHA512 3981e62ce60c42485d2faedf58ff68f261d264c5d0fa891b0db41cbc1427a9cdd761b2119afbbd04f37b5ec34d9ec516cff233a31445d72af0962b570e0f3c1b
 EBUILD intel_clc-9999.ebuild 1748 BLAKE2B 1546870b9ef18aeaa21da10acf8edd2875015453e22dc15ee3c2bf6e37afab1454f83040af343c7fec75d5fcdd8819e4ff0a8f56f27691b6a78c6d5438601efc SHA512 3981e62ce60c42485d2faedf58ff68f261d264c5d0fa891b0db41cbc1427a9cdd761b2119afbbd04f37b5ec34d9ec516cff233a31445d72af0962b570e0f3c1b
 MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a
diff --git a/dev-util/intel_clc/intel_clc-24.1.4.ebuild b/dev-util/intel_clc/intel_clc-24.1.4.ebuild
new file mode 100644
index 000000000000..df38191345d0
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-24.1.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {16..18} )
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit llvm-r1 meson python-any-r1
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
+HOMEPAGE="https://mesa3d.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/intel_clc-${MY_PV}"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/mesa-${MY_PV}"
+	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libclc
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+	')
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	local emesonargs=(
+		-Dllvm=enabled
+		-Dshared-llvm=enabled
+		-Dintel-clc=enabled
+
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+
+		# Set platforms empty to avoid the default "auto" setting. If
+		# platforms is empty meson.build will add surfaceless.
+		-Dplatforms=''
+
+		-Dglx=disabled
+		-Dlibunwind=disabled
+		-Dzstd=disabled
+
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
+}
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index b6bb49342f38..636fcd004719 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -1,13 +1,7 @@
 DIST lttng-modules-2.12.5.tar.bz2 317002 BLAKE2B 9f42f8641dca7ce55e7445495c747ce340919458a23b4d471998fe2a28dd26bc7dfa5edbccf0b11877176091dee0c4d63fdda919c03afc8dad3fcfb7e9529c33 SHA512 81524dac513384852555a6f5619dc10286a2f7d4e3032ee9ca33705e830ee3bc3dc8c96b89a9c09dd5df2bf29944e3e566d1ac1a6cd6be83718af9836e043991
-DIST lttng-modules-2.12.6.tar.bz2 318479 BLAKE2B 7cac6dd7dcb12801a32179ced4bb141a7af87c864eb71b793e65b905e4a0ba3d3273609bd3cd80c9c1251914a39e62da0a85e18058480da0c4eb2d6eb44f851c SHA512 608112b960d47ed5f979c7f2de2886d3fbe78a0d2eaec0892bfbca92bdad423e8ba8c3960836f71045c79d9c1b9eac88757400726656e98fb0ae70035e0073aa
 DIST lttng-modules-2.12.8.tar.bz2 319450 BLAKE2B 0ce5c6675598c1a4b6fbc0dfaf51d36638f12fe2e07095c37a811db8d7ee65bb242164cf02b1854c27b6894f0b4c73867e8ee1b80dd007290e0db203ea429f9e SHA512 5918a54d08a12cec567cdad2909846ba529d5e665a3592a69384d9546f6f3e23e7975876fc11feaef65604d36889b0598b1cf7b5f2badb4e2b11b255a2e7ca99
 DIST lttng-modules-2.13.10.tar.bz2 350692 BLAKE2B a7596586adb63e3d7cdd849b4e6a4812409749c7e84f081d5367f3d5393884f8ae3e945597500336befac14191e84179decfd5153dff6cdcaed2d041055c268e SHA512 21c21bc186c0cf8465e411fdeeb09ce9f11fc0499915abaa086a2143ddc69905805b83847dad7e7c54aef4e61a9fc5507af5f25e478b2edd387309c7ca525b6f
-DIST lttng-modules-2.13.3.tar.bz2 343593 BLAKE2B a0c914af0118327cb6d785c7c018d2d9cbd2139bbc3e0524a9c96832c7214fea7fc2a0dd8a8770db0728aba6ca3e9f30ea6e790575fb4d3492d9a7485993f293 SHA512 a0329c4709cc1a5fcc8d667d7435bc57b37cfa95da5451a8ee6ab700f334365e2d78e085e537376948dfe95d433016be5f6e3b5e5aa34a05948d4fa42f9102a1
-DIST lttng-modules-2.13.7.tar.bz2 348121 BLAKE2B 880ad964477de6c27675bf5dfbbf131fd7e0fd9e911a1314d08e7aa0307a6eb691a7c09e3d450ac8da5d0bdcb3973396322a72461bf3c9b6ef07f71ad0ba3b83 SHA512 60515e847389ce70f9d0dbc28e73d8a072ea6f509f8c5f7bcf35258d6fda68ddc1e195ac75d4cf24d9535fbe385367644afc37f2a42f0e50ee7b4adfbbb1b4dd
 EBUILD lttng-modules-2.12.5.ebuild 1003 BLAKE2B f832e877110422709d9b00c3b0dfdecf26d76e2c1d9e3d09db14aeef0a2b5b1709b3717b0f6997d4c9500e13c898e708bf24629ee07f09af46d78c42d290b804 SHA512 5575233587c9ef25a6bce7efb18a0a561f33be5eee32dc4f6151f50ab83bf722c7c6bafff3940bc66678cf89e5166f819c1781463b00641fe131c4740169afdf
-EBUILD lttng-modules-2.12.6.ebuild 1005 BLAKE2B b6b3c2a093735bddfbf64de28ce391138e8fc6c69d0e6176a8d818b3f34a6d9a4b14c8e146b59f1c023cbf5dc66eeed33fe41c7aadb905ace3e9884fbe4d2075 SHA512 7b18dafcaead0710c05183c5211ff107effa1da1d054042a065d13478fb9936700d3eb421a070be7d92be7174a58bc6256d69b1627848aae2ca40ac74560487d
 EBUILD lttng-modules-2.12.8.ebuild 1005 BLAKE2B a8e08c5a03b608ef3797e7311b25a0a240a4b488122bf6e7687b948d426b110028ba697b6768931e79832cc4c3cbe559211e90f8255854e9b683552f6ae13249 SHA512 99a879768a3be075681fe53e4654b0cca58176179e89ae23f68010c4b762583cd0983d5141ffc19db8bbeed631bb5d887354e28230cb4846209fefcbd1131009
 EBUILD lttng-modules-2.13.10.ebuild 3243 BLAKE2B 3c71de7d290e32ec9d55ae6c87e1ad76094605902ae9f8a165cf3ada0d980e1ddaefa4d87ea9682b3014d5284d31186522eed4ad6f3bca16c7e6a5682e043d55 SHA512 cfc3d7f10bd2ccd896b81771232b6ed155159cd4b00c9e26605f2cc9a70bc72b9dde47a1b17b12837659d3d9a0718fd156d6c4816c6c17eba548ca7f97596436
-EBUILD lttng-modules-2.13.3.ebuild 1000 BLAKE2B f3b0dafe272ece335909f92613a35d0cf59eeab008ca73ecc3a0be36f791b141bdebc768e73e86deec90567d22ae34638238de5d96e54b38456dc61e8001f175 SHA512 ed1931c8e6c899ff09125858380b05975f58a72e161d88a0a7351df8aabec44a86d3b80e52956205c61c13a3f4ff33cf7f59b8146d5744b4d60a6b476d999ed1
-EBUILD lttng-modules-2.13.7.ebuild 1000 BLAKE2B f3b0dafe272ece335909f92613a35d0cf59eeab008ca73ecc3a0be36f791b141bdebc768e73e86deec90567d22ae34638238de5d96e54b38456dc61e8001f175 SHA512 ed1931c8e6c899ff09125858380b05975f58a72e161d88a0a7351df8aabec44a86d3b80e52956205c61c13a3f4ff33cf7f59b8146d5744b4d60a6b476d999ed1
 MISC metadata.xml 706 BLAKE2B 69e1d3140cfc273f7a25098d0223a06548be4ff8d311c8b4cdbd9149d3bf0909d28c1c36b004ee055fd5f900a6c695bf64ec70ae74683da7677d2730d4096935 SHA512 15557b8ab069ff67273e7d05a836ae0875220705109150f2f1371e31eed5d4f398c46549a418e06651aca48f72a2b2411a12aad5f21f9544398cd8e217ad5162
diff --git a/dev-util/lttng-modules/lttng-modules-2.12.6.ebuild b/dev-util/lttng-modules/lttng-modules-2.12.6.ebuild
deleted file mode 100644
index 2936f980647d..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.12.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 3 0; then
-		eerror "${PN} require Linux kernel >= 3.0"
-		die "Please update your kernel!"
-	fi
-}
-
-src_compile() {
-	BUILD_FIXES="KERNELDIR=$KERNEL_DIR" linux-mod_src_compile
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md TODO
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.13.3.ebuild b/dev-util/lttng-modules/lttng-modules-2.13.3.ebuild
deleted file mode 100644
index de25ec1df638..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.13.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 3 0; then
-		eerror "${PN} require Linux kernel >= 3.0"
-		die "Please update your kernel!"
-	fi
-}
-
-src_compile() {
-	BUILD_FIXES="KERNELDIR=$KERNEL_DIR" linux-mod_src_compile
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.13.7.ebuild b/dev-util/lttng-modules/lttng-modules-2.13.7.ebuild
deleted file mode 100644
index de25ec1df638..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.13.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 3 0; then
-		eerror "${PN} require Linux kernel >= 3.0"
-		die "Please update your kernel!"
-	fi
-}
-
-src_compile() {
-	BUILD_FIXES="KERNELDIR=$KERNEL_DIR" linux-mod_src_compile
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md
-}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 9c937bfa6531..3b8844c470f3 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -1,17 +1,9 @@
 DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
 DIST lttng-ust-2.12.1.tar.bz2 859667 BLAKE2B 474d03ac0d3c1102ef085230659545f3e12bc0847cebab598f2998741741cb98ac139812a296992614dd90ed9478040ee0567822eb20e960e0a6489836274394 SHA512 6d5116a88be601f96513535ef7dfda409780cbacaab0831dc76b86070da60d5eac719d7020f70a6821e1c6dbbfae05ddf5a431662ef5a714fc200c2216eeb80e
-DIST lttng-ust-2.12.2.tar.bz2 861351 BLAKE2B 0c580285721b3d7932630c8d9f4a3606ee294596eef75fcf8b3c892ebdfaa1daae4cbfad1b6ef0ef93877b1f7dd143d97fa947758ab476e4a54e746d0f1e1e7e SHA512 e8734deb27b1a4c5efb81ebaa5c100079c1b3eac6b741b4f85487d1cb921d78d9ddf76040be56081404701b3053c6acc83a5d82667e3f49fcc4fa33392462eb8
-DIST lttng-ust-2.12.4.tar.bz2 772723 BLAKE2B cf9782d7b0ab39b1eeebd3f21a31d7a249c9f4f4b1c28746d27ad4dfc0196a4d71dd3d837bfa211ab98c1b555b79b4fa6b39b341312d8b5cc6c47708fa0e8963 SHA512 c2935c9aa63446ceeff1d6fe76367883a3b188c113fcc25c83848b4ee89497a614dfc0b32f920a0c5054c6208bc37899482d40938a1fc37ad890b7c5172fc20b
 DIST lttng-ust-2.12.9.tar.bz2 800795 BLAKE2B 467500f7fd0f473a5cd7af6c23e8f0f83516d57ad573f92c48354bbe1ea1d2fea08bd20d7675e7698adf2284a5069fd23d3a929bc11df0ba157a99091b543777 SHA512 5edaa6c015bccd710e7bfea136398e8bc784946c22933a011f4b31b9c13fa772c4f03d0c42543bf0d08a810922498ff1fa56d4bccd9c5b8c4b14925c849c6c9b
-DIST lttng-ust-2.13.2.tar.bz2 1327075 BLAKE2B 39296ba62fcf5518b16d67f196ab4788c78b41eeadb5f8037c2445ac13a95754e7723399f58f6b21734d8931ae0d68d1dea28b74759fd531fac6a9308817bc09 SHA512 2392b0aeabbaea6daf62a9c752a04ea3043e1cc2d93064b073fd4438beac0d30832aea9b2f158cc8b90b3d98f427bca2999cce4e873fa3f82e04693e13ed9fb3
-DIST lttng-ust-2.13.5.tar.bz2 1336658 BLAKE2B 0e61688c34c7d360829cdc6b265ac5ffb4186f4eddf7f5de10cd2e0b4ee7b570b59c43658c7d9b4853de40ca22add8ad6068047271d7587a43151ba9feba8532 SHA512 3bf969e9deb6ce05a1ae30ad48676ae8ff63a73198583e98ce083d52b78e9fc2d171a6e3890c201abfa364600d4471d1ee8b1ee23de3faeec1f0ca84e0f0acd4
 DIST lttng-ust-2.13.6.tar.bz2 1351915 BLAKE2B c350a7302e38035ef7c6727ea942907ec606c88862ae875bed0a7c833f233b4159405bcb7a41549dccf3d79491151066d593c52d9f06b95b61c345ccbace62f5 SHA512 15458f8dd0ad6fa96a9cf7569ffabadfddcaa70b822b69b39d4d7dfba3701c9489706b06f12f9d7e376147299fb3cfc6fe1213d46d510bdb7b3dc834271da55f
 EBUILD lttng-ust-2.12.0.ebuild 786 BLAKE2B 64652ad07761ab57fb396473ff814fa72b54d55db53ad0fc3c1c50a70c4e13915e8d5fa02e275ef99a8942bd9a1602b87642b411ed6abceb66be2cb8d0ffe344 SHA512 db5de27798866d4f880930bc55eee11499f9e518fc04f07058b4cc2922fefc00630ff5d0e9dabeca42844d4a97079ecba6a3fc9c700e3c1f3832ab5674e0e010
 EBUILD lttng-ust-2.12.1.ebuild 805 BLAKE2B d17d93ce40c9bc6371528c2e49b5d9628d69f3d382cb56a146cbedbd76e11de57c1a90a1cce71cd875b5240ffb1fbd28f33112a7a3ee86d9fc2656ecf2d29540 SHA512 65870e0d91137b0fb8378e4489465651b55a0ff86decedea0d826d4f7eac9cf0d7b2ebd7246704b085ab55e6f90be408229e3287ed0bb19fe6e664b65dbfd02f
-EBUILD lttng-ust-2.12.2.ebuild 807 BLAKE2B acdc598a8ece8bbfc7ea782fb10a4fb8986f59ded7428be8fbd9a11580ce0d1b5be0a046b1493d294320818d1d71c5af370c6d22ba720a1e4228859ef7fac6ee SHA512 df7e6a17c879366b5efc0c1b7a1a957ac78f07a4302a6a8c5f67d7269a94577765f6955692a28b8a36e65d5c75536d503e34a404de4dcb7faee230c2e855eda9
-EBUILD lttng-ust-2.12.4.ebuild 807 BLAKE2B de1a5a71db40f0b49d75205dd05f4ea404a8a983c90e25aa488da31bc71f7d296d97469e8f5b5d1fc832591c586c98a6990d7a7847389d0d98d13ff2666f2bf0 SHA512 bf58535651ac42457f7efbefff8d9d5a70d461604742a0b78fa4df5dccc9b78f193be3be4197f2a4115df0144a407d9213b968b399f870b296aa9297d08db05e
 EBUILD lttng-ust-2.12.9.ebuild 851 BLAKE2B cfc7ef0bf86b6c7d20338c87909022300b8c31161d2dd920c3ed0333661739b7043182242087a2a3386569167eccb43b250f3f7ae1692933ee12db72c5eca8b0 SHA512 9ce90fb2ade836dfc0e8431477989c74ebbb568e1ed5d2404fedfa0e0c789cae12ce7dad23ea3ed3a3e4a67d88ae7f32a8259108f112495b4edac002784ff2a6
-EBUILD lttng-ust-2.13.2.ebuild 814 BLAKE2B 9cca651a1ce78589833ba4c1cd762db4388f277f7ca571c84b5890cc1716ba7c9903457be4a55ab32bf474867b33c31b1ab4a23dcd843f4d8917c368243066e0 SHA512 09306977b8ab9e922ede046a3439017601522b80654347f07c6e893553d8b78eb8477884121f59b6feea8db0765c1113de1b2cc8684f4ea7455f6759c5818093
-EBUILD lttng-ust-2.13.5.ebuild 807 BLAKE2B 27c6bb7460ce70e0f8cd947336b237fd26cd7e9bc1eee874a2f25ddb7acd87a53ec8d926a0ef667338a7d3ae9263b5eea7b00568b687263ac206b65b12a461db SHA512 3eccc93785a2572a3832357467daa0105046ac2969ceab689c9324061413742bd37d2bd3af8ac455008707924f5a3138a632f8d96605e63d89fa15f4df667421
 EBUILD lttng-ust-2.13.6.ebuild 1113 BLAKE2B 11e734550e4c5519be93725f7ebb6809acde583c405ce3e01379bd8e54375cecbb9c9b3f1dcdbd1d8232c35891d7f00762fd7d7bb22e4fcbaf857e1c059e1969 SHA512 fde8ab7c76fc34eca64a1949722a6f0671b0317f4842ae930663c9b7a9b7a99a292b3d5af4aa73dfc50136ac09f018df1de12ba831531268feda1578f1fd2d2c
 MISC metadata.xml 708 BLAKE2B 8f87692839d2a77928c1f09ab4b7dbbf49c94409621833b2d01cf3b44b5d3fd456359bec1bc53c834cd96657fca9d4e6e403a924039d9114b89aeabc519115d7 SHA512 b4bb08c738e6d2e0f813b220f14c70f83074ee34180f997bd72569710ec0ff0374d079558332ee9e2addbc526d0c38441f2c1b06bc8de193edde5cf0728434e0
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.2.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.2.ebuild
deleted file mode 100644
index efe9ff12201c..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.12.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples numa"
-
-DEPEND="
-	dev-libs/userspace-rcu:=
-	numa? ( sys-process/numactl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	default
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable numa)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.4.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.4.ebuild
deleted file mode 100644
index 28e8ec940860..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.12.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples numa"
-
-DEPEND="
-	dev-libs/userspace-rcu:=
-	numa? ( sys-process/numactl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	default
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable numa)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.13.2.ebuild b/dev-util/lttng-ust/lttng-ust-2.13.2.ebuild
deleted file mode 100644
index c50f2434c11d..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.13.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples numa"
-
-DEPEND="
-	dev-libs/userspace-rcu:=
-	numa? ( sys-process/numactl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	default
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable numa)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.13.5.ebuild b/dev-util/lttng-ust/lttng-ust-2.13.5.ebuild
deleted file mode 100644
index 70f27a621cfa..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.13.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="examples numa"
-
-DEPEND="
-	dev-libs/userspace-rcu:=
-	numa? ( sys-process/numactl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	default
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable numa)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 21aff9b7fb22..e6801039a24c 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -4,9 +4,11 @@ DIST cuda_12.3.2_545.23.08_linux.run 4368514070 BLAKE2B bfb6239b7669636e2ef42492
 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
 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
 MISC metadata.xml 761 BLAKE2B a6ae653c6206cbc05349297499b6dde91bce6d543e10bd5ea915cfe9729dfa6f1eb954ae09c2e4d3997f51315ae090b38606c21b5099e750596ea66fdd93e817 SHA512 9133517d805201d25b651e48abed90394c88ef33a2571ab20b3b19d365f85a90478486c7c087c9150d7d9f6e4026873c5236c64ed649fd3bfc8f9b81479dcc59
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.5.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.5.1.ebuild
new file mode 100644
index 000000000000..8357955fde30
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.5.1.ebuild
@@ -0,0 +1,328 @@
+# 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.06"
+
+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/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index b564e4cd3bf4..1f1b6c80bce8 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -7,6 +7,6 @@ DIST pkgcheck-0.10.30.tar.gz 378098 BLAKE2B f80224d707f7656ca45f58932936e1ce780d
 EBUILD pkgcheck-0.10.27-r3.ebuild 2416 BLAKE2B 32b890aa40bb2827a074ba30f8a3db9d3958ca918c5cb3c16cf48aa49dcec56382221a0843898ffb2b9b996cf5f32fe60c325162dabeae5c4234e375ffa0d02f SHA512 fb062ca539a2ee5bea0ea8980b7b6f923defdbef2dbba1039c6f4665878dd6d3c9124987b80be0e576f6c66699841ac10928c449ebfcc43827144b582f7fa59c
 EBUILD pkgcheck-0.10.28-r2.ebuild 2331 BLAKE2B 0090512494d2ff2741d938d688f57eadbbe013c6708fd71af673669008673fd9eb660698a3576a10b4b02c4cf111aa1d142c08d80f44a7e0e6a31eb28fad89ca SHA512 d9de08af50e69d9ea98e1bee8bed0447fed65cded57fa171434df92fb4e15879cb18027667365d0bb98d6dc283d172ce6ef4117323eabba9cdc08ff6a52c255a
 EBUILD pkgcheck-0.10.29-r1.ebuild 2265 BLAKE2B 07df3c4de9de91102c70f4da1ecb42ba9e607afc1ad542038b6f97607c08f099ee3902a320cd1ed9c31186c418d85dde89249bb3f502c2f1c34eed93f34f2c91 SHA512 b8d3cafc37a7c978ec70a1c614f2c28f61f48550af70677e5c90b1157d548c3c4f1e8f55766f8d9dfe149a172bed171716771371164974a12e976f6a7e147f14
-EBUILD pkgcheck-0.10.30.ebuild 2205 BLAKE2B 9f328f690ff3f85b443fda734056b54920986feaa504a615691d8fdc91e49dcb1feb14492cc4847fecc6824eefec91ded4fae27dd2d95e8be40ed23137dd0563 SHA512 a3886c64d32c005dd830e6a5bfce1ea168e210ebc7274e692c2a0c5816d8dfc8c69177f96560c9626a2a7d8262423a20d1511ac9bf67b2345d9cace569cb228f
+EBUILD pkgcheck-0.10.30.ebuild 2211 BLAKE2B a4befeb95ba78b9cfd3b8984cc813ccbad8979a0614b90d0752ce77f19903d9ac88df4f8c97731ba3255722c4c4f57fc888bae547044e0dabd13bfdeaf4f8c25 SHA512 f0cfe316eda417f648d9bd8aedbfd233cb909f610e073f8298aff4ed449daa3fb3e34009013dd6ce24933e34ca6b0b0efc233b4a38606842bd0393542715361c
 EBUILD pkgcheck-9999.ebuild 2223 BLAKE2B 4981c0f78a1723d2de4c58c8d41ac5f8a104f55e928dd113c86f670b0d8abb675b6011951202b564470529bea692f8515e9c7a91261238dc3db44b0c858bb0ce SHA512 d0c59363ec3ddfdb14ec9b4acd2a71440d2fc973b852a0a7a7922ffb38e76b42321f134a48cc2e746b0aa614374db5f12240296cb536f35202268976a2ff21b1
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.30.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.30.ebuild
index 87be860a7d37..7b1c7d6a3044 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.30.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.30.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	inherit pypi
 fi
 
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 784933597c26..46b299cc8ab2 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,5 +1,5 @@
 DIST pkgdev-0.2.10.tar.gz 85476 BLAKE2B 2002daa38d445f90cbc2f17ad0e42045b32b5dcefdd85a3485b6e253d9703ad7e59119873718259874de32e7c50e4f5acbacc6c3b40770d55f4d38dbbd7805c4 SHA512 aa9f6465ba44ff67f2b160bc9249583c355e7cc807ce4c797cc8b6d2a4858414a82e702e47ff5b87dc0f6ba70b9c83d515c59a732406437e5325aa3ae7ff95aa
-EBUILD pkgdev-0.2.10-r1.ebuild 1806 BLAKE2B a88d950c46560d3c4ac4d4f6a2eae107b82ea47f0cfe8e14a3912704a921e731c878338b0b75455e57a84673d30d7a023342bf8805bad5e800bfa2a5d3a598de SHA512 f5f5dc1fb49c01fc88da77c1dce6b4a249ae332c39f2c53122d4b765a9dad3697bc84b573a38c4964412098ed7f476db5e168a6ea74e1137385f2217acb7683f
+EBUILD pkgdev-0.2.10-r1.ebuild 1812 BLAKE2B 2df7601bd1ef3ac3a7127df693be6a163fd6af632ab9b8cd000ef9dae13547788acb912e8ee270ceec97706b037e0493a7c9a66c1de310bedd7d926990004cab SHA512 cafc0e6ff84791b7dd4a4295c3453d324ce2fd318409f70f4a4272ae342b647eb3844a435a36711c307cbee4a55867570898fb729ccdb4785c5224e0827c6790
 EBUILD pkgdev-0.2.10.ebuild 1727 BLAKE2B e0d47b1da47f758d779e3056df523379d44bf558b8ef1e6722ce7549d90f8a28fa2bf3eae6fffa8c5a17b9fa971e8129f74561206cc1ee2c84bfe9ec7372e1de SHA512 497c7a6417c510ca3e4db16aa8fcf927ba6f59364dcac8153774e8f5e2e4f984422174278572f9eabba5a26664523bbbc3ea26927300039703b74a6a90f8bc12
 EBUILD pkgdev-9999.ebuild 1800 BLAKE2B 80454a0ceeb7eba037c74d6b49d4d4de95de732ececed704d90e00637d367a30d0fb96f664acd44868f64566522e1608395e45c141dd77e1141c80ead43e5b1e SHA512 8f9f5ef77ff5f13cb32607a78385180e3386e18869f361bb89af4826d00f4f1c8dd1b4104f73936b163eb99a0ae90c31e922bffa9401029a825947f74b2a3446
 MISC metadata.xml 449 BLAKE2B f440d395e5453394e7bcc857ccd07b6735bce1b68b3e4ce9d33068c28c5794f6ba65d7394ed6f585dcd3e58ccd3f49ecee4d001ff4e40893db721b5ac869f7ae SHA512 a07c315d071af0ad53ee79f9db3cfd1a8acbdbabfad960cf64025eea1a3759f1ef7d5dcf71bf07b17cbfb6f912513edf118c28d3c24de06223a7a3420cc4438d
diff --git a/dev-util/pkgdev/pkgdev-0.2.10-r1.ebuild b/dev-util/pkgdev/pkgdev-0.2.10-r1.ebuild
index 23adc3795862..04b9b310c02c 100644
--- a/dev-util/pkgdev/pkgdev-0.2.10-r1.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.2.10-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 6e3e1834c9e6..f9ab7126d783 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -2,6 +2,7 @@ AUX watchman-2022.02.28.00-libatomic.patch 2254 BLAKE2B 4eec2caf20f9c892bd9d2a79
 AUX watchman-2022.08.08.00-musl-fsword-fix.patch 908 BLAKE2B 79cffe220bde36cada12da0136f7e696151f59763cf07a774fd4da800b362b1943ed99e773751e9e4ff9aa2537812a975f166bc1b60790e22b90e329ac8e5e82 SHA512 82853ce11da25f109c1e58e16d4bdc81d8a4824865763d036a95ac6a2c49077443ec41b1bd1f6c30cfa55595413dc9b6d6c7c69c4bedce9d82cf32de3909cd7e
 AUX watchman-2023.01.16.00-python-working-dir.patch 2270 BLAKE2B 169486ea5b0a585d33f177a4a3746ab0ae5b1fde239cc7fb0ad832ec8946de1d1d3b6b4d3344b0c8552fa4fa8e88ab4ba9e820aadbfafd7fee5d07aac51ce059 SHA512 b46d710fa00ef75f4331fd2451b7faa9edb5901f5b35fe8e34b05931064224d5fd29033b3ab7132f25073a2cd8a8294d673cae2ee88962ce1e6c877597ef5ca1
 AUX watchman-2023.06.19.00-rust-1.70-avoidance.patch 1355 BLAKE2B 30f95b1c644ae85e179992ca2a85e6d3d83014a2c66a01b5572fefd97b6b2a0547bae7e1b9317f1933e13584e67cf5d5752e67cb79324f3051f82c418a51cd79 SHA512 12f8bcba588a47d1de6154af416edc37177d64adb906b79624642335e88764d5c41c919e1ba88b934fd39bc8489f223efc8aadea78d8197f7deddc80830adcbf
+AUX watchman-2023.06.19.00-unused.patch 2706 BLAKE2B e0cc2101620cdebddd4529b7b80e238a39324d892f269f7e2ce117908adf1b8787c1268a166197e377971a59660778dd7983aeb7abcf96fc6b1648a8c88bb622 SHA512 4410875ed07b9c294f5ce6533f18872b9fe31c8356fe49ab98e72480eafb0b932484a8ad786561d08b85aec593dfce23aa4e98bd83376db14a50dd031dace018
 AUX watchman.tmpfiles 32 BLAKE2B 88c6a5c4b1d7a35d4ed485ab1e7ba0e18a8433d176318f69e77030d4980931876fdd8d1811e0af8c924c89c358cffb7cc9ab4effbc363cfae8adc6d88597313a SHA512 5c4230d23a045704efd5851abe0cb4c6e9eba91e128bbfc677e231868ea161364055fea65800a9b8bec61d95c6a2824dffa536755e12d3b6599a81cdea5c063b
 DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
@@ -108,5 +109,5 @@ DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65
 DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
 DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
-EBUILD watchman-2023.06.19.00.ebuild 5463 BLAKE2B f08b0861f87e84451e669f5f9f04d57eba8ab966f68362931a932835740bb581dd1c68a19137da883801c5f07a72c4d6b5113b855013278d31d2d85b4b3470eb SHA512 d924851069f5bac429d9a6a4dd47ad61d67f88777e9b61adf4e33834fd54c9686d521ee5cc357ad81589a414d89caad14e29b6669efdf48c2a9cdd3d07838902
+EBUILD watchman-2023.06.19.00.ebuild 5511 BLAKE2B 26696ecff940a4822c43d62e84b324bde0e6c501592505b6896584142228f329605811497157e9ff47929726411550a7a2d26048fa77cfe3b09e01d3b740e6f3 SHA512 7043e9f58fb6ed9beb458cb2b9368581e264ca425747647f23283387dbcb5950b8ec9def9dadd04696ada3e88a399d3d68f35fe19b63e82e7f006c684ac39ffc
 MISC metadata.xml 429 BLAKE2B e69d0fb854d42a000fdc5609c7c6a12b8928eef97630b9043813a44da1bb24639648cf8a412ae7a2d0c0b7e058e2a2df65d33ee7f5198c1aea3253106d43cc75 SHA512 bf683e13fc81e5bfea3dcd80edf4a10fdae95807074035e0f8a63be4d7137488a92396b7bdcdbff5a539922f6d3fd57b67c5e5720a27b3d471d29c96b3b061ff
diff --git a/dev-util/watchman/files/watchman-2023.06.19.00-unused.patch b/dev-util/watchman/files/watchman-2023.06.19.00-unused.patch
new file mode 100644
index 000000000000..fe8728f9cf71
--- /dev/null
+++ b/dev-util/watchman/files/watchman-2023.06.19.00-unused.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/936225
+https://github.com/facebook/watchman/commit/c3536143cab534cdd9696eb3e2d03c4ac1e2f883
+
+From c3536143cab534cdd9696eb3e2d03c4ac1e2f883 Mon Sep 17 00:00:00 2001
+From: Jun Wu <quark@meta.com>
+Date: Tue, 18 Jun 2024 15:23:48 -0700
+Subject: [PATCH] rust: relax deny(warnings) to internal-only
+
+Summary:
+`deny(warnings)` makes the code fragile with subtle compiler differences
+(upgrade, or internal vs external configuration).
+
+For example, the external rustc complains:
+
+  C:\src\watchman\watchman\rust\watchman_client>cargo check
+      Checking watchman_client v0.9.0 (C:\open\watchman\watchman\rust\watchman_client)
+  error: field `unilateral` is never read
+     --> src\lib.rs:589:17
+      |
+  588 |         pub struct Unilateral {
+      |                    ---------- field in this struct
+  589 |             pub unilateral: bool,
+      |                 ^^^^^^^^^^
+      |
+      = note: `Unilateral` has a derived impl for the trait `Debug`, but this is intentionally ignored during dead code analysis
+
+while the internal one doesn't:
+
+  watchman/rust/watchman_client % arc rust-check --flagfile fbcode//mode/win  :watchman_client
+  ..
+  BXL SUCCEEDED
+
+It seems a bad idea to publish an internally-green code that fails to compile
+externally, or has to upgrade the code every time a compiler upgrade detects
+some new issues.
+
+Let's just limit `deny(warnings)` to internal only when building with buck.
+
+See also https://www.reddit.com/r/rust/comments/f5xpib/psa_denywarnings_is_actively_harmful/
+
+Reviewed By: MichaelCuevas
+
+Differential Revision: D58753075
+
+fbshipit-source-id: bd09c09b4195c884172afab2200e3b2857af67d3
+---
+ watchman/rust/serde_bser/src/lib.rs      | 3 ++-
+ watchman/rust/watchman_client/src/lib.rs | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/watchman/rust/serde_bser/src/lib.rs b/watchman/rust/serde_bser/src/lib.rs
+index cf2fe51b2202..b169c977cf05 100644
+--- a/watchman/rust/serde_bser/src/lib.rs
++++ b/watchman/rust/serde_bser/src/lib.rs
+@@ -1,4 +1,3 @@
+-#![deny(warnings, rust_2018_idioms)]
+ /*
+  * Copyright (c) Meta Platforms, Inc. and affiliates.
+  *
+@@ -6,6 +5,8 @@
+  * LICENSE file in the root directory of this source tree.
+  */
+ 
++#![cfg_attr(fbcode_build, deny(warnings, rust_2018_idioms))]
++
+ pub mod bytestring;
+ pub mod de;
+ mod errors;
+diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs
+index 1d102fe0b2bd..df902313c6a5 100644
+--- a/watchman/rust/watchman_client/src/lib.rs
++++ b/watchman/rust/watchman_client/src/lib.rs
+@@ -33,7 +33,7 @@
+ //!     Ok(())
+ //! }
+ //! ```
+-#![deny(warnings)]
++#![cfg_attr(fbcode_build, deny(warnings))]
+ 
+ pub mod expr;
+ pub mod fields;
+
diff --git a/dev-util/watchman/watchman-2023.06.19.00.ebuild b/dev-util/watchman/watchman-2023.06.19.00.ebuild
index 55b90312e885..9b399e090d42 100644
--- a/dev-util/watchman/watchman-2023.06.19.00.ebuild
+++ b/dev-util/watchman/watchman-2023.06.19.00.ebuild
@@ -168,6 +168,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch
 	"${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch
 	"${FILESDIR}"/${PN}-2023.06.19.00-rust-1.70-avoidance.patch
+	"${FILESDIR}"/${PN}-2023.06.19.00-unused.patch
 )
 
 # Rust utility