gentoo resync : 19.07.2019

13 files changed, 100 insertions, 15 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index dfdc9ddd564d..64b63c7cf0a5 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/forkbomb/Manifest b/app-benchmarks/forkbomb/Manifest
index 260ccf968595..2515c3eeac60 100644
--- a/app-benchmarks/forkbomb/Manifest
+++ b/app-benchmarks/forkbomb/Manifest
@@ -1,3 +1,3 @@
 DIST forkbomb-1.4.tar.gz 4718 BLAKE2B cd784a4c5bfecbb1bdc295346fd78044519b1d2212e3ba8189954aaf74b754c8188a354f324e4f2702a6fc6d397a0e670a9b0c3c67b751f7fb148465ad9c3e44 SHA512 3f5404ed6b3fe70b970e79ffc5f75aef2f9b92d0087895e1ae7d3a5409f28475569dbbb00e5bcb66882f56ce34e18ce388babfbe7cfeb7729a688519663d016e
-EBUILD forkbomb-1.4-r1.ebuild 499 BLAKE2B 9776577091c0ecddb8b79de378a1f8632a6ff91f7f899799cabd5f66f5372293db7a85efec3347d4c38742ead0f8f92351266f324724a7999363dc65ea88ba8f SHA512 b10703223fcfe6c5ba23e418788e6a296fa3094c57a5654a2482fdd9d450db89b9e98ced85dcf7c61be6900d6a951481ce01d6377be9a01bb0020b7e4add4b53
+EBUILD forkbomb-1.4-r1.ebuild 496 BLAKE2B 5f5fe76029c3d2cb711edc81d58dd5fd7704196ce221ee4e074163b5902a3edd0bf5c17ca9063b3f08d1ecb0479c7bd6fc883b2493d920a5de03d89cd3029df7 SHA512 f5486269113a8b6aae0bba238f7acc632d3f4a4b2043af120c9df75b5af0bfd08d2ed0d796d86e2f2e4e7f8a5cd7f43a8eb692b21907aeff1c06e3bb2ef752d5
 MISC metadata.xml 262 BLAKE2B f05392040245c379bef00514595c61b486888d358e699bf65aed331db84a565f6c1e07079994473e272b1736ce9d18c92c5dd8f0162ef6e279ddee527ffa858b SHA512 333932260d8f347e9ce590d0f0bc03f775d87d01ca98bb921f172815c18de2d792a6d6d9b44f33efd735bf43155c8684946e64c6746fd57990962c6cc2676ff4
