9 files changed, 12 insertions, 57 deletions
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 06f3191eccd5..382f0ecc3f64 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index a8604942295d..0f1addf45233 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -1,13 +1,11 @@
 DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b3320303258a5dcc6f169cee0134f1114927ff52745d5f6c0b5d604698e45a464a157454a249cab8e3114b01dad3f7b693ca45a5b0b SHA512 0acc0ce61aa5d2575976c66aeae6ebb88ba895dd89c07daf55e2c7af344858a620336f3e79ccfc5e7b8829caa9d600f97a35a4d6e4da630d19d723dd887fdafe
 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.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
-DIST Geekbench-5.0.0-Linux.tar.gz 92109155 BLAKE2B 5789ae929fbf47960939c3da79ea7cfe4efc9c5bfb9e158f0842d73e1a667a5e76d2c82952e0173aa4418d45a8d3314689e449e453ebe406a86da839229397e8 SHA512 dfec23335ffeef9b7cb089b164a5348fa4bb603169ba289d9995520b355c02815ce5b6619bb5d2ed090c21f21605d78238c1a285db41d75ce2afcc79835b57a5
+DIST Geekbench-5.0.1-Linux.tar.gz 92098694 BLAKE2B 007439570830816d573897eb3fb666656e0521e885fd241ad8606b6a6ca533a5ed490ac86465993ba4532d9278d09d03c78ca01bcf6cd932eb00eac00eb3a242 SHA512 82bd126c533764bdf6d25588d59b929be59deb4d0548ca0d414910fcea6a473918f4e62e9fed5fe644683b57819c868285ecaf92a6d123954ad92a93f989ed69
 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.1.ebuild 1096 BLAKE2B d6981883b2eb295d032b1672105833852a629aa073c63b685667f84f1ab0af8b92f1405831e1243b2fd4ebca06ba376a72e0608f54d7d6f6bf53373557d468be SHA512 8007ed61895716934085cc267fa6409975cbc4a5aff6f462844c9f88ef8a094decc594b034e9a25c53b8c34250a872a43f9fba761b2da8430aee69f51d5702d3
-EBUILD geekbench-5.0.0.ebuild 1042 BLAKE2B 30557738c7e8672de210600fb1e22154a9e9ce1d58482a75d30c1bb110faf94aeb6c708eb3b43c25fd287b52ffeedf6cbcd83fab58b13e13cb40c18ff0b47743 SHA512 5e2c92ae7ebb3d7c6aa0eb5e22524be41b2de1f655559522755e6754176b48b02e6ccc9df962ec412d02daa48b5bcd60f5cd04a8fde7956b326b8879c504a05d
+EBUILD geekbench-4.4.1.ebuild 1095 BLAKE2B c37758e7781c540101c9db348e3c7ad2b7bbeeb41194e64a531906e599b6419dd9ea71f0063b74426d109ae70164a920ea0bc9cfc026cc1253616dfbe4386d80 SHA512 7ec8a971087c0eadfb217a808cb968966885ed9a8d8f69a138d2cd93c3ca2e2c50695366002b23cfb885f9a84b11fd278dc56aaf4f7692d6553c71063a87cf70
+EBUILD geekbench-5.0.1.ebuild 1042 BLAKE2B 30557738c7e8672de210600fb1e22154a9e9ce1d58482a75d30c1bb110faf94aeb6c708eb3b43c25fd287b52ffeedf6cbcd83fab58b13e13cb40c18ff0b47743 SHA512 5e2c92ae7ebb3d7c6aa0eb5e22524be41b2de1f655559522755e6754176b48b02e6ccc9df962ec412d02daa48b5bcd60f5cd04a8fde7956b326b8879c504a05d
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/app-benchmarks/geekbench/geekbench-4.3.3.ebuild b/app-benchmarks/geekbench/geekbench-4.3.3.ebuild
deleted file mode 100644
index 4c5b3c5b523d..000000000000
--- a/app-benchmarks/geekbench/geekbench-4.3.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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/geekbench/geekbench-4.4.1.ebuild b/app-benchmarks/geekbench/geekbench-4.4.1.ebuild
index 0a63a4d5eff2..6768181dccfd 100644
--- a/app-benchmarks/geekbench/geekbench-4.4.1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.4.1.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/geekbench/geekbench-5.0.0.ebuild b/app-benchmarks/geekbench/geekbench-5.0.1.ebuild
index fd51c02afa39..fd51c02afa39 100644
--- a/app-benchmarks/geekbench/geekbench-5.0.0.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.0.1.ebuild
diff --git a/app-benchmarks/hey/Manifest b/app-benchmarks/hey/Manifest
index 643c5067cd30..08a6c1e41f3d 100644
--- a/app-benchmarks/hey/Manifest
+++ b/app-benchmarks/hey/Manifest
@@ -1,3 +1,3 @@
 DIST hey-0.1.1_p20181017.tar.gz 446212 BLAKE2B b8d55e4f7efb34634b81b5301617c84aea66cb1fdbe973d45317a309b845d4503331618688feeaef2bb9effa82f6d155b68b813a4b5b4f17149245cb7f15b2ec SHA512 ccaf4ca2025ce4cbe10cbeb5d7a43903d7e15fdc20ed9623795bd3c11b0df510c3b51749c5e63502fb0fd3153f18a7d1b65297b11631b5889f719d0619602604
