4 files changed, 13 insertions, 186 deletions
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index b190fa89056e..66fbfff84f7c 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,8 +1,6 @@
 AUX fio-2.2.13-libmtd.patch 238 BLAKE2B da7843b4cb2b0fda12c2e950d4b51df661f229eb01b16b5a9d2a5d5e59b15f6c25d9865e607be8e1a86329964e2eb116ce0d1855dd1a80c156650db1ad5a3690 SHA512 66c905a79a78baaea0864d4fbf2432edfb2d98f2262ad638431d591154b1f8214dbc2ae6fed9cddd3cb4684932c830cc7402dc0a4c6b429dd955bb1a1f929f1a
-DIST fio-3.34.tar.bz2 7049859 BLAKE2B 297fef62098bc3bc5476ebc7794566172c182059ce35d57a84bf87f6cedf08f234371d363fd08570e675eef9fbc7eae8d79755826d4312d543a16a144b4afc3f SHA512 912da2d7c7c4e0ad6c64a2e8c5254d23e5b6286c54d3ebf23d6bd2e0b5a9e4d2a53a75da3c807467b0fbe637b4ff23d64f1166fc45d6cce1d13d239f233548d0
-DIST fio-3.36.tar.bz2 7229204 BLAKE2B a9265ae8817486ddda1b63c35c79814b7854ec29106a188110b22ba82fc41a015b076626daa577a43189804a768f5465395b8daa74ceb31c949e03eca091a23b SHA512 925cab44619991052085216253c9c5637f7319f52d92f4cc946df60ab1a964dbfa0bbb0ecd171d6dc21ae1402375a6cf1e7b8ac94df0c03889f849aeb2da8890
 DIST fio-3.37.tar.bz2 7730124 BLAKE2B 87bccb4645a8ce174729b2cd69f250c8cd611e2b7bfca182083ae6e2d216cbc674ad1eab83b1cba0236255b7ee2baa759ac831883378a8694b3cc8c2b752fa91 SHA512 22876c4cad0eb3e5ea6a5e02e59726cb9a047e9e95b8fa81f117e7ee2d5f8c046c850ea0dd7fa35f281e9d925f7aaea409c1b3b503221686fab37386b80bb5ef
-EBUILD fio-3.34.ebuild 4889 BLAKE2B 8b154541a813e5e59c848e92730892f9926a726e59b0ce75fe60d8cb5ed06ccd05eec13a2033ed0cafeb5a59a5828d2f3bdea2919b817dbc27fa5e19daef8982 SHA512 f5500da2d7acfaedd4851524878f27cc8d9359fe4c3e6159440ddbd9597bff36e16002756916e0f3aa1a3cd55b92e6110391c30cd88dbdcbe91c52fbcf0b1bea
-EBUILD fio-3.36-r1.ebuild 4967 BLAKE2B 5a4990bee121b43d054821e20807ec2096330bd6235e058265ef1036f847da831357e5ede60a217fd9cb755e39c020ab25df9f39af392fae972eb50f954d152b SHA512 f1dd2a800c5efc07133bfce98c4823528e5f4698af9430e44335682e8722407f03893e49ad60c6bd44fd58a8f5266f80d6b54a61e390465c6d13055ae4ac58b7
-EBUILD fio-3.37.ebuild 4970 BLAKE2B faa4f2a52508f2577dd0cd4e54b4527b49589b78ac641556165f64b88b29b6edae629704a9d250d4ad96a41e2f7a4f2689e30c51d0ca0573f5ecdfa70e638873 SHA512 1971356e281b8bc79107b9ee2035575a182909b4e220b9ff869bdd3610572fd7349bd7a4a1f631ad418159519c92ff40f7001da550f1d03e25401a4dfeeb1f1b
+DIST fio-3.39.tar.bz2 7552653 BLAKE2B 2a59fc693fae300b6566d90753d429a198b8630beaf509e7adccc960286f6efa9c866bce98f3964e76d914b877c93e30c5af22f0a1b0daea58287684ef558db3 SHA512 ea337775874366190ec87db1dcfad43c6dd86b8ebe8d6e9103048e264e1e369dd5116a02bcd6c3ee2a790027d5856e5a71dfbcf7c7ffbada763bee38f413f4ae
+EBUILD fio-3.37.ebuild 4969 BLAKE2B 189fab334473849d9800835c27a17a13e9f81a2c74a60a1e774e8d8e25091ed6e27694cd0a78abc5d221424c098edf489f51b0c18417c9f8128351436bab4ca0 SHA512 8cddbf2d4e975193a2309ea3bb16528d25810b86a899611aa0e2531b6d039163bad5fc6c75603f1c2dc6f63553154987a7ff184ea47c6387259989e46e8ff2ac
+EBUILD fio-3.39.ebuild 4974 BLAKE2B 60a778354b614fe18efac2907f0d63be41975ff78be1138cdba4a848b5808db71aee7e00c56d11178c8dd13f107ba0e2cd18aff80f0f65e8b217cb14cb2190b1 SHA512 70ae021f50d38dd87a8b55c170bb2d42782da308e702167a5c016918c0ecd6a99107f16a270760ea8572fd92f4b2ab533b96688368f6e48dbc81ef2466c17ff4
 MISC metadata.xml 1370 BLAKE2B 519e169fc6c57463c8e0eac0661658d035219d77e4872cf8de2e3ab93c7977e76d7e4464464f04699e22490e943263f6691da18cfb6c2b5e44dd4f6a09dd4bc5 SHA512 ac62823b7bfffc55f7b8cbebe847a00e1564f54d6037fcb407f60ee0945aec4678ec8223966c0133b2991b73f1a24e7261c0342e0df297b695369d01daa5ec38
diff --git a/sys-block/fio/fio-3.34.ebuild b/sys-block/fio/fio-3.34.ebuild
deleted file mode 100644
index 7cb3f164e3fa..000000000000
--- a/sys-block/fio/fio-3.34.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm64 ~loong ~ppc ppc64 ~riscv x86"
-IUSE="aio curl glusterfs gnuplot gtk io-uring nfs numa python rbd rdma static tcmalloc test valgrind zbc zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	gnuplot? ( python )
-	io-uring? ( aio )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-# GTK+:2 does not offer static libaries.
-# xnvme
-# libblkio
-# pmem2
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
-	curl? (
-		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(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	rdma? ( sys-cluster/rdma-core[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 )
-	valgrind? ( dev-debug/valgrind )"
-RDEPEND+="
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pandas[${PYTHON_USEDEP}]
-	)
-	gnuplot? ( sci-visualization/gnuplot )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/fio-2.2.13-libmtd.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP+=(
-	# Internally uses -Werror=implicit-function-declaration for all configure
-	# checks. bug #904276
-	'*'
-)
-
-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:" \
-		-e '/if compile_prog "" "" "valgrind_dev" *; *then/'"s::if $(usex valgrind 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
-	# TODO: libblkiio - not packaged in Gentoo
-	# TODO: xnvme - not packaged in Gentoo
-	# TODO: libhdfs
-	# libnfs option does not work as expected:
-	# $(usex nfs '' '--disable-libnfs') \
-	OPTS=(
-		--disable-optimizations
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}"
-		--cc="$(tc-getCC)"
-		--disable-pmem
-		--disable-xnvme
-		--disable-libblkio
-		# Not booleans, enable-only up to this version
-		#--disable-cuda
-		#--disable-libcufile
-		#--disable-libhdfs
-		--disable-dfs
-		$(usex nfs '' '--disable-libnfs')
-		$(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')
-	)
-	set -- \
-	# not autoconf
-	./configure "${OPTS[@]}"
-	echo "$@" |tr ' ' '\n'
-	"$@" || 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.rst REPORTING-BUGS HOWTO.rst
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-3.37.ebuild b/sys-block/fio/fio-3.37.ebuild
index 27c5b5950dda..840896489cef 100644
--- a/sys-block/fio/fio-3.37.ebuild
+++ b/sys-block/fio/fio-3.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 IUSE="aio curl glusterfs gnuplot gtk io-uring nfs numa pandas python rbd rdma static tcmalloc test valgrind zbc zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/sys-block/fio/fio-3.36-r1.ebuild b/sys-block/fio/fio-3.39.ebuild
index c4aedcdd8d87..1e6866f33352 100644
--- a/sys-block/fio/fio-3.36-r1.ebuild
+++ b/sys-block/fio/fio-3.39.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit python-r1 toolchain-funcs
 
@@ -14,13 +14,18 @@ DESCRIPTION="Jens Axboe's Flexible IO tester"
 HOMEPAGE="https://brick.kernel.dk/snaps/"
 SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
 IUSE="aio curl glusterfs gnuplot gtk io-uring nfs numa pandas python rbd rdma static tcmalloc test valgrind zbc zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	gnuplot? ( python )
 	io-uring? ( aio )"
+
 RESTRICT="!test? ( test )"
 
 BDEPEND="virtual/pkgconfig"
@@ -57,8 +62,6 @@ RDEPEND+="
 	)
 	gnuplot? ( sci-visualization/gnuplot )"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/fio-2.2.13-libmtd.patch
 )