gentoo resync : 19.05.2018

11 files changed, 62 insertions, 10 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 234d580bbfde..6937ccf10aaa 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/acovea/Manifest b/app-benchmarks/acovea/Manifest
index baa2ef77408c..488b99cb91af 100644
--- a/app-benchmarks/acovea/Manifest
+++ b/app-benchmarks/acovea/Manifest
@@ -6,6 +6,6 @@ AUX acovea-5.1.1-libevocosm.patch 3531 BLAKE2B 1a221c1abd7499384f5ef087c4e3efa8d
 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 925 BLAKE2B 2b51a54451737c8d8087a168992b2922638923e1c7d678b698d1c76f1d44cc912b7478d3fbc43fed23866c48b4ae1bb1bef047a4391cd698e2a0382b369acaed SHA512 d295a9b0623ae4b75d761b14eb10a43f3fed7379cc780c3ac4135ef56062daac251f523e6d8437d1c24f33c1d1b9e2e42e5808eaf6098ffc0e200f06a0af32f1
+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-r2.ebuild b/app-benchmarks/acovea/acovea-5.1.1-r2.ebuild
index 079e98f98b82..6d3ae2f60f1c 100644
--- a/app-benchmarks/acovea/acovea-5.1.1-r2.ebuild
+++ b/app-benchmarks/acovea/acovea-5.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.coyotegulch.com/distfiles/lib${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 9749d79833b9..98438683f04c 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -3,7 +3,7 @@ DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a1
 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.3.ebuild 1164 BLAKE2B 3c701c17d7c17ef45a1e6f6d32d65f666340d4cd1716a9136ff2ffd168c6a21bf2f3259dc7bc1ddebfe1db9a4dd4662cc7987f35f67ce6667058731a356e277a SHA512 42cc3acfb831448c877cb86c618efbed78275440b4e8e340e48e21dcc0e5545353713d3082f945c436956a1c1cd312e9dd1ba5c3d199015dd486423801b669b1
-EBUILD geekbench-3.4.2.ebuild 1164 BLAKE2B 78d93f4f7dbec69b6b77a4106727fa26f8bd49122ffc3e63c8590efbfe758fe7b7d840db6844f9d664e7e616f67c2c8be9dd7332b5eb1acce201cda7baf76a4e SHA512 14c3bf6e5e83784c015399f239af9dfad433e51247e1a1e0b4b270a26d39a7184c2526f9e07f43529b2e355e532fb160c4f72c51ee9dc46e4e30edc3b90a39ad
-EBUILD geekbench-4.2.2.ebuild 1153 BLAKE2B 21efab2160a659b021cd5b1482528b75480e2b7a19626af9564d05b0bd929d269cc521ff1f453cdf1a0d1720b90ace9a9d896c6145b7d335a3f3edd07d39b76a SHA512 04e19831440a28da27e228d31b5e7d85b197db599e7c76557cafac73558f825aec8dfb3a09ee42056aa342814f19cd20a2e8a91ab2643f9c0d938cf73f07206c
+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
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/app-benchmarks/geekbench/geekbench-2.4.3.ebuild b/app-benchmarks/geekbench/geekbench-2.4.3.ebuild
index dc5bcf18f0bb..4938077b3be5 100644
--- a/app-benchmarks/geekbench/geekbench-2.4.3.ebuild
+++ b/app-benchmarks/geekbench/geekbench-2.4.3.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}-Linux.tar.gz"
 
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
 SLOT="2"
 
diff --git a/app-benchmarks/geekbench/geekbench-3.4.2.ebuild b/app-benchmarks/geekbench/geekbench-3.4.2.ebuild
index d4106d28553b..0734fae3b0c9 100644
--- a/app-benchmarks/geekbench/geekbench-3.4.2.ebuild
+++ b/app-benchmarks/geekbench/geekbench-3.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}-Linux.tar.gz"
 
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
 SLOT="3"
 
diff --git a/app-benchmarks/geekbench/geekbench-4.2.2.ebuild b/app-benchmarks/geekbench/geekbench-4.2.2.ebuild
index 898a4c3b2fd1..fc5aa6b4a13e 100644
--- a/app-benchmarks/geekbench/geekbench-4.2.2.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.2.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.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
 
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
 SLOT="4"
 
diff --git a/app-benchmarks/iozone/Manifest b/app-benchmarks/iozone/Manifest
index 656f126bc724..ea2f33b8d199 100644
--- a/app-benchmarks/iozone/Manifest
+++ b/app-benchmarks/iozone/Manifest
@@ -5,5 +5,5 @@ DIST iozone3_471.tar 1853440 BLAKE2B 280c821a439ad1bacbd749278385481678d644a59c1
 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 1873 BLAKE2B 0e9347f32b429b4e2da785f0f6dba78c7770a63ba17d245c74dfdf88deb76ce902e50cfb9e2b0be2b93b2cd412d83e0ca9b1874badf6c6cb9d1f5fec2c219a4a SHA512 0bd8e7198b7b2451ed96be6dd72ecec12df3d01a8dc29111d9d271602193eec86833a7299fe9bdf756f7c590616c0c09ab7b2b1d9d8e8805197850be09c6d183
+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.471.ebuild b/app-benchmarks/iozone/iozone-3.471.ebuild
index 3d352d132330..54ce253764dc 100644
--- a/app-benchmarks/iozone/iozone-3.471.ebuild
+++ b/app-benchmarks/iozone/iozone-3.471.ebuild
@@ -28,7 +28,7 @@ SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 ~arm ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}${PV/./_}
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 6ccbb8de8de4..313f9cd149a5 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -2,7 +2,9 @@ AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cc
 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
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/siege/siege-4.0.4.ebuild b/app-benchmarks/siege/siege-4.0.4.ebuild
new file mode 100644
index 000000000000..364acb95e137
--- /dev/null
+++ b/app-benchmarks/siege/siege-4.0.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1
+
+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 ~arm ~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() {
+	default
+	# bundled macros break recent libtool
+	sed -i -e '/AC_PROG_SHELL/d' configure.ac || die
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with ssl ssl "${EPREFIX}/usr")
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}