From deb34bd3be635dc4da4fc508ee9551026444cf71 Mon Sep 17 00:00:00 2001
From: Patrick McLean <chutzpah@gentoo.org>
Date: Fri, 23 May 2025 09:23:10 -0700
Subject: [PATCH] sys-libs/libnvme: Rename uring to io-uring (bug #951536)

Closes: https://bugs.gentoo.org/951536
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
---
 sys-libs/libnvme/libnvme-1.12-r1.ebuild | 6 +++---
 sys-libs/libnvme/libnvme-1.13-r1.ebuild | 6 +++---
 sys-libs/libnvme/libnvme-1.14.ebuild    | 6 +++---
 sys-libs/libnvme/metadata.xml           | 1 -
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/sys-libs/libnvme/libnvme-1.12-r1.ebuild b/sys-libs/libnvme/libnvme-1.12-r1.ebuild
index a1110a4048252..1692114985b1d 100644
--- a/sys-libs/libnvme/libnvme-1.12-r1.ebuild
+++ b/sys-libs/libnvme/libnvme-1.12-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
 KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="dbus +json keyutils python ssl test uring"
+IUSE="dbus io-uring +json keyutils python ssl test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -26,7 +26,7 @@ DEPEND="
 	dbus? ( sys-apps/dbus:= )
 	python? ( ${PYTHON_DEPS} )
 	ssl? ( >=dev-libs/openssl-1.1:= )
-	uring? ( sys-libs/liburing:= )
+	io-uring? ( sys-libs/liburing:= )
 "
 RDEPEND="
 	${DEPEND}
@@ -43,7 +43,7 @@ src_configure() {
 		$(meson_feature dbus libdbus)
 		$(meson_feature keyutils)
 		$(meson_feature ssl openssl)
-		$(meson_feature uring liburing)
+		$(meson_feature io-uring liburing)
 	)
 	meson_src_configure
 }
diff --git a/sys-libs/libnvme/libnvme-1.13-r1.ebuild b/sys-libs/libnvme/libnvme-1.13-r1.ebuild
index 67d9327c4335c..74e5be635bed0 100644
--- a/sys-libs/libnvme/libnvme-1.13-r1.ebuild
+++ b/sys-libs/libnvme/libnvme-1.13-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="dbus +json keyutils python ssl test uring"
+IUSE="dbus io-uring +json keyutils python ssl test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -26,7 +26,7 @@ DEPEND="
 	dbus? ( sys-apps/dbus:= )
 	python? ( ${PYTHON_DEPS} )
 	ssl? ( >=dev-libs/openssl-1.1:= )
-	uring? ( sys-libs/liburing:= )
+	io-uring? ( sys-libs/liburing:= )
 "
 RDEPEND="
 	${DEPEND}
@@ -43,7 +43,7 @@ src_configure() {
 		$(meson_feature dbus libdbus)
 		$(meson_feature keyutils)
 		$(meson_feature ssl openssl)
-		$(meson_feature uring liburing)
+		$(meson_feature io-uring liburing)
 	)
 	meson_src_configure
 }
diff --git a/sys-libs/libnvme/libnvme-1.14.ebuild b/sys-libs/libnvme/libnvme-1.14.ebuild
index 5ca2755564426..06d1cd1367242 100644
--- a/sys-libs/libnvme/libnvme-1.14.ebuild
+++ b/sys-libs/libnvme/libnvme-1.14.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="dbus +json keyutils python ssl test uring"
+IUSE="dbus io-uring +json keyutils python ssl test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -29,7 +29,7 @@ DEPEND="
 	dbus? ( sys-apps/dbus:= )
 	python? ( ${PYTHON_DEPS} )
 	ssl? ( >=dev-libs/openssl-1.1:= )
-	uring? ( sys-libs/liburing:= )
+	io-uring? ( sys-libs/liburing:= )
 "
 RDEPEND="
 	${DEPEND}
@@ -57,7 +57,7 @@ src_configure() {
 		$(meson_feature dbus libdbus)
 		$(meson_feature keyutils)
 		$(meson_feature ssl openssl)
-		$(meson_feature uring liburing)
+		$(meson_feature io-uring liburing)
 	)
 	meson_src_configure
 	use python && distutils-r1_src_configure
diff --git a/sys-libs/libnvme/metadata.xml b/sys-libs/libnvme/metadata.xml
index 5b2185449d58e..b8882391c6fcd 100644
--- a/sys-libs/libnvme/metadata.xml
+++ b/sys-libs/libnvme/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="json">Support JSON output via <pkg>dev-libs/json-c</pkg></flag>
 		<flag name="keyutils">Add support for <pkg>sys-apps/keyutils</pkg></flag>
 		<flag name="uuid">UUID support via <pkg>sys-apps/util-linux</pkg></flag>
-		<flag name="uring">uring support via <pkg>sys-libs/liburing</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">linux-nvme/libnvme</remote-id>