gentoo resync : 29.05.2018

13 files changed, 4 insertions, 384 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index ce14fa5be798..b6bdb2bbc41c 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/acovea/Manifest b/app-benchmarks/acovea/Manifest
index 488b99cb91af..a6bd63158514 100644
--- a/app-benchmarks/acovea/Manifest
+++ b/app-benchmarks/acovea/Manifest
@@ -5,7 +5,6 @@ AUX acovea-5.1.1-glibc-212.patch 235 BLAKE2B 13be0d214c3f0c287a560bb240efc47874b
 AUX acovea-5.1.1-libevocosm.patch 3531 BLAKE2B 1a221c1abd7499384f5ef087c4e3efa8df510bdce15c32a5b1a70420b5acb7987780dcc4db6cba9cf6609a8f91397845071ba45797c81f4911f33b79acc4d403 SHA512 41704c855fdbdef96dc7eae1f196fde895412a95a248627cbf4e99ccf28519f3725edde17d443fa92ae0f5a301b95c4d8e2255d4a48deb14d4e5a59e902cbe1f
 AUX acovea-5.1.1-underlinking.patch 327 BLAKE2B 3b611c70d306cce314baf45622e4a395fa48f0a29d663198098f8446a575176e852b878615fd5abd3460e660c25f8549492cfb0c2e6c60ed20fb6915082a18f3 SHA512 cc185181899cef9a6e1b830663a179b61170a47cbc1568ee6fd71756cee3ccc605a4568528384b9b24a7b7b4758e70f5bcf523d4ea044b31667bb024293eb883
 DIST libacovea-5.1.1.tar.gz 363048 BLAKE2B 61f894e99f3678f3b676e0926ff6d7a6bd376a654ad109d5b7f676d7053e4b975d90e0ac01d820b8498a6992db1cbd2fb5443fbe3871ef3f86bee280fd808352 SHA512 47ac88d713004ccdbf31c29bd5ead3e9d869eee262f2c12e12bf9aa7ec177d2c1e175908704cd5463b314752692edcd98d69408dbeb5873caff1745535a3a365
