gentoo resync : 30.06.2018

9 files changed, 120 insertions, 11 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 4db01012881c..e258657f4955 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index c4006733205b..e2133a16eaa1 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -3,7 +3,9 @@ AUX fio-2.2.15-rdma.patch 1667 BLAKE2B 7744c58500f0d3c73eb63314bc939f03190907c23
 DIST fio-2.15.tar.bz2 545809 BLAKE2B 163530097a6ff08016c977a328bc499d052c423890c8e7074bc91fb00b02b3d951dd0369ff772fa5f36a37e0b1b7d6b358c3df99bf70db9bec2bbc7f90eee596 SHA512 fa3380031e6e0a597eb34e597af91efbc824a3d5753793fdb00cb10e693943e0358afaad9624eb4333e81182c94424a56fbd1d434eeff098dbf2fc4e19167db0
 DIST fio-2.16.tar.bz2 558662 BLAKE2B cbc6e6000bd497fc92779c34688c0862f3adccd7c399ca5d4e4ce9ee9c40faddfec9b3fcca2fad2cd91ca00eee95c4a108273496c9e63db8017695ecf42d294d SHA512 f71c8ab8423e82ceae160bae8c17ac1222c1b2dde2ccb1b2aedb2288e0eb60485f8e9f3908640d4f6cebf166a148f4ad64026c035381c5db5141bf3059349d75
 DIST fio-3.2.tar.bz2 613565 BLAKE2B e721d698338dd8d2c6215780a2d9a10c643a5912d3c27b3e759b4c14585ae1afe4edab5bdc54df8cf19c6f3727f8f4b19ce9da3298a5f0ef3753a5d8f423f4ef SHA512 97ea5ed6587d1e7382a67ab7ad933b6e332ba84cb648d17dcebad3c95c9eb6b1c04a4537e3470f890607f2921da77fcd4e49079b8b78f2d15e9c199dab850d1e
+DIST fio-3.7.tar.bz2 629354 BLAKE2B 99a1c88481c7a693e31b1a0bc23bc80e85df92385f9d5a7de8d6479be8bc425326a20d794eb4809f822adfcd06e07c66ebed321faa9dbae7a2c1d3c766a6467d SHA512 b1f5cb35fe1c06e030c570959ab9a96d936f9eaa2f7f30d5a34f34fd93fae057da07c4084a06143cd5188ad6b2cc06b564484f8867e050cfeddc0ee3fb0fe266
 EBUILD fio-2.15.ebuild 2693 BLAKE2B 302c54d0b33a6b4a14e1a19ff8cb1848438d87a2732860bfe947f50105eff2a59abb457cb2aefa5cac302a81c0146c3f6858ed91caceaeb54da44864e2c49b60 SHA512 5052d1f15e6250f0802a6a9786aef3ea95fa61a54cb1c7a58c29e80a8b79ed3170096b51fe20f3e8cf4b7ba264fcc4beb25a8e32f222ef7619af6324d73b7a91
 EBUILD fio-2.16.ebuild 2907 BLAKE2B b524791f0ecea03ae3a17994295224963fb9eb10b2b339f4dbdcbb546fbafd24cf905777817878cecd22df2158f84ed1ddfc6d311909ca569bd5ef91da0f1218 SHA512 ae8bd404cddedd37a41729e1ec570df997dd9b4484daa9e77a75c4887ee0bb26d5cffbb015fd1e154103d276f2db11486bb49d09b8dbc897f3d5ba5865fb1559
 EBUILD fio-3.2.ebuild 2855 BLAKE2B 9496bc95ff5ad4511285897285904b352e8e5e1ba547f8eed4932bece1b98f229c7677405c3f6af7e6948ab710e13d79612b94d9442f8371f63cd2a15003b9c6 SHA512 72db1a54e4e876142a7e4c1b16fa467fc0024a1d67eda20a77c97a9685833a03d5a0acaa54b07e0e62e3e12ebd128d2e49ccd58e36758f70c62ca9df25d09bd1
