gentoo resync : 25.08.2020

3 files changed, 19 insertions, 19 deletions

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index fe5636dc2a4b..5e06f0ac6587 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
-AUX stress-ng-0.11.02-makefile.patch 1802 BLAKE2B 1fa9fb57e31a8f0ff60e9a60140e8e85064840f215ba00e82d292737ec37889c3c3bb92cefd94a56104a5e80df69468e3ad7b38cbebed3f8c009dcf23932194b SHA512 7a697fc4c1dfc8e462362e0d3fe99d5432afbf921f2de91963f623163bbcbc0642e61444bb053e673661659d11c22f5a6932668b8a25d9d7564b19eb87467554
-DIST stress-ng-0.11.10.tar.xz 443208 BLAKE2B 273d98c8e8a7664e2ecd6431f0988b417980d9faf05550a80a0a90505907eec24eae5f717f4bd813f128f22870343861472bc1157373deb0aaef365b85de44fa SHA512 ae83fa107d17fe55c27429d4b0763db2b56c83d5ab88f4738f9b0be74a34c8adbb6d1dd7a5417ff1399c394c9a18c900265705f21c1cf123e0cc8361cb8214fe
-EBUILD stress-ng-0.11.10.ebuild 762 BLAKE2B 0ae9493eb2c03f913c6115f54608a43eaba6370296a2a824ff6040b236e118645c7a7344b23b873b414f56ba625cc752eb260e38387104720f72401d59f55746 SHA512 c3fcadf84d8a0ec0e37bf568e0920bb1f24b12eec08f544a1383ec2503c1472d56b27829ee017d813f0ffc3f1c4ef0ea64954839362642219a0db9320f098191
+AUX stress-ng-0.11.17-makefile.patch 1752 BLAKE2B 999a2bd729c0b3d3184010ffe5ffb5d59cf82fead7a16199c2ce1abd37dcfd3a665f4644b8d740ece4b92fa2f543e84d57952b13bac728a78ed0f749d106459c SHA512 affe4f5a324e009f10f0ed26dd8dc6d1ab7938da8574392c2514f307c1e4a46a85b0fcf7c3820e6f147f1150483f811b314d82b73ca7f605167ffa8d50c4691d
+DIST stress-ng-0.11.18.tar.xz 473268 BLAKE2B 1a10fab7fc98dad72f59f871e148980b3a7ea29d62badcc7a41ae72598cd99b880da10927a8809b5785040aaaf93a4776801304a43bf3d7bcfbbf19d5b488cd2 SHA512 c6871cfb6b72fae83ad2d8a4877363b81e5674d1670faa24c7a54951020f177f9a81033506207032a0b2bf39269fb09c6d8a6842d41285ee75135a37ad8e781c
+EBUILD stress-ng-0.11.18.ebuild 845 BLAKE2B 4b9188d58644d0746355fab936e7553a2d8ebd3d2279793cd5c1abc4cc0096c920f2bea11039a22d6e6b10068ccb2468a947956c8039f1ca807cae3c7301acaf SHA512 a8870c9880a3acf73d8914b4668cdb2ccc37ecb64e9bb2006a0f59bb9b0eb2059be53ca6e1924daa99eaea5384e842219a07550e1e48d8c9ad522e72a74febb8
 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch
index bce1907d139d..d3c5e93b0074 100644
--- a/app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch
@@ -1,8 +1,5 @@
-Always respect users CFLAGS, enable verbose output when compiling
-and don't install compressed man pages.
-
---- a/Makefile
-+++ b/Makefile
+--- stress-ng-0.11.17.orig/Makefile	2020-07-27 13:38:23.000000000 +0200
++++ stress-ng-0.11.17/Makefile	2020-08-09 13:43:30.919796477 +0200
 @@ -21,7 +21,7 @@
  # Codename "synthetic system strainer"
  #
@@ -12,10 +9,10 @@ and don't install compressed man pages.
  
  #
  # Pedantic flags
-@@ -357,12 +357,10 @@
+@@ -358,12 +358,10 @@
  .o: stress-ng.h Makefile
  
- .c.o: stress-ng.h Makefile $(SRC)
+ .c.o:
 -	@echo "CC $<"
 -	@$(CC) $(CFLAGS) -c -o $@ $<
 +	$(CC) $(CFLAGS) -c -o $@ $<
@@ -27,7 +24,7 @@ and don't install compressed man pages.
  	@sync
  
  makeconfig:
-@@ -383,7 +381,7 @@
+@@ -384,7 +382,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
@@ -36,9 +33,9 @@ and don't install compressed man pages.
  	@$(CC) -c apparmor-data.c -o apparmor-data.o
  	@rm -rf apparmor-data.c apparmor-data.bin
  
-@@ -399,12 +397,12 @@
- core-perf.o: core-perf.c core-perf-event.c
- 	@$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
+@@ -401,12 +399,12 @@
+ 	@$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | \
+ 	sed 's/,/ /' | sed s/'^ *//' | \
  	awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
 -	@echo CC $<
 -	@$(CC) $(CFLAGS) -c -o $@ $<
@@ -53,7 +50,7 @@ and don't install compressed man pages.
  	@touch stress-ng.c
  
  $(OBJS): stress-ng.h Makefile
-@@ -453,7 +451,7 @@
+@@ -459,7 +457,7 @@
  	mkdir -p ${DESTDIR}${BINDIR}
  	cp stress-ng ${DESTDIR}${BINDIR}
  	mkdir -p ${DESTDIR}${MANDIR}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild
index b2cfc3fbc768..4c88cc73a967 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Stress test for a computer system with various selectable ways"
 HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
@@ -17,10 +17,8 @@ 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
 "
@@ -29,10 +27,15 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${PN}-0.11.02-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.11.17-makefile.patch" )
 
 src_compile() {
 	tc-export CC
 
 	default
 }
+
+pkg_postinst() {
+	optfeature "AppArmor support" sys-libs/libapparmor
+	optfeature "SCTP support" net-misc/lksctp-tools
+}