gentoo resync : 14.07.2018

7 files changed, 219 insertions, 0 deletions

diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
new file mode 100644
index 000000000000..782b8dbf86c9
--- /dev/null
+++ b/app-benchmarks/wrk/Manifest
@@ -0,0 +1,9 @@
+AUX wrk-3.1.1-makefile.patch 1338 BLAKE2B 467634f4bc0686f81029875ff7abf061298cabe40fc54c6526b5f8dcfda8da7554c7605e0225e8decd8e5cbf5a63745f7aca6b3b3e035124a85360494c3c7845 SHA512 7f2e3e1b9ebac680f5c5df73114181960c41030d66c63ca7ec625caa3e748e566e0068766b2c350923d11d0f0de63a1bfbb4d5fbfa7447f303b190ef9adcd643
+AUX wrk-4.1.0-makefile.patch 868 BLAKE2B 2d59e348d7a40badbb93f015b1aabacca4b9cf25783bac59f678e6a7f09f5f8031fff2e32cfe39a16df3159513514aa7d84eb713f6c568e4422bb67a0d7ac4bd SHA512 fae396ded1bc78fb59f16b92b81ab6fc366faaaee3367765de629d6ebfd341c1548514f8956b0d75aad766f5fbb131c7986d776d3cb3e6fdbceab07695d03171
+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 749 BLAKE2B a7c575317dd0df7a3b3ccb010d9ad399b96e59c35e485888c8f134a0ca8898ec113199ccca4defaf77521d5ec41b53027bdbb07e7db04d5d8c0df51f1c79b52b SHA512 3621a749c2b9c4b3768332f2eb3c95a3979b6d9aed8cdbb1ca3267fcdeec8cb288bcbb2f31c8eb7070d6b86ae9c0e647ee087bc959831bc26047055a2c8e2432
+EBUILD wrk-4.0.2.ebuild 693 BLAKE2B 65b7d0c203adf4fb345c19a0e822fcb32f36b2ac187468620decfa1eae188a921002433d1be909b9f90b4fb68103e7596594d62c94aaa162d12fa8f2bafdbacd SHA512 07431134cff46cbfff1971d7dc82bf59c2d6b326bb7dac4df413bd2c819713229808927c0277c95756952ecbb743c35a8111f59b478c64ffa5c1608039642f95
+EBUILD wrk-4.1.0.ebuild 770 BLAKE2B c99ff47bb3aa4bd343cd28d52aecd2161dbc2e29d92c8f3b6a4c6e9e00a0d0f0b610dc8916db02a119bd19a0311f5a424513f3fbd1abb84d1bce795cfcbe887b SHA512 12f5adaff8ab03cec4fdad6b9866eb83e3890e7e62b4916076dbfbdc63726e0d42e65fb10320f2ede539b3aed2ad0285de8e864129baef521442bd1f71adfbfc
+MISC metadata.xml 718 BLAKE2B 0bea8e46c5ea180b770e62fca780e09e60d4f174c8d28470c4116027cddc54807d89cace134d8569a07ba10c6fda357b1bffb6a010808aab443f1dba1ce95a1f SHA512 8d1b5953eecc786c73122b1267ca72b57367b00452171db8224536dcd21d2841eee752e0b821530daca0443a1abe6ad860e99dad7127198f17cd32671b3b9e3e
diff --git a/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch b/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch
new file mode 100644
index 000000000000..595c69ac1572
--- /dev/null
+++ b/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch
@@ -0,0 +1,54 @@
+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
new file mode 100644
index 000000000000..6f091accca56
--- /dev/null
+++ b/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch
@@ -0,0 +1,31 @@
+--- 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/metadata.xml b/app-benchmarks/wrk/metadata.xml
new file mode 100644
index 000000000000..991df185e6e9
--- /dev/null
+++ b/app-benchmarks/wrk/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vikraman@gentoo.org</email>
+		<name>Vikraman Choudhury (vikraman)</name>
+	</maintainer>
+	<longdescription lang="en">
+		wrk is a modern HTTP benchmarking tool capable of generating
+		significant load when run on a single multi-core CPU. It combines a
+		multithreaded design with scalable event notification systems such as
+		epoll and kqueue.  An optional LuaJIT script can perform HTTP request
+		generation, response processing, and custom reporting.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">wg/wrk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/wrk/wrk-3.1.2.ebuild b/app-benchmarks/wrk/wrk-3.1.2.ebuild
new file mode 100644
index 000000000000..724ae80c1f05
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-3.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# 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="x86 amd64"
+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
new file mode 100644
index 000000000000..990d52d0c66d
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-4.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="~x86 ~amd64"
+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
new file mode 100644
index 000000000000..397a84d29580
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-4.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="~x86 ~amd64"
+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
+}