gentoo resync : 27.10.2021

5 files changed, 26 insertions, 87 deletions

diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 1effd145d1dc..04b6631ff424 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,9 +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.9.tar.gz 440675 BLAKE2B 19d9f4982e6bf4d37bbced02aadd0f58e496901c1463c96596b289e23c4e5849bfed9a4129447588c9c8104d5b49fd0bf97ee6495907bf022487407f02d7c4ae SHA512 3565b33bc39bde4480bbde5d46d75ea6907c0921884e8f39029b746f8383d3630942e405c61bcc3654bac5646bc86479b4b790e1b823ec83650649621bab6dac
-EBUILD nvme-cli-1.10.1.ebuild 977 BLAKE2B e971e0666096f3508d8db3d899e592f630edd1c56a84675d49c4d9df897d86317bf481d885ce211cc081692b53bf1bf76cd806e041956ffbbe9bb901d2179e9b SHA512 0c5327273daa6fd181ac3b04ba197d47c5ba0e43182a84e37cc3f6133313dcd6b6d781e0d00761f23fcda9e627f0928b84282cfc5c4ddcfd4d3f7c68fff9648b
-EBUILD nvme-cli-1.11.1.ebuild 841 BLAKE2B d9b6316b4d9a1c5d9d11e77ef45562dff8277d71f8f1180f71ed0bfaea8335d6b9b009e712c84ad91ac8eccfc3eda7d9aa5a7fa46c2705bd00e999b85167ced8 SHA512 3b00b5d217da4325fc1627b695968de0c0c621208cb0a95c06dd04a1c1ca991bbc2fb8971b16da309b8ae8e5c19a8b1b3aae572fd1149238451fa6afbf4818b8
+DIST nvme-cli-1.15.tar.gz 610927 BLAKE2B 66278904d49987d92083c1bb28a98d362adee8e85ee92e44e9dee381f3efcc76ac53ddf82957495ac7b2ef82e717c570d55e1b2052224740c1bc7e5af8af137e SHA512 0614105153edf7217d4c428927423628b63f6bee034c59926370a13d433c9c3af217338fb6fe2f8bbf781fc17ebae0102e8c072371b7ea4324c18dfdffd40305
 EBUILD nvme-cli-1.14.ebuild 844 BLAKE2B b88134580f9f4fb22ffd24bd2e8aca6f7778bc7c68af526e1002963cabe9766f39c69513eac46a7e3426e755e4ba2e1dee651b45ca1ffdd6ae2362d5d5e3a91e SHA512 aa1fecc32da2ac0e456cd73f516e7760a45ccd91fa9b9d4f4fb080e93024c69b5476621a1cbe8d9fcb26292eca6ab79f0c5cd0c35122e2dd70a1f5304c520d26
-EBUILD nvme-cli-1.9-r3.ebuild 976 BLAKE2B b500757c242990e42c523da5d69675c0ee15fc5528923c6bd03d11b513cd3518986e866ac5a0e1503b55ffaa5748ebbef14ade322c731efcd6901ca1a55e084e SHA512 5868e20533d4b7c6c51bacc88c8ccf5a2ce37717e6e05ceb5a26de17192f548f72ede949002af9d86b03da91a45533809f188267925faae68e4b70afc9954d61
-MISC metadata.xml 370 BLAKE2B 641edbf48f889300280c21cfb14645b553d816bb284111e30b9c7cbe4cf0a7db4ace828ce609bf2e339213c3235cee9de734bfc6ef94cabcbda1efc6f0b21d46 SHA512 747d33cebca3654a110732cdd9f90ae6cf72f77445a6aa6853ccc5057d7d1602748ee5cedc012a175d5f3aa752a85fb45b3d54951a776ff12e7aa5757bae731e
+EBUILD nvme-cli-1.15-r1.ebuild 1283 BLAKE2B f90189f1d7d34d340dc3e9f4ca7a1fa611d32ed0913d43e4d74707b159889b3bda123352454bb051541e1168d9eeb9746607bafaf0894566df4c9c4d8036edeb SHA512 506471a6dfc87c346c9a1bd46c19415f795e0a4b11dd8cc8ff59254929d7a59477d254fbeebea5badf53eb8c72cfda2ac85bdbc4dac4d0ede15f5d619d78b4c2
+MISC metadata.xml 594 BLAKE2B 52ac0579fd52797d0c9b2ec0528b134f67ef927987f9b99cf72d1010f13088af42d5eddb761b53939b196bc96ef4b8589b1bfc02242c95a56bf6a6a40afbad91 SHA512 d971b4fd68f8574b4e93377e9c4eef1f5901e81099ae97003ccfafbbd1657db92ce8a975cae38e6516cc4652b54259013c0c5e3ba53e80d717e42dab71440464
diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml
index cba4ebd62aff..0ed1b1c4a09c 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.10.1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.10.1.ebuild
deleted file mode 100644
index e02310e80337..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-1.10.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~x86"
-IUSE="+uuid"
-
-RDEPEND="uuid? ( sys-apps/util-linux:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
-		-e 's|^install-hostparams:$|\0 install-etc|' \
-		-i Makefile || die
-	sed -e "s|/usr/lib/udev|$(get_udevdir)|" \
-		-i nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf || 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)"
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-1.11.1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.15-r1.ebuild
index b0a6d9edd317..0debd0e006e6 100644
--- a/sys-apps/nvme-cli/nvme-cli-1.11.1.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-1.15-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd toolchain-funcs udev
 
@@ -12,24 +12,39 @@ RESTRICT="test"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+uuid"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="hugepages +json systemd +uuid"
 
-RDEPEND="uuid? ( sys-apps/util-linux:= )"
+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"
 }
diff --git a/sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild b/sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild
deleted file mode 100644
index c9ca69fcdc95..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~x86"
-IUSE="+uuid"
-
-RDEPEND="uuid? ( sys-apps/util-linux:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
-		-e 's|^install-hostparams:$|\0 install-etc|' \
-		-i Makefile || die
-	sed -e "s|/usr/lib/udev|$(get_udevdir)|" \
-		-i nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf || 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)"
-}