diff --git a/app-benchmarks/forkbomb/forkbomb-1.4-r1.ebuild b/app-benchmarks/forkbomb/forkbomb-1.4-r1.ebuild
index 67adb9ea3706..0cd893752836 100644
--- a/app-benchmarks/forkbomb/forkbomb-1.4-r1.ebuild
+++ b/app-benchmarks/forkbomb/forkbomb-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://home.tiscali.cz:8080/~cz210552/distfiles/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 60d077db5c58..94fc7e0e816d 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -2,8 +2,10 @@ 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.3.3-Linux.tar.gz 71101735 BLAKE2B f7e784a624f558711e7ebc5fc502de0cae5be489154f3d7d20bfccb624269644ff90867c96ce9f8136609f4911b6764bcfb7ecfb037ebddac56e450b3baa2415 SHA512 8c4bdc51f215f6c84ef955d012d3ba81fab542716cb7dd9e2b05d15c68e678955817fd25032ec659028a769312b5bc04d2d3b9832c9f2fa46d55784446e31b49
+DIST Geekbench-4.4.0-Linux.tar.gz 71106296 BLAKE2B 25329610d4289909d3a0e82a33b093834d00fd443d6e46fa44b01841d1797ea19566b3e9a035a418c62727441d43803837b83b9f0e5b21f82f53a3be167795b2 SHA512 5504981256a50a996d97d4933c0a961c49ad93932719cb2da3cbb637fdfa47b20f5d2cb5ba90838fd1a116d7babe800a8c43dc4a06058100c9d2e2dd39870fc4
 EBUILD geekbench-2.4.2.ebuild 1060 BLAKE2B 4700a2c4c82d5e829bf7b254c1a94a5bf47e1c534e1fad2b37458ddca39ef1f1372ec8d3727c69ecc0c462ec2514abea33a48aedf35c7eee5444dbea8e9ddf96 SHA512 663d11705c70d7a082678b7ee74802651734fe367458a7e10974f33b7c22930d78eddee7a1c56993e11a856da0efeef0412e02696485d7def3e4a6e0464b39f5
 EBUILD geekbench-2.4.3.ebuild 1122 BLAKE2B 70fba3ad954717c01cefd5b2df1ce40294001ad82f25dc82a3b5ba05650fc98bddc5e2c060f6cddd44a9e1028cf2fa8b908a3343491d6fe3b966ddfcad4d6f2f SHA512 3c6b303ea5459f9777bec75ea555a2794d7bbdc4d0da8a5881181e3dc5c8b6796191fb86c9536576c3ad43a7d4613ba22792e9a333cdde4de862a786f53b5e21
 EBUILD geekbench-3.4.2.ebuild 1122 BLAKE2B 8f4d72914a7333869104cac7f97a61c759699405c6f9bde61c95ca38a3804c4538ed8c679665537a380ed2892c685a9e365faa7ef54f1e8e0cae13a659d0cf0e SHA512 caf0856adbd7a3420f89ef5dcbc66629241c891f1129dce540832da224c34ac1d66a9b594503650566ff802683bd6c5f170ae31d95c2ecc147bf8dc64ae79c6e
 EBUILD geekbench-4.3.3.ebuild 1113 BLAKE2B fd8422df54e2b7d46308f565a49986a4fb828b27ce9716d0e7b8e57b4dd6d4288f55d596d325518d084d10f1af02d1097bf4e387b8d268ce48d5425d46e8f4d5 SHA512 dc86f331e2ce84e80b80abcf8928a863fbc3723cb8e7fff8238a1f6bec61aa99796d16f6c1eb0278aa8185399a0f09be9b1971b2df73df9e6638c2b9a93a1798
+EBUILD geekbench-4.4.0.ebuild 1097 BLAKE2B fce35a2964e0ff2db31a8d98025a9b0df8781d4357447848eb179eb8fccad6c087ad7220aa41a762bf9ab521a248f2a4f6224e56105c3e5b6b6ada7fa140b5b8 SHA512 493d70d3aa940437c03a307fc384bbc0e589c7fb5d906bee3e115f6326a2ba9a9f4c1ee22e1ee6a403b34564a701c36db04ba6b6f45d3563abea9dd33a7c187a
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/app-benchmarks/geekbench/geekbench-4.4.0.ebuild b/app-benchmarks/geekbench/geekbench-4.4.0.ebuild
new file mode 100644
index 000000000000..5754046d5dcc
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-4.4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com"
+SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="geekbench"
+SLOT="4"
+
+RESTRICT="bindist fetch mirror strip"
+
+S="${WORKDIR}/Geekbench-${PV}-Linux"
+
+QA_PREBUILT="
+	opt/geekbench4/geekbench4
+	opt/geekbench4/geekbench_x86_32
+	opt/geekbench4/geekbench_x86_64
+"
+
+pkg_nofetch() {
+	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	exeinto /opt/geekbench4
+	doexe geekbench4 geekbench_x86_32 geekbench_x86_64
+
+	insinto /opt/geekbench4
+	doins geekbench.plar
+
+	dodir /opt/bin
+	dosym ../geekbench4/geekbench4 /opt/bin/geekbench4
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench4 -r <email address> <license key>"
+}
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index d010b92436c9..16fbde0e70f4 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,6 @@
 AUX stress-ng-0.09.53-makefile.patch 1736 BLAKE2B f96cf408d2158f435e25c66270062903e1efb435bf48fa2f8198b99d625f1a70f29e71c5deba1a05549ab6e91d6a1e579e7176d4f172f073d5fe5e71b8ad17ba SHA512 72a607a2a569ac7b390067e63c7c5da6d6f15661e6cdc1a723c3f5eee03f156155ed5977045d1b1bbd9ab7d8eef5f5588018cd10107ccacd3a1fddf3e71a9609
 DIST stress-ng-0.09.57.tar.xz 386624 BLAKE2B 524a69e08dc2443d3a66ad46d07f509333eb497ede6bfe11ef10f84fc33720597eae5ce58d706e5384be19f361fc7b4b762110e3ca10556ef4ccfd804dcd1be4 SHA512 5c3bd06be0f66a6bbb88393b3d22400b5a307e4c45e27d7cb15502370b0873ec11c911aa31fa066400152169ec5bea29c1c0260899dedbc640fbef09ee672cb5
