commit:     7468e30dc308622a05313214bbeecf40d173aaf0
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Sat Mar 14 13:47:41 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 14:48:17 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7468e30d

dev-debug/bpftrace: sync 9999 with upstream, clean up patch names

Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/320
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-debug/bpftrace/Manifest                            |  1 +
 dev-debug/bpftrace/bpftrace-0.24.2.ebuild              |  6 +++---
 dev-debug/bpftrace/bpftrace-9999.ebuild                | 18 +++++++++---------
 ...11.4-old-kernels.patch => 0.11.4-old-kernels.patch} |  0
 ...mpress-man.patch => 0.21.0-dont-compress-man.patch} |  0
 ....1-enable-ubsan.patch => 0.24.1-enable-ubsan.patch} |  0
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/dev-debug/bpftrace/Manifest b/dev-debug/bpftrace/Manifest
index 44dc0c7930b5..ff6c03567fd1 100644
--- a/dev-debug/bpftrace/Manifest
+++ b/dev-debug/bpftrace/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-debug/bpftrace/bpftrace-0.24.2.ebuild 
b/dev-debug/bpftrace/bpftrace-0.24.2.ebuild
index 8b8eed42d5c7..ea57a4ba3a3f 100644
--- a/dev-debug/bpftrace/bpftrace-0.24.2.ebuild
+++ b/dev-debug/bpftrace/bpftrace-0.24.2.ebuild
@@ -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-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
similarity index 100%
rename from dev-debug/bpftrace/files/bpftrace-0.11.4-old-kernels.patch
rename to 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
similarity index 100%
rename from dev-debug/bpftrace/files/bpftrace-0.21.0-dont-compress-man.patch
rename to 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
similarity index 100%
rename from dev-debug/bpftrace/files/bpftrace-0.24.1-enable-ubsan.patch
rename to dev-debug/bpftrace/files/0.24.1-enable-ubsan.patch

Reply via email to