gentoo resync : 22.01.2019

5 files changed, 110 insertions, 8 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index ab2ee579b122..6133f36de26f 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 5d6314c69ae2..ec693d281762 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1,9 +1,11 @@
 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 749 BLAKE2B a7c575317dd0df7a3b3ccb010d9ad399b96e59c35e485888c8f134a0ca8898ec113199ccca4defaf77521d5ec41b53027bdbb07e7db04d5d8c0df51f1c79b52b SHA512 3621a749c2b9c4b3768332f2eb3c95a3979b6d9aed8cdbb1ca3267fcdeec8cb288bcbb2f31c8eb7070d6b86ae9c0e647ee087bc959831bc26047055a2c8e2432
 EBUILD wrk-4.0.2.ebuild 693 BLAKE2B 65b7d0c203adf4fb345c19a0e822fcb32f36b2ac187468620decfa1eae188a921002433d1be909b9f90b4fb68103e7596594d62c94aaa162d12fa8f2bafdbacd SHA512 07431134cff46cbfff1971d7dc82bf59c2d6b326bb7dac4df413bd2c819713229808927c0277c95756952ecbb743c35a8111f59b478c64ffa5c1608039642f95
+EBUILD wrk-4.1.0-r1.ebuild 879 BLAKE2B c9281bac51c84c79ecc5e3c419a650eca02cd902bed3172455efda6cb2541291114a97f0ffac8496c923292c73d9cd289902eb54e720af830346bcf9321d5484 SHA512 eb48f9aed96d0e90ac4fe4b63fdbd14a467285086836c3ace3128f0e06884f53daef0b01b7046cb7a407d86af1727d12ba3ee9a1bd70fd8b91b6c9664c3f4661
 EBUILD wrk-4.1.0.ebuild 770 BLAKE2B c99ff47bb3aa4bd343cd28d52aecd2161dbc2e29d92c8f3b6a4c6e9e00a0d0f0b610dc8916db02a119bd19a0311f5a424513f3fbd1abb84d1bce795cfcbe887b SHA512 12f5adaff8ab03cec4fdad6b9866eb83e3890e7e62b4916076dbfbdc63726e0d42e65fb10320f2ede539b3aed2ad0285de8e864129baef521442bd1f71adfbfc
-MISC metadata.xml 619 BLAKE2B 025e8d125d50edf96e0153f5a93af687f2e7910b52632fbf9f8baeff41d62547c36d32ac2824a8aa877afa1457abe0078aae1648c30eba5868b6e401975c2061 SHA512 a754b725e8cbfaeb3d6db3101a3d3c47548254b8d34404f84d1acad776f998709fec925eb702258a43a8ba45234367f3c5a9b11bb9f9ce65932e320909361db1
+MISC metadata.xml 872 BLAKE2B bb064e89a2814dcbe60f5cee80b4f2687e2fdad7e04bab99e2cd9896d7c59cf0ed2cae5e1e6e53093382f175d41312ba827e398e43ca49f7c3e6573bf136d1bb SHA512 ddc9458a301ff7a6d19814d0d39e352900ec43128ad1ca985fe8f890392c058b394e3d0fa86586aa39fd47e816f45624df848be2e8d150d20e32ccd4829b6307
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
new file mode 100644
index 000000000000..6e7dd317b8fb
--- /dev/null
+++ b/app-benchmarks/wrk/files/wrk-4.1.0-r1-makefile.patch
@@ -0,0 +1,37 @@
+--- 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/metadata.xml b/app-benchmarks/wrk/metadata.xml
index d7936a9dcc5b..60f2e98d3c9b 100644
--- a/app-benchmarks/wrk/metadata.xml
+++ b/app-benchmarks/wrk/metadata.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
-	<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.
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		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>
+		<bugs-to>https://www.github.com/wg/wrk/issues</bugs-to>
 		<remote-id type="github">wg/wrk</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..3a9e5c1ade6b
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 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"
+
+RDEPEND="
+	dev-lang/lua:0
+	dev-lang/luajit:2
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=(
+	"CHANGES"
+	"NOTICE"
+	"README.md"
+	"SCRIPTING"
+)
+
+PATCHES=( "${FILESDIR}/${P}-r1-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
+}