gentoo (valentine's day) resync : 14.02.2021

3 files changed, 2 insertions, 150 deletions

diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 61917c45822a..f5dadc20e08a 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,7 +1,5 @@
 AUX fio-2.2.13-libmtd.patch 398 BLAKE2B b1519ed240879f1260e3f5859c9cada3f41161457b7e06e5e764ac3a6656c3a6439fb5f0380cf90bbd6f2133f25e80419e108d725ea4672adfdd976bee94846f SHA512 18792d4ea3dbc2664d9e24541a07d82a50cd60bb7ff2d14bcdadd2207341c003ad2d298d99d65fd72c88813073b17d03a710a50db4df52ee72d49d9e9bcfe400
 AUX fio-3.20-fno-common.patch 1220 BLAKE2B dcfaac74241111cae75ebf956f34258ce883b6abb360b51eaa6bf80c91770d0d4307818e7daf63dc284c3b21a0869d54523d9b4c5cb4733fac898d05c17c8933 SHA512 04e435073204d158d6e8a5de87681cd70fa76c80c82b4c86e3e12650288c3bb2c0c457d64e05812e94f9e07172b5df36542f330306bdbab8222ec2464bda12f4
-DIST fio-3.19.tar.bz2 902391 BLAKE2B 84993717248add335a77c6fc03fa730f628806e1e001078d48a91bc5ac9703e42c6cc5c720cfe76a83d1daf4af2245bfd78fd6a871611de1c19562ca70a9cc89 SHA512 0004dbaf5a8ce4f2b13114a3bfb65c388bb6d01e9a82791208ff7e7eb54cd6741e60cc8cb0a19f6319301ee2040c03862725943972ea767e6cc65fce4a2b3ecb
 DIST fio-3.20.tar.bz2 912040 BLAKE2B 44f8c20a390a6382aadc07881c1e7c65cca932099a1b3992e848669cf2a52b410fde67f9ae576efcd0d8e88ceec04174b6bc077d4b3f9b615b59be9f24f62bed SHA512 4e073754c95cb8d6416a80f48ca61003f34d664717f67a3f29b554e9205f8fe3553595ba6f8a8e9cb3463022d5c83be961f5b5a1ebcd2a9f4da9406a9986c1fb
-EBUILD fio-3.19.ebuild 3892 BLAKE2B f6b3a6f22753c0ace90c7f7961dc33321b74d89cf7db26f76134c99db6dfb97f4eb1fca2f4485b30c37e71acfb52cc365f2213832c9d205e070a93d568b5c143 SHA512 3a94aaeeb38d74ccbc3d209ed72c52277bddc65755b9db1f166e80e34e60d03dc23001fd8bb6d93ed7bdb9815d1fdb5ef638402bed32c1aeda3721024e860d14
-EBUILD fio-3.20-r2.ebuild 4437 BLAKE2B fdea24d780e21414d3485b7bcd35d77e3b52cf442c842724a48e172c8a779c661bb3e0a22226c38323e1a9b2f23dfb8b72bc543e762eac1e6894e4214bd343e8 SHA512 2dba7efe9e2a704456f92ec3739312476df7905d1f04826bc61d78b8e6c9f5ac5c25dd324b4653d2d87b2eb4b329676906008b4663c3340d3756988fd9993906
+EBUILD fio-3.20-r2.ebuild 4434 BLAKE2B f95ebb55386b67e87ac213f8627ecc6dbca158dddc3a2e69e0c3ba4a6939c06db11cb99d26e7bc426fe7c23eee1abb58a9bacb87fd86dbbd3aa3b8a73edb739d SHA512 a3f48d160ff9feeb6cc6439cd59fef828b648bda35fc35352dbac9e333b62b5607e5331a83d879ad89301ba2a434efcfa12c0952a1c4ab33dfee68d715cbee15
 MISC metadata.xml 1172 BLAKE2B e35bbaaa15c8cd095791a4a23a7344314a015ea42bb864b11bb165d340585ee667f969426282465b834a7d092ab6885736e55ec8d4fe950001fbb6336fdfdc14 SHA512 defbc7f932a5ab83b67da58a601ef62784b27f2268f8a8dd5057c02fb441b164bd0945217fa52a0e06803c74b5168dda3b4668de52f593d5cade428bd2f79e86
diff --git a/sys-block/fio/fio-3.19.ebuild b/sys-block/fio/fio-3.19.ebuild
deleted file mode 100644
index 4ca6d95fb4fb..000000000000
--- a/sys-block/fio/fio-3.19.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{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 numa python rbd rdma static tcmalloc zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	libressl? ( curl )
-	gnuplot? ( python )"
-
-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(+)] )
-	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(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-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 "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
-		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
-		configure || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	# TODO: pmem
-	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 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/*
-}
diff --git a/sys-block/fio/fio-3.20-r2.ebuild b/sys-block/fio/fio-3.20-r2.ebuild
index 7bb9cf3a4cfd..0fd2c508cb22 100644
--- a/sys-block/fio/fio-3.20-r2.ebuild
+++ b/sys-block/fio/fio-3.20-r2.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 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 )