16 files changed, 178 insertions, 20 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d73bebb61659..e416b73a7860 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 371332af3a90..2b969243e9b2 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,4 +1,5 @@
 AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6
+AUX apache-2.4.33-libressl-compatibility.patch 4025 BLAKE2B 4e4716f2827d76f7e2980096ade6d9d617b29d405372e929525020fd9aa4882ae5656eacf8778cf20d2de0588f28304d4bee60a1e00e1acfff520f253ef8f0fa SHA512 330e3e5a427e3f50da30e3861d11025c3b80c8226bae1d1a299af35826c25d7ff1c75d0b60d4b3233d6a95ce8dd7a6dc1d51cdf194549986ec29fa72d54c3ecd
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 AUX apache2.2.service 716 BLAKE2B 0006b5f5eee85bf4bae7b1b49944cedb057df974b7ed6e74cee21eed109846d91537c997241554ee4ff7b8d0534dcc54fc435f6a1e9d1f07817091f93f986500 SHA512 5f736c803772077598248bbb41f76dff396dfd2f11a60d1ba929a619275efb8c1b4c0dab78cbcdf83b9ec94db67b958b3333b01f67d71eb3b2e07dba4bca2a7c
@@ -12,6 +13,6 @@ DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0e
 DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
 EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
 EBUILD apache-2.4.27-r1.ebuild 7737 BLAKE2B 6e459c6d091a5d91d1179cde68fa1b34bb4faf04d3c66b8b0a759311e6b03102485fc4758a65437c5c9bd12f63e3afdd50730c196f3e5785c3c6aa25fb2cf2c5 SHA512 bd2df8d64f22fd28af9e2225492de2d3dc2d8172220f14f495841fec587aeb39c02d4d7021d4f96430f9821922baa84a78a7b8470f56d5c5305bd124d763afd2
-EBUILD apache-2.4.29-r1.ebuild 7879 BLAKE2B 56c024f5e6f03973977e02bcdc4b7a9814b8015fb087ab0c7c6050acc8477c50574f51724bf7dd2615f4e09863900cf169dd3050912e6a59a594b30f624918d1 SHA512 ea4094069a3af8a6015411ba1af9f2a1fecb51d49b7eb64cf1c9177e41788ef99d95a66ec31e3d3155a38547843385abfd035fb7b06b722d831658a834aa2c73
-EBUILD apache-2.4.33.ebuild 8031 BLAKE2B c2b6744661c172c941f4188c642311a3f8f7cbbb9cb02eaa3a42338a8796cd7be6862d00f1cc00afb991da825a1b47ccf4441aa1eef19f894bf353c01065f16f SHA512 c6183f5894d7a14448ec56bca2a9f918ced6563aabae6c0ad9cb8f44ef628356a5e5ddcd297d5d42aabe903a5a8e4eaa0d2682e47928eded5cb32f89ed6deb35
+EBUILD apache-2.4.29-r1.ebuild 7878 BLAKE2B 3798d1ac5cc708adef4561d647cfb14cccdf83485c4701e42f4498c556dd6004d8176acb1d46c4b0088fa0b44e421577119dd88f982a71489260465c86423743 SHA512 abc125622dd7b362819639893b463db80a960390b2ab16fc859506f22026094a540ddc646df50d99a636708c944db982a0594bc6c1d8806bc2e983a29ca8fa84
+EBUILD apache-2.4.33.ebuild 8187 BLAKE2B c2f6a73b0f70b2894aa105fcf388222fcf4c075cbfdf5a8f6a1aa1e8b26ea032adf0f3f06fd53a1d26590d4f13cd1f9f983215bedca7846f4e474b70b85b6a62 SHA512 379d362316e8cf94ec7070e2a475a856b9dc2cfd6a1e54cc3c432889e1c0a5f756d2c61a31a993dbf927aac451150a41122c7f08300915bd0911cdc55481ca15
 MISC metadata.xml 3554 BLAKE2B d415eb42fbe1614b63620c8d4f60390ca585d56b10cc7d7ab057b299f3a7046bedb2cf0d0490e36d00e497afa3ebd9a46d61e6afa8716ab55c3c4bf59389b4e2 SHA512 3165c25c9f23548ce0c5efdf5ca6fe563eaf51671c1df0cef8fafeb33c128b224fba921e7edd3ce7c194a980dbd4774889dfd57bf7e21559c659e3163532b902
