Adding metadata

7 files changed, 137 insertions, 104 deletions

diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 0ea8f6658c31..2903ea1b35a4 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,2 +1,2 @@
-DIST libblockdev-3.3.1.tar.gz 1160139 BLAKE2B 4baf4f980df4a71faf085f9e94cd18b0eb64f3f8f0fd68c3bd20b54109709c7cd3aca26cedfa1a8ec9ae4fd44df55a5d4237c3d3fc61a58dbd5288da6f0c0189 SHA512 f9cc15bf19120a8bb77efe82889b15c9435f4c94a1ed677839a1bcfe5bd242719f40221ba2685f4376cc52ec1e8a044f93840cb504fd7574fff1a8dd5e85d477
 DIST libblockdev-3.4.0.tar.gz 1161068 BLAKE2B 330efc4792465b7fd74a6028cd90274b95333c2e3b449e0ed965eb663e59ac2e77e5fcda755a74f7a775fc217a21344440b9d18bed08bd2e6726da93187ea811 SHA512 d722ee1f41b76158b41f57ea4062adaba274c5ffdd88fa40b0b605a8557e68ba095e6a6649b8f6efeff9ad814532b5b19aa541a1688ef4b34ea23078d946c1d3
+DIST libblockdev-3.5.0.tar.gz 1191802 BLAKE2B d852cd6bf62e4b138a38b4756cb3bf11f7cfc4d5289b021d8b84c1738591609b66b3dbe6d51d53b77e60ac5705568db5d5b6b68f2c88b2ecb0ccea686cf95389 SHA512 bdc22bd2ec23a6e0fcee9e41d6e4ed05645b7c5413874e6ed8bc0f2ad17d5e671ed966e8697a2a2b65738eb49830ade3c302a93f9facb7542685e544ebe9106a
diff --git a/sys-libs/libblockdev/files/libblockdev-3.3.0-fix-bashism.patch b/sys-libs/libblockdev/files/libblockdev-3.3.0-fix-bashism.patch
deleted file mode 100644
index 4157c5ba3ca4..000000000000
--- a/sys-libs/libblockdev/files/libblockdev-3.3.0-fix-bashism.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/storaged-project/libblockdev/pull/1111
-
-From bc1fa125aed4ba6e12a19bd00bb75be21b96f44a Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 18 Jun 2025 04:27:30 +0100
-Subject: [PATCH] configure.ac: fix bashism
-
-configure scripts run with a #!/bin/sh shebang which means they should work
-with a POSIX shell, so avoid using '+=' which is a bashism.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -310,7 +310,7 @@ AS_IF([test "x$with_smart" != "xno"],
- 
- AS_IF([test "x$with_smart" != "xno"],
-       [SAVED_CFLAGS=$CFLAGS
--       CFLAGS+=" -I$drivedb_path"
-+       CFLAGS="${CFLAGS} -I$drivedb_path"
-        AC_MSG_CHECKING([for drivedb.h presence])
-        AC_COMPILE_IFELSE(
-            [AC_LANG_PROGRAM([
diff --git a/sys-libs/libblockdev/files/libblockdev-3.3.0-tests-nvme.patch b/sys-libs/libblockdev/files/libblockdev-3.3.0-tests-nvme.patch
deleted file mode 100644
index 19408ee943ea..000000000000
--- a/sys-libs/libblockdev/files/libblockdev-3.3.0-tests-nvme.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/storaged-project/libblockdev/commit/96e69ff1d60d343e64731e37c36fa5630f19295c
-
-From 96e69ff1d60d343e64731e37c36fa5630f19295c Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Mon, 7 Apr 2025 18:26:42 +0200
-Subject: [PATCH] tests: Fix NVMe sanitize log return codes
-
-When calling nvme_get_log_sanitize() on a namespace device through
-io_uring codepath, return codes may differ slightly. This is perfectly
-fine, subject to the kernel implementation. In this case the errno 22
-comes directly from io_uring_wait_cqe().
----
- tests/nvme_test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/nvme_test.py b/tests/nvme_test.py
-index 2ce844c0..72dfcf4e 100644
---- a/tests/nvme_test.py
-+++ b/tests/nvme_test.py
-@@ -283,7 +283,7 @@ def test_sanitize_log(self):
-         with self.assertRaisesRegex(GLib.GError, r".*Failed to open device .*': No such file or directory"):
-             BlockDev.nvme_get_sanitize_log("/dev/nonexistent")
- 
--        message = r"NVMe Get Log Page - Sanitize Status Log command error: Invalid Field in Command: A reserved coded value or an unsupported value in a defined field|NVMe Get Log Page - Sanitize Status Log command error: unrecognized"
-+        message = r"NVMe Get Log Page - Sanitize Status Log command error: (Invalid Field in Command: A reserved coded value or an unsupported value in a defined field|unrecognized|No such file or directory)"
-         with self.assertRaisesRegex(GLib.GError, message):
-             # Cannot retrieve sanitize log on a nvme target loop devices
-             BlockDev.nvme_get_sanitize_log(self.nvme_dev)
-
diff --git a/sys-libs/libblockdev/files/libblockdev-3.3.0-tests-skip-vdo.patch b/sys-libs/libblockdev/files/libblockdev-3.3.0-tests-skip-vdo.patch
deleted file mode 100644
index d6a3ae77bd7b..000000000000
--- a/sys-libs/libblockdev/files/libblockdev-3.3.0-tests-skip-vdo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://github.com/storaged-project/libblockdev/commit/08a78e8bb33963f0221af08cb115ecf83ecba74e
-
-From 08a78e8bb33963f0221af08cb115ecf83ecba74e Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Thu, 27 Feb 2025 07:42:40 +0100
-Subject: [PATCH] tests: Skip LVM VDO tests if 'vdoformat' is not available
-
-LVM VDO still uses the vdoformat binary which might not be
-available everywhere.
-
-Related: https://github.com/storaged-project/udisks/issues/1353
----
- tests/lvm_dbus_tests.py | 3 +++
- tests/lvm_test.py       | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/tests/lvm_dbus_tests.py b/tests/lvm_dbus_tests.py
-index 644d3587..f28e0a79 100644
---- a/tests/lvm_dbus_tests.py
-+++ b/tests/lvm_dbus_tests.py
-@@ -2116,6 +2116,9 @@ def setUpClass(cls):
-         if lvm_version < Version("2.3.07"):
-             raise unittest.SkipTest("LVM version 2.3.07 or newer needed for LVM VDO.")
- 
-+        if not shutil.which("vdoformat"):
-+            raise unittest.SkipTest("vdoformat executable not found in $PATH, skipping.")
-+
-         super().setUpClass()
- 
-     def setUp(self):
-diff --git a/tests/lvm_test.py b/tests/lvm_test.py
-index 038e580d..0d7fe56f 100644
---- a/tests/lvm_test.py
-+++ b/tests/lvm_test.py
-@@ -1986,6 +1986,9 @@ def setUpClass(cls):
-         if lvm_version < Version("2.3.07"):
-             raise unittest.SkipTest("LVM version 2.3.07 or newer needed for LVM VDO.")
- 
-+        if not shutil.which("vdoformat"):
-+            raise unittest.SkipTest("vdoformat executable not found in $PATH, skipping.")
-+
-         super().setUpClass()
- 
-     def setUp(self):
diff --git a/sys-libs/libblockdev/libblockdev-3.3.1.ebuild b/sys-libs/libblockdev/libblockdev-3.5.0.ebuild
index a2e033fd0127..3affc38a5618 100644
--- a/sys-libs/libblockdev/libblockdev-3.3.1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	"
 else
 	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="LGPL-2+"
@@ -37,7 +37,7 @@ RDEPEND="
 	virtual/libudev:=
 	cryptsetup? (
 		>=sys-apps/keyutils-1.5.0:=
-		>=sys-fs/cryptsetup-2.7.0:=
+		>=sys-fs/cryptsetup-2.8.0:=
 		escrow? (
 			>=dev-libs/nss-3.18.0
 			dev-libs/volume_key
@@ -45,6 +45,7 @@ RDEPEND="
 	)
 	device-mapper? ( sys-fs/lvm2 )
 	lvm? (
+		>=dev-libs/json-glib-1.0
 		dev-libs/libyaml
 		sys-fs/lvm2
 		virtual/udev
@@ -90,9 +91,6 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.4-add-non-systemd-method-for-distro-info.patch"
-	"${FILESDIR}/${PN}-3.3.0-fix-bashism.patch"
-	"${FILESDIR}/${PN}-3.3.0-tests-skip-vdo.patch"
-	"${FILESDIR}/${PN}-3.3.0-tests-nvme.patch"
 )
 
 pkg_setup() {
diff --git a/sys-libs/libnvidia-container/Manifest b/sys-libs/libnvidia-container/Manifest
index fa27fc8088e8..c18e9093da70 100644
--- a/sys-libs/libnvidia-container/Manifest
+++ b/sys-libs/libnvidia-container/Manifest
@@ -1,3 +1,4 @@
 DIST libnvidia-container-1.18.0.tar.gz 1616152 BLAKE2B 86316e79209733be795b16570460fe2bd90f16b8279c990ae7c562495cc163ab2220f731205efd467884580aa04446a3ed266a2bd4a08bb5fa7ce09cf110f37c SHA512 230b6d3b0a29a54796cebdc212b4cb4b2249d8bb370e97778be88093b6d36153d1325a5755ef69d5b856cfc6b9a904e30d39466d86efd3369b2c838fa57cd7e9
 DIST libnvidia-container-1.19.0.tar.gz 1617812 BLAKE2B 159074dc894c83f5fd9b23ece2c6c40eb1e540f1ed8a4af4c51400ae2745dbca49d5874a40a2abf24cb3dd61b60c83fcf0f63843145aaa42f47020e36513c89c SHA512 ca90b60cb7cc2762d95308276fa9e3ec5fb03970ea9bb51553854a9bc232feb69e31f23bbf7c2784c3d67d27f24d8de4f4157f762f8448c6f1d0545b4c1d938e
+DIST libnvidia-container-1.19.1.tar.gz 1617802 BLAKE2B a8ae77c9af8f12fb2f7dc3ec700f8c09c85ab2a9d560194b3862a295472c38b9587ba6f8569c98bb1f28e1c3e62bfaddd7022fcf68c3da07c99659d6d6fe5dcc SHA512 06ef0fe55746fa7ff9c9a20212cd03eae20a2e60230fdbf8453690c5087bab27458153c0c6a6182d5a05aeafd7c6a7cfc561f72c0c1a5b96f132dac21ada8bda
 DIST libnvidia-container-nvidia-modprobe-550.54.14.tar.gz 47147 BLAKE2B 7b334877d98d0c75d5750192dea868436938852443ced14e74e59076ed4d8be9e361cdefbe48295d87bb91ac4565152ec3f3233479b3da19bb8baf8e7ef53cd6 SHA512 279228aa315ff5fd1a23df23527aff58b2319f11f9fc7d939fa285ea933b4cc6d223451e20ecf7f50baba9f6c9c100e57cb77675d0d17fa77f19d3fea2ccc193
diff --git a/sys-libs/libnvidia-container/libnvidia-container-1.19.1.ebuild b/sys-libs/libnvidia-container/libnvidia-container-1.19.1.ebuild
new file mode 100644
index 000000000000..4fdd37fd298c
--- /dev/null
+++ b/sys-libs/libnvidia-container/libnvidia-container-1.19.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# check the VERSION in libnvidia-container/mk/nvidia-modprobe.mk
+NVMODV="550.54.14"
+
+DESCRIPTION="NVIDIA container runtime library"
+HOMEPAGE="https://github.com/NVIDIA/libnvidia-container"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
+else
+	SRC_URI="
+		https://github.com/NVIDIA/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+	KEYWORDS="~amd64"
+fi
+NVMODS="${WORKDIR}/nvidia-modprobe-${NVMODV}"
+SRC_URI+="
+	https://github.com/NVIDIA/nvidia-modprobe/archive/${NVMODV}.tar.gz -> ${PN}-nvidia-modprobe-${NVMODV}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+IUSE="+seccomp static-libs"
+
+# libtirpc
+# NOTE It seams that library also has optional support for net-libs/libtirpc, but I didn't
+#      manage to build without it, probably the support for that build-roted away.
+DEPEND="
+	net-libs/libtirpc:=
+	sys-libs/libcap
+	virtual/libelf:=
+	seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="${DEPEND}
+	elibc_glibc? ( x11-drivers/nvidia-drivers )
+"
+
+BDEPEND="
+	dev-lang/go
+	net-libs/rpcsvc-proto
+	sys-apps/lsb-release
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.19.0-fix-makefile.patch"
+)
+
+DOCS=( NOTICE README.md )
+
+src_unpack() {
+	default_src_unpack
+	if [[ "${PV}" == "9999" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# nvidia-modprobe patching based on libnvidia-container/mk/nvidia-modprobe.mk
+	mkdir -p "${S}"/deps/src/nvidia-modprobe-"${NVMODV}" || die
+	cp -r "${NVMODS}"/modprobe-utils/ "${S}"/deps/src/nvidia-modprobe-"${NVMODV}"/ || die
+	touch "${S}/deps/src/nvidia-modprobe-${NVMODV}/.download_stamp" || die
+	pushd "${S}/deps/src/nvidia-modprobe-${NVMODV}" || die
+	eapply -p1 "${S}"/mk/nvidia-modprobe.patch
+	popd || die
+
+	if ! tc-is-gcc; then
+		ewarn "libnvidia-container must be built with gcc because of option \"-fplan9-extensions\"!"
+		ewarn "Ignoring CC=$(tc-getCC) and forcing ${CHOST}-gcc"
+		export CC=${CHOST}-gcc AR=${CHOST}-gcc-ar
+		tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
+	fi
+
+	default
+}
+
+src_configure() {
+	export GOPATH="${S}"
+	export GOFLAGS="-mod=vendor"
+	export CFLAGS="${CFLAGS}"
+	export LDFLAGS="${LDFLAGS}"
+	export CGO_CFLAGS="${CGO_CFLAGS:-$CFLAGS}"
+	export CGO_LDFLAGS="${CGO_LDFLAGS:-$LDFLAGS}"
+
+	tc-export LD OBJCOPY PKG_CONFIG
+
+	# we could also set GO compiller, but it currently defaults to gccgo, but as for now I believe
+	# most users will prefer dev-lang/go and they usually don't define GO="go" their make.conf either.
+	# tc-export GO
+
+	my_makeopts=(
+		prefix="${EPREFIX}/usr"
+		libdir="${EPREFIX}/usr/$(get_libdir)"
+		GO_LDFLAGS="-compressdwarf=false -linkmode=external"
+		WITH_SECCOMP="$(usex seccomp)"
+	)
+	# WITH_TIRPC="$(usex libtirpc)"
+
+	if [[ "${PV}" != "9999" ]] ; then
+		IFS='_' read -r MY_LIB_VERSION MY_LIB_TAG <<< "${PV}"
+
+		my_makeopts=( "${my_makeopts[@]}"
+			REVISION="${PV}"
+			LIB_VERSION="${MY_LIB_VERSION}"
+			LIB_TAG="${MY_LIB_TAG}"
+		)
+	fi
+}
+
+src_compile() {
+	emake "${my_makeopts[@]}"
+}
+
+src_install() {
+	emake "${my_makeopts[@]}" DESTDIR="${D}" install
+	# Install docs
+	einstalldocs # Bug 831705
+	# Cleanup static libraries
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die # Bug 783984
+	fi
+}