Add USE=gnuplot to control the gnuplot related scripts (including python dep). Delete the genfio script since it has security/parallel run issues. Control the aio/numa/zlib deps via USE flags. Drop -W flag usage as it seems to be pointless. Respect CPPFLAGS/PKG_CONFIG env vars.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 95 insertions, 1 deletions

diff --git a/sys-block/fio/ChangeLog b/sys-block/fio/ChangeLog
index 5880212f1185..4b499a650f6d 100644
--- a/sys-block/fio/ChangeLog
+++ b/sys-block/fio/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-block/fio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/ChangeLog,v 1.43 2014/04/12 05:00:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/ChangeLog,v 1.44 2014/04/12 17:02:30 vapier Exp $
+
+*fio-2.1.8-r1 (12 Apr 2014)
+
+  12 Apr 2014; Mike Frysinger <vapier@gentoo.org> +fio-2.1.8-r1.ebuild,
+  metadata.xml:
+  Add USE=gnuplot to control the gnuplot related scripts (including python dep).
+  Delete the genfio script since it has security/parallel run issues. Control
+  the aio/numa/zlib deps via USE flags. Drop -W flag usage as it seems to be
+  pointless. Respect CPPFLAGS/PKG_CONFIG env vars.
 
 *fio-2.1.8 (12 Apr 2014)
 
diff --git a/sys-block/fio/fio-2.1.8-r1.ebuild b/sys-block/fio/fio-2.1.8-r1.ebuild
new file mode 100644
index 000000000000..5f5190129704
--- /dev/null
+++ b/sys-block/fio/fio-2.1.8-r1.ebuild
@@ -0,0 +1,80 @@
+# 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.1 2014/04/12 17:02:30 vapier 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() {
+	# 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/metadata.xml b/sys-block/fio/metadata.xml
index dbee0aa46b5f..c5decdf2ca33 100644
--- a/sys-block/fio/metadata.xml
+++ b/sys-block/fio/metadata.xml
@@ -7,4 +7,9 @@
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="aio">Enable AIO ioengine</flag>
+		<flag name="gnuplot">Install tools for generating gnuplots</flag>
+		<flag name="numa">Enable numa support</flag>
+	</use>
 </pkgmetadata>