fixing bug 541348 and some major cleanup

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)

32 files changed, 25 insertions, 1492 deletions

diff --git a/sys-block/fio/ChangeLog b/sys-block/fio/ChangeLog
index 1a28ef99de8e..36e664530045 100644
--- a/sys-block/fio/ChangeLog
+++ b/sys-block/fio/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-block/fio
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/ChangeLog,v 1.58 2015/01/13 05:12:43 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/ChangeLog,v 1.59 2015/03/09 01:10:34 prometheanfire Exp $
+
+*fio-2.2.4-r1 (09 Mar 2015)
+
+  09 Mar 2015; Matthew Thode <prometheanfire@gentoo.org> +fio-2.2.4-r1.ebuild,
+  -fio-1.17.ebuild, -fio-1.18.1.ebuild, -fio-1.20.ebuild, -fio-1.21.ebuild,
+  -fio-1.21_rc3.ebuild, -fio-1.22.ebuild, -fio-1.23.ebuild, -fio-1.25.1.ebuild,
+  -fio-1.34.ebuild, -fio-1.50_rc4.ebuild, -fio-1.58.ebuild, -fio-2.0.10.ebuild,
+  -fio-2.0.13.ebuild, -fio-2.0.14.ebuild, -fio-2.0.3.ebuild, -fio-2.0.8.ebuild,
+  -fio-2.0.9.ebuild, -fio-2.1.10-r1.ebuild, -fio-2.1.10.ebuild,
+  -fio-2.1.11-r1.ebuild, -fio-2.1.11.ebuild, -fio-2.1.14.ebuild,
+  -fio-2.1.2.ebuild, -fio-2.1.4.ebuild, -fio-2.1.5.ebuild, -fio-2.1.6.1.ebuild,
+  -fio-2.1.7.ebuild, -fio-2.1.8-r1.ebuild, -fio-2.1.8.ebuild, -fio-2.2.4.ebuild,
+  metadata.xml:
+  fixing bug 541348 and some major cleanup
 
 *fio-2.2.4 (13 Jan 2015)
 
