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.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 111 insertions, 10 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/Manifest b/sys-block/fio/Manifest
index 21a9f37659f0..8159e18d366b 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -54,17 +54,24 @@ EBUILD fio-2.1.4.ebuild 1293 SHA256 fe41e5847d3b2e86005d9a109ac602005146ef8153bd
 EBUILD fio-2.1.5.ebuild 1243 SHA256 0599acf57d2e8ea7e1b32b9bb6f1d6b22f26844438f6bc9066c093082c950988 SHA512 bb9a7516e4d6c2c4d0647846ca470e800fa9f7d783391238fbcfb0516d3078e22d9bdfbf2ed94d042dfa4855ad2ce196d5cfd72dbdc10f623ccd10e882c12c58 WHIRLPOOL e9e10a2611e9a36629433e54cc98f1114a7ee8f8d6f69e7a78354cb2c7f0bdce408ba10556830a9a0db2f1869e6cb656df41faddc53ac2e02be1a4fa35f815d2
 EBUILD fio-2.1.6.1.ebuild 1245 SHA256 c3bc06f0dadb5a52c85f073f074f8c86bbb3ead4666619920121eb7a1d80ff49 SHA512 da38e665edf5d519a82e68bda4e6965e3c976feae4997fcb1984a820a2d806f2d61b9364b029acc61f6a3a9167deab86e2faa72d70bf3d4d43de25bd045a72e0 WHIRLPOOL f914528ca3cb900a5c05c943ac91ec7c41a1ea8b92366d19dd725703eb019f0937a74c130b57b94e3255419b45d8bcbba72188834f34080928a2d67af795f6c0
 EBUILD fio-2.1.7.ebuild 1243 SHA256 ed5b19b051a070bd116c54db5f9476177cc8bd2016833a6acb726356471d7f8d SHA512 583d524a1df9596373695c4fecacbc8bd9750f859d63990e11924da3bbb2cb2e89d3dcb3fe8a6358c9b594d8d77e3b4d5aea8f8cdb866561d03025b925194989 WHIRLPOOL a4229f11abb105a505ce730ec3ba85021ff4d7e82d80c65d62cbe143c1876c3a58ee318ba2c6c676667d60b11b64480d8185b799ae8c526fd18ff2426cac2167
+EBUILD fio-2.1.8-r1.ebuild 2096 SHA256 6975643a7b531634509995af0f4b20cde846155bd2348c5fb62778a1b19ca3a7 SHA512 8d507846ba5865089b8fe701be6a423d9bf7945f2f7b61c4b9b16f36326555d820a234d29c579b43a784fe59fed4a7c958ee39fc52aec870ec7640b27cb3375c WHIRLPOOL 19a8e58ffa5c671de7fd3a5b5dfbd8cfbad31ca9b6c135a12c5c6d91c9cc4a66328de14a674a39a7a441a4f837587c8a0f8038d2fd6f327ed7811b1fee0ad7dc
 EBUILD fio-2.1.8.ebuild 1243 SHA256 423f7bb912ddf169cbcc891f4a6905ae7d85acf19547dcc12271be74c51e6f06 SHA512 095e8683cc5032119597631805a0558a832b493a8b677e09691aa0f5b4dea17e324f446c2b4f90ee89248125415a23eefe52f03680c085a51f831ab91e4f827f WHIRLPOOL 8ae5391bf821cf8aeb4880560fd61286b345139fdf8afaf41a2a75286169d2551395b6b3abe366a2a3a7c010ac701e2c2a578040242d8f0c4c81356b95e3b8f2