-EBUILD acovea-5.1.1-r1.ebuild 1099 BLAKE2B 163f42e5da8db02c85d3e29b334f1086667e8af0c9ff68d6a863b1448d1b7cfd966d16d4f31ebbec2b2f34b74ed7f435345c2ac4833507e35fd30037d44c656f SHA512 8738f812088fd73c3583f17cce6af8885f87a65de608a688592c19d941505239719cda161eb2062215704d1b5380842f7b92cdc1a0966ed7b983415e2a0af82c
 EBUILD acovea-5.1.1-r2.ebuild 924 BLAKE2B 770d72ef6cfd95f1b4c344649e3538a5409eb5b637a5cc81013a4d2f2747ead9abccbd1cee4582533b2371d69d6f8fda56a959ba4a40135ca0504d28aa4c1b39 SHA512 f2c6cfb365cca5155435b901daf0408a7264f1f999401aa93db546959b25a160026d7ed43e1896d48cac789c9acf1dd59235a3c62f39c44894a8d646b11079e8
 EBUILD acovea-5.1.1.ebuild 1057 BLAKE2B 8cfdcfd6c09b76e998ed17d7ad776b533ed8cc993a69a597dcb0d7938b11988ae8b0a7b90fa9126bfeac01216429df32d3f88acb450f4506313f90d6b353ef6a SHA512 54def173fd2bd5049bb044ce6e648ecdaee76ee9e0930bf41d1875105b2395554edcb31398c538f33db1b94ded703128287922cef38511d3b532472429ec272c
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild b/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild
deleted file mode 100644
index 5e0202450e7d..000000000000
--- a/app-benchmarks/acovea/acovea-5.1.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-WANT_AUTOMAKE=1.9
-inherit autotools eutils
-
-DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm"
-HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
-SRC_URI="http://www.coyotegulch.com/distfiles/lib${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libcoyotl-3.1.0
-	>=dev-libs/libevocosm-3.1.0
-	dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/lib${P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-free-fix.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-glibc-212.patch \
-		"${FILESDIR}"/${P}-underlinking.patch
-
-	if has_version ">=dev-libs/libevocosm-3.3.0"; then
-		epatch "${FILESDIR}"/${P}-libevocosm.patch
-	fi
-
-	eautomake
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 98438683f04c..a38584ddad5b 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -2,7 +2,7 @@ DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b33203
 DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.2.2-Linux.tar.gz 71028908 BLAKE2B 640df8bb207ea1a0a8b5c7fc4725b517406826b5d9045eb2970515c4d175be1e9972582544f7088c113e725c067ec119d390c2cef183108dd592005e60740e8a SHA512 616b8eed266407154a3dcf09af5c4047cf0be8f852d6aae663f26a29d4a9df3bcc2b4c233b21614071ee0be3ca7316c5f09bccd4769b6db78a4e6187e281920c
-EBUILD geekbench-2.4.2.ebuild 1102 BLAKE2B a9cd3836efb3586532c8d0d2063696aa3775f178af0886e49c11e8e882d37806e5938fce7e289a03fc7ca14208b9ed35a67759800990ea8560fc6b2005f6ba68 SHA512 b74d8a3309d109743b3be050b5b379a79e0644c2e284cb0cca4ee1c4dc824e6b252cbbe3dd5d5c8464c74e1bb89540e2b86653982b8067b6c4dbfc5580af0abf
+EBUILD geekbench-2.4.2.ebuild 1101 BLAKE2B 93dd1eba6ddae5b402cb07268107eaef71270119c0d83206b9951f7ddc4bf68dabb0e332eee312fd7134c14b0b190f77efe629e5e8a51c92c032c85fc1ec9241 SHA512 522b4330990ef4b965769ee4b72edbf8ab2998bfa7d01be159fa6c95cb811d7af2c99e43497f5576102b7041192dab9ce45a91d39bc5fba0eb640052f7e58c63
 EBUILD geekbench-2.4.3.ebuild 1163 BLAKE2B 1613632c4943e554ba9d01fe4b026f713395eba64d9f373ea631f6d24462dfbf889e269d6fe2f254137f0c2c6eab8b1f963955fbd155d65adf25081d34f74762 SHA512 69f90a561f0201d7209e87842f075e9da17a78655490eb801937b0d82e22a5a3a4d4534e1d9a3504516b9da3063093f22016f3b4609040b7fe6d7832edb90d03
 EBUILD geekbench-3.4.2.ebuild 1163 BLAKE2B 638365642db8db662ae19c3ef439a4076a60c7356b3142d850d2570ac55778d8837d46981be1c0ee4d2ea342ee271d95455fa8691baad99c5a52815f818be02a SHA512 b11dde6666585fa1e7471fdbc14749413468808c228e520d235466f0398d998b4118b8dd26cc30c6bdcd7a1beabbf4e4a2db72247bc67516ac07e488b4043258
 EBUILD geekbench-4.2.2.ebuild 1152 BLAKE2B 6b9bfcb5f3fac533eba78c60ad18b80630d70b4c1f54a91be0f93b08918f707006578a277933adb23de6244de6c9244e3fd796c2c1333d2885013ea805f92b90 SHA512 e7b1e6145ae6a82008d2c3d39729f7f621dfc6a1b9c1805aa24ce658ae3c0e901a370676cd600fe7de2aacdd9ad3588ec8bf053ec2648002074d6b037bdc66e7
diff --git a/app-benchmarks/geekbench/geekbench-2.4.2.ebuild b/app-benchmarks/geekbench/geekbench-2.4.2.ebuild
index 48115f3d7c98..c1bc7e6445df 100644
--- a/app-benchmarks/geekbench/geekbench-2.4.2.ebuild
+++ b/app-benchmarks/geekbench/geekbench-2.4.2.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windo
 HOMEPAGE="https://www.geekbench.com"
 SRC_URI="https://cdn.primatelabs.com/Geekbench-${PV}-LinuxARM.tar.gz"
 
-KEYWORDS="-* ~arm"
+KEYWORDS="-* arm"
 LICENSE="geekbench"
 SLOT="2"
 
diff --git a/app-benchmarks/iozone/Manifest b/app-benchmarks/iozone/Manifest
index ea2f33b8d199..eedb21e3de3b 100644
--- a/app-benchmarks/iozone/Manifest
+++ b/app-benchmarks/iozone/Manifest
@@ -1,9 +1,3 @@
-DIST iozone3_397.tar 1679360 BLAKE2B 174d4ef11fb986f4b8bbf95774f6bf22659fb9e5a38fcd0626be8bd89303e775a9d8bc632575896885a9974239205bd3b3541da71b48bf30f80234ab577eb4eb SHA512 e154b56735c922173e7cf23344fa0a478982d202b3b831fd605481f69a77295281be121aa57a0164dc12edf5975f231339f6516da5c40906586d48ebacec7c23
-DIST iozone3_408.tar 1822720 BLAKE2B 700f531addb42525b5a3e8caaabfb8e03f7d7d1fa840a840462e88bd127b508e73f4bb1362bdef1e9f1b2044b42f54ab3811e674789f1fb8d7047b15565e8ee6 SHA512 ebc808468c741fff8d7909abd7eb41303c2a68c21ed7754e12bb6f859a88a9f9d040e0cdde42cb320958fbd453ba6014ba46fb7cfb200155f55a6fa7803f5d44
-DIST iozone3_430.tar 1832960 BLAKE2B 2d8cb85d444a9505550bf4a6951a83531427ba8e4493ffdd13c9435ce07452fbbd529602a7b13b120d276fd95c76609f4d47a58ff490120272b7fcb3650711e4 SHA512 f513c1a34bcdfadca0d01a942d55c7494e5646cf17384140df42643259456d41e40a54453ab3b9a1f1ebdeb456a9b4b1f836f979927cac57391b9a20ecdbcb55
 DIST iozone3_471.tar 1853440 BLAKE2B 280c821a439ad1bacbd749278385481678d644a59c14395482c8a088b0578285f389f376fb32ce3c3abde598f50d693fb0c7c9a3d6597765547a71c76d21ea1c SHA512 c61b2b8b5af3dccdb99b26aef8a0a4f2f5f467fc3985ac72ed4bb4fb36e4b7684ca6dbaa5bbc05ae0a4e73852e048e9fd2495eda9313f5abc4e631499d683aec
-EBUILD iozone-3.397.ebuild 1857 BLAKE2B b049555c6ef9c512dd4061ccb7d29d114e1e0ae3b859cf69eb4fd8622cacdf68e838ae60a2683c55697a57bb553a67d2a9a7cc5114dd656c371b32320e4426eb SHA512 cebbc2775cd1ced1e4ef5bb8862c72c969a9bd6ee02172cd06a8ebe5d82b31e789fa9bd7c121247e6d8a5c9d1729f106079613dedcbe7e60decf2caf17e1525b
-EBUILD iozone-3.408.ebuild 1864 BLAKE2B 47c0acaccd70d0b295ddc318edce943db98ba62be2c10d892aa3183b896aa904b89cb029d9ddcc12fa818098340c55f9198bd75c8ee85f4a5b2e86e9f7d7d55a SHA512 a16bb9b42e24c2505e551ac026742780ee651fc6a1d406a18c4d1a0dc47bf9bccf57759da4c94b2a1d4013801b02e08bfd5362406f27686cf6cec65bb9215ff7
-EBUILD iozone-3.430.ebuild 1891 BLAKE2B 3a24140ab18a97992683bc8d54d5c97cc886626f723e97494f503f04f965e608b68931e814e54c5dd80edded0d6ec54f6e2c0faea9a68813ce8a4f6dd5423705 SHA512 4cad1cd75b044db95561ee93d0041d8a2d08a3164273e6df21ad34086bde57484028440c59c2abb9739134042991f612fef7c4ea5d625d232f43ee5fb2e25082
 EBUILD iozone-3.471.ebuild 1872 BLAKE2B 7d67e87c425715bc1c1125867ba950b100b27d60a1ed3b83eb80d9750a8e9d3548eccd56a683863a84d0e03e97ba8490d0e93d951b7522798d3366964c40479a SHA512 c3e27b22b1be5f6370ea3b447457c41e9de5030fd6f63c192d7d4e66f5342ec130be6f2d70db31c8c5192268e3d1876eaabe779980d12a6827f286a55936db20
 MISC metadata.xml 249 BLAKE2B e266b83580d700efa25e676fca79f0a3e3087e2ac13cd136676205d8c7129532541dee6d30cabf8040283400a70a7fdd305a114820055e092c322284e3e751b6 SHA512 541d74a2d7d079378380eaa4c09743553a6023183d1a7fc52fa527f8463eec32ec277455bf25e809e1f9cddf8a33cef8917e397bd601e9ae2831562c0ce2d6b0
diff --git a/app-benchmarks/iozone/iozone-3.397.ebuild b/app-benchmarks/iozone/iozone-3.397.ebuild
deleted file mode 100644
index 2422edcf74b5..000000000000
--- a/app-benchmarks/iozone/iozone-3.397.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-# TODO
-#        ->   linux-arm            (32bit)   <-
-#        ->   linux-AMD64          (64bit)   <-
-#        ->   linux-ia64           (64bit)   <-
-#        ->   linux-powerpc        (32bit)   <-
-#        ->   linux-powerpc64      (64bit)   <-
-#        ->   linux-S390           (32bit)   <-
-#        ->   linux-S390X          (64bit)   <-
-#
-#        ->   freebsd              (32bit)   <-
-#        ->   macosx               (32bit)   <-
-#        ->   netbsd               (32bit)   <-
-#        ->   openbsd              (32bit)   <-
-#        ->   openbsd-threads      (32bit)   <-
-#
-# ~ia64 ~s390 alpha(?) x86-fbsd
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Filesystem benchmarking program"
-HOMEPAGE="http://www.iozone.org/"
-SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}${PV/./_}
-
-src_compile() {
-	cd src/current
-
-	# Options FIX
-	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
-		-e "s:-O3:${CFLAGS}:g" makefile
-
-	case ${ARCH} in
-		x86|alpha)	PLATFORM="linux";;
-		arm)		PLATFORM="linux-arm";;
-		ppc)		PLATFORM="linux-powerpc";;
-		ppc64)		PLATFORM="linux-powerpc64";;
-		amd64)		PLATFORM="linux-AMD64";;
-		ia64)		PLATFORM="linux-ia64";;
-		s390)		PLATFORM="linux-S390";;
-		x86-fbsd)	PLATFORM="freebsd";;
-		*)			PLATFORM="linux-${ARCH}";;
-	esac
-
-	emake ${PLATFORM} || die "Compile failed"
-}
-
-src_install() {
-	dosbin src/current/iozone
-	dodoc docs/I*
-	dodoc docs/Run_rules.doc
-	dodoc src/current/Changes.txt
-	doman docs/iozone.1
-
-	insinto /usr/share/doc/${PF}
-	cd src/current
-	doins Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
-}
-
-src_test() {
-	cd "${T}"
-	"${S}"/src/current/iozone testfile || die "self test failed"
-}
diff --git a/app-benchmarks/iozone/iozone-3.408.ebuild b/app-benchmarks/iozone/iozone-3.408.ebuild
deleted file mode 100644
index 8be6b9f24826..000000000000
--- a/app-benchmarks/iozone/iozone-3.408.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-# TODO
-#        ->   linux-arm            (32bit)   <-
-#        ->   linux-AMD64          (64bit)   <-
-#        ->   linux-ia64           (64bit)   <-
-#        ->   linux-powerpc        (32bit)   <-
-#        ->   linux-powerpc64      (64bit)   <-
-#        ->   linux-S390           (32bit)   <-
-#        ->   linux-S390X          (64bit)   <-
-#
-#        ->   freebsd              (32bit)   <-
-#        ->   macosx               (32bit)   <-
-#        ->   netbsd               (32bit)   <-
-#        ->   openbsd              (32bit)   <-
-#        ->   openbsd-threads      (32bit)   <-
-#
-# ~ia64 ~s390 alpha(?) x86-fbsd
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Filesystem benchmarking program"
-HOMEPAGE="http://www.iozone.org/"
-SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}${PV/./_}
-
-src_compile() {
-	cd src/current
-
-	# Options FIX
-	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
-		-e "s:-O3:${CFLAGS}:g" makefile
-
-	case ${ARCH} in
-		x86|alpha)	PLATFORM="linux";;
-		arm)		PLATFORM="linux-arm";;
-		ppc)		PLATFORM="linux-powerpc";;
-		ppc64)		PLATFORM="linux-powerpc64";;
-		amd64)		PLATFORM="linux-AMD64";;
-		ia64)		PLATFORM="linux-ia64";;
-		s390)		PLATFORM="linux-S390";;
-		x86-fbsd)	PLATFORM="freebsd";;
-		*)			PLATFORM="linux-${ARCH}";;
-	esac
-
-	emake ${PLATFORM} || die "Compile failed"
-}
-
-src_install() {
-	dosbin src/current/iozone
-	dodoc docs/I*
-	dodoc docs/Run_rules.doc
-	dodoc src/current/Changes.txt
-	doman docs/iozone.1
-
-	insinto /usr/share/doc/${PF}
-	cd src/current
-	doins Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
-}
-
-src_test() {
-	cd "${T}"
-	"${S}"/src/current/iozone testfile || die "self test failed"
-}
diff --git a/app-benchmarks/iozone/iozone-3.430.ebuild b/app-benchmarks/iozone/iozone-3.430.ebuild
deleted file mode 100644
index ee0c9bd78815..000000000000
--- a/app-benchmarks/iozone/iozone-3.430.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-# TODO
-#        ->   linux-arm            (32bit)   <-
-#        ->   linux-AMD64          (64bit)   <-
-#        ->   linux-ia64           (64bit)   <-
-#        ->   linux-powerpc        (32bit)   <-
-#        ->   linux-powerpc64      (64bit)   <-
-#        ->   linux-S390           (32bit)   <-
-#        ->   linux-S390X          (64bit)   <-
-#
-#        ->   freebsd              (32bit)   <-
-#        ->   macosx               (32bit)   <-
-#        ->   netbsd               (32bit)   <-
-#        ->   openbsd              (32bit)   <-
-#        ->   openbsd-threads      (32bit)   <-
-#
-# ~ia64 ~s390 alpha(?) x86-fbsd
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Filesystem benchmarking program"
-HOMEPAGE="http://www.iozone.org/"
-SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}${PV/./_}
-
-src_compile() {
-	cd src/current
-
-	# Options FIX
-	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
-		-e "s:-O3:${CFLAGS}:g" makefile
-
-	case ${ARCH} in
-		x86|alpha)	PLATFORM="linux";;
-		arm)		PLATFORM="linux-arm";;
-		ppc)		PLATFORM="linux-powerpc";;
-		ppc64)		PLATFORM="linux-powerpc64";;
-		amd64)		PLATFORM="linux-AMD64";;
-		ia64)		PLATFORM="linux-ia64";;
-		s390)		PLATFORM="linux-S390";;
-		x86-fbsd)	PLATFORM="freebsd";;
-		*)			PLATFORM="linux-${ARCH}";;
-	esac
-
-	emake ${PLATFORM} || die "Compile failed"
-}
-
-src_install() {
-	dosbin src/current/iozone
-	dosbin src/current/fileop
-	dodoc docs/I*
-	dodoc docs/Run_rules.doc
-	dodoc src/current/Changes.txt
-	doman docs/iozone.1
-
-	insinto /usr/share/doc/${PF}
-	cd src/current
-	doins Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
-}
-
-src_test() {
-	cd "${T}"
-	"${S}"/src/current/iozone testfile || die "self test failed"
-}
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 313f9cd149a5..3274d4103fdc 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,10 +1,6 @@
 AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cced8174a65e09f6196fb4fa50128199d462ee62f17c7c8c55e20aabafca1edec2d3ca7edb508dd5e8ac63ed SHA512 26a4f55ac8d57231d9cc137ac8243da4cc33a3efb6b5366891230087c3e4d7555bcf8c20a7608479142589254a8c049f3165807ecf9c0eba0eb72422e04279e8
