2022-01-21 10:22:04 UTC

16 files changed, 106 insertions, 19 deletions

diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.16 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.16
new file mode 100644
index 000000000000..4cacd2cbe335
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=source
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=5.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.16/src/apache-tomcat-10.0.16-src.tar.gz
+_eclasses_=java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118
+_md5_=484ed8723ef13a21c7a8ed2078e7409b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.75 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.75
new file mode 100644
index 000000000000..ed9f1bbe4195
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.75
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.75/src/apache-tomcat-8.5.75-src.tar.gz
+_eclasses_=java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118
+_md5_=ab5d48ecbb7dcf4732f97868224457ca
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.58 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.58
new file mode 100644
index 000000000000..8aff9c05f857
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.58
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.58/src/apache-tomcat-9.0.58-src.tar.gz
+_eclasses_=java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118
+_md5_=08ded5a97f72bfd8d150c726103afe2f
diff --git a/metadata/md5-cache/dev-lua/dkjson-2.6 b/metadata/md5-cache/dev-lua/dkjson-2.6
index 480407c5cb68..ea5324baf623 100644
--- a/metadata/md5-cache/dev-lua/dkjson-2.6
+++ b/metadata/md5-cache/dev-lua/dkjson-2.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://dkolf.de/src/dkjson-lua.fsl/
 INHERIT=lua toolchain-funcs
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.6.tar.gz?uuid=release_2_5 -> dkjson-2.6.tar.gz
 _eclasses_=multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	lua	f41923d10bccf946e7ce65f103ab577d
-_md5_=4bdf268b29cdf8ff2a5013d1997cf3f6
+_md5_=0e89a2cba7ae1688ce8c82c88fb69549
diff --git a/metadata/md5-cache/media-gfx/feh-3.7.2 b/metadata/md5-cache/media-gfx/feh-3.7.2
index 178ca4d1592f..12c05cd4c443 100644
--- a/metadata/md5-cache/media-gfx/feh-3.7.2
+++ b/metadata/md5-cache/media-gfx/feh-3.7.2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://feh.finalrewind.org/
 INHERIT=toolchain-funcs xdg-utils
 IUSE=debug curl exif test xinerama inotify
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86
 LICENSE=feh
 RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://feh.finalrewind.org/feh-3.7.2.tar.bz2
 _eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=ef7b3eb38b93125b1f708c18c8e1621a
+_md5_=4d15f37413e97dcf26d5218a52faf0b6
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc2 b/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc2
index ce929d4d6c15..bdcd83928c2f 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc2
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ https://github.com/jbenden/mod_clamav http://gssmod.sourceforge.net/
 INHERIT=multilib systemd tmpfiles toolchain-funcs
 IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
 REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.8rc2.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://github.com/jbenden/mod_clamav/archive/v0.14rc2.tar.gz -> proftpd-mod_clamav-0.14rc2.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.9.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8
-_md5_=3513a510be1a64514af22a1ec9ce20f1
+_md5_=d6714b5b554590e27830dcc9f4e0d4ad
diff --git a/metadata/md5-cache/sys-fs/mergerfs-2.33.1 b/metadata/md5-cache/sys-fs/mergerfs-2.33.1
index a42cddacd8be..caac619e5b2a 100644
--- a/metadata/md5-cache/sys-fs/mergerfs-2.33.1
+++ b/metadata/md5-cache/sys-fs/mergerfs-2.33.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/trapexit/mergerfs
 INHERIT=toolchain-funcs
 IUSE=+xattr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC LGPL-2.1
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=https://github.com/trapexit/mergerfs/archive/2.33.1.tar.gz -> mergerfs-2.33.1.tar.gz
 _eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784
-_md5_=c36fe198a9910df6da840b1ae4c4b657
+_md5_=e469fcb0bb9d0e95c4daafe417bf40fb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.173 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.173
index efeb694d9d0b..33260f1ded23 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.173
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.173
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.kernel.org/
 INHERIT=kernel-build
 IUSE=debug savedconfig +initramfs test
-KEYWORDS=amd64 ~arm64 ~ppc ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.173
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.173 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.173
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-177.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-177.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	python-utils-r1	54423f1e035828362c248fad528ebbba	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	dist-kernel-utils	7e2698cba088db6490f6e364edfbdf1e	mount-boot	02a45c5e022c08dbc05178522b2772f2	kernel-install	de572f44bffdb7e6199595c2280b90ee	kernel-build	5f5dcb152079b8fd5773b438c9397f0b
-_md5_=ee76708619831e297f4f654d2c452e55
+_md5_=6a94d6e50c04777981f3e4fd0d1da095
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.173 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.173
index 26b870d335ad..1292b3d6459a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.173
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.173
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.kernel.org/
 INHERIT=kernel-install toolchain-funcs
 IUSE=+initramfs test
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.173
 RDEPEND=!sys-kernel/gentoo-kernel:5.4.173 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.173
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-177.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-177.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.173-1.xpak -> gentoo-kernel-5.4.173-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.173-1.xpak -> gentoo-kernel-5.4.173-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.173-1.xpak -> gentoo-kernel-5.4.173-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.173-1.xpak -> gentoo-kernel-5.4.173-1.x86.xpak )
 _eclasses_=dist-kernel-utils	7e2698cba088db6490f6e364edfbdf1e	mount-boot	02a45c5e022c08dbc05178522b2772f2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	kernel-install	de572f44bffdb7e6199595c2280b90ee
-_md5_=8bf54b19675ea399ecc7ba6a8421356a
+_md5_=138ce6398d3919ebea4739dbabf7ff81
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.173 b/metadata/md5-cache/virtual/dist-kernel-5.4.173
index fad35a2c9545..f0512f0934e6 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.173
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.173
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=amd64 ~arm64 ~ppc ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.173 ~sys-kernel/gentoo-kernel-bin-5.4.173 ~sys-kernel/vanilla-kernel-5.4.173 )
 SLOT=0/5.4.173
