gentoo resync : 29.01.2021

4 files changed, 2 insertions, 124 deletions

diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 4ea84d1052e8..7aa6219700ac 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1,6 +1,4 @@
 AUX wrk-4.1.0-r100-makefile.patch 1509 BLAKE2B d03fcc70c201777cc0f75e81e827ef941ac9a2128b05118ceae5256c481065ed21f1bf5290b05c304a03fe765b7576a91d882392d376ceed19d2d1fc89c9f894 SHA512 a4d035c7114a8876b10435936db30068ba7232516b5e21f9577832e7ffed28144b0f5864b25e9df72ced0937c6d687117cdee42234fcba2a1cfa20b9bd1e31c0
-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-r100.ebuild 922 BLAKE2B cfbcf479e34f55dfbc9e44dc08ab5da90fae1aef7270ea705b3dd852f922d231ab64130b2375c33478c865ed61e957f557f71117e021a624531e3761e3881bd0 SHA512 251038bb0ba7c0271836524685470b1d73f4b791304bd39f655513b1b273d5d33edca4b42c15ac98d4083fbf767519864fd67e2eed5b64dc0c9a50e93f8fd923
-EBUILD wrk-4.1.0-r2.ebuild 911 BLAKE2B 5487c95c9c6b4764214a9919c95e10c29312223a44328c375836675e3f0049ba4a09d4c4401523d2160a381326fa6cf5e268bebe0336dd1a770a9e07cdcca7cf SHA512 0c9e01a168a4c29b2a25618256fe0a1e55516dfa3ffc5015809c954bb2e3a260896e31e92e014bcf2909476ddcadd9bd74e0770cf4e23361e62efcac7d3eb778
+EBUILD wrk-4.1.0-r100.ebuild 920 BLAKE2B 2169abb35f8a845533f93edfdc9d050693f73867c22e3f78a96084e80275cbd4b1b85d399ea33bf180b74874da641ed907da06aa97fa0936f86da05400e565e9 SHA512 6dcde60ccc94cc2c7199fa5cf7456a1692c1c69fbd503f2b7e2a735f45c87e6e1f384dc9310c346d6ad0aaa66947d527b4981a09ff41f0249c100aeb80dc7431
 MISC metadata.xml 753 BLAKE2B 394af58d15030f33d953c4afae440cad777ba3e5fb4f95ec4a06cc6124929365bbcb2117734e7bb6e3d45cf9a42acee152a556f280fcf04244c0d8103e8f161f SHA512 5e262656536bd745faca708024430a5fc321dfea12ab61fdf74bae90df9b1d8237737db5a09afffdbfa278e29a9eb250292c2023263e4540f3fdd4cfe4984ade
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
deleted file mode 100644
index 85de3eaf3c3e..000000000000
--- a/app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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-r100.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
index b41fa3314fab..065b55d6d59b 100644
--- a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
+++ b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
 IUSE="libressl"
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
deleted file mode 100644
index 34bc8be4849a..000000000000
--- a/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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"
-IUSE="libressl"
-
-CBUILD="dev-lang/luajit:2"
-
-DEPEND="
-	dev-lang/lua:0
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-"
-
-RDEPEND="
-	${CBUILD}
-	${RDEPEND}
-"
-
-BDEPEND="
-	${CBUILD}
-	virtual/pkgconfig
-"
-
-DOCS=( "CHANGES" "NOTICE" "README.md" "SCRIPTING" )
-
-PATCHES=( "${FILESDIR}/${P}-r2-makefile.patch" )
-
-src_compile() {
-	myemakeargs=(
-		CC="$(tc-getCC)"
-		VER="${PV}"
-		WITH_LUAJIT="/usr"
-		WITH_OPENSSL="/usr"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	dobin wrk
-
-	insinto /usr/share/wrk
-	doins -r scripts
-
-	einstalldocs
-}