gentoo auto-resync : 06:02:2024 - 05:42:43

7 files changed, 1 insertions, 372 deletions

diff --git a/sys-libs/libnvme/Manifest b/sys-libs/libnvme/Manifest
index 815e45b2b0aa..1d7ded3fcfc3 100644
--- a/sys-libs/libnvme/Manifest
+++ b/sys-libs/libnvme/Manifest
@@ -1,10 +1,3 @@
-AUX libnvme-1.6-lld-17.patch 827 BLAKE2B b2ac67883856c7ea693ec298db92de1406c821f1a6648e85431aa7c5ddf6745a8e950226c01f5d5d58346bb55c0b159a3f6a6df6ab823ce388cea4080927d20c SHA512 6b3e2fdc27a1e5ff22aeea8a01c4c8ebcae078a6db2003a0084e119d0e13ba97aebbc2eed5433e5b6da1fb103a313b0d50f39e4d0b85b7916f109a127c73a459
-AUX libnvme-1.6-musl.patch 2893 BLAKE2B eb7c1879efc26e5555ee270c60b823142b6983defa8a13434c03caf21d30d347a4040d14dd4771fc91820711382d021711b32b034a4cc75af6d57f402e2b3bcb SHA512 55d6f1677e167a8aadee43b36ba951f16d88f29557599e928580107b5146a828a89ab33816d6727c4d72b141f0b82f18730a9abd54419a86996e9e2b8c00c224
-DIST libnvme-1.6-ubsan.patch.xz 5800 BLAKE2B 8603311c44a475bd09a31a6bebe96f29f2b18b6d0917cb02b680fc20861a71688f1c5b3f618d6f38e7c105c8a00b8818b2ffa67289371fd0ab62354d318bebb9 SHA512 74f1a86c4011ce6650b54ec50422fe98ec64a65b50e3aa6c3d57f3715713f85ef7c84451416bb8d136dff646b3eba00d415208c98a16c562bf5d258d51b0d006
-DIST libnvme-1.6.tar.gz 597676 BLAKE2B 8b47b268154574688a909d0664df55eda38d9f133373fabcffe987ede03e0c531f88126e0dc50204d74fb2fa665af6379aa5205757bfc5863926db8402fbab27 SHA512 ae6a95ed75bbdc6f8c5c5608eaad8bcaf60a08348ddff356bd47258da2bd2470bdaa45747cdb7ba24f10db093fc0ab95f8bda076a45cbb87e155e3158ef726f8
 DIST libnvme-1.7.1.tar.gz 604220 BLAKE2B b02bf0914be73f5877f418bebdbed31dfb019484fb9f6e169c3474d90306706b8e787003a472f13bedb72e90eff39a30ba35df252a3cdf4ea08a362c3f9e221b SHA512 aea986ae35eafa17482e07015228d5a7d529d41148f4cee9e4619adc2460abb5460d60cd91177462cbcaf2e94e5870026ff9e45548f91d9f90b65a6268eb3abb
