gentoo resync : 16.04.2022

4 files changed, 15 insertions, 9 deletions

diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index cb30104a48bb..d51bf3423c28 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,6 +1,7 @@
 AUX fio-2.2.13-libmtd.patch 238 BLAKE2B da7843b4cb2b0fda12c2e950d4b51df661f229eb01b16b5a9d2a5d5e59b15f6c25d9865e607be8e1a86329964e2eb116ce0d1855dd1a80c156650db1ad5a3690 SHA512 66c905a79a78baaea0864d4fbf2432edfb2d98f2262ad638431d591154b1f8214dbc2ae6fed9cddd3cb4684932c830cc7402dc0a4c6b429dd955bb1a1f929f1a
 AUX fio-3.27-drop-raw.patch 3315 BLAKE2B 93cfc730e2feceae2cc20c76b93a4e1da2a6b0c8a3b3ba3231208d0074612a9a4e5836108aedb9dff03db61977c354a2fe1b2bf35c4e975b6e302a0357b78852 SHA512 67589a42e65be3821aac5043b910d589f735abb98d8b107ca9fc020d9c10b4c20f82b2e3dc9622d1f8b8ead5b69cc459470136c2d942a5690c7fdefebf57ecee
 DIST fio-3.27.tar.bz2 960330 BLAKE2B 7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170 SHA512 9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99
-EBUILD fio-3.27-r2.ebuild 4210 BLAKE2B 7b5896286280e68beafd273f6bace83356c81712e9665cb19be9ebcdc77b233a6dbf7efaa75d3a976a9bb48584022ad692f66756b5a1629dcd8188fca351a844 SHA512 b5cc6aaa16eb8f261c4ea34cc9ea7ae59669624d529d107e2fd7e9c5984997ab2ebd250d2930d53fa85e3ae765ba8cc96e22d2c246acfcf6344e8af0c57a6e87
-EBUILD fio-3.27-r3.ebuild 4311 BLAKE2B dfc72284cd9c88b680b7c5d946e21ce90450e72ad5f80597abdffffee6eeeeb9e0aa386e314aec56f8c2764280a8e039587f1eedac736145ec9e753a7bc8ce2f SHA512 93ce6fcbc75df4caadf20ec6208ffb6ed80a99b79f87a1d788c4c7a5d494bc546f9a79b87cec977369ef44113aeb1d8f8f817a0289d429c6fd2da1f6e429ed62
-MISC metadata.xml 1174 BLAKE2B ea2b1e11b071672b885227bec7f7335edf0614a3d08705a813c2c1de9e5b98eeaf9a01c26fe9e09d2a4d16f34bb00af0114c48c7b46b2a8c7624e811a89298e6 SHA512 f48fbd4cb4ebe8dbcd45e2961e5aaf0c680553c0d25bd5b376a3135df9ab4e495f36349820163362e3fe2c3a6631535896ce64b86904eb6c24be120ce2241865
+DIST fio-3.30.tar.bz2 6001772 BLAKE2B a4941cd415e6444bb9871274580efdf82281a1e52dc3caaa235f63176e3564fb1dc08e1e4586c555f9c25975d7e6220fe53209ed7218da713b9cb9135de0fc05 SHA512 1fb2ae9c28028147edabceff734fc41bf07ce504af98afdb0951920b724b15d647f2b0852262c177279ad6b4dbbf24be458db7f939d1c80069e0f8e7bc8aa10d
+EBUILD fio-3.27-r3.ebuild 4318 BLAKE2B 0c5e47fe1cb9a9471233f057dceff0dcff8c6bf4826bee3756f2faa5273e36b8fcddf5525779a91f93492127a260dada548cc32992db0709bf10de8827830a15 SHA512 70b244f998c7d4aa0f0b55db5028f855cdeceb9e09467991a08e1e86d94c4f9b1916c44a9c0414b0b4486c719fa5f1b97097e35c0f88251aa7071a63483d5eb5
+EBUILD fio-3.30.ebuild 4404 BLAKE2B 136b43fd9c559c4b3cd3612e92a905f6cf885153c5904938e35ccb836d546c586bb557a05074366a6e6621ab7b65bfafb5df2f8bdf8cbd087914848236ac539f SHA512 c90ae9e5e8ca0214a4fd3a3cf426bdc6b42060078b748b7d4cb04b14dd41d427166d0769e6d5037748f6340b579d489e97fc3b8a963d23c61796f930d45e8639
+MISC metadata.xml 1219 BLAKE2B 854ede8de3dbf6320886a8ca1e8a54f6d3dd4fe080aab6a49032cfbd0eb99503a00f8719225deea1ebebd0da22eb64fb10dad77daab961fdabd9e6ff5100b122 SHA512 b59158d6ead3b96a8e5818685fc6b9ad3b5172d94c07a0c32f1ed688d8e70caded5a2446108aa8f5923a6de953c52363401e3fb08837c39f4f3d7afaca2c4135
diff --git a/sys-block/fio/fio-3.27-r3.ebuild b/sys-block/fio/fio-3.27-r3.ebuild
index 55eb95c00e10..7e2e9e4198ab 100644
--- a/sys-block/fio/fio-3.27-r3.ebuild
+++ b/sys-block/fio/fio-3.27-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ppc64 ~riscv x86"
 IUSE="aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	gnuplot? ( python )
