gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /www-servers
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
52 files changed, 513 insertions, 917 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index bdee6be25bf1..fb9de4bfd8c6 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 1b539b97a155..78b2bcb5abc4 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,19 +1,11 @@
 AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6
-AUX apache-2.4.34-PR62557.patch 8393 BLAKE2B 2e87763186f63be89d28b68d5a9fbec55afa883f1d8cf42b7ea2182365fe81a5681b2a7ca722074f1cfb79bdea3361d68f37e02a9152a45392e93546669375ea SHA512 d87fc2942c7ada9b91c8ab495b4bbc91b3fefa376586b76a1975f3bb1ef2bb4ac2a73b30c2538aa5af10ef1d1d0e33b3de39b2bb0f00c3e44a432d0adea14196
-AUX apache-2.4.34-suexec_parallel_install.patch 578 BLAKE2B f0d89b8f2d29017d653db1cf562a476db6e841d132588b895c48db35fedc1a3a5c21bd4f0d3fc877138d05001802353411cb608fa4daa4c8cc2d8cd1fe14f6ca SHA512 8e07c444eb0e1130bdd73540da7bd2ea4e9d261f4d3700e8183cd49ec309f667a93aeea9afb70a83e8f1e4d92e982b45ad29ac2c00c2760271129a4dfdc0381b
 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
 DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 BLAKE2B d3f6d85192706d7c49a38cc36e816b3ae531f8c0d42111c33ec32ed39900d36d8a2a85a5d1b5afca22331137f04fb24fb424a42a21caa7eb4f6906fa39cb8224 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a
-DIST gentoo-apache-2.4.34-20180716.tar.bz2 24773 BLAKE2B 6ff3b711e16a0156f8c5da4c5ee830a6e3d55b1f29c44a81be26decf6611e2680c84ec7779372bc0de775f3aff90fdaec48f5bc7253c8c9317c1308b60bf10e3 SHA512 4b96c2c7cad0aeef070584b64396360acb2ec24139a5af4755fc36b1f3cd2b82b213ebbfc45035f61c49b59ba40870930227b42e0b60042fd1147f34ba5df574
-DIST gentoo-apache-2.4.38-20190226.tar.bz2 24810 BLAKE2B 31dc4363c7bdb3dd49287da405541b73e31f251b1b31ecfdffd066a3cd6b838938acf7326a7963a05693e20d6dc34e71223efd1ecd5062a25829d6f6f4721595 SHA512 3dbddedab74e4326b53a9ec3daeb53d727c2789736ae3234d127ccffe873541bd7baa26d5cf9ed064b6e4125fd5a2baee97bccb81e67fdc5674cffe81ca93c40
 DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
-DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8
-DIST httpd-2.4.38.tar.bz2 7035030 BLAKE2B 52d965b0eae3402c268f1c5f5fb669ad84408699871d0518ba254c6e7c00f2198cba8cb6106114a62f0f6de67e0a8b921b5783af9530d165ed4d435312ce5164 SHA512 8bdc36fa2bd13fd83feee17fdce4a5316ed8f96c1ac32b636ba106572ba257815438c72068d2d0e900783a3fa25c90a5da34c3f83fc2c04a1dbdbf234f7ad448
 DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7
 EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
-EBUILD apache-2.4.34-r2.ebuild 8245 BLAKE2B ea58474549b4c05319ae4d4eab60d0035415b6698c201aad0255c28cf0b0cd636f1666d4d90b8fc55a1fa53a9da2bd36c49afae7818715101c693cc8837c4abb SHA512 f3ed8140685860c7c8e44baa1198a38dd44de8015e7c994490c37bd9289386a446aed2dd448d75a9159124bf06eb2441dbab59e9c617d70d81f8d4b6c106eaf1
-EBUILD apache-2.4.38-r1.ebuild 8135 BLAKE2B 4d10bdb7d0bf1744bf9593051d934b205806ee3540fc5cbe2b539279357f506864699ae83895a7aa09058c919b3b432d098fcd69e7717bad75dbb58512dfbd2a SHA512 04fe2089e59d7e60ee9650dde03efa0f04ce3e8096d387ed4d532e440a78dfbe81f7b2bd425c263ba434df0a18800f24d5da40a12eb783ceb52881bf7ad32377
-EBUILD apache-2.4.39.ebuild 8142 BLAKE2B c6c6214bdff1810c9586be7b4d46a9b3ac60eff1e47bcb806ed5709eee902e4082c54aa0eac221b6042b288c094118d388cf3fa8325fa4f7b7458662cbe00acc SHA512 f10f6d9e14e1320387a9ce2f8d484f5003c8bb21a1f67b309b5e5653c2fd56a30596925f0a300f6c99304f04a78aca262d300858f4df2185efb628f12abfae3b
+EBUILD apache-2.4.39.ebuild 8134 BLAKE2B a4d286a2ddc61c275d5b204610710b85f2b26aaff318a3fc4d17c3e9d7763c790d1d077aac8b65d311b0c1bd8632a521d29a8abdf59f2d85be5a2e6756fe3855 SHA512 5e35a0bfcb972f185fd81b8a72e41ddd7afce63446481ae64b10f1ee43de971d3f290658922a3b10b21ea9afaf2ca431c110168a4242367736e9567d53558055
 MISC metadata.xml 4052 BLAKE2B dba078e60afae4caf7f47f309f4fb6e65a10ee844b1ef8841e64bc5fb0ec34b0d9ee200473ca751e41498ba34a91f9eed2e84f3c86e6063b1c276adbdaba140a SHA512 0db051271c4b2b6487e3e28f0f994ff0c9167d9ced09042838a049d4a63df3787595213aa1c86108fd8c4f27ef961e1c04b375356b91e9d30231317c56ec7d78
