gentoo resync : 29.10.2017

6 files changed, 38 insertions, 4 deletions

diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index dd753d5a5357..7bf31481bf99 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -3,7 +3,7 @@ AUX bonnie++-1.97-zcav-array-indexing-fix.patch 1474 SHA256 8a50c7121cf3726f1c7c
 DIST bonnie++-1.97.2.tgz 102533 SHA256 3f34a4c52ae9b2c3d493af8f794ba18cbf6732e9b76c3a4fa64549d95d914ce3 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170 WHIRLPOOL 1f66eef8a583ce9cb851a6c301019ba76d104bf3a6322d504cd7c8d1eb073c48235efcff6fec2b2f49207aa696db1071c55c94a3943a01917b2a7aa7349b0b73
 DIST bonnie++-1.97.3.tgz 100166 SHA256 e27b386ae0dc054fa7b530aab6bdead7aea6337a864d1f982bc9ebacb320746e SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893 WHIRLPOOL d889c059b0bd5fb77948fd60aee3d1926f2967464a72e4c287cd14d2946e8dc73059d775bb4cfe1c0065ecbe159543dfdd519d880207974e50ec978a666721af
 EBUILD bonnie++-1.97.2.ebuild 965 SHA256 cbd601f54d0240aa3c9635613cb846c34508e5ec5858e56b0ad994f02386c387 SHA512 e8de81bf2a36c84a479c9632792b830ad589cc22a758b0f05ee650a6c62a5b998b283489219b4e3deadf7ad9baf1ef8edebbfa9e4bf1514cda80949c241afe8b WHIRLPOOL efc2fcce1b58ac383ffbbc81e4cd2523af222249fae9b523bb70b19aafe8f71d9e1ec4a9a4c82bed9e7b606a68c735ca56627587e2530b7fdfe602315340804e
-EBUILD bonnie++-1.97.3.ebuild 968 SHA256 d07254ff8b94196e7b3f4ca800cdbedb34e980c04a4413cb6743e451ad925fbd SHA512 a889f091f76c8e26c07ac843699675f15cc0d1293f0da2a6d05cbcf064bf2c8b66293986a0bb30226c2f0c36ed1a79233cf938e261847e02074b08ad71fa3285 WHIRLPOOL 1f5792c0c07f17025068645fd356642033a4bc2dd7430a53ab76164572dcc4e65ceaac63edf316de2af4a8b0a3e7b0427685f87b1526bc36a1a42ce54ace2ff0
+EBUILD bonnie++-1.97.3.ebuild 966 SHA256 05f911a6215afa3d8cf8e90cb23538b6750f351918b43ee699f9f3afbd75047d SHA512 5313f2d72f9e844f6c453f691b50c35e3e83f6ba839b20e13cce98276b63f3509e6f82085ede41f730421f6963169c5ff2d756c355894be7f698f00fbd2bdbbd WHIRLPOOL 68f0995ec9fb4f9f03e95ccf0d270ec74bbe61d717148b5ff0bdfdc99c55d60371669b23137b801e6b1aca488fafbe8938b437132d00e2ab516ad1121ae65091
 MISC ChangeLog 6219 SHA256 41ad592e7d116226be01f0403f48189d31f87ec05c1de5d946d999d4486bb751 SHA512 02049d84691fc92247610d85c8b6b759fcd3a9ae2b3c59682a573485458a2b43cbda488f83d415dd6f145a70d6697d24c8021b7129cd60839206c6487c7960bb WHIRLPOOL 43ba359fe20064cb547e61c6a5d9ac417bb70b0cfaa6704c525bd61a954503e707ff939d8293cf5220ce8d17696b60e730994fb0a4eace37c109ad587e58e21b
 MISC ChangeLog-2015 6391 SHA256 3104a69df62423f66f37cd45aa8ce2828d774c3203372b07990eb5c463433aa9 SHA512 a589ebc39e14adbe8729ff33ac1612be6c63ccad132d290c5bc13f9b2a0992f058c3476f155a91d45b85c262b2dc065d56ddaf1baa78055c78c284d9c93e4927 WHIRLPOOL 4859d840cb4cf05c520cfba33bf2a31bfdd79fe3a074e971173aab6f3da535e6730ef226ee67663e4c1a60f67fc8a613e56e0090ca6fc006f89146a97dde4b7c
 MISC metadata.xml 610 SHA256 2f50dc1eff0c268e3d911156e41e22a799b6025465feb73e0d8cb220cff16bd9 SHA512 2914ce1d553546237acfec2ef0ba8689a81105fc9414f543cd9080f56090027107e698c1ac0f98f26e5b9658ea16ed27123f23b518fd91ddd0b4a858f6ac98bc WHIRLPOOL 5afaff884e68e762cbb29dbe3d15900d9000e4f33cba0011bbee8299d7fa92199cd985a50d712920affbdd31faaf5ba79355ebe79dab5744db9faedc3706645e
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
index 30084890cf15..954fac012c06 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug"
 
 S="${WORKDIR}/${P}"
