gentoo resync : 02.09.2020

10 files changed, 87 insertions, 52 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index a117d0ba1f1d..804a96fa8021 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/interbench/Manifest b/app-benchmarks/interbench/Manifest
index a77e78642af7..b56d68896d7b 100644
--- a/app-benchmarks/interbench/Manifest
+++ b/app-benchmarks/interbench/Manifest
@@ -1,4 +1,5 @@
 AUX interbench-0.31-makefile.patch 449 BLAKE2B 3c9c0dcbc35c8294ab87e8ba4bd72c5fec4a01a49857de753a95b4eb436bc72657e569ed4f9dfbb759c078a053b47830a65a2e0d72747166815cb99ba54ac8af SHA512 2f4b648bcc879bd67dca83e22198cb18ac267ecf6e923cf23fbbc00b29cf36b57d37844e8095ae6c05c74f9ed538b3ee746e0f8d391349921f4514918a71f36a
+AUX interbench-0.31-musl.patch 330 BLAKE2B 9d7a4ec0b89154e11ecc42be926a20b0c2bdf4fd40e94c642040c77a997a20fc0f02a9e706875a038d420134ac3176ce4da4ec76d8bbd93b54a5c8969ff01747 SHA512 5b4142d49f97cfcbd758870780d85f4624ffdbe6521a1af000a47b5456d4549b8df327c66ab05501faa36ad8ce3ac9518b29ad61d4b1f7d51667ee9260d0ecaf
 DIST interbench-0.31.tar.gz 38791 BLAKE2B 8f5605c763be6be0fcb5b240d5022c578af98d470a8bdf61f0ebc2abe56e6439fa37b5ac4e3eae16c7aab902cc08fab25f0cb34a92c0eea05b287b7bef2abbb4 SHA512 ccad7f5a7ea10c3c56809725145bad17970c4fa8aafc4b962e4e79c56bfa05025fee140e5b70ec407158aca59bba47e6bbff14329516d9383801ffe4c0797a23
-EBUILD interbench-0.31.ebuild 570 BLAKE2B 4b58eb26058b9926c64f32980c0fa2660fceda082fb4fb7650a8f946e0ab15ffa230d6ab398223fe5ef2732289d0a294df6c19f21a56869c988341fcc5dfbf93 SHA512 8907db03297b8fd69a3f9755249ad5ee08a00392ab5d4b0c5963c2d3b8f5cb579943fe0823b13eed01acae34675a70a6efec1dfc18a2ca72857a1e7f40c30050
+EBUILD interbench-0.31.ebuild 602 BLAKE2B 1bc25b1f50eca7fe8bca31a88967536216a79ed1bb5a6ab88ebe4d44e0f79bc768325daecd97418b63a76ca9ad6f93b31bcf90b1c624a2f2a18b02afe71dddee SHA512 828200a2f609fb087238df6dbdcf99f287a2c3664e2f2d5caaa57f28b31ec65c45fafa7af2775e170006fca205bf1098ce074ae1257eee961c1c5e803be8097e
 MISC metadata.xml 753 BLAKE2B 639fa1f66a592e317934dc098a2ce9bc4c994cc0445302ef04971ce42032b8cfcab32fec0e90fb1a0d027be44af2e44fcb358e45137fdd0b87cad3b631a3dca6 SHA512 b61817405ca8784c84377bcd4eae6ac561fc7ff305a3d24c8c541a1d4e91d93daa11e2461ac6b5e2daf754a6c558b65228145e354844ca59d41174d50dd27012