-EBUILD hey-0.1.1_p20181017.ebuild 806 BLAKE2B 9f368bb57f6cf1eae82537c2ca344657829da386485093ef4541f5920a38789fb0dfc2b38c465c49ff1cfd0cdde6479d1f6816e8a05bfe69204b83251a516fe2 SHA512 7424c980cbd992f95da20b81546caa0190f1da4ce27bcd460edfc0832926f7651cfd05cf50bc747fad081b32373b7d8a33642096d1f6604da99f81f6e16dcb1e
+EBUILD hey-0.1.1_p20181017.ebuild 831 BLAKE2B 77d094913d5a8ed91c7e0191e87463222cab5de4a68d781f30420fd9ef8eeb05bdf1f6b4b2e6f8c1f69ea2c0dd9f1808e751c18a779c651e889726a9b0ce52b9 SHA512 d305e90d1ec1beabf22b3c43f3067f7c78f9a8a1d71588b8389b5ceff4af54c423869cf9a96d0e4fc48b49a891c7210fa6bd447ced9d7aa0c822a626a5a85679
 MISC metadata.xml 293 BLAKE2B 02d2186b0c437f4e4b8627c62859ab58035c8084a9150562f92a54374b55a091984a25573b2d7baf0ab21319556452a80f572b3c62d895c5cb9cd0bfa9763f2a SHA512 523be217cb99d6caa758df2bd2a13f8aec17c19e1e58053fc70d4d598bdff4292b1c98555c3e69a319687981bd128aec5961558e40c771f55e3082c5ed13ea75
diff --git a/app-benchmarks/hey/hey-0.1.1_p20181017.ebuild b/app-benchmarks/hey/hey-0.1.1_p20181017.ebuild
index 0be025d4eb3e..c01847f7edca 100644
--- a/app-benchmarks/hey/hey-0.1.1_p20181017.ebuild
+++ b/app-benchmarks/hey/hey-0.1.1_p20181017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ inherit golang-build golang-vcs-snapshot
 DESCRIPTION="HTTP load generator, ApacheBench (ab) replacement, formerly known as rakyll/boom"
 HOMEPAGE="https://github.com/rakyll/hey"
 SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="test"
@@ -22,8 +22,8 @@ RDEPEND=""
 S=${WORKDIR}/${P}/src/${EGO_SRC}
 
 src_compile() {
-	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" GO111MODULE=on \
+		go install -mod=vendor -v -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
 }
 
 src_install() {
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index ec06b9c14720..99ca184d06b2 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
 AUX stress-ng-0.09.53-makefile.patch 1736 BLAKE2B f96cf408d2158f435e25c66270062903e1efb435bf48fa2f8198b99d625f1a70f29e71c5deba1a05549ab6e91d6a1e579e7176d4f172f073d5fe5e71b8ad17ba SHA512 72a607a2a569ac7b390067e63c7c5da6d6f15661e6cdc1a723c3f5eee03f156155ed5977045d1b1bbd9ab7d8eef5f5588018cd10107ccacd3a1fddf3e71a9609
-DIST stress-ng-0.10.04.tar.xz 401148 BLAKE2B c5c1db3e5fc7316b5620311934f0119d00193f8d73d6705ff6597affebd78e81f3132a9748adc8beb7437261162c835346566a32501205416d223b9d03629423 SHA512 44097bd5a26b7c84ea69b47fc23be3a43369ad8325af375cfc51e45e51d8caabb84ea1af25aff00f042cc564980d7b3fc4b997cfb6246ab562a2f6e11d94ee5e
-EBUILD stress-ng-0.10.04.ebuild 750 BLAKE2B f571bc0163c0092642db01d452f85bfeedf74ff3169de5612add03c10d7fa34d1bbce40f0e039834cb6408c1794b44170f80325841a2e850bae84887916dbe00 SHA512 ac0de7f051c4119906e907875cbfa0b3a6426f5caf56c678866aba06fdc976edfb936d812b526990ac0d703280a3883d8f92ce3eef1a67da22bdc348e340a5df
+DIST stress-ng-0.10.05.tar.xz 401176 BLAKE2B f9562656b361e9a931f4ed65e57865310ac6b1630e48c1fd3680f5d5aeb644ac59f1b4f57760faebe6604cfa1f3619530aeef883f34bd573594767095e6d1201 SHA512 b6ea5d9b20431297988861c4416250960c340050a2e1958f93459b3bbfd4c801c61463efdf5a190d33b76627db05fe8288ebbb3aa12f48734dc93d36266bf363
+EBUILD stress-ng-0.10.05.ebuild 751 BLAKE2B f11680987fba121d4f4f383a123c820a605bfc7411a2ece9bd774360c33081597c1f98266dd2f6a4089d9f79c9220b1627c8691e5d28ff0b169c2bdec9dadfec SHA512 1787156da10b0d11a36f7915304c373000ac98cf90d5a04115cc679bae587048dd3e404855f7a988a4ae107e0ab6f1109f9fcf4a8d0a4cb8f8d0230ffe7327af
 MISC metadata.xml 953 BLAKE2B c10dbe55ea86af30a97975174565c3c9bbc76bf029f1582a5fbe8a98f79afb80a509543730294673d5b51ddf4a32fc93e8017f8ba0b26cac119c1e97e8fd025a SHA512 7975ca315e447e9d6c2d551fcf396b2a03d71661c4bd33843dba0413ea7b119dd1d3f59aaa91298bb5be2a17f377f7cae96cc7413531f30a88e2f401ef76f0bb
diff --git a/app-benchmarks/stress-ng/stress-ng-0.10.04.ebuild b/app-benchmarks/stress-ng/stress-ng-0.10.05.ebuild
index a91a89b38cdf..b2c3a4b18a19 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.10.04.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.10.05.ebuild
@@ -33,5 +33,6 @@ PATCHES=( "${FILESDIR}/${PN}-0.09.53-makefile.patch" )
 
 src_compile() {
 	tc-export CC
+
 	default
 }