gentoo resync : 08.06.2019

10 files changed, 99 insertions, 6 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index a98aa4b4c4e9..2c28e986196a 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/cpuburn/Manifest b/app-benchmarks/cpuburn/Manifest
index 1bca94810082..e01c850b6a62 100644
--- a/app-benchmarks/cpuburn/Manifest
+++ b/app-benchmarks/cpuburn/Manifest
@@ -3,5 +3,5 @@ AUX cpuburn-1.4a-variables.patch 879 BLAKE2B b1ede6e0c0086caf3b87bd13753a120b470
 DIST cpuburn-1.4a.tar.gz 9277 BLAKE2B f362380d0f57fd888ee5e5cf8fdf1809ffbc44fc3c3935b64adbd2c29ad0b3f93e5c032fdc265355574625417e7f5f9e9012e6f637c87fe0ae5e2043258f0822 SHA512 db84cabe70af0b6b3579c746f6df08c268b7145c9521fc609ce5b4cfd497dbb0639e52ab55f34110cff297ec23cf1413db28c6bff4e6f81a69722626886df7ce
 EBUILD cpuburn-1.4a-r1.ebuild 718 BLAKE2B 7b51ec50d043083c1a427b2cf6b4aacccfc1823c2ec5223ce1a00bb4cb43a36f9275ca15c2a22f13601bd52e2336ec348025a5cd1956b25432cdadd15489bea6 SHA512 03bcaceb4adfba9e916949bafdd978f5fc5785906cf71e2ddd594ef3d7f1d0a70399d984050d81c567e673be2fa479b4f5a26002087007ec2f9567a77e4728ed
 EBUILD cpuburn-1.4a-r2.ebuild 1372 BLAKE2B 18d9d8be980af968f1485711315921192edf8e3cc218ed0fc5a9e49256ba9c8e0749112d6752bcb2d69c70f0694d7df21144f9cace2f5bdd9ef64265936f37b7 SHA512 3819753d39addc60cf62d8f86abdc82c409b0ecb9721e57e575a4c3976ca1cb008d8fc603183631c69b8c22b543d164995e55230d449d4d04228875556b1745a
-EBUILD cpuburn-1.4a-r3.ebuild 1367 BLAKE2B 4b062bfa278bcb7ea6c2bd1118e7cb347cd077d9ce1206c72d273a9bde5c00c2088000ee1beade8318ba0590a229ecf29ee8899f2812e58aebd3d641da1795b6 SHA512 924c6ea483371af07d96cd2021492c91ebb460576beaa75453a4d34095429d342e05a89a6926b42e04d34e6492c051588b6271e4d52a6b40135223cd8ab7322d
+EBUILD cpuburn-1.4a-r3.ebuild 1366 BLAKE2B 2fce1cd2956b32bcec9b911d6e055155b44546c7c2e09ea9695b54745d79445862339f837fe49661b3c69d1468ea81516c584ea5b56eb2b8059e1d923a60a60f SHA512 18dabb263242c89d43457131aee30abc6ae51c351d935adcbe11bc71226514e0ff92bd60778c369a9bbb94d2d88586bad9d9eed2d6540470bd81a10ef75a7648
 MISC metadata.xml 602 BLAKE2B eda46ae4cc60f92470dc83b419169c6daa3703f32f20a56b5c3764b7eef525a733898322f734739ca3cff379c568ffaa4754f996f5a7fe4637f7c7a3fcd23bf8 SHA512 2c6c59071ca30a6159222e37991b6b3367ba4ac6bc30e583b0ebbf537b9fac007df830fad046bc7904b0aa8e95c6e147fd983c219f97a921e5fd1d40dd593b12
