gentoo resync : 02.08.2019

6 files changed, 0 insertions, 199 deletions

diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 81b5ea988f83..4c09aade6559 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1,11 +1,4 @@
-AUX wrk-3.1.1-makefile.patch 1338 BLAKE2B 467634f4bc0686f81029875ff7abf061298cabe40fc54c6526b5f8dcfda8da7554c7605e0225e8decd8e5cbf5a63745f7aca6b3b3e035124a85360494c3c7845 SHA512 7f2e3e1b9ebac680f5c5df73114181960c41030d66c63ca7ec625caa3e748e566e0068766b2c350923d11d0f0de63a1bfbb4d5fbfa7447f303b190ef9adcd643
-AUX wrk-4.1.0-makefile.patch 868 BLAKE2B 2d59e348d7a40badbb93f015b1aabacca4b9cf25783bac59f678e6a7f09f5f8031fff2e32cfe39a16df3159513514aa7d84eb713f6c568e4422bb67a0d7ac4bd SHA512 fae396ded1bc78fb59f16b92b81ab6fc366faaaee3367765de629d6ebfd341c1548514f8956b0d75aad766f5fbb131c7986d776d3cb3e6fdbceab07695d03171
 AUX wrk-4.1.0-r1-makefile.patch 963 BLAKE2B de7fea198e9e9366f763d2c0d25d1ff5ee2d91791eb7404ac19ceb75dd7f80f0ded3b3c97708c0b23105a42bd47f4750f1337ab8046a095e57ef0ec67d7bf9a6 SHA512 3dbdc1cc3bd74131ac91a211bf6e46754feac5f73b93d64f04f53e7e3acf285f349a8d21a6744b443aa9533d619073729187fe26a97faa03bafa6d99543c5dab
-DIST wrk-3.1.2.tar.gz 902868 BLAKE2B 1b979a7b72c41d37ec63759c76770a74ca8cf618bf2e84b30556fa7db47b3cbe4957924a5ad90594580d4fed5194201d6205b04c660195466c6d6fb369604571 SHA512 399f33c2c008c21ac8fae1b561fe16ebcca324b5171340ffa706e84c256bf13a9983b5c18d258be6f87cb9fe8e38a434f9bfa7059395a01cb783f77faf952b15
-DIST wrk-4.0.2.tar.gz 6146798 BLAKE2B 62188872a370d4ef3a3ffcf6f0568ca1b003473a1333b51d2b79fc3ce793c39ba5958d95c877fc0382751e89b687c8ee7f20b376c9b2fe3826afc3161aa0ac8e SHA512 4279cf7136e2919779be3f61f462136a7a5288eac481104b844193682a8fc554581fd3942624d0be9317a3e82c82497927a124b9b4dbdf455e30d3f0cad1fdea
 DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a
-EBUILD wrk-3.1.2.ebuild 746 BLAKE2B 19b95fd2bbc5b3d75460fa44bf415c0563ad84c208d6b618012aa0169975dd0cc0df971c6dd99de522bf865864ebabb779c6a130b335331d67191e58d41861b6 SHA512 a47e000c8fd9c57a53a2b3d2663ba3e0ccf15bd98188165af46f33ad35bbe867de988b518be94a4d12b107db16048fbeab81814a3fbaaa242b970a3fc3ed031d
-EBUILD wrk-4.0.2.ebuild 690 BLAKE2B ce0d50127823d0d1ba4278785280b4f60e940aed710eef0bad662d3b07cdc75ab47507d37ad2fc223b4e32dea2db07a961956cd42601f2b301a846dea65fe988 SHA512 48db2dec26fec31aefc1f02fa8932fa85ac4532c176eaefe6c48e98b51f62efe557dc912e840540010f8f620047eef0da07b3cef35a810389157b2c142bbd48a
 EBUILD wrk-4.1.0-r1.ebuild 877 BLAKE2B 615984bbe2a7f24f039d2723e8b740ccd2360e73c0a8e5b254caa3859cf700808c72a54c7c0039db221f14594de488b8afc1da51973ac03248e5f670cc38084a SHA512 bd2e1ba2b64fb279a54d44b61f12b3f5a07b9b4bf5c78ddbdeff3692d84caeda745e56705387732bc9e9cb66467a4c245e632ab3e7160407660c97fb02f3f71c
-EBUILD wrk-4.1.0.ebuild 767 BLAKE2B 9197a0940bd0d7738c7fa00482aa006061a493396c252b58b1ffe0a4cfa63510fc4cd909941f81da4a321940cf627add008685347d36f9231b54ab68407827c1 SHA512 a9949bd0d4008cfbee18b4580008988ccecb205b2e8a07a10db0653428d12c07e797d689e52df7b62562d81490a28877c5701fad0f863a3b1b22237befb13689
 MISC metadata.xml 872 BLAKE2B bb064e89a2814dcbe60f5cee80b4f2687e2fdad7e04bab99e2cd9896d7c59cf0ed2cae5e1e6e53093382f175d41312ba827e398e43ca49f7c3e6573bf136d1bb SHA512 ddc9458a301ff7a6d19814d0d39e352900ec43128ad1ca985fe8f890392c058b394e3d0fa86586aa39fd47e816f45624df848be2e8d150d20e32ccd4829b6307
