From d46d1d3a5897cade51811b3848c7bf27969da625 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Dec 2023 07:37:55 +0000 Subject: gentoo auto-resync : 28:12:2023 - 07:37:55 --- sys-apps/nvme-cli/Manifest | 11 ----- sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch | 13 ------ .../nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch | 25 ---------- .../nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch | 25 ---------- sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild | 48 ------------------- sys-apps/nvme-cli/nvme-cli-2.3.ebuild | 50 -------------------- sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild | 51 -------------------- sys-apps/nvme-cli/nvme-cli-2.5.ebuild | 54 ---------------------- 8 files changed, 277 deletions(-) delete mode 100644 sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch delete mode 100644 sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch delete mode 100644 sys-apps/nvme-cli/files/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch delete mode 100644 sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild delete mode 100644 sys-apps/nvme-cli/nvme-cli-2.3.ebuild delete mode 100644 sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild delete mode 100644 sys-apps/nvme-cli/nvme-cli-2.5.ebuild (limited to 'sys-apps/nvme-cli') diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest index c19a738f8716..7fdde12119e6 100644 --- a/sys-apps/nvme-cli/Manifest +++ b/sys-apps/nvme-cli/Manifest @@ -1,18 +1,7 @@ -AUX nvme-cli-2.2-docdir.patch 552 BLAKE2B 9edb2b884ff26a227c90f13ad9e7a110c284bca27c72fe06346587aa799d7c32c0820a49b565a3c2e77dd5b5a024ad346b2f6c71bee32d10bcdc9329abe81d79 SHA512 c865d1374ebe321b5a1c36f8d0b71965521d19e5f6ab50e0977776768f8cc4a104eb7ca5ad2a07a94865d60b2fbd6618fa1744058c66e3dc65d42bed6105e10d -AUX nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch 1273 BLAKE2B bcf9dccfcda5bad06bfc5ffa06dcc489b944f88749d039b80f92d3374186a74162cdc945db2c36213569db633e09ce7e9cf632129db9dc651946603de0c3de07 SHA512 06200151f3177b944c66b36433e5c5538ae5ee451019ef06730d5c6b2a4ca56cd379789ebb8b10db97f36362aab17e11e88238028f1feef3485d4297cd3f70c8 -AUX nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch 1228 BLAKE2B 3d0bf5421456d28a296ae6a4934bed8b095c9593fbf89e46fd6d5680adc3784ac4ac057cf5af2fc0439ba049ebc546a6ba50217dce64d36c687626d8286ad8c7 SHA512 5be0ef69eecad65c50aafeabca0a664d7a4a7c5b671563194763608ba600aad4ef865f46799272899d6aea59cb07f745b182bff6961832c2bdd439e24f4cbb1b AUX nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch 934 BLAKE2B cc05c3a726764feac62caa30441916002e7b539bf8f28123e5eb743225aa052c6e39c4d54f66f868307230c77fbb70ba01e836d2d64277232f27368758bf7086 SHA512 45a05f1d1a576deb35abbbfb713fec0c634ff2ca4ca3f50a6f7b76b3546e5b726b48b3e8f57499cae6accb589d1e14ae4a502be5cc0bfa8bd5ace0dc95cedf56 -DIST nvme-cli-2.2.1.gh.tar.gz 706199 BLAKE2B e0026fc2ee3edeffa18b0fc8365703e3de6f69cdd665878e8589fefa334ddb78f3fdf2768bd5a141dc27b0a7403d0fd7472db763e7e41b55a3cac314105faac3 SHA512 8efa94d49a4d443cdb0310386733e88117f17719b05044f11e63e2a09143fce55918171b457a467371263ebb2e36552558aad249ae4dbd27941af79fe9722e26 -DIST nvme-cli-2.3.gh.tar.gz 733161 BLAKE2B b6da650379f24e0dc5c41af3d09fe15076ed70ad39cf48060fd949e3a4bbfe896eef4dd42e27314fab695710c9cb04985f3444e0384b71794cfbf489aa3e6244 SHA512 9ef654e782ba737d3858fb11f24caf27aea820480179d07d32599731be204e52693062cdb86786ab5cdd1d94fe32ae9028baa0a58693d2eaee5a2b71155e3db2 -DIST nvme-cli-2.4.gh.tar.gz 746955 BLAKE2B 7ca26f957bf6927f7af17ac18267cb1099d63ce0f19b085a412b3a1b343946311edf8c5d5924444b7c7d440fbf42597ee7b9717bf9f5dcdeed0a9a17f135d343 SHA512 155667a0b91e15267e3f991a30cf1d4ae26cb4c53b20c002e3d3341496dd463397e1afbfefcd7a8df88370d28417940ce44a060bda87c04482bbe3be4e901b73 -DIST nvme-cli-2.5.gh.tar.gz 794528 BLAKE2B 4e569c612d98a369d9ef720b74fbd50e6bd0b425725593bac2c06966d693cb0c86e034d571d24b17c12bce39467973280d440c1fb5cc3dccdb6c0d112507feab SHA512 50c557e86e95b27a0ad57779c33bbb847e12dd45c30e792f5ce1d52dedd4bc704ac25fa0af2fdebd281c9dfe0059f7ed7c1620fccfde9323f6f9a97afdf8c3cb DIST nvme-cli-2.6.gh.tar.gz 837964 BLAKE2B cd8b0442d58d94d6c402e252e98d81da209fbbd34d3d9eb8d570caedb7e56107d8cb4f9bd774b72eea688fc00678fc24c5f3f8cf46875e6dedadccca3c8e6f68 SHA512 da4daef2d7c554455e0c195c03f92188e0e946409a3bd8a5b421d9a106746e82fb1309901d2893639b1a3447bda094c80a9f49f59bf43cf2b00402f82beea3fc DIST nvme-cli-2.7.1.gh.tar.gz 902081 BLAKE2B 7d14838f7f0fd6d1ab1cb30041f862fe2db6f40fe72c13cb4ce227831cac6e141ff5cec2924c846f30629188754b0ce0630ad9009d2a490c193da20e8b8a45d1 SHA512 6a9f3574dfd4375e6f7a76ed95f698efb26da5b72a490579caeba9d46c4811ae31650844e0a0e1047dc627158d5ffbdc020112a5059d3195e7eadff902b70b19 DIST nvme-cli-2.7.gh.tar.gz 902149 BLAKE2B 4e9d63f002480f60b76b4c7ca5dfefe0f5c8a1acf37eaeab91d4f0844aa43448b0a79cd906d33a09d6546c0ce5ed17f7a7a104d4f607e0a99c4ebd5b4125b0a3 SHA512 fcdd6598b004287b90b9fdea2948434f288113a9e41b36c2f44731ac51b7acbda9481bf60d0a183b4a8d79b06a1faaf71bd66f47e641d8eb229f1c05c281b2ae -EBUILD nvme-cli-2.2.1.ebuild 973 BLAKE2B 0fce7c3f1c44b4ac5028132030db755dd99ab26ca30d5bbd30d7252ade6714c761d49b492d3ee3ff3baf41939ce52e17d7ea6091e4ad92cdde1def4977b6024f SHA512 86f0841abd19ec017b6c2c516333a25983997318309f3622a49e097427ae8934e607b194d81b08d6fbef1f0aa19c960d9bf63394adefb7f7e34f1a4f13a085ef -EBUILD nvme-cli-2.3.ebuild 1034 BLAKE2B 01fa9617bc068f6e62050fb9fde0a9507c2a8d56b9dcb1d5e7cae08ccb6a4b512073c13af62294f8ea608bb97b69580db94050e928a48baa642242795632a1ea SHA512 f9565ff9486a7825f82964212fe3fbb51255adca76bd42ca2efc5508ea78f6c78ffe78d6ed68cc3d7c189e08a518cf00eef2b024f9e4a2c6b11075c5fdf80ceb -EBUILD nvme-cli-2.4-r2.ebuild 1084 BLAKE2B 89640b22d3c3e3faa4e6ae7bcebe8fabb572674a5979bd28d07b34d19db9e2ea236493c08185bdb972b69611451a82396001a4df77b9b702d3024fcbc7870523 SHA512 d7d374fd46caec4db8a34dad302fc312aa55682bcda346f3fe8fbfa29eb45b685ee4318976458616afa33fd58d1eb18807be2b06df294672ad64ffa4e224aced -EBUILD nvme-cli-2.5.ebuild 1069 BLAKE2B 3a51fdd815ff2cc05a8a4c3ae93a10d61d863ca75447772279c5ee8b9724f5f47bf9339b4bafa3c4cc0179c1b242cad22f682943bc2a4a23cbcb552cd18ddf07 SHA512 d60eab3cdbb3287b5454baff6094ac2bbd355f30795d7d1dcb43c03c4b4df80f474c8207eb020f652974d22bcbd2f6d9135292bd04873f77e0ed0618973f93cb EBUILD nvme-cli-2.6.ebuild 1076 BLAKE2B 8afb19860fb5346647a07d2c17baa01de27fc2339e0ab6d465be56cbc21f833de4a8207fb0fdfd94bc672d38fc0d4f52324a5c70458aceeb00449482153e0492 SHA512 296ce2ff62c42d8754135b8172e0eafcc6b9577471109c6716f545793729eae13f2f584294072901c0a1cccab9b96b91e27d39b2aab9035bc4d471bf95fd3ca9 EBUILD nvme-cli-2.7.1.ebuild 930 BLAKE2B 09198ca98c7680b660977b901b3296bac80cc9192e95ada9130a8c82ee730e75800cf999a46f78472514e07822f3b2315a4765e857141c948c19a06d28b63dcf SHA512 752ba37a612ab64bedf939f7fd0ea3612e0ea40da9420df3d9c34f33bf1d6ac10aadabcd3d34f6b6315505fa9cdadc10af1c2336f79c1d89ccddd2346a0e9011 EBUILD nvme-cli-2.7.ebuild 930 BLAKE2B 09198ca98c7680b660977b901b3296bac80cc9192e95ada9130a8c82ee730e75800cf999a46f78472514e07822f3b2315a4765e857141c948c19a06d28b63dcf SHA512 752ba37a612ab64bedf939f7fd0ea3612e0ea40da9420df3d9c34f33bf1d6ac10aadabcd3d34f6b6315505fa9cdadc10af1c2336f79c1d89ccddd2346a0e9011 diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch b/sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch deleted file mode 100644 index 92a1c51b11f7..000000000000 --- a/sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Documentation/meson.build b/Documentation/meson.build -index bb0c9724..519c4bfc 100644 ---- a/Documentation/meson.build -+++ b/Documentation/meson.build -@@ -187,7 +187,7 @@ want_docs = get_option('docs') - want_docs_build = get_option('docs-build') - if want_docs != 'false' - mandir = join_paths(get_option('mandir'), 'man1') -- htmldir = join_paths(get_option('htmldir'), 'nvme') -+ htmldir = get_option('htmldir') - - asciidoctor = find_program('asciidoc', required: get_option('docs-build')) - if want_docs_build and asciidoctor.found() diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch b/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch deleted file mode 100644 index e8bba22a92bb..000000000000 --- a/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/meson.build b/meson.build -index c05dc47f..4ae7c513 100644 ---- a/meson.build -+++ b/meson.build -@@ -64,9 +64,9 @@ libz_dep = dependency('zlib', required: true, - fallback : ['zlib', 'zlib_dep']) - - # Check for libhugetlbfs availability (optional) --if cc.has_header('hugetlbfs.h') -+if get_option('hugepages') and cc.has_header('hugetlbfs.h') - libhugetlbfs_dep = cc.find_library('hugetlbfs', -- required : false) -+ required : true) - have_libhugetlbfs = libhugetlbfs_dep.found() - else - libhugetlbfs_dep = [] -diff --git a/meson_options.txt b/meson_options.txt -index 04843ea5..bb10b6c0 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -9,3 +9,4 @@ option('nvme-tests', type : 'boolean', value : false, description: 'Run tests ag - option('docs', type : 'combo', choices : ['false', 'html', 'man', 'all'], description : 'install documentation') - option('docs-build', type : 'boolean', value : false, description : 'build documentation') - option('pdc-enabled', type: 'boolean', value : false, description : 'set default Persistent Discovery Controllers behavior') -+option('hugepages', type: 'boolean', value : false, description : 'Enable support for hugetlbfs') diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch b/sys-apps/nvme-cli/files/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch deleted file mode 100644 index d39f95826aae..000000000000 --- a/sys-apps/nvme-cli/files/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/meson.build b/meson.build -index 24fa16e2..fc3ef0d7 100644 ---- a/meson.build -+++ b/meson.build -@@ -66,9 +66,9 @@ endif - conf.set('CONFIG_JSONC', json_c_dep.found(), description: 'Is json-c available?') - - # Check for libhugetlbfs availability (optional) --if cc.has_header('hugetlbfs.h') -+if get_option('hugepages') and cc.has_header('hugetlbfs.h') - libhugetlbfs_dep = cc.find_library('hugetlbfs', -- required : false) -+ required : true) - have_libhugetlbfs = libhugetlbfs_dep.found() - else - libhugetlbfs_dep = [] -diff --git a/meson_options.txt b/meson_options.txt -index 677942ae..752ecd40 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -10,3 +10,4 @@ option('docs', type : 'combo', choices : ['false', 'html', 'man', 'all'], descri - option('docs-build', type : 'boolean', value : false, description : 'build documentation') - option('pdc-enabled', type: 'boolean', value : false, description : 'set default Persistent Discovery Controllers behavior') - option('json-c', type: 'feature', value: 'auto', description: 'JSON suppport') -+option('hugepages', type: 'boolean', value : false, description : 'Enable support for hugetlbfs') diff --git a/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild deleted file mode 100644 index 2c1223bc049e..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 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}.gh.tar.gz" - -LICENSE="GPL-2 GPL-2+" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86" -IUSE="hugepages +json" - -RDEPEND=" - >=sys-libs/libnvme-1.2:=[json(+)=] - hugepages? ( sys-libs/libhugetlbfs:= ) - json? ( dev-libs/json-c:= ) - sys-libs/zlib:= -" - -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/nvme-cli-2.2-docdir.patch" -) - -src_configure() { - local unitdir="$(systemd_get_systemunitdir)" - local emesonargs=( - -Ddocs=all - -Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html" - -Dsystemddir="${unitdir%/system}" - -Dudevrulesdir="${EPREFIX}$(get_udevdir)" - ) - meson_src_configure -} - -src_install() { - meson_src_install -} diff --git a/sys-apps/nvme-cli/nvme-cli-2.3.ebuild b/sys-apps/nvme-cli/nvme-cli-2.3.ebuild deleted file mode 100644 index 64f31939dda6..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2023 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}.gh.tar.gz" - -LICENSE="GPL-2 GPL-2+" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~x86" -IUSE="hugepages" - -RDEPEND=" - >=sys-libs/libnvme-1.3:= - hugepages? ( sys-libs/libhugetlbfs:= ) - dev-libs/json-c:= - sys-libs/zlib:= -" - -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/nvme-cli-2.2-docdir.patch" - "${FILESDIR}/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch" -) - -src_configure() { - local unitdir="$(systemd_get_systemunitdir)" - local emesonargs=( - -Ddocs=all - -Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html" - -Dsystemddir="${unitdir%/system}" - -Dudevrulesdir="${EPREFIX}$(get_udevdir)" - $(meson_use hugepages) - ) - meson_src_configure -} - -src_install() { - meson_src_install -} diff --git a/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild b/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild deleted file mode 100644 index f873d899c06d..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2023 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}.gh.tar.gz" - -LICENSE="GPL-2 GPL-2+" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86" -IUSE="hugepages +json" - -RDEPEND=" - =sys-libs/libnvme-1.4*:=[json?] - hugepages? ( sys-libs/libhugetlbfs:= ) - json? ( dev-libs/json-c:= ) - sys-libs/zlib:= -" - -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/nvme-cli-2.2-docdir.patch" - "${FILESDIR}/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch" -) - -src_configure() { - local emesonargs=( - -Dversion-tag="${PV}" - -Ddocs=all - -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" - -Dsystemddir="$(systemd_get_systemunitdir)" - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - $(meson_use hugepages) - $(meson_feature json json-c) - ) - meson_src_configure -} - -src_install() { - meson_src_install -} diff --git a/sys-apps/nvme-cli/nvme-cli-2.5.ebuild b/sys-apps/nvme-cli/nvme-cli-2.5.ebuild deleted file mode 100644 index de6c59e4cfa3..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 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}.gh.tar.gz" - -LICENSE="GPL-2 GPL-2+" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86" -IUSE="hugepages +json" - -RDEPEND=" - =sys-libs/libnvme-1.5*:=[json?] - hugepages? ( sys-libs/libhugetlbfs:= ) - json? ( dev-libs/json-c:= ) - sys-libs/zlib:= -" - -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch" -) - -src_configure() { - local emesonargs=( - -Dversion-tag="${PV}" - -Ddocs=all - -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" - -Dsystemddir="$(systemd_get_systemunitdir)" - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - $(meson_use hugepages) - $(meson_feature json json-c) - ) - meson_src_configure -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} -- cgit v1.2.3