diff --git a/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild b/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
index d3c48b8eb12e..df7d1c48a385 100644
--- a/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
+++ b/app-benchmarks/cpuburn/cpuburn-1.4a-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="CPU testing utilities in optimized assembler for maximum loading"
 HOMEPAGE="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/"
 SRC_URI="https://downloads.bl4ckb0x.de/pages.sbcglobal.net/redelm/${PN}_${MY_PV}_tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="-* amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/app-benchmarks/httperf/Manifest b/app-benchmarks/httperf/Manifest
index ca0df58dcae2..e97e10e79546 100644
--- a/app-benchmarks/httperf/Manifest
+++ b/app-benchmarks/httperf/Manifest
@@ -1,3 +1,5 @@
+AUX httperf-0.9.1_p20181111-libressl.patch 1907 BLAKE2B 7a4c3d3b11d41c994dc1b098a03511dab22cf7ca649047d4af4fac4a8333fbad83f048352fb21f233d89d2c389592821680bbc223dc188cd3ae3ceb8ef9adad5 SHA512 d4893c719b16271fa09b1fe19f5a3be13b44578d60d64cb9ab62d1c49eee47720297a501e19dc4521025d117e1b2043dae20bf6c752a16c0b061de828dfdb679
 DIST httperf-0.9.1_p20181111.tar.gz 107070 BLAKE2B 044f45b0d4b17bc714a718835be1e713092fe7f6d6573df237ba87791e5783e8f60d1218f29e01473ccdeec3b461d3ab7d35d68a1037ee693865a37fd78b7ea5 SHA512 34cc92f3de6d1dadc3fedc5b5f617538b76787496f9dd28b7800866abaf96c7410765d4bb0989000910bf2b51433292c0a7009fe64ba4fd29889ce96cc4d10fc
+EBUILD httperf-0.9.1_p20181111-r1.ebuild 921 BLAKE2B fe145b72aecb61b52c3e7fb3ce098daead417280d127e02ef0829083fad2c6c04cdc940752645a01380e6d9f28483bb915f4992a5effa4087ee547c224899c25 SHA512 b09f58c353e11b84be8a54bdd680cf7a82cfa26615b1ea2fd973d4497f5cf728d185c2b66c06432bca44df833e3f508ee45627633d02afceb06cc22f85e894c5
 EBUILD httperf-0.9.1_p20181111.ebuild 872 BLAKE2B 6c782cb5e5c5ed0cafb8c9143639025397e4f06cbddf136eb8d3c759585b2a0ce4328c73f358a9e29b90d2f1c38c9099fd500ed1d7f3fd368c0b16e99cb035a7 SHA512 30ebefb5b74f7d1e668f2c224e15f1385227914bcf1534ff9777f5324c22235999d051a7562b960dcbcb632dc9a2f3b5965dda9aeb713a7b507641ccaacef3b9
 MISC metadata.xml 1011 BLAKE2B 3254dacb03b6a957106287289566d9aa466768b5449eee054c423f2d22aac5cc464f990a7afa101256cb40075b03404c4af8bee542e6ee01b5af58e7c8a8415b SHA512 86a8ef9ea287532d89d5833abf29d71aae7e9aca494d6e40ebd6f43cb0eb766e63b769bc2218f8e374f13045d2b3445283dac68d384d9fb449e5a0800caf1dfb
