6 files changed, 158 insertions, 1 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index eb95f646f47a..d2582e3fba3a 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libnvme/Manifest b/sys-libs/libnvme/Manifest
index bc8313ca666d..31648c489577 100644
--- a/sys-libs/libnvme/Manifest
+++ b/sys-libs/libnvme/Manifest
@@ -6,11 +6,13 @@ DIST libnvme-1.2.tar.gz 484397 BLAKE2B ae6b1c3aa8f45594219470059cfc8982674433772
 DIST libnvme-1.3.tar.gz 499870 BLAKE2B 5a019c12829890a0fe0b5e6aec5fbd009fc3bd6dfe7e81f61731292f4ea8b03044e7625491479350c399cc8cd5bc023e02cc9e93f1eba38f4c747667e84cfb24 SHA512 c874b29b73e55be842f71e74a226a76fcd50dfa72e2be100f0437bc83e740cd146b6d2f2cdaa940c11c3d8c48ff2c065ac0e8a83d4d0dde743edf4179f328670
 DIST libnvme-1.4.tar.gz 506101 BLAKE2B c1496c6258bf20ed4109710b06671fa7f0e27c7649520ad8ccf4021df00fffc45f80fea248d62d2b85eecc8b15b6afaf4a113d96d6737ae6772346c9d0bc1002 SHA512 cc4a0a78083471e912736d76e4faaa5c285e1149029560f212ff06254863e8f21b48fcb1638599bd68efcf888312a248fb748d23776af03574b39fbd9b2a418d
 DIST libnvme-1.5.tar.gz 566715 BLAKE2B 2111a6929bc17949f03c39fdb247420bba371641b38e30cc7bc4b61a859471d1bfaa27d0dd3bb41379a3a59bb493ff9ce9006460aaf0b900c7ce40410701c03b SHA512 0a19eca2dd7c48c9da3123767c3c789dfb7528d6f5b2b2dfdc8af7cd64e1d724fb81c6002b9821ce916cc7adb6b5e5e28253f1d73131188b0559c6d276a7d07c
+DIST libnvme-1.6-ubsan.patch.xz 5800 BLAKE2B 8603311c44a475bd09a31a6bebe96f29f2b18b6d0917cb02b680fc20861a71688f1c5b3f618d6f38e7c105c8a00b8818b2ffa67289371fd0ab62354d318bebb9 SHA512 74f1a86c4011ce6650b54ec50422fe98ec64a65b50e3aa6c3d57f3715713f85ef7c84451416bb8d136dff646b3eba00d415208c98a16c562bf5d258d51b0d006
 DIST libnvme-1.6.tar.gz 597676 BLAKE2B 8b47b268154574688a909d0664df55eda38d9f133373fabcffe987ede03e0c531f88126e0dc50204d74fb2fa665af6379aa5205757bfc5863926db8402fbab27 SHA512 ae6a95ed75bbdc6f8c5c5608eaad8bcaf60a08348ddff356bd47258da2bd2470bdaa45747cdb7ba24f10db093fc0ab95f8bda076a45cbb87e155e3158ef726f8
 EBUILD libnvme-1.2-r1.ebuild 1192 BLAKE2B dd05f5d1fba9e50117b24d66fea37d05d1a9d1f900206e419f3f3ce76e3f0868639aa2aadf597507767f726fa5c59376e9d51d6bcd1067d62e24b12069e1baae SHA512 b56d7690c6b71d75b27436d36a0f47dee76b8c3951374aaf58cf4794b687b6fa02b2dbe5936c8fa76390a65c1463842ad2290d4fb4b37f3601644705c3d49971
 EBUILD libnvme-1.3-r1.ebuild 1351 BLAKE2B 571a22422960fd0a7f5c2a0e16e367cb5b9ad9fcd543698b7aa4f320d24c5bb7cb4918bd858d9ebd144e24ec15e4c4db0a546aa773bb4ed023539314b01da3ed SHA512 223e511a5699cdef31b1a22d7bdd1bf757442b652f3dcead4a08e481524f963eb243f70cafa732165783bb32a7ad2d33baf1f379e9c18252f338943c472096dc
 EBUILD libnvme-1.4.ebuild 1393 BLAKE2B 4d67d8f1c72859697e1983a609f3b55aaa62c4cd7bb8428318ae46a137fbddcb5afb46646d0b297807faea32e66fa545cff2d0d229f3b4de61b8480f1891a436 SHA512 01d338434a5bddaa21ca9d69ec362152252359660a0eb8ca16ae27b0f96389ae15c2cc78ba3eb1780deb9092e5d5fb514bafe74ab7122efe2a441fa1ad4a8877
 EBUILD libnvme-1.5-r2.ebuild 1477 BLAKE2B 54f013b3ad5cdaba2f87c15a5d70382e2cc4f74b642c39bbc9ad558907384d1ef832276bb437c2bbe3cedd461434bdd1ffea9a8b58a398c4cf37b44f04636871 SHA512 6325634468a4b3e02e53ccc230ffa8946db527a310d2833127bc953790928a9883dbac77c9605d18b48dc07c7f10d347b1d8ea07aa5028c1055af18df149348e
 EBUILD libnvme-1.6-r1.ebuild 1592 BLAKE2B cfca87f1d76df65b2de0d9444ea2cd0cf24f89a01f8bab17b191f7a8afbe5e7ee015fc1c0640857d2ac98665f9548391c2d03171da7c71d59faab129fce0cefd SHA512 38cdf8442dbd0a61f16166cd79eadaec34d4374821b0629dd6180306c229f310cedfbc254db54afa4507dd55fb5ea27ec9bec5165e593be7dab2c04436d43a63