diff --git a/app-benchmarks/interbench/files/interbench-0.31-musl.patch b/app-benchmarks/interbench/files/interbench-0.31-musl.patch
new file mode 100644
index 000000000000..df673be5114a
--- /dev/null
+++ b/app-benchmarks/interbench/files/interbench-0.31-musl.patch
@@ -0,0 +1,10 @@
+--- interbench-0.31.orig/interbench.c	2016-10-21 02:28:00.000000000 +0000
++++ interbench-0.31/interbench.c	2020-08-27 16:24:51.521420811 +0000
+@@ -42,6 +42,7 @@
+ #include <sys/utsname.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
++#include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/mman.h>
+ #include <sys/wait.h>
diff --git a/app-benchmarks/interbench/interbench-0.31.ebuild b/app-benchmarks/interbench/interbench-0.31.ebuild
index dfa772bcebbb..b77a5a4b1187 100644
--- a/app-benchmarks/interbench/interbench-0.31.ebuild
+++ b/app-benchmarks/interbench/interbench-0.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,10 @@ KEYWORDS="amd64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-musl.patch"
+)
 
 DOCS=(
 	"readme"
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 5e06f0ac6587..356648a302cd 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
 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
+DIST stress-ng-0.11.19.tar.xz 475692 BLAKE2B 711e9532655e8b76c44d06a86c773e2a2d5c19cf08dec693f7aacf100060ed492fc7ace8244897d4b342a3f1cae8e3f81314cb5b792253957c1622621bd1f6c0 SHA512 eefb331699faccaaa98775e14e4f33f5cc99b86ec8feb8f1c34b6cb7d20f061c576f8fcd683e51740fa662fb54d987bed36b9d87ad13a1b39b4fe66e60177ab1
+EBUILD stress-ng-0.11.19.ebuild 845 BLAKE2B 4b9188d58644d0746355fab936e7553a2d8ebd3d2279793cd5c1abc4cc0096c920f2bea11039a22d6e6b10068ccb2468a947956c8039f1ca807cae3c7301acaf SHA512 a8870c9880a3acf73d8914b4668cdb2ccc37ecb64e9bb2006a0f59bb9b0eb2059be53ca6e1924daa99eaea5384e842219a07550e1e48d8c9ad522e72a74febb8
 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
index 4c88cc73a967..4c88cc73a967 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 73029fa4f805..4cf772213c67 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1,4 +1,4 @@
-AUX wrk-4.1.0-r1-makefile.patch 963 BLAKE2B de7fea198e9e9366f763d2c0d25d1ff5ee2d91791eb7404ac19ceb75dd7f80f0ded3b3c97708c0b23105a42bd47f4750f1337ab8046a095e57ef0ec67d7bf9a6 SHA512 3dbdc1cc3bd74131ac91a211bf6e46754feac5f73b93d64f04f53e7e3acf285f349a8d21a6744b443aa9533d619073729187fe26a97faa03bafa6d99543c5dab
+AUX wrk-4.1.0-r2-makefile.patch 1503 BLAKE2B b6af00447a19a1fba571e662a4e9abac812909c2fb309b298d922f1ad7d63a78c626f57f125371dabc65e27758f938f1b3c6a69d56a801dca5296a99a0fd9e1c SHA512 195301271570e539d5ee009315fcda1c1280fc6ca0de0eb89a66bb39bacfae721e7d7d03ab212f01ad0ac331502732350a67da52217ae24cb87a85d12dbb8650
 DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a
-EBUILD wrk-4.1.0-r2.ebuild 915 BLAKE2B f9ca7c5a90d171154de70c1c8899a3548ea763604527741ee35af53c87a29c8cc626e84df84d7a912681b865df695dfe8deb0e8ad9972ad19c9653f4c507c4a6 SHA512 2e112f88ec54cf24de6a07d4dbc3a544f45d350b1fa35fd6f917952dd34630f49619269f34601e84a3b51d3929a41419089ba112d797ca9b113e76cf0168aba7
+EBUILD wrk-4.1.0-r2.ebuild 911 BLAKE2B 5487c95c9c6b4764214a9919c95e10c29312223a44328c375836675e3f0049ba4a09d4c4401523d2160a381326fa6cf5e268bebe0336dd1a770a9e07cdcca7cf SHA512 0c9e01a168a4c29b2a25618256fe0a1e55516dfa3ffc5015809c954bb2e3a260896e31e92e014bcf2909476ddcadd9bd74e0770cf4e23361e62efcac7d3eb778
 MISC metadata.xml 753 BLAKE2B 394af58d15030f33d953c4afae440cad777ba3e5fb4f95ec4a06cc6124929365bbcb2117734e7bb6e3d45cf9a42acee152a556f280fcf04244c0d8103e8f161f SHA512 5e262656536bd745faca708024430a5fc321dfea12ab61fdf74bae90df9b1d8237737db5a09afffdbfa278e29a9eb250292c2023263e4540f3fdd4cfe4984ade
diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-r1-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-r1-makefile.patch
deleted file mode 100644
index 6e7dd317b8fb..000000000000
--- a/app-benchmarks/wrk/files/wrk-4.1.0-r1-makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/Makefile	2018-01-21 07:00:58.000000000 +0100
-+++ b/Makefile	2018-11-09 11:58:57.000000000 +0100
-@@ -1,4 +1,4 @@
--CFLAGS  += -std=c99 -Wall -O2 -D_REENTRANT
-+CFLAGS  += -std=c99 -Wall -D_REENTRANT
- LIBS    := -lpthread -lm -lssl -lcrypto
- 
- TARGET  := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
-@@ -24,7 +24,7 @@
- 
- ODIR := obj
- OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o $(ODIR)/version.o
--LIBS := -lluajit-5.1 $(LIBS)
-+LIBS := $(shell pkg-config luajit --libs) $(LIBS)
- 
- DEPS    :=
- CFLAGS  += -I$(ODIR)/include
-@@ -51,8 +51,7 @@
- 	$(RM) -rf $(BIN) obj/*
- 
- $(BIN): $(OBJ)
--	@echo LINK $(BIN)
--	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- $(OBJ): config.h Makefile $(DEPS) | $(ODIR)
- 
-@@ -67,8 +66,7 @@
- 	@echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ -
- 
- $(ODIR)/%.o : %.c
--	@echo CC $<
--	@$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 
- # Dependencies
- 
diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch
new file mode 100644
index 000000000000..85de3eaf3c3e
--- /dev/null
+++ b/app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch
@@ -0,0 +1,63 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-CFLAGS  += -std=c99 -Wall -O2 -D_REENTRANT
+-LIBS    := -lpthread -lm -lssl -lcrypto
++CFLAGS  += -std=c99 -Wall -D_REENTRANT
++LIBS    := -lm -lssl -lcrypto -lpthread
+ 
+ TARGET  := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
+ 
+@@ -24,15 +24,13 @@
+ 
+ ODIR := obj
+ OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o $(ODIR)/version.o
+-LIBS := -lluajit-5.1 $(LIBS)
++LIBS := $(shell pkg-config luajit --libs) $(LIBS)
+ 
+ DEPS    :=
+ CFLAGS  += -I$(ODIR)/include
+-LDFLAGS += -L$(ODIR)/lib
+ 
+ ifneq ($(WITH_LUAJIT),)
+ 	CFLAGS  += -I$(WITH_LUAJIT)/include
+-	LDFLAGS += -L$(WITH_LUAJIT)/lib
+ else
+ 	CFLAGS  += -I$(ODIR)/include/luajit-2.1
+ 	DEPS    += $(ODIR)/lib/libluajit-5.1.a
+@@ -40,7 +38,6 @@
+ 
+ ifneq ($(WITH_OPENSSL),)
+ 	CFLAGS  += -I$(WITH_OPENSSL)/include
+-	LDFLAGS += -L$(WITH_OPENSSL)/lib
+ else
+ 	DEPS += $(ODIR)/lib/libssl.a
+ endif
+@@ -51,15 +48,14 @@
+ 	$(RM) -rf $(BIN) obj/*
+ 
+ $(BIN): $(OBJ)
+-	@echo LINK $(BIN)
+-	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ $(OBJ): config.h Makefile $(DEPS) | $(ODIR)
+ 
+ $(ODIR):
+ 	@mkdir -p $@
+ 
+-$(ODIR)/bytecode.o: src/wrk.lua
++$(ODIR)/bytecode.c: src/wrk.lua
+ 	@echo LUAJIT $<
+ 	@$(SHELL) -c 'PATH=obj/bin:$(PATH) luajit -b $(CURDIR)/$< $(CURDIR)/$@'
+ 
+@@ -67,8 +63,7 @@
+ 	@echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ -
+ 
+ $(ODIR)/%.o : %.c
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ # Dependencies
+ 
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
index 23ba20045cbb..34bc8be4849a 100644
--- a/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
+++ b/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
@@ -32,14 +32,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-DOCS=(
-	"CHANGES"
-	"NOTICE"
-	"README.md"
-	"SCRIPTING"
-)
-
-PATCHES=( "${FILESDIR}/${P}-r1-makefile.patch" )
+DOCS=( "CHANGES" "NOTICE" "README.md" "SCRIPTING" )
+
+PATCHES=( "${FILESDIR}/${P}-r2-makefile.patch" )
 
 src_compile() {
 	myemakeargs=(