commit: 5255bb4ddd9b1f9e40c208bfe9d056c1acf323e3 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Jan 1 01:57:34 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Jan 1 01:57:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5255bb4d
sys-block/fio: Remove old (py3.6) Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-block/fio/Manifest | 3 - sys-block/fio/files/fio-3.16-snprintf.patch | 44 ------ .../fio/files/fio-3.16-verify_only_numberio.patch | 60 --------- sys-block/fio/fio-3.16-r1.ebuild | 130 ------------------ sys-block/fio/fio-3.16.ebuild | 129 ------------------ sys-block/fio/fio-3.17-r1.ebuild | 147 --------------------- sys-block/fio/fio-3.17.ebuild | 129 ------------------ sys-block/fio/fio-3.7.ebuild | 111 ---------------- 8 files changed, 753 deletions(-) diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest index 9a65f29d8ca..d4ce5a3afc0 100644 --- a/sys-block/fio/Manifest +++ b/sys-block/fio/Manifest @@ -1,5 +1,2 @@ -DIST fio-3.16.tar.bz2 881436 BLAKE2B fee99930d0245474eb67ceee2d1a6ec2f1a0eb4da6d52cf8616d7eda64699a8c2727715284134fd4931e91efad69b064f66a80a78f70ea03e66d4eab4e601120 SHA512 2d651b20cbc6c7babf3adc082dbe78e1f7de920764653cf5ffd99df7516cf6190ffefe2152d2739326d3102949d9bad7db978ff88866cfa54020f9ec3b0a2a23 -DIST fio-3.17.tar.bz2 888795 BLAKE2B 10277efb1234708aff336fc3c0723d0b9b5c903dce3a999ea2b8749b5034c778be4828549b9e0d9fc36a4f9429ca86ac0011f0c110e1a44ed3ad33b6e4a30a68 SHA512 27dba4c3e8f544c0fd40a5f42660f64f42e114e7b56199bc70f540b1a09b9dec9291e3fbae0fab9691189fa4a1f40edbcf4f9b53c313fd9c1a8ba0fdbb7f524e DIST fio-3.19.tar.bz2 902391 BLAKE2B 84993717248add335a77c6fc03fa730f628806e1e001078d48a91bc5ac9703e42c6cc5c720cfe76a83d1daf4af2245bfd78fd6a871611de1c19562ca70a9cc89 SHA512 0004dbaf5a8ce4f2b13114a3bfb65c388bb6d01e9a82791208ff7e7eb54cd6741e60cc8cb0a19f6319301ee2040c03862725943972ea767e6cc65fce4a2b3ecb DIST fio-3.20.tar.bz2 912040 BLAKE2B 44f8c20a390a6382aadc07881c1e7c65cca932099a1b3992e848669cf2a52b410fde67f9ae576efcd0d8e88ceec04174b6bc077d4b3f9b615b59be9f24f62bed SHA512 4e073754c95cb8d6416a80f48ca61003f34d664717f67a3f29b554e9205f8fe3553595ba6f8a8e9cb3463022d5c83be961f5b5a1ebcd2a9f4da9406a9986c1fb -DIST fio-3.7.tar.bz2 629354 BLAKE2B 99a1c88481c7a693e31b1a0bc23bc80e85df92385f9d5a7de8d6479be8bc425326a20d794eb4809f822adfcd06e07c66ebed321faa9dbae7a2c1d3c766a6467d SHA512 b1f5cb35fe1c06e030c570959ab9a96d936f9eaa2f7f30d5a34f34fd93fae057da07c4084a06143cd5188ad6b2cc06b564484f8867e050cfeddc0ee3fb0fe266 diff --git a/sys-block/fio/files/fio-3.16-snprintf.patch b/sys-block/fio/files/fio-3.16-snprintf.patch deleted file mode 100644 index 1470290f3cb..00000000000 --- a/sys-block/fio/files/fio-3.16-snprintf.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5b215853ed4b438b5b2d4ac3e56d5f0d19e145d9 Mon Sep 17 00:00:00 2001 -From: Anatol Pomozov <anatol.pomo...@gmail.com> -Date: Mon, 23 Sep 2019 14:12:12 -0700 -Subject: [PATCH] Fix compilation error with gfio -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 36833fb04 replaced many usages of strncpy with snprintf. -But there is one place where new arguments were added but the function -name has not been changed. It leads to the following compilation error: - -gclient.c:333:2: error: too many arguments to function ‘strncpy’ - 333 | strncpy(message, sizeof(message), "%s", status_message); - | ^~~~~~~ -In file included from /usr/include/features.h:450, - from /usr/include/bits/libc-header-start.h:33, - from /usr/include/stdlib.h:25, - from gclient.c:1: -/usr/include/bits/string_fortified.h:103:1: note: declared here - 103 | __NTH (strncpy (char *__restrict __dest, const char *__restrict __src, - | ^~~~~ - -Signed-off-by: Anatol Pomozov <anatol.pomo...@gmail.com> ---- - gclient.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gclient.c b/gclient.c -index 64324177..d8dc62d2 100644 ---- a/gclient.c -+++ b/gclient.c -@@ -330,7 +330,7 @@ static void gfio_update_thread_status_all(struct gui *ui, char *status_message, - static char message[100]; - const char *m = message; - -- strncpy(message, sizeof(message), "%s", status_message); -+ snprintf(message, sizeof(message), "%s", status_message); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ui->thread_status_pb), m); - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ui->thread_status_pb), perc / 100.0); - gtk_widget_queue_draw(ui->window); --- -2.24.0 - diff --git a/sys-block/fio/files/fio-3.16-verify_only_numberio.patch b/sys-block/fio/files/fio-3.16-verify_only_numberio.patch deleted file mode 100644 index 52fb389f62b..00000000000 --- a/sys-block/fio/files/fio-3.16-verify_only_numberio.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8859c0675aec03467ed65dfc79ecc874d026f165 Mon Sep 17 00:00:00 2001 -From: Gwendal Grignou <gwen...@chromium.org> -Date: Mon, 13 Jan 2020 16:35:10 -0800 -Subject: [PATCH] verify: Fix test to not check for numberio when verify_only - is true - -io->numberio can not be populated when verify_only is true, because -do_dry_run() build and complete IOs immediately, so it can not replicate -the numberio that was produced when the data was layered on the media. - -Without this fix, using write_random -[write_stress] -filename=${FILENAME} -size=${FILESIZE} -verify_only=${VERIFY_ONLY} -readwrite=randwrite -bs=4k -ioengine=libaio -iodepth=32 -direct=1 -do_verify=1 -verify=crc32c - -'VERIFY_ONLY=1 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' passes, -but -'VERIFY_ONLY=0 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' fails: -"""verify_only option fails with verify: bad header numberio 1, wanted -0""". -The fix addresses the problem by not checking numberio. - -Fixes #732 - -Signed-off-by: Gwendal Grignou <gwen...@chromium.org> ---- - verify.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/verify.c b/verify.c -index a2c0d41dbb8c..cf299ebf9643 100644 ---- a/verify.c -+++ b/verify.c -@@ -845,13 +845,11 @@ static int verify_header(struct io_u *io_u, struct thread_data *td, - * For read-only workloads, the program cannot be certain of the - * last numberio written to a block. Checking of numberio will be - * done only for workloads that write data. For verify_only, -- * numberio will be checked in the last iteration when the correct -- * state of numberio, that would have been written to each block -- * in a previous run of fio, has been reached. -+ * numberio check is skipped. - */ - if (td_write(td) && (td_min_bs(td) == td_max_bs(td)) && - !td->o.time_based) -- if (!td->o.verify_only || td->o.loops == 0) -+ if (!td->o.verify_only) - if (hdr->numberio != io_u->numberio) { - log_err("verify: bad header numberio %"PRIu16 - ", wanted %"PRIu16, --- -2.23.0 - diff --git a/sys-block/fio/fio-3.16-r1.ebuild b/sys-block/fio/fio-3.16-r1.ebuild deleted file mode 100644 index f77ee340c37..00000000000 --- a/sys-block/fio/fio-3.16-r1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_6 ) - -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 rbd rdma static tcmalloc zlib" -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} ) - libressl? ( curl )" - -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+=" - gnuplot? ( - sci-visualization/gnuplot - $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} - )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/fio-2.2.13-libmtd.patch - "${FILESDIR}"/fio-3.16-snprintf.patch - "${FILESDIR}"/fio-3.16-verify_only_numberio.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" - - if use gnuplot ; then - sed -i 's:python2.7:python:g' \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - python_replicate_script \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - else - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die - rm "${ED}"/usr/share/fio/*.gpm || die - rmdir "${ED}"/usr/share/fio/ 2>/dev/null - 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.16.ebuild b/sys-block/fio/fio-3.16.ebuild deleted file mode 100644 index fa28576751a..00000000000 --- a/sys-block/fio/fio-3.16.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_6 ) - -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 rbd rdma static tcmalloc zlib" -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} ) - libressl? ( curl )" - -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+=" - gnuplot? ( - sci-visualization/gnuplot - $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} - )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/fio-2.2.13-libmtd.patch - "${FILESDIR}"/fio-3.16-snprintf.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" - - if use gnuplot ; then - sed -i 's:python2.7:python:g' \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - python_replicate_script \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - else - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die - rm "${ED}"/usr/share/fio/*.gpm || die - rmdir "${ED}"/usr/share/fio/ 2>/dev/null - 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.17-r1.ebuild b/sys-block/fio/fio-3.17-r1.ebuild deleted file mode 100644 index 213a718797a..00000000000 --- a/sys-block/fio/fio-3.17-r1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_6 ) - -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 - "${FILESDIR}"/fio-3.16-verify_only_numberio.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.17.ebuild b/sys-block/fio/fio-3.17.ebuild deleted file mode 100644 index 49775e5a636..00000000000 --- a/sys-block/fio/fio-3.17.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_6 ) - -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 rbd rdma static tcmalloc zlib" -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} ) - libressl? ( curl )" - -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+=" - gnuplot? ( - sci-visualization/gnuplot - $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} - )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/fio-2.2.13-libmtd.patch - "${FILESDIR}"/fio-3.16-verify_only_numberio.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" - - if use gnuplot ; then - sed -i 's:python2.7:python:g' \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - python_replicate_script \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - else - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die - rm "${ED}"/usr/share/fio/*.gpm || die - rmdir "${ED}"/usr/share/fio/ 2>/dev/null - 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.7.ebuild b/sys-block/fio/fio-3.7.ebuild deleted file mode 100644 index d3a0e110fd2..00000000000 --- a/sys-block/fio/fio-3.7.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit eutils python-r1 toolchain-funcs - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Jens Axboe's Flexible IO tester" -HOMEPAGE="http://brick.kernel.dk/snaps/" -SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" -IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib" -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )" - -# GTK+:2 does not offer static libaries. -LIB_DEPEND="aio? ( dev-libs/libaio[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(+)] - ) - zlib? ( sys-libs/zlib[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - gtk? ( x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" -RDEPEND+=" - gnuplot? ( - sci-visualization/gnuplot - ${PYTHON_DEPS} - )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/fio-2.2.13-libmtd.patch -) - -src_prepare() { - 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 - default -} - -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 glusterfs '' '--disable-gfapi') \ - $(usex gtk '--enable-gfio' '') \ - $(usex numa '' '--disable-numa') \ - $(usex rbd '' '--disable-rbd') \ - $(usex rdma '' '--disable-rdma') \ - $(usex static '--build-static' '') - echo "$@" - "$@" || die 'configure failed' -} - -src_compile() { - emake V=1 OPTFLAGS= -} - -src_install() { - emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man" - - if use gnuplot ; then - sed -i 's:python2.7:python:g' \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - python_replicate_script \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - else - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die - rm "${ED}"/usr/share/fio/*.gpm || die - rmdir "${ED}"/usr/share/fio/ 2>/dev/null - 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/* -}