+EBUILD libnvme-1.6-r2.ebuild 1705 BLAKE2B 47c6d4b2d1147757ac3a400bd6c147b57556a9632f3e21d9e84912b9169055a0a6d2ee93395cef7ca3d7ab3dfe11d64a86a38b7c83be637062fc6d6ccc004123 SHA512 944c7715b42c480cfab437706a3c997c1423454716c7d22cf08054608ed33bc223cd96be76a9affd2502f6ade8b38497e4093c4f8a5179a7a9debb3faf14021c
 EBUILD libnvme-1.6.ebuild 1535 BLAKE2B 60dd5252ef071bf3186e059fe0482a8cca78226ed28331abe629ac8eb6b224935558c4b9df1b4d74fb222a1a7c7830ededa4054950d46cc7896b25aad04b46f5 SHA512 41e03e4bb81482d292e24dbc408bc7ad48036d198b5afd0469822822bded76f6f5ced22c85766cbe71293cdb4681fe2865d239bad44bcb8a101838f4911a66f9
 MISC metadata.xml 585 BLAKE2B 6163419190adb903fdbdef99ad53f8b14ffbc08ac3c8b56f820049468010af2a58ac204ded1b53c767759e9ac864bf85dbc3b723cd7113cb919194dd9ceaaac3 SHA512 2f5268b41676d2a61d5415de3ec62149cda53613970a1af6aface937cc635d26866c88205a6d9fcf7efd7df0c7f45308ecf5b29b6cea937966b765a222edb8f7
diff --git a/sys-libs/libnvme/libnvme-1.6-r2.ebuild b/sys-libs/libnvme/libnvme-1.6-r2.ebuild
new file mode 100644
index 000000000000..1ece765a3cbf
--- /dev/null
+++ b/sys-libs/libnvme/libnvme-1.6-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit python-r1 meson
+
+DESCRIPTION="C Library for NVM Express on Linux"
+HOMEPAGE="https://github.com/linux-nvme/libnvme"
+SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ubsan.patch.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="dbus +json keyutils python ssl test +uuid"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	json? ( dev-libs/json-c:= )
+	keyutils? ( sys-apps/keyutils:= )
+	dbus? ( sys-apps/dbus:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? ( >=dev-libs/openssl-1.1:= )
+	uuid? ( sys-apps/util-linux:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/swig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6-musl.patch
+	"${FILESDIR}"/${P}-lld-17.patch
+	"${WORKDIR}"/${P}-ubsan.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dpython=false
+		$(meson_use test tests)
+		$(meson_feature json json-c)
+		$(meson_feature dbus libdbus)
+		$(meson_feature keyutils)
+		$(meson_feature ssl openssl)
+		$(meson_feature python)
+	)
+	meson_src_configure
+}
+
+python_compile() {
+	local emesonargs=(
+		-Dpython=enabled
+	)
+	meson_src_configure --reconfigure
+	meson_src_compile
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use python; then
+		python_copy_sources
+		python_foreach_impl python_compile
+	fi
+}
+
+python_install() {
+	meson_src_install
+	use python && python_optimize
+}
+
+src_install() {
+	use python && python_foreach_impl python_install
+
+	meson_src_install
+}
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index d127571c9abd..7a9e35d9a015 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1,4 +1,5 @@
 AUX libseccomp-2.5.3-skip-valgrind.patch 516 BLAKE2B d5dc87fcca8e20b7edd427c434d875c9c3c7aa130a651dbe06c2c648825312e330400f89177afcfe4985fa48e0f95de9937773deb6d3d83da9b2351e6e0488fc SHA512 96053f8ca6abc97ea7c5565c3c25563881e8c0363e9c38fa05836d59b5d9ea1a375f9e072bd5f89a67ddac159c1219be7ed829facd651b3fb8bd5071c89bddcb