-EBUILD libnvme-1.6-r1.ebuild 1592 BLAKE2B cfca87f1d76df65b2de0d9444ea2cd0cf24f89a01f8bab17b191f7a8afbe5e7ee015fc1c0640857d2ac98665f9548391c2d03171da7c71d59faab129fce0cefd SHA512 38cdf8442dbd0a61f16166cd79eadaec34d4374821b0629dd6180306c229f310cedfbc254db54afa4507dd55fb5ea27ec9bec5165e593be7dab2c04436d43a63
-EBUILD libnvme-1.6-r2.ebuild 1712 BLAKE2B bcf55a48f7dcc2d904c39b93249a9de5797a4b4edfc31afd96dddf021dd82519aa1e9563af262daa835e124fc6e001a2ef822b1b5ec7c497b28c812b12bcdde4 SHA512 f1a6dc39b344004387acf19ad998e472a7fabcd3c2baf7715ac6febc8c7c07786a2831bd3e933e4e0d7afce3922d84490e4429d1fdae713b1af55d7600102e73
-EBUILD libnvme-1.6.ebuild 1535 BLAKE2B 60dd5252ef071bf3186e059fe0482a8cca78226ed28331abe629ac8eb6b224935558c4b9df1b4d74fb222a1a7c7830ededa4054950d46cc7896b25aad04b46f5 SHA512 41e03e4bb81482d292e24dbc408bc7ad48036d198b5afd0469822822bded76f6f5ced22c85766cbe71293cdb4681fe2865d239bad44bcb8a101838f4911a66f9
-EBUILD libnvme-1.7.1.ebuild 1517 BLAKE2B 6c7ad79015a045676ff3c9d1f62b43ec1e5a2047ef12f0fba6af1c10257d70129ab6b87f1374101163d80179f2fdc5fbaf91f2e51a957f5be9dff5cc1f96a532 SHA512 9099714197dcc98c5b1a1d52c4b6730320797ac52ee86ca09872bece02b77d41f9647aa47f0609f0cb8c11629ddb8d44c6acd673c1efc206c9d62ce321290612
+EBUILD libnvme-1.7.1-r1.ebuild 1491 BLAKE2B 386d97eeddf8f2dad06c085cbd3f8101059b3287cbb9005014f69b14c15930b76a7fadb65757d2041bbd035b4d59a69d01608be6e1f1737e491c240680333116 SHA512 e799a2bb0158cd89bae1d1c1ed1e4b5c2cd8eaffabb2291ed2492ff420b7e8d1fa536759dd6e310a436f928e6e7479ed65a7111b74638462562be310139a5405
 MISC metadata.xml 585 BLAKE2B 6163419190adb903fdbdef99ad53f8b14ffbc08ac3c8b56f820049468010af2a58ac204ded1b53c767759e9ac864bf85dbc3b723cd7113cb919194dd9ceaaac3 SHA512 2f5268b41676d2a61d5415de3ec62149cda53613970a1af6aface937cc635d26866c88205a6d9fcf7efd7df0c7f45308ecf5b29b6cea937966b765a222edb8f7