diff --git a/www-servers/apache/apache-2.4.29-r1.ebuild b/www-servers/apache/apache-2.4.29-r1.ebuild
index 0b0d7de76739..1d97a24d6da8 100644
--- a/www-servers/apache/apache-2.4.29-r1.ebuild
+++ b/www-servers/apache/apache-2.4.29-r1.ebuild
@@ -128,7 +128,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
 	apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
diff --git a/www-servers/apache/apache-2.4.33.ebuild b/www-servers/apache/apache-2.4.33.ebuild
index 6ec7fdfb67e3..54ecf1cb0539 100644
--- a/www-servers/apache/apache-2.4.33.ebuild
+++ b/www-servers/apache/apache-2.4.33.ebuild
@@ -141,6 +141,11 @@ RDEPEND+="${CDEPEND}"
 
 REQUIRED_USE="apache2_modules_http2? ( ssl )"
 
+PATCHES=(
+	# this *should* be included from upstream in the next release as it is currently in Git head
+	"${FILESDIR}/${P}-libressl-compatibility.patch"
+)
+
 pkg_setup() {
 	# dependend critical modules which are not allowed in global scope due
 	# to USE flag conditionals (bug #499260)
diff --git a/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch b/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch
new file mode 100644
index 000000000000..97d33468e194
--- /dev/null
+++ b/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch
@@ -0,0 +1,97 @@
+# based on upstream commit from:
+# https://github.com/apache/httpd/commit/8134addfabf2685e08da6d51167775b628fda0dc
+# this should be included in the next release (2.4.34?)
+
+diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c
+index 66682eaf4d..8f0def2805 100644
+--- a/modules/md/md_crypt.c
++++ b/modules/md/md_crypt.c
+@@ -190,7 +190,7 @@ static int pem_passwd(char *buf, int size, int rwflag, void *baton)
+  */
+ static apr_time_t md_asn1_time_get(const ASN1_TIME* time)
+ {
+-#ifdef LIBRESSL_VERSION_NUMBER
++#ifdef LIBRESSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
+     /* courtesy: https://stackoverflow.com/questions/10975542/asn1-time-to-time-t-conversion#11263731
+      * all bugs are mine */
+     apr_time_exp_t t;
+@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppkey, apr_pool_t *p, md_pkey_spec_t *spec)
+     }
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f)
+ 
+ #ifndef NID_tlsfeature
+ #define NID_tlsfeature          1020
+diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
+index 48d64cb624..2392019aed 100644
+--- a/modules/ssl/mod_ssl.c
++++ b/modules/ssl/mod_ssl.c
+@@ -398,7 +398,7 @@ static int ssl_hook_pre_config(apr_pool_t *pconf,
+     /* We must register the library in full, to ensure our configuration
+      * code can successfully test the SSL environment.
+      */
+-#if MODSSL_USE_OPENSSL_PRE_1_1_API
++#if MODSSL_USE_OPENSSL_PRE_1_1_API || defined(LIBRESSL_VERSION_NUMBER)
+     (void)CRYPTO_malloc_init();
+ #else
+     OPENSSL_malloc_init();
+diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
+index a3a74f474c..88c0939cab 100644
+--- a/modules/ssl/ssl_engine_init.c
++++ b/modules/ssl/ssl_engine_init.c
+@@ -546,7 +546,8 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
+     char *cp;
+     int protocol = mctx->protocol;
+     SSLSrvConfigRec *sc = mySrvConfig(s);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L || \
++	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20800000L)
+     int prot;
+ #endif
+ 
+@@ -616,7 +617,8 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
+ 
+     SSL_CTX_set_options(ctx, SSL_OP_ALL);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20800000L)
+     /* always disable SSLv2, as per RFC 6176 */
+     SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
+ 
+diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
+index a39569cbf7..e0e1b37087 100644
+--- a/modules/ssl/ssl_private.h
++++ b/modules/ssl/ssl_private.h
+@@ -132,13 +132,14 @@
+         SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
+ #define SSL_CTX_set_max_proto_version(ctx, version) \
+         SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
+-#endif
+-/* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
+- * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...), so
+- * we have to work around this...
++#elif LIBRESSL_VERSION_NUMBER < 0x2070000f
++/* LibreSSL before 2.7 declares OPENSSL_VERSION_NUMBER == 2.0 but does not
++ * include most changes from OpenSSL >= 1.1 (new functions, macros, 
++ * deprecations, ...), so we have to work around this...
+  */
+ #define MODSSL_USE_OPENSSL_PRE_1_1_API (1)
+-#else
++#endif /* LIBRESSL_VERSION_NUMBER < 0x2060000f */
++#else /* defined(LIBRESSL_VERSION_NUMBER) */
+ #define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
+ #endif
+ 
+@@ -238,7 +239,8 @@ void init_bio_methods(void);
+ void free_bio_methods(void);
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10002000L || \
++	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f)
+ #define X509_STORE_CTX_get0_store(x) (x->ctx)
+ #endif
+ 
diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index 0f59a49f9d72..e3e4ee63bf61 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -1,5 +1,5 @@
 AUX gatling-0.12-compile.patch 764 BLAKE2B bb36241c2aae2a6bd11d5055652bdcc087a9a38f1f936c9012a2d56ecae64547a50c7d80f0fd0865c4e585e1ce846ba0c1951bfa6a65a10259d0dcc14cd326f3 SHA512 c734018a9c052ae3cb79e86be2229c222079d87665a32e5de679df9e12361ba2f023043b6ec73506788bbdb00e8a8f7a97a90f779ca12ff93abf96a91144e580