+DIST stress-ng-0.10.00.tar.xz 397988 BLAKE2B 70cc9b0e592685c10207144f1752371944bfc449646580b0100c628598b6d8e80f3088935cd3fabec27ac8943d03a1eae9f1201969b7dd93d4ae64b6669400af SHA512 1acb8fde49d2c613f7958d86268bfce0c0d5482bea573c31182d3ebba855db7522d206c284c64662d4642be7bed3af36b21481c8eede528e589b0a1b0ec7fe07
 EBUILD stress-ng-0.09.57.ebuild 681 BLAKE2B 571483edb5e74678175dbdb72c923068cf6309257446d560f7cd265dc399ad0c530ea3b2426f26f0a6326f8ddc995cefc2c1a80a1e7562f9449a0524bd0bae45 SHA512 0fc7e75a2af96e52a0873c6cb1d6d51e8b8270f265eeb0447b14e16c61869292a4db5baf4abec2690b920674eac36c8927555c8322e4385bff210318ed7ea0c4
+EBUILD stress-ng-0.10.00.ebuild 748 BLAKE2B 480d5cf849ef0b52ff7274bc05ee1a99e80d9c6347580ce8173f1e829397b1d4dadd2fecad61d72bd4d1b93be2bad337deca852e7b95fbeb64e3397770199991 SHA512 1b1cc8c2d0876c451cf4f125a7b5a598230def6ef617b0618ec29e04fc37593a8f23a7f321d1e279c1b3c55736e1d40199056e618efeb68ab35f466ae3a7fcc9
 MISC metadata.xml 953 BLAKE2B c10dbe55ea86af30a97975174565c3c9bbc76bf029f1582a5fbe8a98f79afb80a509543730294673d5b51ddf4a32fc93e8017f8ba0b26cac119c1e97e8fd025a SHA512 7975ca315e447e9d6c2d551fcf396b2a03d71661c4bd33843dba0413ea7b119dd1d3f59aaa91298bb5be2a17f377f7cae96cc7413531f30a88e2f401ef76f0bb
diff --git a/app-benchmarks/stress-ng/stress-ng-0.10.00.ebuild b/app-benchmarks/stress-ng/stress-ng-0.10.00.ebuild
new file mode 100644
index 000000000000..f71f9da805b3
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.10.00.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	net-misc/lksctp-tools
+	sys-apps/attr
+	sys-apps/keyutils
+	sys-libs/libapparmor
+	sys-libs/libcap
+	sys-libs/zlib:=
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
+
+PATCHES=( "${FILESDIR}/${PN}-0.09.53-makefile.patch" )
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/app-benchmarks/volanomark/Manifest b/app-benchmarks/volanomark/Manifest
index 098905b40050..833094c678c6 100644
--- a/app-benchmarks/volanomark/Manifest
+++ b/app-benchmarks/volanomark/Manifest
@@ -1,3 +1,3 @@
 DIST vmark2_5_0_9.class 1591590 BLAKE2B c67b18969f5ceb42f6d68d37260e43d3d30508956ddb2091a59852d5d151606ca3f30205cde397f3212ba5dfd4e4d109802ddcf0cdc6c851b20d07ab6cf5f5be SHA512 002953f780bfb2fa0f9663f6ee2228abbf277e98ebdc69dce3c0e9f03147e0bdb80ae381daf29838790c13aefc83406b61428871a890dcae2396a5c59fcee8bf
