gentoo resync : 25.11.2020

3 files changed, 2 insertions, 159 deletions

diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 81946f178a16..0d563dd9ca2c 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -12,7 +12,6 @@ EBUILD fio-3.16.ebuild 3536 BLAKE2B 2103340435d0bab73419f187554e6d1d466f6cd9b9cb
 EBUILD fio-3.17-r1.ebuild 3944 BLAKE2B 332569e86cb7542fe3003acd4eecc2fceb34d987db50f7bb1c3343231fdd2cb8b7f5cfef993f328a8ea34d440a32b78bf38a60f2524ad761931ec511189fb67d SHA512 fec9f05a86081b670fa5f995f3fd3a4afe084ad9f09d92a6d5d4cbd3b5a168580f5208da64da6a8a186347bf64c8f4029dee7e0d9047e15454d644a5a889c317
 EBUILD fio-3.17.ebuild 3548 BLAKE2B 4a13146b9ade206190d95a4daa235e4c2c15d040335e5eee8a9fd55a50e643c27b9abc2f42095e96291b3e70b69f38a0048effc9899937926f50e52ebf77f408 SHA512 fb04e3eda7ba0f4f3f5ffc905c502ed1a0a3618d131fce539f17a6cd3d2b1f5aa2c33645504eb18c292d86d22462f84f149712baba862df4e8b5c9aafdb74fe1
 EBUILD fio-3.19.ebuild 3894 BLAKE2B 558a90a4f245837ee0044529d2e09d381c5675410239abd2f21a5376299d51626a09494d50b5e09194ce2bb0759686b4ce47994ed9f394a65e8e7bfcf86f42b9 SHA512 8f2d3c714e4a53691353e51ddf0b50da0d5e614f5af0c126b724d3264e99823124b54c4602e12e499f4e8e752e0df5eade5b2fcc921680dded6e664387cc8d9e
-EBUILD fio-3.20-r1.ebuild 4432 BLAKE2B 307c850c639c5395e3b972feffb16ca1cf329453f17f6845062e7b2390e62774ae92db7171e816c59cdd3976da41fb92af2104ce60b00681dbe960ed41398ae6 SHA512 ed4185e3a998fc03dcf773b1b06200cdcfcbd901fd35fac09adaee9023e762d89750277d10e35f99c9d289555466754c745a89d89d33853d4c98bcd3eff7f623
-EBUILD fio-3.20.ebuild 4391 BLAKE2B b9689e5ee54353db6d0e60afb69da68a06c70fd7f5af41efcc11887c20a6bd53fb2d2e38b23719bec79d155e696e07bcc399013e85b619c6403f7e33a343dd77 SHA512 a574abda812f38276aca681fdaaa38fb043ad5dc111ae62086db844e659794ac7ce14995356d339e4861d7e50f7f2db7bc2bb8c47bba17c1f7f93767d0f6f8d6
+EBUILD fio-3.20-r2.ebuild 4434 BLAKE2B eb2c49c2cdce8d9613defb2ceb4bf6855bdd8ec260bb9b8ae5fed498ff1a25eee3980b198b22a032c019c72293680516959bfce0af74111eb3420ded19387628 SHA512 a491f050fc082329cb760b76f3182916e8c6fd7a33d3e6646f87abdfb072cdc41cdb5b3fb5e3db0155dfcbf019c188f69ac56df8d45906adf70235f46392d212
 EBUILD fio-3.7.ebuild 2996 BLAKE2B 66bbc26691006fe8d796009b2260ee768a251e462280d5c0fb7871a96bd67fd9955a02624ecee60ec34fec2218cb89ae5c782ee87dd237f6f9d5d77698dec482 SHA512 7cc3d4a80c9f608da5d5c8da831f1acd46e0fcb8ac90808f24cc876203e831317b19d4778d951db0e1bfacf73d96acc4c1526095967d198263bbb0f89c73bf46
 MISC metadata.xml 1172 BLAKE2B e35bbaaa15c8cd095791a4a23a7344314a015ea42bb864b11bb165d340585ee667f969426282465b834a7d092ab6885736e55ec8d4fe950001fbb6336fdfdc14 SHA512 defbc7f932a5ab83b67da58a601ef62784b27f2268f8a8dd5057c02fb441b164bd0945217fa52a0e06803c74b5168dda3b4668de52f593d5cade428bd2f79e86
