gentoo auto-resync : 05:10:2024 - 04:27:09

37 files changed, 869 insertions, 464 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dc39add0f3a5..e227c414715b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest
index 71dc307335b9..9fcfeb194fa3 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,7 +1,9 @@
 DIST frr-9.0.1.tar.gz 10334150 BLAKE2B c5f0d092421cdaea400e669973da3d53d9875871488be3b5e8c2c9afa78bf357a775671756eacb94372c5067a8a1284cb4feb4927988e0f1a42d19239a871f3b SHA512 fa1884529a98c8e5ad2dab7f6f67246844ea34ba4d68e3a907a01d43e0eec9317104107f5f18e4b61c11d2cbb4d20eac1e8aef6e4a2b2e54efcad245ee3fb6b9
 DIST frr-9.0.2.tar.gz 10341186 BLAKE2B e9c32bf48dc0adc7dd6c23ad1a2779065c762dc6e461a3f86d6b7afbef245345dc65b33d9dd5b499d4c4a7fb3b80a4416bdec9b42e7d15f2864d80c088e2ad4f SHA512 2cfd1a63cf073b8767fd67d9992d9a775d856234a532b13699304b6b1f15eb68bf1301f2f4c503b151fd5c8191bff67aeac9c7a4dc4a3ddb06f9a5db081423b9
+DIST frr-9.0.4.tar.gz 10346069 BLAKE2B 63c7cec0fdaccba058bac757b68906c2cf0ec307f5313a299ef943f1c708dfa0ec0dee8bd8f743f9e54a3ed06f484435bb032294c4e2d0a026a2bd4187e14ec2 SHA512 e3717945176f72e14722e929a99f1a62ddd5332988d671950253ea4efc2e83f0464043e7acf990df6bc9306b81f4a32633a0debf92c8a19d13edd38a9bb4eaea
 DIST frr-9.0.tar.gz 10332694 BLAKE2B 82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17 SHA512 d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25
 EBUILD clippy-9.0.1.ebuild 1163 BLAKE2B e845a4132c8525aeedbb8cb06b7af4ed44ca980ca9c455351cc615d18b9fc54dff7c15dc38a1a6c3fca88c93936b375a5142a4d6df65decc59e89eb0971fd987 SHA512 cc957f3a773435d2b709bae7b6cf3cb0b4a81d356162d9c8c677c81b290db687350eb3d994abc4d3d5f80b22fff66db2cb1799e0ac6789bad69e7be1daf372bd
 EBUILD clippy-9.0.2.ebuild 1164 BLAKE2B 3fc69562994383212707701565bf210561bc0b25144cd45f85b65baa00242f51aacc91e391d9c0bb1e8fbb42855f4cef11a2cc16a05fa64531a3620616640f76 SHA512 deb719aab12c5a98093dc5cad97d14d925b005265f79f0c44b510fa948bd690310e7851f11e1af56f324c124081cce5fcb40c417840ab2940d0869a1cba8905e
+EBUILD clippy-9.0.4.ebuild 1165 BLAKE2B e90f3182c8f512a074d52608908e86e0ea211ed1dc1e03d0bafbae2288b73e474dfed79291f91605b098bfdb080b165b8de52478170cdaf2eadd8f31336504f0 SHA512 3c006980206492aa97d821f72e0d36b77c38bf2b4127384e332089e43e70bd07010f7a4af519a05e005286d2c378180c266a1bcb7de11352b07fca9b35abc97c
 EBUILD clippy-9.0.ebuild 1163 BLAKE2B e845a4132c8525aeedbb8cb06b7af4ed44ca980ca9c455351cc615d18b9fc54dff7c15dc38a1a6c3fca88c93936b375a5142a4d6df65decc59e89eb0971fd987 SHA512 cc957f3a773435d2b709bae7b6cf3cb0b4a81d356162d9c8c677c81b290db687350eb3d994abc4d3d5f80b22fff66db2cb1799e0ac6789bad69e7be1daf372bd
 MISC metadata.xml 590 BLAKE2B 03cc6d8c7b3ebcc2be5e4522d4ee42a01c8f631d71f00c693fc3ea59390bbd77bd2da32058f97b967e1e5f15df860eb2117d617b84fd75959bab368727d18848 SHA512 c2e8dc96da08d30cdfa8285c9bf4bd0f516bd759fb9944cafced9af67442b77fce0051ade7253f017c4380f2a61c82446f2c35d52c7af561a98bbd2f469d3906
diff --git a/dev-util/clippy/clippy-9.0.4.ebuild b/dev-util/clippy/clippy-9.0.4.ebuild
new file mode 100644
index 000000000000..58d125157d33
--- /dev/null
+++ b/dev-util/clippy/clippy-9.0.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="frr-${PV}"
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools python-single-r1
+
+DESCRIPTION="Standalone clippy tool built from FRR sources"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/frr-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# standalone clippy does not have any tests
+# restrict to prevent bug 811753
+RESTRICT="test"
+
+DEPEND="
+	${PYTHON_DEPS}
+	virtual/libelf:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	mallinfo	# check in configure is fallback is needed
+	mallinfo2	# check in configure is fallback is needed
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug #884291
+	unset YACC
+	export LEX=flex
+
+	econf --enable-clippy-only
+}
+
+src_install() {
+	# 830087
+	find "lib" -type f -name "clippy" -print0 |
+		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
+		xargs -I '{}' dobin '{}' ||
+		die "Failed to install 'lib/clippy'"
+}
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index fc42c4ce776c..223f1967d809 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,6 +1,6 @@
 AUX google-perftools-2.9.1-disable-generic-dynamic-tls.patch 1429 BLAKE2B 69dfc7f24fe7d765f4ad6e118ff4b78de070bd471a92ab19bf7349addfc8ce477e14513bada0168fce675aac75e413d26319a784f0ecd5fbfc7e4750b4b1a35e SHA512 a85a631761df4e5a0d38f2e1ce9cb48f3299bb83f7b73cefe872d31f2cf08ec0fffe2c5918dd6e769d83a726404bf94c72857a3870a8823d4dea12d686a4bbd8
-DIST gperftools-2.10.tar.gz 926512 BLAKE2B e92fb751f9e695d21edf5fce443f3d3641fcff15cbd6b5d868bc77fbe622594be824b75c8d45513c7f82b9e574c690133b8502d4574162948a77886d5166b92d SHA512 4400711723be9401f519d85b3b69c026e4715473cbed48ab0573df17abdf895fb971ee969875fe5127a2e8b9aba90d858285e50c8e012384c2c36d5a76b1f0c4
 DIST gperftools-2.15.tar.gz 888271 BLAKE2B 0fb627e36d6677d01081b1d566ad42eee8b87ab94a07cbbc4536a1671b539354bc0d27f6eab249e94317f0d57a9801551aa3b2cceae784231ac69528b61d4d6e SHA512 04551bdfac50812dd8305e0fe6f6ae5b8603f18a5f9cde56657daa634982bfb5eb5303721ea6a8e02f4177aa012535216f1c99b9eda4ce92f046982df41fbcd1
-EBUILD google-perftools-2.10-r1.ebuild 3007 BLAKE2B c57396db53c0ba2dacbe370a94255c355a154c68f8079ef039cb6ff4ef744c235523ddfb990ccb7017e330a3f6382c1be199c97b2cad556243dd0798c8e4c3b0 SHA512 1915920c4745fda89ae5c0097a8359a5f0c1bf626337448e734076b72bff197670c47034ef2d2d4c1ee6a07a21a28ddd1f20aafb427e66578a7c505db07d8de6
+DIST gperftools-2.16.tar.gz 1743259 BLAKE2B a1b1c8b04e7797121ca96d5527e6d862d84bf1df116d4bbd30fe3a572fcb76f32be8633a4711c908adf87e6b57eeb1558f7bde1dcdf393c6f6ccea17b90e0dc3 SHA512 a6eddee06cd6a9344c724522a5bb977082d6ee30eded1c6793d6bb508d4c8542a238dc0f62818c715f09312c858cc90cded0ee95ba2a3ea15fad8a0b78bcdaea
 EBUILD google-perftools-2.15.ebuild 3203 BLAKE2B 5434bc1e7a04eaa689da8d8a5405f2fac7ec5e24fc4b40c32694a0739661fe42cc17f14bb63665a47d40c8ec8c67a91e71d6c87af1bd3bab96ff1b5846336c42 SHA512 10eee62611abab0d95e2c05f8ac95a3c84c59568d7d1288e075d19bf196035de74c2d6309c0f658bdb0e2ed19d9763c0a1218ad70366bc4c6feda61d209184c4
-MISC metadata.xml 2014 BLAKE2B 23bf92b2a94e890320b073d4d27fab2e680d3fb3e5eb9e5fdb6519acb5df8543d4a75e704c908a112f2342d7b81f6f6c1803ad723870f87205cb045370770c01 SHA512 a4cf9f45a166a458c8a6dea731d32e4ef0da44f19138bcf14289d011540926f9aab2852ba50ef48177513dc4af61fe7809496937039bbd4c594635a81f7547be
+EBUILD google-perftools-2.16.ebuild 3002 BLAKE2B 674340dba0614c56c303770b29d4b35a346b1c68a924e561aa5fb5b478107529b541a23cbc68ef7017f088bd0cbd877d659bb68f17dabe1ff60e87e4b4bfee00 SHA512 089e0f0f9df60670652565e86492b91ebffd20ad282b8ed6df1ea2d01b4efc915c4b9b48de725dede0ad1e747eea632dc6df9f2b91b0e504e3f16669a588313c
+MISC metadata.xml 1668 BLAKE2B 57cbf34e9dfe4679b1d8c8f4a35eb7622dbf36f18e04dafb2507ce639154a7a5395a07a9a44df469c46bef7c7ac46c80bec13c1bf69b59c510955a9e18a7dfa7 SHA512 1592fa3483f82aaefa3158181619bf774a41710c5fd8508f5630799e6fb7f0de0ce7ae71d2b939a5f89e5d96b8734fdc82c54810581a7e00b088dd9bf7c755dc
diff --git a/dev-util/google-perftools/google-perftools-2.10-r1.ebuild b/dev-util/google-perftools/google-perftools-2.16.ebuild
index 4e8aef1bd3eb..1bceb84f6911 100644
--- a/dev-util/google-perftools/google-perftools-2.10-r1.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.16.ebuild
@@ -9,6 +9,7 @@ inherit flag-o-matic autotools vcs-snapshot multilib-minimal
 DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
 HOMEPAGE="https://github.com/gperftools/gperftools"
 SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/4"
@@ -17,9 +18,10 @@ SLOT="0/4"
 # linux amd64/arm/arm64/ppc/ppc64/riscv/x86
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="largepages largepages64k +debug llvm-libunwind minimal optimisememory test static-libs"
+IUSE="pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize-256k +debug llvm-libunwind minimal optimisememory test static-libs"
+REQUIRED_USE="?? ( pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize-256k )"
 
 RESTRICT="!test? ( test )"
 