-EBUILD volanomark-2.5.0.9.ebuild 1771 BLAKE2B 22fcdcae01354588a8284f4a0afda3a909b5c12246136fdd3516922459b576f746317164caf8815b39bd22d96105d27c5fca0c713fc6126fab627d802c4bb601 SHA512 2e83a2adbb8da635e60eb97bb7fa1443deaa6fe29ac85db7ba63dc4bded121c9b610abeee1b309ea1d74e43581b34b3e464328f3b3ce458a49b4fff22cf58491
+EBUILD volanomark-2.5.0.9.ebuild 1768 BLAKE2B 5d8d9771bdb06ce5a5f76956e3a4218360f0d445a2d237265207fc6e5ecc7a054d9886756fcdbd2361c3d5d47390c4dffd3eb2f759257d03a8c27c80b89bfd8a SHA512 9f82aad4971f395c9d8ca75c3bba26093aa2f57208df97be57bdb4ebd556003676c950b1f2134c37a6509a2604cf89a5bb709979ce5e5c4ed41f0319fa4fbb14
 MISC metadata.xml 221 BLAKE2B fddb0708e4743cdfe978ab6d0b49a8fc3213b1d7830a4c85ff6a2f4dac146729798ee797e9c35ac311982199a48cdf9a51c47a3bc566c23715ebe9735f98d9e8 SHA512 239603806c8f5664d980a58bed0512b05b581342df90ed690086c86db2290edbb38183fe2cc1805b4245f9e87763c86c6f945022ac9704f8f9214dd73c5d2e07
diff --git a/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild b/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild
index caf8ee111386..efaa5ae49fe4 100644
--- a/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild
+++ b/app-benchmarks/volanomark/volanomark-2.5.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -13,7 +13,7 @@ RESTRICT="mirror"
 
 SLOT="0"
 
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND="virtual/jre
 	>=sys-apps/sed-4
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index a1fe32d690bf..81b5ea988f83 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -4,8 +4,8 @@ AUX wrk-4.1.0-r1-makefile.patch 963 BLAKE2B de7fea198e9e9366f763d2c0d25d1ff5ee2d
 DIST wrk-3.1.2.tar.gz 902868 BLAKE2B 1b979a7b72c41d37ec63759c76770a74ca8cf618bf2e84b30556fa7db47b3cbe4957924a5ad90594580d4fed5194201d6205b04c660195466c6d6fb369604571 SHA512 399f33c2c008c21ac8fae1b561fe16ebcca324b5171340ffa706e84c256bf13a9983b5c18d258be6f87cb9fe8e38a434f9bfa7059395a01cb783f77faf952b15
 DIST wrk-4.0.2.tar.gz 6146798 BLAKE2B 62188872a370d4ef3a3ffcf6f0568ca1b003473a1333b51d2b79fc3ce793c39ba5958d95c877fc0382751e89b687c8ee7f20b376c9b2fe3826afc3161aa0ac8e SHA512 4279cf7136e2919779be3f61f462136a7a5288eac481104b844193682a8fc554581fd3942624d0be9317a3e82c82497927a124b9b4dbdf455e30d3f0cad1fdea
 DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a