-AUX gatling-0.13-compile.patch 323 BLAKE2B 45e709c8361a491e086d20e8c2e280aca2b03b3abc91b9277807951f4d6538ccf7e3cd394decd594ac287cbe906c5cb3dc96bbf8216e6d4df5c659d43a574d89 SHA512 86cf97e2100ac3836a6ce9d2f35779aa0480adcd82fb25f60c27db103faeeaa835f89d90872c5a91b46a8946b93e3ecf67285089a9af6114af3a8ddde708b2b7
+AUX gatling-0.13-compile.patch 255 BLAKE2B 08de101796184625542dd339b96e246477a0cb8aaa40bac8640f0d442b9fba09389ada09bd4f852736487bfda30915f0ca562e1ea6aed0bee8d0104cb65a9c63 SHA512 77e35689b80a4d1b9598bf31cc14c3572a7b92d49ffeb98442552f58eeb04a196ce5c8215941d07e197191c349548d23baadac3b84854d6eb93d26632555c699
 AUX gatling.confd 659 BLAKE2B ac3a2bc798e8ee9172f7c807c7e80f5bc7ad12e1830f296f097078887e609facfcb6087c6d5cdaa162fd747d7f03d208a28ec30e12fb67e7dc938ed0e65f766b SHA512 e903cd9afbb575226c6de0da8ad673d4650a53cac7442505422c98c32a00457f3d48f2853355cd76ea0f83671cb973ddf90df900d86a15172291317109481fb3
 AUX gatling.initd 1915 BLAKE2B 8f0954d855759b6abe90d6ea823fb2e14bddcc36d45a20bbb731aaeb0a4efa2b3bfdc454d9ae1c127634057a33032dd73086d6f7f8c99678bf79c6bf602bcc19 SHA512 7992a44fc61408eef740bd94fd127240b85a27954c6217b44e7be01a6b95256acc8f61962b661eaeecd6321b958403430aae673b9e88656bb11883b577a3d9a6
 AUX gatling.initd-2 1970 BLAKE2B 6c964b6fba4bf576efbbf659fc027b336fe82ada1f822242fd62964dfb64efb71af4adda687bb406b78234b4a01ac6bd0e419e5a7d638b42c7833515e78b1996 SHA512 916b19712c51564bb38167262de1358289202894b80b948c1d10463c74fea0de9bcddc33a8dd804a08f5a07d1762e0cd21bfe6a404dbfe3fd49138248384dbfc