diff --git a/app-benchmarks/dbench/Manifest b/app-benchmarks/dbench/Manifest
index 86c0a7a2f051..3f5423cdfecb 100644
--- a/app-benchmarks/dbench/Manifest
+++ b/app-benchmarks/dbench/Manifest
@@ -1,5 +1,5 @@
 DIST dbench-4.0.tar.gz 2055359 SHA256 6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a SHA512 70c65c5b079edf745c267be753919c780153c9064dbda95c270b3c2c1d8c16e84fab4e743eb777436813678ecff13ec2b55d011e8acc4bd83e58f0dda7438e7f WHIRLPOOL f39d17ec5ec6e8618045337c408f7c7dc722a8c54c68872ca5a03c8affd35de1f6e6d5e842e90dcb889816fc7891f31b9217d2591ec2e90c056d92fdca90da89
-EBUILD dbench-4.0.ebuild 835 SHA256 40e583df16b41e018c33a7f9c43ca1834b01c55e511cd7327b7c758c920ba08c SHA512 ee4d0f96706a23019c9d2308f5fd085972e207ffed82e595bd2dca443e8040a24d74a50a54e5a5340b87f99e3dcb0dff8bd7754bd182c7052d90ebbcba3d6c77 WHIRLPOOL af2f5505538e2f5eb0b7b9a64738aab5d3c2f68a03cec3d26b97146ffca6a402414a778bfc46fcfce61110a8e302c10a91657abe041d2a0018246c1703e028b7
+EBUILD dbench-4.0.ebuild 840 SHA256 5e62caacd9c60b17046d1df0984f84cf19472e19167455feb82fb63301ceeb94 SHA512 82f054754e8062da69169e0b8bb6908b5a3236498b21c48d9a767f831f2adf273b71aea769cb6773f9b7994aaced3f807cb84c961e0638d62ca4a318e6ac4802 WHIRLPOOL 7a3c9e2c04c5ebf2c230a079553140dd756587e93a8743a06c997871fe2c5e0eed8de96b5246bfd669a7ba46e57f5bf75aff0c543b0428a82ddabfaf8a0fb20a
 MISC ChangeLog 2426 SHA256 10aca6e5717470711cc84501b3456df9185301c7aa5a0151cd30e1a861039a67 SHA512 f2e1b20b203248ddb557622051ef66cc25f5595e99c023dd3ec50978d59448585faa3c5e6a1b84088368a85362c13b5e9fe9d4b1b55c2900026c118e188d2109 WHIRLPOOL d1e685e354d75651297006f50bc33df16b231bb0f9c5a371f60a7a32cf0d8f8dd62e8c0c616385411f5541138dde52ff2f9455ead676099ca590916be9147889
 MISC ChangeLog-2015 4116 SHA256 9b209b3c7633ad2100c477fd5ec541dbd0115e08c4f5df08ead2bb926cc7be8f SHA512 4b5340ba57de8689b63e202d1849e4d8e0619263c0e41a7aa68347078d2e35610f17f4ea9edd0604ce7997914d219d5c544ab866911c538f8725fda1e33f5240 WHIRLPOOL 38158ecf6413eae2bce30909889979820230e1c1afaa529bcab0e4121140eca21a9f1bbafa4de705b52524d31954580d7a9f7b13ea8f3e5beee9aa4131ccdc3d
 MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec
diff --git a/app-benchmarks/dbench/dbench-4.0.ebuild b/app-benchmarks/dbench/dbench-4.0.ebuild
index 9b96984d3e1f..ac11bc17b496 100644
--- a/app-benchmarks/dbench/dbench-4.0.ebuild
+++ b/app-benchmarks/dbench/dbench-4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.samba.org/pub/tridge/dbench/${P}.tar.gz"
 HOMEPAGE="http://samba.org/ftp/tridge/dbench/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/popt"
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 200a5141153c..94dc5a5b8675 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1,6 +1,8 @@
 AUX wrk-3.1.1-makefile.patch 1338 SHA256 deb6a89add9bc93c159b2cbc40d5f8b89d9d1147cb7463a01932689e63616f8a SHA512 7f2e3e1b9ebac680f5c5df73114181960c41030d66c63ca7ec625caa3e748e566e0068766b2c350923d11d0f0de63a1bfbb4d5fbfa7447f303b190ef9adcd643 WHIRLPOOL affaf23958f5925060e41905fa272cdc7f403012ab44b423a2b21d9127a1973f9b02b920fa0abd2a743ed987fbcce8e95fecfd31f4c73b1e9b55be9c505a3983
 DIST wrk-3.1.2.tar.gz 902868 SHA256 da88a25f0eeb9e1fd6a9dcf4a96859e9e758f9446f0787cf7c95e4ccde14eefc SHA512 399f33c2c008c21ac8fae1b561fe16ebcca324b5171340ffa706e84c256bf13a9983b5c18d258be6f87cb9fe8e38a434f9bfa7059395a01cb783f77faf952b15 WHIRLPOOL 3460aadf5f3e54cf64d0779b45efba291200f0344a55b3a8c35a603d9fbb917c006ff2035fb91bfdce7652b7e4231fc43c558115cab4ff73b91087163655fe85