+AUX libseccomp-2.5.5-which-hunt.patch 1779 BLAKE2B 00ac7f24b718f450c258c0d69f600a739360ac6cce45acdca51d413e07396d16ffa50d64fda2744968171e33e3a0e2ac17fa01c6016a95fab6774a4f6c7ba7c4 SHA512 b077a3f1075664fdfec6fecc077bd53685823794f037315a559f205cb6dc78a7d5e720ea4587dfdb605bfbeae79cf964d083157fbfae2085ca1d9e2995015067
 AUX libseccomp-2.6.0-python-shared.patch 778 BLAKE2B 343bcb6c8e8cfc9bab3e0439d391ddfae023587f64f23860c1594cacb60d3af58e031edd5f37ba705bf3da01799ed12ab931a4b9a98e9063922f16cab814d5e6 SHA512 029b1403a3b0af5931833837d9b640d8d9ee172972f927f756137ca51bdbfd3f9cd42657029397fdb2cb727a5065356e05ca196fcb2170484f807bb65cd5a398
 AUX libseccomp-python-shared.patch 759 BLAKE2B e2c42e18ca93fe5fddbc3a5b47ac0e6a29e566292fd62b87e6b45f6cb230570a2d1907a8b192e80b32c1900d069a4f10a866fa50bd9b88f5b78abff4206bd4cb SHA512 74548c7969869ff8f937a75eac720f1c654fad87dc17aed1c041bcb765586b4ee978a3ff7c6281be03277f6c74f2ec32624f91beb55afec3066a06a9e51483e2
 DIST libseccomp-2.5.4-loongarch64-20220425.patch.xz 132768 BLAKE2B f3ab165b028b5f8b4c16574936b915595807ebeb49ef7365d6051f3dfafa7da46ef2a9de458e0a268298cb340152abe1f3c0c293446462a06696bc9ce92d2f72 SHA512 94f23c7a2cc2ea8acb01fef00ef184295c276b14b2b3ba0c65687fd72081df8478f3f04c51b0b391ba44529c4f914e6edbb4132af935e3be55902f641d478780
@@ -8,6 +9,6 @@ DIST libseccomp-2.5.5-loongarch64-20231204.patch.xz 41236 BLAKE2B 7831b28c275771
 DIST libseccomp-2.5.5.tar.gz 642445 BLAKE2B d770cee1f3e02fbbcd9f25655b360ab38160ad800e2829a67f2b9da62b095a90be99ac851a67344cf95bd6810a6268da4655dc1d37d996e58239c4999eb41998 SHA512 f630e7a7e53a21b7ccb4d3e7b37616b89aeceba916677c8e3032830411d77a14c2d74dcf594cd193b1acc11f52595072e28316dc44300e54083d5d7b314a38da
 EBUILD libseccomp-2.5.4-r1.ebuild 2892 BLAKE2B 9a6d7af3efc13ff8a4ef7529ce8d16f87268eb63f3b7ba4759113f3f4de51907dda2a06768a5c64ec19ef3b364aa558eb12c093d8fe0f0ebc8646efa1eb356cf SHA512 5c3bda3415903d3baedcd41319caa7daac9d5ec01a7f0044d3a3084b027be40bce7f5886f788135bb627b00fe2348ecf203e2c2b7ad4411cf71f4d4db51e3517
 EBUILD libseccomp-2.5.4.ebuild 2869 BLAKE2B 2eec1616d9e6e66191a0b2e49b26908777d1df0e8647a3dd2812fcb422f53dd35e1616cc747a6d0096f03cdc72d291429f69f1c31b4ee9d5560d5b40c5a36eee SHA512 b7be9c2f80496e48498eec6a6219ba4e66087db25b0abb58dd6b99f3ebe18d1e55ca883af98f129a44fd846eb37f42f86cd17035b65e0c99b05c781789ebd798
