gentoo new year resync : 01.01.2021

18 files changed, 37 insertions, 117 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 2d07fa2bbf87..5c1d37b75d5c 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index f2bd3db56e89..4dee7842016a 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -3,9 +3,9 @@ AUX apache-2.4.41-libressl.patch 1082 BLAKE2B 98428a5653f47e6dd38452809bee92ef7a
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
-DIST gentoo-apache-2.4.46-r4-20201203.tar.bz2 25752 BLAKE2B 7479209b648567438789b1c73c99160af94c639710d6255cca2bb42f91d5b4d3f5692fb691a3566078860e00d507f1b97fa2d0d1352cf8de9ae7f311e3026e8c SHA512 9a810f9dba5c493ca25d23b77cf3c1b1991e9376308ec2c55105e6adb291da46c3858fb15200b6d31ac5a45485796667a504dbf217beeabd82ac097a8cca0569
+DIST gentoo-apache-2.4.46-r4-20201230.tar.bz2 25821 BLAKE2B 3f83b48aa36fa8b9adc75a2cbeaadddad8fb0d69d1602753e0a1978cd6136b1dbf15ad06a837f36c26244e3950bae3ecdfbcdd7668a4d2fc4f0d9f58a909e5b7 SHA512 cea71f3e40ac1409206d906df36c772d7985a79a9e713a3016a9fae67dad032e24ce124789089a4b92454bc98455a70c66515106c8f3c33e05aeaf3037ffabe8
 DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
-EBUILD apache-2.4.46-r1.ebuild 8645 BLAKE2B 500dd93b967c7155d6b07d59f8bb18e8473c0f993f0fd5d56c3e66d4fa80e78e1c180275fee245a7377b7fee822d86b1d21371517b0d46bf9f9ff34fb2a24e5e SHA512 e54c12333cd7390e5a2c2db0ec3bd0e2ff175304a062ccad95fc2a4cebfbc77f130d61d12b0c1e25514214feaf804843323b9532d35b80ca0fa448f5ab828e25
-EBUILD apache-2.4.46-r4.ebuild 8648 BLAKE2B ed16c2f5d7ab1ea4bdffc1563afe905a9c78d51ea13685c663d517afaaec8b822ff56411b7fc76efc994d0c65d4ff7bfe46d28be6f9795efb138263528e57e6d SHA512 9154e5637db94174e4d8cda705d50042f5688a1ba5d027719a9f0d14c6075acee29fa006ba088eff4ccaf03a1fe6d1f46a9a480cbc3aaf435a0565c2bec90d5f
-EBUILD apache-2.4.46.ebuild 8572 BLAKE2B 9f3a59cee0344f620d307e3316f8a17863227b0fbb8aee4a85474c6cfd23e9897d75628e66dbf0de901b9901b20ea4ec431ba7a16d79a5ec5437bc4bbf803eac SHA512 378d004209a14a97bf7358d284d9fa9bb51f1d5340daf8988739e53ef9b8f354e074c0def44d577fb9176137f136e0704ae18e4b000601acb6c63db7caa10a76
+EBUILD apache-2.4.46-r1.ebuild 8634 BLAKE2B 4ae7aa2aa05ca0a90c4a586e98dc1562e39bec10a5e263a4db7be0f56c77daefa803659408a79e18fb0243b820c5e30b793267d5cbd85d5cd9522e5a1caba653 SHA512 c8222ad185b7ba5bf96bd2971457d2f17b411b110158bc452a2b78a5a972367b5734f50378bd5d87e48eb9d280da76e4a58b400be67ad2fcb8cf487594ebf4d6
+EBUILD apache-2.4.46-r4.ebuild 8637 BLAKE2B 472afc5306e053d07590336e4294e5b5af85520e9f1a92759f553070990803ab31ae2726772f90fea4096cbedd1ae77ebcdaf04318c88f73b42d1b6a82d64e56 SHA512 199e5a82cf2700f906ca68a93043ea7737b649e4b6301562ea85c16b22008e683e6af24951391c014e57de5995aa755bd7364c44641cf7c566a6d9d1b548e603
+EBUILD apache-2.4.46.ebuild 8562 BLAKE2B 5729038bd9b592b71aa437f40161ae3fc33180dde4d0e5676634e845095bc7339663ff2d3fa467028d26fb954c34a357db90dd675de94677688824a61db6b00e SHA512 53129105be0c959b6c427fb141fabf7e110ad9e80376cf6d394da200361c9e3889c74fedfa72c48a8506ffdc455bb6ae24944e9e5575f5d25044d457e2add176
 MISC metadata.xml 1012 BLAKE2B ca2238f428144240f64b5c9e48087a07a3f77278958efb240edeb864050ca01d1e042a37fb304fde76925fb651d7d97755d354a45aff34ac0589b7405b848d54 SHA512 a4e903bb75740c54256fa96359f6a97cd75008ffeeadfd6353648f5bfa2295fb108ec9de398956c79633bc465475f5db365d20d71caa34fc14a07c4715cc8683
diff --git a/www-servers/apache/apache-2.4.46-r1.ebuild b/www-servers/apache/apache-2.4.46-r1.ebuild
index 449b79e34862..37a3877f2022 100644
--- a/www-servers/apache/apache-2.4.46-r1.ebuild
+++ b/www-servers/apache/apache-2.4.46-r1.ebuild
@@ -138,7 +138,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 ~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 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~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/apache-2.4.46-r4.ebuild b/www-servers/apache/apache-2.4.46-r4.ebuild
index 237f162a3af6..5a89abe1dadc 100644
--- a/www-servers/apache/apache-2.4.46-r4.ebuild
+++ b/www-servers/apache/apache-2.4.46-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20201203"
+GENTOO_PATCHSTAMP="20201230"
 GENTOO_DEVELOPER="polynomial-c"
 GENTOO_PATCHNAME="gentoo-apache-2.4.46-r4"
 
@@ -138,7 +138,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 ~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 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~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/apache-2.4.46.ebuild b/www-servers/apache/apache-2.4.46.ebuild
index 17d6fb367b7c..1d46160335a6 100644
--- a/www-servers/apache/apache-2.4.46.ebuild
+++ b/www-servers/apache/apache-2.4.46.ebuild
@@ -136,7 +136,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 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 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~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/fnord/Manifest b/www-servers/fnord/Manifest
index 4090a0b9ca97..16b84f56ffdc 100644
--- a/www-servers/fnord/Manifest
+++ b/www-servers/fnord/Manifest
@@ -1,4 +1,4 @@
 AUX fnord-1.10-gentoo.diff 3204 BLAKE2B 98b868e50712d8048a3f3924d8af93f5a5b34d083cba7b2d64a4f02ccc672e20d8a3eaf5a1c2411537763d85ea74a577de6f8b5bb57bd2c1554e038bcbb00f5a SHA512 93921b050e8b165124b738fcd96c0d828289ee238284088c6859777fd5ca647f9156a0419e4cd6ee65df6e9d944913b8f1e7c6382c358b8c549425cac7414a7b
 DIST fnord-1.11.tar.bz2 28845 BLAKE2B 1f9ce7ca3476f03af0528f9ea6701be25babbd8a38398df3f87d1b1a18a28182a54bdfe814165ca6422f427bcdabd013f9eed2c1f178f0403829b38d618c2d08 SHA512 12a3751a2f98acb3ba2d468972bb785b656fa01bfb0828bc9ba5488dc7a2a66e9f226a6cc49ceda57aa7875d8d90954a9e79806c9506a7906cfff346cd400154
-EBUILD fnord-1.11-r1.ebuild 887 BLAKE2B 71fd224ec6a348255692a4781fa284a5f0982be5815c3df46a9920a73b46c7f28eb25e105bc436cdfe7846f1a50dadc6a483b0141014eb2640711cdb03d0b863 SHA512 1e055e649e7497c4232e49fe4ab4fdd8dca013f94e57da1aa5474ca0689b6d876ecadd9c3fbf506354202ed1a93ae0bc3a4783508586fce1ec37504787859106
+EBUILD fnord-1.11-r1.ebuild 888 BLAKE2B c78974003e842e9c8f9d845ec8fddda411d0de0f2491448aedfdc6a319a97292b0f6b9f53ace71dc2c22ba0547ab1e00a30a19988cc727dc9c744dfd29ccc538 SHA512 0b8ea6bb2d88c58bc4b781127d98ad2c651eb557c899a418102dfa9fa4aa517205b0521d9edc3b266a47a95deacd0a60fb0e1746e21108bc13025063a428a4aa
 MISC metadata.xml 242 BLAKE2B de3429346ad1b5e7b5cc5bb2ca71af997b3702565c6dbab9d02c358724423a4bdc916b0ea48180a2273404e59e4bfca367e1659e4c1e2f70f3cff0b111bd8b6b SHA512 688a7e67d3fcc02afd7795ace015bf7832ba3bc428cf64042b4ad9ea72d815996ea128b0a4cf97e8331dc3ad371c4565963d6c773d161e88cd6b6926b58aecec
diff --git a/www-servers/fnord/fnord-1.11-r1.ebuild b/www-servers/fnord/fnord-1.11-r1.ebuild
index 0b042f4d516e..1caf64c5d572 100644
--- a/www-servers/fnord/fnord-1.11-r1.ebuild
+++ b/www-servers/fnord/fnord-1.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ppc sparc x86"
+KEYWORDS="~amd64 ~hppa ppc sparc x86"
 IUSE="auth"
 
 DEPEND=""
diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest
index 6268b4d81541..0f3837847147 100644
--- a/www-servers/spawn-fcgi/Manifest
+++ b/www-servers/spawn-fcgi/Manifest
@@ -1,5 +1,5 @@
 AUX spawn-fcgi.confd 2238 BLAKE2B 0364383f12b79728830556244485b991f5bf5f7f4595e5500b81330c43b752aca8f3fce53cd08d4f007a69279668c7d212c74ff0682a3e37ae0ec545744836c8 SHA512 0b0d5754de17dd691ead380a93526aa7fbdd432359b248ce06f030daefb1ad96e4a81fe5319557fb66602baccb45a0febf6417ec7b79eee91e1e070d9a852b90
 AUX spawn-fcgi.initd-r3 3048 BLAKE2B 5b501069acfe3a535f1d73cbb706d05de50ea8562e09a49209da551dc5ba9626ddc0093b76139d4291ce8ac4c3e329be0bbf494c41c6ec137a182b8b35c3c891 SHA512 6c983f9d741f508d12b728d24dc5b57396cbd2272ae71c7127ba95aef70bd1a90b68d2b15e3481dfdbcfa723ca73a92deea61baae64051a83cec0b583c7da1e1
 DIST spawn-fcgi-1.6.4.tar.xz 79944 BLAKE2B 06fb92261042fe6bccda1a472a712a7c9bc7f56ee04b72f31ee133079f6c1d07ca07ef6c1b7c878db2e32861ea20914998411a3f6b596e4ba950f8767a899346 SHA512 e2b317997b56f852ad644b80fe36fa08376ae81f93566e181c31a3b6764de2eeb32a2e10e420136d8536487c575678ca52a33f7cb3488aadf7185fbd0196bee0
-EBUILD spawn-fcgi-1.6.4-r1.ebuild 744 BLAKE2B 3d86297ab6aea367f10b9afa00ab670223e4c189a23503b136436e0be9269a41a242d1f26ce92f383b1b59a6d4f963262a4e9fe2caeef64333d42d3118767fd6 SHA512 d81f3b0d9e568485784e66a74163945e29b4c62df392966559a4f29623f695b6a0b339e2b808378f0e1e147e5c583aae32d4e94756f4e6b9609322203c513145
+EBUILD spawn-fcgi-1.6.4-r1.ebuild 745 BLAKE2B a197ac01cf74e0e4e0bdfba3290b2cecca983500f14f3a54fa390c0f85e43ed7289c28966ffa9b02249991055eab263a40e2de5dd0f368604e2e38c05582d98b SHA512 3f8905a4c12abbdae8850d78f33847849122007244f5e4b60af91181449cef64ff7d0b629baf3442ecf12adfa3738f778c25bf444f9be039bc1c4d15f478ce9c
 MISC metadata.xml 448 BLAKE2B c5651b029dc5d74e075b0a3ee7eb0b9b1cca540a579ef017faca1363f920fd374277d4e24d25db64d81c5dcea05da91e5d9f3043f98863ca31f38893f67ba041 SHA512 461925b80f58574c97b298aa4b26314e26f40d8874bd3d8e4fc6f9bd1aa7161f9c69cfcc47dd9bd9077b631827e5a6631e0322174fb1387624b7bc3d021e29a2
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
index 3b19292350dd..5f3d809ddd91 100644
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
+++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lighttpd.net/download/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="ipv6"
 
 DEPEND=""
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 68fc0fba58e8..1f8938aeddb6 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -16,10 +16,10 @@ DIST apache-tomcat-9.0.40-src.tar.gz 6017562 BLAKE2B 1c90511911363bb3b154124382f
 DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f SHA512 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b
-EBUILD tomcat-7.0.106.ebuild 4224 BLAKE2B 9ff5e9fa663926e0609ffc15804c5426e95d4eb6dacd1e4e9f27ca06dd167f22bccf44e8b2cfc323532490846f7ae04672494f000e5efcddbf21c1126ae17a67 SHA512 9160d59093bbe4fe7260ac0bb26f124f70574cc4564f52f02d2987f7d6ca46825fe973cdbc69f1493d6a5a9c62ba5059ccabf5bb618ccdfd162c631b1a347b3e
-EBUILD tomcat-7.0.107.ebuild 4225 BLAKE2B 3f82018ea97e47df2439b4230ad19a2bd22163d0558acfafb26d8a1c006cc49cdd0074204b2ac8707f2fbc6a062a62ed8d016fcd0467d38ac51850059f23b818 SHA512 45587f442b61cf66e7fe35bf28a8d8053471e65d81fa982f555b132a58cf9157fb73e500c1049ec411c26dd22073c703d1cd6d0289456ce6d0ac1ba73fcbb160
-EBUILD tomcat-8.5.60.ebuild 4804 BLAKE2B d08021370f64aaa56711a3e74aa75fdba984a42d50c8cd83a4a3f20721f419d83ad9baad6f2798d034d4078ab4d34a6efafe835b2a9aa42e97546268dc05395a SHA512 3a63dc1a26f8add53950ed7ffd24b720605129bad73ba57ce9add5165a30cb27aa7acc1107bf3bb0bfa4c55ea50c1130fd7217304b27787eda7283dd193a3cd4
-EBUILD tomcat-8.5.61.ebuild 4805 BLAKE2B 216c508e3f22ba203f43654eda6a567e78562d29d154172aab0e550c4426bf94e5f5bb56a664173a6a6bd626b899087b9d302a9fff5e73cc28bb52e93bc5a918 SHA512 d441136e62c130070a69b91f4aff6375857cf3ccae2f1697d37c70f31a912fbf977e892f84bbf7121f1bb5f1ca65f40f1c1af485242100d203151fc13b550eba
-EBUILD tomcat-9.0.40.ebuild 5684 BLAKE2B 3a405f0221f549637f77104a6bf32f1c8d4a52050fc8fb3801206e78218a6e373f2fda62e0f759093a86d10991949f319591238540d0314310ee63dae80596cb SHA512 86a1c7b19d7b905ba92e4d151e04aa66976d7d1719027c4fdcc3ab4007b746d0b7fd348f248a430cb70f2b4a5a96fdd6c2006f2382d73853f6315fc7dcd8b68a
-EBUILD tomcat-9.0.41.ebuild 5700 BLAKE2B 479a370db447265b240073fabf1cc631041d65ee089e8342e7a2d304bed7709cd0fbb7e5c19d582f11d1c3fe0d193346956083e79dd0fff687a254ed427e8e07 SHA512 026101900a77cbd0930e57b634d9e15231bc8736cac8c5b64c08dc4197a461df2243980f846a741431f087d976bfc4d3651166dfd6a1d002ecd9e3e1cd973a52
+EBUILD tomcat-7.0.106.ebuild 4154 BLAKE2B 2020b3a15d3e33f4638f74511f6beb8d82db9f68fe920c95ec0efa24ebcfd5d5ec8dcc174ef4fc927063738c710931decf749ec442c948ef9c547b5bcabf22b2 SHA512 7f1e205ae31ec9b0bf98bb0ae86ab8f761314be5bc3fe25f07480c4e97f80c1eb148df3b6b484be2cf23c08df6207d034ca433404a90b0d0e422b9a0d9f9c249
+EBUILD tomcat-7.0.107.ebuild 4154 BLAKE2B 2020b3a15d3e33f4638f74511f6beb8d82db9f68fe920c95ec0efa24ebcfd5d5ec8dcc174ef4fc927063738c710931decf749ec442c948ef9c547b5bcabf22b2 SHA512 7f1e205ae31ec9b0bf98bb0ae86ab8f761314be5bc3fe25f07480c4e97f80c1eb148df3b6b484be2cf23c08df6207d034ca433404a90b0d0e422b9a0d9f9c249
+EBUILD tomcat-8.5.60.ebuild 4734 BLAKE2B 77bbb881cc3df699a5025cddfc2af9d995d06ff86252abd611e92e27e0c0612804b24cd103b48c1c9a7709a2449e45f54ff8f91cbef211ae6cd33b7109ef4bc4 SHA512 97e085fb4167de694bbbbb279282e367505f623fa92a5929fddcbfa234d7a47a0557bae969de6d97792453f7f86ebc36a762c5221bab1e6fa418cea9e6d68d02
+EBUILD tomcat-8.5.61.ebuild 4735 BLAKE2B c8b1703cec5858318af77487a357f64297ea50b6f88396c336f8146b84ae4a76ad622d8104f4a62a182dc4921fecf4b0ee1ed2c2579d152e9267014265049086 SHA512 44882cef93c2f0b1d4117939405053520d0ad0ede1562698c219288e248bc1302e859a9c90fc12b5f3cb09d48bcd44586ecba911283c5cbfe2156e6f79ccbe9c
+EBUILD tomcat-9.0.40.ebuild 5614 BLAKE2B efc50844ed5ed77b781bd0acc9122d0e8b2410fdff49573b378500b476c5448cfdcaca9efc560b50c4f8a24b1e8c978276269df43772a6b96a6c80aae896a6ed SHA512 b53c9064b9d51bff523df465da459f0ee26a9f703d0cfcf6e0cb9d931c7b847769565148067e142454197677efcc36a220b131c33ce9328dc33f645d2954dbff
+EBUILD tomcat-9.0.41.ebuild 5630 BLAKE2B c219a31f70d97b85b928550b9545979caa3e165a0154fd1a1624847fe5bdd9a70772052495e0c30929542bcad1856fdd6143791da4931ebb2d0bab4af1366f36 SHA512 baca0dfa996031d7be20f7a15127554301efcece3f2469296edaf0dd2bfc7bab38e0a334b6e497593acd55532f1054d31209bd34521a0099c7d305e24f2fbd15
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/tomcat-7.0.106.ebuild b/www-servers/tomcat/tomcat-7.0.106.ebuild
index a905c145be4a..84121125211a 100644
--- a/www-servers/tomcat/tomcat-7.0.106.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.106.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${P}-src"
 
@@ -26,6 +26,8 @@ SAPI_SLOT="3.0"
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
 	virtual/jre"
 DEPEND="${COMMON_DEP}
 	virtual/jdk:1.8
@@ -33,12 +35,6 @@ DEPEND="${COMMON_DEP}
 
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
 src_prepare() {
 	default
 
diff --git a/www-servers/tomcat/tomcat-7.0.107.ebuild b/www-servers/tomcat/tomcat-7.0.107.ebuild
index acdb9985f254..84121125211a 100644
--- a/www-servers/tomcat/tomcat-7.0.107.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.107.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${P}-src"
 
@@ -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?
@@ -26,6 +26,8 @@ SAPI_SLOT="3.0"
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
 	virtual/jre"
 DEPEND="${COMMON_DEP}
 	virtual/jdk:1.8
@@ -33,12 +35,6 @@ DEPEND="${COMMON_DEP}
 
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
 src_prepare() {
 	default
 
diff --git a/www-servers/tomcat/tomcat-8.5.60.ebuild b/www-servers/tomcat/tomcat-8.5.60.ebuild
index ae1fd17bba26..3a82c34d5f2c 100644
--- a/www-servers/tomcat/tomcat-8.5.60.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.60.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${P}-src"
 
@@ -26,6 +26,8 @@ SAPI_SLOT="3.1"
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
 	virtual/jre"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
@@ -42,12 +44,6 @@ DEPEND="${COMMON_DEP}
 
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
 src_prepare() {
 	default
 
diff --git a/www-servers/tomcat/tomcat-8.5.61.ebuild b/www-servers/tomcat/tomcat-8.5.61.ebuild
index 86d3e5d65919..43b89effd490 100644
--- a/www-servers/tomcat/tomcat-8.5.61.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.61.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${P}-src"
 
@@ -26,6 +26,8 @@ SAPI_SLOT="3.1"
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
 	virtual/jre"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
@@ -42,12 +44,6 @@ DEPEND="${COMMON_DEP}
 
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
 src_prepare() {
 	default
 
diff --git a/www-servers/tomcat/tomcat-9.0.40.ebuild b/www-servers/tomcat/tomcat-9.0.40.ebuild
index 41d3c02f7744..f85b6b5aea23 100644
--- a/www-servers/tomcat/tomcat-9.0.40.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.40.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${PN}-${PV}-src"
 
@@ -36,6 +36,8 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
 	dev-java/wsdl4j:0"
 RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
 	virtual/jre"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
@@ -65,12 +67,6 @@ src_unpack() {
 	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
 }
 
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
 src_prepare() {
 	default
 
diff --git a/www-servers/tomcat/tomcat-9.0.41.ebuild b/www-servers/tomcat/tomcat-9.0.41.ebuild
index 7f7ed06bb02d..94eda2d7236b 100644
--- a/www-servers/tomcat/tomcat-9.0.41.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.41.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${PN}-${PV}-src"
 
@@ -36,6 +36,8 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
 	dev-java/wsdl4j:0"
 RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
 	virtual/jre"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
@@ -65,12 +67,6 @@ src_unpack() {
 	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
 }
 
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
 src_prepare() {
 	default
 
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 4d43a4b89e90..84ab9244bc67 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -1,5 +1,3 @@
-DIST tornado-4.5.3.tar.gz 484221 BLAKE2B 7b3682fa85a7f6ad32351d40993516a3e397b7b0a5de9d807bcd8b2b21325a6170f3670cb13e12aa208b6590313cf165ddf40537dba1fee61fa9d71954265a66 SHA512 c17dd7a3b541c26950d27c8a399ae4fdff1d99d16ff0c5de9871fe2de4c0f797c96712b23b5ed5efdaee06bb251f7def114c83fe6f7f37f344cdac9996d14448
 DIST tornado-6.0.4.tar.gz 496204 BLAKE2B 6c092214d03baf5cf7615b780043e2fa40a4ed623b7ca59a2528cc3625ba904b21ef93c528278adedaf83e3b6e5a6311d867833dfe9826637e97918dee6fa334 SHA512 d29d69cf40f8b34fb2c55d81b6ecd9bc7c6fdf644eb4ff35452829510c0d5ec185da0a6067fec3e8afb2bedf9f5f08b06adb0ad53dcab04cb791a75abc304d6e
-EBUILD tornado-4.5.3.ebuild 1272 BLAKE2B 803fffb9d8b1568ad02836612c73aa1b9d4c8ab409aba395d6a7a44adb786f03145936328b650536c88564f66a5dbf337b587a30e03d092753fbc104d2dcab3c SHA512 089dacaeeb8fe14380d3afcf5a9ba91b580d9bd67559433f3143e5b73a7ad879367a199862e81494df279a38b4bb631718dbc8bf22dfbda65734bf8b5481c7e4
 EBUILD tornado-6.0.4.ebuild 1377 BLAKE2B 8b418d14a03da19b2330ef40a109d2792dc6522c45b76323d554afe1f2b99a263dd82415ae3160b94597e3d7f1e6ee7ad083d728b6002751ec60faa3769d90c4 SHA512 a3b8b6b66516f842573c246eb94d394e790665ebf44e80525ff8b44ae4dc971857f24e78ed327d804ed916da597cf9973aa69540f4e1230d99f122d48564e2a0
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-4.5.3.ebuild b/www-servers/tornado/tornado-4.5.3.ebuild
deleted file mode 100644
index 0c7d57c35956..000000000000
--- a/www-servers/tornado/tornado-4.5.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python web framework and asynchronous networking library"
-HOMEPAGE="http://www.tornadoweb.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-# doc without intersphinx does not build (asyncio error)
-#PATCHES=(
-#	"${FILESDIR}"/4.5.1-drop-intersphinx.patch
-#)
-
-python_test() {
-	"${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r demos/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}