+DIST wrk-4.0.2.tar.gz 6146798 SHA256 a4a6ad6727733023771163e7250189a9a23e6253b5e5025191baa6092d5a26fb SHA512 4279cf7136e2919779be3f61f462136a7a5288eac481104b844193682a8fc554581fd3942624d0be9317a3e82c82497927a124b9b4dbdf455e30d3f0cad1fdea WHIRLPOOL 123e3233b211b06d4542f504db2cd5bded5eb4405fc647a1f4edd1ee2eed8ccb7757b77d2baa7867fac02bf73114de9221cefbf347425498d656fdd2fd9ca000
 EBUILD wrk-3.1.2.ebuild 749 SHA256 a4a78a895cb2aa105a735cd2eb62aeacd52c81fbd5e30d371edb37ec40f67729 SHA512 3621a749c2b9c4b3768332f2eb3c95a3979b6d9aed8cdbb1ca3267fcdeec8cb288bcbb2f31c8eb7070d6b86ae9c0e647ee087bc959831bc26047055a2c8e2432 WHIRLPOOL d4561304b66b18c0b0134901578c9768ee518c3fc189a950e81278f9d80b870f0b160b161da79c764b6e2ba000b5c67583954ff88a35e13a93b57c53143a1a22
+EBUILD wrk-4.0.2.ebuild 693 SHA256 f9dd30a1c0621775f0bba8cb85264e3f4acdf00457688209ed8375d9426a1bd9 SHA512 07431134cff46cbfff1971d7dc82bf59c2d6b326bb7dac4df413bd2c819713229808927c0277c95756952ecbb743c35a8111f59b478c64ffa5c1608039642f95 WHIRLPOOL a6a30bc9c88145de4df98604d83e349ae5e3b1efb12570635c965b92799f91ec1387a7664585a214c04dd5acff7620320f69590cb2551312bac81727ffa32e41
 MISC ChangeLog 2656 SHA256 0e2fb42ad64b037dbbc84e5193ecc74900239f7a12f7a1e5ba5d849d609bbbea SHA512 8d37fd1c2e26557540b96c88e4b5f8c7df5ea34880f1cbb5f055720747a9b8a0f97455997b8b26b805ea77f49ef0147e14ddd8ab812d1bb886b606522474569f WHIRLPOOL ec83cdf128bb20e55154837b83c512ed9a9aa9d2eaa77a1fac3a721a5c0ae8d0d45931a0278850be8d26e7bac5760788cc8a7cecbb6b6355706bd9bc6dd6f9f7
 MISC ChangeLog-2015 720 SHA256 6e30aa92f7f5af730ac3a6019f71047f7834f030500d2b661ce48d85cd5a37ae SHA512 f5fba76f0a2b5ce72a9764228b75f1f0347fb8bad32b6227b3e68135b0c2b10627910e58c1c2798f9eee971f170002cc47679be630cb08a12cf11613c3608d8f WHIRLPOOL 642155819a22b889016b27d78b4540ea7358828d9a17ba101409e5350bfe130090d22e18dbf0ad6f6d3a3f42763d80912714ca9e21a8ffdefb2cc1b071ae9b73
 MISC metadata.xml 729 SHA256 6dcf73bb2b35fcbe91dffeada056c7b7ee3a1f15b7114c42bd15d14a4fe8a900 SHA512 2c6513f32e7f7b67aed0021d6cae23f59aaf8f57ab88cd57fbe346422997617813f8a92208535397cd391935028174fce5cd88364eeff038481fd0362513d89f WHIRLPOOL 18d586d38d9808dddf9b01787f34db7ff8f753125df7b84682e013039ef29c861c3417dae90646f4589eda7834fc8d0c2f9eb3446c93be11736ef13b3bc38d78
diff --git a/app-benchmarks/wrk/wrk-4.0.2.ebuild b/app-benchmarks/wrk/wrk-4.0.2.ebuild
new file mode 100644
index 000000000000..990d52d0c66d
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-4.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A modern HTTP benchmarking tool"
+HOMEPAGE="https://github.com/wg/wrk"
+SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="libressl"
+
+DEPEND=">=dev-lang/luajit-2.0.2
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	tc-export CC
+	emake VER="${PV}" WITH_LUAJIT="${EPREFIX}"/usr WITH_OPENSSL="${EPREFIX}"/usr
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README NOTICE
+	insinto /usr/share/${PN}
+	doins -r scripts
+}