@@ -10,5 +10,5 @@ DIST gatling-0.15.tar.xz 121804 BLAKE2B 7df5f6d4fc823e8a1252bacca2b57d0848dd3a92
 EBUILD gatling-0.12-r2.ebuild 1448 BLAKE2B a7c5951e568e9cf12b6c3c0d9780769dbd157e28db8ebc5274becc60ffd118a07c1c2f3405cdb65e39f8baf2ac48872ab2fec2871fee7e117baa6980ce037476 SHA512 d8aa82aeefce975684f99c1df7feea7329979cb57a0f7f214a401d5ee5aa9a09618241ecf37a0bd8a2467ca7a66ab1f7e00decd1f2c4eb3a188bc26bf932e168
 EBUILD gatling-0.13-r1.ebuild 1517 BLAKE2B c07ee1269d3cd89c342309f74977f9b08d0cc8d11967805d49ad49365318019f5be857bf9c8d74d0b68a046f8a77c9d8a3522cc33b6b2605a70c8d4ede3dc993 SHA512 b946510624a7154271a78460e50235a1e7d1f2b3aa897efe3bbb378221adb2de296584f02a6c033794a6af27ddbbd1ec1b015059122aab36bdab248b6e3cced1
 EBUILD gatling-0.13.ebuild 1454 BLAKE2B b00758fbfe346244da9cedf9d723e83cb53c2083dc059c49a1a981110c96dce999f121faa38b96df4a17016338efa4593a26c46493a8cb92c5bf4f8f252e773a SHA512 a23dd560da18fd14702b657b61678b450a09449eb7bed6d1df884271c70bb50118d2325acb7896c2af0651c5e4554da774ab9f94cfd7aacbc7b02617f30d6df9
-EBUILD gatling-0.15.ebuild 1545 BLAKE2B 13b1e1116644a27ed309985a428d5ca8bb1182b18d944dbd9132e89ac27d18141633b95007566844d05144bcf353881c98b87b105c20e96f323f8f5111f47162 SHA512 088ab87c7075960f4e9a27f3731aa4145976b84a5c102f4dc51622a93cd8ea6e7b3442cd5e0979a0cab4a6ae9ff636ded07df3c58ce047986e29b2462fa5d747
+EBUILD gatling-0.15.ebuild 1547 BLAKE2B a5e6e2d04fef5bb646debd50ba69d47f7d065cf44a3ba0021efc0f5bcadf056cb03fe1cfcb91b1a38f1e83a357da0c375e4ad198b6a8ea6cb37244fbedd65578 SHA512 409f89a283ac591c3ca06b9140de4e906064de750a76cac70d5abcf632704e23ef72281f3b213b054e43aa019c5f0a9264d21f922144831bf48c1b1b86c16984
 MISC metadata.xml 444 BLAKE2B dd65d9cb3f9b6babebc0e45c67e8bda05f48d49d8902f6a0da4d1d75f38ba2e1d627f0a1e9e35dac77466fd7edfe43435b7b99d7ee394268df1e4f5cc5b53ab5 SHA512 0f829523b85ea9fcd62743f72f7a985e532685d4989b0083191286cbc9a99db398fde3c63f86ad9bdeb6e75d559a777e85cf2df037456e5b0960b15c2511815a
diff --git a/www-servers/gatling/files/gatling-0.13-compile.patch b/www-servers/gatling/files/gatling-0.13-compile.patch
index 7b4d44af9c09..a87a9541becb 100644
--- a/www-servers/gatling/files/gatling-0.13-compile.patch
+++ b/www-servers/gatling/files/gatling-0.13-compile.patch
@@ -1,5 +1,5 @@
---- GNUmakefile	2012-04-10 04:31:14.505474482 +0200
-+++ GNUmakefile	2012-04-10 04:31:53.821982958 +0200
+--- a/GNUmakefile
++++ b/GNUmakefile
 @@ -64,7 +64,7 @@
  acc: acc.c
  	$(CC) -o $@ $< $(CFLAGS) $(LDFLAGS) -lowfat
diff --git a/www-servers/gatling/gatling-0.15.ebuild b/www-servers/gatling/gatling-0.15.ebuild
index f2b75dd25464..b404cfd8a5c9 100644
--- a/www-servers/gatling/gatling-0.15.ebuild
+++ b/www-servers/gatling/gatling-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,10 +23,13 @@ DEPEND=">=dev-libs/libowfat-0.25[diet=]
 	)"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.13-compile.patch"