-DIST siege-3.0.6.tar.gz 496002 BLAKE2B b21ed07a36b3e0ae5b4166f2d1351be790261d149bcac98f4d2795796e42a8697bf618822792f6f7c912be29d926cf5f8d3de443498deab8c553217db359d282 SHA512 621f3f60f2aac70fb051f48819f5673d60f31fc4fc69e4c65d4ae0a285d02112686f1e9b40241d48afc378446a2b296a7dc4bbc6d8ae38e390d380506f4d448b
-DIST siege-3.1.3.tar.gz 527862 BLAKE2B 9cc10b5afa15c5a7682452d8a4020de62c195192abcb222c36d148da871693c1fcf5be2e3d1a3ca1c4a7fd39fda505520f40ee053ca50fd15340441a498e368f SHA512 880b6d8bbe6b8210147ebb26fd724f4c242076740284977471165fbca514b56c49812ace42dcbe23c57be8fd10a2503b129deec10b79991451a9ae83f30a742b
 DIST siege-3.1.4.tar.gz 530149 BLAKE2B 3721387fa1ace745ce7748612849b84c07e84456bd903460930ab407cba1e24f493d4a251bacd3e509aafbc653e5d74e96509bf74f0a2a8066a0ec2b7ad2e9ee SHA512 8e8b4c1e9c20833f4c3538e8929e47d1c9113cd1faf395e5f07734fb7f4291061cb7554cf500a80d8b1b6be0d6f4c8194b054f632f35533837220702784ee068
 DIST siege-4.0.4.tar.gz 523102 BLAKE2B 2d69dd37fea7ff35e05b41d500d4efb5b4fe60d9389b7bd98ec360148af781a24b6ebaa213b59ffc36cfcc8421efea14d8ec9f5742a53e019b2221584b5af17e SHA512 a8361ac0e2514626d794e7e4a345b178462409a1f3b53a9318adf171b511c408508acdb07652ad38f34021ac4a614dc5e6d2ea3c6a4ffd261ceef36d3226e573
