6 files changed, 97 insertions, 46 deletions
diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index 1fff053ee211..7a995652efc4 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/ald/Manifest b/dev-debug/ald/Manifest
deleted file mode 100644
index ee9232f56794..000000000000
--- a/dev-debug/ald/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ald-0.1.7.tar.gz 665998 BLAKE2B 52cdd01f5927a4fedc2bdd7728cd063aa3b48fda7dd3af36c4b9299b62d7cbd199f2a8ebb06457bf29c62a5024fb158944d82260b4aac77838e4338acdd33a25 SHA512 dbde0929beebe51ef5f77055b5f396630e16fd01ded4210d828f9ce97c676e7863700a98bf02d26e10cc2d8481adf329d8c8cb11c866302361221f072dbf45bf
-EBUILD ald-0.1.7-r2.ebuild 634 BLAKE2B 0080ef6d5485fb629933d29dbef3292a88b7b839b7331c59b010de093c2559021a3c0091b76eff467fbff3e286146e367c255ee4c17d08d49ad2035bfd5fd43d SHA512 bbcd11c8ef792a6d2d342b879b30e025f77356f76885a215956c9d5b0bfe63010dbbd3bb4630aeb3f3335afdad87cf65a4a30c4d167da29e16b49b4b6a40e664
-MISC metadata.xml 435 BLAKE2B 46309c106622c57645eb6af605cc9a27552bafdab1f36f4ee35b551abf81b040e53a7430dac37cc9bf4262395d5137e4ab3242ba1f7c7213e435827fc37e9c2a SHA512 9d785b722ce60885a2617cd3fb09f2b1beb8ce700439d35fd24944eae0dbe89b71cd53257bd1938eb76b4b4a9fad2e7fe8b80e47722c09ef6168c2f14aa9047a
diff --git a/dev-debug/ald/ald-0.1.7-r2.ebuild b/dev-debug/ald/ald-0.1.7-r2.ebuild
deleted file mode 100644
index 932ced9f8db5..000000000000
--- a/dev-debug/ald/ald-0.1.7-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Assembly Language Debugger"
-HOMEPAGE="http://ald.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/ald/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="debug ncurses"
-
-DEPEND="ncurses? ( sys-libs/ncurses:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# respect CFLAGS (bug #240268)
-	sed -i -e "/^CFLAGS/d" configure.ac || die 'sed on CFLAGS failed'
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ncurses curses) \
-		$(use_enable debug assert)
-}
diff --git a/dev-debug/ald/metadata.xml b/dev-debug/ald/metadata.xml
deleted file mode 100644
index 2bea771dff2c..000000000000
--- a/dev-debug/ald/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">ald</remote-id>
-  </upstream>
- <longdescription>
-    Assembly Language Debugger --- a tool for debugging executable programs at the assembly level.
-    It currently runs only on Intel x86 platforms.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-debug/bpftrace/Manifest b/dev-debug/bpftrace/Manifest
index 69f38a23200c..828f6ad84840 100644
--- a/dev-debug/bpftrace/Manifest
+++ b/dev-debug/bpftrace/Manifest
@@ -6,7 +6,9 @@ AUX bpftrace-0.21.0-dont-compress-man.patch 1887 BLAKE2B 7437e270ccfb06e13ce8daa
 DIST bpftrace-0.20.1.gh.tar.gz 1233431 BLAKE2B fe9221a94d58b43e0311f8c841df8421c3fe226a3fe61f2ec5cce5de309acdb69a68834e92a2e622a1750975869cbdaa95a90f9afb83989aa61b56b551fa96e3 SHA512 fdcc2b0d091d4ab428207877626b0fb37f3e0778730e6a6db26be869a086264e1f24186857c47597813aacde98621a66301bcf6c8004f77bdf9ebf180f198ba0
 DIST bpftrace-0.20.4.gh.tar.gz 1233327 BLAKE2B ef98dbae80285c42b6322c10666345600e594e7043184e7191c77a3158e8c188b7448a580c00b656c1c352601fc1898178d17a7f88f4f1f174187440074832b2 SHA512 a8d5b5bd7d35f9bb308cd7d0ae4eaee899312d3e6540164d3b29eac61159983ea01350311f53b7b6c5023844bde9a2cd3a2d50459116261a536c0e6e52963462
 DIST bpftrace-0.21.1.gh.tar.gz 1293781 BLAKE2B 154acfd076bd10d1ea7f81b77f8fe6b94812be7fc82bf798f508fa94a5558b068e1ec4bde7cecf51d1076593032d7674a5c0cde6432be7bb6dc4781656104915 SHA512 db6f5faf65fc2ac55ffbd1799b70941b8a6e4036c7fc2f56fe134f932dcf8a14fdd11a5a8b1d4b20261932d2d1ac18636cc1d7d4b87b31e366a9e53514a84ad3
