gentoo resync : 21.09.2018

6 files changed, 52 insertions, 10 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index ff84669d3d96..201da9402510 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index a15cf77fc6e5..f8091b345e0f 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.2.3-Linux.tar.gz 71032570 BLAKE2B 9589c355561acffdfe6b68fcb7a73a7d3c87376db10b70d471d7970491c9ce29cd66e9d5f48968cb2b34fad6440a8667ebf061976e5b838295fb002442de101a SHA512 eaeb1657a1eff0dd8fac4b9a89e5a7d0da22e396e35ba6a1255c2a5c4434ad1a23cda54f28f4271a9a5450e57b3601c344964ddd96dcdef1144f17b7fd20aa4b
+DIST Geekbench-4.3.0-Linux.tar.gz 71075837 BLAKE2B 9d278654d44a43577f252a0a2842e3b9a34bf6b9a0f605b0a053354bff845f5ae5c029b8ff22b3b3f4f66581c60d46a4643207f042ba020515b74a01fa56a37e SHA512 d76c2f0a93ad06afa250c32633c27d5718ca9c2abca7eaa050f967a63d279bde9e220e20677af1433d531bce176d70ed15eee16d020b41aff0b817fde966a0c6
 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.2.3.ebuild 1111 BLAKE2B 819573e558d88206121c461935c424e85e85f811e3c00669627daa0434cd5505ea0fc0621ad0b93677ad19023c5a78a9203319d4160952a72f9b1bbf2b9c6f53 SHA512 c51a31b124940476742ba26497652e0cced23f2cab230222246be02ddc2f90359580cb517374f8498b63bcab5e66dc82a8bec0c3b6cc5d0bbaf1d3a182900f5c