+EBUILD fio-3.7.ebuild 2885 BLAKE2B 135cb06fa67eddc80d2aacfbc725d05e979505d5ba3097f46adeafff6feeed1e3608b5dff6dc09a5b025fa44cb371a78a52ffb13faadab37e9eec36213a08ebd SHA512 10dcb6e674afe017fa000b65a1d052b8ca6b16ab74da96f1b3c645d2c54fe966de4d7450f26bc0420bb0436523b1d85cc33bb3ee70fdc6e5840b1741b3c668f1
 MISC metadata.xml 761 BLAKE2B 196d8933527b9a6ca6731e173a00543723452f972edf59f44273a33259ffd77d9bed0bd8652d718608f741d49338e69a4e6eddc77e65478749aef8a76f4871cd SHA512 b5f10abbb437a0833b0a02e870b91b56c49c264d190e65e2a88fe45f4d19f40040c300e91dc11d8055118a30a7f334cc2283b9f55852f5baf985eae44cb26e01
diff --git a/sys-block/fio/fio-3.7.ebuild b/sys-block/fio/fio-3.7.ebuild
new file mode 100644
index 000000000000..dd2a2649eca2
--- /dev/null
+++ b/sys-block/fio/fio-3.7.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+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"
+REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )"
+
+# 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(+)] )
+	rdma? (
+		sys-fabric/libibverbs[static-libs(+)]
+		sys-fabric/librdmacm[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}"
+
+PATCHES=(
+	"${FILESDIR}"/fio-2.2.13-libmtd.patch
+)
+
+src_prepare() {
+	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
+
+	# 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
+	default
+}
+
+src_configure() {
+	chmod g-w "${T}"
+	# not a real configure script
+	# TODO: pmem
+	set -- \
+	./configure \
+		--disable-optimizations \
+		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+		--cc="$(tc-getCC)" \
+		--disable-pmem \
+		$(usex glusterfs '' '--disable-gfapi') \
+		$(usex gtk '--enable-gfio' '') \
+		$(usex numa '' '--disable-numa') \
+		$(usex rbd '' '--disable-rbd') \
+		$(usex rdma '' '--disable-rdma') \
+		$(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" \
+			"${ED}/usr/bin/fiologparser_hist.py" \
+			"${ED}/usr/bin/fiologparser.py"
+	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/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 2a621598b9bf..413700e89392 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -8,7 +8,7 @@ DIST mbuffer-20180318.tgz 137259 BLAKE2B bec1f6acc68c3c9cf617dd7a752644628d08854
 DIST mbuffer-20180410.tgz 140026 BLAKE2B d271b4c744d5c54aebaea9a68a674df184ac460f879ac4788afaca732466c95dd958145ffcb42155ed998cab771a5b0e70a57a6b479d244156afe6232c37b154 SHA512 88fdad5b767bc4dabdbe3300cf3de99a56d137ac991aa5be7ba383fc2447ec01cb43853f31ec88be3bf0cfa736753afe8bd5ef0a5abb386521f2d3316b781d74
 DIST mbuffer-20180505.tgz 140183 BLAKE2B 4c575c9654f15b4f81357fff21f41170627f6747313a462a76abbb8f5125a2e97549a9975aa67a59b402af6651b4e27b17e4ac7ea72b45620b43542ebccf9107 SHA512 b2f541332afadb42bbd2452d2079373f9d8ad44f0fe5eab2934cf4c46c6b2e4ec18c862ed385ba10e5b820efeab28c982bcf4ffa37a9cf70c5c92b5aabde7f4f
 EBUILD mbuffer-20150412.ebuild 795 BLAKE2B 92d4c504fb558dafd340c80c814240c3dc266a8f1a28bddc8621004269da216a16b2630a637963c0478208c0e5761a6ee99570dbf1a96fd84058a377190c04ce SHA512 b4b9c424ccc4da361b00a173c4d18f0bd55994242f962c35c79dcd6edaec7c4f7e3ab29a18314b2dc047ea4916171dafaca57de7bf49ad18ae18a6989a93f32b
-EBUILD mbuffer-20171011.ebuild 1420 BLAKE2B b31a6e5966ed14f909055f3bbf41d9a10fff33afbb7764faa5f533683ac70321e7b4ba093c234ffe56a43eee6039b7250fbf9f6c40515d47387faf4775dd6d64 SHA512 cee05fbb0a9b10dd65fec4e7b16a56f04f5db516ee526ff478109e623d7efe485d82d3ea83e30e181d10faf64d1ab9827d5b1bb4c6da35898a24c6a14a04f50a
+EBUILD mbuffer-20171011.ebuild 1419 BLAKE2B b623eea89a7b8d913c885b818d94b83ca4883df2d44d2c36463d2e62d9240affed87290989359c51a380e56a763d31f98440de4a011a05692aa2ec686b890d07 SHA512 94da802069d9c9336d85fc837ab8debbd5441aa69530714b3f90690ff13b7e9ef42a86448ba1e443b60b3cacf7ac9646397b5c3f5f71256b5dd631490439539c
 EBUILD mbuffer-20180318.ebuild 1422 BLAKE2B 7743ea686f29752e4168b3932ceadd3393b5334b550121848c4b65196a005f270a90013bbe69596d623959930c77e4e625178382eb878c1d7bf49663fe0a9422 SHA512 c7e2e07b7130a13dea4080303024ba4f127d6b63f62c882d5073b602b942fc07991f27eb73afe7e35fe79b91ddd3115b9a58c94d5dee3535a014e0af0fc2fe6c
 EBUILD mbuffer-20180410.ebuild 1462 BLAKE2B 20f10be9d294edba49618c493b8001292c73a6a5a43e5633ea169b1f920f6463d728a368acad3c6506ad425cb0a2dc042c67488b363f318eae2bde7b9cf7a171 SHA512 ea7ba8e7e0981208c8f8a0f41467f4fd55e4fe99280fdb5d022a54d285ee66a06fe11ccf028e46556ced87760a9e838128af0fa0113a8727c4131eb01e53667d
 EBUILD mbuffer-20180505.ebuild 1462 BLAKE2B 20f10be9d294edba49618c493b8001292c73a6a5a43e5633ea169b1f920f6463d728a368acad3c6506ad425cb0a2dc042c67488b363f318eae2bde7b9cf7a171 SHA512 ea7ba8e7e0981208c8f8a0f41467f4fd55e4fe99280fdb5d022a54d285ee66a06fe11ccf028e46556ced87760a9e838128af0fa0113a8727c4131eb01e53667d
diff --git a/sys-block/mbuffer/mbuffer-20171011.ebuild b/sys-block/mbuffer/mbuffer-20171011.ebuild
index 3597331e692b..76fdd8feac16 100644
--- a/sys-block/mbuffer/mbuffer-20171011.ebuild
+++ b/sys-block/mbuffer/mbuffer-20171011.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug ssl test"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/sys-block/whdd/Manifest b/sys-block/whdd/Manifest
index a1426c33952b..8eed56509e4b 100644
--- a/sys-block/whdd/Manifest
+++ b/sys-block/whdd/Manifest
@@ -1,6 +1,6 @@
 DIST whdd-2.2.tar.gz 33317 BLAKE2B 0f0f6a36c37ec8b0df538fe6c353fc14bfd1f2cecbe2b6c0c94727d4a417c1cba3e96ecd323d52a60a67b8f169ecde2e50196db090657f496cd7d46d37fb7079 SHA512 ab30c1e418cb7ba9881b1a91b99d0b1d5389172c4d5802be69d98cb9c16f1282ff7808e2b40bb937987a9d3ad9fa7f20e630d19307eb0aa1090cff531a904d4a
 DIST whdd-3.0.tar.gz 45865 BLAKE2B 788ae197c5607f9044f68523336786eacf40eca382d531c590d3b45ec3710c5ea66740f8f5a9750a9746d78a0c6b7e9c77153345ef39cff962a6b2652f3f5d80 SHA512 f53888383dc0ed4158c13a064a2cd45e8e312b389bb79c1bfc9ce86c8a61a195fe5003821c868715316eeaba7ee5bcb387324fb6577af7f875679789cd5af5d7
-EBUILD whdd-2.2.ebuild 556 BLAKE2B 72773454e34f2236b54ea111b20d50dd13cfb94fe6360b29195bd6be09eff940fd1f01539010aa2a21262ef56f2d49516b6725f844ab42873bf0bc83a1cee8f0 SHA512 69c326f030f700d29ff945ac33ae6714a6f69d46a5b2f75bd8d061132a5e7dc13f710ce9d64746dd63918f5a395203f6c967088871207911927f06b2017a8eca
-EBUILD whdd-3.0.ebuild 632 BLAKE2B d177acdf1867745e8c648dd342c21b05819d561a37b1c7ea2382846bac3382e621f89e5e7e73b28e4661b09dddf014f8c3bae91cff4f5926c1414608e94f0547 SHA512 553f3a5ae8a56718e58817a7474bca3614f2beb8f35312fc5d72bd0802a732f05d5ecea313be04de6f48f5757bf830c11508b923f7cb11de7820ec13116425aa
-EBUILD whdd-9999.ebuild 632 BLAKE2B d177acdf1867745e8c648dd342c21b05819d561a37b1c7ea2382846bac3382e621f89e5e7e73b28e4661b09dddf014f8c3bae91cff4f5926c1414608e94f0547 SHA512 553f3a5ae8a56718e58817a7474bca3614f2beb8f35312fc5d72bd0802a732f05d5ecea313be04de6f48f5757bf830c11508b923f7cb11de7820ec13116425aa
+EBUILD whdd-2.2.ebuild 558 BLAKE2B 83dd2624700bc3760feb6805a1c0e293693364416428002ceba38a9b796a5b571bcd20ef4e46c7c07fa8d780959676fab8ad50f82b3caa05f17cec67be49ffff SHA512 082603ea4f309fcc938736a9a4bb236730e31e34d5812985286d1015f81a6cae06ad307f68977cdc6ac728baec3a2f53969c31144e5dd1668bf4d6899fbe55b6
+EBUILD whdd-3.0.ebuild 634 BLAKE2B 6a99f295aaf457883e83c3ed419810501c850c779c8f199de60517d0164cbbc31e875d92bf529ccd9322ff562811fce55b21d43bc2e12ad447b26197b500728a SHA512 fe723d7db3bad52d81f41e87b8b453bb5c4d2a0e3b784734dcdb001bf2b34d3f4c0bfa1130b2327499c6c4b4dee29fbce4674d203c01749a685eae5b3f76fb45
+EBUILD whdd-9999.ebuild 634 BLAKE2B 6a99f295aaf457883e83c3ed419810501c850c779c8f199de60517d0164cbbc31e875d92bf529ccd9322ff562811fce55b21d43bc2e12ad447b26197b500728a SHA512 fe723d7db3bad52d81f41e87b8b453bb5c4d2a0e3b784734dcdb001bf2b34d3f4c0bfa1130b2327499c6c4b4dee29fbce4674d203c01749a685eae5b3f76fb45
 MISC metadata.xml 325 BLAKE2B 4a164b15722878b9245897bdee75a486272fce67b8b0a6fcac04ac4ad4933ab9bbeb05bd0bb5273d56fe75fe72d468b5efd76d5c4e9bce53920af87ae3a0cce4 SHA512 5c0da6b1d5e04ff3adfe9f1eb4af339f72045eb38a9993a7c6db5b8a9c302e7c7651a0e245f82912d8db2ec9e450bb55ffeab398559d8f66dd084b106d40bf1a
diff --git a/sys-block/whdd/whdd-2.2.ebuild b/sys-block/whdd/whdd-2.2.ebuild
index 170ff794a99e..8f7afc6967d3 100644
--- a/sys-block/whdd/whdd-2.2.ebuild
+++ b/sys-block/whdd/whdd-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	dev-util/dialog
+	dev-util/dialog:=
 	sys-libs/ncurses:0[unicode]"
 RDEPEND="${DEPEND}
 	sys-apps/smartmontools"
diff --git a/sys-block/whdd/whdd-3.0.ebuild b/sys-block/whdd/whdd-3.0.ebuild
index 93dae25ffdd7..967ab1dc5447 100644
--- a/sys-block/whdd/whdd-3.0.ebuild
+++ b/sys-block/whdd/whdd-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	dev-util/dialog
+	dev-util/dialog:=
 	sys-libs/ncurses:0=[unicode]"
 RDEPEND="${DEPEND}
 	sys-apps/smartmontools"
diff --git a/sys-block/whdd/whdd-9999.ebuild b/sys-block/whdd/whdd-9999.ebuild
index 93dae25ffdd7..967ab1dc5447 100644
--- a/sys-block/whdd/whdd-9999.ebuild
+++ b/sys-block/whdd/whdd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	dev-util/dialog
+	dev-util/dialog:=
 	sys-libs/ncurses:0=[unicode]"
 RDEPEND="${DEPEND}
 	sys-apps/smartmontools"