diff --git a/app-benchmarks/httperf/files/httperf-0.9.1_p20181111-libressl.patch b/app-benchmarks/httperf/files/httperf-0.9.1_p20181111-libressl.patch
new file mode 100644
index 000000000000..e1c0c90fac07
--- /dev/null
+++ b/app-benchmarks/httperf/files/httperf-0.9.1_p20181111-libressl.patch
@@ -0,0 +1,49 @@
+From 1c4277eb9288c719b009aacb4bd71ca543f51cbd Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Mon, 3 Jun 2019 16:18:21 +0300
+Subject: [PATCH] Use correct ifdefs for checking TLS 1.3
+
+TLS 1.3 is not ready yet in LibreSSL. Also there is a theoretical
+possibility of OpenSSL >=1.1.1 built without TLS 1.3 support
+
+Upstream-Status: Submitted
+[https://github.com/httperf/httperf/pull/66]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/httperf.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/httperf.c b/src/httperf.c
+index af6f568..5dbba07 100755
+--- a/src/httperf.c
++++ b/src/httperf.c
+@@ -687,7 +687,7 @@ main(int argc, char **argv)
+                                 param.ssl_protocol = 5;
+ 			    else if (strcasecmp (optarg, "TLSv1.2") == 0 || strcasecmp (optarg, "TLSv1_2") == 0)
+                                 param.ssl_protocol = 6;
+-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
++#ifdef TLS1_3_VERSION
+                             else if (strcasecmp (optarg, "TLSv1.3") == 0 || strcasecmp (optarg, "TLSv1_3") == 0)
+                                 param.ssl_protocol = 7;
+ #endif
+@@ -1104,7 +1104,7 @@ main(int argc, char **argv)
+ 		    SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1); break;
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
++#ifdef TLS1_3_VERSION
+                     /* 7/TLSv1.3 */
+ 		    case 7:
+                     ssl_ctx = SSL_CTX_new (TLS_client_method ());
+@@ -1329,7 +1329,7 @@ main(int argc, char **argv)
+             case 4: printf (" --ssl-protocol=TLSv1.0"); break;
+ 	    case 5: printf (" --ssl-protocol=TLSv1.1"); break;
+ 	    case 6: printf (" --ssl-protocol=TLSv1.2"); break;
+-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
++#ifdef TLS1_3_VERSION
+             case 7: printf (" --ssl-protocol=TLSv1.3"); break;
+ #endif
+         }
+-- 
+2.21.0
+
diff --git a/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild b/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild
new file mode 100644
index 000000000000..d340a5ce8237
--- /dev/null
+++ b/app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="00bf5dab6fd284aa559f125964f5fe6dc0f23595"
+inherit autotools
+
+DESCRIPTION="A tool from HP for measuring web server performance"
+HOMEPAGE="https://github.com/httperf/httperf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos"
+IUSE="debug idleconn libressl"
+
+DEPEND="
+	idleconn? ( dev-libs/libevent:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/usr/bin
+		$(use_enable debug)
+		$(use_enable idleconn)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-benchmarks/interbench/Manifest b/app-benchmarks/interbench/Manifest
index 9a29b1719f69..b139e7fdaecc 100644
--- a/app-benchmarks/interbench/Manifest
+++ b/app-benchmarks/interbench/Manifest
@@ -1,4 +1,4 @@
 AUX interbench-0.31-makefile.patch 449 BLAKE2B 3c9c0dcbc35c8294ab87e8ba4bd72c5fec4a01a49857de753a95b4eb436bc72657e569ed4f9dfbb759c078a053b47830a65a2e0d72747166815cb99ba54ac8af SHA512 2f4b648bcc879bd67dca83e22198cb18ac267ecf6e923cf23fbbc00b29cf36b57d37844e8095ae6c05c74f9ed538b3ee746e0f8d391349921f4514918a71f36a
 DIST interbench-0.31.tar.gz 38791 BLAKE2B 8f5605c763be6be0fcb5b240d5022c578af98d470a8bdf61f0ebc2abe56e6439fa37b5ac4e3eae16c7aab902cc08fab25f0cb34a92c0eea05b287b7bef2abbb4 SHA512 ccad7f5a7ea10c3c56809725145bad17970c4fa8aafc4b962e4e79c56bfa05025fee140e5b70ec407158aca59bba47e6bbff14329516d9383801ffe4c0797a23
-EBUILD interbench-0.31.ebuild 606 BLAKE2B 3df7f5049ef58f5813ec4a292af496e2cc0581d0c739ef1952ef51a43b4d6c6e9f7bfc3732403669f69faead2da401011a363772665a77e92620785148af6c27 SHA512 d0affed3a3a2aa251939fecc870b177e9fb383dcc45d7e2b96e5f9921ea7fb811789c9455d23530f10c585b2db36a2e68d9168a8da941230ec81cb8970fd6221
+EBUILD interbench-0.31.ebuild 605 BLAKE2B df135097c327d9ef4dc71ce79f958a7e4bf2ae9f5cf6ad0d055f4c964bc719868ef56be66230cbb0c9f7dd5b3d433122df671125772f886d4c440cfe1f6cb0fa SHA512 afa38909a6ef23b85412af805c1cfb393ea3c328502dd9df57682c6166297460a7a436497947bc52a88685b546e64c77973a096c87074c9198cf8aab4e6ddd00
 MISC metadata.xml 872 BLAKE2B fcccf6de8afd8bc7e50413fd70a604d790ed698b8cb45a2687e4e5e12b7820055d6c4bce8f355561605037331b9211a5e2f0346a663a54b4b7ba68355a5147c5 SHA512 12a54c9af0464b5732dd771eb67f52480161f7755de3c0e80975c90ba2d2887be3fcee82d6d4d8193e1a8929d1553acd9f9c9b2d892271c6bfbeffefafcc18bf
diff --git a/app-benchmarks/interbench/interbench-0.31.ebuild b/app-benchmarks/interbench/interbench-0.31.ebuild
index f186cb9c19a1..37ddd5060336 100644
--- a/app-benchmarks/interbench/interbench-0.31.ebuild
+++ b/app-benchmarks/interbench/interbench-0.31.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 "
 SRC_URI="https://github.com/ckolivas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 62aa927fa8b3..a1fe32d690bf 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -6,6 +6,6 @@ DIST wrk-4.0.2.tar.gz 6146798 BLAKE2B 62188872a370d4ef3a3ffcf6f0568ca1b003473a13
 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 878 BLAKE2B 84a4433bebf91222e22a3ebebedbecfa664c15a2e1d46d839be671fc976beef2c4fc3378c5cc4ef86c279759ea28f900416fe35a126d83fa6c62db9d4b4dc4f8 SHA512 157bdfccefca6a9ae96e5bb8ab69b889231c4b5231e47106e9d4ea822805c147de3793556c59126069edc937083e6caddb20952baeaefddf485e7de4c85151c2
+EBUILD wrk-4.1.0-r1.ebuild 877 BLAKE2B 615984bbe2a7f24f039d2723e8b740ccd2360e73c0a8e5b254caa3859cf700808c72a54c7c0039db221f14594de488b8afc1da51973ac03248e5f670cc38084a SHA512 bd2e1ba2b64fb279a54d44b61f12b3f5a07b9b4bf5c78ddbdeff3692d84caeda745e56705387732bc9e9cb66467a4c245e632ab3e7160407660c97fb02f3f71c
 EBUILD wrk-4.1.0.ebuild 770 BLAKE2B c99ff47bb3aa4bd343cd28d52aecd2161dbc2e29d92c8f3b6a4c6e9e00a0d0f0b610dc8916db02a119bd19a0311f5a424513f3fbd1abb84d1bce795cfcbe887b SHA512 12f5adaff8ab03cec4fdad6b9866eb83e3890e7e62b4916076dbfbdc63726e0d42e65fb10320f2ede539b3aed2ad0285de8e864129baef521442bd1f71adfbfc
 MISC metadata.xml 872 BLAKE2B bb064e89a2814dcbe60f5cee80b4f2687e2fdad7e04bab99e2cd9896d7c59cf0ed2cae5e1e6e53093382f175d41312ba827e398e43ca49f7c3e6573bf136d1bb SHA512 ddc9458a301ff7a6d19814d0d39e352900ec43128ad1ca985fe8f890392c058b394e3d0fa86586aa39fd47e816f45624df848be2e8d150d20e32ccd4829b6307
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild
index b8b9610df446..37187a92ca5c 100644
--- a/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild
+++ b/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild
@@ -9,7 +9,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"