Adding metadata

7 files changed, 35 insertions, 32 deletions

diff --git a/dev-debug/bpftrace/Manifest b/dev-debug/bpftrace/Manifest
index abe1f0ce2973..c316b2f8be15 100644
--- a/dev-debug/bpftrace/Manifest
+++ b/dev-debug/bpftrace/Manifest
@@ -1,4 +1,4 @@
-DIST bpftrace-0.24.1-man.tar.xz 43808 BLAKE2B f5d49b29e300e37444d134b8e9530c17294dfd47aaf7810bfaaf411cc9795a57450a64de6e8d4803e71d236523b81dff285868aa3b63b30d883507a12c1ec93c SHA512 a9618aa2cb3013448cb0af20a807238dc3e0cd0e6fa3f867bc7156ecb274782b81d87c14315430d939c9eac8ec65f8d6a3f9671cd49bf52b37c576cd56c11064
-DIST bpftrace-0.24.1.tar.gz 1522448 BLAKE2B 840220497bb4312391231e5471c1f8fa36151a4b5993e6cd67287967054c0b03f882e8da1e64e628f58f04d795c1f70b4877ef5cb1ff12819253303ffb2459b9 SHA512 97ce3d909c6d6fe021afc6db4ea67dd70fa85502358ee89314d8cf58cb8727ce091bbbdf23f73d9eaadae59d8244d76530dda89993b499deebe7f90edd21cda7
 DIST bpftrace-0.24.2-man.tar.xz 43820 BLAKE2B b0964633f4c1a462874f20934c286c321307a4abf79ebebaf085396e545a119f39f46f35b597921a61a5707a6cad5b368788ca8db682dee0eb916fc8a65b5520 SHA512 5a64c875400ede0050ee13f00351e06f72aeb8d8ce0db6933ac9c9f93023388218dd5fd62db7fd24370ddadbe390c6efa71692afd2e55b7f5755e4816f4832eb
 DIST bpftrace-0.24.2.tar.gz 1375106 BLAKE2B c397eb7ded3a72ea0805487db66f422bda9a0a743b1757056dc1bc70119e2d4fa7e69577a7e295143ce2b9789c62c4469b995ac0dca228c464efb3db8da25eeb SHA512 d9ff773ce39b578877d5e73a48434d3654b46985bb4b9ad458fbf622718049da5075b3a2d2e6d1ae0a9effbdb74658822b4c4535bca384fbd6e539fdec393f4b
+DIST bpftrace-0.25.0-man.tar.xz 44292 BLAKE2B e3ad8255b74836c9947595cd3c39caa201ccc420e573376ea7a144c499f4f74349911df87618f98a877d797b6d3b0c54f0117292537d03e184d2669b8a1331a5 SHA512 343fadffec5d2a6f702e2fe67087718c909f32cd6440dabc0fa93d2c0b8264ceda7d7a1eee7f79b4be2365318170c4eff7582453ec8ff4e15343ce2cb056b2ea
+DIST bpftrace-0.25.0.tar.gz 1484592 BLAKE2B 75b6afd9e46d6df8c76c3e3bc515174b72dbc866b4375e3372d9bd07d86f3a1be1a4426f7fb9005458325ac0eea603689ceb619123db898a570a11affa78f026 SHA512 8a6515f21b4f19d4acaf338085ddb40e78d1ab4ce4c8e39733e85e301941cc6b125ec19892aa52632d9e9f94401fd5af126db23ebfecf6c9a33aa59ce7c316bd
diff --git a/dev-debug/bpftrace/bpftrace-0.24.2.ebuild b/dev-debug/bpftrace/bpftrace-0.24.2.ebuild
index 7bb505c72208..ea57a4ba3a3f 100644
--- a/dev-debug/bpftrace/bpftrace-0.24.2.ebuild
+++ b/dev-debug/bpftrace/bpftrace-0.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2025 Gentoo Authors
+# Copyright 2019-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999* ]] ; then
 	MAN_V="0.24.2"
 else
 	SRC_URI="https://github.com/bpftrace/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 	# the man page version may trail the release
 	#MAN_V="0.24.2"
 fi
@@ -72,9 +72,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
-	"${FILESDIR}/bpftrace-0.21.0-dont-compress-man.patch"
-	"${FILESDIR}/bpftrace-0.24.1-enable-ubsan.patch"
+	"${FILESDIR}/0.11.4-old-kernels.patch"
+	"${FILESDIR}/0.21.0-dont-compress-man.patch"
+	"${FILESDIR}/0.24.1-enable-ubsan.patch"
 )
 
 pkg_pretend() {
diff --git a/dev-debug/bpftrace/bpftrace-0.24.1.ebuild b/dev-debug/bpftrace/bpftrace-0.25.0.ebuild
index baa9011ffe70..ab4ee111d39f 100644
--- a/dev-debug/bpftrace/bpftrace-0.24.1.ebuild
+++ b/dev-debug/bpftrace/bpftrace-0.25.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2019-2025 Gentoo Authors
+# Copyright 2019-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-LLVM_COMPAT=( {17..21} )
-RUST_MIN_VER=1.85.1
+LLVM_COMPAT=( {18..22} )
+RUST_MIN_VER="1.85.0"
 RUST_OPTIONAL=1
 
 inherit cmake flag-o-matic linux-info llvm-r1 rust
@@ -12,19 +12,21 @@ inherit cmake flag-o-matic linux-info llvm-r1 rust
 DESCRIPTION="High-level tracing language for eBPF"
 HOMEPAGE="https://github.com/bpftrace/bpftrace"
 MY_PV="${PV//_/}"
-# the man page version may trail the release
-#MAN_V="0.24.0"
 
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/bpftrace/bpftrace"
-	EGIT_BRANCH="release/0.24.x"
+	EGIT_BRANCH="master"
 	inherit git-r3
+	# use a released man page for git
+	MAN_V="0.25.0"
 else
-	SRC_URI="https://github.com/bpftrace/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
+	SRC_URI="https://github.com/bpftrace/bpftrace/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+	# the man page version may trail the release
+	#MAN_V="0.25.0"
 fi
 
-SRC_URI+=" https://github.com/bpftrace/${PN}/releases/download/v${MAN_V:-${PV}}/man.tar.xz -> ${PN}-${MAN_V:-${PV}}-man.tar.xz"
+SRC_URI+=" https://github.com/bpftrace/bpftrace/releases/download/v${MAN_V:-${PV}}/man.tar.xz -> bpftrace-${MAN_V:-${PV}}-man.tar.xz"
 
 S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
 
@@ -37,17 +39,17 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/blazesym_c-0.1.1
-	>=dev-libs/libbpf-1.5:=
-	>=dev-util/bcc-0.25.0:=
+	>=dev-libs/libbpf-1.6:=[static-libs]
+	>=dev-util/bcc-0.25.0
 	$(llvm_gen_dep '
 		llvm-core/clang:${LLVM_SLOT}=
 		llvm-core/llvm:${LLVM_SLOT}=[llvm_targets_BPF(+)]
 	')
-	sys-process/procps
 	sys-libs/binutils-libs:=
 	virtual/libelf:=
 	systemd? ( sys-apps/systemd:= )
 	pcap? ( net-libs/libpcap:= )
+	virtual/zlib:=
 "
 DEPEND="
 	${RDEPEND}
@@ -58,9 +60,9 @@ BDEPEND="
 	app-arch/xz-utils
 	app-alternatives/lex
 	app-alternatives/yacc
-	|| ( dev-util/xxd app-editors/vim-core )
 	dev-libs/cereal
 	dev-util/bpftool
+	|| ( dev-util/xxd app-editors/vim-core )
 	test? (
 		${RUST_DEPEND}
 		dev-lang/go
@@ -70,9 +72,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
-	"${FILESDIR}/bpftrace-0.21.0-dont-compress-man.patch"
-	"${FILESDIR}/bpftrace-0.24.1-enable-ubsan.patch"
+	"${FILESDIR}/0.11.4-old-kernels.patch"
+	"${FILESDIR}/0.21.0-dont-compress-man.patch"
 )
 
 pkg_pretend() {
@@ -138,6 +139,8 @@ src_configure() {
 		-DENABLE_MAN=OFF
 		-DENABLE_SKB_OUTPUT=$(usex pcap)
 		-DENABLE_SYSTEMD=$(usex systemd)
+		# always use system libbpf
+		-DUSE_SYSTEM_LIBBPF=ON
 	)
 
 	# enable UBSAN only when enabled in the toolchain
diff --git a/dev-debug/bpftrace/bpftrace-9999.ebuild b/dev-debug/bpftrace/bpftrace-9999.ebuild
index 3e70045126a2..ab4ee111d39f 100644
--- a/dev-debug/bpftrace/bpftrace-9999.ebuild
+++ b/dev-debug/bpftrace/bpftrace-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2019-2025 Gentoo Authors
+# Copyright 2019-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-LLVM_COMPAT=( {17..21} )
-RUST_MIN_VER="1.85.1"
+LLVM_COMPAT=( {18..22} )
+RUST_MIN_VER="1.85.0"
 RUST_OPTIONAL=1
 
 inherit cmake flag-o-matic linux-info llvm-r1 rust
@@ -18,15 +18,15 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	# use a released man page for git
-	MAN_V="0.24.2"
+	MAN_V="0.25.0"
 else
-	SRC_URI="https://github.com/bpftrace/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/bpftrace/bpftrace/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64"
 	# the man page version may trail the release
-	#MAN_V="0.24.2"
+	#MAN_V="0.25.0"
 fi
 
-SRC_URI+=" https://github.com/bpftrace/${PN}/releases/download/v${MAN_V:-${PV}}/man.tar.xz -> ${PN}-${MAN_V:-${PV}}-man.tar.xz"
+SRC_URI+=" https://github.com/bpftrace/bpftrace/releases/download/v${MAN_V:-${PV}}/man.tar.xz -> bpftrace-${MAN_V:-${PV}}-man.tar.xz"
 
 S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
 
@@ -72,8 +72,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
-	"${FILESDIR}/bpftrace-0.21.0-dont-compress-man.patch"
+	"${FILESDIR}/0.11.4-old-kernels.patch"
+	"${FILESDIR}/0.21.0-dont-compress-man.patch"
 )
 
 pkg_pretend() {
diff --git a/dev-debug/bpftrace/files/bpftrace-0.11.4-old-kernels.patch b/dev-debug/bpftrace/files/0.11.4-old-kernels.patch
index 831de6487a84..831de6487a84 100644
--- a/dev-debug/bpftrace/files/bpftrace-0.11.4-old-kernels.patch
+++ b/dev-debug/bpftrace/files/0.11.4-old-kernels.patch
diff --git a/dev-debug/bpftrace/files/bpftrace-0.21.0-dont-compress-man.patch b/dev-debug/bpftrace/files/0.21.0-dont-compress-man.patch
index 93bcfcf73e31..93bcfcf73e31 100644
--- a/dev-debug/bpftrace/files/bpftrace-0.21.0-dont-compress-man.patch
+++ b/dev-debug/bpftrace/files/0.21.0-dont-compress-man.patch
diff --git a/dev-debug/bpftrace/files/bpftrace-0.24.1-enable-ubsan.patch b/dev-debug/bpftrace/files/0.24.1-enable-ubsan.patch
index 8e6cc1bb3053..8e6cc1bb3053 100644
--- a/dev-debug/bpftrace/files/bpftrace-0.24.1-enable-ubsan.patch
+++ b/dev-debug/bpftrace/files/0.24.1-enable-ubsan.patch