gentoo auto-resync : 31:10:2022 - 21:05:59

7 files changed, 72 insertions, 2 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c1bb2b98c5f5..940d3008f3ef 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 4e74ef106862..5b3acb69b77d 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,14 +1,17 @@
 AUX nvme-cli-1.16-bash-completions.patch 2223 BLAKE2B 072ce4f65ab4177a1a2f4aece0103c00a596503b7a8100cbc545750d6f7b63c12f014101f2441e0bb58a0364b6215e9fdf02bebb5191ba2e26121e896f2c2d95 SHA512 ff18cded88a78fd07f6a11f06635699a76c0efa6cfce217f7d02581a8fd60e7e2c1b248efec45fd28a962b4cff6534404d466252659a9e77e609174d07b0c2e8
 AUX nvme-cli-1.16-musl-limits.patch 1148 BLAKE2B ee1206a23ee11d6badaed70a98cd2ea405d3ad144def7d00e44a49b2f2579fc61efbaa3325856e426be097e52b02e4b18c4122ab74c1f20d58ced1c1748419c0 SHA512 e7c8c387446360eb2ed816006fe7d9a7f6a1b9c81dd6d3171f909ae760236243278a4b42be727b39381f95c9b50dce09f816400a280da929da8453b6c9851004
 AUX nvme-cli-2.0-bash-completions.patch 1803 BLAKE2B fd201e60a66b1fbc61f13c002465b002b60de94acf0c604af359064e2d4d2f3ed1c02d8f2f48b7af8812405a4990fe23b20fff39b28a69770d21174af5ff9741 SHA512 6baef0aff380fe8b0f0b21ba450e81703c6a3c88959c635d9425f010ffe0845d5b47c02e63df0b190899238dc911c108eda793f7823e4dba2a793782e2aa47d6
+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.gh.tar.gz 706243 BLAKE2B ad06296484b9a1a8e53a904cb5f28f93a25c2882186ddcc2fca1f7762af0f7bedc1775d094d566fca3917419018d87c41b7a78378758a9e0b65c161a8188517e SHA512 a3f572bb1bbd4ba56eb3a4c1e1aa95c4ed5e7bc1d5adb80125fe54a894c470838cad5457a0420692deb39f4302cefc4fc1eab92c08c134faabe03a654b9542f4
 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
-MISC metadata.xml 594 BLAKE2B 52ac0579fd52797d0c9b2ec0528b134f67ef927987f9b99cf72d1010f13088af42d5eddb761b53939b196bc96ef4b8589b1bfc02242c95a56bf6a6a40afbad91 SHA512 d971b4fd68f8574b4e93377e9c4eef1f5901e81099ae97003ccfafbbd1657db92ce8a975cae38e6516cc4652b54259013c0c5e3ba53e80d717e42dab71440464
+EBUILD nvme-cli-2.2.ebuild 990 BLAKE2B e79027f1f083e407610917dcb4ccfd7e3210de495aedf369532362b3e2be9749e524c38887a95c606b75595869b45a30d4a744566086c4c161c3af6704bbd7a4 SHA512 fc941272c3ae454cfa89f624b16b4a9e94e4c1fd4f38d9eff952c6e8a8638695dd1c39409f86390c41812e6c1ddccff6ba7cc31b1211523b71e4dd2e40fc9a74
+MISC metadata.xml 710 BLAKE2B c0e034a1cd0f8f4dd116ec716ec8f05dde352dfacde82df494c640a761d80a09683b305aa0e66819f15c363a7d50116cc1d1d216f96792b5ed190804d50cfd5a SHA512 07d939ea3961b3e4e6ebd22a596904c1b09c1afb1e3dd69c167814c58de37132f0d5eabd007d301ee9abc82048ea8b5af1bb2ac068944ff6425f035e7d79bb49
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
new file mode 100644
index 000000000000..92a1c51b11f7
--- /dev/null
+++ b/sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch
@@ -0,0 +1,13 @@
+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/metadata.xml b/sys-apps/nvme-cli/metadata.xml
index 0ed1b1c4a09c..ccf53ab56617 100644
--- a/sys-apps/nvme-cli/metadata.xml
+++ b/sys-apps/nvme-cli/metadata.xml
@@ -4,6 +4,10 @@
   <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>
diff --git a/sys-apps/nvme-cli/nvme-cli-2.2.ebuild b/sys-apps/nvme-cli/nvme-cli-2.2.ebuild
new file mode 100644
index 000000000000..e306a3a8eb3b
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-2.2.ebuild
@@ -0,0 +1,49 @@
+# 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}.gh.tar.gz"
+RESTRICT="test"
+
+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/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 8a1456c9a8c3..3234dbcfb171 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -11,5 +11,5 @@ DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc
 EBUILD systemd-utils-251.4-r2.ebuild 12095 BLAKE2B 21014fadfa7a5ea04e2cabde58ff7a5c404c28feb224680309c49f3f056b2b0af92688d245f17f42896e71bd1e59879ed070c691dfadaaa29e90580a3a216038 SHA512 f3bb8010c6162fc601b95eebc297ae8f3f5256bd6a20c70423aec1c90854744c773f63affe3f610c3b28ab795f5579cfb45ec57f70cb5eb6121c4347a7f45e95
 EBUILD systemd-utils-251.5.ebuild 12004 BLAKE2B 813622adb081673984af0142e4fcec51259441bcc31d2cd2985cd93c31ab6790a82081469525b6e3a05e9fe17f9cc581f717903aefa267aeb5167edebf714521 SHA512 3cfc14f2d5d0570dc6be9d4ad1ad9ebcc17c59970e5840a02a84bda6d80f35b33facddd46554a1857ecc38fc6e69875681e292d57a2dc32205e4e2f88a377c54
 EBUILD systemd-utils-251.6.ebuild 12053 BLAKE2B 885efc6eacdee2839c1098a7a450eee58b7cd28eb4c1c09c58cf090c9ba6c6c9a887ffee96cde1131a8f5d3ac701bb02c0ed47581d7a4da75189237774a1c729 SHA512 c25c6088674b560130e7b113e376077c44e5eb622ab62e5c8211dd7c9d84efd97df82fd94d169bbbbf46f180203d042dad8d39b34773b33fb5294ad92ef934f9
-EBUILD systemd-utils-251.7.ebuild 12053 BLAKE2B 885efc6eacdee2839c1098a7a450eee58b7cd28eb4c1c09c58cf090c9ba6c6c9a887ffee96cde1131a8f5d3ac701bb02c0ed47581d7a4da75189237774a1c729 SHA512 c25c6088674b560130e7b113e376077c44e5eb622ab62e5c8211dd7c9d84efd97df82fd94d169bbbbf46f180203d042dad8d39b34773b33fb5294ad92ef934f9
+EBUILD systemd-utils-251.7.ebuild 12077 BLAKE2B cde11f108438a6f010fb7a9dc47391e09fd033018ecb16850307583dadc511526724af81d4d5fd9900be6ef5af8ca2168c77405a84ccc94deecaad7a0d5bb054 SHA512 d37dcf2472fa594add1e1bec03567e6eceaf442febc27352df22f9c83c045a24c8fbe9426980bf98d0f02a716621da8c3db3182c37b605592948d40d93cf23de
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
index a59e868762b9..46a55e226ca4 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild
@@ -175,6 +175,7 @@ multilib_src_configure() {
 		-Daudit=false
 		-Dbacklight=false
 		-Dbinfmt=false
+		-Dbpf-framework=false
 		-Dbzip2=false
 		-Dcoredump=false
 		-Ddbus=false