gentoo auto-resync : 15:11:2022 - 00:51:37

5 files changed, 13 insertions, 142 deletions

diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 31d6a1458905..3cf80e128d81 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -4,14 +4,10 @@ AUX nvme-cli-2.0-bash-completions.patch 1803 BLAKE2B fd201e60a66b1fbc61f13c00246
 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.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
 EBUILD nvme-cli-1.16-r1.ebuild 1394 BLAKE2B bd2e45a72c07efd6e48b5872f43353817550ac4e7c4c31efc9b1b6f4e5736ac4298b2505c9d55537ecf701933bb470368a44df0587fa0a59d51a562f56273148 SHA512 63d4ef1730a6cb1fee4a331a8df795637935fc00d994f09a1d9d060d18726081ea7a2098c33187a23c4b81cec0742967fcb7ae9e1b9a107579f09a4d6ac765aa
-EBUILD nvme-cli-1.16.ebuild 1330 BLAKE2B dca5bcee7da2e65799bed14ba6eec3484b19d025061f1068d343891f2e76aa2c000c017b03bc977be76f51d9b0d38180ba7e44e6d7ce27eeed338a2b1741ba07 SHA512 44c68fa403731bd0d8f54f361e6d7b84cbb7f9222f7070ef174354c29e0314fa1007f0c1caba48e30afb607e5a6c56f355eb2d02b80079f62a8c2defc073b55f
 EBUILD nvme-cli-2.0-r1.ebuild 916 BLAKE2B 562795a3d62c792d35042187d614813605e900a7614fdbe67261541a0470671af215a12db322a6c80ddf062366239a7281bae2ba7080e717c7e3fe85de648911 SHA512 403efef199a73a7e7fc3b86612b8c2d1c5b2a5dfe9d1816651f0146fc1fe0322805e33e9ecda6db7f5ca9de4b608b853dd7d383f1cfa6a464925a4d9a4cec137
-EBUILD nvme-cli-2.0.ebuild 839 BLAKE2B 92d5d8df41fa282553ac4e0d652d047c90c327281a76282222f50cfd7b60d6b384fb3335102102d6a9873029fe54b5cb9a0848c26943dd63206b48c6cabca34f SHA512 6a84afa8302af8382e1d9c7e6b361fc4d1c287994c497a3706e34676de08bdad58f48d597087522942c7831edbc7e0213a9f4af54f59e8dff996fdd00d2332c9
-EBUILD nvme-cli-2.1.1.ebuild 845 BLAKE2B d8f1ec5ef3a4902d631f410f94b79fe2662f99b5193074cb4efef918c1f68691ef7bceabd8774e7e72239d22bf5ca4f77abacbd9a7a9aaf0fbd15207e13d9289 SHA512 577ce12620c001d90b77bcc4785a78471e4f3964369b2be36a782fc74a5885555a6d5bae8d64836a669b2054fdc87830680e985c515fc769558f8730b9c4be83
 EBUILD nvme-cli-2.1.2.ebuild 854 BLAKE2B 93f1b657ff20ab781248a048d8ae71aefc51c86e5ab555171d2b72082ce543d4623c5e8a64c346aedb49413a2905a741b1987703aeaf7ada6619fda0422dc71c SHA512 18d9b36f1a9e1c91ecee2cba888a7ecb62864261130ddcbe0c03a80bddd8f9294fe77f5b20316a4df821baee7971b88f166628f1f93f9a949cbc78ac0a5a3b4e
 EBUILD nvme-cli-2.2.1.ebuild 974 BLAKE2B 005f0d1a21c220f7ee5899494121bacc32ce5e60862e14ac1a187cbd174a4e89979da24d81c992456f6f85256567c939c9719e4f5452f156af4f979186a27c8f SHA512 7da8ed81c8842e6f96ee142accac31aaab9431979eb746dab55d28cfdccf8323d2c30eaa48f4dc7058e856752078efe59d7251999a40d711eee93c236d668215
-MISC metadata.xml 710 BLAKE2B c0e034a1cd0f8f4dd116ec716ec8f05dde352dfacde82df494c640a761d80a09683b305aa0e66819f15c363a7d50116cc1d1d216f96792b5ed190804d50cfd5a SHA512 07d939ea3961b3e4e6ebd22a596904c1b09c1afb1e3dd69c167814c58de37132f0d5eabd007d301ee9abc82048ea8b5af1bb2ac068944ff6425f035e7d79bb49
+MISC metadata.xml 617 BLAKE2B 1d1de414ebd3b5c03b3ae800dd4ba17ac1f7139142c5ab77c8e1e5bc3d2a936f20f5c874733e697128f2adebb27cb6b6f2ad136e76e56d712fe353f909bdc672 SHA512 96ae457f166961fc274dd11ac655d39d549a26366a1d6e0e0a59d9efee1ca2fe5cd168d458fa12f3ac27e646b160f2c90154372478f387f3ace09f2ff0a61840
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>zmedico@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <name>Patrick McLean</name>
-    <email>chutzpah@gentoo.org</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>base-system@gentoo.org</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
-}