+)
+
 src_prepare() {
+	default
 	rm Makefile  # leaves us with GNUmakefile
-	epatch "${FILESDIR}/${PN}-0.13-compile.patch"
-	eapply_user
 }
 
 src_compile() {
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 5792e95d9c7e..dd24cb319d8e 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -2,8 +2,10 @@ DIST gunicorn-19.1.1.tar.gz 385155 BLAKE2B 683bff89e9f7037b22748c968f842cbd6328f
 DIST gunicorn-19.3.0.tar.gz 395381 BLAKE2B cbdf0e4a8c5f107b3dbee9ac30b141142bd10e5a4d9046de3c2fe3af965e6b5f091ff29bdfd9f4a1da75ea409e6f9a3b9627f6069d5529dc9db4d6ad1e3f9860 SHA512 8c4e0bb1bf0b35aaf9160b9b7d87890a991451fbc86186454203f3483767858944704c1ec22dd52480ce1e4693e84b62b1428dd3b67b2ae925e0475dc08fcb50
 DIST gunicorn-19.4.5.tar.gz 399066 BLAKE2B 046dd95170b3d6c6071c955462af5777ee0fbaa48d80c4a16b78fb1c9abd49bef98f7428e7f861b404a2791683074ae37a22a7e73d5b7f183fa6ac77d139123e SHA512 a255178a4ce7966af5883fc6c104e7c472c87ce91861caf976b52cfb0ccd90b34109130334afa6c1f6dd251a4b33b052b1f9a4f598c5cd1e7f26e332b92e9154
 DIST gunicorn-19.6.0.tar.gz 404497 BLAKE2B 8edc6907daf9cced83ab4213146d468789a23b4428a562f9f5cc7d2aa8f7c57137ca9f163609b6a8955537dfc5a93910a7cef183fa6457c5017cbb3941f4e0c8 SHA512 50b69ae18acc6f60be6fc5c6f4a867d8415d32009a1f959155b58502d52403a057612e97d6c9b69ec068ee5af7b9b045952a636a5edf4713a1249492611be479
-EBUILD gunicorn-19.1.1.ebuild 1155 BLAKE2B 5042372dc5ed723cfd9138c09517000520b2b3a9a0564f8260131af3fc6567d37d0fbba1519179e4933867d1c252b928f02d65c5b0b0e6ba95b8a9cea116b4b9 SHA512 883495c7e2d4a85a1fd917980ae598088ccce08393eedad95d30d5eaad52047ff05d2ff8a68929e0e83d6e4709a0d7f584f4fe92c9993544edaf7730feeecb8c
-EBUILD gunicorn-19.3.0.ebuild 1211 BLAKE2B aac390c1ecc1475bc19fdee74350ddeb31bc46e2530bd0f62117ba1b9ab8509f11132da5c642782e8c1ac181a29b33d6862ac1e7c80b3a406162bce13a546d59 SHA512 e6a0ea3758c0199aacf756851ca9e97ceb63cb22ddd1e52a93812de2fadb582260630a9857d7c3d6a5901ccec44e8e63ba200b8a051d0555b40ec79e06c303bf
-EBUILD gunicorn-19.4.5.ebuild 1109 BLAKE2B 158a435edb442d310ce61034b83437d2251a1eafbcfeef67ace162261b23f89583cac427f34f96f824e6c108551988195e5ce7fbdb06973b7bae5ceea8554e12 SHA512 f1d2fb42e31ad2eed1504fe51bf2e3e9241ce25d298c15ae27c9d8e6134097f91da50688ad6c9e07bbf499038061361969994e172f38b4016142f4616c1ad155
-EBUILD gunicorn-19.6.0.ebuild 1174 BLAKE2B 7369b707041e2b59dbb7f3839cab966c0d64e765eb4e25f4dcd9a9d2c9ab5535236a25695e72715231967691dd81a2fc8a99e9669858be7a8ddb56da1cd40e5b SHA512 b7554cee97aec109fa2a65540bb8326a6b641b83c8bfdfa4004a27df26caae655f6aaf89982134ae1ad790c39650a0fc87d93d9b1302e9bd030b6ef6d9022059
+DIST gunicorn-19.7.1.tar.gz 402658 BLAKE2B 8fd96ae3cc8c78beae8f3f84f960d75dc1a17134050fa7735cf0f01bd2a560bca733450d98c69e7c77b9679b3502df8e71dfe29d4127bd0f5086b7961b35e756 SHA512 ee01276028ad65c72076f09d95b6801a720700ec55d9b0bf929e0a6c0db546178a21c34f584ef1780f329218b2cfa3dc1e0c2d81bd4f7fcb0b328fbdfb0b9f0e
+EBUILD gunicorn-19.1.1.ebuild 1151 BLAKE2B 0b5cee281a8ed43db9331445b0e858e8d57fa6e428411c5bc98fd6a20898bcfc6a19e20b5d3d6c0665174a345674430730982a4158de584749d6b333a708b428 SHA512 820877963111e0d47cabb5e9a46792d7c75b662ce681e9ca50faba2a0cfce7893b4f5de0bb6e01163b9eb9f7fc2f8f09b4fda4d5fb0b3cf3408705e4ca0c54d2
+EBUILD gunicorn-19.3.0.ebuild 1207 BLAKE2B a402dbb7e670776317227d5ee9a6b66d2f28233df89ec12e15c7ba2e935f31a2ba1efa4e45df3f53f3139c47747498a484f409876872d4d0e575034696be52a5 SHA512 f27bc1cd2ee0372764a9d8c794d2e230634c6e9ff5e894d5d5dbecb2ff9f6464a3294757fe237e36be94c2475f5b81a912633d5a8a8ce2a949e6ac3292ab2f4a
+EBUILD gunicorn-19.4.5.ebuild 1105 BLAKE2B 90be17c877d14d8564817d27a6fa1fbc00f9132e74a26aff71ef6212c71a317cdc2bd164100ac51a02d2026947a57f104ecdebade5878123c1633a23c7304a42 SHA512 16ce9e2d2643d2016a0dca8fd771a79f41433c25df534e00162b8a615480f3fc8fb4b9f21c348e429dce964d879cc6004adedcc6a233eaf9233adbaaf331c755
+EBUILD gunicorn-19.6.0.ebuild 1170 BLAKE2B 8984e1db206b79b0d98a56ffd655784b3a750fe98c8a7a9f9e682220553de5ae15b6dac8b79f892aa0ab8446a04cac16987e5522ebb590a7632b874c968ed60b SHA512 410179a50f0701ebf9580a40034279a4be846b71319872a4c34a26d2ab05857e930030643abe146e9d168350f29ad27adb58077bab621488fd9ee4bbedf309b3
+EBUILD gunicorn-19.7.1.ebuild 1164 BLAKE2B 36c0d6ee3e93853cbe672a02a5a8df1de38af0b709454749a422a15b5749f02b097d6f9901ce9c5bf63879a785a7a6731d317674b6fe64a654e5c4e7b99055b5 SHA512 6f2d4943b1ed05af93dc9a4e513838ba845e0745ae243ceffd6909bd554298c84685ef2c15b0e460725fe898cb011a8f4d59e03841c79e364cb430b2b49976a7
 MISC metadata.xml 707 BLAKE2B baa7ba91610f10f6acc7298c6bbecb030b2d6dcda9a2f0c642f24ee27edbab38baea8bc231d7fbfc9f60459faa13bb05e548a8f7680b735c8c1005d00db2a3ee SHA512 ee74f9e811231c840235bccb318ffd99e7ff765a13efe285dfd870ff343d8e64b5190d5afd6589b6367f0f8cec8e699de8ae19d8da5e9a9f22cb7eb9e3539c0a
diff --git a/www-servers/gunicorn/gunicorn-19.1.1.ebuild b/www-servers/gunicorn/gunicorn-19.1.1.ebuild
index 2b534c00a950..fde0b5196211 100644
--- a/www-servers/gunicorn/gunicorn-19.1.1.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.python.org/pypi/gunicorn"
+HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/www-servers/gunicorn/gunicorn-19.3.0.ebuild b/www-servers/gunicorn/gunicorn-19.3.0.ebuild
index 5990dadd704d..030c35a54df1 100644
--- a/www-servers/gunicorn/gunicorn-19.3.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.python.org/pypi/gunicorn https://github.com/benoitc/gunicorn"
+HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/www-servers/gunicorn/gunicorn-19.4.5.ebuild b/www-servers/gunicorn/gunicorn-19.4.5.ebuild
index 05be8e62d5fa..73095f06827d 100644
--- a/www-servers/gunicorn/gunicorn-19.4.5.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.4.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.python.org/pypi/gunicorn https://github.com/benoitc/gunicorn"
+HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/www-servers/gunicorn/gunicorn-19.6.0.ebuild b/www-servers/gunicorn/gunicorn-19.6.0.ebuild
index 6da709721f9f..e00b4055cf71 100644
--- a/www-servers/gunicorn/gunicorn-19.6.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.python.org/pypi/gunicorn https://github.com/benoitc/gunicorn"
+HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2 doc? ( BSD )"
diff --git a/www-servers/gunicorn/gunicorn-19.7.1.ebuild b/www-servers/gunicorn/gunicorn-19.7.1.ebuild
new file mode 100644
index 000000000000..8aef7da541fa
--- /dev/null
+++ b/www-servers/gunicorn/gunicorn-19.7.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI HTTP Server for UNIX"
+HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT PSF-2 doc? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+DOCS="README.rst"
+
+python_prepare_all() {
+	sed -ie "s/..\/bin/\/usr\/bin\//" docs/Makefile || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 2eed178abb05..0e8fe0008d7b 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -3,6 +3,6 @@ AUX 4.4.1-options-test.patch 651 BLAKE2B 02bfe56623948ce64b5e790fb4cdea60ed4f943
 AUX 4.5.1-drop-intersphinx.patch 717 BLAKE2B e9a2ea61b68302b796aa2e7bd7d7745d0f86a35bb6fe2315ce21f525112b42d6176af85c5d9b922cfadd1dd4ca0378acf1e5e4a6df7e7d2e6c8ed0dd53cb0ea5 SHA512 1959062a395544a9557ff8603debb58e73cbd146e501b4d9f9e04bb4a1d9531899a8cfe5cbd41c474638245755e040cd10156a3b1874f66489757447a1af815e
 DIST tornado-4.4.2.tar.gz 460193 BLAKE2B 4586397e8899af19582e07ac9ecdf56980a552a8c15458f1c16d83dc8ec7bf73b6a1eb341a5402d8555319c3d7528702567d13c4b56a995597e7dba4576f694b SHA512 f330bc62433576708e3c566577cede07c54c19996f374df82d5abc19a669ade549e7b6c27dcae3d421921fec506fae39473443cdb04692553c5ea2f8ec11a327
 DIST tornado-4.5.1.tar.gz 483225 BLAKE2B 261a5da8a7cc43b11b8504162a030fdad9c3c1409d653f86ab37deb5e4398f39ac05bee1da58944c2d1a2fa92dd5894256b748910f90926834305d6c6adf7ab4 SHA512 b31b3572bf58df8b758694c32b2233c547d6600b0c27f56cff3521abaad38a1646a528d2c2dfcf13214159bf5ba0f59470ba3d538edf16dc014a8b03f0d3bb87
-EBUILD tornado-4.4.2-r1.ebuild 1861 BLAKE2B 89b4ed430ad82598327d723b2bc4de0513e95de0f64e7a0a74bc08e40b54b22042cc3628eff6c932f4e4d2fa3361e3084b87a54deac5075737de34adc485859b SHA512 12d2fa8ad9f1e08c0e5e278aa91565c94585009cade64f1f4db2cc968b68e8719ba98288d87d753de7924d71fa98bc810f1b2026b55f2366e3608cbac02318a3
+EBUILD tornado-4.4.2-r1.ebuild 1857 BLAKE2B 3850718258142bd2319a8be34c82eb9ef49a37333f889912839acdee3b31a6f0bdb78608ff2945fc4848d0e81b36a87ee493972a30e44d4b78b3bf6124d4eda6 SHA512 316973dede35685e2f6826acedd83ba29f27e20afed1252172a80ff519cff39ecb00ad6493532b9082ab77b6696cbe0ac6b71d3f2d069540f54e0ee83b1ecc31
 EBUILD tornado-4.5.1.ebuild 1868 BLAKE2B 722e23f6ecdb3d110a61cb074933b2b61b080bc21948fd42fae4099275f8c4114aeed18c6635aa1c569581c2364105c86278f31769dba27dd9d826aa95c29964 SHA512 a844f5b5b52ae13ada511f50c3979b1a96683bb81f52c93d71d89d38da98817e677bccc41113941d996594622e4dd312254a93c636c77d951f31c5b900312447
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-4.4.2-r1.ebuild b/www-servers/tornado/tornado-4.4.2-r1.ebuild
index 5321d46eb935..340c2da3043f 100644
--- a/www-servers/tornado/tornado-4.4.2-r1.ebuild
+++ b/www-servers/tornado/tornado-4.4.2-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python web framework and asynchronous networking library"
-HOMEPAGE="http://www.tornadoweb.org/ https://pypi.python.org/pypi/tornado"
+HOMEPAGE="http://www.tornadoweb.org/ https://pypi.org/project/tornado"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"