gentoo resync : 30.06.2018

3 files changed, 18 insertions, 35 deletions

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index a5673cc23180..9afd36aed05b 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
-AUX makefile.patch 2336 BLAKE2B 6ec251c24e174a360c3c183d44a335cdceba6a9be084b94a2abd9327397b87dacc3badda8a94330d6a6a5a32810fb31af8bafceb2079b53f11452e8ad0b31ba2 SHA512 8f2d477a66774b94c04c41ea86a86980d1050ea8cb7fa901d629b3eebcf23446d2f6db0af4e9a01ced531ffb9cbc543678bef78b32cadab4c93f56876900ca25
-DIST stress-ng-0.09.30.tar.xz 350520 BLAKE2B 24d4b92947aa00549905166f58408e4c3d90945c7dc4f0e4bb1d143eea80cc7ef641547611c68f80d45c77a2b552937b6426c3162c54137435ceb578fa5da5a7 SHA512 3bab686e9a251e9f693987cf90554687acc3a4ea06712adc4c90ff45e6fbf650077017ecde49871aa1806ef9c874fd819f9ae65baea04bdf576da2abbf273f9c
-EBUILD stress-ng-0.09.30.ebuild 665 BLAKE2B f4444fa2ff6cb081e886057f9fe1835acc794ded8149bd41bc681c41a13bb2ae1ac22013db6ccf6e2531dd4eabd94bb19bea1fc413a03f7036e71b7be0d93bbe SHA512 201a5a60afa3867f8e349543656f244fbb1c8f30239f489904090719ad0e2690ecf6afa20407aa46c70e97240d347d6ae316da462e3480b15380f180496bc6f5
+AUX stress-ng-0.09.31-makefile.patch 1860 BLAKE2B a5fe82d643f79fd74303de3528a25444914e0071d9e43519c567a38c6f7956bafac3b48b12ed4d74abec9494fec70521a7e1e065905651de979f0051a6ade6ef SHA512 87fde07ed850f5761fd73bb147dd0d0a0781f190dd20d9cbfcc79013c5c8c3e5c1b1217f5dc20b596c9a8482b209f2855fbde73984249b156154eb87df273f86
+DIST stress-ng-0.09.31.tar.xz 350760 BLAKE2B 5f839b4a4020cb3f1c5cfeafafefc576dd36f4d6c600f4cce917837ddf3f2e70349b0b76037dc2ee0e3d96fca172d65b01629559f705bdbf6f975978a79f58b1 SHA512 01fc32bac51adcbf98907c73bfc0c54ec9d04355d3959e7dcba208dbd85c314310cf6c5b4fe092dad53bfca54d7dfe6d292b75845bc0b0998e43f9907dbc50ac
+EBUILD stress-ng-0.09.31.ebuild 670 BLAKE2B 6a0bf6a4a047eaabf22c13e4938ae891822326640e012a8268a80918bcd7dd04c0ef2c6d9c4dd4298ef69a0b5ed45fd721b44bf2bcb7bfaa5995493ac05b92f1 SHA512 9676a4a48423720371fe5fc2fb5caed282554ddfb8186e59a8ef4dfe3822ce1a2dcfea478c9b0d15a58b2cc53ec78f7da43b0272c5cabbf84d30d00eef4a9ad2
 MISC metadata.xml 796 BLAKE2B 746809bd51f5512246e29a1e15d9b41f3cf0df968b2e2655dcaef7bb839aff27ce2cefd4818e79fec18b9f12c7902bdd0440c634f9480da2352108950554d636 SHA512 47472bafada342a449ad7d3632c2b0859ee56f2eef31ca3ca9e7af1e106126ec7858862c67baa6b8d16611e2dd3ac166ecd931bab3491c875088e4bd66499aa6
diff --git a/app-benchmarks/stress-ng/files/makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
index eecb12cad5b4..633c6db1b3fd 100644
--- a/app-benchmarks/stress-ng/files/makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
@@ -1,20 +1,21 @@
---- a/Makefile	2018-04-27 17:02:16.000000000 +0200
-+++ b/Makefile	2018-05-13 20:54:08.741008488 +0200
+--- a/Makefile	2018-06-21 15:39:27.000000000 +0200
++++ b/Makefile	2018-06-24 14:46:41.773596760 +0200
 @@ -21,7 +21,7 @@
  # Codename "portable pressure producer"
  #
  
 -CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
-+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"'
++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
  
  #
  # Pedantic flags
-@@ -314,12 +314,9 @@
+@@ -319,12 +319,10 @@
  .o: stress-ng.h Makefile
  
  .c.o: stress-ng.h Makefile $(SRC)
 -	@echo "CC $<"
 -	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
  
  stress-ng: info $(OBJS)
 -	@echo "LD $@"
@@ -23,50 +24,32 @@
  	@sync
  
  .PHONY: info
-@@ -339,8 +336,7 @@
+@@ -344,8 +342,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
 -	@echo "CC $<"
 -	@$(CC) -c apparmor-data.c -o apparmor-data.o
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c apparmor-data.c -o apparmor-data.o
- 	@rm -rf apparmor-data.c
++	$(CC) -c apparmor-data.c -o apparmor-data.o
+ 	@rm -rf apparmor-data.c apparmor-data.bin
  
  #
-@@ -353,20 +349,15 @@
- stress-personality.c: personality.h
- 
+@@ -360,12 +357,10 @@
  perf.o: perf.c perf-event.c
--	@$(CC) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
+ 	@$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
+ 	awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
 -	@echo CC $<
 -	@$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
  
  stress-vecmath.o: stress-vecmath.c
 -	@echo CC $<
 -	@$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -fno-builtin -c -o $@ $<
++	$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
  	@touch stress-ng.c
  
  $(OBJS): stress-ng.h Makefile
- 
--stress-ng.1.gz: stress-ng.1
--	gzip -c $< > $@
--
- .PHONY: dist
- dist:
- 	rm -rf stress-ng-$(VERSION)
-@@ -386,7 +377,7 @@
- 
- .PHONY: clean
- clean:
--	@rm -f stress-ng $(OBJS) stress-ng.1.gz stress-ng.pdf
-+	@rm -f stress-ng $(OBJS) stress-ng.pdf
- 	@rm -f stress-ng-$(VERSION).tar.xz
- 	@rm -f personality.h
- 	@rm -f perf-event.h
-@@ -398,10 +389,10 @@
+@@ -405,10 +400,10 @@
  	STRESS_NG=./stress-ng debian/tests/fast-test-all
  
  .PHONY: install
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.30.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild
index 22522e099dce..7652a40c8cfd 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.09.30.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild
@@ -25,4 +25,4 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/makefile.patch" )
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )