gentoo auto-resync : 06:02:2024 - 05:42:43

6 files changed, 1 insertions, 138 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9c5fdd2a2ced..57321f65222e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index a1436256efec..117f3b93c6e8 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,8 +1,3 @@
-AUX nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch 934 BLAKE2B cc05c3a726764feac62caa30441916002e7b539bf8f28123e5eb743225aa052c6e39c4d54f66f868307230c77fbb70ba01e836d2d64277232f27368758bf7086 SHA512 45a05f1d1a576deb35abbbfb713fec0c634ff2ca4ca3f50a6f7b76b3546e5b726b48b3e8f57499cae6accb589d1e14ae4a502be5cc0bfa8bd5ace0dc95cedf56
-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.6.ebuild 1076 BLAKE2B 8afb19860fb5346647a07d2c17baa01de27fc2339e0ab6d465be56cbc21f833de4a8207fb0fdfd94bc672d38fc0d4f52324a5c70458aceeb00449482153e0492 SHA512 296ce2ff62c42d8754135b8172e0eafcc6b9577471109c6716f545793729eae13f2f584294072901c0a1cccab9b96b91e27d39b2aab9035bc4d471bf95fd3ca9
 EBUILD nvme-cli-2.7.1.ebuild 926 BLAKE2B ffdaa6599c97b85a07f8e08e51c06d74157bfeff083c034bb93c023406689216e715537bfb8a47b289982a5ec1d83a5f273c4a903bed38207dfc43514a34c7da SHA512 48f4e66972e0594775f735e0dcc6900e009361ec03f06200e288922262f4a63e57e98cddc7bff820172f7fc9b02015dead97ec10f2479934be5dc4b61594b726
-EBUILD nvme-cli-2.7.ebuild 930 BLAKE2B 09198ca98c7680b660977b901b3296bac80cc9192e95ada9130a8c82ee730e75800cf999a46f78472514e07822f3b2315a4765e857141c948c19a06d28b63dcf SHA512 752ba37a612ab64bedf939f7fd0ea3612e0ea40da9420df3d9c34f33bf1d6ac10aadabcd3d34f6b6315505fa9cdadc10af1c2336f79c1d89ccddd2346a0e9011
-MISC metadata.xml 542 BLAKE2B ec93d6395b76ed201e05ec98e5813f025e74e8afa849084b664faa6c9dc03a8f8237cdb2fec5675db7cc70575b8c07383470d4f3d36b595980bcffdac83d2708 SHA512 ba2ed3173808235a4567152d23836f9828c345e8e716781ee5b7c1aeaa0053ff36ffd85ac12686302af10b1bd02a61e061446e4e1cb2600ce00da3bb1d72b6ee
+MISC metadata.xml 435 BLAKE2B 6756d3cbc2fa183946f5cb5fe2e6cc3e19ffef2a63f6c5ba6cf203bbcc6eb0df68d615b8ad266dc89ce23cd06a5d843bddeae8eaf574bf45ad1c06442f50c9c5 SHA512 2b05f8e31378564378339755d80da4244524c8f261fc0fda47a1350bf5a6309b5cca68c74bad06566d6f2bf9e1cc1747b7ce2ebf783c46a9015d27fdcff44b7d
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 @@
 	</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>
 	</use>
 </pkgmetadata>
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
-}