-_md5_=33d7e7f9ccaf321a555f10531069af90
+_md5_=2efd2e23ef65c3ee0fb3f77c654bb35e
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.16 b/metadata/md5-cache/www-servers/tomcat-10.0.16
new file mode 100644
index 000000000000..11882a8749c4
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.0.16
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.16:5.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix
+IUSE=extra-webapps doc source test
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.16:5.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=10
+SRC_URI=mirror://apache/tomcat/tomcat-9/v10.0.16/src/apache-tomcat-10.0.16-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
+_eclasses_=java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	java-ant-2	262d853e2dd1056dc103b953dfc113b9	prefix	d04f14b297013ad1410550c0757f14f8
+_md5_=3a4fae740d6bfc01c2ea1176fcf721bf
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.75 b/metadata/md5-cache/www-servers/tomcat-8.5.75
new file mode 100644
index 000000000000..2ab08b2310c8
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.75
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.75:3.1 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 doc? ( dev-java/glassfish-xmlrpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix
+IUSE=extra-webapps doc source test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.75:3.1 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.75/src/apache-tomcat-8.5.75-src.tar.gz
+_eclasses_=java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	java-ant-2	262d853e2dd1056dc103b953dfc113b9	prefix	d04f14b297013ad1410550c0757f14f8
+_md5_=87497b61b1d6d220162ee8bf9e237131
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.58 b/metadata/md5-cache/www-servers/tomcat-9.0.58
new file mode 100644
index 000000000000..394eb526c4e0
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.58
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.58:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 virtual/jdk:1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix
+IUSE=extra-webapps doc source test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.58:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.58/src/apache-tomcat-9.0.58-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
+_eclasses_=java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	java-ant-2	262d853e2dd1056dc103b953dfc113b9	prefix	d04f14b297013ad1410550c0757f14f8
+_md5_=e97e807b5b4864dc1822da31ee67a052
diff --git a/metadata/md5-cache/x11-misc/redshift-1.12-r5 b/metadata/md5-cache/x11-misc/redshift-1.12-r5
index 4b0b51fa6102..3d1f2654f73b 100644
--- a/metadata/md5-cache/x11-misc/redshift-1.12-r5
+++ b/metadata/md5-cache/x11-misc/redshift-1.12-r5
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=http://jonls.dk/redshift/
 INHERIT=flag-o-matic systemd autotools gnome2-utils python-r1
 IUSE=appindicator geoclue gtk nls python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm appindicator? ( dev-libs/libappindicator:3[introspection] ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ) gtk? ( dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 REQUIRED_USE=gtk? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/jonls/redshift/archive/v1.12.tar.gz -> redshift-1.12.tar.gz
 _eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	systemd	2736b403a83f194b59b767f3b344c2c1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	xdg-utils	4f29a8b760a594a212abe9c2ba957c31	gnome2-utils	239e7afa214b50012f83b8bb61de7555	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	54423f1e035828362c248fad528ebbba	python-r1	4c008ab1e6c02cbead059dfe8b864c26
-_md5_=2ff70219409b91b886e66a9949a97a1f
+_md5_=c78416402fa0453864dec45aca27a46c
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 7b3077cb6378..24262b2a2243 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -5269,7 +5269,7 @@ dev-java/tijmp 0.8-r1: Java Memory Profiler
 dev-java/tomcat-jstl-impl 1.2.5-r1: JSP Standard Tag Library (JSTL) - Implementation jar
 dev-java/tomcat-jstl-spec 1.2.5-r1: JSP Standard Tag Library (JSTL) - Specification jar
 dev-java/tomcat-native 1.2.31: Allows Tomcat to use certain native resources for better performance
-dev-java/tomcat-servlet-api 4.1.40 5.5.36 6.0.53-r1 7.0.109 8.5.73 9.0.56 10.0.14: Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
+dev-java/tomcat-servlet-api 4.1.40 5.5.36 6.0.53-r1 7.0.109 8.5.73 8.5.75 9.0.56 9.0.58 10.0.14 10.0.16: Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 dev-java/touchgraph-graphlayout 1.22-r1: TouchGraph provides a set of interfaces for graph visualization
 dev-java/treelayout 1.0.2 1.0.3: Efficiently create compact tree layouts in Java
 dev-java/trove 3.0.2-r3 3.0.3: GNU Trove: High performance collections for Java
@@ -18461,7 +18461,7 @@ www-servers/sniproxy 0.6.0-r1: Proxies incoming HTTP and TLS connections based o
 www-servers/spawn-fcgi 1.6.4-r1: A FCGI spawner for lighttpd and cherokee and other webservers
 www-servers/thin 1.8.1: A fast and very simple Ruby web server
 www-servers/thttpd 2.27.1-r2 9999: Fork of thttpd, a small, fast, multiplexing webserver
-www-servers/tomcat 7.0.109 8.5.73 9.0.56 10.0.14: Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
+www-servers/tomcat 7.0.109 8.5.73 8.5.75 9.0.56 9.0.58 10.0.14 10.0.16: Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
 www-servers/tornado 6.1: Python web framework and asynchronous networking library
 www-servers/uwsgi 2.0.19.1-r108: uWSGI server for Python web applications
 www-servers/varnish 6.5.2 6.6.1 7.0.1: Varnish is a state-of-the-art, high-performance HTTP accelerator
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b2f4068595d1..50988a0e28e2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 21 Jan 2022 09:51:56 +0000
+Fri, 21 Jan 2022 10:22:04 +0000