diff --git a/sys-libs/libnvme/files/libnvme-1.6-lld-17.patch b/sys-libs/libnvme/files/libnvme-1.6-lld-17.patch
deleted file mode 100644
index c64b4a80cbfb..000000000000
--- a/sys-libs/libnvme/files/libnvme-1.6-lld-17.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/linux-nvme/libnvme/pull/725
-
-From a5cc9074765bf400336f78a05c8374b9788ad670 Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Tue, 10 Oct 2023 04:22:48 +0300
-Subject: [PATCH] build: remove symbol which doesn't exist in libnvme-mi.so
-
-* Added in bb70b874dac13a15c37ce1dd1de866d6a5dd428d, but was never used.
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
----
- src/libnvme-mi.map | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/libnvme-mi.map b/src/libnvme-mi.map
-index f1ce7125..41e81106 100644
---- a/src/libnvme-mi.map
-+++ b/src/libnvme-mi.map
-@@ -49,7 +49,6 @@ LIBNVME_MI_1_1 {
- 		nvme_mi_admin_security_send;
- 		nvme_mi_admin_security_recv;
- 		nvme_mi_endpoint_desc;
--		nvme_mi_root_close;
- 		nvme_mi_first_endpoint;
- 		nvme_mi_next_endpoint;
- 		nvme_mi_first_ctrl;
diff --git a/sys-libs/libnvme/files/libnvme-1.6-musl.patch b/sys-libs/libnvme/files/libnvme-1.6-musl.patch
deleted file mode 100644
index bc1037820311..000000000000
--- a/sys-libs/libnvme/files/libnvme-1.6-musl.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://github.com/linux-nvme/libnvme/pull/724
-
-From f78a97acf9cdec1031d81f0e8a3956fc8f28c33c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 30 Sep 2023 06:38:53 +0100
-Subject: [PATCH 1/2] test: handle POSIX ioctl prototype
-
-glibc has the following prototype for ioctl: int ioctl(int fd, unsigned long request, ...)
-POSIX (inc. musl) has the following for ioctl: int ioctl(int fd, int request, ...)
-
-Check which prototype is used in <sys/ioctl.h> to avoid a conflict and conditionally
-define the right one for the system.
-
-Bug: https://bugs.gentoo.org/914921
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/meson.build
-+++ b/meson.build
-@@ -230,6 +230,16 @@ conf.set(
-     ),
-     description: 'Is network address and service translation available'
- )
-+conf.set(
-+    'HAVE_GLIBC_IOCTL',
-+    cc.compiles(
-+        '''#include <sys/ioctl.h>
-+        int ioctl(int fd, unsigned long request, ...);
-+        ''',
-+        name: 'ioctl has glibc-style prototype'
-+    ),
-+    description: 'Is ioctl the glibc interface (rather than POSIX)'
-+)
- 
- if cc.has_function_attribute('fallthrough')
-   conf.set('fallthrough', '__attribute__((__fallthrough__))')
---- a/test/ioctl/mock.c
-+++ b/test/ioctl/mock.c
-@@ -114,7 +114,11 @@ void end_mock_cmds(void)
- 	} \
- })
- 
-+#ifdef HAVE_GLIBC_IOCTL
- int ioctl(int fd, unsigned long request, ...)
-+#else
-+int ioctl(int fd, int request, ...)
-+#endif
- {
- 	struct mock_cmds *mock_cmds;
- 	bool result64;
-@@ -141,7 +145,7 @@ int ioctl(int fd, unsigned long request, ...)
- 		result64 = true;
- 		break;
- 	default:
--		fail("unexpected %s %lu", __func__, request);
-+		fail("unexpected %s %lu", __func__, (unsigned long) request);
- 	}
- 	check(mock_cmds->remaining_cmds,
- 	      "unexpected %s command", mock_cmds->name);
-
-From 149c006d23da60e168485ede722730dc2b725e6b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 30 Sep 2023 06:43:39 +0100
-Subject: [PATCH 2/2] meson: make building tests conditional
-
-Just like we do for docs.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/meson.build
-+++ b/meson.build
-@@ -273,7 +273,9 @@ subdir('internal')
- subdir('ccan')
- subdir('src')
- subdir('libnvme')
--subdir('test')
-+if get_option('tests')
-+    subdir('test')
-+endif
- subdir('examples')
- subdir('doc')
- 
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -6,6 +6,7 @@ option('rstdir', type : 'string', value : '', description : 'directory for ReST
- 
- option('docs', type : 'combo', choices : ['false', 'html', 'man', 'rst', 'all'], description : 'install documentation')
- option('docs-build', type : 'boolean', value : false,  description : 'build documentation')
-+option('tests', type : 'boolean', value : true, description : 'build tests')
- 
- option('python', type : 'feature', value: 'auto', description : 'Generate libnvme python bindings')
- option('openssl', type : 'feature', value: 'auto', description : 'OpenSSL support')
-
diff --git a/sys-libs/libnvme/libnvme-1.6-r1.ebuild b/sys-libs/libnvme/libnvme-1.6-r1.ebuild
deleted file mode 100644
index f4ec08793b9f..000000000000
--- a/sys-libs/libnvme/libnvme-1.6-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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"
-
-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
-)
-
-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/libnvme/libnvme-1.6-r2.ebuild b/sys-libs/libnvme/libnvme-1.6-r2.ebuild
deleted file mode 100644
index 99790bc67429..000000000000
--- a/sys-libs/libnvme/libnvme-1.6-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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 ~sparc ~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/libnvme/libnvme-1.6.ebuild b/sys-libs/libnvme/libnvme-1.6.ebuild
deleted file mode 100644
index 2937331ef7b9..000000000000
--- a/sys-libs/libnvme/libnvme-1.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~loong 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
-)
-
-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/libnvme/libnvme-1.7.1.ebuild b/sys-libs/libnvme/libnvme-1.7.1-r1.ebuild
index 0ee4043171d1..5dce034744c3 100644
--- a/sys-libs/libnvme/libnvme-1.7.1.ebuild
+++ b/sys-libs/libnvme/libnvme-1.7.1-r1.ebuild
@@ -43,7 +43,6 @@ src_configure() {
 		$(meson_feature dbus libdbus)
 		$(meson_feature keyutils)
 		$(meson_feature ssl openssl)
-		$(meson_feature python)
 	)
 	meson_src_configure
 }