-EBUILD libseccomp-2.5.5.ebuild 2890 BLAKE2B 59f7cea33461ca816ab5d7d503361d18ee3f43158adb75b86659ea89cb61ca5117446b21faaa0ed367536f63d1518b8cf631aee5b7f54de4d851fb337dd8d43b SHA512 07459d5e692479b2e18caabeef76be191d4dd544143da34460143e0280b064b9a4f2523231ac33e8e5abd284c52ceca03de8c5c4473fe6d86d9f4e69630ea62e
+EBUILD libseccomp-2.5.5.ebuild 2939 BLAKE2B 1c5181358fa85f65059d9633821a0dbe8864d7b02b484fddd5bf0d5e3fcc8d71068d07948ef227292d473592b058409bfbe79dbbe69a9eeaf8c1364037f32c18 SHA512 01150fe32346d2fe09cdeea25ac752a11e24253ea9d94fae1f996e2cde13f3d7701017f7a27ea64518192c2fd9de8ada2feb5b4bdbd5ce4a3d097be06075dd83
 EBUILD libseccomp-9999.ebuild 2395 BLAKE2B 585bfd4132bfc731a507bc867a5af585427def52f0618ea37208a53a2abe99d06f80005671c234e1a8f7dd243ab690717ddd040be1665d12db9e641ccf350705 SHA512 d9fe1e6a07790aa193eeccd3752a30a7bc70428762876e0c78f6df7aeebf7367a762f8d605bea19c4a48b3e626ff7d462d489081e8fcc835c675b01e9066d713
 MISC metadata.xml 506 BLAKE2B 44dc13629234226f9314270c05d5c7c87575639fe12282e73697ead63d016ee9b52a89d673be5881bfcbf4d605024ecfcc3e19510581d334a6d5737df6a36b50 SHA512 93b0a53783499eab6b6264867a049830d765ee56d19b0c60e764f6651dff9f0d11efbec0783fdeb17c2c64d3f409bb4b1b1f74f267022775b992b61a1df03100
diff --git a/sys-libs/libseccomp/files/libseccomp-2.5.5-which-hunt.patch b/sys-libs/libseccomp/files/libseccomp-2.5.5-which-hunt.patch
new file mode 100644
index 000000000000..90dc25bf4e7c
--- /dev/null
+++ b/sys-libs/libseccomp/files/libseccomp-2.5.5-which-hunt.patch
@@ -0,0 +1,69 @@
+https://github.com/seccomp/libseccomp/pull/424
+
+From 865adeed17cac7063cbbce0c5df225aa35c83621 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 16 Dec 2023 02:17:36 +0000
+Subject: [PATCH] tests: avoid use of non-portable `which`
+
+which is not a standard POSIX utility, and indeed, each of these test scripts
+uses #!/bin/bash as its shebang, so we can use `type -P` which has the same
+behaviour as `which` for free.
+
+(If the tests used POSIX shell, we could do `command -v`, its only caveat is
+that it'll pick up functions in the user's shell, which doesn't matter 99% of
+the time anyway.)
+
+Distributions like Debian [0] and Gentoo [1] are looking to remove `which`
+from their base set of packages.
+
+[0] https://lwn.net/Articles/874049/
+[1] https://bugs.gentoo.org/646588
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/tests/38-basic-pfc_coverage.sh
++++ b/tests/38-basic-pfc_coverage.sh
+@@ -18,7 +18,7 @@
+ #
+ function check_deps() {
+ 	[[ -z "$1" ]] && return
+-	which "$1" >& /dev/null
++	type -P "$1" >& /dev/null
+ 	return $?
+ }
+ 
+--- a/tests/55-basic-pfc_binary_tree.sh
++++ b/tests/55-basic-pfc_binary_tree.sh
+@@ -18,7 +18,7 @@
+ #
+ function check_deps() {
+ 	[[ -z "$1" ]] && return
+-	which "$1" >& /dev/null
++	type -P "$1" >& /dev/null
+ 	return $?
+ }
+ 
+--- a/tests/regression
++++ b/tests/regression
+@@ -73,7 +73,7 @@ GLBL_SYS_API="../tools/scmp_api_level"
+ #
+ function check_deps() {
+ 	[[ -z "$1" ]] && return
+-	which "$1" >& /dev/null
++	type -P "$1" >& /dev/null
+ 	return $?
+ }
+ 
+--- a/tests/testgen
++++ b/tests/testgen
+@@ -32,7 +32,7 @@
+ #
+ function verify_deps() {
+ 	[[ -z "$1" ]] && return
+-	if ! which "$1" >& /dev/null; then
++	if ! type -P "$1" >& /dev/null; then
+ 		echo "error: install \"$1\" and include it in your \$PATH"
+ 		exit 1
+ 	fi
+-- 
+2.43.0
+
diff --git a/sys-libs/libseccomp/libseccomp-2.5.5.ebuild b/sys-libs/libseccomp/libseccomp-2.5.5.ebuild
index e65a98cb7fc6..51018de4ccdd 100644
--- a/sys-libs/libseccomp/libseccomp-2.5.5.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.5.5.ebuild
@@ -40,6 +40,7 @@ BDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}"/libseccomp-python-shared.patch
 	"${FILESDIR}"/libseccomp-2.5.3-skip-valgrind.patch
+	"${FILESDIR}"/libseccomp-2.5.5-which-hunt.patch
 )
 
 src_prepare() {