@@ -29,14 +31,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Please keep this if possible on bumps, check Fedora if needs rebasing
-	# Allows correct functionality on e.g. arm64, bug #818871
-	"${FILESDIR}"/${PN}-2.9.1-disable-generic-dynamic-tls.patch
-)
-
 pkg_setup() {
 	# set up the make options in here so that we can actually make use
 	# of them on both compile and install.
@@ -57,9 +51,12 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	use largepages64k && append-cppflags -DTCMALLOC_LARGE_PAGES64K
 	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
+	use pagesize-16k && append-cppflags -DTCMALLOC_PAGE_SIZE_SHIFT=14
+	use pagesize-32k && append-cppflags -DTCMALLOC_PAGE_SIZE_SHIFT=15
+	use pagesize-64k && append-cppflags -DTCMALLOC_PAGE_SIZE_SHIFT=16
+	use pagesize-128k && append-cppflags -DTCMALLOC_PAGE_SIZE_SHIFT=17
+	use pagesize-256k && append-cppflags -DTCMALLOC_PAGE_SIZE_SHIFT=18
 	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
 
 	local myeconfargs=(
@@ -85,12 +82,6 @@ multilib_src_configure() {
 }
 
 src_test() {
-	if has sandbox ${FEATURES}; then
-		ewarn "Unable to run tests when sandbox is enabled."
-		ewarn "See https://bugs.gentoo.org/290249"
-		return 0
-	fi
-
 	multilib-minimal_src_test
 }
 
diff --git a/dev-util/google-perftools/metadata.xml b/dev-util/google-perftools/metadata.xml
index 1e3420600a79..9b2cf6a3aeeb 100644
--- a/dev-util/google-perftools/metadata.xml
+++ b/dev-util/google-perftools/metadata.xml
@@ -6,16 +6,6 @@
 		<name>Bernard Cafarelli</name>
 	</maintainer>
 	<use>
-		<flag name="largepages">
-			Use (experimental) larger pages for tcmalloc, this increases
-			memory usage, but should speed up the allocation/free
-			operations.
-		</flag>
-		<flag name="largepages64k">
-			Use (experimental) 64K pages for tcmalloc, this increases
-			memory usage, but should speed up the allocation/free
-			operations.
-		</flag>
 		<flag name="pagesize-16k">
 			Use 16K page size for tcmalloc. Larger size makes tcmalloc faster,
 			at the cost of using more space (due to internal fragmentation)
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 90adee3a01e4..85922307b546 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,4 +1,5 @@
 DIST idea-community-2024.2.3-aarch64.tar.gz 880579524 BLAKE2B f60114f4f5e9a344bcd8a94ddeaa929b6f2981b1d748a8a8c60749cd5c0b71a266e55b7e4ec29828442467abd359f31dc87a11f008c7e7b2beb2dc474b75c7be SHA512 94aa65f7082b4ddbd53faa955f6a9eaf93f121200c3c55dcb9a9c6b52ead2f192fe8a99000d6979e31747af645a0d3b67e6699ec025dbb7b9ee0101ea633ef69
 DIST idea-community-2024.2.3-amd64.tar.gz 881193694 BLAKE2B 4c7af9a748bbebe9b4c6702c512a5c99d8bbd1d8b19ce596e2a51cbe77d3172c8679062c13f2afacb0f315618d2626a453b1512f227fe24d40df6498a5e3a6eb SHA512 4b8caf3ee62fa6cf1e725f270d330c184222425eb68231d545bd377d16c0a30257e1acf2ce2031a53b7cea948f7f17aede6790ee29225529902a39e724ef0e51
+EBUILD idea-community-2024.2.3-r1.ebuild 4732 BLAKE2B 2018d320ba8e2092172200f83e4c6bcf94d68fa66953a19d3e9edaa37419d15103d8643d1e7d2b91bdaa16bbe76fc25d6e549cf6d7b86e51c7cf70e060c442d4 SHA512 40534b679d0d26d1b963a57ea6db489f8d85d5c4e589696662f2da345016755732cd2c612b8a00872aa0754b491691e497745896bde684db91d5c1b4fe4f47c8
 EBUILD idea-community-2024.2.3.ebuild 3754 BLAKE2B fac34a3784fd3d298dce863d3461c2bfe2089a1a2108e6e6c8cfb1104a46129b555e7a0f720e4e2a502617e568b78b87a3000ea1732f88daba69d50b07f8b52e SHA512 1bf899313d606ce6e9c51057cfd9c4e8152c6cd7a70dc741be673b49402d7b124d68c7ae21e09f7aa794882c708d3ef2cd978af8ef35b96ef3229dab2a43982f
 MISC metadata.xml 454 BLAKE2B 297cfd8c543bf216cd45b66b5284f310659422e91f12af3d0bbe2ff689d94c96988d4c125c75a95526135b2c0f54a004ee43e1c1c4dfe4d1d68e86af5f75ab0d SHA512 5ca382bcbc51ea5400cbaeb067bccfcb4a245e208a2769d800cbd80fc7151310f895d410e5828c9a32223ab93345716ba4a2ebce521092631a4b7c0858519ef2
diff --git a/dev-util/idea-community/idea-community-2024.2.3-r1.ebuild b/dev-util/idea-community/idea-community-2024.2.3-r1.ebuild
new file mode 100644
index 000000000000..9ddf71a93e45
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2024.2.3-r1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop wrapper
+
+MY_PV=$(ver_cut 1-3)
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+SRC_URI="
+	amd64? ( https://download.jetbrains.com/idea/ideaIC-${MY_PV}.tar.gz -> ${P}-amd64.tar.gz )
+	arm64? ( https://download.jetbrains.com/idea/ideaIC-${MY_PV}-aarch64.tar.gz -> ${P}-aarch64.tar.gz )
+	"
+
+S="${WORKDIR}/idea-IC-${PV}"
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL-1.1 ZLIB"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+DEPEND="
+	|| (
+		>=dev-java/openjdk-17.0.8.1_p1:17
+		>=dev-java/openjdk-bin-17.0.8.1_p1:17
+	)"
+
+RDEPEND="${DEPEND}
+	sys-libs/glibc
+	media-libs/harfbuzz
+	dev-java/jansi-native
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXrender
+	media-libs/freetype
+	x11-libs/libXext
+	dev-libs/wayland
+	x11-libs/libXi
+	x11-libs/libXtst
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXrandr
+	media-libs/alsa-lib
+	app-accessibility/at-spi2-core
+	x11-libs/cairo
+	net-print/cups
+	x11-libs/libdrm
+	media-libs/mesa
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/libdbusmenu
+	x11-libs/libxkbcommon
+	x11-libs/libXcursor
+	x11-libs/pango"
+
+QA_PREBUILT="opt/${PN}/*"
+
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+
+src_unpack() {
+
+	default_src_unpack
+	if [ ! -d "$S" ]; then
+		einfo "Renaming source directory to predictable name..."
+		mv $(ls "${WORKDIR}") "idea-IC-${PV}" || die
+	fi
+}
+
+src_prepare() {
+
+	default_src_prepare
+
+	if use amd64; then
+		JRE_DIR=jre64
+		rm -vf "${S}"/plugins/cwm-plugin/quiche-native/linux-aarch64/libquiche.so
+	else
+		JRE_DIR=jre
+		rm -vf "${S}"/plugins/cwm-plugin/quiche-native/linux-x86-64/libquiche.so
+	fi
+
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+	# rm LLDBFrontEnd after licensing questions with Gentoo License Team
+	rm -vf "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	rm -vf "${S}"/lib/pty4j-native/linux/x86-64/libpty.so
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	patchelf --set-rpath '$ORIGIN' "jbr/lib/libjcef.so" || die
+	patchelf --set-rpath '$ORIGIN' "jbr/lib/libcef.so" || die
+	patchelf --set-rpath '$ORIGIN' "jbr/lib/jcef_helper" || die
+
+	if ! use elibc_musl; then
+		rm plugins/platform-ijent-impl/ijent-aarch64-unknown-linux-musl-release
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+	local dst="${D}${dir}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea,idea.sh,inspect.sh,restarter,fsnotifier}
+
+	if [[ -d jbr ]]; then
+		fperms 755 "${dir}"/jbr/bin/{java,javac,javadoc,jcmd,jdb,jfr,jhsdb,jinfo,jmap,jps,jrunscript,jstack,jstat,jwebserver,keytool,rmiregistry,serialver}
+
+		# Fix #763582
+		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+	fi
+
+	if use amd64; then
+		JRE_DIR=jre
+		JRE_DIR=jre
+	fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
+	fi
+
+	# bundled script is always lowercase, and doesn't have -ultimate, -professional suffix.
+	local bundled_script_name="${PN%-*}.sh"
+	make_wrapper "${PN}" "${dir}/bin/$bundled_script_name" || die
+
+	local pngfile="$(find ${dst}/bin -maxdepth 1 -iname '*.png')"
+	newicon $pngfile "${PN}.png" || die "we died"
+
+	make_desktop_entry "/opt/idea-community/bin/idea" "IntelliJ Idea Community Edition" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+
+	# remove bundled harfbuzz
+	rm -f "${D}"/lib/libharfbuzz.so || die "Unable to remove bundled harfbuzz"
+}
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index dd717f86a06a..6f00f21adf0e 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,5 +1,5 @@
 AUX itstool-2.0.7-missing-translation-fix.patch 1260 BLAKE2B af0023bb175919f58ce3150b714f28059c39991e6b1a223b3599b3776690a4457b4ca67d267599ae562ff1633c4c6c93fa064d0a6221abf8b889cb9975f9a0bd SHA512 4536552d4587f4ce5573367c274854710e3df56485fefb00c9d3ca5efcff3cce91e2ff4b0b67d604f4b3884b57493e4ff282d4bafce6c1e257eeb0686cd824d9
 AUX itstool-2.0.7-raw-string.patch 3193 BLAKE2B 37f1a182d0a26837a84ad7a0524f47b309264c0eb150e39333071a273e825a2a3962d6172911d72e6744189c2a007c528ca57f073bbb436e874aed21bde47041 SHA512 a783b912b0306d8a336fee292db9cd90ca1d61e382d144b823581d16d0ec0f9f96305c3f6b8bf0704295d3b29fd997378d22258899695319c27e6c24912e41aa
 DIST itstool-2.0.7.tar.bz2 104648 BLAKE2B e2d27d7b0a772596a0fa02b157bbef65b132b839c908c114596d21a54c245a0c941419a3555a8b9b7255800f9ef65d557a5b0f6847103b0a3934c908d43128ab SHA512 710c188e518a7eccbf9d31df59692fd6acc79430589a93ef4333f33f74440c311c340614ca74cc43191830567a98024d0981325ccd83a8fd9b75410d9dd91992
-EBUILD itstool-2.0.7-r2.ebuild 1062 BLAKE2B 6fbbd8aa30d8e4d3c9db84eb6528f90274d64c284db5f620425c8e70a2d0601277d43efd7f4ec74b94b66895296d62b35dfdb8b9d1cf2f1a954ad5b46ac773df SHA512 1f8aede1ba536768fdad0ba1d799a056bf10b9e3e65cf42beb801eecc086635485cdf60f607328272aa688024e50ac8d5f79b2725c79fa2e41465d052df9f466
+EBUILD itstool-2.0.7-r2.ebuild 1062 BLAKE2B ab2a2c155da3824a0946a7e8e07867b25db707a560ef9c92dfaa64e894d39ecbfb5b300e90527c89a4395a0b8d4f30661c4d319217031f907b6b7ec6846d8bfd SHA512 4b3922ac46865509d354c85bbf48f673047d4b120e1b892c630c04050c373ebe9ae21948a4956968204b270b862a572c0896b1a929730969a321483a3692aac1
 MISC metadata.xml 612 BLAKE2B 0d4784d03f20c26f28f64015ee59a119b1059fd75f27352b0e99f07b5c3914ea3541674d4970620b1bbd6278951e524e687807d1275da1999d3a2fa311fb8206 SHA512 dcf3e043d41747edbd72e8081b75617b88d76e6c46fea1e112e5c2a8e7049f74f1b5ece6de4681863994eeb18bade3b793c3944269ddc5d3b6c6ead1a72dc8f9
diff --git a/dev-util/itstool/itstool-2.0.7-r2.ebuild b/dev-util/itstool/itstool-2.0.7-r2.ebuild
index 8b04b67898de..f1f0d0273519 100644
--- a/dev-util/itstool/itstool-2.0.7-r2.ebuild
+++ b/dev-util/itstool/itstool-2.0.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit python-single-r1
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 5aff80738b29..480ba0369aef 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-php-24.08.0.tar.xz 1093492 BLAKE2B 4ea054a76fc3ea6b750184f700d3adfd9a25463f976bbdb0d298d30ccc0c7f50c7462bfba6c45691e3c9c2ae9fe8fc0288d267a69b126a6fe79a56b8083c36d3 SHA512 0b7e4f47b20a8b73058dceed4ed3529f02adef5781910f6f67ea8c75e740651b8199f1efcba0bcdf2c5f5bbedbe71bfbeec37f876ee9cf70f3f539c11a64baa7
 DIST kdev-php-24.08.1.tar.xz 1093928 BLAKE2B ad2fec5f6d866624f5c4748dd8a6448afc2fc86ca5f26bffc7a17418fff341cec57675f2f164726b75e879b368ee41517cad9155371ec6433dd3bf20392cc693 SHA512 c8f254512fbdba6bbf8db7b2a3bf046b34174e51375e1029d2e855398ea96ded98558254b879545aa63993bfe5171c6ece6ee7d807ff0818643b5189913c26ef
-EBUILD kdevelop-php-24.08.0.ebuild 1208 BLAKE2B 2cb782edc2551ccc26355baec8afec60cbbd32907fd4cd3af2ff6ea44a33268ce38bd533d692f78104cb94d4b827e6b7eb1718f722c078d9e6e61f63485919ca SHA512 e97a7506f281a454c677f69d5c51c9675954307d7e1b091198ac72f1c0bcb635b785cfb0bfba588677247e2138180816d14e75da7d81efbed305534f4ba59123
-EBUILD kdevelop-php-24.08.1.ebuild 1209 BLAKE2B 65ff861a3c803e43fe0bde46bc226eda31fed770f9b2a9602c1f8c2846fed8eebcfb3d4d6d61d3405dbabc8cdd21db5b8f175cf139fbfa22809d4e65142d89d1 SHA512 731f1cac18f1bc8ff2c186f23bf53f71a9b2a0f6df65f02eeb9096df392aaadaaa6a673b1eb3ca6704994182dc0cbd8f123e6d1fa6885907ff2be6a0f7d4f6dc
+EBUILD kdevelop-php-24.08.1.ebuild 1208 BLAKE2B 2cb782edc2551ccc26355baec8afec60cbbd32907fd4cd3af2ff6ea44a33268ce38bd533d692f78104cb94d4b827e6b7eb1718f722c078d9e6e61f63485919ca SHA512 e97a7506f281a454c677f69d5c51c9675954307d7e1b091198ac72f1c0bcb635b785cfb0bfba588677247e2138180816d14e75da7d81efbed305534f4ba59123
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-php/kdevelop-php-24.08.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-24.08.0.ebuild
deleted file mode 100644
index edc439274b77..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-24.08.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 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.5.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-php/kdevelop-php-24.08.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-24.08.1.ebuild
index 7c7d13560729..edc439274b77 100644
--- a/dev-util/kdevelop-php/kdevelop-php-24.08.1.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-24.08.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kdevelop.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="6"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 # remaining tests fail for some, bug 668530
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 66b9ab8d7141..1d1043aea7d2 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-python-24.08.0.tar.xz 1101512 BLAKE2B 030b40783e882d770cf40873f5da2e7975287541d949f3767ce272e70dfc680193ba45ace52956964eeebae8a64e52c65128eb38d2138c5cec3e128beb807383 SHA512 d971f718ee5e54e9b3d12377ffb225b1b4577f75d7870d5f6408ce52e5ccf4e1e84b22ddf3d5deb23c016838680f9e7833a26c748beefa0cbd186d9b75f03d36
 DIST kdev-python-24.08.1.tar.xz 1101688 BLAKE2B efa86c0d83386ebeee2619e2a885f2b600c0c81fcf171ee441339f2dba12c987ef9c29dee0dbd825015011eeda48c8bff35cf6e35c32e077383eceecd6ff63ad SHA512 c40acb15517e0261878cf6862b588a289425e6f15b57d107dae152e369a91625c47de785b85f3e7b8b78023901e2fc543adb1a04561e05cba5d3a7cced6e8fd9
-EBUILD kdevelop-python-24.08.0.ebuild 1119 BLAKE2B 455b6ab786d6de972d1a02f6faf855c2a80c9d87e7daa7947612627da8bd78e50b83c852016a20eefeabec415d60ca8988f80ab9cbae112c2b1f5096543c9588 SHA512 3fffed4e354b3041a1a7035d6826b5b439343b77ec9f94c0052276744bd2a69af0966668049c685c0f20f1066a2654af2eeee39856790293abfbdca3ca37279c
-EBUILD kdevelop-python-24.08.1.ebuild 1120 BLAKE2B ef7152a1f7e439f9dc217d346bc583a7f5d708a6fff9f2d58987fc97a3d250f4e99cb28d24a6ae9d1215c2ac8e4c4be4752a10c447c28aeb5039854b2cc63289 SHA512 bfe16ea550bac21e13e0608fd98f08460a8feea330f8f5c0f411b6f42cfc831a81a3e9db37a3b080ca43a532682b11fcb96cc2b50e9fab4c1d29eae39e5b7934
+EBUILD kdevelop-python-24.08.1.ebuild 1119 BLAKE2B 455b6ab786d6de972d1a02f6faf855c2a80c9d87e7daa7947612627da8bd78e50b83c852016a20eefeabec415d60ca8988f80ab9cbae112c2b1f5096543c9588 SHA512 3fffed4e354b3041a1a7035d6826b5b439343b77ec9f94c0052276744bd2a69af0966668049c685c0f20f1066a2654af2eeee39856790293abfbdca3ca37279c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.08.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.08.0.ebuild
deleted file mode 100644
index 75a9f7ad66c7..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-24.08.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 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.5.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-python/kdevelop-python-24.08.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.08.1.ebuild
index 366e3f7f8ade..75a9f7ad66c7 100644
--- a/dev-util/kdevelop-python/kdevelop-python-24.08.1.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-24.08.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kdevelop.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 1a8f21784cd0..6429b020c13f 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,3 @@
-DIST kdevelop-24.08.0.tar.xz 8784672 BLAKE2B 3b47231a31c713a355b506aa625a5440d0f5bc1f26cbb9f06b6f4ebea40ad753ed94d6701bda2016248a3025400a89c2dfb3e51430db62ee4631e31d380e8acd SHA512 b5c116cf8dde83e51bcd5c3445129f91233bc0314c18b85d3f5e48f2ac8433930594ef3f9d4d1330fd761beb93d2b91999c2344c3f41241214828a1f20226e6c
 DIST kdevelop-24.08.1.tar.xz 8794020 BLAKE2B 0be6d6e89956e5e8aefea7150408c8b7f82f78ae4e3f01fcfcbc4f61ed8d0bf4efed395872ea2afdf3feef549e3998e2e449fc32210e0d6576c0fd738b6434be SHA512 eaade81702387be71e1ce9b11085934b9449235d7deb8e85ad3fd52325c4cc8d766997adc9211614e0e63ae7251ff2e8e4e3835f2ddd6ba04099c1dd743e5224
-EBUILD kdevelop-24.08.0.ebuild 3700 BLAKE2B a29bb2f0568cc77efa1e5a63f8eebba7b23c1c39b756f155b185f6086ba6b42d63daff2bb87c927594d0653d38036272c75a85aee04d17080568b955f6a76a29 SHA512 2fcd78533c630e178eafd4e06edebdf51a5e088240dab44cca5b6f6cf28e64c44e72a1507b6cc7e0e816e46f6241b35c05db2c89fb551b7261e267ffd5bb998c
-EBUILD kdevelop-24.08.1.ebuild 3701 BLAKE2B c1c9564faa5dc4b09cb5d72ce517f8348bbffd7d43fd37cb3153c519b30368b2830d3bc0ce27729a4871a4c8db1e7903db87f0722e1c320e31cfb312db486ce9 SHA512 e254732cc4b6c9690ac3fce4e36c1e6f5dc2ca17449d5a18a7d863f3ffa129f94c14c79aca06688b06a90d248bf46cbebe0aa34a494f801ad240800e5f4fd93a
+EBUILD kdevelop-24.08.1.ebuild 3700 BLAKE2B a29bb2f0568cc77efa1e5a63f8eebba7b23c1c39b756f155b185f6086ba6b42d63daff2bb87c927594d0653d38036272c75a85aee04d17080568b955f6a76a29 SHA512 2fcd78533c630e178eafd4e06edebdf51a5e088240dab44cca5b6f6cf28e64c44e72a1507b6cc7e0e816e46f6241b35c05db2c89fb551b7261e267ffd5bb998c
 MISC metadata.xml 671 BLAKE2B a67a7998eea115188a188dc7e225226f6b8ce68168ed1d43bf452cc7fd26f343d6d7c61367df45ddb5fea674c0aa3c5028287e16e791311bfb0d89488eed8935 SHA512 9ad5e98671886e809fe69e8ca9bedf05e417535798bd855a19b8a69ba510324862d5fd0d236c7827c4d4952305468709abf7a9d7ed1fe36e2b9bee6a4663179a
diff --git a/dev-util/kdevelop/kdevelop-24.08.0.ebuild b/dev-util/kdevelop/kdevelop-24.08.0.ebuild
deleted file mode 100644
index 46c949670673..000000000000
--- a/dev-util/kdevelop/kdevelop-24.08.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2024 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.5.0
-LLVM_COMPAT=( 15 16 17 18 )
-QTMIN=6.7.2
-inherit ecm gear.kde.org llvm-r1 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 'sys-devel/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}
-	dev-build/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-r1_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/kdevelop/kdevelop-24.08.1.ebuild b/dev-util/kdevelop/kdevelop-24.08.1.ebuild
index 4bc5241fab4f..46c949670673 100644
--- a/dev-util/kdevelop/kdevelop-24.08.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-24.08.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kdevelop.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="6/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="gdbui plasma +qmake +share subversion"
 
 # see bug 366471
diff --git a/dev-util/kio-perldoc/Manifest b/dev-util/kio-perldoc/Manifest
index 591052b57357..aec4cede179f 100644
--- a/dev-util/kio-perldoc/Manifest
+++ b/dev-util/kio-perldoc/Manifest
@@ -1,5 +1,3 @@
-DIST kdesdk-kio-24.05.2.tar.xz 41144 BLAKE2B d2c87c7e37e5cf795b0d931fed4644fe87fcdffd156044eeb14ed1c2063f5c4f939c2c8c3fd2fc46d49a123a2e8d50ee5e6c798e36eef55178a2d843c418ec9c SHA512 337b3c7b8f06aec472ad01335275ef90831ea2b54210058a3ce9457e4d3fbc642b9a8870cd9e3bc089cf590fa92407bc8ccc7df665a751c2fea278e5a3f83e61
 DIST kdesdk-kio-24.08.1.tar.xz 41768 BLAKE2B 4901e61a12542d01b26eb23c717120f56c8463b341e8296db5cfe35d3abc45cbad956bbd0bb33342ac2eeb5aa18210ae9d39c496961b8b986ac526afbe98fddf SHA512 65ee2d1463c15b42a093f8336d8394ae667b76537c6739605c2b48e77c61171859b252eb1795faec7fc5396e38d39f7a998eabd06d8fd4b96d42f0da26db8151
-EBUILD kio-perldoc-24.05.2.ebuild 490 BLAKE2B 638ac904ec32bd3dd2603c9e7983e35da44eab7573ec39c27fc8c5563da46d5a74633446cdabf2cca4a1b419b2c0d5a8291ce4052216d8a6bdf3cc179b50f94a SHA512 005110171b9b10d5de30d92773d07f546f2f926fa19b01919ac99b3396ca8f7dcb88d6add5c49a1838bfa1bc0d919b9a2acf85378fbc4144cbea822304f9c111
-EBUILD kio-perldoc-24.08.1.ebuild 491 BLAKE2B 5797bdf6e1fd1747bf9901e3310070e244dec17cf8fbcd0d7b6b55aa78bad3ecf7915958b6771c1d4d52b5e63b3a2c1950970cb69160a5a67c5ba1e763eae187 SHA512 b6c1cb01bbf8602d9302e4d04a7339eef7f52bcf0c2f783afa12eab49e2cfac631f6015dcc20e95a747982f870eb3993774d01a8b315c57020749aa03fd932f5
+EBUILD kio-perldoc-24.08.1.ebuild 490 BLAKE2B 3b4f01f28b5b3e062f18f722d0534e5c8e3f626d3a1a164288200271366868520e48ec246723239606aeb425f1e614eabe7c16d0e1228e7d89fe75e408aee5d6 SHA512 cb9945efddc173d239de4ab854500cf2fd6e55e1dd850e19c56dde642e4c3961071081fd6266f292f9d271a6527cfbfa564c26d2d06838fbda8e36419583207c
 MISC metadata.xml 376 BLAKE2B 973773b9cb2a2e9d2a7e187056409bbbe4a1f88bf97b791fe4b096beb1c638bbfef558abb19920383471641454784549ada0fe5aba4fcfb6ce762156711457c6 SHA512 e29785bf513fab36b159f7bdca1a339dc3e004e067b1e98ae5997f865494ac70ef4e27a74387cc65a486decd42f91926fe478143b6ac9906753a69f0b546617a
diff --git a/dev-util/kio-perldoc/kio-perldoc-24.05.2.ebuild b/dev-util/kio-perldoc/kio-perldoc-24.05.2.ebuild
deleted file mode 100644
index fc2748d99a38..000000000000
--- a/dev-util/kio-perldoc/kio-perldoc-24.05.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="kdesdk-kio"
-KFMIN=6.3.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/kio-perldoc/kio-perldoc-24.08.1.ebuild b/dev-util/kio-perldoc/kio-perldoc-24.08.1.ebuild
index 7a8193555d08..156fe79ee2ca 100644
--- a/dev-util/kio-perldoc/kio-perldoc-24.08.1.ebuild
+++ b/dev-util/kio-perldoc/kio-perldoc-24.08.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KIO worker interface to browse Perl documentation"
 
 LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
 SLOT="6"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/libtree/Manifest b/dev-util/libtree/Manifest
index 5d6338e21900..bee66eb0582c 100644
--- a/dev-util/libtree/Manifest
+++ b/dev-util/libtree/Manifest
@@ -1,5 +1,5 @@
 AUX libtree-3.1.1-modern-c.patch 4584 BLAKE2B 7a35eb096abc47561506e9a625fcd9c13944e2ba3f781ea81c84b2e44a9bdff33764d76d2da3bea0e2481f168864df4ce594f3270fe4f77bf86627397b6a9b1e SHA512 4fc8910fea3a547eb763c9a24746184b96a11977f9fbc744a15f65ff7a9ef76316f000ed4c3bbcb742df251b37765a394ef103fdbde010f64c6a31d90343fee5
 AUX libtree-3.1.1-test-flags.patch 1316 BLAKE2B 41295a1e2263456a88d7d2ac7fcd2ec6e84cf4b7000f306ef317b25bdfada660a151d336683da23c1ab182b4c6251d3274cfcc022d28711d5a45eba3723e6522 SHA512 c1acc0dd70806eac8f9c2afe687026597659b132748e868e573ae43f008cc3a82e3963efb31f2e4d468ebeb757c2521023523b3b6009f1dae747dda987043674
 DIST libtree-3.1.1.tar.gz 79931 BLAKE2B 70359c36a83ad1fb7937e57757f872e067ae167b65ee0bf065a357ac0c4dad2106370fe8a9cca11a477e37bed7266073ceb79947ab9d4b5e7cd0d2a6bacca8e9 SHA512 6b4b41b16edfcaa83c16b566a3afff1de0ecffdd5f91af2c82db95fca678b993e021ca8fac5fd1d37ad60ea2215100a0889ee457ce08019f3888e32c755ba1ce
-EBUILD libtree-3.1.1.ebuild 593 BLAKE2B 769404a2122c43d292eb68ec51d96f6f26cc0e80673673052e9e76b64d81c479deca0f851e56d59f2109e1293e1b1e57edd5eca725f4708d18160a964beb066d SHA512 b1d2e9fb0b8dc8650fcf00d92c4de99cb507c5eb2d86269588f07597134d4a76cee2e2f62c64c743d20a36de665864f7688341c0e73316f2e7b49419551978d9
+EBUILD libtree-3.1.1.ebuild 600 BLAKE2B 2736cb4e4633222a6fe073a48576d488feb014049caab1977db841057b058650016718a2f3432ad884c5947974fe1f97d41692c957bd173bcb9b080fcb67389f SHA512 f24a4d9a6e51b8531fb3c76034c0c5b0a542ca4e364dc788d84533af95b3f08d45b3b8a23671b800701a7f4c150af5431763d44797758c21f936f183d03d5b15
 MISC metadata.xml 320 BLAKE2B 7c5fe56a3cb0f496d86aeec399e20af48e5b951f63f9fca6553488e7d124f5b1c1d7eb73bbc508aecfc246d67667307ac1dd3acc763eb8549d8a904a38e05833 SHA512 d6a205bddcbbbb0099f146861e2285bf6262f2195c484195f5cceed112396a1130451016e133c41dc6cac315eb5e8fbd9b57a4463ac03a5af198d5d8c7a33b39
diff --git a/dev-util/libtree/libtree-3.1.1.ebuild b/dev-util/libtree/libtree-3.1.1.ebuild
index 801e7bc8e4c2..fe59c542ed4d 100644
--- a/dev-util/libtree/libtree-3.1.1.ebuild
+++ b/dev-util/libtree/libtree-3.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/haampie/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-modern-c.patch
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 2a0d261b08f4..3d10541dfbe2 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-build-tools-0.13.0.tar.xz 25480 BLAKE2B aebbcb55851b0acc00bf4d34e3846e12a3d503e4f7238ba57d7d6b3df44ccd8e6dbe5fc1986ed722dfd4384ad17f22be14fa0c6270b3ed385ae7cd4ff5711e3e SHA512 ffb300159d6bbbdbe9d43d261a5028342f24057c943cf8dab5093d53b72bf5700de8f545914d454993e949d64aba77e3d01cbe68e8a4b4f6ca9f9f9693de3e0b
 DIST lxqt-build-tools-2.0.0.tar.xz 26072 BLAKE2B a549dbe4b2e93d33d0238efe4e419c867db49e626436c243c8080cd4d925212edfb531bb2d9b661d675b7c9b9fec076a4a6f2d144f414ebc3babacada75877e3 SHA512 4fe92af82d55bda8fc1b6dc44998ed64b031e33a5c19e9206c1822375b8aa8abbf5f5b94d3c5ebe6d5d318f8821664ee308064b7adb9081e08047a4456cc6a66
 EBUILD lxqt-build-tools-0.13.0.ebuild 543 BLAKE2B 4214b2adad5fe03ce742b99c688a549992857d425d23b2a55fee0c72596676445d347759daaceede0e84c53dc6c462483d855c87841e67cb0da3455d6723d664 SHA512 d2c685893bd39c16218dfc0822bf2e552dca529c81f85d9cccb1ebd16c0e45a7207c23fb541348ef84c8beef05c16ed115bcc94e9473392c5324824cd432ae0e
-EBUILD lxqt-build-tools-2.0.0-r1.ebuild 1408 BLAKE2B d7b7ebc3c0e736189f11ffd6c2447b2f5f0f6f8141a1573e66e4b197e8cee408f77a4769bc104ca8dd3e57c19dfbe59280d3edd8b071d2cc5a083135dc645d7c SHA512 54effe195bb4f62e486ba13f187f8d9ed206910c9ea4b762a1d77fd928ef6961df501f954587f3f009dadcd11151e2fc773052b66dea1c64f400945313aee8a5
+EBUILD lxqt-build-tools-2.0.0-r1.ebuild 1415 BLAKE2B 080050544644964a48dc92d246fa29fc76db11e5025287bfadde0aa11a50bb768eb95d9bd14a9aeecca37e0bdfb0e7024be2965ef9408b1667bd6345a961d952 SHA512 59795ab82b8a05aa077e8bd40955eb794d3f7db07dc72a8b5d9316130093ac6f69090e21a3b1402855bf45af07602c2ff329bab251a01db78212192ea76aaa2b
 MISC metadata.xml 323 BLAKE2B 23d737cdebbafa977534a82a3244d697f8d3b55b16715d344ec46da7c71eb68d480e3a4196944e800400c94c900f240f92ffffc092c68aceeeb95c8cdead9a87 SHA512 403f0f0d13ce990a814e653032166c8cab4d3ea8924aec77f46050760d94e26afb42cb1d793ca4eda3a04a402f3817646cc876c35b506d1bff80bc03a020f0f6
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-2.0.0-r1.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-2.0.0-r1.ebuild
index 2e10cae42b4f..14b4fb1177b7 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-2.0.0-r1.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-2.0.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index 6f7cc558de97..729bfe53b2ec 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -11,7 +11,7 @@ EBUILD pahole-1.24_p20221024.ebuild 1692 BLAKE2B 06963686b5161a63841e5184603a6f1
 EBUILD pahole-1.25.ebuild 1699 BLAKE2B cd5422b82887a43fdf49c0f402aeeda058bab76b53d575f736c8c88f27d43643d57bc35595d0a2b5857333bec75085f719be8fb34260a85eb401c4ce7debc242 SHA512 8292e2d7815dc49ad2b821b96f2d04976ef4c092b21532657e6ab5a8675096743b806ef10a989e225dcc6e0255ebac05866a00d5a3df8c83b6bce8a4b82e2379
 EBUILD pahole-1.26-r1.ebuild 2118 BLAKE2B dde9c52f1f124fef141cc9aed25f17a6fc6d42948e3a929d0e198866a6625f20e180309f6e6798fd206982c20eac15c0ef030738267c43701cf451f8eb39169b SHA512 d0f52e4afca64581a136b6990c57cae6bb4078901a383438d4ffaecf40a6826b961793182643466dc8af9aede24427fab3cfa52774b40335ebb5c2dd0ac7f2f9
 EBUILD pahole-1.26.ebuild 1698 BLAKE2B 48d80b80170687ffa9b91966deb9b1b8f7fb8d839799bcd4e2e1d96fa7cb92b842ea6fe2d5a8f9cdb6558e71fc0914857cb50ab615b399609a49ad40dd64fdb9 SHA512 9b1f28ac235b906327c452bd173087ab8102f0ebe3ec5a9f305f19e9114b89d8a99c58acc094512c4342768c576dbfeb00b69ead274411121ad25b5058baeb66
-EBUILD pahole-1.27-r1.ebuild 2206 BLAKE2B 90866a5a8b807942b4af6686569a745063a1f7b386106e98e56a6782b92ae65eadb6b813c888c7e7dfcbdc57c5772eef6751674605ce90e9032d010ba50420bb SHA512 bf1cc941eb5a65c74c5d08203a83e638173299a3f2828d7528b243f0a4063c7a0c9c9df4226eb8ef8cac9b7a2baa2224a5b42b9af8dcdfcf520b234ecc6a942e
+EBUILD pahole-1.27-r1.ebuild 2207 BLAKE2B a53642ea0b1af89ef206001d2dd5d1d18865e2c5848ebcb68406615146a18b9053c6a723b6b99528400cc9a0f24b9a96212a2c9788951a487bbfad61bfdb1a91 SHA512 c64de6d29a98e7164b7ae70d7cc8ac8946c45e283258d2ab3ff90758e91a0b51ba827cb28c0f340afeb2b4ae3e4e4b3909fc697d77e55811de0450e1cd91652f
 EBUILD pahole-1.27.ebuild 2118 BLAKE2B dde9c52f1f124fef141cc9aed25f17a6fc6d42948e3a929d0e198866a6625f20e180309f6e6798fd206982c20eac15c0ef030738267c43701cf451f8eb39169b SHA512 d0f52e4afca64581a136b6990c57cae6bb4078901a383438d4ffaecf40a6826b961793182643466dc8af9aede24427fab3cfa52774b40335ebb5c2dd0ac7f2f9
-EBUILD pahole-9999.ebuild 2118 BLAKE2B dde9c52f1f124fef141cc9aed25f17a6fc6d42948e3a929d0e198866a6625f20e180309f6e6798fd206982c20eac15c0ef030738267c43701cf451f8eb39169b SHA512 d0f52e4afca64581a136b6990c57cae6bb4078901a383438d4ffaecf40a6826b961793182643466dc8af9aede24427fab3cfa52774b40335ebb5c2dd0ac7f2f9
+EBUILD pahole-9999.ebuild 2119 BLAKE2B a0af57f5e84a6c352e3444f502c7a5249efd41200bd919103f91a20dffd48dac592932b1278d51555e0c542af034572e5a230df92652f830f3bd9f5309803dbe SHA512 928bb2980b49a17a060920859a55444d2d725d5e268b0b3f5c5b466a3a3d8036f28294c6722c056ab69ed2e9b11c8a5a9ca61b90b6d79cb14755d67804e088ce
 MISC metadata.xml 671 BLAKE2B 02f5850fd69e3eda9a616d312232cdfbda1b557c56c9f802edd5a79e4e231ebddae57d50fbe44ca595d06b86da9c1f72a1dc516245c3525d73be46accffa0944 SHA512 7877a56f0879df1b6550bd6dc576a69ce5cc5a26e34e18d403cfa0c6cb5a9279c0ff6a11c56a7990de8255a55b67687755be0df62c6ff247b2b35f2e3df30235
diff --git a/dev-util/pahole/pahole-1.27-r1.ebuild b/dev-util/pahole/pahole-1.27-r1.ebuild
index 7a1aa466edfb..1f86be66916a 100644
--- a/dev-util/pahole/pahole-1.27-r1.ebuild
+++ b/dev-util/pahole/pahole-1.27-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake python-single-r1
 
 MY_PN=dwarves
diff --git a/dev-util/pahole/pahole-9999.ebuild b/dev-util/pahole/pahole-9999.ebuild
index d55f767254cb..560c9a73d4a0 100644
--- a/dev-util/pahole/pahole-9999.ebuild
+++ b/dev-util/pahole/pahole-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake python-single-r1
 
 MY_PN=dwarves
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 7fb1e325b8fd..bff145b2d825 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,16 +1,15 @@
-AUX perf-6.0-c++17.patch 1127 BLAKE2B 923390f761b588a01935e2b36ff25f916f91e752f76fc6e02999ddc51e297a13798b38a9d3523deab327c8fd6ee2ea02e93f454a4b799f61552c11c1cad574aa SHA512 add3956108a83fd58ca949f6f6a611c44a0f29a4b4eef28c4883a1ba6058b66203064837878becbd64d8afebef57beb1cefcfcedb2a95c221f6792dffcaf38cb
-AUX perf-6.0-clang.patch 1862 BLAKE2B e88655e51cb785b80cd44fefb73bb7668bf6d57205e478b106a0d0fbbee4e7089850c2328e796530347c354eb8e7e46e947c18e03ded488bede41de5f74f0b8e SHA512 0e92ba2e878b2b20f6d7c30ba5fde43388378c7f8e752a7c07dd65abc66e576be8f74cf9c06abb79713cc8c1cab37c9cd678f4e5bba8bb99ed1020317f278eb2
 AUX perf-6.10-bpf-capstone.patch 11805 BLAKE2B 5e4f2942b6ab4e7c3e149b86dab9515b0a60ab73e003b59bb2623288896f4db3bd80f372110e9ef7f2da49641c925fe60989fb5e21dd5e2e13409fc7e60b3722 SHA512 ac5270276552b934736dd111eefe7019cfe091a14ed7e2fe107527b69652e82415f4142a1199db5e3a1a3e0b48b7ee0166f650bfe0fb25bdc69908b376baf3d3
 AUX perf-6.10-expr.patch 1355 BLAKE2B d4dcb3b8b79944f304fd8789cd680e91e2fb1deffaa0ac108e200130f9ab669bea6a8ad65efc66b730b3282d523f839812cc4de6861b665c86bf2ba400645743 SHA512 0b031a675c49149b0f7623c0e663e4b6c2866ab4fa7e7e29712a55ebbceccef68bdde8ebe1f70a0f3e035e75e6e8e6fb90c06d0c16d39d2866ecbded4ff0c5cc
 AUX perf-6.10.3-bpf-capstone.patch 11856 BLAKE2B 17f3d66a4fd0508f3ac89d4c9d18341dac97cf4b753bde85887a1b9ee79c10a3e1e94d28bb2c77a69dd35c5db21ef7ffe83314c8adca95dcc3ca353829eff139 SHA512 c41dcee2e85676a56178a0cb9998f1a56dab1aba8c49cdac506fd05bf72065a6dc51a46d48fe968a45ab5a872235f6839aab93b3464e6cf25aa66580b92ac652
+AUX perf-6.11-bpf-capstone.patch 12796 BLAKE2B 8d99c9bf701589c025886ff64a3591537676ac6f8f0dc56693d2542f95ceb8ec575c8c5724dc9dfa1eee0253e71efbe304f8b5457b1323a54d10f0cdf9659203 SHA512 b6ee9c74d3839febb90c86ed58f6162b268e06ab2c545e840e5a62cf062f1f6e5d2d8fca978ef6092572c61e168301984fb3ddf27bc02ed9351b01dc5558fe4e
 AUX perf-6.4-libtracefs.patch 780 BLAKE2B dc97e42f1d3ece03722441b5a2c1f87ab9871ca92b9cf9f57b2e44627fddfcedaf6d7f64ddf74fd103c23aa0db71c4d147f7841743eb5c5a466c9bbb150597ea SHA512 da1b69c190491dd926ba1e98a43965a5ffd543df4134e6a10d187ab544695617fcffede3190bce4cbef13b897d113dee743f67a98ff249a486f8de2d49e62f9f
 AUX perf-6.7-expr.patch 1257 BLAKE2B 1ff41975d84f835a343d2b2f9f049edd817bf80ca576879c7f819608506341b5d19147cf3ecd67a731ab6ecf9a45ce494a8a665aa1bff86cc14f3967a6dd12a0 SHA512 8f1a5a8412464f7623b10da562552b2ac17ca8e70eb4507a3751493662e64066828f2b7a73f1bc7546f463d8d21919f59622b978a6bacafed6a93f232a15ff0b
 DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2
-DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
+DIST linux-6.11.tar.xz 146900704 BLAKE2B e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab SHA512 329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea
 DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
 DIST patch-6.10.4.xz 303168 BLAKE2B d38bbcdd2f730a030add5b38c1ab09c7081c311ed716d3ae976a058dd34b235078700cdff05d79dc93d9badb75c95566a3bdfc39dfa045d54857d82ee2c92e9d SHA512 5f5e8b19d114fed733c8c98a581fe339f8896e05e5da6a37deb1d7d8aa9dd83b3c80a97b1c6f3f51b6f20cca9c435b20c28c2c511da2026980d9fa72624cf420
 EBUILD perf-6.10.4.ebuild 9495 BLAKE2B 90bf673dcd8c94531bd534e520077c5a049abca75edea00a85c21e96cffc69a449c9c1eca24072f0ea9e00c192e21fd32fd9407829001168d101e9ef6cb0695f SHA512 3aa795231a233cbc85d1dcb8e0bec426b6ffa42dca128d264f64e15b93dd6fbff83d59c1b4b66fad4b4806783dcc76bb1711a2c2dc26bfa328b3b9d349a13f28
 EBUILD perf-6.10.ebuild 9289 BLAKE2B 31127f741e6ec0ab27723ba29b54d1e6e6da2005a6be2e2ec742f03f377473ba0bdbdd309bdce61b767b737fe665b6fe4bdcb44eb46e92ad073a16e5e991b65f SHA512 a338e422d8fde71bce6e680992901fdf2008ea12e4e2bb7e06e5a135d3d61b6c7dbc74f61d1e4c5b72ee57c3bf4f86443a407b77f3d6f9fc556012f53d528d82
-EBUILD perf-6.3.ebuild 7879 BLAKE2B 8c0a0d871ba9892559e6a7456d65f3e428dc447c956e59f885c5a3690317c613c35de24e0c2638fb820d7635a291c85f4a36ce6f303e694c2895fa9e79922734 SHA512 929c052bcd742009aea8157c8316c52daa02f8fd36894df743d5a942f776ef13f683e04bb63b8568c20dbfa1b2a360e7189a99d67e8d4ad7458db790e221d50c
+EBUILD perf-6.11.ebuild 9483 BLAKE2B 39154089a2bd3de3e4f0dfbf1e96dcee10160dab0fca9d9a9acf31e7a94a421a078f8baa593581ab045256f1dfa16abb9ac00896da70bf6fa6db911127326d42 SHA512 d4eb50d0e524b8d11ec034f1bdac2c4cd58ff77cea72f74040c24248b4415905a2d7a9cbec0d55930c944bc5a7694d8d3b1b15587c7ac52bcd53b4709673a2aa
 EBUILD perf-6.7.ebuild 9089 BLAKE2B 22ca5977135f8b1f411c423697a61e0a4a4582fb9e470c4e816d7a8022f4f90088f640ff5fb4352c963805d3ab5ff9de003f6aa0d0d7b541bc4d788c17ed3df5 SHA512 3d822becfa8100be4e597082cadd51d817358344e79ff65c722c5d1f904cc34fdda0b01ae1ff9417e5b1132b7e13a9271ac21560538bb775b30ef3d5bdd4d247
-MISC metadata.xml 1732 BLAKE2B 03176060a38c63b19df545d60440a68581f637aa5533a8cf31ac1aa0412d30e73ac1fd65bd13e50d731fc2a028dda5fbe3eac92d85fa7acefb3884fb3cf490dd SHA512 2910d91429859d9ac69d275422239341dcbbd24b0010d716ee9de52272b817e72e59af0c7b524404366140e55491d3fe3b3abe14ec6df98ca064e91eab51b923
+MISC metadata.xml 1664 BLAKE2B fd151376545e542f591d4a0b06f7a3e51a5e3844a613035fabbeb770a58781ed29cd5d7614560d0f7473b2dec3636e1ca0f736259091371baad96d1bc2ef5d8f SHA512 96d8b853e38317bb526d5d5888b04e706df8dcc37c2ef26a3b047b861f86e33406071d8cebc287fbd09e6e33a2b5e72872b41c3ceb247392adc310f8389c1a26
diff --git a/dev-util/perf/files/perf-6.0-c++17.patch b/dev-util/perf/files/perf-6.0-c++17.patch
deleted file mode 100644
index 08c34bc552ca..000000000000
--- a/dev-util/perf/files/perf-6.0-c++17.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/904169
---- a/tools/perf/Makefile.config
-+++ b/tools/perf/Makefile.config
-@@ -309,7 +309,7 @@
- CORE_CFLAGS += -Wextra
- CORE_CFLAGS += -std=gnu11
- 
--CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti
-+CXXFLAGS += -std=gnu++17 -fno-exceptions -fno-rtti
- CXXFLAGS += -Wall
- CXXFLAGS += -fno-omit-frame-pointer
- CXXFLAGS += -ggdb3
---- a/tools/build/feature/Makefile
-+++ b/tools/build/feature/Makefile
-@@ -339,7 +339,7 @@
- 	$(BUILD)
- 
- $(OUTPUT)test-llvm.bin:
--	$(BUILDXX) -std=gnu++14 				\
-+	$(BUILDXX) -std=gnu++17 				\
- 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
- 		-L$(shell $(LLVM_CONFIG) --libdir)		\
- 		$(shell $(LLVM_CONFIG) --libs)			\
-@@ -347,12 +347,12 @@
- 		> $(@:.bin=.make.output) 2>&1
- 
- $(OUTPUT)test-llvm-version.bin:
--	$(BUILDXX) -std=gnu++14					\
-+	$(BUILDXX) -std=gnu++17					\
- 		-I$(shell $(LLVM_CONFIG) --includedir)		\
- 		> $(@:.bin=.make.output) 2>&1
- 
- $(OUTPUT)test-clang.bin:
--	$(BUILDXX) -std=gnu++14					\
-+	$(BUILDXX) -std=gnu++17					\
- 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
- 		-L$(shell $(LLVM_CONFIG) --libdir)		\
- 		-lclang-cpp $(shell $(LLVM_CONFIG) --libs)	\
-
diff --git a/dev-util/perf/files/perf-6.0-clang.patch b/dev-util/perf/files/perf-6.0-clang.patch
deleted file mode 100644
index 65b38c8d399b..000000000000
--- a/dev-util/perf/files/perf-6.0-clang.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-
-Adapt for building against LLVM/Clang with monolithic libraries.
-
---- a/tools/build/feature/Makefile
-+++ b/tools/build/feature/Makefile
-@@ -338,7 +338,7 @@ $(OUTPUT)test-llvm.bin:
- 	$(BUILDXX) -std=gnu++14 				\
- 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
- 		-L$(shell $(LLVM_CONFIG) --libdir)		\
--		$(shell $(LLVM_CONFIG) --libs Core BPF)		\
-+		$(shell $(LLVM_CONFIG) --libs)			\
- 		$(shell $(LLVM_CONFIG) --system-libs)		\
- 		> $(@:.bin=.make.output) 2>&1
- 
-@@ -351,10 +351,7 @@ $(OUTPUT)test-clang.bin:
- 	$(BUILDXX) -std=gnu++14					\
- 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
- 		-L$(shell $(LLVM_CONFIG) --libdir)		\
--		-Wl,--start-group -lclangBasic -lclangDriver	\
--		  -lclangFrontend -lclangEdit -lclangLex	\
--		  -lclangAST -Wl,--end-group 			\
--		$(shell $(LLVM_CONFIG) --libs Core option)	\
-+		-lclang-cpp $(shell $(LLVM_CONFIG) --libs)	\
- 		$(shell $(LLVM_CONFIG) --system-libs)		\
- 		> $(@:.bin=.make.output) 2>&1
- 
---- a/tools/perf/Makefile.perf
-+++ b/tools/perf/Makefile.perf
-@@ -416,14 +416,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS))
- LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
- 
- ifeq ($(USE_CLANG), 1)
--  CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization
--  CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l))
--  LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so))
--  LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group
-+  LIBS += -lclang-cpp
- endif
- 
- ifeq ($(USE_LLVM), 1)
--  LIBLLVM = $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) --system-libs)
-+  LIBLLVM = $(shell $(LLVM_CONFIG) --libs) $(shell $(LLVM_CONFIG) --system-libs)
-   LIBS += -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM)
- endif
diff --git a/dev-util/perf/files/perf-6.11-bpf-capstone.patch b/dev-util/perf/files/perf-6.11-bpf-capstone.patch
new file mode 100644
index 000000000000..7d8b376869f3
--- /dev/null
+++ b/dev-util/perf/files/perf-6.11-bpf-capstone.patch
@@ -0,0 +1,469 @@
+commit ea59b70a8418a313d6f2ab48a957de015fc33018
+Author: Arnaldo Carvalho de Melo <acme@redhat.com>
+Date:   Wed Jul 31 11:58:56 2024 -0300
+
+    perf bpf: Move BPF disassembly routines to separate file to avoid clash with capstone bpf headers
+    
+    There is a clash of the libbpf and capstone libraries, that ends up
+    with:
+    
+      In file included from /usr/include/capstone/capstone.h:325,
+                       from util/disasm.c:1513:
+      /usr/include/capstone/bpf.h:94:14: error: ‘bpf_insn’ defined as wrong kind of tag
+         94 | typedef enum bpf_insn {
+    
+    So far we're just trying to avoid this by not having both headers
+    included in the same .c or .h file, do it one more time by moving the
+    BPF diassembly routines from util/disasm.c to util/disasm_bpf.c.
+    
+    This is only being hit when building with BUILD_NONDISTRO=1, i.e.
+    building with binutils-devel, that isn't the in the default build due to
+    a licencing clash. We need to reimplement what is now isolated in
+    util/disasm_bpf.c using some other library to have BPF annotation
+    feature that now only is available with BUILD_NONDISTRO=1.
+    
+    Fixes: 6d17edc113de1e21 ("perf annotate: Use libcapstone to disassemble")
+    Cc: Adrian Hunter <adrian.hunter@intel.com>
+    Cc: Ian Rogers <irogers@google.com>
+    Cc: Jiri Olsa <jolsa@kernel.org>
+    Cc: Kan Liang <kan.liang@linux.intel.com>
+    Cc: Namhyung Kim <namhyung@kernel.org>
+    Link: https://lore.kernel.org/lkml/ZqpUSKPxMwaQKORr@x1
+    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+
+diff --git a/tools/perf/util/Build b/tools/perf/util/Build
+index 0f18fe81ef0b..b24360c04aae 100644
+--- a/tools/perf/util/Build
++++ b/tools/perf/util/Build
+@@ -13,6 +13,7 @@ perf-util-y += copyfile.o
+ perf-util-y += ctype.o
+ perf-util-y += db-export.o
+ perf-util-y += disasm.o
++perf-util-y += disasm_bpf.o
+ perf-util-y += env.o
+ perf-util-y += event.o
+ perf-util-y += evlist.o
+diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c
+index 410e52cd9cfd..85fb0cfedf94 100644
+--- a/tools/perf/util/disasm.c
++++ b/tools/perf/util/disasm.c
+@@ -16,6 +16,7 @@
+ #include "build-id.h"
+ #include "debug.h"
+ #include "disasm.h"
++#include "disasm_bpf.h"
+ #include "dso.h"
+ #include "env.h"
+ #include "evsel.h"
+@@ -1323,192 +1324,6 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil
+ 	return 0;
+ }
+ 
+-#if defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
+-#define PACKAGE "perf"
+-#include <bfd.h>
+-#include <dis-asm.h>
+-#include <bpf/bpf.h>
+-#include <bpf/btf.h>
+-#include <bpf/libbpf.h>
+-#include <linux/btf.h>
+-#include <tools/dis-asm-compat.h>
+-
+-#include "bpf-event.h"
+-#include "bpf-utils.h"
+-
+-static int symbol__disassemble_bpf(struct symbol *sym,
+-				   struct annotate_args *args)
+-{
+-	struct annotation *notes = symbol__annotation(sym);
+-	struct bpf_prog_linfo *prog_linfo = NULL;
+-	struct bpf_prog_info_node *info_node;
+-	int len = sym->end - sym->start;
+-	disassembler_ftype disassemble;
+-	struct map *map = args->ms.map;
+-	struct perf_bpil *info_linear;
+-	struct disassemble_info info;
+-	struct dso *dso = map__dso(map);
+-	int pc = 0, count, sub_id;
+-	struct btf *btf = NULL;
+-	char tpath[PATH_MAX];
+-	size_t buf_size;
+-	int nr_skip = 0;
+-	char *buf;
+-	bfd *bfdf;
+-	int ret;
+-	FILE *s;
+-
+-	if (dso__binary_type(dso) != DSO_BINARY_TYPE__BPF_PROG_INFO)
+-		return SYMBOL_ANNOTATE_ERRNO__BPF_INVALID_FILE;
+-
+-	pr_debug("%s: handling sym %s addr %" PRIx64 " len %" PRIx64 "\n", __func__,
+-		  sym->name, sym->start, sym->end - sym->start);
+-
+-	memset(tpath, 0, sizeof(tpath));
+-	perf_exe(tpath, sizeof(tpath));
+-
+-	bfdf = bfd_openr(tpath, NULL);
+-	if (bfdf == NULL)
+-		abort();
+-
+-	if (!bfd_check_format(bfdf, bfd_object))
+-		abort();
+-
+-	s = open_memstream(&buf, &buf_size);
+-	if (!s) {
+-		ret = errno;
+-		goto out;
+-	}
+-	init_disassemble_info_compat(&info, s,
+-				     (fprintf_ftype) fprintf,
+-				     fprintf_styled);
+-	info.arch = bfd_get_arch(bfdf);
+-	info.mach = bfd_get_mach(bfdf);
+-
+-	info_node = perf_env__find_bpf_prog_info(dso__bpf_prog(dso)->env,
+-						 dso__bpf_prog(dso)->id);
+-	if (!info_node) {
+-		ret = SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF;
+-		goto out;
+-	}
+-	info_linear = info_node->info_linear;
+-	sub_id = dso__bpf_prog(dso)->sub_id;
+-
+-	info.buffer = (void *)(uintptr_t)(info_linear->info.jited_prog_insns);
+-	info.buffer_length = info_linear->info.jited_prog_len;
+-
+-	if (info_linear->info.nr_line_info)
+-		prog_linfo = bpf_prog_linfo__new(&info_linear->info);
+-
+-	if (info_linear->info.btf_id) {
+-		struct btf_node *node;
+-
+-		node = perf_env__find_btf(dso__bpf_prog(dso)->env,
+-					  info_linear->info.btf_id);
+-		if (node)
+-			btf = btf__new((__u8 *)(node->data),
+-				       node->data_size);
+-	}
+-
+-	disassemble_init_for_target(&info);
+-
+-#ifdef DISASM_FOUR_ARGS_SIGNATURE
+-	disassemble = disassembler(info.arch,
+-				   bfd_big_endian(bfdf),
+-				   info.mach,
+-				   bfdf);
+-#else
+-	disassemble = disassembler(bfdf);
+-#endif
+-	if (disassemble == NULL)
+-		abort();
+-
+-	fflush(s);
+-	do {
+-		const struct bpf_line_info *linfo = NULL;
+-		struct disasm_line *dl;
+-		size_t prev_buf_size;
+-		const char *srcline;
+-		u64 addr;
+-
+-		addr = pc + ((u64 *)(uintptr_t)(info_linear->info.jited_ksyms))[sub_id];
+-		count = disassemble(pc, &info);
+-
+-		if (prog_linfo)
+-			linfo = bpf_prog_linfo__lfind_addr_func(prog_linfo,
+-								addr, sub_id,
+-								nr_skip);
+-
+-		if (linfo && btf) {
+-			srcline = btf__name_by_offset(btf, linfo->line_off);
+-			nr_skip++;
+-		} else
+-			srcline = NULL;
+-
+-		fprintf(s, "\n");
+-		prev_buf_size = buf_size;
+-		fflush(s);
+-
+-		if (!annotate_opts.hide_src_code && srcline) {
+-			args->offset = -1;
+-			args->line = strdup(srcline);
+-			args->line_nr = 0;
+-			args->fileloc = NULL;
+-			args->ms.sym  = sym;
+-			dl = disasm_line__new(args);
+-			if (dl) {
+-				annotation_line__add(&dl->al,
+-						     &notes->src->source);
+-			}
+-		}
+-
+-		args->offset = pc;
+-		args->line = buf + prev_buf_size;
+-		args->line_nr = 0;
+-		args->fileloc = NULL;
+-		args->ms.sym  = sym;
+-		dl = disasm_line__new(args);
+-		if (dl)
+-			annotation_line__add(&dl->al, &notes->src->source);
+-
+-		pc += count;
+-	} while (count > 0 && pc < len);
+-
+-	ret = 0;
+-out:
+-	free(prog_linfo);
+-	btf__free(btf);
+-	fclose(s);
+-	bfd_close(bfdf);
+-	return ret;
+-}
+-#else // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
+-static int symbol__disassemble_bpf(struct symbol *sym __maybe_unused,
+-				   struct annotate_args *args __maybe_unused)
+-{
+-	return SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF;
+-}
+-#endif // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
+-
+-static int
+-symbol__disassemble_bpf_image(struct symbol *sym,
+-			      struct annotate_args *args)
+-{
+-	struct annotation *notes = symbol__annotation(sym);
+-	struct disasm_line *dl;
+-
+-	args->offset = -1;
+-	args->line = strdup("to be implemented");
+-	args->line_nr = 0;
+-	args->fileloc = NULL;
+-	dl = disasm_line__new(args);
+-	if (dl)
+-		annotation_line__add(&dl->al, &notes->src->source);
+-
+-	zfree(&args->line);
+-	return 0;
+-}
+-
+ #ifdef HAVE_LIBCAPSTONE_SUPPORT
+ #include <capstone/capstone.h>
+ 
+diff --git a/tools/perf/util/disasm_bpf.c b/tools/perf/util/disasm_bpf.c
+new file mode 100644
+index 000000000000..1fee71c79b62
+--- /dev/null
++++ b/tools/perf/util/disasm_bpf.c
+@@ -0,0 +1,195 @@
++// SPDX-License-Identifier: GPL-2.0-only
++
++#include "util/annotate.h"
++#include "util/disasm_bpf.h"
++#include "util/symbol.h"
++#include <linux/zalloc.h>
++#include <string.h>
++
++#if defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
++#define PACKAGE "perf"
++#include <bfd.h>
++#include <bpf/bpf.h>
++#include <bpf/btf.h>
++#include <bpf/libbpf.h>
++#include <dis-asm.h>
++#include <errno.h>
++#include <linux/btf.h>
++#include <tools/dis-asm-compat.h>
++
++#include "util/bpf-event.h"
++#include "util/bpf-utils.h"
++#include "util/debug.h"
++#include "util/dso.h"
++#include "util/map.h"
++#include "util/env.h"
++#include "util/util.h"
++
++int symbol__disassemble_bpf(struct symbol *sym, struct annotate_args *args)
++{
++	struct annotation *notes = symbol__annotation(sym);
++	struct bpf_prog_linfo *prog_linfo = NULL;
++	struct bpf_prog_info_node *info_node;
++	int len = sym->end - sym->start;
++	disassembler_ftype disassemble;
++	struct map *map = args->ms.map;
++	struct perf_bpil *info_linear;
++	struct disassemble_info info;
++	struct dso *dso = map__dso(map);
++	int pc = 0, count, sub_id;
++	struct btf *btf = NULL;
++	char tpath[PATH_MAX];
++	size_t buf_size;
++	int nr_skip = 0;
++	char *buf;
++	bfd *bfdf;
++	int ret;
++	FILE *s;
++
++	if (dso__binary_type(dso) != DSO_BINARY_TYPE__BPF_PROG_INFO)
++		return SYMBOL_ANNOTATE_ERRNO__BPF_INVALID_FILE;
++
++	pr_debug("%s: handling sym %s addr %" PRIx64 " len %" PRIx64 "\n", __func__,
++		  sym->name, sym->start, sym->end - sym->start);
++
++	memset(tpath, 0, sizeof(tpath));
++	perf_exe(tpath, sizeof(tpath));
++
++	bfdf = bfd_openr(tpath, NULL);
++	if (bfdf == NULL)
++		abort();
++
++	if (!bfd_check_format(bfdf, bfd_object))
++		abort();
++
++	s = open_memstream(&buf, &buf_size);
++	if (!s) {
++		ret = errno;
++		goto out;
++	}
++	init_disassemble_info_compat(&info, s,
++				     (fprintf_ftype) fprintf,
++				     fprintf_styled);
++	info.arch = bfd_get_arch(bfdf);
++	info.mach = bfd_get_mach(bfdf);
++
++	info_node = perf_env__find_bpf_prog_info(dso__bpf_prog(dso)->env,
++						 dso__bpf_prog(dso)->id);
++	if (!info_node) {
++		ret = SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF;
++		goto out;
++	}
++	info_linear = info_node->info_linear;
++	sub_id = dso__bpf_prog(dso)->sub_id;
++
++	info.buffer = (void *)(uintptr_t)(info_linear->info.jited_prog_insns);
++	info.buffer_length = info_linear->info.jited_prog_len;
++
++	if (info_linear->info.nr_line_info)
++		prog_linfo = bpf_prog_linfo__new(&info_linear->info);
++
++	if (info_linear->info.btf_id) {
++		struct btf_node *node;
++
++		node = perf_env__find_btf(dso__bpf_prog(dso)->env,
++					  info_linear->info.btf_id);
++		if (node)
++			btf = btf__new((__u8 *)(node->data),
++				       node->data_size);
++	}
++
++	disassemble_init_for_target(&info);
++
++#ifdef DISASM_FOUR_ARGS_SIGNATURE
++	disassemble = disassembler(info.arch,
++				   bfd_big_endian(bfdf),
++				   info.mach,
++				   bfdf);
++#else
++	disassemble = disassembler(bfdf);
++#endif
++	if (disassemble == NULL)
++		abort();
++
++	fflush(s);
++	do {
++		const struct bpf_line_info *linfo = NULL;
++		struct disasm_line *dl;
++		size_t prev_buf_size;
++		const char *srcline;
++		u64 addr;
++
++		addr = pc + ((u64 *)(uintptr_t)(info_linear->info.jited_ksyms))[sub_id];
++		count = disassemble(pc, &info);
++
++		if (prog_linfo)
++			linfo = bpf_prog_linfo__lfind_addr_func(prog_linfo,
++								addr, sub_id,
++								nr_skip);
++
++		if (linfo && btf) {
++			srcline = btf__name_by_offset(btf, linfo->line_off);
++			nr_skip++;
++		} else
++			srcline = NULL;
++
++		fprintf(s, "\n");
++		prev_buf_size = buf_size;
++		fflush(s);
++
++		if (!annotate_opts.hide_src_code && srcline) {
++			args->offset = -1;
++			args->line = strdup(srcline);
++			args->line_nr = 0;
++			args->fileloc = NULL;
++			args->ms.sym  = sym;
++			dl = disasm_line__new(args);
++			if (dl) {
++				annotation_line__add(&dl->al,
++						     &notes->src->source);
++			}
++		}
++
++		args->offset = pc;
++		args->line = buf + prev_buf_size;
++		args->line_nr = 0;
++		args->fileloc = NULL;
++		args->ms.sym  = sym;
++		dl = disasm_line__new(args);
++		if (dl)
++			annotation_line__add(&dl->al, &notes->src->source);
++
++		pc += count;
++	} while (count > 0 && pc < len);
++
++	ret = 0;
++out:
++	free(prog_linfo);
++	btf__free(btf);
++	fclose(s);
++	bfd_close(bfdf);
++	return ret;
++}
++#else // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
++int symbol__disassemble_bpf(struct symbol *sym __maybe_unused, struct annotate_args *args __maybe_unused)
++{
++	return SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF;
++}
++#endif // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
++
++int symbol__disassemble_bpf_image(struct symbol *sym, struct annotate_args *args)
++{
++	struct annotation *notes = symbol__annotation(sym);
++	struct disasm_line *dl;
++
++	args->offset = -1;
++	args->line = strdup("to be implemented");
++	args->line_nr = 0;
++	args->fileloc = NULL;
++	dl = disasm_line__new(args);
++	if (dl)
++		annotation_line__add(&dl->al, &notes->src->source);
++
++	zfree(&args->line);
++	return 0;
++}
+diff --git a/tools/perf/util/disasm_bpf.h b/tools/perf/util/disasm_bpf.h
+new file mode 100644
+index 000000000000..2ecb19545388
+--- /dev/null
++++ b/tools/perf/util/disasm_bpf.h
+@@ -0,0 +1,12 @@
++// SPDX-License-Identifier: GPL-2.0-only
++
++#ifndef __PERF_DISASM_BPF_H
++#define __PERF_DISASM_BPF_H
++
++struct symbol;
++struct annotate_args;
++
++int symbol__disassemble_bpf(struct symbol *sym, struct annotate_args *args);
++int symbol__disassemble_bpf_image(struct symbol *sym, struct annotate_args *args);
++
++#endif /* __PERF_DISASM_BPF_H */
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 89fef8ad07ac..2a4e4eada619 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -17,7 +17,6 @@
     <flag name="bpf">Enable support for eBPF features with <pkg>dev-libs/libbpf</pkg></flag>
     <flag name="babeltrace">Enable <pkg>dev-util/babeltrace</pkg> support</flag>
     <flag name="capstone">Use <pkg>dev-libs/capstone</pkg> for disassembly support</flag>