diff --git a/sys-block/fio/fio-1.17.ebuild b/sys-block/fio/fio-1.17.ebuild
deleted file mode 100644
index 4095f972fe5c..000000000000
--- a/sys-block/fio/fio-1.17.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.17.ebuild,v 1.3 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-1.18.1.ebuild b/sys-block/fio/fio-1.18.1.ebuild
deleted file mode 100644
index 176591e17a6e..000000000000
--- a/sys-block/fio/fio-1.18.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.18.1.ebuild,v 1.2 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-1.20.ebuild b/sys-block/fio/fio-1.20.ebuild
deleted file mode 100644
index 4d9cd0d78eb8..000000000000
--- a/sys-block/fio/fio-1.20.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.20.ebuild,v 1.3 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.21.ebuild b/sys-block/fio/fio-1.21.ebuild
deleted file mode 100644
index c12ad5fd5661..000000000000
--- a/sys-block/fio/fio-1.21.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.21.ebuild,v 1.2 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.21_rc3.ebuild b/sys-block/fio/fio-1.21_rc3.ebuild
deleted file mode 100644
index 31faa51532db..000000000000
--- a/sys-block/fio/fio-1.21_rc3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.21_rc3.ebuild,v 1.3 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.22.ebuild b/sys-block/fio/fio-1.22.ebuild
deleted file mode 100644
index 636272c9bdb7..000000000000
--- a/sys-block/fio/fio-1.22.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.22.ebuild,v 1.3 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.23.ebuild b/sys-block/fio/fio-1.23.ebuild
deleted file mode 100644
index b4032df6b516..000000000000
--- a/sys-block/fio/fio-1.23.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.23.ebuild,v 1.2 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.25.1.ebuild b/sys-block/fio/fio-1.25.1.ebuild
deleted file mode 100644
index 7d62aadb7e0b..000000000000
--- a/sys-block/fio/fio-1.25.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.25.1.ebuild,v 1.2 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.34.ebuild b/sys-block/fio/fio-1.34.ebuild
deleted file mode 100644
index a5d855929867..000000000000
--- a/sys-block/fio/fio-1.34.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.34.ebuild,v 1.4 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.50_rc4.ebuild b/sys-block/fio/fio-1.50_rc4.ebuild
deleted file mode 100644
index e6b73d2db373..000000000000
--- a/sys-block/fio/fio-1.50_rc4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.50_rc4.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.58.ebuild b/sys-block/fio/fio-1.58.ebuild
deleted file mode 100644
index d56ba9eec98c..000000000000
--- a/sys-block/fio/fio-1.58.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.58.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.10.ebuild b/sys-block/fio/fio-2.0.10.ebuild
deleted file mode 100644
index f7cb26aab56e..000000000000
--- a/sys-block/fio/fio-2.0.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.10.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.13.ebuild b/sys-block/fio/fio-2.0.13.ebuild
deleted file mode 100644
index ff51716ae359..000000000000
--- a/sys-block/fio/fio-2.0.13.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.13.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.14.ebuild b/sys-block/fio/fio-2.0.14.ebuild
deleted file mode 100644
index 5209ca8d4976..000000000000
--- a/sys-block/fio/fio-2.0.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.14.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		-e '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' \
-		Makefile || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	: # not a real configure script
-	./configure --extra-cflags="${CFLAGS}" --cc="$(tc-getCC)"
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.3.ebuild b/sys-block/fio/fio-2.0.3.ebuild
deleted file mode 100644
index e662f1fca4ee..000000000000
--- a/sys-block/fio/fio-2.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.3.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.8.ebuild b/sys-block/fio/fio-2.0.8.ebuild
deleted file mode 100644
index 663223800a80..000000000000
--- a/sys-block/fio/fio-2.0.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.8.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.9.ebuild b/sys-block/fio/fio-2.0.9.ebuild
deleted file mode 100644
index 4676feef84de..000000000000
--- a/sys-block/fio/fio-2.0.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.9.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.10-r1.ebuild b/sys-block/fio/fio-2.1.10-r1.ebuild
deleted file mode 100644
index 4df0f9d71b4f..000000000000
--- a/sys-block/fio/fio-2.1.10-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.10-r1.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-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 gnuplot gtk numa zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	zlib? ( 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}-json.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
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		|| 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.1.10.ebuild b/sys-block/fio/fio-2.1.10.ebuild
deleted file mode 100644
index 6372cd467b91..000000000000
--- a/sys-block/fio/fio-2.1.10.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.10.ebuild,v 1.4 2014/09/07 17:42:56 robbat2 Exp $
-
-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 gnuplot gtk numa zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	zlib? ( 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_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
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		|| 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.1.11-r1.ebuild b/sys-block/fio/fio-2.1.11-r1.ebuild
deleted file mode 100644
index fb73d39beb57..000000000000
--- a/sys-block/fio/fio-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.11-r1.ebuild,v 1.4 2014/09/24 19:48:36 maekke Exp $
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	glusterfs? ( sys-cluster/glusterfs )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	rbd? ( sys-cluster/ceph )
-	zlib? ( 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_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
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		|| 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.1.11.ebuild b/sys-block/fio/fio-2.1.11.ebuild
deleted file mode 100644
index ee02d2ad5811..000000000000
--- a/sys-block/fio/fio-2.1.11.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.11.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-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 gnuplot gtk numa zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	zlib? ( 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_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
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		|| 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.1.2.ebuild b/sys-block/fio/fio-2.1.2.ebuild
deleted file mode 100644
index 47f3ed0add36..000000000000
--- a/sys-block/fio/fio-2.1.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.2.ebuild,v 1.4 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic 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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' \
-		-e '/-o gfio/s/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
-		Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot.py"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.4.ebuild b/sys-block/fio/fio-2.1.4.ebuild
deleted file mode 100644
index 97aba9c3e97c..000000000000
--- a/sys-block/fio/fio-2.1.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.4.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic 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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' \
-		-e '/-o gfio/s/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
-		Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.5.ebuild b/sys-block/fio/fio-2.1.5.ebuild
deleted file mode 100644
index 8153540cefd3..000000000000
--- a/sys-block/fio/fio-2.1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.5.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic 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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.6.1.ebuild b/sys-block/fio/fio-2.1.6.1.ebuild
deleted file mode 100644
index 07318552ffe3..000000000000
--- a/sys-block/fio/fio-2.1.6.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.6.1.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic 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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.7.ebuild b/sys-block/fio/fio-2.1.7.ebuild
deleted file mode 100644
index 778ddec47652..000000000000
--- a/sys-block/fio/fio-2.1.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.7.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic 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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.8-r1.ebuild b/sys-block/fio/fio-2.1.8-r1.ebuild
deleted file mode 100644
index 249489b65e2b..000000000000
--- a/sys-block/fio/fio-2.1.8-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.8-r1.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio gnuplot gtk numa zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	zlib? ( 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_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
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		|| 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.1.8.ebuild b/sys-block/fio/fio-2.1.8.ebuild
deleted file mode 100644
index bc77baaf3e03..000000000000
--- a/sys-block/fio/fio-2.1.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.8.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic 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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.14.ebuild b/sys-block/fio/fio-2.2.4-r1.ebuild
index c6d6bd852870..98cc28e03c21 100644
--- a/sys-block/fio/fio-2.1.14.ebuild
+++ b/sys-block/fio/fio-2.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.14.ebuild,v 1.2 2015/01/13 05:12:43 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.2.4-r1.ebuild,v 1.1 2015/03/09 01:10:34 prometheanfire Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -16,16 +16,18 @@ 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 zlib"
+IUSE="aio glusterfs gnuplot gtk numa rbd rdma zlib"
 
 DEPEND="aio? ( dev-libs/libaio )
-	glusterfs? ( sys-cluster/glusterfs )
+	glusterfs? ( !arm? ( sys-cluster/glusterfs ) )
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gtk+:2
 	)
-	numa? ( sys-process/numactl )
-	rbd? ( sys-cluster/ceph )
+	numa? ( !arm? ( sys-process/numactl ) )
+	rbd? ( !arm? ( !ppc? ( sys-cluster/ceph ) ) )
+	rdma? ( !ppc? ( !ppc64? ( !ia64? ( !arm? (
+		sys-infiniband/librdmacm ) ) ) ) )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
 	gnuplot? (
@@ -44,6 +46,7 @@ src_prepare() {
 		-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:" \
+		-e '/if compile_prog "" "-lrdmacm" "rdma" ; then/'"s::if $(usex rdma true false) ; then:" \
 		configure || die
 }
 
@@ -57,6 +60,7 @@ src_configure() {
 		$(usex gtk '--enable-gfio' '') \
 		$(usex numa '' '--disable-numa') \
 		$(usex rbd '' '--disable-rbd') \
+		$(usex rdma '' '--enable-rdma') \
 		|| die 'configure failed'
 }
 
diff --git a/sys-block/fio/fio-2.2.4.ebuild b/sys-block/fio/fio-2.2.4.ebuild
deleted file mode 100644
index 8dd04b354cda..000000000000
--- a/sys-block/fio/fio-2.2.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.2.4.ebuild,v 1.1 2015/01/13 05:12:43 prometheanfire Exp $
-
-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 zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	glusterfs? ( sys-cluster/glusterfs )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	rbd? ( sys-cluster/ceph )
-	zlib? ( 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_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
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		|| 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/metadata.xml b/sys-block/fio/metadata.xml
index 17877aa398ca..76526f751f3b 100644
--- a/sys-block/fio/metadata.xml
+++ b/sys-block/fio/metadata.xml
@@ -13,5 +13,6 @@
 		<flag name="gnuplot">Install tools for generating gnuplots</flag>
 		<flag name="numa">Enable numa support</flag>
 		<flag name="rbd">Enable Rados block device support via <pkg>sys-cluster/ceph</pkg></flag>
+		<flag name="rdma">Enable infiniband support via <pkg>sys-infiniband/librdmacm</pkg></flag>
 	</use>
 </pkgmetadata>