12 files changed, 191 insertions, 10 deletions
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 4ff0ed1d5d13..c1099692be76 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,3 +4,5 @@ DIST ccache-4.11.3.tar.xz.asc 833 BLAKE2B ee4a4abac6268ef38ef4c5e131ba76fbd11ae7
 DIST ccache-4.12-docs.tar.xz 85640 BLAKE2B 6e554be1d6bfc583fa92b29c891a3c55fb0abd943c467a5b03d984300093362fd2a5ad6b78c03f0b14fbd16df9f1b2433b786270b0f6f9f9bb45a10943007b93 SHA512 373399313fa8465ec66d2c73e3a39def52eec18a9f925af9afdf998045edb02bad2502b50bcbae22c532a4f19835cdfcbf89770f8e7610031968524505d2c1d6
 DIST ccache-4.12.1.tar.xz 509872 BLAKE2B 1ff3ddede9f60471cbfaede36722b399f45c4f33f7012db31e2f806db63ffccf1985681d414a91d391391efcd10453f0be666afbbf0c5cafad70b487ab5fd504 SHA512 f6618026b99d7352fc59d8233dd1cb307970baceb37b3c0c8f5360ca485141ca12da5bcf1e58deaa9e2c383cf40b56eb6fae70a51db90f54ae126596e841eb57
 DIST ccache-4.12.1.tar.xz.minisig 315 BLAKE2B a8f97d4ec3ead39d8a49e737d1bf36c9f65b9255846f76a35d09450f88026dc4aabd520f704da44f8453812c557d85ded944b7599e2da2a4e3ba1e4f523c8521 SHA512 c66612a70ffeaf29f04d0109d4171d0baf3de0b4b456e968942efc9be644e5e7a74ad0f9597d1f4bf8390a74e9f9f8ce456ec52e95d35411fa689fed28af2d4a
