gentoo resync 08.09.2018

6 files changed, 15 insertions, 15 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 78f09af2f689..ff84669d3d96 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/pipebench/Manifest b/app-benchmarks/pipebench/Manifest
index 592a09cd8478..e6d2f3c31c13 100644
--- a/app-benchmarks/pipebench/Manifest
+++ b/app-benchmarks/pipebench/Manifest
@@ -1,4 +1,4 @@
 AUX pipebench-0.40-fix-build-system.patch 603 BLAKE2B 69c90bad81413e22ab1be93014b9a9a8a60207e852354bf74c86aab496761102bdeabebfa1c3d33d803b30d6f42275dfb3c5b2cb9fede394cee9db4b9957a696 SHA512 a054d3393043953c56b759326d0bd72e94233673f945474aaa24fba0c78901997f864e79a255ab282b7251a6d88d6a024c08d332581aa3461bc5ce4be9a94bff
 DIST pipebench-0.40.tar.gz 11542 BLAKE2B b024ad8066a0adb2c1c9e1de1de93d9a9e91104380a1d955852b6281f1b4506be3b03240ed238766590c643c1d93060da43c523e773da738adb8bab333894247 SHA512 bace18d73425cf56bc3fd95eea4db47b3010cc82c16d9b433390d0ee4593046ab10101ce73df451596b34ace89fa92e93a92bb625286edb9cdfb809e630788cd
-EBUILD pipebench-0.40-r2.ebuild 569 BLAKE2B 1ef74acbacde5f884e6b3d828a83373f3505e0a7f97c737644197cff77d237003da2646dae367886f57f5d7848e14f1c227d8759aa9e77a45e441195e8a3fc51 SHA512 5c651e73ceeb6775183836d31e63f656248ae789649cb6ad36da697093b1822273a4757b32b48424d0cfc395c8789a858d9c6897f4acb172849b8b61726691c1
+EBUILD pipebench-0.40-r2.ebuild 558 BLAKE2B 4f705671d53a8f0b838cd449d7d959764a4442596b2c44cc4e7d3ef38ce30c6cbc743d732f6f64a57f933bc7705311b786586fb17d256e5d2e71b238e009b18d SHA512 ead526900469ba640b4f2148fbf094e348667ac206055158ec58a2bb55103ced5258beb1ed09955a482a2e3813cd438e5afb33f7f45c2e06b2fcc8870a237175
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild b/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild
index 0688bd665cff..6058d8d81f6a 100644
--- a/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild
+++ b/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.habets.pp.se/pub/synscan/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ppc64 x86 ~x86-linux"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${PN}-0.40-fix-build-system.patch )
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 2ccd4b27b189..c2405e4daa27 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
-AUX stress-ng-0.09.31-makefile.patch 1860 BLAKE2B a5fe82d643f79fd74303de3528a25444914e0071d9e43519c567a38c6f7956bafac3b48b12ed4d74abec9494fec70521a7e1e065905651de979f0051a6ade6ef SHA512 87fde07ed850f5761fd73bb147dd0d0a0781f190dd20d9cbfcc79013c5c8c3e5c1b1217f5dc20b596c9a8482b209f2855fbde73984249b156154eb87df273f86
-DIST stress-ng-0.09.37.tar.xz 354748 BLAKE2B 8910e169c8b14f047691bc931d016a39b90ace613ab10cc7337a90d48ae4ce78b8bcc76d0f5257a627e258de12836293f4bcf73117ccc1ecaab7fe7325f3f0ab SHA512 87014399e4e166bbacd01d65e6660db80ad6653bd6e69088321b6190e3dca1d9997d9f0567433791380c5af97a58b7414fea2d9190c09954a5861e6da303f25f
-EBUILD stress-ng-0.09.37.ebuild 681 BLAKE2B 7d819ff63bae78b55ade23ccf680fad63382ba39f88614c2cfb56d1b871130c0714bcde50848bc8329006c7bd00004e0fac5fb290b6840ed2a2a1fae9a20bf7e SHA512 1a33939cb65405e390a5e96052eef683d879ccd28506d4bca5effbf86de16cc459b0773e70707b310707cb448b2da762cf5411fe4eeed1634b08211c10d89ec2
+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
 MISC metadata.xml 796 BLAKE2B 746809bd51f5512246e29a1e15d9b41f3cf0df968b2e2655dcaef7bb839aff27ce2cefd4818e79fec18b9f12c7902bdd0440c634f9480da2352108950554d636 SHA512 47472bafada342a449ad7d3632c2b0859ee56f2eef31ca3ca9e7af1e106126ec7858862c67baa6b8d16611e2dd3ac166ecd931bab3491c875088e4bd66499aa6
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
index 633c6db1b3fd..6a36bc4adafe 100644
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2018-06-21 15:39:27.000000000 +0200
-+++ b/Makefile	2018-06-24 14:46:41.773596760 +0200
+--- a/Makefile	2018-08-23 17:55:27.000000000 +0200
++++ b/Makefile	2018-09-01 14:46:51.000000000 +0200
 @@ -21,7 +21,7 @@
  # Codename "portable pressure producer"
  #
@@ -9,7 +9,7 @@
  
  #
  # Pedantic flags
-@@ -319,12 +319,10 @@
+@@ -337,12 +337,10 @@
  .o: stress-ng.h Makefile
  
  .c.o: stress-ng.h Makefile $(SRC)
@@ -17,14 +17,14 @@
 -	@$(CC) $(CFLAGS) -c -o $@ $<
 +	$(CC) $(CFLAGS) -c -o $@ $<
  
- stress-ng: info $(OBJS)
+ stress-ng: $(OBJS)
 -	@echo "LD $@"
 -	@$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
 +	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
  	@sync
  
- .PHONY: info
-@@ -344,8 +342,7 @@
+ makeconfig:
+@@ -363,8 +361,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
  
  #
-@@ -360,12 +357,10 @@
+@@ -379,12 +376,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,8 +49,8 @@
  	@touch stress-ng.c
  
  $(OBJS): stress-ng.h Makefile
-@@ -405,10 +400,10 @@
- 	STRESS_NG=./stress-ng debian/tests/fast-test-all
+@@ -428,10 +423,10 @@
+ 	./stress-ng --seq 0 -t 15 --pathological --verbose --times --tz --metrics
  
  .PHONY: install
 -install: stress-ng stress-ng.1.gz
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.37.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild
index ce7b1343e7dc..66c8efa4f87c 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.09.37.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild
@@ -25,4 +25,4 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${PN}-0.09.31-makefile.patch" )
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )