gentoo auto-resync : 07:03:2024 - 19:06:58

4 files changed, 173 insertions, 1 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index f439a22b9507..f267254905ff 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 379c7a54d70f..1119d20da7ef 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -3,7 +3,9 @@ AUX fio-3.27-drop-raw.patch 3315 BLAKE2B 93cfc730e2feceae2cc20c76b93a4e1da2a6b0c
 DIST fio-3.27.tar.bz2 960330 BLAKE2B 7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170 SHA512 9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99
 DIST fio-3.30.tar.bz2 6001772 BLAKE2B a4941cd415e6444bb9871274580efdf82281a1e52dc3caaa235f63176e3564fb1dc08e1e4586c555f9c25975d7e6220fe53209ed7218da713b9cb9135de0fc05 SHA512 1fb2ae9c28028147edabceff734fc41bf07ce504af98afdb0951920b724b15d647f2b0852262c177279ad6b4dbbf24be458db7f939d1c80069e0f8e7bc8aa10d
 DIST fio-3.34.tar.bz2 7049859 BLAKE2B 297fef62098bc3bc5476ebc7794566172c182059ce35d57a84bf87f6cedf08f234371d363fd08570e675eef9fbc7eae8d79755826d4312d543a16a144b4afc3f SHA512 912da2d7c7c4e0ad6c64a2e8c5254d23e5b6286c54d3ebf23d6bd2e0b5a9e4d2a53a75da3c807467b0fbe637b4ff23d64f1166fc45d6cce1d13d239f233548d0
+DIST fio-3.36.tar.bz2 7229204 BLAKE2B a9265ae8817486ddda1b63c35c79814b7854ec29106a188110b22ba82fc41a015b076626daa577a43189804a768f5465395b8daa74ceb31c949e03eca091a23b SHA512 925cab44619991052085216253c9c5637f7319f52d92f4cc946df60ab1a964dbfa0bbb0ecd171d6dc21ae1402375a6cf1e7b8ac94df0c03889f849aeb2da8890
 EBUILD fio-3.27-r4.ebuild 4214 BLAKE2B 538cd69c2b272539b13ad8092162719acee3b75adc8add267e51dbed4ddd72073b92641a274e2eb1f2029253b0821e154da01bcef06ebb9ce42e910f53e55ca3 SHA512 89134c77d4ca071bce113e19e9ec06f3ea51e0241f4a265a73c6f61da6db505288fb12fcbf06b38aaa2b72bfa60e029a3ca6f0aa55ec869df55962338720280d
 EBUILD fio-3.30-r1.ebuild 4309 BLAKE2B 0d6550feed9d63640193478f0a44500ef75f929132d10b811db060b028b2e0d608091a4816f57d6d47c325f835cffb4ec5baf1aff315f0a5c81c2fc77d6b5096 SHA512 ac56400040fa5f8cbb83e4c6e15a108fbfd5f24ddcef38207ce594275362fef9e81736a285f57aa14bc03c285b788876f8da338a495b13951e1def8418fc122b
 EBUILD fio-3.34.ebuild 4761 BLAKE2B ae90b2786ba7394d181c3c6da0653348190e526f0d0b9e86c11c7b57d3d7b84f6c6962878cfc23c10c749fbec9281e4f66e1260e9cc1b56b2dce20824586775d SHA512 67c36b657fab98801898ef3487514671c210698b9c0c46dc4c077b41541c1d85c52355d2ec3dc35204fd2f2bb8b374b00b2ffae0adf1ce255d50da2b8f0aa81f
-MISC metadata.xml 1293 BLAKE2B 609080b0f70ed898d1203afddf9e9dd850fdbd8111536ea9341a413fa6ca07a7314bd4088df05613d95b849f9fdcc2a1519a17d20e56dc46115e6d88bf07672e SHA512 76096ea48b59fc78624980a7b2721e1b43584eccaee4488a38a18d7ea4fa389423b684af0f015f2f0d73ae2989167a7caa4a02c9277e153f382f319780ab31e5
+EBUILD fio-3.36.ebuild 4843 BLAKE2B 53a49bfb47dd4b48c029a748556da9382c24ddd9b1daf626e5207a9d4996942d95dcec4b66ca27785f1be676c66945c2eae1c75d171324ac6c80d53d5da5958c SHA512 527626b960dce789c019a9ced1c04c4738f1f76f819fed543575feeb213b61b014a3705546d580cf4edd65fd90b750c23fce03cff11065da353496e96034eaa8
+MISC metadata.xml 1370 BLAKE2B 519e169fc6c57463c8e0eac0661658d035219d77e4872cf8de2e3ab93c7977e76d7e4464464f04699e22490e943263f6691da18cfb6c2b5e44dd4f6a09dd4bc5 SHA512 ac62823b7bfffc55f7b8cbebe847a00e1564f54d6037fcb407f60ee0945aec4678ec8223966c0133b2991b73f1a24e7261c0342e0df297b695369d01daa5ec38
diff --git a/sys-block/fio/fio-3.36.ebuild b/sys-block/fio/fio-3.36.ebuild
new file mode 100644
index 000000000000..5c3e73c4de29
--- /dev/null
+++ b/sys-block/fio/fio-3.36.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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 ~ia64 ~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"
+
+# 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}
+		pandas? ( dev-python/pandas[${PYTHON_USEDEP}] )
+	)
+	gnuplot? ( sci-visualization/gnuplot )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/fio-2.2.13-libmtd.patch
+)
+
+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[@]}"
+		use pandas || rm -f "${ED}"/usr/bin/fiologparser_hist.py
+	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/metadata.xml b/sys-block/fio/metadata.xml
index 4bcc4d25ecf5..133abb627921 100644
--- a/sys-block/fio/metadata.xml
+++ b/sys-block/fio/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name="curl">Enable HTTP engine for S3 and WebDav support support via <pkg>net-misc/curl</pkg></flag>
 		<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="pandas">Install dependencies for complex python scripts</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>