[gentoo-commits] repo/gentoo:master commit in: sys-apps/nvme-cli/, profiles/arch/riscv/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nvme-cli/, profiles/arch/riscv/

[Sam James]

commit:     3ec2e30b2f1acf44e1b2c427b8a31f3a77f538e5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 26 07:32:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 07:33:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ec2e30b

sys-apps/nvme-cli: add 1.15

Closes: https://bugs.gentoo.org/820320
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/arch/riscv/package.use.mask   |  4 +++
 sys-apps/nvme-cli/Manifest             |  1 +
 sys-apps/nvme-cli/metadata.xml         |  4 ++-
 sys-apps/nvme-cli/nvme-cli-1.15.ebuild | 50 ++++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 74860dc8e6e..91aa042a09f 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-26)
+# sys-libs/libhugetlbfs is not keyworded on ~riscv right now
+sys-apps/nvme-cli hugepages
+
 # Michael Seifert <m.seifert@digitalernachschub.de> (2021-10-23)
 # dev-python/furo isn't keyworded here
 dev-python/argon2-cffi doc

diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index eaba3a9c811..b018972b82d 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,4 +1,5 @@
 DIST nvme-cli-1.10.1.tar.gz 463826 BLAKE2B d92702e3cb7c761dbf12dbd56dee44248d49ebdb5b57636ff00a74728e14b44caa6f1500ed90e7fa63d4b1f2de28624a70f37e27a060dbc138f303e46e224dcf SHA512 92bef073205b357f4b14ba929b7f261d0c18b343e5e244cefc24521dfc581dec4b941a13dc00f9a3b4d938ccd026c847d58ccfd75f813cc3c4f484f8316269dc
 DIST nvme-cli-1.11.1.tar.gz 478664 BLAKE2B 74c1ffae32da7605afa02fbbf73878477e04669331c8971d4cc596088c42619abac65a1cfe54b62bd62f253328309f8bbd61c232a200816aa1090ebdf3f7ea76 SHA512 467e327f45500d80cebd6e5e55d4e6d3731a754423e71180efa9d4f5e98f0774f7a31393fefc2794250b487446005dad8e7002a27aff1f2b285983d55ec0d0b3
 DIST nvme-cli-1.14.tar.gz 579561 BLAKE2B e27dade228ee47d88ef5cbab4d9d6163e75af44fb3345ed2ae566e875b973355255a5aba1b1846e53006f9676922cf7901a5e6e4867fcf04c591bf372a119bca SHA512 b5e18708233fd37069d84ee34232d737ed6d6909b0ec523d82cc2c4940172f7ce769b9bbec0d8615ebee544a5174cb4d752ad6d96ea05cfaa1177efc760f0e9e
+DIST nvme-cli-1.15.tar.gz 610927 BLAKE2B 66278904d49987d92083c1bb28a98d362adee8e85ee92e44e9dee381f3efcc76ac53ddf82957495ac7b2ef82e717c570d55e1b2052224740c1bc7e5af8af137e SHA512 0614105153edf7217d4c428927423628b63f6bee034c59926370a13d433c9c3af217338fb6fe2f8bbf781fc17ebae0102e8c072371b7ea4324c18dfdffd40305
 DIST nvme-cli-1.9.tar.gz 440675 BLAKE2B 19d9f4982e6bf4d37bbced02aadd0f58e496901c1463c96596b289e23c4e5849bfed9a4129447588c9c8104d5b49fd0bf97ee6495907bf022487407f02d7c4ae SHA512 3565b33bc39bde4480bbde5d46d75ea6907c0921884e8f39029b746f8383d3630942e405c61bcc3654bac5646bc86479b4b790e1b823ec83650649621bab6dac

diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml
index cba4ebd62af..0ed1b1c4a09 100644
--- a/sys-apps/nvme-cli/metadata.xml
+++ b/sys-apps/nvme-cli/metadata.xml
@@ -8,6 +8,8 @@
     <remote-id type="github">linux-nvme/nvme-cli</remote-id>
   </upstream>
   <use>
-    <flag name="uuid">UUID support</flag>
+    <flag name="json">Support JSON output via <pkg>dev-libs/json-c</pkg></flag>
+    <flag name="hugepages">Use huge pages for memory allocations via <pkg>sys-libs/libhugetlbfs</pkg></flag>
+    <flag name="uuid">UUID support via <pkg>sys-apps/util-linux</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/sys-apps/nvme-cli/nvme-cli-1.15.ebuild b/sys-apps/nvme-cli/nvme-cli-1.15.ebuild
new file mode 100644
index 00000000000..3fd05ec551f
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-1.15.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs udev
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="hugepages +json systemd +uuid"
+
+RDEPEND="json? ( dev-libs/json-c:= )
+	hugepages? ( sys-libs/libhugetlbfs )
+	systemd? ( sys-apps/systemd )
+	uuid? ( sys-apps/util-linux:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
+		-e 's|^LIBJSONC =|LIBJSONC ?=|' \
+		-e 's|^LIBHUGETLBFS =|LIBHUGETLBFS ?=|' \
+		-e 's|^HAVE_SYSTEMD =|HAVE_SYSTEMD ?=|' \
+		-e '/DESTDIROLD/d' \
+		-i Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+
+	export PREFIX="${EPREFIX}/usr"
+
+	local unitdir="$(systemd_get_systemunitdir)"
+	export SYSTEMDDIR="${unitdir%/system}"
+	export UDEVDIR="${EPREFIX}$(get_udevdir)"
+
+	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
+	MAKEOPTS+=" LIBJSONC=$(usex json 0 1)"
+	MAKEOPTS+=" LIBHUGETLBFS=$(usex hugepages 0 1)"
+	MAKEOPTS+=" HAVE_SYSTEMD=$(usex systemd 0 1)"
+	MAKEOPTS+="  V=1"
+}