Merge updates from master

6 files changed, 91 insertions, 1 deletions

diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index 8a3664f9cde4..223ab14c10c6 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -3,3 +3,4 @@ DIST rocksdb-7.9.2.tar.gz 12058713 BLAKE2B 76a840565fccdc800eaad055da7698f7a5fc6
 DIST rocksdb-8.11.3.tar.gz 13345436 BLAKE2B 8d8069c030ee345090ebec15528342d776d7a74d6b72808a054511aad169acaa89c5fee530e73b3faba9152aadc4d26f1edc4586e31ddf5501d2899b5d6500ec SHA512 df701e8f3a94efe351c5dfec691635b6cff9b5902e8d5bd714caa7389bbbfd8ce7f7e91f1549978b47b934449fb3b77581dfcc2811a7727be049709a330ca71e
 DIST rocksdb-9.7.4.tar.gz 13615065 BLAKE2B 8babae4a879d3d08c7bccf0b93dc78bf413d3d518b9470e343588cba92f796ad5d493128276fe0673e915bfd8eab8a98abfd52dd0e633446324989db00032746 SHA512 d7209fee27f0b40ebce7a43c0356b2e6ca355d768d60b5e56599074bbd2aa555f4ed3b97e85ef492742be1597184d505b6acfd84ad27d6a5b83bf1a13bf4b1ca
 DIST rocksdb-9.8.4.tar.gz 13647031 BLAKE2B faeca03e688a9240b739a671fb00f3f2015b0a90397d0473a44c4278ece6af91e6870ca6defec7c4a49bc9c7d07c19b218776937d608d87a9e456e8b219cd911 SHA512 34afd421c86bdb3741f49e35466efbaef041d8461bedf7d32fa6d808e3cc38807aafddfd0bb563f34d21de8f0d31dfc26dcae3208c2dd36da449913cef9a3e1b