+DIST ccache-4.12.2.tar.xz 510576 BLAKE2B cddabb91c8ebcf1c0c819bf65c84bb501b871e78cf3ee2b5aaf3a5f32ae6092be87b8a416ce77e30430499f746e168e5e30b36ad43a7111fe5354b623efe041a SHA512 fc6993a13c22398ba8d80a367bf2cfd2e44fd991d8a83fc829e51a48051fb8208e6a81ce7cff0ed5cd61a070fb20aaedd8e8cb69b51f5195e4973c1c2ae3033a
+DIST ccache-4.12.2.tar.xz.minisig 315 BLAKE2B 142c3a0e353dd39d6d313455e8997207054a64319d260d84998b4292742de0663d453e071b875048ccf3793563186c9caafc3c44dd590fcfd7800c5da69e0c43 SHA512 27f6b69d7d7b953b4818139e1154cfef1b572154574cea23d9eef3ac26fbca2f4635d23d576b02a57d89260be0391d442bcd4edca7eefaa6eb16ad44faf2dea8
diff --git a/dev-util/ccache/ccache-4.12.1.ebuild b/dev-util/ccache/ccache-4.12.1.ebuild
index b17cf4c8bb73..edd15c463540 100644
--- a/dev-util/ccache/ccache-4.12.1.ebuild
+++ b/dev-util/ccache/ccache-4.12.1.ebuild
@@ -35,7 +35,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/ccache/ccache-4.12.2.ebuild b/dev-util/ccache/ccache-4.12.2.ebuild
new file mode 100644
index 000000000000..84efe5730e46
--- /dev/null
+++ b/dev-util/ccache/ccache-4.12.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ccache.minisig
+VERIFY_SIG_METHOD=minisig
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.minisig )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+	SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )"
+	MY_DOCS_USEFLAG="doc"
+fi
+
+# https://ccache.dev/license.html
+# ccache, blake3, NonstdSpan, tl-expected
+LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+# TODO: package NonstdSpan, TlExpected
+DEPEND="
+	>=app-arch/zstd-1.3.4:=
+	!static-c++? (
+		>=dev-cpp/cpp-httplib-0.20.0:=
+		>=dev-libs/libfmt-8.0.0:=
+	)
+	>=dev-libs/blake3-1.8.2:=
+	>=dev-libs/xxhash-0.8.3
+	redis? ( >=dev-libs/hiredis-1.3.0:= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+BDEPEND="
+	doc? ( dev-ruby/asciidoctor )
+	test? (
+		>=dev-cpp/doctest-2.4.12
+		dev-libs/elfutils
+	)
+	verify-sig? ( sec-keys/minisig-keys-ccache )
+"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.11-avoid-run-user.patch
+	"${FILESDIR}"/${PN}-4.11.3-libfmt-libcxx-21.patch
+)
+
+src_unpack() {
+	# Avoid aborting on the doc tarball
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.minisig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	cp "${FILESDIR}"/ccache-config-3 ccache-config || die
+	eprefixify ccache-config
+}
+
+src_configure() {
+	# Mainly used in tests
+	tc-export CC OBJDUMP
+
+	local mycmakeargs=(
+		-DENABLE_DOCUMENTATION=$(usex doc)
+		-DENABLE_TESTING=$(usex test)
+		-DDEPS=LOCAL
+		-DREDIS_STORAGE_BACKEND=$(usex redis)
+	)
+
+	# Avoid dependency on libstdc++.so. Useful for cases when
+	# we would like to use ccache to build older gcc which injects
+	# into ccache locally built (possibly outdated) libstdc++
+	# See bug #761220 for examples.
+	#
+	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+	if use static-c++ ; then
+		append-ldflags -static-libstdc++
+		mycmakeargs+=(
+			-DDEP_CPPHTTPLIB=BUNDLED
+			-DDEP_FMT=BUNDLED
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
+	fi
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] ; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/hip/files/hip-6.4.1-no-glibcxx-assert.patch b/dev-util/hip/files/hip-6.4.1-no-glibcxx-assert.patch
index b73c5cad8dbb..9a3c673a92e6 100644
--- a/dev-util/hip/files/hip-6.4.1-no-glibcxx-assert.patch
+++ b/dev-util/hip/files/hip-6.4.1-no-glibcxx-assert.patch
@@ -13,7 +13,7 @@ Bug: https://bugs.gentoo.org/955623
  #define __HIP_HAS_GET_PCH ${_pchStatus}\n
 +
 +// Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115740
-+#if defined(__has_include) && defined(__cplusplus) && defined(__HIP__)
++#if defined(__has_include) && defined(__cplusplus) && defined(__HIP__) && !defined(__HIPCC_RTC__)
 +  #if __has_include(\"bits/c++config.h\")
 +    #include <bits/c++config.h>
 +    #undef __glibcxx_assert
diff --git a/dev-util/hip/files/hip-7.1.0-no-hipother-install.patch b/dev-util/hip/files/hip-7.1.0-no-hipother-install.patch
new file mode 100644
index 000000000000..417718e5682b
--- /dev/null
+++ b/dev-util/hip/files/hip-7.1.0-no-hipother-install.patch
@@ -0,0 +1,29 @@
+HIPNV_DIR is /usr (part of dev-libs/hipother).
+Installing from there results in file collision.
+
+Bug: https://bugs.gentoo.org/966306
+--- a/hipamd/packaging/CMakeLists.txt
++++ b/hipamd/packaging/CMakeLists.txt
+@@ -106,10 +106,6 @@ endforeach()
+ install(DIRECTORY ${HIP_COMMON_DIR}/include DESTINATION . COMPONENT dev)
+ install(DIRECTORY ${hip_SOURCE_DIR}/include/hip/amd_detail
+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hip COMPONENT dev)
+-if(DEFINED HIPNV_DIR)
+-    install(DIRECTORY ${HIPNV_DIR}/include/hip/nvidia_detail
+-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hip COMPONENT dev)
+-endif()
+ if(HIP_PLATFORM STREQUAL "amd" )
+ install(FILES ${CMAKE_BINARY_DIR}/hipamd/include/hip/amd_detail/hip_prof_str.h
+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hip/amd_detail COMPONENT dev)
+--- a/hipamd/CMakeLists.txt
++++ b/hipamd/CMakeLists.txt
+@@ -398,9 +398,6 @@ if(NOT ${INSTALL_SOURCE} EQUAL 0)
+     endif()
+ 
+     install(DIRECTORY include DESTINATION .)
+-    if(DEFINED HIPNV_DIR)
+-        install(DIRECTORY ${HIPNV_DIR}/include/hip/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hip/)
+-    endif()
+     install(DIRECTORY ${HIP_COMMON_INCLUDE_DIR}/hip/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hip/)
+     if(WIN32)
+       install(DIRECTORY ${HIP_COMMON_DIR}/cmake DESTINATION .)
diff --git a/dev-util/hip/hip-6.4.3-r1.ebuild b/dev-util/hip/hip-6.4.3-r2.ebuild
index 844409d2db9e..844409d2db9e 100644
--- a/dev-util/hip/hip-6.4.3-r1.ebuild
+++ b/dev-util/hip/hip-6.4.3-r2.ebuild
diff --git a/dev-util/hip/hip-7.0.2.ebuild b/dev-util/hip/hip-7.0.2-r1.ebuild
index 4e90c13c7a81..4e90c13c7a81 100644
--- a/dev-util/hip/hip-7.0.2.ebuild
+++ b/dev-util/hip/hip-7.0.2-r1.ebuild
diff --git a/dev-util/hip/hip-7.1.0.ebuild b/dev-util/hip/hip-7.1.0-r1.ebuild
index b891484de5a9..561a3e6a4419 100644
--- a/dev-util/hip/hip-7.1.0.ebuild
+++ b/dev-util/hip/hip-7.1.0-r1.ebuild
@@ -91,6 +91,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.4.1-no-glibcxx-assert.patch"
 	"${FILESDIR}/${PN}-7.0.2-fix-libcxx-noinline.patch"
 	"${FILESDIR}/${PN}-7.0.2-fix-libcxx-ranges.patch"
+	"${FILESDIR}/${PN}-7.1.0-no-hipother-install.patch"
 )
 
 QA_FLAGS_IGNORED="usr/lib.*/libhiprtc-builtins.*"
