3 files changed, 107 insertions, 15 deletions
diff --git a/sys-block/fio/ChangeLog b/sys-block/fio/ChangeLog
index beaa52056c1d..e2f6ffe57cd4 100644
--- a/sys-block/fio/ChangeLog
+++ b/sys-block/fio/ChangeLog
@@ -1,6 +1,11 @@
 # 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.60 2015/03/11 06:02:43 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/ChangeLog,v 1.61 2015/07/07 10:09:07 vapier Exp $
+
+*fio-2.2.9 (07 Jul 2015)
+
+  07 Jul 2015; Mike Frysinger <vapier@gentoo.org> +fio-2.2.9.ebuild:
+  Version bump.
 
   11 Mar 2015; Matthew Thode <prometheanfire@gentoo.org> fio-2.2.4-r1.ebuild:
   removing badness arm? 542850 and fixing 542640
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index a1a56a2001fb..a17201ed8f4e 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -9,28 +9,30 @@ DIST fio-2.0.14.tar.bz2 253574 SHA256 4bf01f1d2baf6d4fa905e5489e446e85e01979c427
 DIST fio-2.0.15.tar.bz2 258773 SHA256 3cc1b5e6c6955f9acad016b4d2ef619061ad9937874c7663e2a29777ed845ac4 SHA512 00289a0404cb44dd670614856932fbdf61cb1508e0eb672e5778c2ba3eba661b82892f7c969e4a82cf4fc487a744eb7411bfebf3b9612863de0197a28787f556 WHIRLPOOL 08b37573b63f812ea62c4ba323f05f510a9656e74f780117bd711bcc78e7fc7b5bef009212e7ec98f0ed153cc3786ece4d75d565845c0bc5eaba59afa1b037d8
 DIST fio-2.1.9.tar.bz2 429122 SHA256 4ae877939a1a1460ad4d93f7891a15bad8ca7295f441204b12c723758a0d4493 SHA512 91913941c0d83705c156eef550eb87b388368804ee722c8c99ea638481ee657960e333c58b54e720034e92c2c34e9a8bb901336399a209a87f5eaa1ad1dfde53 WHIRLPOOL 6f44cbfe601f436b1ed0173e1dfbcf3b342f1a191c947392f0167a2dba9c4806fa422ffaedf9475f83b49fab8832aa1076ba91d27a9f2bdbcae126fa4d708824
 DIST fio-2.2.4.tar.bz2 467312 SHA256 9e1c77216457d9e21e418a55fa28bc1f98c283723fe9dcccff6138e3fb25285b SHA512 91fa0d8f9dd8d950dd26ef5c778414acddd9d6deeb84caeecdfef08df7e00c7972566a76bd242b0d5aea33a7c588aa05cf2fdcd79ef5a475277a2139d1f111a1 WHIRLPOOL 4588601d5f44c1836f97cc223bf08cce3f29f5ea3421880c00a16dcd9e3cffd741bbdd2029518712f8808548469d7f44f1b0348189643419bfd2104eab980536
+DIST fio-2.2.9.tar.bz2 492404 SHA256 c881d9cf15500bd4436970d0467c356c5c021417131587931ba78845e965bf56 SHA512 e0cd26bb8a760ef5e40ddb73246671c1988f0c0886bd24fa510fcab93fe64d8853f120355f55fa109168c7fae0b081f63278f2233644f5ed20da4e4c3cb3f3fc WHIRLPOOL 4f5ada7f1140c7229fc3173fa0582a4ae7401121768d8dec828dcd42c1c22ec828e9c000c482b155ead4fd75ee15c4d7678fc7c6d18c8fbb9c749e83f87a4881
 EBUILD fio-1.17.2.ebuild 783 SHA256 99737e98189787260770e7e2833f64a6c0a71bc5fbc690b5e142300ff34870f2 SHA512 044b6c866945a6d36dfafd42f7fc338a5f4181ca9231ba0b6293e5eb862b67041245d31c78d678be559570833c930ced9d57a75b3a0d2ee9b2552f6b9f031c73 WHIRLPOOL 6af1a7ec804843049b9b428f6ec102e3201c8f7449f893fc51f352b1caeec8145b1e499547e667822da60520962d76dc8b9238bb79b89fa36cd25c49f6736b43
 EBUILD fio-1.99.10.ebuild 1014 SHA256 561242beee2c66fcb179df121b3bc48eece4982cf5d8ebabe7d04de9ce6f2284 SHA512 24c1ac77bd6c17386267fa3be8cd1762097f10c4985fff9344f179c3dea297b869728ea8635f50da993ec4882e91f1337e343d4befe52c336579217a97e886ce WHIRLPOOL 347ff9eecb392c066a4e4376e27056e46ce594b1ace6e1590baeb6cfa8d1ba0107bd89b4d2f9bc05eae430b3578d8b04743c91aa9827a21592e8f8851022efa9
 EBUILD fio-2.0.14-r1.ebuild 1158 SHA256 846868591432a9d345dc2d96c79a20e898f8cfd477e97b541017e984ada9677d SHA512 54895f6f56a91022f3e406634872d4c5668f3cc425eaace9e6d31a26d46b4253f3cda74fa76c0c4c3fceb9467b19ba229589a83090e86f588e996e4985c03de1 WHIRLPOOL d536408b08e11d97e50a76e2229d3323b1dc4c1e0288a04b77de78d135a7fd48c99069e583f6f6c36f7e150fde10217dcef8d84190b5b6ee15521fbe8f56764f
 EBUILD fio-2.0.15.ebuild 1187 SHA256 5133e47f7177c5804031b7d1b4cf83dcea17449299cf18885a4e3ffe703d6494 SHA512 3897d20f51b38a16e68b0cfbfb82e238c20221c7b551ca7b1944216bab9b33149cfc2bd7590d3c50482c7a0d99025d43b4ec7e0843cc3703ee48fc8f62d16650 WHIRLPOOL 520f5417d0b127557e65c1ab97225975b5846ff873c700d67401facd237cd8ccc0b2530bc4235a462a98c50fcc98452438551f56986d009d93beefca7eac900b
 EBUILD fio-2.1.9.ebuild 2112 SHA256 9ebe04c6c0d790e96339d842a3f01cbc41d273c8672e9d14a2537bf9ceb8d56e SHA512 a3f2d07f83c2046d60b82261dc0bc058530a036f0a64f67d79268625ef25391614ed58d7ef26686bb47a6ab4f17232772b33c9af835e0b43509d0f71373d46d4 WHIRLPOOL 3e5710d18a5338d3e03c8e327cc96fbf9d887fbaba1ecca71ad75225dd3f279507b39d962bd5d67917898577280939d652110e18ce33ed6fa6cd6f3e4c69f3bc
 EBUILD fio-2.2.4-r1.ebuild 2299 SHA256 e7b5b8f45e22fa4c65b09a5fa503510e9c5dcd84656f4ec8b78e4e969b0ccd9d SHA512 d2e72bfed65da0199c47ea75b4af766c7c7f846ff94a2174855dd15bbaf378c45d4552e5701984cf73d1809aedd340001cec7854845b4ad5243e93a289cac768 WHIRLPOOL 099a4f5189a01737c44b45af80eaf22e849f592649d14261c0fa387ec7bfe3f94ac3a9e063b520d3c2f9290264ccc2bb8067e6a506d0909cf7f6ee42bb6e7926
-MISC ChangeLog 9545 SHA256 b2c5a8340b424ec325a2b51d1531b960c8b676e3d139f313879464c0e11eafee SHA512 2476d90107dbc62efa1abe8c26ada7a4b6c856a7ee530397a5a6fb831d6c751ead926b087062fc2b54bd9f7c8aa59b10ce567bf6570431e47fbd2b08cd6f0216 WHIRLPOOL 3e348d345e8504d61e56ed8348fee2e44aba13f16528a7659ee1db0c5df3557baecdd19ab41a378e7c66ee4518913efc63272ba7e92fd453647f1571f54e89c5
+EBUILD fio-2.2.9.ebuild 2288 SHA256 e0770b1d68a601d1365c714e717d9199cc00353d2436a127a8ad0f0bd753f34b SHA512 6c498498aebaba432a3eb4888e7465c015925d13419209944477388109f421e4c37d9106bef507a4389548f18414d540bd27225fd491118b7000be8625bc9dbc WHIRLPOOL 708d26cb53a71d88883aa37ac0e40909968de4f84af4260d3c8c9d1ca0c81f88a27b0819b56a01332dc4f205675828092b2de36a63fe70d9c30dcada2e58045f
+MISC ChangeLog 9649 SHA256 a922455e763a55de1d30c3a50925753fb5b42f7230cc755b4bdc42137bc4cd9f SHA512 37d81713af135ff6bbfa6873b1ba80acf88e0e149a9381bc7d817d6316b8b57b33a9c13fd9d174f7a5379d6933d9fce99015ec9c4c5ae4904fe26f5076bdc3a4 WHIRLPOOL 9077014b5d538c8bee2eb97734b0e95307fe28aa31562d2fba0dbc33d888b4f57f008c32d25f7cac238523975c12eb4812c03445a1c677d6f66c8641e4513f84
 MISC metadata.xml 737 SHA256 5e3b3ce6fdea78c1c6bcf040693a0c444f66593a77b1af1e0cf954878e57b65c SHA512 6c58fb6f99d79e88439a531d2dca5cf143b56aeaad079354160b8c332dbc7a8d16585a2de18588f5a990179f292e1da70bef5e523ec9f55bb6c6c59ace058542 WHIRLPOOL f7f78bb4d85dbbd4447801d4dd845e243a37ad65d16dfeabb5a5eae1064371970c12b4a97ec356278cef9f38395da19956625a568cffff4081c9ce5906b78eda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU/9q1AAoJEGSje+quGaTot+EP/2S2SIvlhHbkmO49yOwKTvvk
-qJRi7d+X+0NAOfah8g1EzaNWt3HaL/jhF/YZTzd/iPvAaJ66AFjcfBASCyuigf6S
-ICoB/klUJ42Nt39eu9YnbPi9p6OzOLj8BSDfVYBo522P3zy3r2lmgBdY8hSIA4wy
-qLv5O4UuyM85gmhNEtSMuMUgiVcXnKa6sut0U1AtSbMp9g7QZnbtbFEmzXdZPSD5
-39YlUMH6SJU0GqEBAl5RSTvii8MFDtszvV4rOwGYMwYrGx/zYgYZNYVD/ObZeRAd
-W2EZ1HjQJ21aZLZN6QZxmoyb6nM3D1IOr0xpyAkuqXV4lVhNAyhLeAeiJtSZY93b
-vvYfNIBrWvPksqPY0ZXtFBdhLDf7y8x+/YpBnz769mv/VNT6c7yU52M0ZmpbxKnO
-wbjVROmpXQ+nejKYIGYH9VPmQulaREiuIA0R1JTocO5yfqmFI+E4DvW0ONEk4+bC
-aOOpyv0MvhPvNSdJspTQ+53j/ST4MfXxpBGNGQB0monQHaW+7uRiExVIrnW39m9N
-MolxWSY7x6CysvG60IaLp9NWbW+iXpZSXj+zOXs4+4Sd5/YceSfx0bnDx+mei5ci
-8ufzahfWePzHYkh9XeXVWaAIOTa9bjsYU5dn/i50gZgWToRvl4SaO08hp3NkWTx4
-aQ0gOAK8bBJpeM3Hee9v
-=cMQK
+iQIcBAEBCAAGBQJVm6VEAAoJEPGu1DbS6WIACdEP/i8IGOlBNx5Q69G3i2kTQu79
+tX/bzcwqnBk3gtjXTDsKRFA3c8R3Oq/p/whN7LW83COqgEVMqTr5v+htyLbUW4oM
+2rY3fwBo5R8fxe6J9gP6JZzi4lKicZSCidbSwAabbcsBwcZyws/kcWLIa4viku1A
+9BjKM0hRegwGRDPUuaQhlLxOo6/1bAZBwTar5sVjpNKQDPrG+ij2MgMMXaQa9R8L
+IDw2Q/u4829HsbX1bkF8GPRip3CsefhPFXjVuc4bzaE+TcboFGcXTjINBywALJYN
+ApABnhAljDWXbhf4YZq0Wj50HEbx5FVeAjFCKIlwJH0SsgN9CIiInjjdEcB+vLsD
+hgh+e4ZMAUU8stR4TnlsW8GFnYF874qz4lNAzgmQiPagda5+3Yb1QCS820OMG8mT
+oEfXZLeIx7ZoseEjKb0/tHcbSbDVRbf6ztXroyuKgF/Tv1JL2Js8lNZfRYg3qmjr
+kPujUo8GvhZY/qkVvRd60i5jo7QEmgKB4aK1FJp4LsuJpXi4RzZtfyx6MRD0gLGH
+DpVfDywVPc1RAp+oUd4l4i64p0lXaoPT4b+DfDFSkF6HGHGks5siKXa0il7equxe
+oVYthu81FDS9rbU+d5YdQTy9Lq8zLT8QVWNTu7BgL4Q0vHqs0Hg1R8nKTAU5Sdf+
+t434CdjyXI7lqwxMK68q
+=90Yf
 -----END PGP SIGNATURE-----
diff --git a/sys-block/fio/fio-2.2.9.ebuild b/sys-block/fio/fio-2.2.9.ebuild
new file mode 100644
index 000000000000..18e2e2f8352e
--- /dev/null
+++ b/sys-block/fio/fio-2.2.9.ebuild
@@ -0,0 +1,85 @@
+# 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.9.ebuild,v 1.1 2015/07/07 10:09:07 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 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="aio glusterfs gnuplot gtk numa rbd rdma zlib"
+
+DEPEND="aio? ( dev-libs/libaio )
+	glusterfs? ( !arm? ( 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/*
+}