-MISC ChangeLog 5200 SHA256 b367ca63891513a9ae24ca5e8d76b2b656adb4a6d122dc518cda97df274ef108 SHA512 31895854b524084ce15e0246ec03b7df5d37a27882c8209fba7252adfd6e95280f23e97a04680a1794e5febb5d9b37f7f110c1bf230d5d16a7c4f7708c0d74bb WHIRLPOOL e4b8ef375722322cd174698ac1498bb85b951a239a7b385d201bae97d599638e1e8705476f69c1a08fa92b982cf3b69622d828ec24e97a2fbef5593cb4fb0fe7
-MISC metadata.xml 276 SHA256 bfd43d2df2ba2cc7700cddc5f855a6a26f2eda1ec7017bf4cb057358ba51263a SHA512 b24c5ddb2963bca8ba760cbd2aa75b5c17c969e06a0535569c2aae3c668c4446e16b6a6a261c806428e31d5a5ceb1fbca38f431ee95a5ee4021624caed9659f5 WHIRLPOOL fc6c35071b6fdf79c496878485df76cdcc8f125892e9cf05574b1fefee0bde3acb48bbe1e84e985bbdc4733fef60be7acea247b4ec50cf9a7edc8467c9f63c49
+MISC ChangeLog 5602 SHA256 6e7269d5b9d9f1ef5901a595a44dd1ee6243877b71411a5b0899f2594abf784e SHA512 92643ec07a9408dbf323c3a87d42b395a43c0fe2d0d35ec96c5fde3577aa2813473cd04fd0d72a88eb0f4087e564b2d14b56da2caf4d63b95c94af16892edfd0 WHIRLPOOL c19dc30d1cebe50611a629ab7eb445c1a302b709842dc9f4b1167757e7142faa6be560cd48049316dd8099bd2a2823aa18a6b6fa5ff08129661f60c70d4e9cb4
+MISC metadata.xml 452 SHA256 5b6d0e9054d1eac1b7990980f960776666c8077053b1b4afcb0e6d274dea86fc SHA512 9a3b2c5edc41973d8a9ec4ac9f385a86d94598c9724d8105a2d7983221aeb1798bf8f3f06dca39e2d5f7f5406209ebfa99c07fd3611db5decba534ca62f9f67e WHIRLPOOL 7ea8effc47fb8e193b5c5e3d5c50d1e69d05d3fc4d950e129075df1d3d5c5fe6bb307ea5928f7e2b4af8dabd1d30d419697a7b60b1f61d54c865601068df4f2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTSMhxAAoJEEqz6FtPBkyjFRgIAId+E4a58MvD36I/5vuP3PF7
-tRoFZ3IN8E2hPx969d8KlztRs98IbRrPDCF9h7MGXjU/5f2odTOJpCf0y80mI85R
-5P3xqVoyLHshyDr6VqF7g1wdamHxNMRgxQ/c8OSMyA0dJT8qwzs9Xm8tcCRcrqpI
-pgwI78/Dp/B9voC9B1NH/EJ3Ft9niavFRnalD6XcRm6h0Xk6XdLb5qutOVa2u7ru
-NdIbDVSNR7gZPmyCXvU9V211OpDiHffY72J+OSu86NKpH+jVAPW4faxA8lH18JYw
-Yzb1rUS/z+N/N2gy63okmg2UetOJ1aaXSdwa8NchAVEhGm2qDwAzBPbUVbPqpDI=
-=wV0f
+iQIcBAEBCAAGBQJTSXGqAAoJEPGu1DbS6WIAZzYQAInSumveuhS7+ci6JErDB+be
+7GxXRktV4bfy2G8GDE/5KxkO4qr1boWffUSzAqCIZodN+wJ7uvmVCC6MiaZ9TTD1
+s2tbo93RQnwZXOhCBA6jMUbPvonfFwuqAGN1JJGApGL3AxeFMZ647r+wl/iItwoc
+6uLkYnwp/so4sq6HnnRCe5hUaq8uGHliJTdaAnPz3Eap6dsBREXRyHC5FEOx675c
+iiqdnS7QMnQduY3XfInkkYFd0qxwZ61Bxwhuf4alwnGgkhle1vP0fOQUnRUH1uvd
+FgU6+2dmAi0Gw5TPLoNuFts2VEzrYKLeY6BHVKAr2EmAPvYq2vwckDpjNIaIrxFt
+exdbfK4Ysv9tCiH0yflo0guX8NfuPjKRYiKE2iYfW+eWczo1rAo39MZxlL+18wSb
+9BnBkwDs5kiQuzWKq4LLgKiq1QzysdhIPCIK/DNdda8EP3xmwh7dZ0WUmbpEk/q9
+MtC3q0gUEHf09BSPIoElk2Mi/TfZiyQS+dFZly/5d4r/yAlNk7F7TkiY3987VqMS
+xOBGev41YnJoFGkhiBugWc07YMIDOzPrMBct6JyCqi2UBYOR3XfOxZZoOFNJRQ8P
+BW2M905lS1DeSQjKY904bmo/nYY0uS9G/2/lXZQykUyZ3SVAJbrDmmi/0RywTtxV
+AsY8Qj8UUlOcgfuFSQTg
+=MaX+
 -----END PGP SIGNATURE-----
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>