@@ -172,17 +173,17 @@ src_configure() {
 		-DHIP_ENABLE_ROCPROFILER_REGISTER=OFF
 		-DHIPCC_BIN_DIR="${EPREFIX}/usr/bin"
 		-DROCM_PATH="${EPREFIX}/usr"
-		-DUSE_PROF_API=OFF
 
-		-DOpenGL_GL_PREFERENCE="GLVND"
 		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_NUMA="$(usex !numa)"
-		-DCMAKE_REQUIRE_FIND_PACKAGE_NUMA="$(usex numa)"
 	)
 
 	if use video_cards_amdgpu; then
 		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_NUMA="$(usex !numa)"
+			-DCMAKE_REQUIRE_FIND_PACKAGE_NUMA="$(usex numa)"
 			-DHIP_PLATFORM="amd"
+			-DOpenGL_GL_PREFERENCE="GLVND"
+			-DUSE_PROF_API=OFF
 		)
 	elif use video_cards_nvidia; then
 		mycmakeargs+=(
diff --git a/dev-util/itstool/itstool-2.0.7_p20250326.ebuild b/dev-util/itstool/itstool-2.0.7_p20250326.ebuild
index df0b0c9143be..59af9eecf60d 100644
--- a/dev-util/itstool/itstool-2.0.7_p20250326.ebuild
+++ b/dev-util/itstool/itstool-2.0.7_p20250326.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 # files in /usr/share/itstool/its are under a special exception || GPL-3+
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/mesa_clc/mesa_clc-25.2.7.ebuild b/dev-util/mesa_clc/mesa_clc-25.2.7.ebuild
index 44f29e4fc0ca..3604919ec761 100644
--- a/dev-util/mesa_clc/mesa_clc-25.2.7.ebuild
+++ b/dev-util/mesa_clc/mesa_clc-25.2.7.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	S="${WORKDIR}/mesa-${MY_PV}"
 	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-7.1.0-r1.ebuild b/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-7.1.0-r2.ebuild
index c5be88d58c53..99d19c8de7ce 100644
--- a/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-7.1.0-r1.ebuild
+++ b/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-7.1.0-r2.ebuild
@@ -66,7 +66,7 @@ src_prepare() {
 
 	sed -e "/set(AMD_ROCM_STAGING_INSTALL_LIBDIR/ s/lib/$(get_libdir)/" \
 		-e "/set(AMD_ROCM_STAGING_INSTALL_EXPORTDIR/ s/lib/$(get_libdir)/" \
-		-e "s:DOCDIR}/\${CPACK_PACKAGE_NAME}:DOCDIR}/${P}:" \
+		-e "s:DOCDIR}/\${CPACK_PACKAGE_NAME}:DOCDIR}/${PF}:" \
 		-i CMakeLists.txt || die
 
 	sed -e "s:/usr/local/lib:${EPREFIX}/usr/$(get_libdir):" \
diff --git a/dev-util/umockdev/umockdev-0.19.3.ebuild b/dev-util/umockdev/umockdev-0.19.3.ebuild
index 3d3b28ca2e36..cbd580352b6b 100644
--- a/dev-util/umockdev/umockdev-0.19.3.ebuild
+++ b/dev-util/umockdev/umockdev-0.19.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Mock hardware devices for creating unit tests"