commit: 4bc38d60b5996c0d8eeb7e2ccfccb5b4281ef988 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Mon Nov 14 22:15:16 2022 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Mon Nov 14 22:15:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc38d60
sys-apps/nvme-cli: drop 1.16, 2.0, 2.1.1 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> sys-apps/nvme-cli/Manifest | 1 - sys-apps/nvme-cli/metadata.xml | 27 ++++++++--------- sys-apps/nvme-cli/nvme-cli-1.16.ebuild | 54 --------------------------------- sys-apps/nvme-cli/nvme-cli-2.0.ebuild | 34 --------------------- sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild | 34 --------------------- 5 files changed, 12 insertions(+), 138 deletions(-) diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest index c727acc4e18a..47bc3591ad5f 100644 --- a/sys-apps/nvme-cli/Manifest +++ b/sys-apps/nvme-cli/Manifest @@ -1,5 +1,4 @@ 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.1.tar.gz 674354 BLAKE2B 2cb995195328a9c91644ff32676eb3a6d9f1927a004ed75d2be0a746f45050b8ae927924a1095a787ea10618bd600133237852f56116c1db25c4eaa03ea9dab5 SHA512 61a8e7c0ae8da082ac0cda2fdf61ffe8d83ed5d4ee31640bde89fde929ba3fe6d788950bd232630af2c7fc5f3563f05f47f350e005c8556691e5aede73c88d74 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 diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml index ccf53ab56617..f9624e33a203 100644 --- a/sys-apps/nvme-cli/metadata.xml +++ b/sys-apps/nvme-cli/metadata.xml @@ -1,19 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - </maintainer> - <maintainer type="person"> - <name>Patrick McLean</name> - <email>[email protected]</email> - </maintainer> - <upstream> - <remote-id type="github">linux-nvme/nvme-cli</remote-id> - </upstream> - <use> - <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> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo Base System</name> + </maintainer> + <upstream> + <remote-id type="github">linux-nvme/nvme-cli</remote-id> + </upstream> + <use> + <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.16.ebuild b/sys-apps/nvme-cli/nvme-cli-1.16.ebuild deleted file mode 100644 index 57126d5159de..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-1.16.ebuild +++ /dev/null @@ -1,54 +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 -) - -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.ebuild b/sys-apps/nvme-cli/nvme-cli-2.0.ebuild deleted file mode 100644 index 33135e2e14ea..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.0.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" -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" - -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.1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild deleted file mode 100644 index 78d30a7452f5..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.1.1.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" -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 -}