-EBUILD wrk-3.1.2.ebuild 749 BLAKE2B a7c575317dd0df7a3b3ccb010d9ad399b96e59c35e485888c8f134a0ca8898ec113199ccca4defaf77521d5ec41b53027bdbb07e7db04d5d8c0df51f1c79b52b SHA512 3621a749c2b9c4b3768332f2eb3c95a3979b6d9aed8cdbb1ca3267fcdeec8cb288bcbb2f31c8eb7070d6b86ae9c0e647ee087bc959831bc26047055a2c8e2432
-EBUILD wrk-4.0.2.ebuild 693 BLAKE2B 65b7d0c203adf4fb345c19a0e822fcb32f36b2ac187468620decfa1eae188a921002433d1be909b9f90b4fb68103e7596594d62c94aaa162d12fa8f2bafdbacd SHA512 07431134cff46cbfff1971d7dc82bf59c2d6b326bb7dac4df413bd2c819713229808927c0277c95756952ecbb743c35a8111f59b478c64ffa5c1608039642f95
+EBUILD wrk-3.1.2.ebuild 746 BLAKE2B 19b95fd2bbc5b3d75460fa44bf415c0563ad84c208d6b618012aa0169975dd0cc0df971c6dd99de522bf865864ebabb779c6a130b335331d67191e58d41861b6 SHA512 a47e000c8fd9c57a53a2b3d2663ba3e0ccf15bd98188165af46f33ad35bbe867de988b518be94a4d12b107db16048fbeab81814a3fbaaa242b970a3fc3ed031d
+EBUILD wrk-4.0.2.ebuild 690 BLAKE2B ce0d50127823d0d1ba4278785280b4f60e940aed710eef0bad662d3b07cdc75ab47507d37ad2fc223b4e32dea2db07a961956cd42601f2b301a846dea65fe988 SHA512 48db2dec26fec31aefc1f02fa8932fa85ac4532c176eaefe6c48e98b51f62efe557dc912e840540010f8f620047eef0da07b3cef35a810389157b2c142bbd48a
 EBUILD wrk-4.1.0-r1.ebuild 877 BLAKE2B 615984bbe2a7f24f039d2723e8b740ccd2360e73c0a8e5b254caa3859cf700808c72a54c7c0039db221f14594de488b8afc1da51973ac03248e5f670cc38084a SHA512 bd2e1ba2b64fb279a54d44b61f12b3f5a07b9b4bf5c78ddbdeff3692d84caeda745e56705387732bc9e9cb66467a4c245e632ab3e7160407660c97fb02f3f71c
-EBUILD wrk-4.1.0.ebuild 770 BLAKE2B c99ff47bb3aa4bd343cd28d52aecd2161dbc2e29d92c8f3b6a4c6e9e00a0d0f0b610dc8916db02a119bd19a0311f5a424513f3fbd1abb84d1bce795cfcbe887b SHA512 12f5adaff8ab03cec4fdad6b9866eb83e3890e7e62b4916076dbfbdc63726e0d42e65fb10320f2ede539b3aed2ad0285de8e864129baef521442bd1f71adfbfc
+EBUILD wrk-4.1.0.ebuild 767 BLAKE2B 9197a0940bd0d7738c7fa00482aa006061a493396c252b58b1ffe0a4cfa63510fc4cd909941f81da4a321940cf627add008685347d36f9231b54ab68407827c1 SHA512 a9949bd0d4008cfbee18b4580008988ccecb205b2e8a07a10db0653428d12c07e797d689e52df7b62562d81490a28877c5701fad0f863a3b1b22237befb13689
 MISC metadata.xml 872 BLAKE2B bb064e89a2814dcbe60f5cee80b4f2687e2fdad7e04bab99e2cd9896d7c59cf0ed2cae5e1e6e53093382f175d41312ba827e398e43ca49f7c3e6573bf136d1bb SHA512 ddc9458a301ff7a6d19814d0d39e352900ec43128ad1ca985fe8f890392c058b394e3d0fa86586aa39fd47e816f45624df848be2e8d150d20e32ccd4829b6307
diff --git a/app-benchmarks/wrk/wrk-3.1.2.ebuild b/app-benchmarks/wrk/wrk-3.1.2.ebuild
index 724ae80c1f05..62466fde2990 100644
--- a/app-benchmarks/wrk/wrk-3.1.2.ebuild
+++ b/app-benchmarks/wrk/wrk-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 x86"
 IUSE="libressl"
 
 DEPEND=">=dev-lang/luajit-2.0.2
diff --git a/app-benchmarks/wrk/wrk-4.0.2.ebuild b/app-benchmarks/wrk/wrk-4.0.2.ebuild
index 990d52d0c66d..0e6fa418a27b 100644
--- a/app-benchmarks/wrk/wrk-4.0.2.ebuild
+++ b/app-benchmarks/wrk/wrk-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="libressl"
 
 DEPEND=">=dev-lang/luajit-2.0.2
diff --git a/app-benchmarks/wrk/wrk-4.1.0.ebuild b/app-benchmarks/wrk/wrk-4.1.0.ebuild
index 397a84d29580..0e8caf2dc307 100644
--- a/app-benchmarks/wrk/wrk-4.1.0.ebuild
+++ b/app-benchmarks/wrk/wrk-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="libressl"
 
 DEPEND=">=dev-lang/luajit-2.0.2