diff --git a/www-servers/apache/apache-2.4.34-r2.ebuild b/www-servers/apache/apache-2.4.34-r2.ebuild
deleted file mode 100644
index 7951d9793d58..000000000000
--- a/www-servers/apache/apache-2.4.34-r2.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20180716"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.34"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
-proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
-slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
-unixd version vhost_alias watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	brotli:filter
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	cache_socache:cache
-	md:watchdog
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_html:proxy
-	proxy_html:xml2enc
-	proxy_http:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	cache_socache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	http2:HTTP2
-	info:INFO
-	ldap:LDAP
-	md:SSL
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_html:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-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-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-
-# Enable http2 by default (bug #563452)
-# FIXME: Move to apache-2.eclass once this has reached stable.
-IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
-# New suexec options (since 2.4.34)
-IUSE="${IUSE} +suexec-caps suexec-syslog"
-
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
-	apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
-	apache2_modules_md? ( >=dev-libs/jansson-2.10 )"
-
-DEPEND+="${CDEPEND}
-	suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${CDEPEND}"
-
-REQUIRED_USE="apache2_modules_http2? ( ssl )
-	apache2_modules_md? ( ssl )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.34-suexec_parallel_install.patch" #661358
-	"${FILESDIR}"/${P}-PR62557.patch #663312
-)
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	local i
-	local apache_tools_prune_list=(
-		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
-		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
-		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
-		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
-	)
-	for i in ${apache_tools_prune_list[@]} ; do
-		rm "${ED%/}"/$i || die "Failed to prune apache-tools bits"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	dobin support/apxs
-	dosym ../bin/apxs /usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in some forthcoming release,
-	# Then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
-	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-
-	# Install http2 module config
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}"/41_mod_http2.conf
-
-	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
-	tmpfiles_process apache.conf #662544
-
-	# warnings that default config might not work out of the box
-	local mod cmod
-	for mod in ${MODULE_CRITICAL} ; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in ${MODULE_CRITICAL} ; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! ${lbset} ] ; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.38-r1.ebuild b/www-servers/apache/apache-2.4.38-r1.ebuild
deleted file mode 100644
index 14a3ff7dfa27..000000000000
--- a/www-servers/apache/apache-2.4.38-r1.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20190226"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.38"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
-proxy_http2 proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
-slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
-unixd version vhost_alias watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	brotli:filter
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	cache_socache:cache
-	md:watchdog
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_html:proxy
-	proxy_html:xml2enc
-	proxy_http:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	cache_socache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	http2:HTTP2
-	info:INFO
-	ldap:LDAP
-	md:SSL
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_html:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-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-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-
-# Enable http2 by default (bug #563452)
-# FIXME: Move to apache-2.eclass once this has reached stable.
-IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
-# New suexec options (since 2.4.34)
-IUSE="${IUSE} +suexec-caps suexec-syslog"
-
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
-	apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
-	apache2_modules_md? ( >=dev-libs/jansson-2.10 )"
-
-DEPEND+="${CDEPEND}
-	suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${CDEPEND}"
-
-REQUIRED_USE="apache2_modules_http2? ( ssl )
-	apache2_modules_md? ( ssl )"
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	local i
-	local apache_tools_prune_list=(
-		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
-		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
-		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
-		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
-	)
-	for i in ${apache_tools_prune_list[@]} ; do
-		rm "${ED%/}"/${i} || die "Failed to prune apache-tools bits"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	dobin support/apxs
-	dosym ../bin/apxs /usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in some forthcoming release,
-	# Then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
-	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-
-	# Install http2 module config
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}"/41_mod_http2.conf
-
-	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
-	tmpfiles_process apache.conf #662544
-
-	# warnings that default config might not work out of the box
-	local mod cmod
-	for mod in ${MODULE_CRITICAL} ; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in ${MODULE_CRITICAL} ; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! ${lbset} ] ; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.39.ebuild b/www-servers/apache/apache-2.4.39.ebuild
index 329c200ef402..7a1fd21f41f1 100644
--- a/www-servers/apache/apache-2.4.39.ebuild
+++ b/www-servers/apache/apache-2.4.39.ebuild
@@ -130,7 +130,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-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-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
diff --git a/www-servers/apache/files/apache-2.4.34-PR62557.patch b/www-servers/apache/files/apache-2.4.34-PR62557.patch
deleted file mode 100644
index d95a9864d1bc..000000000000
--- a/www-servers/apache/files/apache-2.4.34-PR62557.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From d7713339dbde7cfa4cfc9914f683b4644dcab92e Mon Sep 17 00:00:00 2001
-From: Ruediger Pluem <rpluem@apache.org>
-Date: Fri, 20 Jul 2018 19:27:31 +0000
-Subject: [PATCH] * mod_proxy: Remove load order and link dependency between
- mod_lbmethod_*   modules and mod_proxy by providing mod_proxy's
- ap_proxy_balancer_get_best_worker   as an optional function.
-
-PR: 62557
-
-
-git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1836381 13f79535-47bb-0310-9956-ffa450edef68
----
- CHANGES                                           |  3 +++
- include/ap_mmn.h                                  |  5 +++-
- modules/proxy/balancers/mod_lbmethod_bybusyness.c | 28 ++++++++++++++++++++++-
- modules/proxy/balancers/mod_lbmethod_byrequests.c | 28 ++++++++++++++++++++++-
- modules/proxy/balancers/mod_lbmethod_bytraffic.c  | 28 ++++++++++++++++++++++-
- modules/proxy/mod_proxy.h                         |  8 +++++++
- modules/proxy/proxy_util.c                        |  1 +
- 7 files changed, 97 insertions(+), 4 deletions(-)
-
---- apache2.orig/modules/proxy/balancers/mod_lbmethod_bybusyness.c
-+++ apache2/modules/proxy/balancers/mod_lbmethod_bybusyness.c
-@@ -22,6 +22,9 @@
- 
- module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module;
- 
-+static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
-+                            *ap_proxy_balancer_get_best_worker_fn = NULL;
-+
- static int is_best_bybusyness(proxy_worker *current, proxy_worker *prev_best, void *baton)
- {
-     int *total_factor = (int *)baton;
-@@ -44,7 +47,7 @@ static proxy_worker *find_best_bybusynes
- {
-     int total_factor = 0;
-     proxy_worker *worker =
--        ap_proxy_balancer_get_best_worker(balancer, r, is_best_bybusyness,
-+        ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_bybusyness,
-                                           &total_factor);
- 
-     if (worker) {
-@@ -82,9 +85,32 @@ static const proxy_balancer_method bybus
-     NULL
- };
- 
-+/* post_config hook: */
-+static int lbmethod_bybusyness_post_config(apr_pool_t *pconf, apr_pool_t *plog,
-+        apr_pool_t *ptemp, server_rec *s)
-+{
-+
-+    /* lbmethod_bybusyness_post_config() will be called twice during startup.  So, don't
-+     * set up the static data the 1st time through. */
-+    if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) {
-+        return OK;
-+    }
-+
-+    ap_proxy_balancer_get_best_worker_fn =
-+                 APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
-+    if (!ap_proxy_balancer_get_best_worker_fn) {
-+        ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO()
-+                     "mod_proxy must be loaded for mod_lbmethod_bybusyness");
-+        return !OK;
-+    }
-+
-+    return OK;
-+}
-+
- static void register_hook(apr_pool_t *p)
- {
-     ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness);
-+    ap_hook_post_config(lbmethod_bybusyness_post_config, NULL, NULL, APR_HOOK_MIDDLE);
- }
- 
- AP_DECLARE_MODULE(lbmethod_bybusyness) = {
---- apache2.orig/modules/proxy/balancers/mod_lbmethod_byrequests.c
-+++ apache2/modules/proxy/balancers/mod_lbmethod_byrequests.c
-@@ -22,6 +22,9 @@
- 
- module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module;
- 
-+static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
-+                            *ap_proxy_balancer_get_best_worker_fn = NULL;
-+
- static int is_best_byrequests(proxy_worker *current, proxy_worker *prev_best, void *baton)
- {
-     int *total_factor = (int *)baton;
-@@ -81,7 +84,7 @@ static proxy_worker *find_best_byrequest
-                                 request_rec *r)
- {
-     int total_factor = 0;
--    proxy_worker *worker = ap_proxy_balancer_get_best_worker(balancer, r, is_best_byrequests, &total_factor);
-+    proxy_worker *worker = ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_byrequests, &total_factor);
- 
-     if (worker) {
-         worker->s->lbstatus -= total_factor;
-@@ -123,6 +126,28 @@ static const proxy_balancer_method byreq
-     NULL
- };
- 
-+/* post_config hook: */
-+static int lbmethod_byrequests_post_config(apr_pool_t *pconf, apr_pool_t *plog,
-+        apr_pool_t *ptemp, server_rec *s)
-+{
-+
-+    /* lbmethod_byrequests_post_config() will be called twice during startup.  So, don't
-+     * set up the static data the 1st time through. */
-+    if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) {
-+        return OK;
-+    }
-+
-+    ap_proxy_balancer_get_best_worker_fn =
-+                 APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
-+    if (!ap_proxy_balancer_get_best_worker_fn) {
-+        ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO()
-+                     "mod_proxy must be loaded for mod_lbmethod_byrequests");
-+        return !OK;
-+    }
-+
-+    return OK;
-+}
-+
- static void register_hook(apr_pool_t *p)
- {
-     /* Only the mpm_winnt has child init hook handler.
-@@ -130,6 +155,7 @@ static void register_hook(apr_pool_t *p)
-      * initializes and after the mod_proxy
-      */
-     ap_register_provider(p, PROXY_LBMETHOD, "byrequests", "0", &byrequests);
-+    ap_hook_post_config(lbmethod_byrequests_post_config, NULL, NULL, APR_HOOK_MIDDLE);
- }
- 
- AP_DECLARE_MODULE(lbmethod_byrequests) = {
---- apache2.orig/modules/proxy/balancers/mod_lbmethod_bytraffic.c
-+++ apache2/modules/proxy/balancers/mod_lbmethod_bytraffic.c
-@@ -22,6 +22,9 @@
- 
- module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module;
- 
-+static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
-+                            *ap_proxy_balancer_get_best_worker_fn = NULL;
-+
- static int is_best_bytraffic(proxy_worker *current, proxy_worker *prev_best, void *baton)
- {
-     apr_off_t *min_traffic = (apr_off_t *)baton;
-@@ -59,7 +62,7 @@ static proxy_worker *find_best_bytraffic
- {
-     apr_off_t min_traffic = 0;
- 
--    return ap_proxy_balancer_get_best_worker(balancer, r, is_best_bytraffic,
-+    return ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_bytraffic,
-                                              &min_traffic);
- }
- 
-@@ -93,6 +96,28 @@ static const proxy_balancer_method bytra
-     NULL
- };
- 
-+/* post_config hook: */
-+static int lbmethod_bytraffic_post_config(apr_pool_t *pconf, apr_pool_t *plog,
-+        apr_pool_t *ptemp, server_rec *s)
-+{
-+
-+    /* lbmethod_bytraffic_post_config() will be called twice during startup.  So, don't
-+     * set up the static data the 1st time through. */
-+    if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) {
-+        return OK;
-+    }
-+
-+    ap_proxy_balancer_get_best_worker_fn =
-+                 APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
-+    if (!ap_proxy_balancer_get_best_worker_fn) {
-+        ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO()
-+                     "mod_proxy must be loaded for mod_lbmethod_bytraffic");
-+        return !OK;
-+    }
-+
-+    return OK;
-+}
-+
- static void register_hook(apr_pool_t *p)
- {
-     /* Only the mpm_winnt has child init hook handler.
-@@ -100,6 +125,7 @@ static void register_hook(apr_pool_t *p)
-      * initializes and after the mod_proxy
-      */
-     ap_register_provider(p, PROXY_LBMETHOD, "bytraffic", "0", &bytraffic);
-+    ap_hook_post_config(lbmethod_bytraffic_post_config, NULL, NULL, APR_HOOK_MIDDLE);
- }
- 
- AP_DECLARE_MODULE(lbmethod_bytraffic) = {
---- apache2.orig/modules/proxy/mod_proxy.h
-+++ apache2/modules/proxy/mod_proxy.h
-@@ -846,6 +846,14 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_b
-                                                                 request_rec *r,
-                                                                 proxy_is_best_callback_fn_t *is_best,
-                                                                 void *baton);
-+/*
-+ * Needed by the lb modules.
-+ */
-+APR_DECLARE_OPTIONAL_FN(proxy_worker *, ap_proxy_balancer_get_best_worker,
-+                                        (proxy_balancer *balancer,
-+                                         request_rec *r,
-+                                         proxy_is_best_callback_fn_t *is_best,
-+                                         void *baton));
- 
- /**
-  * Find the shm of the worker as needed
---- apache2.orig/modules/proxy/proxy_util.c
-+++ apache2/modules/proxy/proxy_util.c
-@@ -4028,4 +4028,5 @@ void proxy_util_register_hooks(apr_pool_
- {
-     APR_REGISTER_OPTIONAL_FN(ap_proxy_retry_worker);
-     APR_REGISTER_OPTIONAL_FN(ap_proxy_clear_connection);
-+    APR_REGISTER_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
- }
diff --git a/www-servers/apache/files/apache-2.4.34-suexec_parallel_install.patch b/www-servers/apache/files/apache-2.4.34-suexec_parallel_install.patch
deleted file mode 100644
index d5543f7004be..000000000000
--- a/www-servers/apache/files/apache-2.4.34-suexec_parallel_install.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/661358
-
---- httpd-2.4.34/Makefile.in
-+++ httpd-2.4.34/Makefile.in
-@@ -277,12 +277,12 @@
-             $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \
- 	fi
- 
--install-suexec-setuid:
-+install-suexec-setuid: install-suexec-binary
- 	@if test -f $(builddir)/support/suexec; then \
- 	    chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
- 	fi
- 
--install-suexec-caps:
-+install-suexec-caps: install-suexec-binary
- 	@if test -f $(builddir)/support/suexec; then \
-             setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \
- 	fi
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 13e99d761904..d1071c7aa85e 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,3 +1,5 @@
 DIST gunicorn-19.8.1.tar.gz 415541 BLAKE2B f0eefc4ff24052320b4dfaac3fc2523487f8dbb63365a9a3c52bc411b4d8f6150f348c709cae94dc4acb45e7fda534cf462d0339abc0325230d3560f76ce3241 SHA512 7f7fcbcde20b70d3a2faad595e08a028530348895f784eddcb35f24b3d5a7955edfc5b68aac4630243798fa37d41b7e869ec0d454dc80700c2630ba2cc39afc0
-EBUILD gunicorn-19.8.1.ebuild 1165 BLAKE2B 8403df0de1fc1ab28a4a342cede387a7061cd8ccefcf8947fce94afedd96e18ee990df3108ede4c7649ea1973675c8c8d45b60effe57591016e59564e692ae73 SHA512 2a75528f4814727b310fdb95767074b0e28182fd0dc83c658494e474632e9c26b5eff659bbfd08a4993a72042fddacc0297aee34cac7862c13037f4e363386a3
+DIST gunicorn-19.9.0.tar.gz 415774 BLAKE2B 1ac920e3a02aff434d2458cbcacd821df428e2dceeb0ee5a10c8cc449e49c0252980847bfcee02633f791c05aa086b37f5b50f9fd535acee6deb8a18dd1c24f8 SHA512 4a89f963daa7afe7741a4fb9aa4f14192429ac0e9ba5672547d683475dd2f2733efeed903ec99db9d831e2b05b9ed9e583e3cfec483a1b481d897aa77373e8a3
+EBUILD gunicorn-19.8.1.ebuild 1163 BLAKE2B 137625b655ba6c18e4c99a3245bf9528333a0c8cb846d241747acab36ba79069adfc1e6708aa5793994c71ca395b5786577a3ec29989631cebf2cd1c6832b9ae SHA512 003adf0aca47005f506430350d2a9005453fbb47756ca85a726df491857c3942b25c036710f73bab2f64cf38cac9873f52ca6a25dcd8868fa51c24c57f3907b2
+EBUILD gunicorn-19.9.0.ebuild 1166 BLAKE2B 86f5b4625990ce7f1ba2dbd763879682f62da083dbf7da8f2d44565224f603d3ff6c7623f5f4a13d76c56ccf26e8de0e5d9763e381b1b65317a4f2d186c7d5e8 SHA512 87004d0363e8eb693c3c42007d6de58bab8465ebcf80e396a3064286e4cb8dfb98d48c243a0ed5e7ef2e9ea1220de00eda4aba0ca1411f2c348f3b560664f230
 MISC metadata.xml 707 BLAKE2B baa7ba91610f10f6acc7298c6bbecb030b2d6dcda9a2f0c642f24ee27edbab38baea8bc231d7fbfc9f60459faa13bb05e548a8f7680b735c8c1005d00db2a3ee SHA512 ee74f9e811231c840235bccb318ffd99e7ff765a13efe285dfd870ff343d8e64b5190d5afd6589b6367f0f8cec8e699de8ae19d8da5e9a9f22cb7eb9e3539c0a
diff --git a/www-servers/gunicorn/gunicorn-19.8.1.ebuild b/www-servers/gunicorn/gunicorn-19.8.1.ebuild
index 9593bdecf5c5..31ce2e67890e 100644
--- a/www-servers/gunicorn/gunicorn-19.8.1.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
 
 inherit distutils-r1
 
diff --git a/www-servers/gunicorn/gunicorn-19.9.0.ebuild b/www-servers/gunicorn/gunicorn-19.9.0.ebuild
new file mode 100644
index 000000000000..a3e43945651e
--- /dev/null
+++ b/www-servers/gunicorn/gunicorn-19.9.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI HTTP Server for UNIX"
+HOMEPAGE="https://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 ~arm ~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/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index e4bca66d923b..fb253ca1d2c7 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -5,11 +5,11 @@ DIST nginx-unit-1.6.tar.gz 439244 BLAKE2B 38e5580eed131b92f7fb73f389bd1dcc713a09
 DIST nginx-unit-1.7.1.tar.gz 445348 BLAKE2B ce71948575c1d4c8cd6a918625525a77094c7b9bee335283a131bdf72e863f4a645761074642bf4150b1aeaf61c5d95302e0e2f0547483fc76b7ab3784aeb1d0 SHA512 08073aced61aff6cb9891128d4e5eb96096f113cfbff3418976fb7f896762e6abe2f08202935cf464f7b547daade89e071c616496969447a5aa35e77004d4ffa
 DIST nginx-unit-1.7.tar.gz 445144 BLAKE2B 99f985768551bb3d12fa09751c3bad9ffbfd0bb9768914a439bf420e438b468f5baa909866c6f7518c6ab17335ddcb69f312207f8f0a8b25dc28ddb2c5bb75d7 SHA512 68156a8dd69401895d40f2c23d7889f3998f52dd7bfd5c3efb7894e5267aef0075868db857fbbbc34f85ed9d56b9ea4fa7a19f662eb91f68284eb99a55f0380b
 DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
-EBUILD nginx-unit-1.3-r1.ebuild 1194 BLAKE2B dd27ff30e4113e9beb716ea2c73f6559fcde29bf1137b0361b73aa56a4c46a293928b6060eb61e2689d6bccb90a8452e7aa83621ea1768f326b7bd1a60202430 SHA512 af28c954708053a62ef0d2e534d05de59f5e05e8f1042488bcd25f6d0e4c0b4144e7b7ccc146c5b97a0d2f0ca1cc21542aff92082dfc38eeb0fbc9137802727c
+EBUILD nginx-unit-1.3-r1.ebuild 1187 BLAKE2B 360601786caf23913e1d57fe336390e1f8116a7485edecd4eef8d8d8404ea3451dc9115b66cb45610ab752db65911666297d8a9f5919b54917edfd64536f8f05 SHA512 705f34be973dfadcf2cf37eddeedfec1e4acc3123d509fa9df5ebe9d73c16ccb0b4eace8e5eab89c1cc8b13438991480851d5acc6f84cbe9b2e469b884ef8e38
 EBUILD nginx-unit-1.3.ebuild 937 BLAKE2B 09d8c3e3e8e0d0737f94bb1b483479fdce591f3a60a8ac5dab65d94e361e04b6bc1099f6c78432af93469c21c995a0bbde85d916c143ccf92ed0124d3e835913 SHA512 498a05d21d8593c0d640fadabee04245dc7c2c49050c314a1366ae4edd52a268b6a5745aa9d7eecbd0383706cac6c02b7838e0c517206b55b6ddeed849cb9340
-EBUILD nginx-unit-1.5.ebuild 1663 BLAKE2B 77860cf8fd796c3fd341cd0a4387663eaa8abfb87203af7520d88579e1d484f2aaa33e32bc5dcc5328850f90b9aaec3cf91fb67f508c92f6b418c81675113f92 SHA512 4ef0abe2086b78cebb0006eb522dc803441693bb1af3db02ee9f604872f34841b6866c25ff0ee560d5681b9b4f6afea76b48baae0d724ae2d09c40c365044455
-EBUILD nginx-unit-1.6.ebuild 1663 BLAKE2B 77860cf8fd796c3fd341cd0a4387663eaa8abfb87203af7520d88579e1d484f2aaa33e32bc5dcc5328850f90b9aaec3cf91fb67f508c92f6b418c81675113f92 SHA512 4ef0abe2086b78cebb0006eb522dc803441693bb1af3db02ee9f604872f34841b6866c25ff0ee560d5681b9b4f6afea76b48baae0d724ae2d09c40c365044455
-EBUILD nginx-unit-1.7.1.ebuild 1663 BLAKE2B 77860cf8fd796c3fd341cd0a4387663eaa8abfb87203af7520d88579e1d484f2aaa33e32bc5dcc5328850f90b9aaec3cf91fb67f508c92f6b418c81675113f92 SHA512 4ef0abe2086b78cebb0006eb522dc803441693bb1af3db02ee9f604872f34841b6866c25ff0ee560d5681b9b4f6afea76b48baae0d724ae2d09c40c365044455
-EBUILD nginx-unit-1.7.ebuild 1663 BLAKE2B 77860cf8fd796c3fd341cd0a4387663eaa8abfb87203af7520d88579e1d484f2aaa33e32bc5dcc5328850f90b9aaec3cf91fb67f508c92f6b418c81675113f92 SHA512 4ef0abe2086b78cebb0006eb522dc803441693bb1af3db02ee9f604872f34841b6866c25ff0ee560d5681b9b4f6afea76b48baae0d724ae2d09c40c365044455
-EBUILD nginx-unit-1.8.0.ebuild 1663 BLAKE2B 77860cf8fd796c3fd341cd0a4387663eaa8abfb87203af7520d88579e1d484f2aaa33e32bc5dcc5328850f90b9aaec3cf91fb67f508c92f6b418c81675113f92 SHA512 4ef0abe2086b78cebb0006eb522dc803441693bb1af3db02ee9f604872f34841b6866c25ff0ee560d5681b9b4f6afea76b48baae0d724ae2d09c40c365044455
+EBUILD nginx-unit-1.5.ebuild 1659 BLAKE2B 9d12593d5320dfc9d3ba40c9b8a7d8825cd25f3f4674b4c2e7f95e2267a05b85fc22e67212fc025de77138447ec3495c5fa662868c49c60b6018c2e8f9665631 SHA512 cabbe6c59690ac942bcfdfe0c54e06bb0ce3d7ef8460aa15f48822c2050ed6469701b7ffd648df51d36174660a32bb17d43c72035a7f15bec2a3570377633bf8
+EBUILD nginx-unit-1.6.ebuild 1659 BLAKE2B 9d12593d5320dfc9d3ba40c9b8a7d8825cd25f3f4674b4c2e7f95e2267a05b85fc22e67212fc025de77138447ec3495c5fa662868c49c60b6018c2e8f9665631 SHA512 cabbe6c59690ac942bcfdfe0c54e06bb0ce3d7ef8460aa15f48822c2050ed6469701b7ffd648df51d36174660a32bb17d43c72035a7f15bec2a3570377633bf8
+EBUILD nginx-unit-1.7.1.ebuild 1659 BLAKE2B 9d12593d5320dfc9d3ba40c9b8a7d8825cd25f3f4674b4c2e7f95e2267a05b85fc22e67212fc025de77138447ec3495c5fa662868c49c60b6018c2e8f9665631 SHA512 cabbe6c59690ac942bcfdfe0c54e06bb0ce3d7ef8460aa15f48822c2050ed6469701b7ffd648df51d36174660a32bb17d43c72035a7f15bec2a3570377633bf8
+EBUILD nginx-unit-1.7.ebuild 1659 BLAKE2B 9d12593d5320dfc9d3ba40c9b8a7d8825cd25f3f4674b4c2e7f95e2267a05b85fc22e67212fc025de77138447ec3495c5fa662868c49c60b6018c2e8f9665631 SHA512 cabbe6c59690ac942bcfdfe0c54e06bb0ce3d7ef8460aa15f48822c2050ed6469701b7ffd648df51d36174660a32bb17d43c72035a7f15bec2a3570377633bf8
+EBUILD nginx-unit-1.8.0.ebuild 1659 BLAKE2B 9d12593d5320dfc9d3ba40c9b8a7d8825cd25f3f4674b4c2e7f95e2267a05b85fc22e67212fc025de77138447ec3495c5fa662868c49c60b6018c2e8f9665631 SHA512 cabbe6c59690ac942bcfdfe0c54e06bb0ce3d7ef8460aa15f48822c2050ed6469701b7ffd648df51d36174660a32bb17d43c72035a7f15bec2a3570377633bf8
 MISC metadata.xml 949 BLAKE2B 31fd3223474719c473dac9015906c04fe7ad706575073eaddcb05b362ee421d57aa9e7bc92952ff01e9dae558fc838e0e7c248a5f0b29822248e61f97c72048a SHA512 5176f55f2d57f45bbe1df67336d798dfb5a412d2851706ba8d26dfba65beed787f59fd2419bfbb135c5dd9cdb1b2fa50220bdef3d0aed6c2e5ef00ca4dd23370
diff --git a/www-servers/nginx-unit/nginx-unit-1.3-r1.ebuild b/www-servers/nginx-unit/nginx-unit-1.3-r1.ebuild
index 304602c948a5..bc37116427f2 100644
--- a/www-servers/nginx-unit/nginx-unit-1.3-r1.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{3,4,5,6})
+PYTHON_COMPAT=(python2_7 python3_{5,6})
 
 inherit python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.5.ebuild b/www-servers/nginx-unit/nginx-unit-1.5.ebuild
index f3124ecc86f3..a4fad3ff51ec 100644
--- a/www-servers/nginx-unit/nginx-unit-1.5.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{3,4,5,6,7})
+PYTHON_COMPAT=(python2_7 python3_{5,6,7})
 
 inherit python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.6.ebuild b/www-servers/nginx-unit/nginx-unit-1.6.ebuild
index f3124ecc86f3..a4fad3ff51ec 100644
--- a/www-servers/nginx-unit/nginx-unit-1.6.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{3,4,5,6,7})
+PYTHON_COMPAT=(python2_7 python3_{5,6,7})
 
 inherit python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.7.1.ebuild b/www-servers/nginx-unit/nginx-unit-1.7.1.ebuild
index f3124ecc86f3..a4fad3ff51ec 100644
--- a/www-servers/nginx-unit/nginx-unit-1.7.1.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{3,4,5,6,7})
+PYTHON_COMPAT=(python2_7 python3_{5,6,7})
 
 inherit python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.7.ebuild b/www-servers/nginx-unit/nginx-unit-1.7.ebuild
index f3124ecc86f3..a4fad3ff51ec 100644
--- a/www-servers/nginx-unit/nginx-unit-1.7.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{3,4,5,6,7})
+PYTHON_COMPAT=(python2_7 python3_{5,6,7})
 
 inherit python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
index f3124ecc86f3..a4fad3ff51ec 100644
--- a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{3,4,5,6,7})
+PYTHON_COMPAT=(python2_7 python3_{5,6,7})
 
 inherit python-single-r1
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 720df74fd5cb..b050c3e406fb 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -12,8 +12,8 @@ AUX nginx.logrotate-r1 257 BLAKE2B d62c57377efd5259b6c776861d921b6e4ea026387157d
 AUX nginx.service-r1 327 BLAKE2B 081c72f7f7b98e30b2b45aeb8b1e4ead935c5b9a558fcfc7c18c20a2c0f18711272e91f4688c04c7f0eb833be8f7daff2f7d01bd1a04981f03ed54a07fe1148c SHA512 9b6bcf74df2f74ae6a2c255ebf2d826ea92ed9921b9995da6c9a0c5656e2863a2fe5293ef8a656fbd36298602cc88ffc5d7acfbbf143c23a78c9689d61b05df9
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
 DIST nginx-1.14.2.tar.gz 1015384 BLAKE2B 0d41b078215ca3996f434cf3d43c99a52dd43f8b1b798a4566d3f9509fa35c74c139a3e0dca8b0350ee3eb1064dacc8e76bb2fc3ffc78873eec8fff80e53214d SHA512 d8362dbd86435657d6b13156bd6ad1b251d2ab10bc11cdda959b142dd6120b087e4b314f0025d9bbcc88529cb4b9407fb4df1cfae5d081b7ea1db51ccfc2dbe7
-DIST nginx-1.15.10.tar.gz 1032228 BLAKE2B c25884161b2ff861a8cbbbd4b2d7c42298cfeadd54af63a73d5146bb3b666aadbd1335a1cfdd7e0bfc4caf67d4363bdce682c61d7ffb7c6b17f66678a7018007 SHA512 16be3b6a095c045543050ec07fef8170a123738892a077003f7fb0428af9a94e9fe560a20ed68606f34145f088b1b656fe72e72d9d65d51c052f06b89d5244ff
-DIST nginx-1.15.9.tar.gz 1031760 BLAKE2B 899b86f16ee9ba3795085e8e901750c767dc8f040c36e372146dcef3995cf0168020179a3dfce6cfd6516e063105aa2d8fb59661f176920a718db394b0f174c7 SHA512 24dcd5b9bae966244663ff71a625ca90fbe1b29b5717e88aca96ac0c4772108a234647a8c7456154f34ef34d27ebffdce82ad30d2900f24ef5536af6080a6ba8
+DIST nginx-1.15.12.tar.gz 1032347 BLAKE2B 6dfd7fc0a17cd6e92c34e568db17368561f63c107654d76d3fcdf6979688e19a6f9396ddfc421c8fea6a6e0def717337e9b9b43eb8c5c8e3b2efc6bae8eaa3a9 SHA512 58961194c4fb94136b657c75c0d2ee3fe6515552a17d66e80d6cd53d342731229c0cbb897700631517275943fc2731179780a3c4b61b93b32a2cf6490ebf0f50
+DIST nginx-1.16.0.tar.gz 1032345 BLAKE2B 187a07e7bde2dc6d7dd476372fa5e880a085f06bba321177428a4064e75bb1012950fdc31125344dab36b8c5d78c60d9f9ca963279cfa46741478c250221c199 SHA512 e99cfaa4538f209c096ea2f93c04b5019756617f3bcd3305c273e98ddc89fed5bf90d65fb9b493149bc47d55ff79e73850bfcac20505fab74930d0102075df3d
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 DIST ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz 12672 BLAKE2B fa2febfa63b98303f8890c6774de6ccb09475ccd639d3b74493a4ffd97c90febdc22755c5928018bdac24a537bd13cde165f97e5d2b50bebf598c3fb22ec0206 SHA512 169566b8764bb2b82e029f954a99063a9c61e2cbf982861c5f6818b389a5f37bf5389afb1b5627de9bd3f7af7b3c404be0230f943d47ab621c2a2bd825cc8203
@@ -38,8 +38,8 @@ DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.2.8.tar.gz 300750 BLAKE2B 180770c9e56bb7a9c2e3c33c5c4ca87ce56eb16fc1fca483c952ecf9885ae45734bdd7f794d0fc316fd6191d7a6a8c093fd49dc80985ab07b0880f3500aaa1be SHA512 f4ab5dc0b807df443c9edb01020eb78979d4747111e3a529a6303100b922f9acc9e281cde6d88a920c30b4780b2cd85ca2f5abd3518488b75f6ed1b12cf8d616
-DIST njs-0.3.0.tar.gz 307613 BLAKE2B 3385fc9a102791bdca093d3e49869b64fbf29c1ee7c4fbabf26461e1e57dea5844afb94ecb427aab50682f57b18f732db0acaa4575df375295510c046ae09c75 SHA512 9dfbe3adb00f8b7181b13a3b6192326ab8979bc43106075faf271fcfc28fc2e90a3716a2fbcd44edde5c466f2be906e22ae763d948e141b052a28110c1eca13a
-EBUILD nginx-1.14.2-r3.ebuild 40470 BLAKE2B 49aabea4ea212e1940553b09a6492c1bf66f026e0f165bd3050d13b358a8decdb7cad6eef1eb29bc97587f753a0d7ef5f6bdd71c711ded28bf736e58aab130e2 SHA512 3367421409eb1ac117f783355b7a3b36594ce5b45e96bfa39d02543eb2a0c4f481c0b6e674bf6efdbce3f392da61c42cff4a61b472848b94170643f78bc87401
-EBUILD nginx-1.15.10.ebuild 40472 BLAKE2B 895a9013a50b7b95996220a0751cb0e36b7529ea2a3a15b59836a03958a80838a8f0476841341b0e9d34662cb9a2703977c4c0a7518802a72c5b3f4eea2a220b SHA512 6b8a68b9c32ca668c8f8024a53dd1cbe37289b40a83c24a6d08b14ceda99eb2b6bebf1297242c2185d3cb07bab2f11784d2b05215e3e66e588b94134205384d2
-EBUILD nginx-1.15.9.ebuild 40472 BLAKE2B c143f4d4b8d7f3fd73254a3e6415c93c36db4ce4fdc6bb9d3a2f76643962852ddbc47dd3a334c2406e2a1b7a95690ae8ddc2626071040cd1ef90a9643ba76053 SHA512 cdd6b4f9c7ad5963740778c89949906a5b7dc825950cbc74fd59e9d9b224ba1211ded24fc950ddcc45971be7cffecaf56fdb16d899c7e393ffb3af11ad1fcbc9
+DIST njs-0.3.1.tar.gz 314049 BLAKE2B d80b90fbf27699151b5717c483841dc2899dc347c8ba1cc61ce5e3efa99290337d35a230fe5097d037bbce401a71a59e261e0b307a2d41b50185a624beb6fd38 SHA512 b2f427366e66827068b1e3956f7b4b56271d4a7aec535bfa22fe56a2ef0dea5ce1c43c4d028affdf32b8397d19ca4d03d974fc6660bf244bbbd899e23f13637d
+EBUILD nginx-1.14.2-r4.ebuild 40544 BLAKE2B 0a0501b50fb0059d3a1aceb7bb91cdd6119200fb474c591a1ce476a25acc8ccfbdcd7b6da666934a74c5750990db87aa5b6768b0adb3267734e6274f3eac5bb9 SHA512 b85b52f946268441af84bb71db020d6e098a33fac6d6b92c4e384b839837e13e2c2e6f591d5a886f9f73c36b10c8109eaecdf1f48f800736cf563a1c8cc16ae3
+EBUILD nginx-1.15.12-r1.ebuild 40546 BLAKE2B 8cb9a2b8efd517d9bd3272b1dbd76db90f8d510fca33826df44260d161ec35c6d31ec764b71ddee5d9edcdc37e626bc2057d4f01251d98686525d7ccc127fa94 SHA512 4846ec9382d1e0d181a4bd00a833b5c3e2a1d3e64fe5dd9c69ad0512d880bbe31b8f001ef0f91678abc75c3b35eb7fc9923fea7d182b7899fa3fe49d98426647
+EBUILD nginx-1.16.0.ebuild 40546 BLAKE2B b08d2ea1420e5ba6545cbaafa998b6242448feeae8385bc753204b35122c2fe5b220383b379d5d7adfa6cc62734c3aac6189dcd3b2f314a567e72661bc97d28e SHA512 19434f6fdf2a1abde98dfeb5f9527b306b0e104dcc900e9099d651e18a07ac19ace2fb7079d0571b4be1108dd5163b151c32bc4b4031aa2a9b3c05e86bf7c76a
 MISC metadata.xml 1310 BLAKE2B 6f40252a833a188f4b62cb2f2a126f93e68cdcd0e3575febdc371106c82d7ebdc6931b162a5ef8070fb6fe1f18e969191f67d3ccdd5e55712dc4d209c16c34c9 SHA512 10403ec29eaa83eb45b7b0b78340103b226145b52b3795e18b1e8bf272efa83586bc190e6e66061f33544434e3c2f94d2229be988733713578e9bb495ce7219c
diff --git a/www-servers/nginx/nginx-1.14.2-r3.ebuild b/www-servers/nginx/nginx-1.14.2-r4.ebuild
index c7c8f616f3a0..dde537f4fa24 100644
--- a/www-servers/nginx/nginx-1.14.2-r3.ebuild
+++ b/www-servers/nginx/nginx-1.14.2-r4.ebuild
@@ -165,7 +165,7 @@ NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
 SSL_DEPS_SKIP=1
 AUTOTOOLS_AUTO_DEPEND="no"
 
-inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 HOMEPAGE="https://nginx.org"
@@ -751,6 +751,10 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
 
+	if use luajit; then
+		pax-mark m "${ED%/}/usr/sbin/nginx"
+	fi
+
 	if use nginx_modules_http_perl; then
 		cd "${S}"/objs/src/http/modules/perl/ || die
 		emake DESTDIR="${D}" INSTALLDIRS=vendor
diff --git a/www-servers/nginx/nginx-1.15.10.ebuild b/www-servers/nginx/nginx-1.15.12-r1.ebuild
index 530a35c1e9ed..1ef25b421414 100644
--- a/www-servers/nginx/nginx-1.15.10.ebuild
+++ b/www-servers/nginx/nginx-1.15.12-r1.ebuild
@@ -156,7 +156,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.3.0"
+NJS_MODULE_PV="0.3.1"
 NJS_MODULE_P="njs-${NJS_MODULE_PV}"
 NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
 NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
@@ -165,7 +165,7 @@ NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
 SSL_DEPS_SKIP=1
 AUTOTOOLS_AUTO_DEPEND="no"
 
-inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 HOMEPAGE="https://nginx.org"
@@ -751,6 +751,10 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
 
+	if use luajit; then
+		pax-mark m "${ED%/}/usr/sbin/nginx"
+	fi
+
 	if use nginx_modules_http_perl; then
 		cd "${S}"/objs/src/http/modules/perl/ || die
 		emake DESTDIR="${D}" INSTALLDIRS=vendor
diff --git a/www-servers/nginx/nginx-1.15.9.ebuild b/www-servers/nginx/nginx-1.16.0.ebuild
index 0358257509e0..1b4b842834f2 100644
--- a/www-servers/nginx/nginx-1.15.9.ebuild
+++ b/www-servers/nginx/nginx-1.16.0.ebuild
@@ -150,13 +150,13 @@ HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LD
 HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
 
 # geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="2.0"
+GEOIP2_MODULE_PV="3.2"
 GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.2.8"
+NJS_MODULE_PV="0.3.1"
 NJS_MODULE_P="njs-${NJS_MODULE_PV}"
 NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
 NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
@@ -165,7 +165,7 @@ NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
 SSL_DEPS_SKIP=1
 AUTOTOOLS_AUTO_DEPEND="no"
 
-inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 HOMEPAGE="https://nginx.org"
@@ -201,7 +201,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_security? ( Apache-2.0 )
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
-SLOT="mainline"
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
@@ -326,7 +326,7 @@ CDEPEND="
 	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
+	!www-servers/nginx:mainline"
 DEPEND="${CDEPEND}
 	nginx_modules_http_brotli? ( virtual/pkgconfig )
 	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
@@ -751,6 +751,10 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
 
+	if use luajit; then
+		pax-mark m "${ED%/}/usr/sbin/nginx"
+	fi
+
 	if use nginx_modules_http_perl; then
 		cd "${S}"/objs/src/http/modules/perl/ || die
 		emake DESTDIR="${D}" INSTALLDIRS=vendor
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 2458df28ac48..637fcee07786 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -3,5 +3,5 @@ DIST puma-3.12.0.tar.gz 215213 BLAKE2B 1b142e6cc135021eccb01b2e8643d8d22f1c53572
 DIST puma-3.12.1.tar.gz 217543 BLAKE2B 6427c48d17ead515a17fd53ba05baba0ca27b9a3c6b26257e83b21ce099d7ff36666dfe1f1a964d23addd666c5aa83c46e6795ad2e22236de7136e25be689ff5 SHA512 70784ed89403e96d1bdb68f3ee0a5446d98a6f8a1af5ddf369d837e2ae3320118c29c9c33e7a9db7a76b1a80aef66a9b6426140c492721984de50e7cc5fc8300
 EBUILD puma-3.11.4.ebuild 1912 BLAKE2B 3b230f35f65f74e07adaaf85c979e823281920def719d056264e718f823878c7c8cefdf2d08f5146c57067e3c0932379415566730bb5f21dbca5980198503560 SHA512 568ecfb914f2d0ccb3896fe3c3a1d6d1a18413b992f72a2e1b67373194f8ca6072da937d09cdeabfc0f6971cb2b0ebc887922c00554ef7dd526082f2280b5573
 EBUILD puma-3.12.0.ebuild 1910 BLAKE2B ce5c492096c3b163c8f446f5ddac6304b1b67c7a61dddc16fe7e08e264a7fa1767fcbc45708e33bda99015e7d3fb2932a215c95d902aab224d146db4566a1aca SHA512 e267e4f13d75caf2de3c9bf9e9dcb84d07df7233c9c433ad1a35ecce047aa27e33b933957360b955a19dc0b3f17e810880694fdec275419770d1df477fee57a4
-EBUILD puma-3.12.1.ebuild 2022 BLAKE2B 0bd5123d6b723af2467eae3a9aaffdbbfaa8e343e3c04d92afbfe48515969dfafc411645681ea31078dbfb14ab32c6f8eab5ec067ebed1553979d3f33882dcbc SHA512 cc999ba40db84b461b4d20afea801ea5c804f2098a4e92163d6b08dfe74fcfe70d71baa6342a166ca46c40fb6be734736f1f830372f505350e5d82fe5c179444
+EBUILD puma-3.12.1.ebuild 2021 BLAKE2B 95dacafd408be10f2be5a5baad06e06c2878b19e753362127d076d7914d34e0d168ada453ea9a70cf4e2def9e772ec9fb6d80cf21a54a0bfb74e97c98d7c42d3 SHA512 90aee14d9b0fc5537cbf0382ec0063b949c203e3ef68b7d8f5c87a24f0fae8356c092401c8515bae9453742ce22a916dc57a51b5ff2e03e8b1d1b5be28d5f154
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-3.12.1.ebuild b/www-servers/puma/puma-3.12.1.ebuild
index df9ff4d937e3..091df024abde 100644
--- a/www-servers/puma/puma-3.12.1.ebuild
+++ b/www-servers/puma/puma-3.12.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 75290413fd8a..f1569ff370f8 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,30 +1,31 @@
 AUX tomcat-7.0.84-build.xml.patch 5771 BLAKE2B fc7ceb5503836f2d2e52611b1fef76390d62668ac030cfc51b51ab20278d80fb4c3561e6ff4eb0fa5f7461b72f73930a69af6c616bc10b6dd6a3c4033d6ad618 SHA512 3583167e6e7b307ab282982779ef58e1f401e0ada8ddf0fc1ac9669147a22d6472ab9ec09aa293f2846be2f406dda63df5fc0351eac67c86742606140293a0c3
+AUX tomcat-7.0.94-build.xml.patch 5966 BLAKE2B 01e253b0597e7353eaa38b5af29f4f6db4161fbe91aa1a46e2b8412f37cb66a10c06a14291e1c49ea108f7fbbff538e1c605829de8ee20d85a57d9c6122e4436 SHA512 66e001d705a7081461a3ddb9477e857b7fb87676b1ebc3eaa4bbf7f6a1e8f88f7eae4fc49a8a5b7a7baebc2258acc2bd0fe11d3683716021430e4a9dcd367b43
 AUX tomcat-8.0.53-build.xml.patch 10949 BLAKE2B 2693f3e74a69967ceeb5f4ee41756b840da5bc2ab3c64cb855d52bd099bad8d6115f1d01903bacdcb634c24b9085dbb2ef34027f71325f887f20826721b268aa SHA512 20373a340dcb17595e7ff52608e8d3d3b1eddd5f0104b588c5f91b21eb4510047df61a0dfd9ed8674fb7b0b709945d5014d6e1cad4027414ff9e72c2b5d56cfc
-AUX tomcat-8.5.37-build.xml.patch 9814 BLAKE2B 8f25989b1fa957337686beacc12d9b1fa5427fc26582645c0b9fd7a45fba11100fbd10516ed9bdd510afc25a180986076db00f8b026e9ed8ca00b285404889c9 SHA512 ac1328a6fb755c87cd8804b5538aaec7b09a966e427c0a9c3db408947135087ce5e1e81c9e18243d7b34f1751002afbe538424b975a6772a1d5c7443dab73f8f
 AUX tomcat-8.5.39-build.xml.patch 10037 BLAKE2B f8815ff5c9b959daa58260ce029d0af337ef38a8e057f9cabe4c7079a443149890803c9a379fdfcbf7128392e2e1220385616488b30f6bba9afed1ed9598e22b SHA512 b33d8b018fd8def02a7f9bfaf0aed2f7954d70e110c82f3999104aec933f616d1b68fb2bf2cbe2ba00810b571333d17bae47d60bdea212803eb131f46314ffaf
-AUX tomcat-9.0.16-build.xml.patch 10623 BLAKE2B ff6b110604628cbf750a75cea2544789cb65357f2f5bd87e8f781fcffade2a538f4a76ed4c8709a34dbb5995006a550e10e13b74487570b0474ca451ea21c209 SHA512 27f5040e2384ad4c212c1e25aaa850c26fec93de73b86a1b3e06e763ff5e13ed491153427d1206eec662eb225ee0890c43f292cbe95dd6521702254632983df1
+AUX tomcat-8.5.40-build.xml.patch 10429 BLAKE2B ba2dcd97d06d353f1ae8c9041ad5eaf510ea6668fe08d2331b6f2b9efc886492c7946ad5d3e6dfe49e83d62bce7df20eaa8003c40c91f8f1be95e301bd02a87f SHA512 18ddf79f7fd12ca0095c75cd60876a942b35bd7d5f38919ce2edd1199d2a544381f157e7544bbf52c0d54d2786535c29910ae10ea1ef7f6afb030505861c5807
 AUX tomcat-9.0.17-build.xml.patch 10600 BLAKE2B 34ac1539155c8263b8fbf48096685a4e63567727fa129ba33c896d82e1d57fefb5d390375cc1655312f7f3b69ab3f51b1990857b6765c954c4026d650d9a8f24 SHA512 0065397d64c8a508c62d3acc689bb968c2ccb303f7e8013de107feb63d15637f58a2fcefdd24dbf6edfddf8f5e4227277c9a5b7b188c65adb0c02985bb3bd4c0
+AUX tomcat-9.0.19-build.xml.patch 10992 BLAKE2B 2205b3973bff2cd252679e3cc809c907f9df56874d7030283b4a4b1ce32337a832eacf84b62ce6d01473da2e539a1dc00e7ee233d1226458f266eb627c7fbcd5 SHA512 0988b9b52ef9921a174fb52ea3982d3560fa808fa83c77cbcf0a0d09c09ede2269957f6bc966357ac461250158c45c54b3f45e80ce62916f5c015d77d7e27d06
 AUX tomcat-9.0.4-build.xml.patch 10399 BLAKE2B 3ec7f4d315b51056884b44abbd03093e2bf3675acfb572c556a62a8a32de3209dae82ee3f3b1c65178b2a62b42f5d4c3fba2e765aa27aa7147a9d8478d09f0f0 SHA512 60729e4f085951aa1133b0d6fdc6386bac9fd4bcd421814eb87c8a45a62819fab1ea2347dfffd12150e93c54fda2ba98bf1df4bc39a622de5ac9ea0c2e81a710
 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a
 DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa SHA512 5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
+DIST apache-tomcat-7.0.94-src.tar.gz 4966331 BLAKE2B e806baa91ebe4672fb238d6fd461b2055ff90db822b7edb2ad4432334d45cf2c2286639bc12f83987972a47129493bef4ba6ec77e544a93e000282a2d24ae9e8 SHA512 5e8d2fab7145af5677170299bec0ae5ea5fd20b7a539738678a420581f9b53a95a6fbb1caffb54c7222d97edfe8ff34ce6dbb7ba62adb1a61f2bfa6b15c43139
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
-DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480 SHA512 b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486ceeee
 DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859 SHA512 ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
-DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc SHA512 60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
+DIST apache-tomcat-8.5.40-src.tar.gz 5274830 BLAKE2B d96044fecd8f3bd5b971e9bfed79fd7768845f5e760140513c6701f34e0217edfb7718b669e38c3de8554fca5c5af08660c423a266909dab5b0fa089e24c107a SHA512 aef81900ef0af98122d19ef467b06569b46e084c50c14673872b82517b9b61569a2df70f5763bb30100edf73eb73bcf1c81bcb1106018c81ad96f4a019f72ae2
 DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7 SHA512 b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
+DIST apache-tomcat-9.0.19-src.tar.gz 5692733 BLAKE2B 771d8afd50e9032edda09abb5d03e16663a7475d36ee9a5561cd54fbc948169c145ea95bc16ebc690280e5327a5a9868e56a29bd08acb6c10c34fc4e7bf94cc7 SHA512 0461ab9a4e5f021636957b5bc8fbe45714488837e53ca2df4bf9faab5c620270c3041859e034135ccc6e2914ae70e4e38cf4b4353cb17b543ed3dc3a7628fba1
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
-EBUILD tomcat-7.0.92.ebuild 4230 BLAKE2B 4a16e1282fff97b370a2b1b676fcaba190c3dd75ae6e0355cdebc32f97a43e244c135a8445862f5c8105af101563fcc4aced9a5a582ad3ed096870e7496c4ca1 SHA512 ae58f357dddbd7aa960c85c7f903cb8ba45d845ba93b836ad273c16a16672f34cce1bedf90d6e71b589c4bc112853184f2fc7a3ad20bfd79bbd6d291b6fe0892
-EBUILD tomcat-7.0.93.ebuild 4231 BLAKE2B b1bed407c15f9562cb15a7360ae8091ce6c2143a5597c9f0e0a0cfea3f382661f916b9cdf66a94a6317629d54d0351667ad6694abc5d772fda0eb17c7a4b70e8 SHA512 c40e6edb3b38c116e3f367a4d744d8c785d49fa59e955aad1ebfd9faed50dc7c0aad1729f3ff05c5b6cea7bb8315be161bfae30b585bcc46491b49fc5d413170
+EBUILD tomcat-7.0.93.ebuild 4230 BLAKE2B 4a16e1282fff97b370a2b1b676fcaba190c3dd75ae6e0355cdebc32f97a43e244c135a8445862f5c8105af101563fcc4aced9a5a582ad3ed096870e7496c4ca1 SHA512 ae58f357dddbd7aa960c85c7f903cb8ba45d845ba93b836ad273c16a16672f34cce1bedf90d6e71b589c4bc112853184f2fc7a3ad20bfd79bbd6d291b6fe0892
+EBUILD tomcat-7.0.94.ebuild 4223 BLAKE2B b2dd85673f3417d6c267759c5c6b7fd1ef406063cfcdeaee695eafd90ed077f9738aecb931cb2e12c3192972cbdb0c493e5205574115ce560ee966884c9271f6 SHA512 2665ea899808bdd0b8d42f497db968bf93ffd9d0b39ab040497c1a1fa6a89073bf720f9bd1945f13796c718ef7ee51391a5ddaf8dae0fb205ba49b8038830991
 EBUILD tomcat-8.0.53.ebuild 4554 BLAKE2B acdadf7f369b1c69ad391056abbe79dccfbaa1b561cdf050f7da1cb1da0bd3b8be0004ebfd9795bd1cdaa2b9b58d2b3cbfd84e97453a8a70455bd99d2d46b524 SHA512 665c4bd33e542f36268f4c4b1384f10a69e65dd81aca1a603e9b3969380a050754c215684131683940e346300bca77e7c1fee0714a5e4ee785531c5c3edeb2e9
-EBUILD tomcat-8.5.38.ebuild 4610 BLAKE2B c874fc536892996a46f5d0da15486f6cd3082f5178c4843e2ffc421b11c9ed36fcb79b9f9a8dc7e01993318562323963c3b3158af51321fab592fe76f27f32fb SHA512 86a36fe791e700969331df3a9a1d7f45e79a0c8a6d22bfb4aa524d37c765057a7e2f26ab748c79ba209021906fc7568088e5ae89aa046c9b3ca2fbb07ff5c790
-EBUILD tomcat-8.5.39.ebuild 4603 BLAKE2B ebef90f1f6cbf209a87aef11bb43042465dbbd4d2275150f3ac7425b27b3929d1804690d3c3fae7a18aa0e25c44ea53168b1201eb8cb857a9285d61bbd1af321 SHA512 15a61c6f1e16d43f60998e5f1a668d46fc5187f920b720033cad4b1d0c0521e647cbaede2245de1542b7e487273a7b8ffdd9319d126b4f6d5a879ecd40ac0468
-EBUILD tomcat-9.0.16.ebuild 5513 BLAKE2B 2675ab6497b53e3f02d88dfd419ead40db3e20df8ffb447218b772d9c5bca9a696190b523b4ea104d056a312619532c3478695171968eadea013b5b1962116b0 SHA512 0880a152d77a9b9db7e2fdd360208d20ae8ffea03a76f3b40ed4288a03f6c7d3dd3dd261d5942234a58806184885bd8eb1faa35590d8c434b0835fda73bf70b6
+EBUILD tomcat-8.5.39.ebuild 4602 BLAKE2B 5c780c1fe4dc7a62830114f5bc0de0d2dcd5b49a15af8ce363c68c3c820af2bc308e2732da3a3c38c6e68216e31d601a3178adcb2a5f136afaada9c9ceeca1a4 SHA512 b79c3a1093be0f6d1301bda73df499ba64d69eb3c840070b2909c123f262ddb65baf05ce1757e78375f2366b5bfa656d4c69342dfa635726b838c25a8535eeed
+EBUILD tomcat-8.5.40.ebuild 4603 BLAKE2B ebef90f1f6cbf209a87aef11bb43042465dbbd4d2275150f3ac7425b27b3929d1804690d3c3fae7a18aa0e25c44ea53168b1201eb8cb857a9285d61bbd1af321 SHA512 15a61c6f1e16d43f60998e5f1a668d46fc5187f920b720033cad4b1d0c0521e647cbaede2245de1542b7e487273a7b8ffdd9319d126b4f6d5a879ecd40ac0468
 EBUILD tomcat-9.0.17.ebuild 5513 BLAKE2B 2675ab6497b53e3f02d88dfd419ead40db3e20df8ffb447218b772d9c5bca9a696190b523b4ea104d056a312619532c3478695171968eadea013b5b1962116b0 SHA512 0880a152d77a9b9db7e2fdd360208d20ae8ffea03a76f3b40ed4288a03f6c7d3dd3dd261d5942234a58806184885bd8eb1faa35590d8c434b0835fda73bf70b6
+EBUILD tomcat-9.0.19.ebuild 5513 BLAKE2B 2675ab6497b53e3f02d88dfd419ead40db3e20df8ffb447218b772d9c5bca9a696190b523b4ea104d056a312619532c3478695171968eadea013b5b1962116b0 SHA512 0880a152d77a9b9db7e2fdd360208d20ae8ffea03a76f3b40ed4288a03f6c7d3dd3dd261d5942234a58806184885bd8eb1faa35590d8c434b0835fda73bf70b6
 EBUILD tomcat-9.0.7.ebuild 4564 BLAKE2B bb3e1e254fc8eada11610515139c5edf3e4c310dca7990a3d1595862848dbd4157eb7380362a893ae2a904cadfc1f1e6e5c576f89a2c1b5fb48c047e9bb70328 SHA512 cc933b2ddccd45542d8be98cb18b2288ef7eb1db9f587405cc0d04591b0de9334394b4962b0c1deecbd3e8cb0429b2cacabb5de607203030aaf6fcc4134fe9c4
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch
new file mode 100644
index 000000000000..832ce0be4a23
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.94-build.xml.patch
@@ -0,0 +1,163 @@
+diff --git a/build.xml b/build.xml
+index 92d8b92..790d8fd 100644
+--- a/build.xml
++++ b/build.xml
+@@ -685,12 +685,14 @@
+       </fileset>
+     </copy>
+     <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+     <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+       <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+         <include name="*" />
+         <exclude name="jspxml*" />
+       </fileset>
+     </copy>
++-->
+ 
+   </target>
+ 
+@@ -741,26 +743,32 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.2 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       notice="${tomcat.manifests}/jsp-api.jar.notice"
+       license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- Bootstrap JAR File -->
+     <jarIt jarfile="${bootstrap.jar}"
+@@ -819,9 +827,9 @@
+       filesId="files.jasper-el" />
+ 
+     <!-- Re-packaged Apache Commons DBCP 1-->
+-    <jarIt jarfile="${tomcat-dbcp.jar}"
++<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
+       filesDir="${tomcat.classes}"
+-      filesId="files.tomcat-dbcp" />
++      filesId="files.tomcat-dbcp" /> -->
+ 
+     <!-- i18n JARs -->
+     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
+@@ -1022,9 +1030,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1083,7 +1091,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1728,7 +1736,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1925,11 +1933,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!--
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1941,6 +1950,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+     description="Create the Tomcat javadoc" >
+     <fail unless="java.7.home"
+           message="The java.7.home property must be set for javadoc build"/>
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -2005,6 +2015,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2045,9 +2056,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2658,7 +2671,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download components necessary to compile" >
++          description="Download components necessary to compile" unless="noget" >
+ 
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -2683,7 +2696,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2747,7 +2760,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.37-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch
index 4c2d8da9e919..e049d77141e4 100644
--- a/www-servers/tomcat/files/tomcat-8.5.37-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/build.xml b/build.xml
-index 6fbb321..4fb4b42 100644
+index 179802b..49ac8c0 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -722,24 +722,29 @@
+@@ -727,24 +727,29 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
      <!-- Servlet 3.1 Implementation JAR File -->
@@ -33,7 +33,19 @@ index 6fbb321..4fb4b42 100644
  
      <!-- WebSocket 1.1 API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
-@@ -1025,9 +1030,9 @@
+@@ -836,9 +841,9 @@
+       filesId="files.jasper-el" />
+ 
+     <!-- Re-packaged Apache Commons DBCP 2-->
+-    <jarIt jarfile="${tomcat-dbcp.jar}"
++<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
+       filesDir="${tomcat.classes}"
+-      filesId="files.tomcat-dbcp" />
++      filesId="files.tomcat-dbcp" /> -->
+ 
+     <!-- i18n JARs -->
+     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
+@@ -1030,9 +1035,9 @@
  
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
@@ -45,7 +57,7 @@ index 6fbb321..4fb4b42 100644
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -1087,7 +1092,7 @@
+@@ -1092,7 +1097,7 @@
          <exclude name="${jdt.jar.filename}"/>
        </fileset>
      </delete>
@@ -54,7 +66,7 @@ index 6fbb321..4fb4b42 100644
  
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
-@@ -1123,7 +1128,7 @@
+@@ -1128,7 +1133,7 @@
      </javac>
    </target>
  
@@ -63,7 +75,7 @@ index 6fbb321..4fb4b42 100644
      <!-- build the jdbc-pool jar and source jar-->
      <echo message="Building Tomcat JDBC pool libraries"/>
      <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1138,7 +1143,7 @@
+@@ -1143,7 +1148,7 @@
      <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
    </target>
  
@@ -72,7 +84,7 @@ index 6fbb321..4fb4b42 100644
      <!-- build the jdbc-pool source jar-->
      <echo message="Building Tomcat JDBC pool src JAR"/>
      <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1242,9 +1247,11 @@
+@@ -1246,9 +1251,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -84,7 +96,7 @@ index 6fbb321..4fb4b42 100644
      <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
  
      <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1624,7 +1631,7 @@
+@@ -1629,7 +1636,7 @@
  
    <target name="extras-webservices-prepare"
            depends="extras-prepare"
@@ -93,15 +105,15 @@ index 6fbb321..4fb4b42 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1720,6 +1727,7 @@
+@@ -1793,6 +1800,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
  
-   <target name="javadoc" depends="dist-source"
+   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
      description="Create the Tomcat javadoc" >
 +<!--
      <javadoc packagenames="javax.servlet.*"
        excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-@@ -1784,6 +1792,7 @@
+@@ -1857,6 +1865,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -109,7 +121,7 @@ index 6fbb321..4fb4b42 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1824,9 +1833,11 @@
+@@ -1897,9 +1906,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path refid="tomcat.webservices.classpath"/>
          <path location="${ant.core.lib}"/>
        </classpath>
@@ -121,16 +133,16 @@ index 6fbb321..4fb4b42 100644
        <link href="../websocketapi"/>
        <link href="http://docs.oracle.com/javase/7/docs/api/"/>
        <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2550,7 +2561,7 @@ skip.installer property in build.properties" />
+@@ -2629,7 +2640,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile" unless="noget">
+-          description="Download components necessary to compile" >
++          description="Download components necessary to compile" unless="noget" >
  
      <!-- Download Commons Daemon -->
      <antcall target="downloadgz-2">
-@@ -2576,7 +2587,7 @@ skip.installer property in build.properties" />
+@@ -2655,7 +2666,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -139,7 +151,7 @@ index 6fbb321..4fb4b42 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2654,7 +2665,7 @@ skip.installer property in build.properties" />
+@@ -2733,7 +2744,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
@@ -148,7 +160,7 @@ index 6fbb321..4fb4b42 100644
  
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2709,13 +2720,13 @@ skip.installer property in build.properties" />
+@@ -2788,13 +2799,13 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -164,7 +176,7 @@ index 6fbb321..4fb4b42 100644
      <echo message="Testing  for ${destfile}"/>
      <available file="${destfile}" property="exist"/>
    </target>
-@@ -2837,7 +2848,7 @@ skip.installer property in build.properties" />
+@@ -2916,7 +2927,7 @@ skip.installer property in build.properties" />
      </sequential>
    </macrodef>
  
@@ -173,7 +185,7 @@ index 6fbb321..4fb4b42 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2854,7 +2865,7 @@ skip.installer property in build.properties" />
+@@ -2933,7 +2944,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -182,7 +194,7 @@ index 6fbb321..4fb4b42 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2879,7 +2890,7 @@ skip.installer property in build.properties" />
+@@ -2958,7 +2969,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -191,7 +203,7 @@ index 6fbb321..4fb4b42 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2895,7 +2906,7 @@ skip.installer property in build.properties" />
+@@ -2974,7 +2985,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -200,7 +212,7 @@ index 6fbb321..4fb4b42 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2919,7 +2930,7 @@ skip.installer property in build.properties" />
+@@ -2998,7 +3009,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -209,7 +221,7 @@ index 6fbb321..4fb4b42 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2934,7 +2945,7 @@ skip.installer property in build.properties" />
+@@ -3013,7 +3024,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -218,7 +230,7 @@ index 6fbb321..4fb4b42 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2962,7 +2973,7 @@ skip.installer property in build.properties" />
+@@ -3041,7 +3052,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -227,7 +239,7 @@ index 6fbb321..4fb4b42 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -2973,7 +2984,7 @@ skip.installer property in build.properties" />
+@@ -3052,7 +3063,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -236,7 +248,7 @@ index 6fbb321..4fb4b42 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -2984,7 +2995,7 @@ skip.installer property in build.properties" />
+@@ -3063,7 +3074,7 @@ skip.installer property in build.properties" />
  
    <target name="ide-eclipse"
            depends="download-compile, extras-webservices-prepare, download-test-compile"
diff --git a/www-servers/tomcat/files/tomcat-9.0.16-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch
index 8712be138e01..a4bcbeb949bc 100644
--- a/www-servers/tomcat/files/tomcat-9.0.16-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/build.xml b/build.xml
-index e5c5076..72231a6 100644
+index b3b299f..40bf4f8 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -742,6 +742,7 @@
+@@ -752,6 +752,7 @@
        addOSGi="true" />
  
      <!-- Servlet 4.0 Implementation JAR File -->
@@ -10,7 +10,7 @@ index e5c5076..72231a6 100644
      <jarIt jarfile="${servlet-api.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.servlet-api"
-@@ -749,21 +750,23 @@
+@@ -759,21 +760,23 @@
        notice="${tomcat.manifests}/servlet-api.jar.notice"
        license="${tomcat.manifests}/servlet-api.jar.license"
        addOSGi="true" />
@@ -37,7 +37,20 @@ index e5c5076..72231a6 100644
      <!-- WebSocket 1.1 API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
        filesDir="${tomcat.classes}"
-@@ -1114,9 +1117,9 @@
+@@ -879,10 +882,10 @@
+       addOSGi="true" />
+ 
+     <!-- Re-packaged Apache Commons DBCP 2-->
+-    <jarIt jarfile="${tomcat-dbcp.jar}"
++<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-dbcp"
+-      addOSGi="true" />
++      addOSGi="true" /> -->
+ 
+     <!-- i18n JARs -->
+     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1124,9 +1127,9 @@
  
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
@@ -49,7 +62,7 @@ index e5c5076..72231a6 100644
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -1176,7 +1179,7 @@
+@@ -1186,7 +1189,7 @@
          <exclude name="${jdt.jar.filename}"/>
        </fileset>
      </delete>
@@ -58,7 +71,7 @@ index e5c5076..72231a6 100644
  
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
-@@ -1212,7 +1215,7 @@
+@@ -1222,7 +1225,7 @@
      </javac>
    </target>
  
@@ -67,7 +80,7 @@ index e5c5076..72231a6 100644
      <!-- build the jdbc-pool jar and source jar-->
      <echo message="Building Tomcat JDBC pool libraries"/>
      <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1227,7 +1230,7 @@
+@@ -1237,7 +1240,7 @@
      <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
    </target>
  
@@ -76,7 +89,7 @@ index e5c5076..72231a6 100644
      <!-- build the jdbc-pool source jar-->
      <echo message="Building Tomcat JDBC pool src JAR"/>
      <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1330,9 +1333,11 @@
+@@ -1340,9 +1343,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -88,7 +101,7 @@ index e5c5076..72231a6 100644
      <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
  
      <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1785,11 +1790,12 @@
+@@ -1849,11 +1854,12 @@
      </copy>
  
      <!-- Source bundles for native components -->
@@ -102,7 +115,7 @@ index e5c5076..72231a6 100644
      <!-- platform README files -->
      <echo append="false" file="${tomcat.dist}/bin/x64/README">
  Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1799,6 +1805,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1863,6 +1869,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
  
    <target name="javadoc" depends="dist-source"
      description="Create the Tomcat javadoc" >
@@ -110,7 +123,7 @@ index e5c5076..72231a6 100644
      <javadoc packagenames="javax.servlet.*"
        excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-@@ -1860,6 +1867,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1924,6 +1931,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -118,7 +131,7 @@ index e5c5076..72231a6 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1898,9 +1906,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1962,9 +1970,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path refid="compile.classpath"/>
          <path location="${ant.core.lib}"/>
        </classpath>
@@ -130,16 +143,16 @@ index e5c5076..72231a6 100644
        <link href="../websocketapi"/>
        <link href="http://docs.oracle.com/javase/8/docs/api/"/>
        <link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2616,7 +2626,7 @@ skip.installer property in build.properties" />
+@@ -2686,7 +2696,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile" unless="noget">
+-          description="Download components necessary to compile" >
++          description="Download components necessary to compile" unless="noget" >
  
      <!-- Download Commons Daemon -->
      <antcall target="downloadgz-2">
-@@ -2671,7 +2681,7 @@ skip.installer property in build.properties" />
+@@ -2741,7 +2751,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -148,7 +161,7 @@ index e5c5076..72231a6 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2749,7 +2759,7 @@ skip.installer property in build.properties" />
+@@ -2819,7 +2829,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
@@ -157,7 +170,7 @@ index e5c5076..72231a6 100644
  
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2804,13 +2814,13 @@ skip.installer property in build.properties" />
+@@ -2874,13 +2884,13 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -173,7 +186,7 @@ index e5c5076..72231a6 100644
      <echo message="Testing  for ${destfile}"/>
      <available file="${destfile}" property="exist"/>
    </target>
-@@ -2932,7 +2942,7 @@ skip.installer property in build.properties" />
+@@ -3002,7 +3012,7 @@ skip.installer property in build.properties" />
      </sequential>
    </macrodef>
  
@@ -182,7 +195,7 @@ index e5c5076..72231a6 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2949,7 +2959,7 @@ skip.installer property in build.properties" />
+@@ -3019,7 +3029,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -191,7 +204,7 @@ index e5c5076..72231a6 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2974,7 +2984,7 @@ skip.installer property in build.properties" />
+@@ -3044,7 +3054,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -200,7 +213,7 @@ index e5c5076..72231a6 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2990,7 +3000,7 @@ skip.installer property in build.properties" />
+@@ -3060,7 +3070,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -209,7 +222,7 @@ index e5c5076..72231a6 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3014,7 +3024,7 @@ skip.installer property in build.properties" />
+@@ -3084,7 +3094,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -218,7 +231,7 @@ index e5c5076..72231a6 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3029,7 +3039,7 @@ skip.installer property in build.properties" />
+@@ -3099,7 +3109,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -227,7 +240,7 @@ index e5c5076..72231a6 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3057,7 +3067,7 @@ skip.installer property in build.properties" />
+@@ -3127,7 +3137,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -236,7 +249,7 @@ index e5c5076..72231a6 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -3068,7 +3078,7 @@ skip.installer property in build.properties" />
+@@ -3138,7 +3148,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -245,7 +258,7 @@ index e5c5076..72231a6 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -3079,7 +3089,7 @@ skip.installer property in build.properties" />
+@@ -3149,7 +3159,7 @@ skip.installer property in build.properties" />
  
    <target name="ide-eclipse"
            depends="download-compile, download-test-compile"
@@ -254,7 +267,7 @@ index e5c5076..72231a6 100644
  
      <!-- Copy the sample project files into the root directory -->
      <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3097,7 +3107,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
+@@ -3167,7 +3177,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
  
    <target name="ide-intellij"
            depends="download-compile, download-test-compile"
diff --git a/www-servers/tomcat/tomcat-7.0.93.ebuild b/www-servers/tomcat/tomcat-7.0.93.ebuild
index 1df725b2158c..9acd6b92a2e4 100644
--- a/www-servers/tomcat/tomcat-7.0.93.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.93.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps websockets"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-7.0.92.ebuild b/www-servers/tomcat/tomcat-7.0.94.ebuild
index 9acd6b92a2e4..b94ae21e1ef3 100644
--- a/www-servers/tomcat/tomcat-7.0.92.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.94.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="7"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps websockets"
 
 RESTRICT="test" # can we run them on a production system?
@@ -48,7 +48,7 @@ src_prepare() {
 
 	java-pkg_clean
 
-	eapply "${FILESDIR}/${PN}-7.0.84-build.xml.patch"
+	eapply "${FILESDIR}/${P}-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-8.5.39.ebuild b/www-servers/tomcat/tomcat-8.5.39.ebuild
index 3d8ad6af6922..eaca4fb8c6ac 100644
--- a/www-servers/tomcat/tomcat-8.5.39.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.39.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.38.ebuild b/www-servers/tomcat/tomcat-8.5.40.ebuild
index f4aff4478a60..3d8ad6af6922 100644
--- a/www-servers/tomcat/tomcat-8.5.38.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.40.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
@@ -53,7 +53,7 @@ src_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${PN}-8.5.37-build.xml.patch"
+	eapply "${FILESDIR}/${P}-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-9.0.16.ebuild b/www-servers/tomcat/tomcat-9.0.19.ebuild
index e6cda13656f0..e6cda13656f0 100644
--- a/www-servers/tomcat/tomcat-9.0.16.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.19.ebuild
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index c3bd6af2471a..e2bfedcd860f 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -6,9 +6,9 @@ DIST tornado-4.5.1.tar.gz 483225 BLAKE2B 261a5da8a7cc43b11b8504162a030fdad9c3c14
 DIST tornado-4.5.3.tar.gz 484221 BLAKE2B 7b3682fa85a7f6ad32351d40993516a3e397b7b0a5de9d807bcd8b2b21325a6170f3670cb13e12aa208b6590313cf165ddf40537dba1fee61fa9d71954265a66 SHA512 c17dd7a3b541c26950d27c8a399ae4fdff1d99d16ff0c5de9871fe2de4c0f797c96712b23b5ed5efdaee06bb251f7def114c83fe6f7f37f344cdac9996d14448
 DIST tornado-5.0.2.tar.gz 506544 BLAKE2B 616298761f5e0cdcacfa96c3a14efaf2cc1d7579d582dc8b2fae2a3a3e45405804aa2a1409665a9af38d2f415908b373c1c34e4ff5868f989bb1bd29fe81a569 SHA512 fbd360df34fe29ed3e5f406992923e2af2815f93446fb9d9810f7575fe06300a2cb15c3f36bd93150284ba297772f94c94a4227acca2dc65c94cf7d100cb5974
 DIST tornado-5.1.tar.gz 516359 BLAKE2B 1ff6e6ced124b7b0df0e476eac555de20e4ac86f01369ee484e33bf5d749c269a81dd11a0b4c8b3169db6fd9f7a1b4e3c3551d46474c53a1fed8e342660c57f9 SHA512 8f45e5bbee5453a4225f05840a9fa80dd574c5a9cac9ec4d787f11c3f86f347c66d39c984a8bbe96dbb41f599e25102f1a3dad1c55b479bebee7d856aaca764a
-EBUILD tornado-4.4.2-r1.ebuild 1855 BLAKE2B 59870501490ba6aa7478064d9f6507d0077b9db69fb30ba565edd2faecea45c8d7f7b318dd0de91eb3fab86bd645c0ea791af8886afba3be7ee55bb4ad29fd1c SHA512 a7625c986a4f116f66938141ee16c4578628e69243891a7bf395a2fc64bd7cc8ea47ad46621fe8287c6d1860ee0585a22b40ea8d63fda882ac011e9d388f8480
-EBUILD tornado-4.5.1.ebuild 1868 BLAKE2B 722e23f6ecdb3d110a61cb074933b2b61b080bc21948fd42fae4099275f8c4114aeed18c6635aa1c569581c2364105c86278f31769dba27dd9d826aa95c29964 SHA512 a844f5b5b52ae13ada511f50c3979b1a96683bb81f52c93d71d89d38da98817e677bccc41113941d996594622e4dd312254a93c636c77d951f31c5b900312447
-EBUILD tornado-4.5.3.ebuild 1855 BLAKE2B feeb9a017c0394cb4688a777507551aad6e7ea7c4965fd0639839ec01e2465c56b8194cdd7ace3e90aa584fce69598a9ba3032ff6ede330b9606b3f1f123e402 SHA512 702b867c92b81badd416ab731d781114ddf0bd88c03d67961338d7cf7be4e8a281aa0954a70cc1a176305c127858ca6565751df7e25beeecd9976b3040d6d90c
-EBUILD tornado-5.0.2.ebuild 1791 BLAKE2B c5be3458eac03a96dd4bdd248c6548aebd0eb03e2363c2cf2de79311e8f51d290ae320f97a7b9eda1e42fd21ea97b3e58b362883289e87bd6b3797bee1730b04 SHA512 7541ae290aba4adc0e32ed771ac3a8567a091a6dc000d1a76d829d895ba3fb2e793b2f0f084e975618c9ac0495264ce96b474cfbe8a1e2a6a5ebd9860c056ad1
-EBUILD tornado-5.1.ebuild 1614 BLAKE2B b53658c6e6e1ff32c3e24ffcec98fc10f77f9fd13f6715cfd16e9335884bca70ce78fa072ae8b040cfd9e1f8d9b64fee8e91720bce67289cae743cdfb5e4df30 SHA512 f4cdb0adcbb69e364e9dee6baccad15ff19cae62233293cf82706b15fe5ee35b94dc62abfa5447a76658d84e768e7f60840ede1b1ccd989a8deb3b18ef3dd821
+EBUILD tornado-4.4.2-r1.ebuild 1842 BLAKE2B 2768d755118cff87118e220bbb3ceb42eee3ea3fef0d1673e297eb2b169b8eccc10aa383900d01cc504d333ed2b53ffcffae41962085c610944178ae2bc36c09 SHA512 7d884601d236d35a39c900b2f11eaa3b3563ecedc40733459423b17b8382e3d67a81fd41c974c2c4eef0afb61b23e6d85a02d7fd4c6906b90282a34e56ea85a6
+EBUILD tornado-4.5.1.ebuild 1852 BLAKE2B 974e164a7794e7ad8d30447bcb0ab8aa6c9510e1c86f546b1e06327f83dc38c6af90400f5cc2cad9007475b9a5e7557bc49a1a5c21f823e72c4279506c3966c8 SHA512 0e90bf0b2e8d7216a7714c14b51e9100c6f8e79e18d7718e4f97c05d211df976166614b0d1546493c2c08d7bf6c2ab8f10015f891af05afe754d97c0646da303
+EBUILD tornado-4.5.3.ebuild 1842 BLAKE2B 6c6b4db4d90d2a74dd4e52a35c149b93d36abe2b3cc84e83b4f18fc7b18d4963f7a25b0e7d9040b09496a8fbe82d6a02d3d4f87a13c6e669fb91e1c427149202 SHA512 dbf0efd7fb45d1a4416913a77e8dc2b3792ba0fff6b62fa494eebbd2481fb75c4946c95b93097d6f069ca86f3bdae8b7ebee971c2d503682f3ee5926f8959eff
+EBUILD tornado-5.0.2.ebuild 1787 BLAKE2B 1c0fdb179e0dbe19c5e617038ff526365cd2ad2546a306024c5492e43f335bad4807aa923f6e0794143ce7724acec5d83ff5c5b4686f133270719e7d38af802f SHA512 bb4ef16a3d17f379b71fc2781984d762dd6e75874c8feeab18e62e7282f8625f8b8fd52f92f4127031f557003fce5806d19875b51440ac437e0d3536405c4720
+EBUILD tornado-5.1.ebuild 1610 BLAKE2B 4ce7ae2faed9e11335c0c2998b651c49b5becf07ffebbce3623b5864fa4d73ab4e05f84bfb7efdcc18c6385f363955ea1b87a3ff87c17d1b07aabbc8b8c5e522 SHA512 7c7ba94be1c273df596ea3068400301efc6f4bc9eb14a0badc6393091fb7560d03c9cc59f97d52ee037760084f40b7d8d241796c782d89ee46a472ca62216a4b
 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 50cfb25a3464..3d603a22ae1d 100644
--- a/www-servers/tornado/tornado-4.4.2-r1.ebuild
+++ b/www-servers/tornado/tornado-4.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -20,7 +20,7 @@ IUSE="doc examples test"
 CDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
 	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4')
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7')
 	|| (
 		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 		(	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7')
@@ -63,6 +63,6 @@ python_install_all() {
 		insinto /usr/share/doc/${PF}/examples
 		doins -r demos/.
 		docompress -x /usr/share/doc/${PF}/examples
-fi
+	fi
 	distutils-r1_python_install_all
 }
diff --git a/www-servers/tornado/tornado-4.5.1.ebuild b/www-servers/tornado/tornado-4.5.1.ebuild
index 455bb5303a0c..43da253ccc07 100644
--- a/www-servers/tornado/tornado-4.5.1.ebuild
+++ b/www-servers/tornado/tornado-4.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -20,7 +20,7 @@ IUSE="doc examples test"
 CDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
 	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4')
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7')
 	|| (
 		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 		(	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7')
@@ -63,6 +63,6 @@ python_install_all() {
 		insinto /usr/share/doc/${PF}/examples
 		doins -r demos/.
 		docompress -x /usr/share/doc/${PF}/examples
-fi
+	fi
 	distutils-r1_python_install_all
 }
diff --git a/www-servers/tornado/tornado-4.5.3.ebuild b/www-servers/tornado/tornado-4.5.3.ebuild
index 3d8f54a9c464..b7cc6d4b6ee0 100644
--- a/www-servers/tornado/tornado-4.5.3.ebuild
+++ b/www-servers/tornado/tornado-4.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -20,7 +20,7 @@ IUSE="doc examples test"
 CDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
 	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4')
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7')
 	|| (
 		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 		(	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7')
@@ -63,6 +63,6 @@ python_install_all() {
 		insinto /usr/share/doc/${PF}/examples
 		doins -r demos/.
 		docompress -x /usr/share/doc/${PF}/examples
-fi
+	fi
 	distutils-r1_python_install_all
 }
diff --git a/www-servers/tornado/tornado-5.0.2.ebuild b/www-servers/tornado/tornado-5.0.2.ebuild
index 8eec00be8a45..069b29f2dc0a 100644
--- a/www-servers/tornado/tornado-5.0.2.ebuild
+++ b/www-servers/tornado/tornado-5.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -62,6 +62,6 @@ python_install_all() {
 		insinto /usr/share/doc/${PF}/examples
 		doins -r demos/.
 		docompress -x /usr/share/doc/${PF}/examples
-fi
+	fi
 	distutils-r1_python_install_all
 }
diff --git a/www-servers/tornado/tornado-5.1.ebuild b/www-servers/tornado/tornado-5.1.ebuild
index 728122716d35..86ab2f2853ad 100644
--- a/www-servers/tornado/tornado-5.1.ebuild
+++ b/www-servers/tornado/tornado-5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -57,6 +57,6 @@ python_install_all() {
 		insinto /usr/share/doc/${PF}/examples
 		doins -r demos/.
 		docompress -x /usr/share/doc/${PF}/examples
-fi
+	fi
 	distutils-r1_python_install_all
 }
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index b1fccc9c06b5..181868f6ca71 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -6,8 +6,8 @@ AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886
 DIST uwsgi-2.0.17.1.tar.gz 800156 BLAKE2B a8697263e6e7689c0062a06a9fdb1101a2df72e0ac9122b5f8a0acc78bbdbdeaa96faa1c8870b9c3a43e2e1fb5fc835e708e1bc3d0171ae746467b4734dc299d SHA512 10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b
 DIST uwsgi-2.0.17.tar.gz 798642 BLAKE2B 86efb2103efaeedb37ebb00de4c01477162d119ae3dea0dc0696385216e30ff2c74eb48576f86eb181b8ada4b9eaa63b0aa761e966e3301597633d33b81142e1 SHA512 639427fbb89a1c2610c1cafb6ff009398a3c0a8e27c3de3f00829428271ba97b64b1253368dd6150912cf44441052be2a63cbe81613bbe964be27ee2e570d2b2
 DIST uwsgi-2.0.18.tar.gz 801555 BLAKE2B d8008e751fd699474a1b7d6276c10b3d2f1ebd0ca325e45bfb3b13f81e88de20e4e7389cd6aa9c8b3daa964d9b11524ee71e93717ed9762bf021471f6a2c09fa SHA512 6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61
-EBUILD uwsgi-2.0.17.1-r1.ebuild 12221 BLAKE2B 07cb023a9449db1936362e0b1012a554fdeee6e97f80d24cb4656bcb241210297f8e6683565f4a1a6add8d2c5158c75d1d455cc9715c82d1fa5bbde1b53bd75c SHA512 e2b0462dcb816b73f782fb23dd32962badb906af646e2f842b16249de39eadc475d201e9ea348021c62d75c9b27ab73ff200228ffc5777ee3b7deda9e49ba3d2
-EBUILD uwsgi-2.0.17.1.ebuild 12702 BLAKE2B 71622151c2900cdf41aadd8e141e6895e39142be4d268cf193b2d8227ded7e40cbd034b4db1861b7b4b711f16de724b9e09c64289242636b7a21eb8cc2eab59a SHA512 7579a86a6fdd74532b25a18946faef4b977f8073a459d74de6f07799810e8cc3b318caec594889e87728697465753a12c2c999a3f0415af5c94eb5157f2938cf
-EBUILD uwsgi-2.0.17.ebuild 12787 BLAKE2B 6cfe5bba7c593158a1f7b40fe1d43a33c5721f87db69c3740f3b204fadb26449292328202f1537b5c19e249bd20fed01a68f5344b7da4f2199e3502eb3ae264e SHA512 ebf3ba7efcc3ab85a0d392a286aba4a7dea3d1109e50f59806849e2420f7c0ceea2c55db0547fe1b678c8a751ddaa4c3b8cc491d4b6622bf8f011d6a9a66545a
-EBUILD uwsgi-2.0.18.ebuild 12221 BLAKE2B 07cb023a9449db1936362e0b1012a554fdeee6e97f80d24cb4656bcb241210297f8e6683565f4a1a6add8d2c5158c75d1d455cc9715c82d1fa5bbde1b53bd75c SHA512 e2b0462dcb816b73f782fb23dd32962badb906af646e2f842b16249de39eadc475d201e9ea348021c62d75c9b27ab73ff200228ffc5777ee3b7deda9e49ba3d2
+EBUILD uwsgi-2.0.17.1-r1.ebuild 12219 BLAKE2B 54a878fee8ed703fcd4da1a1db7fc2c65f24ffe18b6f2f43e43cfa0d8e73a61b576e078e330d9ab616ac1c5a2c14edc250025590263fe7237acf981a326cd0cc SHA512 3ec0ed93395ce191c474ac936ae2ca7a9761dffff326429c541b01326f16485af33749900deeeb6ff78f4efdf0d3dbb3b140ebf3bf5b55e1c8d74d8a59748663
+EBUILD uwsgi-2.0.17.1.ebuild 12700 BLAKE2B 1890022364f0e8471a32ab86737bf11ea761aa9a30de72b7546d1a6f6ff00718027bd7f47c6d3f08b7871a1751010cfe6fbf74ee0978e77887d875f51d42bcd5 SHA512 6c43a1e33e6832be0dffd09aed4e6d94cf418142e67e7dc35eef7366b5443ff371661681ea484bda29828260106be2a46842d3aaafb32322a926f75a06111f54
+EBUILD uwsgi-2.0.17.ebuild 12785 BLAKE2B d8c52dac79e9341b9ed4a0f966625f6555861ab8e79630df26c8685233c5f65b9aef6a64b09f515921a1b3e9924d03d413cf7af04d8b2f79c103b918a644c3eb SHA512 1dcdbddc01e5236af54c96b739800dcdc8fa6868f5d82616e5359d57fded6837d41526e48d2cf613d0de65f9a51262d35970948315dd8f17792f62e757dbe1d4
+EBUILD uwsgi-2.0.18.ebuild 12237 BLAKE2B 4554fbf4b7d08bf04dc19f12c06b105179163b04634929cd8da6652bc0698d1fd192a09e18f07fe81e86936a67e181230f4f0833641c6c0d5deffe2fe661e009 SHA512 5c1f52e0c0985a2edb05efde1aa16fb36d980cd01d8f3059d10528cb38024fb144990203bc0c8310de2540d9a8af8995d7b142d54af902da72aed695ed4ab413
 MISC metadata.xml 1508 BLAKE2B 22125c58eed49b27100421613726f650e78bba0fb712eea2a3e122862101f34803636c12fa98cdb7483dbfad00e51cba6419ee4a93d43e5116530cb43e6778b2 SHA512 4a925a03e1ff9fedf6d7d4ad9673fdf12caaf6d9b2c4ce5cce01b964ae50294451b6d2f820121dfbe8a9288d0ae62180acc243a07ab1b365e10fef65adff2a02
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
index 865383e7054c..f3a4990dac34 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
index 68b9e8da4660..29267552f1da 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
index 13867675ceb2..07c27595255d 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
 PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
index 865383e7054c..badd0a9e1c3c 100644
--- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
@@ -116,6 +116,7 @@ CDEPEND="
 	mono? ( dev-lang/mono:= )
 	perl? ( dev-lang/perl:= )
 	php? (
+		net-libs/libnsl
 		php_targets_php5-6? ( dev-lang/php:5.6[embed] )
 		php_targets_php7-1? ( dev-lang/php:7.1[embed] )
 		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index dddce685897c..9d16d629cea6 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -15,11 +15,13 @@ DIST varnish-5.2.1.tgz 2827676 BLAKE2B 6f50a55a9b16d137eaec59aea98a0179b808bb67f
 DIST varnish-6.0.1.tgz 3065822 BLAKE2B b99d0d50444872353367007f2ee97c5d5f0e60031ece7b07f8b2c3a7a84b31be88fe2b850304b1f2e47a35f35c2c41f43888bee1d1874721a72ad078acfddfa1 SHA512 057cb69ae6a4d980401effb7561d3a9b537216d8626fdf4e7bcc75971958517f51b6bd7f7af86c11bc92a2e77876831c577736dfcd11447ad0128f222c5ad138
 DIST varnish-6.1.0.tgz 3137149 BLAKE2B 8db1fb3460a25763bd28c92fa8b9181711b497a7d1cadfbbf19794c9df3e64e60aefac87032892a02eed3ff380686f047fb67d8c7f70b602e65c63b69224e674 SHA512 48584fc2d938cc0759fa5d795992a0c6d5d9fb49db5f3063dca8d3d88c6282dac971ed268edc07bec95b4f25e26562089b1b84abdd26099e12be9ea66557716d
 DIST varnish-6.1.1.tgz 3135623 BLAKE2B c39904fe2745ab601e7c1f6d85850fe1a83c19e8d80e8af5a60ac5f134817b26b3274ba62c78c3839fd7e6c2da3e58b6c211a7452d37dd864f0f658d500a6138 SHA512 67e546e5fee2d10ec038d7b011a3f61a0a056ce8a4813556526c8fce23bb1fe4e29952a773e6cbc2433c0228971a5e90693d5ce61f6cb5f2242e055e0ce13d18
-EBUILD varnish-4.0.5.ebuild 2050 BLAKE2B 22e332f95d1138577e37deebee8e0e77f11bb1ead55f672cd67db4765b3d3e8ae5854b940d59a652ec6619c56a5e3a379f425c39780685c0e8fa7a54869a2141 SHA512 b1520598b99b94f29afd63305470e06fc9a8ef4f6d816cc56390b73fb980cbffcd62488e644e4eaa56991445f153ff39661a04726babbb89e574bca3f891a796
-EBUILD varnish-4.1.8.ebuild 2208 BLAKE2B 6a0509906c324ead94dc1706dfcb22156d04c2390615acd541277d90c25fe2e0bf4e96d1210d03f8f886711b67b2deb6fa635d14ef4fe249ab7b71bcf350fdf3 SHA512 166fe6d8e1d89fbf4064f2d6995b00156bbca7920b1131a6fbbde45605d26fdfaf54dadff626ed72546fdfd66ccdec20efb31a526c2ff3336261da2f31d6b84e
-EBUILD varnish-5.1.3.ebuild 2213 BLAKE2B 33a0b63f322d721c352748ac54b9e78c3df4b1916950bf698960bab57cfabfd39efa1c7a5ca4ea945f77fbebd943cfdf2579eb92e21a98bf24690a8a537b14b6 SHA512 290570d1a668f5ed0a4acda504313d5264c9d0dc7dc2d49a237b4bfa16c5c5b31749c48fa20e79fc06cb54a5ad100231da6fef00cdb75362a926f123ff17320f
-EBUILD varnish-5.2.1.ebuild 2267 BLAKE2B 6b6886e00415115a3649eee695bbbd4bbc2a7ab8590edf9cd7951a50cdf6f6e32bd3384514bd3330086dfab18dfc5a39c79db36f40cec76a9c66cdbc4e26ce3b SHA512 d3dec4d67b7e22981ecb643cefdb8729e51cb7545178eee996d96e15875e6373cf9b2956e29b3acc888b5ec6db430164096f0ce9e2bb24b295c01435870d27a3
-EBUILD varnish-6.0.1.ebuild 2239 BLAKE2B 46435007dcaff830ff0abb1aff3c3af1ed8913e759fb3e72ca9875f8c9334f9a617f73fe9342070d1f148308623c347b72a0c24e0962f863c278d55673825666 SHA512 6c2a1d74129726af32015a6c92bf63d253b66b67e9822b308f1b7148979848c99cdfba4ac0c7240a8279f2b255d719895408a447f2e682180ace1c3d7208d1d3
-EBUILD varnish-6.1.0.ebuild 2260 BLAKE2B 317004952169a6c652e229f606e6616c3b12489df02a71a184c61bf5470a4c03d410ec592e845ef9f5ddbecb2b0759ece1992af071b5b30afc03ed9e11945d78 SHA512 a1a936029d0120ba00b45eccdb95eba69c8c48d184ec95f3c03e61715b1bddcf7226aa0f646c4a9caaee491c7b2b29407bd2a8dd216bad3731965c210cb84bee
-EBUILD varnish-6.1.1.ebuild 2260 BLAKE2B 317004952169a6c652e229f606e6616c3b12489df02a71a184c61bf5470a4c03d410ec592e845ef9f5ddbecb2b0759ece1992af071b5b30afc03ed9e11945d78 SHA512 a1a936029d0120ba00b45eccdb95eba69c8c48d184ec95f3c03e61715b1bddcf7226aa0f646c4a9caaee491c7b2b29407bd2a8dd216bad3731965c210cb84bee
+DIST varnish-6.2.0.tgz 3207400 BLAKE2B e35a3621fd55eb61da38f39554027575f646d24987c7fe64938da6da40e751bfd87019629d8b475c24b748d80dec213ae4b4bb6d762dcd42dff6fb7785ac8c47 SHA512 fc447c27fbe31ef96c7e5666cd83007467619d012c7587c252da6fc8dc00e9534c790f1558c568f610ef9a61f5a0a61dc367e3723d905dece525dc27ee236376
+EBUILD varnish-4.0.5.ebuild 2041 BLAKE2B 40849c2e1e4eb7de54434f4afad53c3118e06a8fa806865791477cff77d4cc5971fa0e94d6595ce09c1b4a3d1e06b6b53068601ad29203298356213743af5920 SHA512 d15b5dc8636de0cb89259fd79a660add4eb0b82f7fb0e4136f8d0a1e34ccef23984dba06a3878e812eaf9ff983e8244a592f4f7353c944cf129cd8f9daa05b77
+EBUILD varnish-4.1.8.ebuild 2199 BLAKE2B 68cc745ec689cd900457c378584e147e8c6aacf3e723aabd38587180980ff444a72809f0ad1deffe1806fd07c3a250488f16e508b46e23de91b83469df0f4ea7 SHA512 ddc15dae39fac7da38ac6a4be7be4cdb7dfaa843e536deacab9f73c318d900048ecc3169901f811a0cb6d7dbbf92d7e032c393ded226cf6871236eb31a669f57
+EBUILD varnish-5.1.3.ebuild 2206 BLAKE2B cb71ffa0d53ffc0ff1f66e87777c56a08a6fd5378eefaa5e0795df73311a427d34ea59bfaf521219826d5efedb5a42a766cd8a872a417235a484caff22bfae95 SHA512 b568fdea0212c81843526da83f1d6a3d4421248c9be4133e488a23ae1f72efd345bae0c7a7d8c668b152f1581b86a05dfeb67238c6b36e47da0a2d38185bb97d
+EBUILD varnish-5.2.1.ebuild 2260 BLAKE2B aa4eacd573f0a01eb4c6eedc2575b02eb88c1e885bef05334f2b8a92705049d8915d9188f6d97c89dd73788d177b15f6709dc9c6210ce1e416841272f444a3fa SHA512 9ea6a69121847a78a7e12fd4d7b6bb77c8e4e4b36f86522f39d26bea148e5e42ef392733f90edaba3e40a67b7355237b6ef9be11763f7b77355d2ca2f91d7a72
+EBUILD varnish-6.0.1.ebuild 2235 BLAKE2B e192db3f8f4be308b8f96c822d74de92d868ea247b0e3b81bc898afe5e73c1cda66059ebf34307af097c10ea765251bd9b8ac18ed7f208e979afcd0a0f91083d SHA512 5c8fc13763369355474e2349e703fd5bd187fae06c4c7dfa081c0308cae8400c365e3110421817ea5bd0663f9cd899db3dd952807ec9fc9929aa4928686f6855
+EBUILD varnish-6.1.0.ebuild 2256 BLAKE2B b5fcedc8b9fb11306a92caafb619e5e8c5cf43f003d83951baae34578fe76f2d53f3fca7a6da4a352a857dc3258a9cadd0eb5391b5f14de763b3797d47320bcb SHA512 3aaecfbcfd263a21e7a23fac991431800454069c04d13c4bf88bc1490cdc2b88fc7f60a700f0fd218fcce2f4838c0f55ea0fc040ee6b9b3161ff9f81a453b83a
+EBUILD varnish-6.1.1.ebuild 2254 BLAKE2B 70e6a4efe262d28843bd4b6490c7ddea0448da78407da2c185c01e01451f8cf2eb88bf1a406539a78dc565a1b5ad7a0978e167ec743c8e2bc4dfab150b8d5f67 SHA512 b902aedc91d5c7b7330b9f2a17443348cfef9fa02502f7de7de6a861aa0741a75ba4e61224165a7a36d9c7bbc067f647a7457d631260fe2919b1df0f52987eea
+EBUILD varnish-6.2.0.ebuild 2256 BLAKE2B e072b3e3bd71e169d18c1da30c0b9b4775507ed20e6702d70e2152d1424098e086e2177e48186358b84e67ee24b265f06f15c41d26d46746f04831e769c6b531 SHA512 793a923d4ea3086433d7d6c3a830c85e1ac36d10a4e09f132ceb701735a115954518f4467c2292492df0d6ccd7fff675efa98153c9f0d3bfbef0669e67c2c6fd
 MISC metadata.xml 1154 BLAKE2B eef29e16772e06a4b08bb7c2de3c02570a698eafe1eb9f3d1d6708cbf4ea3ef2644642b3040ebea108477e331aff164e4e540dc7f5620f15643b385d1523fd7f SHA512 a429d2e7604fb1e1f1d3ef48c13ab2151f7e2adab6a81021f473d7b56bdc9fc8d7700370125908b0278c2b0621afb3cccb73c4f3284b288cbceac05294e70f99
diff --git a/www-servers/varnish/varnish-4.0.5.ebuild b/www-servers/varnish/varnish-4.0.5.ebuild
index dd9c1ab25220..649885e3f55e 100644
--- a/www-servers/varnish/varnish-4.0.5.ebuild
+++ b/www-servers/varnish/varnish-4.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python2_7 pypy )
 
 inherit user autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-4.1.8.ebuild b/www-servers/varnish/varnish-4.1.8.ebuild
index a2b684287b9d..69944b3e71f0 100644
--- a/www-servers/varnish/varnish-4.1.8.ebuild
+++ b/www-servers/varnish/varnish-4.1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python2_7 pypy )
 
 inherit user autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-5.1.3.ebuild b/www-servers/varnish/varnish-5.1.3.ebuild
index c7269e2396f9..60dea7e21c54 100644
--- a/www-servers/varnish/varnish-5.1.3.ebuild
+++ b/www-servers/varnish/varnish-5.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit user autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-5.2.1.ebuild b/www-servers/varnish/varnish-5.2.1.ebuild
index 5b3698dea93b..1307df6c2053 100644
--- a/www-servers/varnish/varnish-5.2.1.ebuild
+++ b/www-servers/varnish/varnish-5.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit user autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-6.0.1.ebuild b/www-servers/varnish/varnish-6.0.1.ebuild
index 85face76d494..6c31874944de 100644
--- a/www-servers/varnish/varnish-6.0.1.ebuild
+++ b/www-servers/varnish/varnish-6.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit user autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-6.1.0.ebuild b/www-servers/varnish/varnish-6.1.0.ebuild
index af7e42b863da..cbc508b46c07 100644
--- a/www-servers/varnish/varnish-6.1.0.ebuild
+++ b/www-servers/varnish/varnish-6.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit user autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-6.1.1.ebuild b/www-servers/varnish/varnish-6.1.1.ebuild
index af7e42b863da..94d3b6a44086 100644
--- a/www-servers/varnish/varnish-6.1.1.ebuild
+++ b/www-servers/varnish/varnish-6.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit user autotools systemd python-r1
 
@@ -13,7 +13,7 @@ SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0/2"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
 IUSE="jemalloc jit static-libs"
 
 CDEPEND="
diff --git a/www-servers/varnish/varnish-6.2.0.ebuild b/www-servers/varnish/varnish-6.2.0.ebuild
new file mode 100644
index 000000000000..fe7cfa24cf56
--- /dev/null
+++ b/www-servers/varnish/varnish-6.2.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} pypy )
+
+inherit user autotools systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="https://varnish-cache.org/"
+SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+	sys-libs/readline:0=
+	dev-libs/libpcre[jit?]
+	jemalloc? ( dev-libs/jemalloc )
+	sys-libs/ncurses:0="
+
+#varnish compiles stuff at run time
+RDEPEND="
+	${PYTHON_DEPS}
+	${CDEPEND}
+	sys-devel/gcc"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	dev-python/sphinx
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+pkg_setup() {
+	ebegin "Creating varnish user and group"
+	enewgroup varnish
+	enewuser varnish -1 -1 /var/lib/varnish varnish
+	eend $?
+}
+
+src_prepare() {
+	# Remove -Werror bug #528354
+	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
+
+	# Upstream doesn't put varnish.m4 in the m4/ directory
+	# We link because the Makefiles look for the file in
+	# the original location
+	ln -sf ../varnish.m4 m4/varnish.m4
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable jit pcre-jit ) \
+		$(use_with jemalloc)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
+	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+	diropts -m750
+
+	keepdir /var/lib/varnish
+	keepdir /var/log/varnish
+
+	systemd_dounit "${FILESDIR}/${PN}d.service"
+
+	insinto /etc/varnish/
+	doins lib/libvmod_std/vmod.vcc
+	doins etc/example.vcl
+
+	dodoc README.rst
+	dodoc doc/changes.rst
+
+	fowners root:varnish /etc/varnish/
+	fowners varnish:varnish /var/lib/varnish/
+	fperms 0750 /var/lib/varnish/ /etc/varnish/
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /www-servers
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)