From adb727afeb568404873e8cbc91ba93d3d49eff13 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Dec 2022 14:07:48 +0000 Subject: gentoo auto-resync : 26:12:2022 - 14:07:48 --- sys-apps/nvme-cli/Manifest | 11 +--- .../files/nvme-cli-1.16-bash-completions.patch | 72 ---------------------- .../nvme-cli/files/nvme-cli-1.16-musl-limits.patch | 37 ----------- .../files/nvme-cli-2.0-bash-completions.patch | 61 ------------------ sys-apps/nvme-cli/metadata.xml | 1 - sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild | 55 ----------------- sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild | 38 ------------ sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild | 34 ---------- 8 files changed, 1 insertion(+), 308 deletions(-) delete mode 100644 sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch delete mode 100644 sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch delete mode 100644 sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch delete mode 100644 sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild delete mode 100644 sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild delete mode 100644 sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild (limited to 'sys-apps/nvme-cli') diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest index c8537442640a..df6db244e57a 100644 --- a/sys-apps/nvme-cli/Manifest +++ b/sys-apps/nvme-cli/Manifest @@ -1,13 +1,4 @@ -AUX nvme-cli-1.16-bash-completions.patch 2223 BLAKE2B 072ce4f65ab4177a1a2f4aece0103c00a596503b7a8100cbc545750d6f7b63c12f014101f2441e0bb58a0364b6215e9fdf02bebb5191ba2e26121e896f2c2d95 SHA512 ff18cded88a78fd07f6a11f06635699a76c0efa6cfce217f7d02581a8fd60e7e2c1b248efec45fd28a962b4cff6534404d466252659a9e77e609174d07b0c2e8 -AUX nvme-cli-1.16-musl-limits.patch 1148 BLAKE2B ee1206a23ee11d6badaed70a98cd2ea405d3ad144def7d00e44a49b2f2579fc61efbaa3325856e426be097e52b02e4b18c4122ab74c1f20d58ced1c1748419c0 SHA512 e7c8c387446360eb2ed816006fe7d9a7f6a1b9c81dd6d3171f909ae760236243278a4b42be727b39381f95c9b50dce09f816400a280da929da8453b6c9851004 -AUX nvme-cli-2.0-bash-completions.patch 1803 BLAKE2B fd201e60a66b1fbc61f13c002465b002b60de94acf0c604af359064e2d4d2f3ed1c02d8f2f48b7af8812405a4990fe23b20fff39b28a69770d21174af5ff9741 SHA512 6baef0aff380fe8b0f0b21ba450e81703c6a3c88959c635d9425f010ffe0845d5b47c02e63df0b190899238dc911c108eda793f7823e4dba2a793782e2aa47d6 AUX nvme-cli-2.2-docdir.patch 552 BLAKE2B 9edb2b884ff26a227c90f13ad9e7a110c284bca27c72fe06346587aa799d7c32c0820a49b565a3c2e77dd5b5a024ad346b2f6c71bee32d10bcdc9329abe81d79 SHA512 c865d1374ebe321b5a1c36f8d0b71965521d19e5f6ab50e0977776768f8cc4a104eb7ca5ad2a07a94865d60b2fbd6618fa1744058c66e3dc65d42bed6105e10d -DIST nvme-cli-1.16.tar.gz 598246 BLAKE2B 8aef6ae82ec9a2c67de6c69addd72c87ade6554e6d374c717f8e3c0585565974a2b2870eb172b3ebdc1ae307bd3a55a14a17d3feea8d437265db136b434b519f SHA512 c713eb15b979ad17791cf95717b42d5f638cb4803d646bca1f4825e6bb50f086226b44b108b61571709b2cb615ae6ba86dbad309f675b240ebd3968d1cf536ff -DIST nvme-cli-2.0.tar.gz 646320 BLAKE2B 81a8161091071be4e98d4feb78b3f3edaed07262212a8950c1882e3b46f38cd82d8cd8bfec62b3971feda6e82d297338e5541c8eda33c8b6f714d3b3ce000c25 SHA512 24a00ee8e0fc963c1757797413ff5725cec18f821a714d6bbbf37906010d72934d6fdd7b466c085f13716a5279d1a7bd3254ee474e37a0ecd00a85ef23e12417 -DIST nvme-cli-2.1.2.tar.gz 674414 BLAKE2B e71e32a371c2cebfd7f66539490baa8e8074c5bd21afa2470e73c763c752318ca5abc1fe1a4d3f346137dcdbb604889a23955269f209222384a629e8d6817d6a SHA512 2162a6967a221a4ae7e0261748c26a10ff43d5b592039e29578d8310cf176428d528c2d510c0b58419b70bd6d28f4d2c77f0cd27606d87079c64289d5d14f930 DIST nvme-cli-2.2.1.gh.tar.gz 706199 BLAKE2B e0026fc2ee3edeffa18b0fc8365703e3de6f69cdd665878e8589fefa334ddb78f3fdf2768bd5a141dc27b0a7403d0fd7472db763e7e41b55a3cac314105faac3 SHA512 8efa94d49a4d443cdb0310386733e88117f17719b05044f11e63e2a09143fce55918171b457a467371263ebb2e36552558aad249ae4dbd27941af79fe9722e26 -EBUILD nvme-cli-1.16-r1.ebuild 1394 BLAKE2B bd2e45a72c07efd6e48b5872f43353817550ac4e7c4c31efc9b1b6f4e5736ac4298b2505c9d55537ecf701933bb470368a44df0587fa0a59d51a562f56273148 SHA512 63d4ef1730a6cb1fee4a331a8df795637935fc00d994f09a1d9d060d18726081ea7a2098c33187a23c4b81cec0742967fcb7ae9e1b9a107579f09a4d6ac765aa -EBUILD nvme-cli-2.0-r1.ebuild 916 BLAKE2B 562795a3d62c792d35042187d614813605e900a7614fdbe67261541a0470671af215a12db322a6c80ddf062366239a7281bae2ba7080e717c7e3fe85de648911 SHA512 403efef199a73a7e7fc3b86612b8c2d1c5b2a5dfe9d1816651f0146fc1fe0322805e33e9ecda6db7f5ca9de4b608b853dd7d383f1cfa6a464925a4d9a4cec137 -EBUILD nvme-cli-2.1.2.ebuild 854 BLAKE2B 93f1b657ff20ab781248a048d8ae71aefc51c86e5ab555171d2b72082ce543d4623c5e8a64c346aedb49413a2905a741b1987703aeaf7ada6619fda0422dc71c SHA512 18d9b36f1a9e1c91ecee2cba888a7ecb62864261130ddcbe0c03a80bddd8f9294fe77f5b20316a4df821baee7971b88f166628f1f93f9a949cbc78ac0a5a3b4e EBUILD nvme-cli-2.2.1.ebuild 970 BLAKE2B 36064a54b8dd5a531dac77d0e251a3fb50ea877b7096b4d8514920780942f23cc5d8bb0cde95f47c482dda5eaf37bd259f4b5592e7178edf26e996a6ee8c9651 SHA512 23dd1a0a6a23e1d8f75b82ef1f88f6f03524983954f46ec29c510f7584de6fa493ee1e9c4db5ac4c0443264d56a6ae679f9e0023fd23118172c2fa1de254c779 -MISC metadata.xml 617 BLAKE2B 1d1de414ebd3b5c03b3ae800dd4ba17ac1f7139142c5ab77c8e1e5bc3d2a936f20f5c874733e697128f2adebb27cb6b6f2ad136e76e56d712fe353f909bdc672 SHA512 96ae457f166961fc274dd11ac655d39d549a26366a1d6e0e0a59d9efee1ca2fe5cd168d458fa12f3ac27e646b160f2c90154372478f387f3ace09f2ff0a61840 +MISC metadata.xml 542 BLAKE2B ec93d6395b76ed201e05ec98e5813f025e74e8afa849084b664faa6c9dc03a8f8237cdb2fec5675db7cc70575b8c07383470d4f3d36b595980bcffdac83d2708 SHA512 ba2ed3173808235a4567152d23836f9828c345e8e716781ee5b7c1aeaa0053ff36ffd85ac12686302af10b1bd02a61e061446e4e1cb2600ce00da3bb1d72b6ee diff --git a/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch b/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch deleted file mode 100644 index 27a80eda9955..000000000000 --- a/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch +++ /dev/null @@ -1,72 +0,0 @@ -This fixes several issues: -* the upstream rebase error (unclosed double quote) -* typo "lugin_seagate_opts" -* "readonly" with assignment is problematic on Bash 5.1.x - -Gentoo bug: https://bugs.gentoo.org/852764 -Upstream: https://github.com/linux-nvme/nvme-cli/pull/1574 -Upstream: https://github.com/linux-nvme/nvme-cli/commit/25fd8c707b106ca0763402566ad657ef710bf09e - -Author: Karlson2k (Evgeny Grin) -Signed-off-by: Karlson2k (Evgeny Grin) - -diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh -index 41938d77..31afb3b3 100644 ---- a/completions/bash-nvme-completion.sh -+++ b/completions/bash-nvme-completion.sh -@@ -3,12 +3,13 @@ - # Kelly Kaoudis kelly.n.kaoudis at intel.com, Aug. 2015 - - # Constant to indicate command has no options --readonly NO_OPTS="" -+NO_OPTS="" -+readonly NO_OPTS - - # Associative array of plugins and associated subcommands - # Order here is same as PLUGIN_OBJS in Makefile - typeset -A _plugin_subcmds --readonly _plugin_subcmds=( -+_plugin_subcmds=( - [intel]="id-ctrl internal-log lat-stats \ - set-bucket-thresholds lat-stats-tracking \ - market-name smart-log-add temp-stats" -@@ -55,10 +56,11 @@ readonly _plugin_subcmds=( - [nvidia]="id-ctrl" - [ymtc]="smart-log-add" - ) -+readonly _plugin_subcmds - - # Associative array mapping plugins to coresponding option completions - typeset -A _plugin_funcs --readonly _plugin_funcs=( -+_plugin_funcs=( - [intel]="plugin_intel_opts" - [amzn]="plugin_amzn_opts" - [lnvm]="plugin_lnvm_opts" -@@ -77,6 +79,7 @@ readonly _plugin_funcs=( - [nvidia]="plugin_nvidia_opts" - [ymtc]="plugin_ymtc_opts" - ) -+readonly _plugin_funcs - - # Top level commands - _cmds="list list-subsys id-ctrl id-ns \ -@@ -101,8 +104,7 @@ _cmds="list list-subsys id-ctrl id-ns \ - connect disconnect disconnect-all gen-hostnqn \ - show-hostnqn dir-receive dir-send virt-mgmt \ - rpmb boot-part-log fid-support-effects-log \ -- supported-log-pages lockdown" -- supported-log-pages list-endgrp" -+ supported-log-pages lockdown list-endgrp" - - # Add plugins: - for plugin in "${!_plugin_subcmds[@]}"; do -@@ -983,7 +985,7 @@ plugin_micron_opts () { - return 0 - } - --lugin_seagate_opts () { -+plugin_seagate_opts () { - local opts="" - local compargs="" - diff --git a/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch b/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch deleted file mode 100644 index 27c9667c827c..000000000000 --- a/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/linux-nvme/nvme-cli/commit/4729b13f36d4713ce1162dc1d4425d44e1474078.patch -https://bugs.gentoo.org/829705 -(and an additional hunk for https://bugs.gentoo.org/830744) - -From: Ariadne Conill -Date: Mon, 26 Apr 2021 00:41:20 -0600 -Subject: [PATCH] nvme-rpmb: Add limits.h due to missing PATH_MAX definition - -Commit 21f40f38b introduced new use of PATH_MAX, but did not add the -limits.h header. This resulted in nvme-cli failing to build on -ppc64le systems using the musl C library. - -Signed-off-by: Ariadne Conill -[dwagner: removed nvme-topology.c bits] -Signed-off-by: Daniel Wagner ---- a/nvme-rpmb.c -+++ b/nvme-rpmb.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #include "nvme.h" - #include "libnvme.h" -diff --git a/nvme-topology.c b/nvme-topology.c -index 0a22f6b..6d510f2 100644 ---- a/nvme-topology.c -+++ b/nvme-topology.c -@@ -1,6 +1,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch b/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch deleted file mode 100644 index 3ddad04a5518..000000000000 --- a/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch +++ /dev/null @@ -1,61 +0,0 @@ -This fixes several issues: -* typo "lugin_seagate_opts" -* "readonly" with assignment resulting in error on Bash 5.x - -Gentoo bug: https://bugs.gentoo.org/852764 -Upstream: https://github.com/linux-nvme/nvme-cli/pull/1574 -Upstream: https://github.com/linux-nvme/nvme-cli/commit/25fd8c707b106ca0763402566ad657ef710bf09e - -Author: Karlson2k (Evgeny Grin) -Signed-off-by: Karlson2k (Evgeny Grin) - -diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh -index 5e0eb23b..469ba3e2 100644 ---- a/completions/bash-nvme-completion.sh -+++ b/completions/bash-nvme-completion.sh -@@ -3,12 +3,13 @@ - # Kelly Kaoudis kelly.n.kaoudis at intel.com, Aug. 2015 - - # Constant to indicate command has no options --readonly NO_OPTS="" -+NO_OPTS="" -+readonly NO_OPTS - - # Associative array of plugins and associated subcommands - # Order here is same as PLUGIN_OBJS in Makefile - typeset -A _plugin_subcmds --readonly _plugin_subcmds=( -+_plugin_subcmds=( - [intel]="id-ctrl internal-log lat-stats \ - set-bucket-thresholds lat-stats-tracking \ - market-name smart-log-add temp-stats" -@@ -53,10 +54,11 @@ readonly _plugin_subcmds=( - [nvidia]="id-ctrl" - [ymtc]="smart-log-add" - ) -+readonly _plugin_subcmds - - # Associative array mapping plugins to coresponding option completions - typeset -A _plugin_funcs --readonly _plugin_funcs=( -+_plugin_funcs=( - [intel]="plugin_intel_opts" - [amzn]="plugin_amzn_opts" - [memblaze]="plugin_memblaze_opts" -@@ -74,6 +76,7 @@ readonly _plugin_funcs=( - [nvidia]="plugin_nvidia_opts" - [ymtc]="plugin_ymtc_opts" - ) -+readonly _plugin_funcs - - # Top level commands - _cmds="list list-subsys id-ctrl id-ns \ -@@ -939,7 +942,7 @@ plugin_micron_opts () { - return 0 - } - --lugin_seagate_opts () { -+plugin_seagate_opts () { - local opts="" - local compargs="" - diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml index f9624e33a203..37ce8bf89548 100644 --- a/sys-apps/nvme-cli/metadata.xml +++ b/sys-apps/nvme-cli/metadata.xml @@ -11,6 +11,5 @@ Support JSON output via dev-libs/json-c Use huge pages for memory allocations via sys-libs/libhugetlbfs - UUID support via sys-apps/util-linux diff --git a/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild deleted file mode 100644 index d1507396d8fd..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 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" - -PATCHES=( - "${FILESDIR}"/${P}-musl-limits.patch - "${FILESDIR}"/${P}-bash-completions.patch # Gentoo bug #852764 -) - -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-2.0-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild deleted file mode 100644 index 3bce0f7121ce..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson systemd 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 ~loong ~ppc64 ~riscv ~x86" -IUSE="hugepages +json +uuid" - -RDEPEND=" - sys-libs/libnvme:=[json=,uuid=] - hugepages? ( sys-libs/libhugetlbfs:= ) - json? ( dev-libs/json-c:= ) - uuid? ( sys-apps/util-linux:= )" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-bash-completions.patch # Gentoo bug #852764 -) - -src_configure() { - local unitdir="$(systemd_get_systemunitdir)" - local emesonargs=( - -Dsystemddir=${unitdir%/system} - -Dudevrulesdir="${EPREFIX}"$(get_udevdir) - ) - meson_src_configure -} diff --git a/sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild b/sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild deleted file mode 100644 index ef7cb9b54e90..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson systemd 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 GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="hugepages +json +uuid" - -RDEPEND=" - >=sys-libs/libnvme-1.1:=[json=,uuid=] - hugepages? ( sys-libs/libhugetlbfs:= ) - json? ( dev-libs/json-c:= ) - uuid? ( sys-apps/util-linux:= )" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_configure() { - local unitdir="$(systemd_get_systemunitdir)" - local emesonargs=( - -Dsystemddir="${unitdir%/system}" - -Dudevrulesdir="${EPREFIX}$(get_udevdir)" - ) - meson_src_configure -} -- cgit v1.2.3