From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A07615815E for ; Tue, 6 Feb 2024 03:05:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7ED23E2A7A; Tue, 6 Feb 2024 03:05:13 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 21475E2A7A for ; Tue, 6 Feb 2024 03:05:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31C5D340940 for ; Tue, 6 Feb 2024 03:05:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C1B5A14AB for ; Tue, 6 Feb 2024 03:05:10 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1707188543.8d83c2b790640a42929cc92b0cc24675e182b21c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nvme-cli/, sys-apps/nvme-cli/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/nvme-cli/Manifest sys-apps/nvme-cli/files/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch sys-apps/nvme-cli/metadata.xml sys-apps/nvme-cli/nvme-cli-2.6.ebuild sys-apps/nvme-cli/nvme-cli-2.7.ebuild X-VCS-Directories: sys-apps/nvme-cli/ sys-apps/nvme-cli/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8d83c2b790640a42929cc92b0cc24675e182b21c X-VCS-Branch: master Date: Tue, 6 Feb 2024 03:05:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5e77b8f3-c720-40e3-821e-c296d8dc5342 X-Archives-Hash: c0aeb47747b032f243133eb3b7b66f81 commit: 8d83c2b790640a42929cc92b0cc24675e182b21c Author: Sam James gentoo org> AuthorDate: Tue Feb 6 03:02:14 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Feb 6 03:02:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d83c2b7 sys-apps/nvme-cli: drop 2.6, 2.7 Signed-off-by: Sam James gentoo.org> sys-apps/nvme-cli/Manifest | 2 - .../nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch | 30 ------------ sys-apps/nvme-cli/metadata.xml | 1 - sys-apps/nvme-cli/nvme-cli-2.6.ebuild | 54 ---------------------- sys-apps/nvme-cli/nvme-cli-2.7.ebuild | 47 ------------------- 5 files changed, 134 deletions(-) diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest index 84abb1e70a6e..4b98f80e744c 100644 --- a/sys-apps/nvme-cli/Manifest +++ b/sys-apps/nvme-cli/Manifest @@ -1,3 +1 @@ -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 diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch b/sys-apps/nvme-cli/files/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch deleted file mode 100644 index df32c2c13332..000000000000 --- a/sys-apps/nvme-cli/files/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/meson.build b/meson.build -index af79bd4d..90c4d6ad 100644 ---- a/meson.build -+++ b/meson.build -@@ -69,9 +69,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) - else - libhugetlbfs_dep = dependency('', required: false) - endif -diff --git a/meson_options.txt b/meson_options.txt -index c61dae0f..a05a7e0f 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -70,3 +70,9 @@ option( - type : 'string', - description : 'override the git version string' - ) -+option( -+ 'hugepages', -+ type: 'boolean', -+ value : false, -+ description : 'Enable support for hugetlbfs' -+) diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml index 37ce8bf89548..727194bfa429 100644 --- a/sys-apps/nvme-cli/metadata.xml +++ b/sys-apps/nvme-cli/metadata.xml @@ -10,6 +10,5 @@ Support JSON output via dev-libs/json-c - Use huge pages for memory allocations via sys-libs/libhugetlbfs diff --git a/sys-apps/nvme-cli/nvme-cli-2.6.ebuild b/sys-apps/nvme-cli/nvme-cli-2.6.ebuild deleted file mode 100644 index b5740f1e6b1f..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.6.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 ~sparc x86" -IUSE="hugepages +json" - -RDEPEND=" - >=sys-libs/libnvme-1.6:=[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 -} diff --git a/sys-apps/nvme-cli/nvme-cli-2.7.ebuild b/sys-apps/nvme-cli/nvme-cli-2.7.ebuild deleted file mode 100644 index 0ee6bdafbc3b..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.7.ebuild +++ /dev/null @@ -1,47 +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 ~sparc ~x86" -IUSE="+json" - -RDEPEND=" - >=sys-libs/libnvme-1.7:=[json?] - json? ( dev-libs/json-c:= ) - sys-libs/zlib:= -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - virtual/pkgconfig -" - -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_feature json json-c) - ) - meson_src_configure -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -}