gentoo resync : 10.02.2020

20 files changed, 365 insertions, 375 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e68052baab27..4434d8aac3da 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index b17db621db1a..5b67d9d6a62d 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -9,7 +9,8 @@ AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469a
 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
 DIST lighttpd-1.4.53.tar.xz 732160 BLAKE2B 75848ab259226fc77b232dfb365c6c656e4605055fb5beba1aea60f54f01cb76c3260ca97e59110dc3dd3d1ba7cb3f2fad646f91f37baee69a8cdbaefcf125a4 SHA512 bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76
 DIST lighttpd-1.4.54.tar.xz 763248 BLAKE2B 0425dde326dc514a55790256ab7f3e6c704417fe2ac01c49d109d5f463fb41605140c0773dc3988bd27e1dbee316c5fc96231c9c8699ec40db3acf2c54ec077d SHA512 aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37
-EBUILD lighttpd-1.4.53.ebuild 6352 BLAKE2B 584affd7be01f2c1f595a8cc932fb4bee89d7add8412e653a17a7357b5ec0872ae2c7e57d20e1c6b8dda36c6111b91f74229d8dd920fe6ca897f341a47e3d140 SHA512 eec578b409fadefa008d3fa78768d4963874442b307b7b6422e6d8895eba3725ae41f5aeabb7fc701eaf9ecc6b02962913c8df7f8a93e9b3a1709a29129b85a5
-EBUILD lighttpd-1.4.54.ebuild 6353 BLAKE2B 35244ab51f6e93857f2611e77d262a5ed3c78e77c5f5fe8e63eae8ab7307fa55eead74a7dbaf66ee5ed35b4650dee09c52dfdd57c111d5ff5f41058a13a086bd SHA512 d0fde0f4d906f3c327501aef37e4e22e6522cce3009280c7bd18ecee1b4e7c5b0dc53f4ea24fd34afb11a1ef22d7ea7dc96f74c2bcdf1045659bea77147d37dc
-EBUILD lighttpd-9999.ebuild 5939 BLAKE2B d58f5b531433b32d8223735b4bc836cab048aa4a6c52c90060898c6f8578e6e85e7e17cfb9825ba1c6e593213d0c85ee8ed37e1b5390f71d8c6495ae6b6e74b8 SHA512 b3b4d58f4feb2486acaf0c9115997ca8012fcca4e3fd0a7abcc65e088beddef91a689a4d96f823b5b3c3ed85182b2e5f60b8dc2a925d1f757fb4feb744096053
+DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402 SHA512 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439
+EBUILD lighttpd-1.4.53.ebuild 6307 BLAKE2B b9c6407dc67c59de97d4ea75326b0a6211b09637060eddbc8b57fc9fe4d3db49a4da27c015a482757b8b9aa43828d0974cf4613846dba568eae4f974242fc74c SHA512 e0e241ca1daa6e79ff6309b3646cc548779e79f9a3073eae073914b8b6310bb13bd1d9d0b2c8417044c127e8704bd11ee9625d8167de3fa6392c91524cb725a1
+EBUILD lighttpd-1.4.54.ebuild 6308 BLAKE2B 82c072ee05bbcb396bc412ef7d836c9aee457cd02733b6ed2ad9330d567c7cce045a5d14c8738a5f73cfaa2a7b562719e95f08ddd5291bcc58fad0ca9c6451e4 SHA512 41c4eaeb1cbbbd7b5e4ef1b99d81b5a08615eeb520944fc84ef237c1fbfd23ed297f883446d85567d1f805ada30dbe8812663ab5bac372607f9e519a8023b16e
+EBUILD lighttpd-1.4.55.ebuild 6308 BLAKE2B 82c072ee05bbcb396bc412ef7d836c9aee457cd02733b6ed2ad9330d567c7cce045a5d14c8738a5f73cfaa2a7b562719e95f08ddd5291bcc58fad0ca9c6451e4 SHA512 41c4eaeb1cbbbd7b5e4ef1b99d81b5a08615eeb520944fc84ef237c1fbfd23ed297f883446d85567d1f805ada30dbe8812663ab5bac372607f9e519a8023b16e
 MISC metadata.xml 1054 BLAKE2B caf21b255e5eb1fc5300edf62d928b933540613492333abd65dc2c0ae89f5a22c18467ff4ab90b2b0582b4f1eff9bad21eeca91bca9c034377280c9ec022b1f9 SHA512 a773d9b8da2f118b148943c4f78662f26aaea5def18abc37ba39bb539fb31449beb04b8e9f1a09ce893ae07aaea2e2fabb42bcba47c5e9100db1f1ef3bf9ea82
diff --git a/www-servers/lighttpd/lighttpd-1.4.53.ebuild b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
index 2a4cc6bdf7c5..0097aa1b826d 100644
--- a/www-servers/lighttpd/lighttpd-1.4.53.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic readme.gentoo-r1 systemd user
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
@@ -46,7 +46,9 @@ COMMON_DEPEND="
 		sys-fs/e2fsprogs
 	)
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )"
+	zlib? ( >=sys-libs/zlib-1.1 )
+	acct-group/lighttpd
+	acct-user/lighttpd"
 
 DEPEND="${COMMON_DEPEND}
 	doc?  ( dev-python/docutils )
@@ -102,9 +104,6 @@ pkg_setup() {
 		ewarn "and mod_ssi."
 	fi
 
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-
 	DOC_CONTENTS="IPv6 migration guide:\n
 		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
 }
diff --git a/www-servers/lighttpd/lighttpd-1.4.54.ebuild b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
index d296fa74c41b..b8d0d13b8efa 100644
--- a/www-servers/lighttpd/lighttpd-1.4.54.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic readme.gentoo-r1 systemd user
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
@@ -46,7 +46,9 @@ COMMON_DEPEND="
 		sys-fs/e2fsprogs
 	)
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )"
+	zlib? ( >=sys-libs/zlib-1.1 )
+	acct-group/lighttpd
+	acct-user/lighttpd"
 
 DEPEND="${COMMON_DEPEND}
 	doc?  ( dev-python/docutils )
@@ -102,9 +104,6 @@ pkg_setup() {
 		ewarn "and mod_ssi."
 	fi
 
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-
 	DOC_CONTENTS="IPv6 migration guide:\n
 		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
 }
diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
index 50b9cd4b7091..b8d0d13b8efa 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
@@ -1,55 +1,63 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit autotools eutils readme.gentoo-r1 user systemd git-r3
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
 
 DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net
-		  https://github.com/lighttpd"
-EGIT_REPO_URI="https://git.lighttpd.net/lighttpd1.4.git git+ssh://git@lighttpd.net/lighttpd/lighttpd1.4.git git://git.lighttpd.net/lighttpd/lighttpd1.4.git"
+HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
+SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="kerberos? ( ssl !libressl )"
+REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
+
+BDEPEND="dev-libs/libgamin
+	virtual/pkgconfig"
 
-CDEPEND="
+COMMON_DEPEND="
 	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	libev?    ( >=dev-libs/libev-4.01 )
-	lua?      ( >=dev-lang/lua-5.1:= )
+	dbi?	( dev-db/libdbi )
+	fam?    ( virtual/fam )
+	gdbm?   ( sys-libs/gdbm )
+	geoip?	( dev-libs/geoip )
+	ldap?   ( >=net-nds/openldap-2.1.26 )
+	libev?  ( >=dev-libs/libev-4.01 )
+	lua?    ( >=dev-lang/lua-5.1:= )
 	memcached? ( dev-libs/libmemcached )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
+	mysql?  ( dev-db/mysql-connector-c:= )
+	pcre?   ( >=dev-libs/libpcre-3.1 )
 	php?      ( dev-lang/php:*[cgi] )
+	postgres? ( dev-db/postgresql:* )
 	rrdtool?  ( net-analyzer/rrdtool )
+	sasl?     ( dev-libs/cyrus-sasl )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.7:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
+	sqlite?	( dev-db/sqlite:3 )
 	webdav? (
 		dev-libs/libxml2
-		>=dev-db/sqlite-3
 		sys-fs/e2fsprogs
 	)
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? (	>=sys-libs/zlib-1.1 )"
+	zlib? ( >=sys-libs/zlib-1.1 )
+	acct-group/lighttpd
+	acct-user/lighttpd"
 
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
+DEPEND="${COMMON_DEPEND}
 	doc?  ( dev-python/docutils )
 	test? (
 		virtual/perl-Test-Harness
 		dev-libs/fcgi
 	)"
 
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-apache )
 "
 
@@ -76,7 +84,7 @@ remove_non_essential() {
 
 	# non-essential modules
 	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
+		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* || die
 
 	# allow users to keep some based on USE flags
 	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
@@ -96,19 +104,17 @@ pkg_setup() {
 		ewarn "and mod_ssi."
 	fi
 
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-
 	DOC_CONTENTS="IPv6 migration guide:\n
 		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
 }
 
 src_prepare() {
+	default
+	use memcached && append-ldflags -pthread
 	#dev-python/docutils installs rst2html.py not rst2html
 	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
 		die "sed doc/Makefile.am failed"
 	eautoreconf
-	default
 }
 
 src_configure() {
@@ -117,16 +123,21 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable mmap) \
 		$(use_with bzip2) \
+		$(use_with dbi) \
 		$(use_with fam) \
 		$(use_with gdbm) \
-		$(use_with kerberos kerberos5) \
+		$(use_with geoip ) \
+		$(use_with kerberos krb5) \
 		$(use_with ldap) \
 		$(use_with libev) \
 		$(use_with lua) \
-		$(use_with memcached memcache) \
+		$(use_with memcached) \
 		$(use_with mysql) \
 		$(use_with pcre) \
+		$(use_with postgres pgsql) \
+		$(use_with sasl) \
 		$(use_with ssl openssl) \
+		$(use_with sqlite) \
 		$(use_with webdav webdav-props) \
 		$(use_with webdav webdav-locks) \
 		$(use_with xattr attr) \
@@ -154,6 +165,8 @@ src_test() {
 src_install() {
 	default
 
+	find "${D}" -name '*.la' -delete || die
+
 	# init script stuff
 	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
 	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
@@ -189,7 +202,7 @@ src_install() {
 	fperms 0750 /var/l{ib,og}/lighttpd
 
 	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
+	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* || die
 
 	use minimal && remove_non_essential
 
@@ -200,13 +213,13 @@ src_install() {
 pkg_postinst () {
 	use ipv6 && readme.gentoo_print_elog
 
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
+	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
 		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
 		einfo "spawn-fcgi's init script configuration is now located"
 		einfo "at /etc/conf.d/spawn-fcgi."
 	fi
 
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
+	if [[ -f ${ROOT}/etc/lighttpd.conf ]] ; then
 		elog "Gentoo has a customized configuration,"
 		elog "which is now located in /etc/lighttpd.  Please migrate your"
 		elog "existing configuration."
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index e18323660704..de641ab08164 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -4,9 +4,11 @@ AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0
 DIST nginx-unit-1.12.0.tar.gz 681661 BLAKE2B 1e497172a37fdcd33d0ced5b97675bff42f4cadab2f9363316e667c90c8b4dc4b43f4b8d5cff9f547daa7e92d532550434907515134a5c958586f1822beea749 SHA512 a55a084ed6e1cd3f784bd81571772ca29ca9a0d19089c9bb74c88258d2e1ef872978219c47b6dc2610711ae1aa95ef68ddb77f45747a2eacdd9d92c6f8fee28b
 DIST nginx-unit-1.13.0.tar.gz 693159 BLAKE2B fd2e803188e66c16d5956f26e693c81273b1f3f69c9b68209f15bca6abd0e06b9fb9e03eb32ab640b8f601260b439abee1c4aa9cd03ed92fd26ab55893a6a6ab SHA512 cf33295604040963545b04f72f1a894431d4ee22a2c7b9560f18a694f110ee3bf243c90f65cfa4760a0009a5a7b132b75e1bb51439b19255e15148e8f4e9b9a7
 DIST nginx-unit-1.14.0.tar.gz 708603 BLAKE2B 482ab76a1eaef2943c0000c6dd2adf37aca285304b306e5b05d67e9cca30665269d11c1a585bd1a638d6811b8ee6370ef3cf682bebaf7165585cdaea51f3a5c8 SHA512 0cfe5364d427ff09d08c3b1b134827665f8bf70b8871f3c4506680e4c2d61249a53581122c42276b590f5eb077c398ae6a6c2fa46f24c680844b7d365f2ca66b
+DIST nginx-unit-1.15.0.tar.gz 712284 BLAKE2B 8db45644a22a4043de660ed0dcb94957e6e9f26ee1735a0a053128b0995cfb670d9c52d7d64ffa2292818cc7aed79071fdd753186f010e1bd0fae876f886adff SHA512 3be17ba5290d323283e962a3a5b9c244c3c45302848b62fdad2fd92129e330c8783b4f76273dedc7b010ed71bd6a4bf1cc4085a3425288b1e28dc532e1a1bf5a
 DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
-EBUILD nginx-unit-1.12.0-r3.ebuild 1973 BLAKE2B a3ac6f3aef30bd5a98b699311ed18b6325293f03bb30de27383db38723067ceae761ac05f2aedc324b5de4abf168f04d4b7444389706464063c4a473116d2d9b SHA512 be3f40d89854b316d43bd02e5fde82b69208c4dc158500a9a17e93fd157d436efaa57acdba3927104b483f13072d26727a85200a449038587ffc441ed23a2aec
-EBUILD nginx-unit-1.13.0.ebuild 1990 BLAKE2B f368b63276011c4e8568b79a0a2aa80dacf9f3f8f9a26f7c5a9ad919d9d3d5bfd93cbb15ffee35d1a05810133b61012d72fdd03ca3a1df72cc147a07876278ff SHA512 6225d705c2ff0da9cc98794f6657b30ed7bdc3baeb2d1078253f178745fdca572fbfc0cb4f1c4d1b43461e4f8a42e94e87b5c5729788bf6fb8a322cab901ef62
-EBUILD nginx-unit-1.14.0.ebuild 1992 BLAKE2B 177f5ad5f9c84274e1b65066b122dee3a66dbef7ff710f2103d10b8281d5afaa9ac4cca199f5b662c67ef534b1709080db1b890a50fe6ee278ac3f8ef30dd87c SHA512 5c4e2d7d76f2dc31d4a722c4b2ef2e55f70aabb297425b71832cc4fa0368ea881ca4854ef73ae4004733c5b4f9bb955e138def95726f576dbdb502440cec12e4
-EBUILD nginx-unit-1.8.0.ebuild 1700 BLAKE2B ec23607b482f1dcc5fa7dbba7364fc4cab62fe111f4afd1ba8d8600408d30020647174af79402c66ca1d0b56890c98980eeb12473b6e03660ed484362a1d3823 SHA512 5b1dcf2fec7071d9a99f0772748a31330612ad83ab5f2adba32c8d76b7aae0cac6d0f384d7d265ea902420092d6a3756679d58220a087f08fc58c2b96c9982a5
-MISC metadata.xml 998 BLAKE2B 89d0469b5b21967d1526d121fea36c3312a43e0a4c703aea36f451d4ef8cb4926435aca6a8af2d1ba9964498166da7551bcb6a87bb86a24896f08bf1d2016fc4 SHA512 c9e76bb48c5e1297354c25c7bf01cc80a3d0e2d21f130e24df5647987e9ac6747a9f02851070eea3fa948a7bfbb030b12f869f604ab3c63d82f481ee6c7d3ef3
+EBUILD nginx-unit-1.12.0-r3.ebuild 1963 BLAKE2B afda4ef0d65e3ec12fd77350be7b2384dd39bc575310bad5632fe65e340bf424655737755b2e346cb38a7070a48276052050c493def70a3e8e46375bd1e04c94 SHA512 524682cf26343e769b478873fff40db5f38808a9679684f5484f306b6282840feca54fcfc1fd55c79c753626f3a710667e014850ba24e56358b53c9d7ee0d9d0
+EBUILD nginx-unit-1.13.0.ebuild 1980 BLAKE2B d66c20e69d49ae7b58cd8106d59cb1e84763ee99fcb9de4b7b10449d96c857f3117576b93bcaa262516d1134f6611bb1c11c08f2a6a0d103206fa1079f01158e SHA512 59f9c42a423c925089301b0176a3c1f4554c9e7a61b3beba2689d24d7945923a69dfefb95c97467e308681853eb227859822e22db66922c029451b8eb2f1ef2a
+EBUILD nginx-unit-1.14.0.ebuild 1982 BLAKE2B 1673391165bd459f87864810aa9688c5727c00f7817a4cd46d0f3027e0d8ed9e96db733bdf42f8995dd006a1388af40d9d48a351ec5ff786f4c01b4dce495d82 SHA512 3e1af60d9abe2ad885706cb5cc9a6eaf4912bfb6d2879ccb06adb3358d6bef03996d9d298e99a62bdaf07e390f9c2d3e41b4fe3042edd09bc53d328d548b4da0
+EBUILD nginx-unit-1.15.0.ebuild 1938 BLAKE2B 8f2aa722511d06f54afd5a6d8b2b2d823a6fcf6893907440b981685daf10189b220ae6eca9bde955ab2d014c74ac106c5a8841574bcd6be0235e5b0f061eecf3 SHA512 889e7e38e483dd657bfcb6babd1d6d90542f4b31b799ee93bcf0727f11d2093535a7f699495f56b532f6accb2e0deda1c3c28e514f3cd4338da81f17cd307d66
+EBUILD nginx-unit-1.8.0.ebuild 1690 BLAKE2B 620a1ffa238fc609f2436080140d49e8d4d0387d5a82a28aa683a0c8a29482e786ceb7d4343b35da9f4fb5a0caccabdd4a3baeba34d8d95a32a88be01e269aa7 SHA512 64279e44a4980e33806cabe186c41048631d34c57afbb4ff256a0280800b51197cb758f8b12dc0a856b829b9fdd27565843317fbc4c7f598a805923f12e353fb
+MISC metadata.xml 1047 BLAKE2B 04429a2c4f083e98a753a293b77bec95c6a9eada3b14d8d249e0f0a71788e31f36125f637e5afeb204727f2dabae1cfc359524e7019a71cca7c7c5d5805d61d0 SHA512 1e8b885289895816758f9711145b4d6e69b54f27394434700794d60fa613fa771246909b44987c9e884f11ab1c5b1e1e82053ec733678c1712401cc51e291879
diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml
index ae56567e450a..c6f29a250703 100644
--- a/www-servers/nginx-unit/metadata.xml
+++ b/www-servers/nginx-unit/metadata.xml
@@ -21,6 +21,7 @@
 		<flag name="php7-1">Support for PHP 7.1</flag>
 		<flag name="php7-2">Support for PHP 7.2</flag>
 		<flag name="php7-3">Support for PHP 7.3</flag>
+		<flag name="php7-4">Support for PHP 7.4</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">nginx/unit</remote-id>
diff --git a/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild b/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
index fe54f3d5da05..ab4379548ef8 100644
--- a/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{6,7})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit flag-o-matic python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
index 7c0a7235ecef..7f3d1031a1e3 100644
--- a/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{6,7})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit flag-o-matic python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
index 88b0d284968d..a1506b1539e9 100644
--- a/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{6,7,8})
+PYTHON_COMPAT=(python3_{6,7,8})
 
 inherit flag-o-matic python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild
new file mode 100644
index 000000000000..28295fbc991c
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6,7,8})
+
+inherit flag-o-matic python-single-r1
+
+MY_P="unit-${PV}"
+DESCRIPTION="Dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+MY_USE="perl python ruby"
+MY_USE_PHP="php7-2 php7-3 php7-4"
+IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php7-2? ( dev-lang/php:7.2[embed] )
+	php7-3? ( dev-lang/php:7.3[embed] )
+	php7-4? ( dev-lang/php:7.4[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby:* )
+	ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	sed -i '/^CFLAGS/d' auto/make || die
+}
+
+src_configure() {
+	local opt=(
+		--control=unix:/run/${PN}.sock
+		--log=/var/log/${PN}
+		--modules=$(get_libdir)/${PN}
+		--pid=/run/${PN}.pid
+		--prefix=/usr
+		--state=/var/lib/${PN}
+	)
+	use ssl && opt+=( --openssl )
+	export AR="$(tc-getAR)"
+	export CC="$(tc-getCC)"
+	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
+	# Modules require position-independent code
+	append-cflags $(test-flags-CC -fPIC)
+	for flag in ${MY_USE} ; do
+		if use ${flag} ; then
+			./configure ${flag} || die "Module configuration failed: ${flag}"
+		fi
+	done
+	for flag in ${MY_USE_PHP} ; do
+		if use ${flag} ; then
+			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+			./configure php \
+				--module=${flag} \
+				--config=${php_slot}/bin/php-config \
+				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+		fi
+	done
+}
+
+src_install() {
+	default
+	diropts -m 0770
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
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 6a544717ad6b..85232da8eb28 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_{6,7})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit python-single-r1
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index cf2e5fd75113..f5af0d7c224b 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -39,7 +39,7 @@ DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b
 DIST njs-0.3.5.tar.gz 339177 BLAKE2B 6327be0b7c8077870408722376782bca579a6cfdf1fe2a4950fc0d289311ad21f671bc2b47d06f70d95d4f68d99e8c70fd4598dcc167b79c57704d99a098d284 SHA512 236e0284f251856f74eb51d8251bb5be725d2ca90056f2feef7677eb636a4e97e203f3bba81fb6b677158d615dc2d6ffcb0dc1059fb678ab12b7d14cc4ea7241
 DIST njs-0.3.7.tar.gz 360227 BLAKE2B b23e5105e3b9a0575e4da6a6e344983c2fed2081cdf0be9209fc86cd51c6e962ec5d855945d2c6972153de048dfead866686b2248b28660b41219a8e05fa939a SHA512 1975c38fab59a587045e1c6bebd527a4432c4e6bec5a62cb2e1bc5fef19275deffdb6c6558caa3f0dcc58716b702adc0eb89b0171acf5f70f275c593b16f4bfb
 DIST njs-0.3.8.tar.gz 398172 BLAKE2B 2bc76a1267c21bd691dd05ba5416e9d443d9a1d59adca07d6e370bf5b8c9a1420dc4fae2831620b26b6ea2ed16fb00c2058f569c1d60179dce83ff7cf44067c2 SHA512 7a68f5205357c64d5b4e13d72ab03b81ce5675d6f5d5643960c8e1273001828f3c1c9caab7e6b7616168f73d45c1cebb802a75ed31c22f8ca12e377ec5a4d5a5
-EBUILD nginx-1.16.1-r1.ebuild 40532 BLAKE2B e220ab8234bbbaa59f805a2f2a838627e9feae6b78d5474b9f0f4fb45287894cb4c2c04288f87d8d1a917ac0ed603e27878fd82b9a3bbc5df9b04e27e368aa03 SHA512 8adfe6a783036726afc73d328b1db4f863ff02dfd3f2970a6cb6e7595ede97b08497454382471a89210ae5af943b9ec350283d1b3f2fcf8308feaeefa0eb1fc0
-EBUILD nginx-1.17.7.ebuild 40534 BLAKE2B b9639bed18f45b390ca3733defd0cbd95a7abf8d0713cb4cfb650fe2b38e2f8d1f3334c583cc36f42bc3b1a6401cc5e4873da27aca409f7554b78517eb6388a1 SHA512 abbb97e46654615ce5e48c256262dbc6e4600a77684bacc5ffe98efe9db18de96c0c2d6215522b36b92c092873b2fc929c8f6c72f337c5dd0b2c890184932d95
-EBUILD nginx-1.17.8.ebuild 40534 BLAKE2B 81317002198726f37d92d8a2864988d200d31bad5ff11b0eb49dcbd37c0f88b38d8e5d5c4fb3d5a4bf07bc85fcb301977d7b1ba4d2ab254173b9000c96ebea91 SHA512 da187591571fca1a565a0b8dcfaa4a056ba88c27b7be131660a73484c679ff34df6e36401bec47bf620ef060c3f74c8786c8be23e426b1118ed83146dd512cb9
+EBUILD nginx-1.16.1-r1.ebuild 40512 BLAKE2B bae783454c045e184733ea1b86cd966049a83a70b97d7dd82cc3d6338703ec6f0224efa83e6f306e357c1240c775b0f7bec893776a18695ad236788da0c4ee9b SHA512 93db7e72940f13fe9453a9f6d7a2caa0ae7107b4d81a28c7461e0bc2ae89b683e784b0dbec1f08770764d3d0aff91f2d83f269bc7f5a52ac589fd1ebac950a77
+EBUILD nginx-1.17.7.ebuild 40514 BLAKE2B eb51d676352152ab02a7e8e10ee482219488f60bc9c977b79cf23dd8e080a40fd603e44da9bee5f0d673fe1a02b3cb32c3ad83e657abc39ab59362a61b36e612 SHA512 78949b4317c41b9084296181123ad088634908dab157214ffa8ee5b6d6b3f3ed2bdc896dc124b2c1db3507163b21a7000582aaa87bd70a0a62086f4507552917
+EBUILD nginx-1.17.8.ebuild 40514 BLAKE2B 52817e558f2afc30bfd5bb29b751d63f17c52ed725da2b39ada17d524e9f0a09ff3a439c3ee036b450ff76c170ff94c7cfb2941aa8d0ce18e1853a8a4d3b6870 SHA512 96fcf83c290015b16c53f736cdbb9ea38193ab388c9cae9d6780fbc48a6e3f6f51ca69a4c80f716598b700e1b6595741814b6bbbd8e188ba3e85b616b54b8350
 MISC metadata.xml 1193 BLAKE2B aeb293cf75ed650c946910222d6396f726dc5ed49f1213e6a5664613d78e3b27616399bc1c9f0a360f5303b16931da7016cdf540b24601afafc3ada4428b33a9 SHA512 a96002bc9845bc465542c753c738899b77ad7a32fac7f5f9a7049336868bc41199e926422e3dc23e47f34656c9aaea255511d2ef91e9d59f48c9cd0b4a3c4903
diff --git a/www-servers/nginx/nginx-1.16.1-r1.ebuild b/www-servers/nginx/nginx-1.16.1-r1.ebuild
index fcb191046b1b..9c62c90db19c 100644
--- a/www-servers/nginx/nginx-1.16.1-r1.ebuild
+++ b/www-servers/nginx/nginx-1.16.1-r1.ebuild
@@ -996,15 +996,15 @@ pkg_postinst() {
 			ewarn "following directories to mitigate a security bug"
 			ewarn "(CVE-2013-0337, bug #458726):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
 			chmod o-rwx \
-				"${EPREFIX%/}"/var/log/nginx \
-				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
 				_has_to_show_permission_warning=1
 		fi
 
@@ -1013,15 +1013,15 @@ pkg_postinst() {
 			ewarn "The permissions on the following directory have been reset in"
 			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX}/var/log/nginx"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "Also ensure that no other log directory used by any of your"
 			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
 			ewarn "used by nginx can be abused to escalate privileges!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
 		fi
 
 		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
@@ -1046,7 +1046,7 @@ pkg_postinst() {
 	# unmerged a affected installation on purpose in the past leaving
 	# /var/log/nginx on their system due to keepdir/non-empty folder
 	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
 	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
 	if [ $? -eq 0 ] ; then
 		# Cleanup -- no reason to die here!
@@ -1059,7 +1059,7 @@ pkg_postinst() {
 		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
 		ewarn "(bug #605008) because nginx user is able to create files in"
 		ewarn ""
-		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn "  ${EPREFIX}/var/log/nginx"
 		ewarn ""
 		ewarn "Also ensure that no other log directory used by any of your"
 		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
diff --git a/www-servers/nginx/nginx-1.17.7.ebuild b/www-servers/nginx/nginx-1.17.7.ebuild
index 9b7d6b814dba..266794ff8ded 100644
--- a/www-servers/nginx/nginx-1.17.7.ebuild
+++ b/www-servers/nginx/nginx-1.17.7.ebuild
@@ -996,15 +996,15 @@ pkg_postinst() {
 			ewarn "following directories to mitigate a security bug"
 			ewarn "(CVE-2013-0337, bug #458726):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
 			chmod o-rwx \
-				"${EPREFIX%/}"/var/log/nginx \
-				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
 				_has_to_show_permission_warning=1
 		fi
 
@@ -1013,15 +1013,15 @@ pkg_postinst() {
 			ewarn "The permissions on the following directory have been reset in"
 			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX}/var/log/nginx"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "Also ensure that no other log directory used by any of your"
 			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
 			ewarn "used by nginx can be abused to escalate privileges!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
 		fi
 
 		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
@@ -1046,7 +1046,7 @@ pkg_postinst() {
 	# unmerged a affected installation on purpose in the past leaving
 	# /var/log/nginx on their system due to keepdir/non-empty folder
 	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
 	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
 	if [ $? -eq 0 ] ; then
 		# Cleanup -- no reason to die here!
@@ -1059,7 +1059,7 @@ pkg_postinst() {
 		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
 		ewarn "(bug #605008) because nginx user is able to create files in"
 		ewarn ""
-		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn "  ${EPREFIX}/var/log/nginx"
 		ewarn ""
 		ewarn "Also ensure that no other log directory used by any of your"
 		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
diff --git a/www-servers/nginx/nginx-1.17.8.ebuild b/www-servers/nginx/nginx-1.17.8.ebuild
index fe0559cad19b..e950633e242e 100644
--- a/www-servers/nginx/nginx-1.17.8.ebuild
+++ b/www-servers/nginx/nginx-1.17.8.ebuild
@@ -996,15 +996,15 @@ pkg_postinst() {
 			ewarn "following directories to mitigate a security bug"
 			ewarn "(CVE-2013-0337, bug #458726):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
 			chmod o-rwx \
-				"${EPREFIX%/}"/var/log/nginx \
-				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
 				_has_to_show_permission_warning=1
 		fi
 
@@ -1013,15 +1013,15 @@ pkg_postinst() {
 			ewarn "The permissions on the following directory have been reset in"
 			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX}/var/log/nginx"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "Also ensure that no other log directory used by any of your"
 			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
 			ewarn "used by nginx can be abused to escalate privileges!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
 		fi
 
 		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
@@ -1046,7 +1046,7 @@ pkg_postinst() {
 	# unmerged a affected installation on purpose in the past leaving
 	# /var/log/nginx on their system due to keepdir/non-empty folder
 	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
 	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
 	if [ $? -eq 0 ] ; then
 		# Cleanup -- no reason to die here!
@@ -1059,7 +1059,7 @@ pkg_postinst() {
 		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
 		ewarn "(bug #605008) because nginx user is able to create files in"
 		ewarn ""
-		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn "  ${EPREFIX}/var/log/nginx"
 		ewarn ""
 		ewarn "Also ensure that no other log directory used by any of your"
 		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f9858fe38c06..359c53cbfc92 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,19 +1,19 @@
 AUX tomcat-7.0.94-build.xml.patch 5966 BLAKE2B 01e253b0597e7353eaa38b5af29f4f6db4161fbe91aa1a46e2b8412f37cb66a10c06a14291e1c49ea108f7fbbff538e1c605829de8ee20d85a57d9c6122e4436 SHA512 66e001d705a7081461a3ddb9477e857b7fb87676b1ebc3eaa4bbf7f6a1e8f88f7eae4fc49a8a5b7a7baebc2258acc2bd0fe11d3683716021430e4a9dcd367b43
+AUX tomcat-7.0.99-build.xml.patch 5913 BLAKE2B 21316c4ce76bd3e87c2749354cbd455c1322431649b276b59a93f10b97f59d03690f3531c2fd3a8ce67b81969544d498bf04e829407005dbed867067f8970347 SHA512 f8d0cb4ba0effdeea3db4049381efc84513551a1e28551b59a254340a8add306824d1dba344f6eaddc93e8b61fc0b71e1a8d0bcfc860500134cc19072deef30e
 AUX tomcat-8.5.47-build.xml.patch 10363 BLAKE2B 8f851b5eaa4ffb3073ee526122ef278f8e975e263b439140748ba774152a72712b6bc78d6568d097befac4ba56bc6a1721f14dd0a85d288e88621f49819e1a97 SHA512 236df8ce63e7e48293584868c140d4ba5160172cc19bd90eeacd6f14e08663b7c750f95fb24ab1eddf7c7a2a80e2f05e5470261159f3c95d3b22bd790b2f6b89
 AUX tomcat-9.0.27-build.xml.patch 10936 BLAKE2B a75c4635744b1815d5f4df29ac6bbb2afebf752c7b43cda2cd69c2cbe66100b10e04fe8a4306e2c166a6b2159091a7c7a4b88d299ea7d408e6af04c8b552ea8f SHA512 e1a68955dc6a89e1751cb429d44a19501644425b1a7553c0021255016bf69c58b64059267dab91457e78573e9dce01c3f3abe0f776d69bbf35d1c36c0535e1ce
-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.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
+DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0
 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
-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.96.ebuild 4197 BLAKE2B e20677c88681fb4c79dbeec633981176b7b309e67bfd8361546b531ee627d74aa3e5f6c5ac4da5593603b6fff3b00e7b63471e9b2c6cebae84f6437ce34039a5 SHA512 a0b7045e9edea9661ca17e5d3d8151152b817d605c218158365cedf1528a9a167d487dcd304ef9417bd35c73f1e73a058f8fb590e4009c24f45e3d062aaa154c
+EBUILD tomcat-7.0.99.ebuild 4190 BLAKE2B b749f120ab3e162ee61b06f717070603bec4c7961731f0a196bb754980c6f8f21dfe954780ddcc9550083228e3695abf2fd64da635c42852ab5a553973478a3b SHA512 840917afe93cf802a6977118d711ef19a6b553c0c6023540d9400b7f7eb41488b14ae9219e8ad40b0ee6d6c8b4419a2e0908e12ecc7ebfda495b010f19f62ef4
 EBUILD tomcat-8.5.47.ebuild 4559 BLAKE2B 2b6ac83085c87208bfc013e3ec68a6412b2bbd9208aab1732096ef8079500497a2a53e6c2a2a1f235f7d7f29a87aa52ae105b34994fc46bee73127e22b12e2df SHA512 7bb79bd8f186a0e782c3b9ff9ed056df0c1e8e458d6886079654878722f8584409a069b7f39cd712f1e73c98a0f21dc733a49c93ea96dd12b8e92617722183e0
 EBUILD tomcat-9.0.27.ebuild 5470 BLAKE2B a001f155a2214e363aee2e8fefcb0e73d0881e52ef8da29c53480e464609a48a9526bc886ca8257e7a761c4e4c0b86b9ecd1c0bd84d6e900aa7e388410843326 SHA512 6d4b46bf13cc1abe2d8b5544ff6eb5419d2d716fa47b60879fe244ad04264cd7029272fe24085472e9c181af6e4346ce59f180636d06a941a1a9e0d5566d2518
-EBUILD tomcat-9.0.7.ebuild 4518 BLAKE2B af856b921778713ca7ffd9d35dd5916ca1bcbdd438945d91bd9ec26ac4bf36b8e33176c05523df12b76c2ebeb5055ff296be8b1ee2e03b38e21b468ada3f112b SHA512 fe3933a53df4395dee7884910b6d3d293b351e9ed6e0015f850ecb008afa49778c5e7b30d694ec55c41f889bd155e831a940492c35e16be03177a697b17a6844
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
new file mode 100644
index 000000000000..29cf6c2e403c
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
@@ -0,0 +1,163 @@
+diff --git a/build.xml b/build.xml
+index dbad7cb..101bc57 100644
+--- a/build.xml
++++ b/build.xml
+@@ -715,12 +715,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>
++-->
+ 
+     <!-- Convert the message files from UTF-8 to ASCII. This can be removed
+     after upgrading to Java 9+ as the minimum JRE and specifying the encoding
+@@ -776,26 +778,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}"
+@@ -854,9 +862,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-de.jar"
+@@ -1087,9 +1095,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">
+@@ -1149,7 +1157,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" />
+@@ -1839,7 +1847,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}"/>
+@@ -2034,11 +2042,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.
+@@ -2070,6 +2079,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -2137,6 +2147,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"
+@@ -2181,9 +2192,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+       <link href="../annotationapi"/>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="https://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="https://docs.oracle.com/javaee/6/api/"/>
+@@ -2889,7 +2902,7 @@ skip.installer property in build.properties" />
+   </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">
+@@ -2925,7 +2938,7 @@ skip.installer property in build.properties" />
+   </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}"/>
+@@ -2989,7 +3002,7 @@ skip.installer property in build.properties" />
+   </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-9.0.4-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
deleted file mode 100644
index feb5f126a37e..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
+++ /dev/null
@@ -1,256 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -719,24 +719,30 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 4.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.3 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
- 
-     <!-- EL 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- WebSocket 1.1 API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-@@ -1012,9 +1018,9 @@
- 
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,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">
-@@ -1074,7 +1080,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" />
-@@ -1108,7 +1114,7 @@
-     </javac>
-   </target>
- 
--  <target name="build-tomcat-jdbc" depends="package">
-+  <target name="build-tomcat-jdbc" depends="package" unless="noget">
-     <!-- 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}"
-@@ -1123,7 +1129,7 @@
-     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
-   </target>
- 
--  <target name="build-tomcat-jdbc-src">
-+  <target name="build-tomcat-jdbc-src" unless="noget">
-     <!-- 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}"
-@@ -1227,9 +1233,11 @@
- 
-     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
-     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
-     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
- 
-     <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1612,7 +1620,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}"/>
-@@ -1752,11 +1760,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.
-@@ -1766,6 +1775,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- 
-   <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"
-@@ -1830,6 +1840,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"
-@@ -1870,9 +1881,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/8/docs/api/"/>
-       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2617,7 +2630,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">
- 
-     <!-- Download Commons Daemon -->
-     <antcall target="downloadgz-2">
-@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" />
-   </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}"/>
-@@ -2694,7 +2707,7 @@ skip.installer property in build.properties" />
-   </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}"/>
-@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" />
- 
-   <!-- =============== Utility Targets to support downloads ================ -->
- 
--  <target name="setproxy" if="${proxy.use}">
-+  <target name="setproxy" if="${proxy.use}" unless="noget">
-     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-   </target>
- 
--  <target name="testexist">
-+  <target name="testexist" unless="noget">
-     <echo message="Testing  for ${destfile}"/>
-     <available file="${destfile}" property="exist"/>
-   </target>
- 
--  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadgz-2" unless="exist" depends="testexist">
-+  <target name="downloadgz-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2787,7 +2800,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadzip-2" unless="exist" depends="testexist">
-+  <target name="downloadzip-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2805,7 +2818,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
-     <!-- Download the file -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2815,7 +2828,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="downloadfile-2" unless="exist" depends="testexist">
-+  <target name="downloadfile-2" unless="noget" depends="testexist">
-     <!-- Download the file from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2838,7 +2851,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="trydownload.check" depends="setproxy">
-+  <target name="trydownload.check" depends="setproxy" unless="noget">
-     <condition property="trydownload.run">
-       <and>
-         <not>
-@@ -2849,7 +2862,7 @@ skip.installer property in build.properties" />
-     </condition>
-   </target>
- 
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
-     <!-- Downloads a file if not yet downloaded and the source URL is available -->
-     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-   </target>
-@@ -2860,7 +2873,7 @@ skip.installer property in build.properties" />
- 
-   <target name="ide-eclipse"
-           depends="download-compile, extras-webservices-prepare, download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-9.0.7.ebuild b/www-servers/tomcat/tomcat-7.0.99.ebuild
index 967fffcd751e..7fa74915d25f 100644
--- a/www-servers/tomcat/tomcat-9.0.7.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.99.ebuild
@@ -1,39 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
 inherit eutils java-pkg-2 java-ant-2 prefix user
 
-MY_P="apache-${PN}-${PV}-src"
+MY_P="apache-${P}-src"
 
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
 HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
 
 RESTRICT="test" # can we run them on a production system?
 
 ECJ_SLOT="4.5"
-SAPI_SLOT="4.0"
+SAPI_SLOT="3.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8"
+	virtual/jre"
 DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=virtual/jdk-1.8
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
+	virtual/jdk:1.8
+	test? ( dev-java/ant-junit:0 )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -46,12 +42,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	find -name '*.jar' -type f -delete -print || die
-
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${PN}-9.0.4-build.xml.patch"
+	java-pkg_clean
+
+	eapply "${FILESDIR}/${P}-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
@@ -65,16 +61,16 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_BUILD_TARGET="deploy"
 EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
 EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
 EANT_NEEDS_TOOLS="true"
 EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
 
 # revisions of the scripts
-IM_REV="-r2"
+IM_REV="-r1"
 INIT_REV="-r1"
 
 src_compile() {
+	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
 	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
 	java-pkg-2_src_compile
 }
@@ -100,13 +96,6 @@ src_install() {
 
 	### Webapps ###
 
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
 	insinto "${dest}"/webapps
 	doins -r output/build/webapps/{host-manager,manager,ROOT}
 	use extra-webapps && doins -r output/build/webapps/{docs,examples}
@@ -119,7 +108,7 @@ src_install() {
 	fperms 0750 "${dest}"/logs
 
 	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
 	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
 
 	# prepend gentoo.classpath to common.loader, see #453212