-EBUILD siege-3.0.6.ebuild 1137 BLAKE2B 1790115533694ff1e028ce8d5487672a3f29a2fffdab53d2a15cef1b8df1e796754c5e85ffc26001f208f36cf546bc470a73aa3f567ad99f54e6c7c983d9bc25 SHA512 51a1a5650f81440fa974b17479acf13e6ab58a96b74708a2169e0d42cdd459e68f7de4e1bc471635b4e28bff5d7a1006db3949a468f91c8af64baa43f986d2e7
-EBUILD siege-3.1.3.ebuild 1192 BLAKE2B 5a8bf0e8cee22e6b8f42bcc161e1cb8e7ae0052dadcb25700185eaf1db455b82ccc31ef39e8fbae12466bf36b4ca4bea191a83184df808f4142c5c5d50c86b2f SHA512 46650e12d37c45bd994ee7806d9130639d1591028fb3d9f3000a55747f177a7521bb666a871741ed9cdd245606d957873d5de77700f573854cf341ae3c613e00
 EBUILD siege-3.1.4.ebuild 1189 BLAKE2B a72e0f000ae78e38e026666e23c7839e57109f8cfeaba90e476bbd34f880da9debd5f904c4e2a9482bb983573af72682fa7ba572a57575155771a8362bc7c640 SHA512 9a4d62ea2072f180eb99195c319f0b1546b31e4a50918db0bbaec8fa9cb9424afc8e18c03d258c7e37d4945046bba18890d68aa931c1d99db6f64195eb1e8c25