diff --git a/sys-block/fio/fio-3.20-r1.ebuild b/sys-block/fio/fio-3.20-r2.ebuild
index 445de828e1e3..36b088a60fb9 100644
--- a/sys-block/fio/fio-3.20-r1.ebuild
+++ b/sys-block/fio/fio-3.20-r2.ebuild
@@ -35,7 +35,7 @@ LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
 	)
 	glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
 	gtk? ( dev-libs/glib:2[static-libs(+)] )
-	io-uring? ( sys-libs/liburing[static-libs(+)] )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	rbd? ( sys-cluster/ceph[static-libs(+)] )
 	rdma? (
diff --git a/sys-block/fio/fio-3.20.ebuild b/sys-block/fio/fio-3.20.ebuild
deleted file mode 100644
index 6e66a7abbe20..000000000000
--- a/sys-block/fio/fio-3.20.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="https://brick.kernel.dk/snaps/"
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio curl glusterfs gnuplot gtk libressl io-uring numa python rbd rdma static tcmalloc test zbc zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	libressl? ( curl )
-	gnuplot? ( python )
-	io-uring? ( aio )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
-	curl? (
-		net-misc/curl:=[static-libs(+)]
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
-	gtk? ( dev-libs/glib:2[static-libs(+)] )
-	io-uring? ( sys-libs/liburing[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	rdma? (
-		sys-fabric/libibverbs[static-libs(+)]
-		sys-fabric/librdmacm[static-libs(+)]
-	)
-	tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
-	zbc? ( >=sys-block/libzbc-5 )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( dev-util/cunit )"
-RDEPEND+="
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
-	)
-	gnuplot? ( sci-visualization/gnuplot )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/fio-2.2.13-libmtd.patch
-)
-
-python_check_deps() {
-	has_version "dev-python/pandas[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-
-	# Many checks don't have configure flags.
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e '/if compile_prog "" "-lzbc" "libzbc" *; *then/  '"s::if $(usex zbc true false) ; then:" \
-		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
-		-e '/if compile_prog "" "-laio" "libaio" *; *then/'"s::if $(usex aio true false) ; then:" \
-		-e '/if compile_prog "" "-lcunit" "CUnit" *; *then/'"s::if $(usex test true false) ; then:" \
-		configure || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	# TODO: cuda
-	# TODO: libnbd - not packaged in Gentoo
-	# TODO: pmem - not packaged in Gentoo
-	set -- \
-	./configure \
-		--disable-optimizations \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		--disable-pmem \
-		$(usex curl '' '--disable-http') \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex io-uring '--enable-libaio-uring' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		$(usex rdma '' '--disable-rdma') \
-		$(usex static '--build-static' '') \
-		$(usex tcmalloc '' '--disable-tcmalloc')
-	echo "$@"
-	"$@" || die 'configure failed'
-}
-
-src_compile() {
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
-	local python2_7_files=(
-		"${ED}"/usr/bin/fiologparser_hist.py
-		"${ED}"/usr/bin/fiologparser.py
-	)
-	local python_files=(
-		"${python2_7_files[@]}"
-		"${ED}"/usr/bin/fio_jsonplus_clat2csv
-	)
-	if use python ; then
-		sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die
-		python_replicate_script "${python2_7_files[@]}"
-	else
-		rm "${python_files[@]}" || die
-	fi
-
-	local gnuplot_python2_7_files=(
-		"${ED}"/usr/bin/fio2gnuplot
-	)
-	local gnuplot_files=(
-		"${gnuplot_python2_7_files[@]}"
-		"${ED}"/usr/bin/fio_generate_plots
-		"${ED}"/usr/share/man/man1/fio_generate_plots.1
-		"${ED}"/usr/share/man/man1/fio2gnuplot.1
-		"${ED}"/usr/share/fio/*.gpm
-	)
-	if use gnuplot ; then
-		sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die
-		python_replicate_script "${gnuplot_python2_7_files[@]}"
-	else
-		rm "${gnuplot_files[@]}" || die
-		rmdir "${ED}"/usr/share/fio/ || die
-	fi
-
-	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
-	rm "${ED}"/usr/bin/genfio || die
-
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}