+EBUILD geekbench-4.3.0.ebuild 1115 BLAKE2B bf4755b13f3994838afe07bfcb1d9f84dde6984fad2ad7177c33c897d48565ce4066d4116eb7e3426b7abad28c8e59295b2165e2a66f29e7c293a7f7853a4519 SHA512 193958053b574ae781930aea7a285828e141aacb17ae33b993849640083fbd3b3511477275229a4ce92395ccbeff70eb0ad787cf46529c2a28ca9e97173212a6
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/app-benchmarks/geekbench/geekbench-4.3.0.ebuild b/app-benchmarks/geekbench/geekbench-4.3.0.ebuild
new file mode 100644
index 000000000000..dfc702580340
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-4.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 c2405e4daa27..6aad8d9e25a9 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
-AUX stress-ng-0.09.38-makefile.patch 1879 BLAKE2B f037aa43102e7959de1b7ee370e67b63268b758b0989ae70fccb7fbbee029641640a36437af07c141862b6b58a207aeca4eefd44a69fee189aa8d9bcffe4fa2d SHA512 7cee370fedd317c80ff059c8602df57b7809ab51dbfa57b8ee57d25638c010e3b04e92be6a6000788319355951e370f0bc813b8329a11108199c74b9fd842c5a
-DIST stress-ng-0.09.38.tar.xz 355252 BLAKE2B 9382d48af5fa7fbb9128887d484688045cf033a2f5997898209f530ef6c27ea27c5271666247a9c650f4dd66bd2add93586dd5beb19f6509f78b9e355791cf27 SHA512 b3f3d03151cd5afaa267eb028ec9f450d8dccec851de0f16fe8d83e81b7a8e9572b7c556e1fab4ecc57c56829e6d30023716708f15b9156af146a0c72ae4ddf8
-EBUILD stress-ng-0.09.38.ebuild 672 BLAKE2B 50466e766076bae87c179f8aa4affa8d3a21ba776790bcc64c07c45f56fe58f92bb4d89197e3000440513cd3a0df4ef9b7ea391b3fa6e2afde17b753b6a1ea74 SHA512 5b04dade5e4e0f92e9f156625a4db6d1a47a914695d85ab30782b8bf87e4a73c7a9917d91e720542f581b97406cb2ddcfe87fa89a3f83d3c1df8230216567af8
+AUX stress-ng-0.09.40-makefile.patch 1885 BLAKE2B 63eb0580af258cb6bd1085b40c6c124611ce86b23509c696ac99a2f9d12ff30aa33ff5ecbd34be048ed86b4c71c7729f1b27f9d41dbb7194f59ec5630b656471 SHA512 ebc40864b2c66fe60dc0525ab29b2b458b5d518aa5495f7335f1fb97ba7920764f527b4ed75ce54229c4145c89bd63c8a3abe3440b9ffe9625b993ca0be59086
+DIST stress-ng-0.09.40.tar.xz 358268 BLAKE2B 4c52af04ea4579c53ac2e44a32322f2b4a962e78a44fea088ae1046e6e4d9e77c3b8110864d02088c99379d12f0f4edab29bc8be5102c6a8dd0f27ff4ed20c31 SHA512 f60057596e80488d3160e984c547471fb7874e76bb13d5d57407336d2770ed480902c05b013c7e27e682ca84954daa7fd9a4bbe2b45b3307ba3361ec747a21d6
+EBUILD stress-ng-0.09.40.ebuild 672 BLAKE2B 50466e766076bae87c179f8aa4affa8d3a21ba776790bcc64c07c45f56fe58f92bb4d89197e3000440513cd3a0df4ef9b7ea391b3fa6e2afde17b753b6a1ea74 SHA512 5b04dade5e4e0f92e9f156625a4db6d1a47a914695d85ab30782b8bf87e4a73c7a9917d91e720542f581b97406cb2ddcfe87fa89a3f83d3c1df8230216567af8
 MISC metadata.xml 796 BLAKE2B 746809bd51f5512246e29a1e15d9b41f3cf0df968b2e2655dcaef7bb839aff27ce2cefd4818e79fec18b9f12c7902bdd0440c634f9480da2352108950554d636 SHA512 47472bafada342a449ad7d3632c2b0859ee56f2eef31ca3ca9e7af1e106126ec7858862c67baa6b8d16611e2dd3ac166ecd931bab3491c875088e4bd66499aa6
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch
index 6a36bc4adafe..e3478e8ced84 100644
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch
@@ -1,15 +1,15 @@
---- a/Makefile	2018-08-23 17:55:27.000000000 +0200
-+++ b/Makefile	2018-09-01 14:46:51.000000000 +0200
+--- a/Makefile	2018-09-12 18:12:22.000000000 +0200
++++ b/Makefile	2018-09-16 02:06:13.000000000 +0200
 @@ -21,7 +21,7 @@
  # Codename "portable pressure producer"
  #
  
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
+-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99 -pipe
 +CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
  
  #
  # Pedantic flags
-@@ -337,12 +337,10 @@
+@@ -338,12 +338,10 @@
  .o: stress-ng.h Makefile
  
  .c.o: stress-ng.h Makefile $(SRC)
@@ -24,7 +24,7 @@
  	@sync
  
  makeconfig:
-@@ -363,8 +361,7 @@
+@@ -364,8 +362,7 @@
  		sed '$$ s/.$$//' >> apparmor-data.c
  	@echo "};" >> apparmor-data.c
  	@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
@@ -34,7 +34,7 @@
  	@rm -rf apparmor-data.c apparmor-data.bin
  
  #
-@@ -379,12 +376,10 @@
+@@ -380,12 +377,10 @@
  perf.o: perf.c perf-event.c
  	@$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
  	awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
@@ -49,7 +49,7 @@
  	@touch stress-ng.c
  
  $(OBJS): stress-ng.h Makefile
-@@ -428,10 +423,10 @@
+@@ -429,10 +424,10 @@
  	./stress-ng --seq 0 -t 15 --pathological --verbose --times --tz --metrics
  
  .PHONY: install
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.40.ebuild
index 66c8efa4f87c..66c8efa4f87c 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.40.ebuild