+DIST rocksdb-9.9.3.tar.gz 13668148 BLAKE2B d2a2843b14a601efbc80e37c321ee9541d674f5d7ab9cc3357397b3b017a6bcfc40404d472764c6e74175e9573ee505fe8a4039169ffa19da3b973f548655854 SHA512 119759e9e829f65b11042ac22fff845ef0ddea88a2e326a2c4f6f00a6e7e3951f4043eac6f4bb2fe7e4ecda9e597989827f961924ae4c8bb99608432883aa950
diff --git a/dev-libs/rocksdb/rocksdb-9.9.3.ebuild b/dev-libs/rocksdb/rocksdb-9.9.3.ebuild
new file mode 100644
index 000000000000..bab86b142729
--- /dev/null
+++ b/dev-libs/rocksdb/rocksdb-9.9.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Embeddable, persistent key-value store for fast storage"
+HOMEPAGE="http://rocksdb.org https://github.com/facebook/rocksdb/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="jemalloc numa static-libs tbb test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/zstd:=
+	dev-cpp/gflags:=
+	sys-libs/liburing:=
+	sys-libs/zlib:=
+	sys-process/numactl
+	jemalloc? ( dev-libs/jemalloc:= )
+	tbb? ( dev-cpp/tbb:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e 's/liburing.a/uring/' cmake/modules/Finduring.cmake || die
+	sed -i -e '/find_program(CCACHE_FOUND ccache)/d' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFAIL_ON_WARNINGS=OFF
+		-DPORTABLE=1
+		-DROCKSDB_BUILD_SHARED=$(usex static-libs OFF ON)
+		-DWITH_ALL_TESTS=$(usex test)
+		-DWITH_ASAN=OFF
+		-DWITH_BENCHMARK=OFF
+		-DWITH_BENCHMARK_TOOLS=OFF
+		-DWITH_BZ2=ON
+		-DWITH_CORE_TOOLS=ON
+		-DWITH_DYNAMIC_EXTENSION=ON
+		-DWITH_EXAMPLES=OFF
+		-DWITH_FALLOCATE=ON
+		-DWITH_GFLAGS=ON
+		-DWITH_IOSTATS_CONTEXT=ON
+		-DWITH_JEMALLOC=$(usex jemalloc ON OFF)
+		-DWITH_JNI=OFF
+		-DWITH_LIBURING=ON
+		-DWITH_LZ4=ON
+		-DWITH_MD_LIBRARY=ON
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_SNAPPY=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_TOOLS=ON
+		-DWITH_TRACE_TOOLS=ON
+		-DWITH_TSAN=OFF
+		-DWITH_ZLIB=ON
+		-DWITH_ZSTD=ON
+	)
+	# -DWITH_TESTS option works only with debug build, needs to be set here
+	# to not be overriden by cmake.eclass
+	CMAKE_BUILD_TYPE=$(usex test Debug RelWithDebInfo) cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
+}
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		OptionsSettableTest.ColumnFamilyOptionsAllFieldsSettable
+	)
+	cmake_src_test
+}
diff --git a/dev-util/perf/perf-6.11.7.ebuild b/dev-util/perf/perf-6.11.7-r1.ebuild
index 01c0ecb177a4..50b812589926 100644
--- a/dev-util/perf/perf-6.11.7.ebuild
+++ b/dev-util/perf/perf-6.11.7-r1.ebuild
@@ -279,6 +279,7 @@ perf_make() {
 		NO_LIBCRYPTO=$(puse crypt)
 		NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
 		NO_LIBELF=
+		NO_LIBLLVM=$(puse bpf)
 		NO_LIBNUMA=$(puse numa)
 		NO_LIBPERL=$(puse perl)
 		NO_LIBPFM4=$(puse libpfm)
diff --git a/dev-util/perf/perf-6.12.ebuild b/dev-util/perf/perf-6.12-r1.ebuild
index 411534198d8b..c8df399468cc 100644
--- a/dev-util/perf/perf-6.12.ebuild
+++ b/dev-util/perf/perf-6.12-r1.ebuild
@@ -283,6 +283,7 @@ perf_make() {
 		NO_LIBCRYPTO=$(puse crypt)
 		NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
 		NO_LIBELF=
+		NO_LIBLLVM=$(puse bpf)
 		NO_LIBNUMA=$(puse numa)
 		NO_LIBPERL=$(puse perl)
 		NO_LIBPFM4=$(puse libpfm)
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 51c7236cd951..2fb6232c7091 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,4 +1,4 @@
 DIST root_v6.30.08.source.tar.gz 184887777 BLAKE2B 730bce87e343e0b84bd1f53c03527a1953d6915cfd63393ed1eee1f9e19a795b6e6a7149a511ed3b8cd17380acbbc4956d031169d571f9685e920f0c73fc67c8 SHA512 08da422cfbd879e1601064f04210db52c571545cca534dc37d67a190ccea948af0af01a67dcee553fb557fe0fb290a062f7905e413ebc1b15c2f32a5adff93cb
 DIST root_v6.32.06.source.tar.gz 192918335 BLAKE2B 2d0553048c6ee4c107329655b8bc812135059f13b180c1278361b2ec16131e1efa03b6c3fb72fa8d44cee8c6c52573473fd262202c9a2aeb6b74dd4a01238398 SHA512 e8507bd18e7e580d597ef91fc56ab62b7c5becaed5b1f10d18e2715703232a88e05c6e008066c6600a4dc14c676f8c3e904b75e95047697c2abd26b7a2f4a928
 DIST root_v6.32.08.source.tar.gz 192930079 BLAKE2B 8810322ea518607a81cddeec41645ced272ca0ddbb2bc36a7710d49b6d52a4d897fd369d4f201653a6c7a6ef278121a529b69e62e99c49f13dc0a9ca224ef07d SHA512 fd4f66a4dcf577e5103a99c6d859e832597680f46af420eac2b50d5cf57c745046b1600f0c48f2b2a4d0f26c5ddd1a3bb8159df742363d28a6c6a12efc4224db
-DIST root_v6.34.00.source.tar.gz 197286622 BLAKE2B c954cd7e6d95e4a251d16ba03a00e89b6b88f0cb7ca6650051d322413237ecc862ce403466fe9272b43fcd4345f31fe9b7563324d98417c23228b56ccd3a3dbc SHA512 5b97c9966bb3892c6d7c0444dbe1c2da66560f8f9443218b60dd3e1cb27ddba983dd512b150e542800a1ed1bf727bb6fc73f528ec7f0264c3a3b0a3600742f8b
+DIST root_v6.34.02.source.tar.gz 197303012 BLAKE2B f595944583e2ea2d92a46fcdb35dc2c7583027851216e2df54596cfe1753d200947a501a219dffbadd35f517a684c232cfdd74eb6fbb8060dafdce38956f4239 SHA512 fa5cd4eb152f11a9386cf9b4b5162614edc38b491892f98722e968b237386886ec799e0d978e289caf4b5c5f712db347007561a753e8897fc601e5fe0515fab6
diff --git a/sci-physics/root/root-6.34.00.ebuild b/sci-physics/root/root-6.34.02.ebuild
index 453459c31cfb..453459c31cfb 100644
--- a/sci-physics/root/root-6.34.00.ebuild
+++ b/sci-physics/root/root-6.34.02.ebuild