From 02e057374a652bea4ede61ac35dfddbd83f39310 Mon Sep 17 00:00:00 2001
From: Icenowy Zheng <uwu@icenowy.me>
Date: Sat, 25 Nov 2023 11:47:18 +0800
Subject: [PATCH 1/2] libnvme: new, 1.6

Signed-off-by: Icenowy Zheng <uwu@icenowy.me>
---
 runtime-devices/libnvme/autobuild/defines | 8 ++++++++
 runtime-devices/libnvme/spec              | 4 ++++
 2 files changed, 12 insertions(+)
 create mode 100644 runtime-devices/libnvme/autobuild/defines
 create mode 100644 runtime-devices/libnvme/spec

diff --git a/runtime-devices/libnvme/autobuild/defines b/runtime-devices/libnvme/autobuild/defines
new file mode 100644
index 00000000000..a0068568f58
--- /dev/null
+++ b/runtime-devices/libnvme/autobuild/defines
@@ -0,0 +1,8 @@
+PKGNAME=libnvme
+PKGDES="Library for NVMe protocol definition"
+PKGSEC=libs
+PKGDEP="dbus json-c"
+BUILDDEP="swig"
+
+PKGBREAK="nvme-cli<=2.2.1-0"
+PKGREP="nvme-cli<=2.2.1-0"
diff --git a/runtime-devices/libnvme/spec b/runtime-devices/libnvme/spec
new file mode 100644
index 00000000000..bf19a9c4ce3
--- /dev/null
+++ b/runtime-devices/libnvme/spec
@@ -0,0 +1,4 @@
+VER=1.6
+SRCS="git::commit=tags/v${VER}::https://github.com/linux-nvme/libnvme.git"
+CHKSUMS="SKIP"
+CHKUPDATE="anitya::id=242763"

From a0801821ad7f64aaa8b3633d685c5ffba54ae2dd Mon Sep 17 00:00:00 2001
From: Icenowy Zheng <uwu@icenowy.me>
Date: Sat, 25 Nov 2023 11:47:38 +0800
Subject: [PATCH 2/2] nvme-cli: update to 2.6 and use system libnvme

- Force configuration files to /etc (otherwise they'll be in /usr/etc).
- Explicitly enable json-c (previously auto).

Signed-off-by: Icenowy Zheng <uwu@icenowy.me>
---
 app-admin/nvme-cli/autobuild/defines | 5 +++--
 app-admin/nvme-cli/spec              | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-admin/nvme-cli/autobuild/defines b/app-admin/nvme-cli/autobuild/defines
index 1be1d8dc897..9244fb3b531 100644
--- a/app-admin/nvme-cli/autobuild/defines
+++ b/app-admin/nvme-cli/autobuild/defines
@@ -1,9 +1,10 @@
 PKGNAME=nvme-cli
 PKGSEC=admin
-PKGDEP="systemd"
+PKGDEP="systemd libnvme json-c"
 PKGDES="NVMe management command line interface"
 
 # No point in re-generating documentations if the source tree provides it.
-MESON_AFTER="-Dhtmldir=/usr/share/doc/$PKGNAME/html \
+MESON_AFTER="-Dsysconfdir=/etc -Djson-c=enabled \
+             -Dhtmldir=/usr/share/doc/$PKGNAME/html \
              -Ddocs=all \
              -Ddocs-build=false"
diff --git a/app-admin/nvme-cli/spec b/app-admin/nvme-cli/spec
index decccfdcb5a..ae17abe584a 100644
--- a/app-admin/nvme-cli/spec
+++ b/app-admin/nvme-cli/spec
@@ -1,5 +1,4 @@
-VER=2.2.1
-REL=1
-SRCS="https://github.com/linux-nvme/nvme-cli/archive/v$VER.tar.gz"
-CHKSUMS="sha256::68720bc25c68adb93dafe1186de4fabbe40f8390ff1416256b52fe74f78259ae"
+VER=2.6
+SRCS="git::commit=tags/v${VER}::https://github.com/linux-nvme/nvme-cli.git"
+CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=9074"