diff --git a/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch b/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch
deleted file mode 100644
index 595c69ac1572..000000000000
--- a/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git i/Makefile w/Makefile
-index d956c6b..48be677 100644
---- i/Makefile
-+++ w/Makefile
-@@ -1,4 +1,4 @@
--CFLAGS  := -std=c99 -Wall -O2 -D_REENTRANT
-+CFLAGS  += -std=c99 -Wall -D_REENTRANT
- LIBS    := -lpthread -lm -lcrypto -lssl
- 
- TARGET  := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
-@@ -23,38 +23,31 @@ BIN  := wrk
- ODIR := obj
- OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o
- 
--LDIR     = deps/luajit/src
--LIBS    := -lluajit $(LIBS)
--CFLAGS  += -I$(LDIR)
--LDFLAGS += -L$(LDIR)
-+LIBS    := $(shell pkg-config --libs luajit) $(LIBS)
-+CFLAGS  += $(shell pkg-config --cflags luajit)
- 
- all: $(BIN)
- 
- clean:
- 	$(RM) $(BIN) obj/*
--	@$(MAKE) -C deps/luajit clean
- 
- $(BIN): $(OBJ)
- 	@echo LINK $(BIN)
--	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
--$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR)
-+$(OBJ): config.h Makefile | $(ODIR)
- 
- $(ODIR):
- 	@mkdir -p $@
- 
- $(ODIR)/bytecode.o: src/wrk.lua
- 	@echo LUAJIT $<
--	@$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@'
-+	@$(SHELL) -c 'luajit -b $(CURDIR)/$< $(CURDIR)/$@'
- 
- $(ODIR)/%.o : %.c
- 	@echo CC $<
- 	@$(CC) $(CFLAGS) -c -o $@ $<
- 
--$(LDIR)/libluajit.a:
--	@echo Building LuaJIT...
--	@$(MAKE) -C $(LDIR) BUILDMODE=static
--
- .PHONY: all clean
- .SUFFIXES:
- .SUFFIXES: .c .o .lua
diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch
deleted file mode 100644
index 6f091accca56..000000000000
--- a/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	2018-01-21 01:00:58.000000000 -0500
-+++ Makefile	2018-02-15 22:03:01.565862308 -0500
-@@ -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)
-@@ -30,20 +30,8 @@
- 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
--endif
--
--ifneq ($(WITH_OPENSSL),)
--	CFLAGS  += -I$(WITH_OPENSSL)/include
--	LDFLAGS += -L$(WITH_OPENSSL)/lib
--else
--	DEPS += $(ODIR)/lib/libssl.a
--endif
-+CFLAGS  += $(shell pkg-config openssl luajit --cflags)
-+LDFLAGS += $(shell pkg-config openssl luajit --libs)
- 
- all: $(BIN)
- 
diff --git a/app-benchmarks/wrk/wrk-3.1.2.ebuild b/app-benchmarks/wrk/wrk-3.1.2.ebuild
deleted file mode 100644
index 62466fde2990..000000000000
--- a/app-benchmarks/wrk/wrk-3.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A modern HTTP benchmarking tool"
-HOMEPAGE="https://github.com/wg/wrk"
-SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl"
-
-DEPEND=">=dev-lang/luajit-2.0.2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -rf deps/luajit || die "failed to remove bundled luajit"
-	epatch "${FILESDIR}/${PN}-3.1.1-makefile.patch"
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README NOTICE
-	insinto /usr/share/${PN}
-	doins -r scripts
-}
diff --git a/app-benchmarks/wrk/wrk-4.0.2.ebuild b/app-benchmarks/wrk/wrk-4.0.2.ebuild
deleted file mode 100644
index 0e6fa418a27b..000000000000
--- a/app-benchmarks/wrk/wrk-4.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A modern HTTP benchmarking tool"
-HOMEPAGE="https://github.com/wg/wrk"
-SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-
-DEPEND=">=dev-lang/luajit-2.0.2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	tc-export CC
-	emake VER="${PV}" WITH_LUAJIT="${EPREFIX}"/usr WITH_OPENSSL="${EPREFIX}"/usr
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README NOTICE
-	insinto /usr/share/${PN}
-	doins -r scripts
-}
diff --git a/app-benchmarks/wrk/wrk-4.1.0.ebuild b/app-benchmarks/wrk/wrk-4.1.0.ebuild
deleted file mode 100644
index 0e8caf2dc307..000000000000
--- a/app-benchmarks/wrk/wrk-4.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A modern HTTP benchmarking tool"
-HOMEPAGE="https://github.com/wg/wrk"
-SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-
-DEPEND=">=dev-lang/luajit-2.0.2
-	dev-lang/lua:0
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -rf deps/ || die "failed to remove bundled dependencies"
-	epatch "${FILESDIR}/${PN}-4.1.0-makefile.patch"
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README.md NOTICE
-	insinto /usr/share/${PN}
-	doins -r scripts
-}