+DIST bpftrace-0.21.2.gh.tar.gz 1299415 BLAKE2B 5a5d00c94c188ea4bc5008a88c9c244b0da4ac6f74c2b7083e13b8da9b0c566efc30fd9c7164f562505a4c72e6def1f2be4e360e3cd4556366e9a0aa3e1d3cf8 SHA512 8c64de94da29030dcde0680be90e3c16a5cd965a0066b1abe3c0740f11a78d70f383bf2e0bbe2fce639eddc7d45cb44508cc8a78743c205d7efa45734151e743
 EBUILD bpftrace-0.20.1-r2.ebuild 1930 BLAKE2B d92cc08b503ccacab7525257c867f7f94e1ded719b5cb75d3cebca7ce91f2ef4e39e8c2333a35307630eccea0e0bb1c8adf9be041b46a77a108fa092f7f89aec SHA512 d21d001c3ab2b8ee6e5bc3bc54be9df7f90b487e766d7329d1990e17f84f10e0fafad4fabbc3948f66ec335b82be2667be30b2c207aa50d17cc20dd780013edd
 EBUILD bpftrace-0.20.4.ebuild 1867 BLAKE2B 2b1f8d14a249cb8c7651d548ea4921aa1384f7a0858fbce4f840f0d26c48dcffe488cd574efba7e73b5a80b88715a1a27e69293e8868883bb52c2afe4ffdc0a6 SHA512 e7750823cb0f4d7312126681ff68d83f725279fb8a5ecbb85bb5743d465e24497fea8747a6fb04a97f156466e83b1fc813c131a6a265c30eb11ef6e4411785f4
 EBUILD bpftrace-0.21.1.ebuild 1823 BLAKE2B 2363fe318a2672b7d66208c30d12053fbad2af1510fb3d258ba096373edeb188950fb1d1f640e3091bbf2bcebe5d0d5a287b6b2f7906ae5d161ba992a2dba039 SHA512 f237a4f94f8d4e538f10d756331d4afc27fe6b8224a7d61a8c55427d7079635047990a6d88bb09b6931425d41cf5b95e8a2f7aadeba838e242ec720ef3dc4c9e
+EBUILD bpftrace-0.21.2.ebuild 1824 BLAKE2B ac40c774133b6b2912455a9d98b789f3cdf899e226e39c9fef289ce575aed1ca4260e1ef90d7b636eba2a99aa1fee9e49ab8a75036ed2639a2dfdaf3f99321e4 SHA512 c9bcc2f7dbd2d3a1244aa78c8c7a375854e652c7e2447fa8f1830b82028b94771fd335d8dd3b196f000fd907401a1562b8ce2c4afc437a68d48258c2989400e0
 MISC metadata.xml 885 BLAKE2B ddc2fa06dbbf2de6ebea4820a2755a7816786d13ae5faed0a30d74d1bd4f8670d94b8b184aa05cc5960c756a72a16d03817bd3db0e3544eafcd2d9932c7d605a SHA512 6bcec6b73627b3b9a44d75d96c1309c8e4e4d5f470c53ed911a901446bb500f20d91ccc135142e2d7b4471325761ec8face64a2bb6a16b1adefe98b23842bdea
diff --git a/dev-debug/bpftrace/bpftrace-0.21.2.ebuild b/dev-debug/bpftrace/bpftrace-0.21.2.ebuild
new file mode 100644
index 000000000000..bf07da70b442
--- /dev/null
+++ b/dev-debug/bpftrace/bpftrace-0.21.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=18
+
+inherit llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/bpftrace/bpftrace"
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/bpftrace/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="lldb test"
+
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libbpf-1.1:=
+	>=dev-util/bcc-0.25.0:=
+	lldb? ( >=dev-debug/lldb-15 )
+	>=sys-devel/llvm-15[llvm_targets_BPF(+)]
+	>=sys-devel/clang-15
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
+	sys-process/procps
+	sys-libs/binutils-libs:=
+	virtual/libelf:=
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/cereal:=
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-arch/xz-utils
+	app-alternatives/lex
+	app-alternatives/yacc
+	test? (
+		app-editors/vim-core
+		dev-util/pahole
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.21.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# prevent automagic lldb use
+		$(cmake_use_find_package lldb LLDB)
+		# DO NOT build the internal libs as shared
+		-DBUILD_SHARED_LIBS=OFF
+		# DO dynamically link the bpftrace executable
+		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DBUILD_FUZZ:BOOL=OFF
+		-DENABLE_MAN:BOOL=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doman man/man8/*.?
+}