-EBUILD siege-4.0.4.ebuild 1126 BLAKE2B 4348e02e13c3534cf0d778e14d8036068d6ec9c333f32462e6608ae89b0efd391775c07581cf156cec713f87dd6721065a1752b373a3581422c2499d2f2a8d3e SHA512 981a9d505a2dddd5eee4f74273d38b9e3dad1dbd38747bf8c2ee99ee38f3d0b0d86eebb7f43cc91f905e72e158e9955b1cd270dffddde8263f540cd9f8f14c98
+EBUILD siege-4.0.4.ebuild 1125 BLAKE2B 743fc12b845f59798a070bc55430aa585841d3290509b9f0ce501504f0927d1b832e38e7be233cdfdcb6dcbbda13d607696a47b97385cb576544c9bb53e3df55 SHA512 16341cb0a02868a8f7472d5792b78581f2410308d62558c92f623987b57adf328eacdc2f8e4fea6da2d8d8097197ee7dc1b1a4a70c1983976c01a2fdc5a48fcd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/siege/siege-3.0.6.ebuild b/app-benchmarks/siege/siege-3.0.6.ebuild
deleted file mode 100644
index 1002d516d110..000000000000
--- a/app-benchmarks/siege/siege-3.0.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#WANT_AUTOMAKE=1.9
-
-inherit eutils bash-completion-r1 libtool autotools
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="http://www.joedog.org/JoeDog/Siege"
-SRC_URI="http://www.joedog.org/pub/siege/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ~mips ppc x86 ~x64-macos"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-src_prepare() {
-	# bundled macros break recent libtool
-	sed -i -e 's/AC_PROG_SHELL//' configure.ac || die
-	rm *.m4 || die "failed to remove bundled macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use ssl && myconf="--with-ssl=${EPREFIX}/usr" || myconf="--without-ssl"
-	econf ${myconf}
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog INSTALL MACHINES README* KNOWNBUGS \
-		doc/siegerc doc/urls.txt
-
-	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
-
-pkg_postinst() {
-	echo
-	elog "An example ~/.siegerc file has been installed in"
-	elog "${EPREFIX}/usr/share/doc/${PF}/"
-}
diff --git a/app-benchmarks/siege/siege-3.1.3.ebuild b/app-benchmarks/siege/siege-3.1.3.ebuild
deleted file mode 100644
index b08e5a9b4f55..000000000000
--- a/app-benchmarks/siege/siege-3.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#WANT_AUTOMAKE=1.9
-
-inherit eutils bash-completion-r1 libtool autotools
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="https://www.joedog.org/siege-home/"
-SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x64-macos"
-SLOT="0"
-IUSE="libressl ssl"
-
-RDEPEND="ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-src_prepare() {
-	# bundled macros break recent libtool
-	sed -i -e 's/AC_PROG_SHELL//' configure.ac || die
-	rm *.m4 || die "failed to remove bundled macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use ssl && myconf="--with-ssl=${EPREFIX}/usr" || myconf="--without-ssl"
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog INSTALL README* KNOWNBUGS \
-		doc/siegerc doc/urls.txt
-
-	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
-
-pkg_postinst() {
-	echo
-	elog "An example ~/.siegerc file has been installed in"
-	elog "${EPREFIX}/usr/share/doc/${PF}/"
-}
diff --git a/app-benchmarks/siege/siege-4.0.4.ebuild b/app-benchmarks/siege/siege-4.0.4.ebuild
index 364acb95e137..20d20168d47f 100644
--- a/app-benchmarks/siege/siege-4.0.4.ebuild
+++ b/app-benchmarks/siege/siege-4.0.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.joedog.org/siege-home/"
 SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc x86 ~x64-macos"
 SLOT="0"
 IUSE="libressl ssl"