Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/, sys-block/fio/files/
Date: Fri, 01 Jan 2021 02:03:07
Message-Id: 1609466254.5255bb4ddd9b1f9e40c208bfe9d056c1acf323e3.mgorny@gentoo
1 commit: 5255bb4ddd9b1f9e40c208bfe9d056c1acf323e3
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 1 01:57:34 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 1 01:57:34 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5255bb4d
7
8 sys-block/fio: Remove old (py3.6)
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-block/fio/Manifest | 3 -
13 sys-block/fio/files/fio-3.16-snprintf.patch | 44 ------
14 .../fio/files/fio-3.16-verify_only_numberio.patch | 60 ---------
15 sys-block/fio/fio-3.16-r1.ebuild | 130 ------------------
16 sys-block/fio/fio-3.16.ebuild | 129 ------------------
17 sys-block/fio/fio-3.17-r1.ebuild | 147 ---------------------
18 sys-block/fio/fio-3.17.ebuild | 129 ------------------
19 sys-block/fio/fio-3.7.ebuild | 111 ----------------
20 8 files changed, 753 deletions(-)
21
22 diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
23 index 9a65f29d8ca..d4ce5a3afc0 100644
24 --- a/sys-block/fio/Manifest
25 +++ b/sys-block/fio/Manifest
26 @@ -1,5 +1,2 @@
27 -DIST fio-3.16.tar.bz2 881436 BLAKE2B fee99930d0245474eb67ceee2d1a6ec2f1a0eb4da6d52cf8616d7eda64699a8c2727715284134fd4931e91efad69b064f66a80a78f70ea03e66d4eab4e601120 SHA512 2d651b20cbc6c7babf3adc082dbe78e1f7de920764653cf5ffd99df7516cf6190ffefe2152d2739326d3102949d9bad7db978ff88866cfa54020f9ec3b0a2a23
28 -DIST fio-3.17.tar.bz2 888795 BLAKE2B 10277efb1234708aff336fc3c0723d0b9b5c903dce3a999ea2b8749b5034c778be4828549b9e0d9fc36a4f9429ca86ac0011f0c110e1a44ed3ad33b6e4a30a68 SHA512 27dba4c3e8f544c0fd40a5f42660f64f42e114e7b56199bc70f540b1a09b9dec9291e3fbae0fab9691189fa4a1f40edbcf4f9b53c313fd9c1a8ba0fdbb7f524e
29 DIST fio-3.19.tar.bz2 902391 BLAKE2B 84993717248add335a77c6fc03fa730f628806e1e001078d48a91bc5ac9703e42c6cc5c720cfe76a83d1daf4af2245bfd78fd6a871611de1c19562ca70a9cc89 SHA512 0004dbaf5a8ce4f2b13114a3bfb65c388bb6d01e9a82791208ff7e7eb54cd6741e60cc8cb0a19f6319301ee2040c03862725943972ea767e6cc65fce4a2b3ecb
30 DIST fio-3.20.tar.bz2 912040 BLAKE2B 44f8c20a390a6382aadc07881c1e7c65cca932099a1b3992e848669cf2a52b410fde67f9ae576efcd0d8e88ceec04174b6bc077d4b3f9b615b59be9f24f62bed SHA512 4e073754c95cb8d6416a80f48ca61003f34d664717f67a3f29b554e9205f8fe3553595ba6f8a8e9cb3463022d5c83be961f5b5a1ebcd2a9f4da9406a9986c1fb
31 -DIST fio-3.7.tar.bz2 629354 BLAKE2B 99a1c88481c7a693e31b1a0bc23bc80e85df92385f9d5a7de8d6479be8bc425326a20d794eb4809f822adfcd06e07c66ebed321faa9dbae7a2c1d3c766a6467d SHA512 b1f5cb35fe1c06e030c570959ab9a96d936f9eaa2f7f30d5a34f34fd93fae057da07c4084a06143cd5188ad6b2cc06b564484f8867e050cfeddc0ee3fb0fe266
32
33 diff --git a/sys-block/fio/files/fio-3.16-snprintf.patch b/sys-block/fio/files/fio-3.16-snprintf.patch
34 deleted file mode 100644
35 index 1470290f3cb..00000000000
36 --- a/sys-block/fio/files/fio-3.16-snprintf.patch
37 +++ /dev/null
38 @@ -1,44 +0,0 @@
39 -From 5b215853ed4b438b5b2d4ac3e56d5f0d19e145d9 Mon Sep 17 00:00:00 2001
40 -From: Anatol Pomozov <anatol.pomozov@×××××.com>
41 -Date: Mon, 23 Sep 2019 14:12:12 -0700
42 -Subject: [PATCH] Fix compilation error with gfio
43 -MIME-Version: 1.0
44 -Content-Type: text/plain; charset=UTF-8
45 -Content-Transfer-Encoding: 8bit
46 -
47 -Commit 36833fb04 replaced many usages of strncpy with snprintf.
48 -But there is one place where new arguments were added but the function
49 -name has not been changed. It leads to the following compilation error:
50 -
51 -gclient.c:333:2: error: too many arguments to function ‘strncpy’
52 - 333 | strncpy(message, sizeof(message), "%s", status_message);
53 - | ^~~~~~~
54 -In file included from /usr/include/features.h:450,
55 - from /usr/include/bits/libc-header-start.h:33,
56 - from /usr/include/stdlib.h:25,
57 - from gclient.c:1:
58 -/usr/include/bits/string_fortified.h:103:1: note: declared here
59 - 103 | __NTH (strncpy (char *__restrict __dest, const char *__restrict __src,
60 - | ^~~~~
61 -
62 -Signed-off-by: Anatol Pomozov <anatol.pomozov@×××××.com>
63 ----
64 - gclient.c | 2 +-
65 - 1 file changed, 1 insertion(+), 1 deletion(-)
66 -
67 -diff --git a/gclient.c b/gclient.c
68 -index 64324177..d8dc62d2 100644
69 ---- a/gclient.c
70 -+++ b/gclient.c
71 -@@ -330,7 +330,7 @@ static void gfio_update_thread_status_all(struct gui *ui, char *status_message,
72 - static char message[100];
73 - const char *m = message;
74 -
75 -- strncpy(message, sizeof(message), "%s", status_message);
76 -+ snprintf(message, sizeof(message), "%s", status_message);
77 - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ui->thread_status_pb), m);
78 - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ui->thread_status_pb), perc / 100.0);
79 - gtk_widget_queue_draw(ui->window);
80 ---
81 -2.24.0
82 -
83
84 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
85 deleted file mode 100644
86 index 52fb389f62b..00000000000
87 --- a/sys-block/fio/files/fio-3.16-verify_only_numberio.patch
88 +++ /dev/null
89 @@ -1,60 +0,0 @@
90 -From 8859c0675aec03467ed65dfc79ecc874d026f165 Mon Sep 17 00:00:00 2001
91 -From: Gwendal Grignou <gwendal@××××××××.org>
92 -Date: Mon, 13 Jan 2020 16:35:10 -0800
93 -Subject: [PATCH] verify: Fix test to not check for numberio when verify_only
94 - is true
95 -
96 -io->numberio can not be populated when verify_only is true, because
97 -do_dry_run() build and complete IOs immediately, so it can not replicate
98 -the numberio that was produced when the data was layered on the media.
99 -
100 -Without this fix, using write_random
101 -[write_stress]
102 -filename=${FILENAME}
103 -size=${FILESIZE}
104 -verify_only=${VERIFY_ONLY}
105 -readwrite=randwrite
106 -bs=4k
107 -ioengine=libaio
108 -iodepth=32
109 -direct=1
110 -do_verify=1
111 -verify=crc32c
112 -
113 -'VERIFY_ONLY=1 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' passes,
114 -but
115 -'VERIFY_ONLY=0 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' fails:
116 -"""verify_only option fails with verify: bad header numberio 1, wanted
117 -0""".
118 -The fix addresses the problem by not checking numberio.
119 -
120 -Fixes #732
121 -
122 -Signed-off-by: Gwendal Grignou <gwendal@××××××××.org>
123 ----
124 - verify.c | 6 ++----
125 - 1 file changed, 2 insertions(+), 4 deletions(-)
126 -
127 -diff --git a/verify.c b/verify.c
128 -index a2c0d41dbb8c..cf299ebf9643 100644
129 ---- a/verify.c
130 -+++ b/verify.c
131 -@@ -845,13 +845,11 @@ static int verify_header(struct io_u *io_u, struct thread_data *td,
132 - * For read-only workloads, the program cannot be certain of the
133 - * last numberio written to a block. Checking of numberio will be
134 - * done only for workloads that write data. For verify_only,
135 -- * numberio will be checked in the last iteration when the correct
136 -- * state of numberio, that would have been written to each block
137 -- * in a previous run of fio, has been reached.
138 -+ * numberio check is skipped.
139 - */
140 - if (td_write(td) && (td_min_bs(td) == td_max_bs(td)) &&
141 - !td->o.time_based)
142 -- if (!td->o.verify_only || td->o.loops == 0)
143 -+ if (!td->o.verify_only)
144 - if (hdr->numberio != io_u->numberio) {
145 - log_err("verify: bad header numberio %"PRIu16
146 - ", wanted %"PRIu16,
147 ---
148 -2.23.0
149 -
150
151 diff --git a/sys-block/fio/fio-3.16-r1.ebuild b/sys-block/fio/fio-3.16-r1.ebuild
152 deleted file mode 100644
153 index f77ee340c37..00000000000
154 --- a/sys-block/fio/fio-3.16-r1.ebuild
155 +++ /dev/null
156 @@ -1,130 +0,0 @@
157 -# Copyright 1999-2020 Gentoo Authors
158 -# Distributed under the terms of the GNU General Public License v2
159 -
160 -EAPI="7"
161 -
162 -PYTHON_COMPAT=( python3_6 )
163 -
164 -inherit python-r1 toolchain-funcs
165 -
166 -MY_PV="${PV/_rc/-rc}"
167 -MY_P="${PN}-${MY_PV}"
168 -
169 -DESCRIPTION="Jens Axboe's Flexible IO tester"
170 -HOMEPAGE="https://brick.kernel.dk/snaps/"
171 -SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
172 -
173 -LICENSE="GPL-2"
174 -SLOT="0"
175 -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
176 -IUSE="aio curl glusterfs gnuplot gtk libressl numa rbd rdma static tcmalloc zlib"
177 -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )
178 - libressl? ( curl )"
179 -
180 -BDEPEND="virtual/pkgconfig"
181 -
182 -# GTK+:2 does not offer static libaries.
183 -LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
184 - curl? (
185 - net-misc/curl:=[static-libs(+)]
186 - !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
187 - libressl? ( dev-libs/libressl:0=[static-libs(+)] )
188 - )
189 - glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
190 - gtk? ( dev-libs/glib:2[static-libs(+)] )
191 - numa? ( sys-process/numactl[static-libs(+)] )
192 - rbd? ( sys-cluster/ceph[static-libs(+)] )
193 - rdma? (
194 - sys-fabric/libibverbs[static-libs(+)]
195 - sys-fabric/librdmacm[static-libs(+)]
196 - )
197 - tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
198 - zlib? ( sys-libs/zlib[static-libs(+)] )"
199 -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
200 - gtk? ( x11-libs/gtk+:2 )"
201 -DEPEND="${RDEPEND}
202 - static? ( ${LIB_DEPEND} )"
203 -RDEPEND+="
204 - gnuplot? (
205 - sci-visualization/gnuplot
206 - $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
207 - ${PYTHON_DEPS}
208 - )"
209 -
210 -S="${WORKDIR}/${MY_P}"
211 -
212 -PATCHES=(
213 - "${FILESDIR}"/fio-2.2.13-libmtd.patch
214 - "${FILESDIR}"/fio-3.16-snprintf.patch
215 - "${FILESDIR}"/fio-3.16-verify_only_numberio.patch
216 -)
217 -
218 -python_check_deps() {
219 - has_version "dev-python/pandas[${PYTHON_USEDEP}]"
220 -}
221 -
222 -src_prepare() {
223 - default
224 -
225 - sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
226 -
227 - # Many checks don't have configure flags.
228 - sed -i \
229 - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
230 - -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
231 - -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
232 - configure || die
233 -}
234 -
235 -src_configure() {
236 - chmod g-w "${T}"
237 - # not a real configure script
238 - # TODO: pmem
239 - set -- \
240 - ./configure \
241 - --disable-optimizations \
242 - --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
243 - --cc="$(tc-getCC)" \
244 - --disable-pmem \
245 - $(usex curl '' '--disable-http') \
246 - $(usex glusterfs '' '--disable-gfapi') \
247 - $(usex gtk '--enable-gfio' '') \
248 - $(usex numa '' '--disable-numa') \
249 - $(usex rbd '' '--disable-rbd') \
250 - $(usex rdma '' '--disable-rdma') \
251 - $(usex static '--build-static' '') \
252 - $(usex tcmalloc '' '--disable-tcmalloc')
253 - echo "$@"
254 - "$@" || die 'configure failed'
255 -}
256 -
257 -src_compile() {
258 - emake V=1 OPTFLAGS=
259 -}
260 -
261 -src_install() {
262 - emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
263 -
264 - if use gnuplot ; then
265 - sed -i 's:python2.7:python:g' \
266 - "${ED}/usr/bin/fio2gnuplot" \
267 - "${ED}/usr/bin/fiologparser_hist.py" \
268 - "${ED}/usr/bin/fiologparser.py"
269 - python_replicate_script \
270 - "${ED}/usr/bin/fio2gnuplot" \
271 - "${ED}/usr/bin/fiologparser_hist.py" \
272 - "${ED}/usr/bin/fiologparser.py"
273 - else
274 - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
275 - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
276 - rm "${ED}"/usr/share/fio/*.gpm || die
277 - rmdir "${ED}"/usr/share/fio/ 2>/dev/null
278 - fi
279 -
280 - # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
281 - rm "${ED}"/usr/bin/genfio || die
282 -
283 - dodoc README REPORTING-BUGS HOWTO
284 - docinto examples
285 - dodoc examples/*
286 -}
287
288 diff --git a/sys-block/fio/fio-3.16.ebuild b/sys-block/fio/fio-3.16.ebuild
289 deleted file mode 100644
290 index fa28576751a..00000000000
291 --- a/sys-block/fio/fio-3.16.ebuild
292 +++ /dev/null
293 @@ -1,129 +0,0 @@
294 -# Copyright 1999-2020 Gentoo Authors
295 -# Distributed under the terms of the GNU General Public License v2
296 -
297 -EAPI="7"
298 -
299 -PYTHON_COMPAT=( python3_6 )
300 -
301 -inherit python-r1 toolchain-funcs
302 -
303 -MY_PV="${PV/_rc/-rc}"
304 -MY_P="${PN}-${MY_PV}"
305 -
306 -DESCRIPTION="Jens Axboe's Flexible IO tester"
307 -HOMEPAGE="https://brick.kernel.dk/snaps/"
308 -SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
309 -
310 -LICENSE="GPL-2"
311 -SLOT="0"
312 -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
313 -IUSE="aio curl glusterfs gnuplot gtk libressl numa rbd rdma static tcmalloc zlib"
314 -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )
315 - libressl? ( curl )"
316 -
317 -BDEPEND="virtual/pkgconfig"
318 -
319 -# GTK+:2 does not offer static libaries.
320 -LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
321 - curl? (
322 - net-misc/curl:=[static-libs(+)]
323 - !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
324 - libressl? ( dev-libs/libressl:0=[static-libs(+)] )
325 - )
326 - glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
327 - gtk? ( dev-libs/glib:2[static-libs(+)] )
328 - numa? ( sys-process/numactl[static-libs(+)] )
329 - rbd? ( sys-cluster/ceph[static-libs(+)] )
330 - rdma? (
331 - sys-fabric/libibverbs[static-libs(+)]
332 - sys-fabric/librdmacm[static-libs(+)]
333 - )
334 - tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
335 - zlib? ( sys-libs/zlib[static-libs(+)] )"
336 -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
337 - gtk? ( x11-libs/gtk+:2 )"
338 -DEPEND="${RDEPEND}
339 - static? ( ${LIB_DEPEND} )"
340 -RDEPEND+="
341 - gnuplot? (
342 - sci-visualization/gnuplot
343 - $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
344 - ${PYTHON_DEPS}
345 - )"
346 -
347 -S="${WORKDIR}/${MY_P}"
348 -
349 -PATCHES=(
350 - "${FILESDIR}"/fio-2.2.13-libmtd.patch
351 - "${FILESDIR}"/fio-3.16-snprintf.patch
352 -)
353 -
354 -python_check_deps() {
355 - has_version "dev-python/pandas[${PYTHON_USEDEP}]"
356 -}
357 -
358 -src_prepare() {
359 - default
360 -
361 - sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
362 -
363 - # Many checks don't have configure flags.
364 - sed -i \
365 - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
366 - -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
367 - -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
368 - configure || die
369 -}
370 -
371 -src_configure() {
372 - chmod g-w "${T}"
373 - # not a real configure script
374 - # TODO: pmem
375 - set -- \
376 - ./configure \
377 - --disable-optimizations \
378 - --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
379 - --cc="$(tc-getCC)" \
380 - --disable-pmem \
381 - $(usex curl '' '--disable-http') \
382 - $(usex glusterfs '' '--disable-gfapi') \
383 - $(usex gtk '--enable-gfio' '') \
384 - $(usex numa '' '--disable-numa') \
385 - $(usex rbd '' '--disable-rbd') \
386 - $(usex rdma '' '--disable-rdma') \
387 - $(usex static '--build-static' '') \
388 - $(usex tcmalloc '' '--disable-tcmalloc')
389 - echo "$@"
390 - "$@" || die 'configure failed'
391 -}
392 -
393 -src_compile() {
394 - emake V=1 OPTFLAGS=
395 -}
396 -
397 -src_install() {
398 - emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
399 -
400 - if use gnuplot ; then
401 - sed -i 's:python2.7:python:g' \
402 - "${ED}/usr/bin/fio2gnuplot" \
403 - "${ED}/usr/bin/fiologparser_hist.py" \
404 - "${ED}/usr/bin/fiologparser.py"
405 - python_replicate_script \
406 - "${ED}/usr/bin/fio2gnuplot" \
407 - "${ED}/usr/bin/fiologparser_hist.py" \
408 - "${ED}/usr/bin/fiologparser.py"
409 - else
410 - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
411 - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
412 - rm "${ED}"/usr/share/fio/*.gpm || die
413 - rmdir "${ED}"/usr/share/fio/ 2>/dev/null
414 - fi
415 -
416 - # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
417 - rm "${ED}"/usr/bin/genfio || die
418 -
419 - dodoc README REPORTING-BUGS HOWTO
420 - docinto examples
421 - dodoc examples/*
422 -}
423
424 diff --git a/sys-block/fio/fio-3.17-r1.ebuild b/sys-block/fio/fio-3.17-r1.ebuild
425 deleted file mode 100644
426 index 213a718797a..00000000000
427 --- a/sys-block/fio/fio-3.17-r1.ebuild
428 +++ /dev/null
429 @@ -1,147 +0,0 @@
430 -# Copyright 1999-2020 Gentoo Authors
431 -# Distributed under the terms of the GNU General Public License v2
432 -
433 -EAPI="7"
434 -
435 -PYTHON_COMPAT=( python3_6 )
436 -
437 -inherit python-r1 toolchain-funcs
438 -
439 -MY_PV="${PV/_rc/-rc}"
440 -MY_P="${PN}-${MY_PV}"
441 -
442 -DESCRIPTION="Jens Axboe's Flexible IO tester"
443 -HOMEPAGE="https://brick.kernel.dk/snaps/"
444 -SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
445 -
446 -LICENSE="GPL-2"
447 -SLOT="0"
448 -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
449 -IUSE="aio curl glusterfs gnuplot gtk libressl numa python rbd rdma static tcmalloc zlib"
450 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
451 - libressl? ( curl )
452 - gnuplot? ( python )"
453 -
454 -BDEPEND="virtual/pkgconfig"
455 -
456 -# GTK+:2 does not offer static libaries.
457 -LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
458 - curl? (
459 - net-misc/curl:=[static-libs(+)]
460 - !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
461 - libressl? ( dev-libs/libressl:0=[static-libs(+)] )
462 - )
463 - glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
464 - gtk? ( dev-libs/glib:2[static-libs(+)] )
465 - numa? ( sys-process/numactl[static-libs(+)] )
466 - rbd? ( sys-cluster/ceph[static-libs(+)] )
467 - rdma? (
468 - sys-fabric/libibverbs[static-libs(+)]
469 - sys-fabric/librdmacm[static-libs(+)]
470 - )
471 - tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
472 - zlib? ( sys-libs/zlib[static-libs(+)] )"
473 -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
474 - gtk? ( x11-libs/gtk+:2 )"
475 -DEPEND="${RDEPEND}
476 - static? ( ${LIB_DEPEND} )"
477 -RDEPEND+="
478 - python? (
479 - ${PYTHON_DEPS}
480 - $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
481 - )
482 - gnuplot? ( sci-visualization/gnuplot )"
483 -
484 -S="${WORKDIR}/${MY_P}"
485 -
486 -PATCHES=(
487 - "${FILESDIR}"/fio-2.2.13-libmtd.patch
488 - "${FILESDIR}"/fio-3.16-verify_only_numberio.patch
489 -)
490 -
491 -python_check_deps() {
492 - has_version "dev-python/pandas[${PYTHON_USEDEP}]"
493 -}
494 -
495 -src_prepare() {
496 - default
497 -
498 - sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
499 -
500 - # Many checks don't have configure flags.
501 - sed -i \
502 - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
503 - -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
504 - -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
505 - configure || die
506 -}
507 -
508 -src_configure() {
509 - chmod g-w "${T}"
510 - # not a real configure script
511 - # TODO: pmem
512 - set -- \
513 - ./configure \
514 - --disable-optimizations \
515 - --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
516 - --cc="$(tc-getCC)" \
517 - --disable-pmem \
518 - $(usex curl '' '--disable-http') \
519 - $(usex glusterfs '' '--disable-gfapi') \
520 - $(usex gtk '--enable-gfio' '') \
521 - $(usex numa '' '--disable-numa') \
522 - $(usex rbd '' '--disable-rbd') \
523 - $(usex rdma '' '--disable-rdma') \
524 - $(usex static '--build-static' '') \
525 - $(usex tcmalloc '' '--disable-tcmalloc')
526 - echo "$@"
527 - "$@" || die 'configure failed'
528 -}
529 -
530 -src_compile() {
531 - emake V=1 OPTFLAGS=
532 -}
533 -
534 -src_install() {
535 - emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
536 -
537 - local python2_7_files=(
538 - "${ED}"/usr/bin/fiologparser_hist.py
539 - "${ED}"/usr/bin/fiologparser.py
540 - )
541 - local python_files=(
542 - "${python2_7_files[@]}"
543 - "${ED}"/usr/bin/fio_jsonplus_clat2csv
544 - )
545 - if use python ; then
546 - sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die
547 - python_replicate_script "${python2_7_files[@]}"
548 - else
549 - rm "${python_files[@]}" || die
550 - fi
551 -
552 - local gnuplot_python2_7_files=(
553 - "${ED}"/usr/bin/fio2gnuplot
554 - )
555 - local gnuplot_files=(
556 - "${gnuplot_python2_7_files[@]}"
557 - "${ED}"/usr/bin/fio_generate_plots
558 - "${ED}"/usr/share/man/man1/fio_generate_plots.1
559 - "${ED}"/usr/share/man/man1/fio2gnuplot.1
560 - "${ED}"/usr/share/fio/*.gpm
561 - )
562 - if use gnuplot ; then
563 - sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die
564 - python_replicate_script "${gnuplot_python2_7_files[@]}"
565 - else
566 - rm "${gnuplot_files[@]}" || die
567 - rmdir "${ED}"/usr/share/fio/ || die
568 - fi
569 -
570 - # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
571 - rm "${ED}"/usr/bin/genfio || die
572 -
573 - dodoc README REPORTING-BUGS HOWTO
574 - docinto examples
575 - dodoc examples/*
576 -}
577
578 diff --git a/sys-block/fio/fio-3.17.ebuild b/sys-block/fio/fio-3.17.ebuild
579 deleted file mode 100644
580 index 49775e5a636..00000000000
581 --- a/sys-block/fio/fio-3.17.ebuild
582 +++ /dev/null
583 @@ -1,129 +0,0 @@
584 -# Copyright 1999-2020 Gentoo Authors
585 -# Distributed under the terms of the GNU General Public License v2
586 -
587 -EAPI="7"
588 -
589 -PYTHON_COMPAT=( python3_6 )
590 -
591 -inherit python-r1 toolchain-funcs
592 -
593 -MY_PV="${PV/_rc/-rc}"
594 -MY_P="${PN}-${MY_PV}"
595 -
596 -DESCRIPTION="Jens Axboe's Flexible IO tester"
597 -HOMEPAGE="https://brick.kernel.dk/snaps/"
598 -SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
599 -
600 -LICENSE="GPL-2"
601 -SLOT="0"
602 -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
603 -IUSE="aio curl glusterfs gnuplot gtk libressl numa rbd rdma static tcmalloc zlib"
604 -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )
605 - libressl? ( curl )"
606 -
607 -BDEPEND="virtual/pkgconfig"
608 -
609 -# GTK+:2 does not offer static libaries.
610 -LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
611 - curl? (
612 - net-misc/curl:=[static-libs(+)]
613 - !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
614 - libressl? ( dev-libs/libressl:0=[static-libs(+)] )
615 - )
616 - glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
617 - gtk? ( dev-libs/glib:2[static-libs(+)] )
618 - numa? ( sys-process/numactl[static-libs(+)] )
619 - rbd? ( sys-cluster/ceph[static-libs(+)] )
620 - rdma? (
621 - sys-fabric/libibverbs[static-libs(+)]
622 - sys-fabric/librdmacm[static-libs(+)]
623 - )
624 - tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
625 - zlib? ( sys-libs/zlib[static-libs(+)] )"
626 -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
627 - gtk? ( x11-libs/gtk+:2 )"
628 -DEPEND="${RDEPEND}
629 - static? ( ${LIB_DEPEND} )"
630 -RDEPEND+="
631 - gnuplot? (
632 - sci-visualization/gnuplot
633 - $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
634 - ${PYTHON_DEPS}
635 - )"
636 -
637 -S="${WORKDIR}/${MY_P}"
638 -
639 -PATCHES=(
640 - "${FILESDIR}"/fio-2.2.13-libmtd.patch
641 - "${FILESDIR}"/fio-3.16-verify_only_numberio.patch
642 -)
643 -
644 -python_check_deps() {
645 - has_version "dev-python/pandas[${PYTHON_USEDEP}]"
646 -}
647 -
648 -src_prepare() {
649 - default
650 -
651 - sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
652 -
653 - # Many checks don't have configure flags.
654 - sed -i \
655 - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
656 - -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
657 - -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
658 - configure || die
659 -}
660 -
661 -src_configure() {
662 - chmod g-w "${T}"
663 - # not a real configure script
664 - # TODO: pmem
665 - set -- \
666 - ./configure \
667 - --disable-optimizations \
668 - --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
669 - --cc="$(tc-getCC)" \
670 - --disable-pmem \
671 - $(usex curl '' '--disable-http') \
672 - $(usex glusterfs '' '--disable-gfapi') \
673 - $(usex gtk '--enable-gfio' '') \
674 - $(usex numa '' '--disable-numa') \
675 - $(usex rbd '' '--disable-rbd') \
676 - $(usex rdma '' '--disable-rdma') \
677 - $(usex static '--build-static' '') \
678 - $(usex tcmalloc '' '--disable-tcmalloc')
679 - echo "$@"
680 - "$@" || die 'configure failed'
681 -}
682 -
683 -src_compile() {
684 - emake V=1 OPTFLAGS=
685 -}
686 -
687 -src_install() {
688 - emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
689 -
690 - if use gnuplot ; then
691 - sed -i 's:python2.7:python:g' \
692 - "${ED}/usr/bin/fio2gnuplot" \
693 - "${ED}/usr/bin/fiologparser_hist.py" \
694 - "${ED}/usr/bin/fiologparser.py"
695 - python_replicate_script \
696 - "${ED}/usr/bin/fio2gnuplot" \
697 - "${ED}/usr/bin/fiologparser_hist.py" \
698 - "${ED}/usr/bin/fiologparser.py"
699 - else
700 - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
701 - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
702 - rm "${ED}"/usr/share/fio/*.gpm || die
703 - rmdir "${ED}"/usr/share/fio/ 2>/dev/null
704 - fi
705 -
706 - # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
707 - rm "${ED}"/usr/bin/genfio || die
708 -
709 - dodoc README REPORTING-BUGS HOWTO
710 - docinto examples
711 - dodoc examples/*
712 -}
713
714 diff --git a/sys-block/fio/fio-3.7.ebuild b/sys-block/fio/fio-3.7.ebuild
715 deleted file mode 100644
716 index d3a0e110fd2..00000000000
717 --- a/sys-block/fio/fio-3.7.ebuild
718 +++ /dev/null
719 @@ -1,111 +0,0 @@
720 -# Copyright 1999-2020 Gentoo Authors
721 -# Distributed under the terms of the GNU General Public License v2
722 -
723 -EAPI=6
724 -
725 -PYTHON_COMPAT=( python3_6 )
726 -
727 -inherit eutils python-r1 toolchain-funcs
728 -
729 -MY_PV="${PV/_rc/-rc}"
730 -MY_P="${PN}-${MY_PV}"
731 -
732 -DESCRIPTION="Jens Axboe's Flexible IO tester"
733 -HOMEPAGE="http://brick.kernel.dk/snaps/"
734 -SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
735 -
736 -LICENSE="GPL-2"
737 -SLOT="0"
738 -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
739 -IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
740 -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )"
741 -
742 -# GTK+:2 does not offer static libaries.
743 -LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
744 - glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
745 - gtk? ( dev-libs/glib:2[static-libs(+)] )
746 - numa? ( sys-process/numactl[static-libs(+)] )
747 - rbd? ( sys-cluster/ceph[static-libs(+)] )
748 - rdma? (
749 - sys-fabric/libibverbs[static-libs(+)]
750 - sys-fabric/librdmacm[static-libs(+)]
751 - )
752 - zlib? ( sys-libs/zlib[static-libs(+)] )"
753 -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
754 - gtk? ( x11-libs/gtk+:2 )"
755 -DEPEND="${RDEPEND}
756 - static? ( ${LIB_DEPEND} )"
757 -RDEPEND+="
758 - gnuplot? (
759 - sci-visualization/gnuplot
760 - ${PYTHON_DEPS}
761 - )"
762 -
763 -S="${WORKDIR}/${MY_P}"
764 -
765 -PATCHES=(
766 - "${FILESDIR}"/fio-2.2.13-libmtd.patch
767 -)
768 -
769 -src_prepare() {
770 - sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
771 -
772 - # Many checks don't have configure flags.
773 - sed -i \
774 - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
775 - -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
776 - -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
777 - configure || die
778 - default
779 -}
780 -
781 -src_configure() {
782 - chmod g-w "${T}"
783 - # not a real configure script
784 - # TODO: pmem
785 - set -- \
786 - ./configure \
787 - --disable-optimizations \
788 - --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
789 - --cc="$(tc-getCC)" \
790 - --disable-pmem \
791 - $(usex glusterfs '' '--disable-gfapi') \
792 - $(usex gtk '--enable-gfio' '') \
793 - $(usex numa '' '--disable-numa') \
794 - $(usex rbd '' '--disable-rbd') \
795 - $(usex rdma '' '--disable-rdma') \
796 - $(usex static '--build-static' '')
797 - echo "$@"
798 - "$@" || die 'configure failed'
799 -}
800 -
801 -src_compile() {
802 - emake V=1 OPTFLAGS=
803 -}
804 -
805 -src_install() {
806 - emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
807 -
808 - if use gnuplot ; then
809 - sed -i 's:python2.7:python:g' \
810 - "${ED}/usr/bin/fio2gnuplot" \
811 - "${ED}/usr/bin/fiologparser_hist.py" \
812 - "${ED}/usr/bin/fiologparser.py"
813 - python_replicate_script \
814 - "${ED}/usr/bin/fio2gnuplot" \
815 - "${ED}/usr/bin/fiologparser_hist.py" \
816 - "${ED}/usr/bin/fiologparser.py"
817 - else
818 - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
819 - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
820 - rm "${ED}"/usr/share/fio/*.gpm || die
821 - rmdir "${ED}"/usr/share/fio/ 2>/dev/null
822 - fi
823 -
824 - # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
825 - rm "${ED}"/usr/bin/genfio || die
826 -
827 - dodoc README REPORTING-BUGS HOWTO
828 - docinto examples
829 - dodoc examples/*
830 -}