8 files changed, 117 insertions, 22 deletions
diff --git a/dev-util/b2/Manifest b/dev-util/b2/Manifest
index ea63a9f6825c..88a04888a951 100644
--- a/dev-util/b2/Manifest
+++ b/dev-util/b2/Manifest
@@ -1 +1,2 @@
 DIST b2-4.10.1.tar.gz 982429 BLAKE2B bb1e6ef741ca10d3b0029e64d69a7ee7eb0d40d26c68d2a3932d4210e8e2a83131c9bac2d54f2885373725d58fe73dd7fa7aebfc5781059f01c3462c738d426c SHA512 0bc4897a342685190626a6593926c4b200c5ca9b498ba77287a7c49467a8e3f65cb850b9616fd05d4aea9ebfab32ec46792d7d8226bed89911a711ce14ecce30
+DIST b2-5.0.0.tar.gz 1015818 BLAKE2B 87b6f34733002479f91f658aee4f776930ae6441f33b2540b82049e18c4199280e73047afafa90dc156cc75db8b587c5bb9e2ce65d93c493775ac4107ce3201b SHA512 37403f0bd863753c5313393405dd8514a4f8d9f0839ccd397ee1856e02af6116bd238d345e5b766512441ca1c0b09883386588e270bd982eca45235eef1b01b7
diff --git a/dev-util/b2/b2-5.0.0.ebuild b/dev-util/b2/b2-5.0.0.ebuild
new file mode 100644
index 000000000000..6cff0eca434e
--- /dev/null
+++ b/dev-util/b2/b2-5.0.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="https://www.bfgroup.xyz/b2/"
+SRC_URI="https://github.com/bfgroup/b2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples"
+RESTRICT="test"
+
+RDEPEND="!dev-util/boost-build"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.2-disable_python_rpath.patch
+	"${FILESDIR}"/${PN}-4.9.2-darwin-gentoo-toolchain.patch
+	"${FILESDIR}"/${PN}-4.9.2-add-none-feature-options.patch
+	"${FILESDIR}"/${PN}-4.9.2-no-implicit-march-flags.patch
+)
+
+src_configure() {
+	# need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
+	append-lfs-flags
+}
+
+src_compile() {
+	cd engine || die
+
+	# don't call windres since it leads to broken relocations
+	export B2_DONT_EMBED_MANIFEST=1
+
+	# upstream doesn't want separate flags for CPPFLAGS/LDFLAGS
+	# https://github.com/bfgroup/b2/pull/187#issuecomment-1335688424
+	edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx \
+		--cxx="$(tc-getCXX)" \
+		--cxxflags="${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" \
+		-d+2 \
+		--without-python
+}
+
+src_test() {
+	# Forget tests, b2 is a lost cause
+	:
+}
+
+src_install() {
+	dobin engine/b2
+
+	insinto /usr/share/b2/src
+	doins -r "${FILESDIR}/site-config.jam" \
+		build-system.jam ../example/user-config.jam \
+		build contrib options tools util
+
+	find "${ED}"/usr/share/b2/src -iname '*.py' -delete || die
+
+	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r ../example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-util/distribution-gpg-keys/Manifest b/dev-util/distribution-gpg-keys/Manifest
index 83d095977250..bfd594ced536 100644
--- a/dev-util/distribution-gpg-keys/Manifest
+++ b/dev-util/distribution-gpg-keys/Manifest
@@ -1 +1 @@
-DIST distribution-gpg-keys-1.99-1.tar.gz 51750227 BLAKE2B b8bf16b52acb5cf071cc24a289c32cb554424c96c8e0eed24dad5c735fe6438ea221be4368a27401d666bf45d1903f15cc94560b6ba5330e81992c72cb341934 SHA512 f830e36d215be076e07a2d28b6ffcf6e00a9e925b388eac022120098147b8847d151c420dca187995b131e7ef353681b6dcaeea8f72d157a5574f28c3c22de42
+DIST distribution-gpg-keys-1.100-1.tar.gz 52365963 BLAKE2B 3a42110a444a2be1705d45780fbfbf9ea928c6fff263d79d937a135ddcc9230156b0e8c33e805056356a08131987dea8a6941009d6716243a58578c1409b6730 SHA512 c500302ced12f645eb3609846f037f095bb833fbf1f4a4fccd2986698a7053ca4cb748c0986e0b06f894e74c4e41a0c63df0e403a1d27b3fb8795331a0cf49e0
diff --git a/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.99.ebuild b/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.100.ebuild
index 35057063070f..7be1840f5b55 100644
--- a/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.99.ebuild
+++ b/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-util/find-work/Manifest b/dev-util/find-work/Manifest
index 68899d84c7ba..3c769368151d 100644
--- a/dev-util/find-work/Manifest
+++ b/dev-util/find-work/Manifest
@@ -1,2 +1,2 @@
-DIST find_work-0.1.1.tar.gz 10530 BLAKE2B 51294e6b9e21c72fcd2da77c4ecd0c0cb3614d631b7d4840dbc3d774d83aa910a5b83277c7be2c16adb3f0827b5841e5ad24107ac7a546380d4c056e9a8e275a SHA512 b0f06689554ec2a8d27da270874c89fc31683c0f211d0bacbbe7fee8482a0115107f21836c7ebdaf13ea297030d0870bc53919a90e68ccf10da615eeb9111c5f
 DIST find_work-0.2.0.tar.gz 11440 BLAKE2B 507da062ca3a30885fedf49831be2454ea2012aabab052599fd3d2740d3a30b602c5b0eb2e7e69699dc5858f279d7dc041481f1fd9c7403b19f18c3953d32d76 SHA512 ad38a464bb682c18e5ae49f15e00041909bc6104ba59efb21a2447b7da84872b2ec191071a60721d50e6eacfeecbbe46d790faffe1e4232a49d8da31bce40e5d
+DIST find_work-0.3.0.tar.gz 16939 BLAKE2B f80bb5436ff70debe3fa1c2c3cec09bb2701e8b60b1a2397de74b1035aa925d935228928a8e6a6eb6b75b218c2a062b2466c963718c89ba5ca4b8457923a3c72 SHA512 e52bcd8636003f1940fd42c3baca22b69654b35f62b9b2ee3345625d4fb1b31a9124c4da3d17e9fec84162eb7b7190553599f7e8a6eda60fb92f946aefaf1c95
diff --git a/dev-util/find-work/find-work-0.1.1.ebuild b/dev-util/find-work/find-work-0.3.0.ebuild
index 8595ca28504c..1a3924fdf8bf 100644
--- a/dev-util/find-work/find-work-0.1.1.ebuild
+++ b/dev-util/find-work/find-work-0.3.0.ebuild
@@ -25,10 +25,15 @@ RDEPEND="
 	dev-python/click-aliases[${PYTHON_USEDEP}]
 	>=dev-python/pydantic-2[${PYTHON_USEDEP}]
 	<dev-python/pydantic-3[${PYTHON_USEDEP}]
+	dev-python/python-bugzilla[${PYTHON_USEDEP}]
 	>=dev-python/repology-client-0.0.2[${PYTHON_USEDEP}]
 	<dev-python/repology-client-2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
 	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+	dev-python/tabulate[${PYTHON_USEDEP}]
 "
+BDEPEND="test? ( dev-python/pytest-recording[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.7+.patch b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.7+.patch
new file mode 100644
index 000000000000..a6db9e2d751c
--- /dev/null
+++ b/dev-util/scap-driver/files/0.29.3-fix-kmod-build-on-6.7+.patch
@@ -0,0 +1,21 @@
+
+Bug: https://bugs.gentoo.org/921163
+Subset of patch taken from: https://github.com/falcosecurity/libs/commit/bf0afa0cacb775582fde134500fe66af38f1eb59
+
+--- a/driver/ppm_fillers.c	2024-01-01 15:05:13.000000000 +0100
++++ b/driver/ppm_fillers.c	2024-01-01 15:15:59.893048651 +0100
+@@ -430,7 +430,13 @@ struct file *ppm_get_mm_exe_file(struct
+ {
+ 	struct file *exe_file;
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)
++	// Since linux 6.7.0, `get_file_rcu` is no more a define and takes a double pointer parameter.
++	// See https://github.com/torvalds/linux/commit/0ede61d8589cc2d93aa78230d74ac58b5b8d0244.
++	rcu_read_lock();
++	exe_file = get_file_rcu(&mm->exe_file);
++	rcu_read_unlock();
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
+ 	rcu_read_lock();
+ 	exe_file = rcu_dereference(mm->exe_file);
+ 	if (exe_file && !get_file_rcu(exe_file))
diff --git a/dev-util/scap-driver/scap-driver-0.29.3.ebuild b/dev-util/scap-driver/scap-driver-0.29.3-r5.ebuild
index b7f0615e4841..099b02873376 100644
--- a/dev-util/scap-driver/scap-driver-0.29.3.ebuild
+++ b/dev-util/scap-driver/scap-driver-0.29.3-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake linux-mod
+inherit cmake linux-mod-r1
 
 DESCRIPTION="Kernel module for dev-util/sysdig"
 HOMEPAGE="https://sysdig.com/"
@@ -18,13 +18,19 @@ S="${WORKDIR}/libs-${LIBS_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="!<dev-util/sysdig-${PV}[modules]"
 
 CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
 
-PATCHES=( "${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch )
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.2+.patch
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.3+.patch
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.4+.patch
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-6.7+.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
@@ -36,21 +42,11 @@ src_configure() {
 	)
 
 	cmake_src_configure
+}
 
-	# setup linux-mod ugliness
-	MODULE_NAMES="scap(extra:${BUILD_DIR}/driver/src:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	# work with clang-built kernels (#816024)
-	if linux_chkconfig_present CC_IS_CLANG; then
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
+src_compile() {
+	local modlist=( scap=:"${BUILD_DIR}"/driver/src )
+	local modargs=( KERNELDIR="${KV_OUT_DIR}" )
 
-	BUILD_TARGETS="all"
+	linux-mod-r1_src_compile
 }