gentoo resync : 15.12.2019

4 files changed, 15 insertions, 18 deletions

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index a9227a0928c9..b668c197eaa4 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.07.tar.xz 400796 BLAKE2B c0a5630b2de32768e8294afcd4c8f8ab4474325e54ca50f4c19001ac7493d15a2daa0aa755f606693ba7bc84686c9d259d948041148341d7b7a99d6148ed14fd SHA512 eb5c945ef64af06201ec3f28e1e5c5421dc53cb5b93b4781476a11fb80777a24f50f45f4e59d2ad0c19d753c3f170dc91b0868ffb5b5eb7674a3cbf41e615b31
-EBUILD stress-ng-0.10.07.ebuild 751 BLAKE2B f11680987fba121d4f4f383a123c820a605bfc7411a2ece9bd774360c33081597c1f98266dd2f6a4089d9f79c9220b1627c8691e5d28ff0b169c2bdec9dadfec SHA512 1787156da10b0d11a36f7915304c373000ac98cf90d5a04115cc679bae587048dd3e404855f7a988a4ae107e0ab6f1109f9fcf4a8d0a4cb8f8d0230ffe7327af
-MISC metadata.xml 953 BLAKE2B c10dbe55ea86af30a97975174565c3c9bbc76bf029f1582a5fbe8a98f79afb80a509543730294673d5b51ddf4a32fc93e8017f8ba0b26cac119c1e97e8fd025a SHA512 7975ca315e447e9d6c2d551fcf396b2a03d71661c4bd33843dba0413ea7b119dd1d3f59aaa91298bb5be2a17f377f7cae96cc7413531f30a88e2f401ef76f0bb
+AUX stress-ng-0.10.13-makefile.patch 1804 BLAKE2B 69124dc34ea49c94e4ffe51af6e3a87c060fb3572a6b7b6857177f7b8c6830725cff08699a3cc13be9212f6a14e4fca85579ed88b79e30c5ad799cd1c0fefe00 SHA512 1603c399e17e6d70fdc7995674ab1b10578d7165e33cb4545313596dfc2b1f006d5a4ee83eef1b679c8e553d6cb58f7ffb93228c91ce83d986f0c9759f9ed636
+DIST stress-ng-0.10.13.tar.xz 409940 BLAKE2B fffeaedd999a0887955674f3883f65124eb13814cf284ab1bd7c7dec34380cd381026d9217c9f949a7c0c2227c8b9558409153d0feff01473a6c9f49730f89b4 SHA512 97e8a7ce5dc5e428c26b0d4eeb1350c43c1043aa7dbf591112768c33e208bafe9df7fe737c9a912f0b4296d64e4b27b81131b459c356aca95bc8856e8b939639
+EBUILD stress-ng-0.10.13.ebuild 740 BLAKE2B 6c77c8d18321cb4d04edd65c9079e89a45acbdd29ea0ca31b3e84aa38f5b7918dc2491cb4b6ef2e41bc3a98cb75e8e3339bac2c31673e9a67e9bb212036b4a61 SHA512 ff98c644734669a336cf5463ef3c825ae0cf7b7ad06aa2da08a8ba28b650c42d3da7669090551b10317bef62c5be110c286867ab8878f00077169a41584fdc12
+MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch
index cf08858d361b..b6a8554cdde2 100644
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch
@@ -1,7 +1,7 @@
---- a/Makefile	2019-02-15 13:06:01.000000000 +0100
-+++ b/Makefile	2019-02-19 21:44:10.000000000 +0100
+--- stress-ng-0.10.13.orig/Makefile	2019-12-09 13:42:13.000000000 +0100
++++ stress-ng-0.10.13/Makefile	2019-12-14 00:51:33.390034647 +0100
 @@ -21,7 +21,7 @@
- # Codename "portable pressure producer"
+ # Codename "systematic system smasher"
  #
  
 -CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
@@ -9,7 +9,7 @@
  
  #
  # Pedantic flags
-@@ -347,12 +347,10 @@
+@@ -359,12 +359,10 @@
  .o: stress-ng.h Makefile
  
  .c.o: stress-ng.h Makefile $(SRC)
@@ -24,7 +24,7 @@
  	@sync
  
  makeconfig:
-@@ -373,7 +371,7 @@
+@@ -385,7 +383,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
@@ -33,7 +33,7 @@
  	@$(CC) -c apparmor-data.c -o apparmor-data.o
  	@rm -rf apparmor-data.c apparmor-data.bin
  
-@@ -389,12 +387,12 @@
+@@ -401,12 +399,12 @@
  core-perf.o: core-perf.c core-perf-event.c
  	@$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
  	awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
@@ -50,7 +50,7 @@
  	@touch stress-ng.c
  
  $(OBJS): stress-ng.h Makefile
-@@ -442,6 +440,6 @@
+@@ -455,7 +453,7 @@
  	mkdir -p ${DESTDIR}${BINDIR}
  	cp stress-ng ${DESTDIR}${BINDIR}
  	mkdir -p ${DESTDIR}${MANDIR}
@@ -58,3 +58,4 @@
 +	cp stress-ng.1 ${DESTDIR}${MANDIR}
  	mkdir -p ${DESTDIR}${JOBDIR}
  	cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
+ 	mkdir -p ${DESTDIR}${BASHDIR}
diff --git a/app-benchmarks/stress-ng/metadata.xml b/app-benchmarks/stress-ng/metadata.xml
index 41c8fd9db167..c2c476305376 100644
--- a/app-benchmarks/stress-ng/metadata.xml
+++ b/app-benchmarks/stress-ng/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Stress-ng will stress test a computer system in various selectable ways.
 		It was designed to exercise various physical subsystems of a computer
diff --git a/app-benchmarks/stress-ng/stress-ng-0.10.07.ebuild b/app-benchmarks/stress-ng/stress-ng-0.10.13.ebuild
index b2c3a4b18a19..342e1b2caa46 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.10.07.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.10.13.ebuild
@@ -22,14 +22,14 @@ DEPEND="
 	sys-apps/keyutils:=
 	sys-libs/libapparmor
 	sys-libs/libcap
-	sys-libs/zlib:=
+	sys-libs/zlib
 "
 
 RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${PN}-0.09.53-makefile.patch" )
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
 
 src_compile() {
 	tc-export CC