[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/, sys-block/fio/files/

[Mike Frysinger]

commit:     cb6f3225601c0c0dd4aee641fd4d7859a4b7e5dd
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  1 04:58:20 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar  1 05:40:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6f3225

sys-block/fio: drop old <2.15 versions and old patches

 sys-block/fio/Manifest                          |   6 -
 sys-block/fio/files/fio-2.2.10-libmtd.patch     |  12 --
 sys-block/fio/files/fio-2.2.9-atomic-sync.patch | 140 ------------------------
 sys-block/fio/files/fio-2.8-sysmacros.patch     |  47 --------
 sys-block/fio/fio-2.15.ebuild                   |   1 -
 sys-block/fio/fio-2.16.ebuild                   |   2 +-
 sys-block/fio/fio-2.2.10.ebuild                 |  91 ---------------
 sys-block/fio/fio-2.2.13.ebuild                 |  91 ---------------
 sys-block/fio/fio-2.2.9.ebuild                  |  90 ---------------
 sys-block/fio/fio-2.5.ebuild                    |  91 ---------------
 sys-block/fio/fio-2.6.ebuild                    |  92 ----------------
 sys-block/fio/fio-2.8.ebuild                    |  94 ----------------
 12 files changed, 1 insertion(+), 756 deletions(-)

diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 28616c8d49a..cf77e929e9b 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,8 +1,2 @@
 DIST fio-2.15.tar.bz2 545809 SHA256 60044f92cfbd2f656162864aae309ab88ff5983c2e49f4b9f8271c445852f5bd SHA512 fa3380031e6e0a597eb34e597af91efbc824a3d5753793fdb00cb10e693943e0358afaad9624eb4333e81182c94424a56fbd1d434eeff098dbf2fc4e19167db0 WHIRLPOOL 32215d63a373c88041d90c6d07d87f9b4e6d4070d1b263676a817dc9ddd8cb175cbbc25e8359cec956ea26a39f40c1cb501ba897475f628ce4f6a5502939239e
 DIST fio-2.16.tar.bz2 558662 SHA256 7d8dd6897a5fa181b4b707ffb7b87306c23a5a99a3aefa1d6f510150302cb6ec SHA512 f71c8ab8423e82ceae160bae8c17ac1222c1b2dde2ccb1b2aedb2288e0eb60485f8e9f3908640d4f6cebf166a148f4ad64026c035381c5db5141bf3059349d75 WHIRLPOOL cdd11fd09dce3fec04b12f82fef6d53c8ae70623b35a39cbfe50039bf9be5d80e00715c58e9fa6dee67a471327bf6da7f741add880bfefa9eb26f432b265e9ac
-DIST fio-2.2.10.tar.bz2 497503 SHA256 04b4490c69f82bafeccbab51d33732cfd74e7a54e74eae0d9a2450faf4f1d857 SHA512 6ff71ca78b2ffa40cd9390b3e4f0b6f07db4d50c85f89c4a9e03c7f327153c0fed3eb8b7c44f3a8f8d0b1b35b48ccb5b1aa96a95fdca08581c22b99f2961c7d3 WHIRLPOOL 7bb881ecea82f3ad568d7513af0486494dc657ede69cc4de0f71e7bdf873ccf8f7a58744ab8f1fce8a1c507c3ce0f7e95eb3a7098a01fe041f04cd29a6a4afb7
-DIST fio-2.2.13.tar.bz2 503950 SHA256 66a0084c37bd8804d9f7d260d843a9a3bf51561954024d3b32062b9332281924 SHA512 b2adc4fb1b8c71bb909cfc2cfd9e0d25affcacd47908bc6d126625b448c0e964afa7c65fb88cf21662d4b9d07bfbaebbb2fd66b4c4662382ef68aaf8f053bd6d WHIRLPOOL 112af8620a73e907723760fd01caa4c582f7adba5eef5bf51bb6b695c1a15ff812957937cb67dff00b93c3e941df67d751ecf1aca1627722a6084c5494e7f70a
-DIST fio-2.2.9.tar.bz2 492404 SHA256 c881d9cf15500bd4436970d0467c356c5c021417131587931ba78845e965bf56 SHA512 e0cd26bb8a760ef5e40ddb73246671c1988f0c0886bd24fa510fcab93fe64d8853f120355f55fa109168c7fae0b081f63278f2233644f5ed20da4e4c3cb3f3fc WHIRLPOOL 4f5ada7f1140c7229fc3173fa0582a4ae7401121768d8dec828dcd42c1c22ec828e9c000c482b155ead4fd75ee15c4d7678fc7c6d18c8fbb9c749e83f87a4881
-DIST fio-2.5.tar.bz2 509978 SHA256 30f85cd6596125bd2f76b379f15a4edee1149bb0347a9c10a2dda15d7591a543 SHA512 44fc4bc342b611f9ed89685d73592389dd9e63970a9bbcc1b332aa8434a3e4a52b0c16d27b6a6dd96fcf3a9831a68af5249251895a6dbd9f7190ad0b8935eb40 WHIRLPOOL dced416aae899987ff80c6f37999a064d8a45c8ea809d7a3f3a2eea5dd3b6ae5633125326373a5da3b37429dc940f0c97fa9694e976a61819709db3b6ab7ac3e
-DIST fio-2.6.tar.bz2 509685 SHA256 b4b846fca614f724b8315348cb23e2d4a1046e63f10e79b4b310acf29c4d1ac0 SHA512 9831c3de2110c509f6c99ffe0fc8256aea2b9b337e6b2799108c89d1b5e472a85e6df9cb090549db80429658717aa75f2ab10d41359386e1dde861c600645b39 WHIRLPOOL c5138eb2def4c67ee0d5cca46db6aa663e2a1e0eead05aab5938ced20dd68bc214f217724d3bd1c4a1030b4ffee2c07ee37910b57c6f11b2ed6a0ff67d3b30cc
-DIST fio-2.8.tar.bz2 513800 SHA256 815344531a6c0201872aca43581c2e4b6fbc1d735266dd12a0c3408754ec862f SHA512 2228dab377f6664ce9e1bd6e5720e7eb256370758f6cea25c778a2480b5fbbf39630e8c5676e2cf34d9d664c7b1960c618feb1bd252fec290e09bf534672922c WHIRLPOOL fd32419a2d338a77f76d68831eb08ae7b1f34892d03bcd931a8cca3630813767fefa081148fd8f636531b62bd71c7fa0a7d4d71c53d8c8294f7cad7bb794eec6

diff --git a/sys-block/fio/files/fio-2.2.10-libmtd.patch b/sys-block/fio/files/fio-2.2.10-libmtd.patch
deleted file mode 100644
index 7e0a0c0d7d5..00000000000
--- a/sys-block/fio/files/fio-2.2.10-libmtd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar --exclude config.log fio-2.2.10/lib/libmtd.h fio-2.2.10.new/lib/libmtd.h
---- fio-2.2.10/lib/libmtd.h	2016-01-26 18:02:07.000000000 -0800
-+++ fio-2.2.10.new/lib/libmtd.h	2016-02-03 08:10:19.104693006 -0800
-@@ -29,6 +29,8 @@
- extern "C" {
- #endif
- 
-+#include <stdint.h>
-+
- /* Maximum MTD device name length */
- #define MTD_NAME_MAX 127
- /* Maximum MTD device type string length */

diff --git a/sys-block/fio/files/fio-2.2.9-atomic-sync.patch b/sys-block/fio/files/fio-2.2.9-atomic-sync.patch
deleted file mode 100644
index a8b32022e44..00000000000
--- a/sys-block/fio/files/fio-2.2.9-atomic-sync.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-fix from upstream
-
-From 2a2743361cf643b9dd2ba3e491da62e7cb83a101 Mon Sep 17 00:00:00 2001
-From: Jens Axboe <axboe@××.com>
-Date: Mon, 29 Jun 2015 09:34:39 -0600
-Subject: [PATCH] workqueue: make it work on platforms without
- __sync_fetch_and_add()
-
-Signed-off-by: Jens Axboe <axboe@××.com>
----
- configure   | 22 ++++++++++++++++++++++
- workqueue.c | 22 ++++++++++++++++++++++
- workqueue.h |  1 +
- 3 files changed, 45 insertions(+)
-
-diff --git a/configure b/configure
-index e459d63..e5cf34d 100755
---- a/configure
-+++ b/configure
-@@ -271,6 +271,7 @@ CYGWIN*)
-   output_sym "CONFIG_TCP_NODELAY"
-   output_sym "CONFIG_TLS_THREAD"
-   output_sym "CONFIG_IPV6"
-+  output_sym "CONFIG_SFA"
-   echo "CC=$CC" >> $config_host_mak
-   echo "BUILD_CFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
-   exit 0
-@@ -1492,6 +1493,24 @@ if compile_prog "" "" "getmntinfo"; then
- fi
- echo "getmntinfo                    $getmntinfo"
- 
-+##########################################
-+# Check whether we have __sync_fetch_and_add()
-+sfa=="no"
-+cat > $TMPC << EOF
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <inttypes.h>
-+int main(int argc, char **argv)
-+{
-+  uint64_t dst = 1, src = 3;
-+  __sync_fetch_and_add(&dst, src);
-+}
-+EOF
-+if compile_prog "" "" "__sync_fetch_and_add"; then
-+  sfa="yes"
-+fi
-+echo "__sync_fetch_and_add          $sfa"
-+
- #############################################################################
- 
- if test "$wordsize" = "64" ; then
-@@ -1671,6 +1690,9 @@ fi
- if test "$getmntinfo" = "yes" ; then
-   output_sym "CONFIG_GETMNTINFO"
- fi
-+if test "$sfa" = "yes" ; then
-+  output_sym "CONFIG_SFA"
-+fi
- 
- if test "$zlib" = "no" ; then
-   echo "Consider installing zlib-dev (zlib-devel), some fio features depend on it."
-diff --git a/workqueue.c b/workqueue.c
-index b9a967f..8f6963f 100644
---- a/workqueue.c
-+++ b/workqueue.c
-@@ -197,6 +197,7 @@ err:
- 	return 1;
- }
- 
-+#ifdef CONFIG_SFA
- static void sum_val(uint64_t *dst, uint64_t *src)
- {
- 	if (*src) {
-@@ -204,15 +205,34 @@ static void sum_val(uint64_t *dst, uint64_t *src)
- 		*src = 0;
- 	}
- }
-+#else
-+static void sum_val(uint64_t *dst, uint64_t *src)
-+{
-+	if (*src) {
-+		*dst += *src;
-+		*src = 0;
-+	}
-+}
-+#endif
- 
- static void sum_ddir(struct thread_data *dst, struct thread_data *src,
- 		     enum fio_ddir ddir)
- {
-+#ifndef CONFIG_SFA
-+	pthread_mutex_lock(&dst->io_wq.stat_lock);
-+	pthread_mutex_lock(&src->io_wq.stat_lock);
-+#endif
-+
- 	sum_val(&dst->io_bytes[ddir], &src->io_bytes[ddir]);
- 	sum_val(&dst->io_blocks[ddir], &src->io_blocks[ddir]);
- 	sum_val(&dst->this_io_blocks[ddir], &src->this_io_blocks[ddir]);
- 	sum_val(&dst->this_io_bytes[ddir], &src->this_io_bytes[ddir]);
- 	sum_val(&dst->bytes_done[ddir], &src->bytes_done[ddir]);
-+
-+#ifndef CONFIG_SFA
-+	pthread_mutex_unlock(&src->io_wq.stat_lock);
-+	pthread_mutex_unlock(&dst->io_wq.stat_lock);
-+#endif
- }
- 
- static void update_accounting(struct submit_worker *sw)
-@@ -355,6 +375,7 @@ void workqueue_exit(struct workqueue *wq)
- 	free(wq->workers);
- 	pthread_mutex_destroy(&wq->flush_lock);
- 	pthread_cond_destroy(&wq->flush_cond);
-+	pthread_mutex_destroy(&wq->stat_lock);
- }
- 
- static int start_worker(struct workqueue *wq, unsigned int index)
-@@ -393,6 +414,7 @@ int workqueue_init(struct thread_data *td, struct workqueue *wq,
- 	wq->next_free_worker = 0;
- 	pthread_cond_init(&wq->flush_cond, NULL);
- 	pthread_mutex_init(&wq->flush_lock, NULL);
-+	pthread_mutex_init(&wq->stat_lock, NULL);
- 
- 	wq->workers = calloc(wq->max_workers, sizeof(struct submit_worker));
- 
-diff --git a/workqueue.h b/workqueue.h
-index 5d47a5e..4e92449 100644
---- a/workqueue.h
-+++ b/workqueue.h
-@@ -17,6 +17,7 @@ struct workqueue {
- 
- 	pthread_cond_t flush_cond;
- 	pthread_mutex_t flush_lock;
-+	pthread_mutex_t stat_lock;
- 	volatile int wake_idle;
- };
- 
--- 
-2.4.4
-

diff --git a/sys-block/fio/files/fio-2.8-sysmacros.patch b/sys-block/fio/files/fio-2.8-sysmacros.patch
deleted file mode 100644
index 0881c1b91d8..00000000000
--- a/sys-block/fio/files/fio-2.8-sysmacros.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/580592
-
-From a254805d9ca1872adced3f8be2a053211b8f27eb Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@g.o>
-Date: Wed, 20 Apr 2016 12:51:23 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor
-
-These functions have always been defined in sys/sysmacros.h under
-Linux C libraries.  For some, including sys/types.h implicitly
-includes that as well, but glibc wants to deprecate that, and some
-others already have.  Include the header explicitly for the funcs.
-
-The mtd change is already in upstream mtd-utils too.
-
-Signed-off-by: Mike Frysinger <vapier@g.o>
----
- os/os-linux.h         | 1 +
- oslib/libmtd_common.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/os/os-linux.h b/os/os-linux.h
-index 9e708f0..23c16b6 100644
---- a/os/os-linux.h
-+++ b/os/os-linux.h
-@@ -6,6 +6,7 @@
- #include <sys/ioctl.h>
- #include <sys/uio.h>
- #include <sys/syscall.h>
-+#include <sys/sysmacros.h>
- #include <sys/vfs.h>
- #include <sys/mman.h>
- #include <unistd.h>
-diff --git a/oslib/libmtd_common.h b/oslib/libmtd_common.h
-index a123323..9768066 100644
---- a/oslib/libmtd_common.h
-+++ b/oslib/libmtd_common.h
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <features.h>
- #include <inttypes.h>
-+#include <sys/sysmacros.h>
- 
- #ifndef PROGRAM_NAME
- # error "You must define PROGRAM_NAME before including this header"
--- 
-2.7.4
-

diff --git a/sys-block/fio/fio-2.15.ebuild b/sys-block/fio/fio-2.15.ebuild
index 5ff7ba987f7..1158dbdae90 100644
--- a/sys-block/fio/fio-2.15.ebuild
+++ b/sys-block/fio/fio-2.15.ebuild
@@ -39,7 +39,6 @@ RDEPEND+="
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	#epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
 	epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
 	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
 	epatch_user

diff --git a/sys-block/fio/fio-2.16.ebuild b/sys-block/fio/fio-2.16.ebuild
index f3c960214b7..c57607e80a2 100644
--- a/sys-block/fio/fio-2.16.ebuild
+++ b/sys-block/fio/fio-2.16.ebuild
@@ -39,9 +39,9 @@ RDEPEND+="
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	# "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
 	"${FILESDIR}"/fio-2.2.13-libmtd.patch
 )
+
 src_prepare() {
 	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
 

diff --git a/sys-block/fio/fio-2.2.10.ebuild b/sys-block/fio/fio-2.2.10.ebuild
deleted file mode 100644
index acf467c2713..00000000000
--- a/sys-block/fio/fio-2.2.10.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-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"
-
-# GTK+:2 does not offer static libaries
-# numactl always includes static libraries
-DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? ( dev-libs/libaio ) )
-	glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static? ( sys-cluster/glusterfs ) )
-	gtk? (
-		static? ( dev-libs/glib:2[static-libs(+)] ) !static? ( dev-libs/glib:2 )
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	rbd? ( static? ( sys-cluster/ceph[static-libs(+)] ) !static? ( sys-cluster/ceph ) )
-	zlib? ( static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/fio-2.2.10-libmtd.patch
-	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-	epatch_user
-
-	# 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
-	set -- \
-	./configure \
-		--disable-optimizations \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		$(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
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	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-2.2.13.ebuild b/sys-block/fio/fio-2.2.13.ebuild
deleted file mode 100644
index dd2f14e9d1b..00000000000
--- a/sys-block/fio/fio-2.2.13.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-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"
-
-# GTK+:2 does not offer static libaries
-# numactl always includes static libraries
-DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? ( dev-libs/libaio ) )
-	glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static? ( sys-cluster/glusterfs ) )
-	gtk? (
-		static? ( dev-libs/glib:2[static-libs(+)] ) !static? ( dev-libs/glib:2 )
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	rbd? ( static? ( sys-cluster/ceph[static-libs(+)] ) !static? ( sys-cluster/ceph ) )
-	zlib? ( static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
-	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-	epatch_user
-
-	# 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
-	set -- \
-	./configure \
-		--disable-optimizations \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		$(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
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	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-2.2.9.ebuild b/sys-block/fio/fio-2.2.9.ebuild
deleted file mode 100644
index 5dd6921dfec..00000000000
--- a/sys-block/fio/fio-2.2.9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-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"
-
-# GTK+:2 does not offer static libaries
-# numactl always includes static libraries
-DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? ( dev-libs/libaio ) )
-	glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static? ( sys-cluster/glusterfs ) )
-	gtk? (
-		static? ( dev-libs/glib:2[static-libs(+)] ) !static? ( dev-libs/glib:2 )
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	rbd? ( static? ( sys-cluster/ceph[static-libs(+)] ) !static? ( sys-cluster/ceph ) )
-	zlib? ( static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-	epatch "${FILESDIR}"/${P}-atomic-sync.patch
-	epatch_user
-
-	# 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
-	set -- \
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		$(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
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	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-2.5.ebuild b/sys-block/fio/fio-2.5.ebuild
deleted file mode 100644
index dd2f14e9d1b..00000000000
--- a/sys-block/fio/fio-2.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-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"
-
-# GTK+:2 does not offer static libaries
-# numactl always includes static libraries
-DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? ( dev-libs/libaio ) )
-	glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static? ( sys-cluster/glusterfs ) )
-	gtk? (
-		static? ( dev-libs/glib:2[static-libs(+)] ) !static? ( dev-libs/glib:2 )
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	rbd? ( static? ( sys-cluster/ceph[static-libs(+)] ) !static? ( sys-cluster/ceph ) )
-	zlib? ( static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
-	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-	epatch_user
-
-	# 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
-	set -- \
-	./configure \
-		--disable-optimizations \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		$(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
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	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-2.6.ebuild b/sys-block/fio/fio-2.6.ebuild
deleted file mode 100644
index da3b76334ae..00000000000
--- a/sys-block/fio/fio-2.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-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"
-
-# GTK+:2 does not offer static libaries
-# numactl always includes static libraries
-DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? ( dev-libs/libaio ) )
-	glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static? ( sys-cluster/glusterfs ) )
-	gtk? (
-		static? ( dev-libs/glib:2[static-libs(+)] ) !static? ( dev-libs/glib:2 )
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	rbd? ( static? ( sys-cluster/ceph[static-libs(+)] ) !static? ( sys-cluster/ceph ) )
-	zlib? ( static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
-	epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
-	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-	epatch_user
-
-	# 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
-	set -- \
-	./configure \
-		--disable-optimizations \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		$(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
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	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-2.8.ebuild b/sys-block/fio/fio-2.8.ebuild
deleted file mode 100644
index cff874b73f0..00000000000
--- a/sys-block/fio/fio-2.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-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"
-
-# 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(+)] )
-	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}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
-	epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
-	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-	epatch_user
-
-	# 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
-	set -- \
-	./configure \
-		--disable-optimizations \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		$(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
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	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/*
-}