-    <flag name="clang">Enable builtin clang and LLVM support</flag>
     <flag name="doc">
       Build documentation and man pages. With this USE flag disabled,
       the --help parameter for perf and its sub-tools will not be
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.11.ebuild
index 9d36b0ce8ca7..b523d8477bf6 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.11.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
-inherit bash-completion-r1 estack flag-o-matic llvm toolchain-funcs python-r1 linux-info
+LLVM_COMPAT=( {16..19} )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit bash-completion-r1 estack flag-o-matic linux-info llvm-r1 toolchain-funcs python-r1
 
 DESCRIPTION="Userland tools for Linux Performance Counters"
 HOMEPAGE="https://perf.wiki.kernel.org/"
@@ -33,10 +34,12 @@ S="${S_K}/tools/perf"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace capstone big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
 
 # setuptools (and Python) are always needed even if not building Python bindings
 BDEPEND="
@@ -55,35 +58,46 @@ BDEPEND="
 	)
 "
 
-RDEPEND="audit? ( sys-process/audit )
-	babeltrace? ( dev-util/babeltrace )
-	crypt? ( virtual/libcrypt:= )
-	clang? (
-		sys-devel/clang:=
-		sys-devel/llvm:=
+RDEPEND="
+	audit? ( sys-process/audit )
+	babeltrace? ( dev-util/babeltrace:0/1 )
+	bpf? (
+		dev-libs/libbpf
+		dev-util/bpftool
+		dev-util/pahole
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/llvm:${LLVM_SLOT}=
+		')
 	)
+	caps? ( sys-libs/libcap )
+	capstone? ( dev-libs/capstone )
+	crypt? ( dev-libs/openssl:= )
 	gtk? ( x11-libs/gtk+:2 )
 	java? ( virtual/jre:* )
-	libpfm? ( dev-libs/libpfm )
+	libpfm? ( dev-libs/libpfm:= )
+	libtraceevent? ( dev-libs/libtraceevent )
+	libtracefs? ( dev-libs/libtracefs )
 	lzma? ( app-arch/xz-utils )
 	numa? ( sys-process/numactl )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	slang? ( sys-libs/slang )
 	systemtap? ( dev-debug/systemtap )
-	unwind? ( sys-libs/libunwind )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
+	tcmalloc? ( dev-util/google-perftools )
+	unwind? ( sys-libs/libunwind:= )
+	zstd? ( app-arch/zstd:= )
 	dev-libs/elfutils
-	sys-libs/binutils-libs:="
+	sys-libs/binutils-libs:=
+	sys-libs/zlib
+	virtual/libcrypt
+"
 
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-5.10
 	java? ( virtual/jdk )
 "
 
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
 QA_FLAGS_IGNORED=(
 	'usr/bin/perf-read-vdso32' # not linked with anything except for libc
 	'usr/libexec/perf-core/dlfilters/.*' # plugins
@@ -98,18 +112,40 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	use clang && llvm_pkg_setup
+	local CONFIG_CHECK="
+		~DEBUG_INFO
+		~FTRACE
+		~FTRACE_SYSCALLS
+		~FUNCTION_TRACER
+		~KALLSYMS
+		~KALLSYMS_ALL
+		~KPROBES
+		~KPROBE_EVENTS
+		~PERF_EVENTS
+		~UPROBES
+		~UPROBE_EVENTS
+	"
+
+	use bpf && llvm-r1_pkg_setup
 	# We enable python unconditionally as libbpf always generates
 	# API headers using python script
 	python_setup
+
+	if use bpf ; then
+		CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT"
+	fi
+
+	linux-info_pkg_setup
 }
 
 # src_unpack and src_prepare are copied to dev-util/bpftool since
 # it's building from the same tarball, please keep it in sync with bpftool
 src_unpack() {
 	local paths=(
-		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
-		scripts include lib "arch/*/lib"
+		'arch/*/include/*' 'arch/*/lib/*' 'arch/*/tools/*' 'include/*'
+		'kernel/bpf/*' 'lib/*' 'scripts/*' 'tools/arch/*' 'tools/bpf/*'
+		'tools/build/*' 'tools/include/*' 'tools/lib/*' 'tools/perf/*'
+		'tools/scripts/*'
 	)
 
 	# We expect the tar implementation to support the -j option (both
@@ -121,9 +157,10 @@ src_unpack() {
 	if [[ -n ${LINUX_PATCH} ]] ; then
 		eshopts_push -o noglob
 		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
+		xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
+		assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
 		eend $? || die "filterdiff failed"
+		test -s ${P}.patch || die "patch is empty?!"
 		eshopts_pop
 	fi
 
@@ -144,8 +181,7 @@ src_prepare() {
 	fi
 
 	pushd "${S_K}" >/dev/null || die
-	eapply "${FILESDIR}"/perf-6.0-clang.patch
-	eapply "${FILESDIR}"/perf-6.0-c++17.patch
+	eapply "${FILESDIR}"/perf-6.11-bpf-capstone.patch
 	popd || die
 
 	# Drop some upstream too-developer-oriented flags and fix the
@@ -166,7 +202,7 @@ src_prepare() {
 	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
 }
 
-puse() { usex $1 "" no; }
+puse() { usex $1 "" 1; }
 perf_make() {
 	# The arch parsing is a bit funky.  The perf tools package is integrated
 	# into the kernel, so it wants an ARCH that looks like the kernel arch,
@@ -187,62 +223,88 @@ perf_make() {
 	   ! use arm64 && \
 	   ! use ppc && ! use ppc64 \
 	   ! use s390 && \
-	   ! use riscv
+	   ! use riscv && \
+	   ! use loong
 	then
 		disable_libdw=1
 	fi
 
+	# perf directly invokes LD for linking without going through CC, on mips
+	# it is required to specify the emulation.  port of below buildroot patch
+	# https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
+	local linker="$(tc-getLD)"
+	if use mips
+	then
+		if use big-endian
+		then
+			use abi_mips_n64 && linker+=" -m elf64btsmip"
+			use abi_mips_n32 && linker+=" -m elf32btsmipn32"
+			use abi_mips_o32 && linker+=" -m elf32btsmip"
+		else
+			use abi_mips_n64 && linker+=" -m elf64ltsmip"
+			use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
+			use abi_mips_o32 && linker+=" -m elf32ltsmip"
+		fi
+	fi
+
 	# FIXME: NO_CORESIGHT
-	emake V=1 VF=1 \
-		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
-		CLANG="${CHOST}-clang" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		prefix="${EPREFIX}/usr" bindir_relative="bin" \
-		tipdir="share/doc/${PF}" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		ARCH="${arch}" \
-		JDIR="${java_dir}" \
-		LIBCLANGLLVM=$(usex clang 1 "") \
-		LIBPFM4=$(usex libpfm 1 "") \
-		NO_AUXTRACE="" \
-		NO_BACKTRACE="" \
-		NO_CORESIGHT=1 \
-		NO_DEMANGLE= \
-		GTK2=$(usex gtk 1 "") \
-		feature-gtk2-infobar=$(usex gtk 1 "") \
-		NO_JVMTI=$(puse java) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBBABELTRACE=$(puse babeltrace) \
-		NO_LIBBIONIC=1 \
-		NO_LIBBPF= \
-		NO_LIBCRYPTO=$(puse crypt) \
-		NO_LIBDW_DWARF_UNWIND="${disable_libdw}" \
-		NO_LIBELF= \
-		NO_LIBNUMA=$(puse numa) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_LIBZSTD=$(puse zstd) \
-		NO_SDT=$(puse systemtap) \
-		NO_SLANG=$(puse slang) \
-		NO_LZMA=$(puse lzma) \
-		NO_ZLIB=$(puse zlib) \
-		WERROR=0 \
-		LIBDIR="/usr/libexec/perf-core" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
+	local emakeargs=(
+		V=1 VF=1
+		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
+		CLANG="${CHOST}-clang"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		prefix="${EPREFIX}/usr" bindir_relative="bin"
+		tipdir="share/doc/${PF}"
+		EXTRA_CFLAGS="${CFLAGS}"
+		EXTRA_LDFLAGS="${LDFLAGS}"
+		ARCH="${arch}"
+		BUILD_BPF_SKEL=$(usex bpf 1 "") \
+		BUILD_NONDISTRO=1
+		JDIR="${java_dir}"
+		CORESIGHT=
+		GTK2=$(usex gtk 1 "")
+		feature-gtk2-infobar=$(usex gtk 1 "")
+		NO_AUXTRACE=
+		NO_BACKTRACE=
+		NO_CAPSTONE=$(puse capstone)
+		NO_DEMANGLE=
+		NO_JEVENTS=$(puse python)
+		NO_JVMTI=$(puse java)
+		NO_LIBAUDIT=$(puse audit)
+		NO_LIBBABELTRACE=$(puse babeltrace)
+		NO_LIBBIONIC=1
+		NO_LIBBPF=$(puse bpf)
+		NO_LIBCAP=$(puse caps)
+		NO_LIBCRYPTO=$(puse crypt)
+		NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
+		NO_LIBELF=
+		NO_LIBNUMA=$(puse numa)
+		NO_LIBPERL=$(puse perl)
+		NO_LIBPFM4=$(puse libpfm)
+		NO_LIBPYTHON=$(puse python)
+		NO_LIBTRACEEVENT=$(puse libtraceevent)
+		NO_LIBUNWIND=$(puse unwind)
+		NO_LIBZSTD=$(puse zstd)
+		NO_SDT=$(puse systemtap)
+		NO_SHELLCHECK=1
+		NO_SLANG=$(puse slang)
+		NO_LZMA=$(puse lzma)
+		NO_ZLIB=
+		TCMALLOC=$(usex tcmalloc 1 "")
+		WERROR=0
+		DEBUG=$(usex debug 1 "")
+		LIBDIR="/usr/libexec/perf-core"
+		libdir="${EPREFIX}/usr/$(get_libdir)"
+		plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
 		"$@"
+	)
+	emake "${emakeargs[@]}"
 }
 
 src_compile() {
 	filter-lto
 
-	# test-clang.bin not build with g++
-	if use clang; then
-		make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
-	fi
 	perf_make -f Makefile.perf
 	use doc && perf_make -C Documentation man
 }
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index f31e1bead9f2..81883700d72f 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -19,6 +19,6 @@ EBUILD spirv-llvm-translator-16.0.4-r1.ebuild 1412 BLAKE2B d2cd71408d42d6b5f2bda
 EBUILD spirv-llvm-translator-17.0.0-r2.ebuild 1512 BLAKE2B 9e642681cc67196b91532b36b44ec2817161d25423d057f6bd91fedacada2e33d12946257ff54c337143d0fbfc9d11f29816cfb485404685d209be906e75097f SHA512 96961a3225f9c10eb317741b39091341e40202e07b7a07434182e78f9b8ce5451f44b6ae8011d7e9f95b640157f2a5cf04c56b77d6b5647c806dea6fb09c97f1
 EBUILD spirv-llvm-translator-17.0.4-r1.ebuild 1366 BLAKE2B a61c6ce67f44996d3c9e233c865e97ece7c170c14072260c47db65a349da1f1c233a1b7be888d1e958aeea6ebf38c6850cdf778e182ff18c2c4a0bdd2b8e094c SHA512 74097428f4ee8c3a099806ea37b25f66fa9d81356658e024c7eb4f7bff37a8dbb7bf808d06afe214099120b020b4911e66eeaab3c09dcd72a41e0b7e89857c16
 EBUILD spirv-llvm-translator-18.1.3.ebuild 1376 BLAKE2B 418e281081e7870eef0632cf158e6c8e2f918adad00d8d0683732556585026004ce40ec470179c62ee40ca2e9665703c2dd183c308d7b599cb0754993c7ca7c7 SHA512 f0af44f0c2cee1f5561f22423b079186817be3d6e6b4f5aebdc03a51b5f00f8a7cd750947c4236e7db0defd1bbabcecbb2f747106e6e367ead93908687f30ca2
-EBUILD spirv-llvm-translator-18.1.4.ebuild 1444 BLAKE2B 3ec3b38927aae7243856d6fc23af04975baea2ccd43267e5ad064e583a65fbadd4d2e301b24940801c89402fef3b6752f1ceb08998ae911f357efc15b65e4bf5 SHA512 894d5e1d4c8502beca0389a852fb2ec44d3caf57ce884c94dc911079c964e831585845837d464f7c5ab5ecb439082dba7a69606d87ff1bcd305e0ec2574cf2d1
+EBUILD spirv-llvm-translator-18.1.4.ebuild 1443 BLAKE2B 81a213c306d14277bd71b21e21ee806b957ea19a873f877275d1c81ec322e20c23e2d577418364a913dc1efe67e1002ed2c76cd16c52058f5223b8910af741a0 SHA512 cd588bc8eb05ab0bbcb54b0edce5cd53bc7b5e9da873897591017feb903cca6152abe78799fb21f257219fe737fa3eec01c6aba93751391c739d045aa5f55a3b
 EBUILD spirv-llvm-translator-19.1.0.ebuild 1446 BLAKE2B 529248c50bb68a7011a1ef47f5673d560cd89f3e8a36b3fc2ca8eead54a1b4208b7f312730a79d5032f449f64d55fe0b34332639afc4bbdd1045154f04a75c80 SHA512 91d302e70a233fff66a963a34bd875032844dca38069fbdf1fe6e6fcdd8b673a13cc13ae14e9b17bceab46a20792d89a16cdecd5f4b840d422da3b06e6ee6d7f
 MISC metadata.xml 445 BLAKE2B 11c5d6b6e94192c6fe1aa0cdce39ddb6e3e0aac1462533b5480136c415cc5d82ac77c4930a07a234d0ae987d3409c8dae590f0d5b99139282a89939d0b65cf4e SHA512 e58ae0f86f23be399eff43be9b90006f9be0f699af67f354f2e5434bc0fd43856863763192e0270fd06f7df65e0bdea2bd0b9d43b5b200d8a0399e0230c86e71
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.4.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.4.ebuild
index aa97f4be6cd1..4ca4472e4a4b 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.4.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"