diff --git a/sys-block/fio/fio-3.27-r2.ebuild b/sys-block/fio/fio-3.30.ebuild
index 95b48167827b..0eb2039eda6c 100644
--- a/sys-block/fio/fio-3.27-r2.ebuild
+++ b/sys-block/fio/fio-3.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-r1 toolchain-funcs
 
@@ -16,8 +16,8 @@ SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ppc64 x86"
-IUSE="aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="aio curl glusterfs gnuplot gtk io-uring nfs numa python rbd rdma static tcmalloc test zbc zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	gnuplot? ( python )
 	io-uring? ( aio )"
@@ -31,6 +31,7 @@ LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
 		net-misc/curl:=[static-libs(+)]
 		dev-libs/openssl:0=[static-libs(+)]
 	)
+	nfs? ( net-fs/libnfs:=[static-libs(+)] )
 	glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
 	gtk? ( dev-libs/glib:2[static-libs(+)] )
 	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
@@ -83,12 +84,15 @@ src_configure() {
 	# TODO: cuda
 	# TODO: libnbd - not packaged in Gentoo
 	# TODO: pmem - not packaged in Gentoo
+	# libnfs option does not work as expected:
+	# $(usex nfs '' '--disable-libnfs') \
 	set -- \
 	./configure \
 		--disable-optimizations \
 		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
 		--cc="$(tc-getCC)" \
 		--disable-pmem \
+		$(usex nfs '' '--disable-nfs') \
 		$(usex curl '' '--disable-http') \
 		$(usex glusterfs '' '--disable-gfapi') \
 		$(usex gtk '--enable-gfio' '') \
@@ -97,7 +101,7 @@ src_configure() {
 		$(usex rdma '' '--disable-rdma') \
 		$(usex static '--build-static' '') \
 		$(usex tcmalloc '' '--disable-tcmalloc')
-	echo "$@"
+	echo "$@" |tr ' ' '\n'
 	"$@" || die 'configure failed'
 }
 
@@ -144,7 +148,7 @@ src_install() {
 	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
 	rm "${ED}"/usr/bin/genfio || die
 
-	dodoc README REPORTING-BUGS HOWTO
+	dodoc README.rst REPORTING-BUGS HOWTO.rst
 	docinto examples
 	dodoc examples/*
 }
diff --git a/sys-block/fio/metadata.xml b/sys-block/fio/metadata.xml
index 83445573eea0..35aae97a4d18 100644
--- a/sys-block/fio/metadata.xml
+++ b/sys-block/fio/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="glusterfs">Enable GlusterFS gfapi support via <pkg>sys-cluster/glusterfs</pkg></flag>
 		<flag name="gnuplot">Install tools for generating gnuplots</flag>
 		<flag name="io-uring">Enable efficient I/O via <pkg>sys-libs/liburing</pkg>.</flag>
+		<flag name="nfs">Enable NFS support</flag>
 		<flag name="numa">Enable numa support</flag>
 		<flag name="rbd">Enable Rados block device support via <pkg>sys-cluster/ceph</pkg></flag>
 		<flag name="rdma">Enable infiniband support via <pkg>sys-cluster/rdma-core</pkg></flag>