gentoo resync : 22.12.2021

4 files changed, 108 insertions, 2 deletions

diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 8af9046223a3..d92f5e0bb801 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1,4 +1,7 @@
 AUX wrk-4.1.0-r100-makefile.patch 1509 BLAKE2B d03fcc70c201777cc0f75e81e827ef941ac9a2128b05118ceae5256c481065ed21f1bf5290b05c304a03fe765b7576a91d882392d376ceed19d2d1fc89c9f894 SHA512 a4d035c7114a8876b10435936db30068ba7232516b5e21f9577832e7ffed28144b0f5864b25e9df72ced0937c6d687117cdee42234fcba2a1cfa20b9bd1e31c0
+AUX wrk-4.2.0-makefile.patch 1277 BLAKE2B a286a0c3b523e0e6cd86607ae7334e1b3981c94ff9f260f6cdfbb71bd34b1f355ac78ec1b5493fea25c4563ba70b23da9012d62f7b9a96c298afbec0e3b622fe SHA512 cb5fbb252ec2867355f09c323d6675814d83388d3b04f23192ae0b2b7e94580574431173d88d79079e07cedaf4aedfc31d7e6d47083618333d6974ace685b823
 DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a
-EBUILD wrk-4.1.0-r100.ebuild 853 BLAKE2B a3654e82bf0ec7b89617585555d6e03bd8ec923ec02b17314aa565927a3ae26fcae83f87711b22efd3a677cfb5996c5e1c10740d481d8a8bbd80303dda315331 SHA512 0cc4e667cf0647d9d51db4278d40192949d6f73e2b4703f73d51b3d925c929adea2fea7ad866236d32a0110a3ab9c6cbb183334fd2353032b0fde7e44637aea1
+DIST wrk-4.2.0.tar.gz 10973405 BLAKE2B e81698f70017cd7d55ee7adceb050ea48b2ed9d2ef9195e5b2743dafb637f78d54c8003d049c2965f90457f9b7a80620b86bc0b9bb1a259b88e5c66d6af8cc79 SHA512 c356b1314f37b558f39f30d9a9c6a2a9c2f646eaf7c0cb4262325850922528148f89ccbe7c33390c87e40f8fef6fffd704e3cfe75a89e4e9b178101043fa038d
+EBUILD wrk-4.1.0-r100.ebuild 869 BLAKE2B 44d506bcd633613f0d4d1d8e08601f5baa689e5457d5d557e28b6d63b3b545004915a74c44740132562ecbd3767c71543868a268d9e36f97085f2402d0eebd91 SHA512 b1d475081f647b09a579e307aa06cf6ebda8d110516356b6b507323f9791be4261e020d17fff4bee0a5eeb60e08360d98d0bbb237082a00711e7b524a51411cf
+EBUILD wrk-4.2.0.ebuild 873 BLAKE2B cde42694574dcad29b166e6479bc7790cfbafb610e93cd20367f090c1104b0bcce95c9812c4617ddfd215b89cd88e26d05363710e04930c1a2f8aa924e218e46 SHA512 7709ff53c6e32d71eecc06966434cfd47dd78a536b599998ff530f21aaaff9b530785cf8bd632c70bd01dbc6a62677f629f42d42de609a808a1d8eedebb417c7
 MISC metadata.xml 754 BLAKE2B 5d9f7e4ef536efaaaf5dcc71e908c6e50a3c691acd361cfc5d5abaefb7c193a5d6acf72f70ffad0eca96133cda35e1236f00212ca1deee11a5dfbcedf6f604b3 SHA512 864c4eefd5446d398495645a6cbc73613f28102dff61bcfe2f81e8ebbb005679deb463735e051e0451e23eaa4ab4893092e148abf87071ace9ebc5b2029fd619
diff --git a/app-benchmarks/wrk/files/wrk-4.2.0-makefile.patch b/app-benchmarks/wrk/files/wrk-4.2.0-makefile.patch
new file mode 100644
index 000000000000..b5a32ae9b5eb
--- /dev/null
+++ b/app-benchmarks/wrk/files/wrk-4.2.0-makefile.patch
@@ -0,0 +1,54 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS  += -std=c99 -Wall -O2 -D_REENTRANT
++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 := $(LUA_LIBS) $(LIBS)
+ 
+ DEPS    :=
+ CFLAGS  += -I$(ODIR)/include
+-LDFLAGS += -L$(ODIR)/lib
+ 
+ ifneq ($(WITH_LUAJIT),)
+-	CFLAGS  += -I$(WITH_LUAJIT)/include
+-	LDFLAGS += -L$(WITH_LUAJIT)/lib
++	CFLAGS  += $(WITH_LUAJIT)
+ 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,8 +48,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 +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-r100.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
index a72f75b15bd4..ae473486ff83 100644
--- a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
+++ b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( luajit )
 
-inherit lua-single
+inherit lua-single toolchain-funcs
 
 DESCRIPTION="A HTTP benchmarking tool"
 HOMEPAGE="https://www.github.com/wg/wrk"
diff --git a/app-benchmarks/wrk/wrk-4.2.0.ebuild b/app-benchmarks/wrk/wrk-4.2.0.ebuild
new file mode 100644
index 000000000000..93042e4f6647
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-4.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+
+inherit lua-single toolchain-funcs
+
+DESCRIPTION="A HTTP benchmarking tool"
+HOMEPAGE="https://www.github.com/wg/wrk"
+SRC_URI="https://www.github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	${LUA_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( "CHANGES" "NOTICE" "README.md" "SCRIPTING" )
+
+PATCHES=( "${FILESDIR}/${PN}-4.2.0-makefile.patch" )
+
+src_compile() {
+	myemakeargs=(
+		CC="$(tc-getCC)"
+		LUA_LIBS="$(lua_get_LIBS)"
+		VER="${PV}"
+		WITH_LUAJIT="$(lua_get_CFLAGS)"
+		WITH_OPENSSL="/usr"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	dobin wrk
+
+	insinto /usr/share/wrk
+	doins -r scripts
+
+	einstalldocs
+}