2022-12-06 09:01:55 UTC

9 files changed, 81 insertions, 11 deletions

diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.5 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6
index f23813cc9af6..ee6fa1ad61ad 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.5
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/bcel-6.6.0:0 >=dev-java/commons-compress-1.21:0 >=dev-java/commons-io-2.11.0:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.tar.gz -> jakartaee-migration-1.0.5-sources.tar.gz
+SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.6/source/jakartaee-migration-1.0.6-src.tar.gz -> jakartaee-migration-1.0.6-sources.tar.gz
 _eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5
-_md5_=633b9d98bf9ef477362f98cb6c751c3b
+_md5_=99e160dd22484b5da83b333338be687e
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.70 b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.70
new file mode 100644
index 000000000000..d7f5690be7bb
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.70
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.70:9.0.70 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's EL API 3.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+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.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz.asc )
+_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=cee843021497cb85545abd2aaa566001
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.70 b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.70
new file mode 100644
index 000000000000..f3e556078689
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.70
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.70:9.0.70 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-9.0.70:3.0 ~dev-java/tomcat-servlet-api-9.0.70:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's JSP API 2.3 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+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/tomcat-el-api-9.0.70:3.0 ~dev-java/tomcat-servlet-api-9.0.70:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.3
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz.asc )
+_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=3dbd459cc9340613221f38e9d3a2d2de
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.70 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.70
new file mode 100644
index 000000000000..fdf2007a4edd
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.70
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.70:9.0.70 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-9.0.70:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 4.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+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/tomcat-el-api-9.0.70:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz.asc )
+_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=fb9cd723f35bc1788cd5ab3334848745
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.70 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.70
new file mode 100644
index 000000000000..351ecf7ff9bc
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.70
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=public-domain
+SLOT=9.0.70
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-9/v9.0.70/KEYS -> openpgp-keys-apache-tomcat-9.0.70-KEYS.asc
+_md5_=2a0dd85294d3a36dbaa4f7672373bf44
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2865.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2867.29
index 007a06d6519a..2781d9d5ddd6 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2865.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2867.29
@@ -10,6 +10,6 @@ LICENSE=Vivaldi
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2865.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2865.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2865.3-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2867.29-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2867.29-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2867.29-1_arm64.deb )
 _eclasses_=toolchain-funcs	959e1d99122907eb98a3a660297a967e	multilib	5ca4e49abed8e3a2f7b56920eadee157	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	unpacker	bc57272a0491765c71d973c8cfd35063	xdg-utils	ac0e315a3688929e34ac75b139e7349a	xdg	6024fbc93167fad782e2032933654857
 _md5_=a7a95f70f001c3763cc0797c10fee920
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.70 b/metadata/md5-cache/www-servers/tomcat-9.0.70
new file mode 100644
index 000000000000..432a6aaf4922
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.70
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.70:9.0.70 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+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-el-api-9.0.70:3.0 ~dev-java/tomcat-jsp-api-9.0.70:2.3 ~dev-java/tomcat-servlet-api-9.0.70: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 verify-sig
+IUSE=extra-webapps doc source test verify-sig
+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-el-api-9.0.70:3.0 ~dev-java/tomcat-jsp-api-9.0.70:2.3 ~dev-java/tomcat-servlet-api-9.0.70:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=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.70/src/apache-tomcat-9.0.70-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.3.1/biz.aQute.bnd-6.3.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.3.1/biz.aQute.bndlib-6.3.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz.asc )
+_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	959e1d99122907eb98a3a660297a967e	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=7c53fbb4ecc87c3270bf5a8797db4298
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index b809bf5f7d49..abee807529d1 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -5016,7 +5016,7 @@ dev-java/jakarta-oro 2.0.8-r5: A set of text-processing Java classes
 dev-java/jakarta-regexp 1.4-r3: 100% Pure Java Regular Expression package
 dev-java/jakarta-servlet-api 4.0.4 6.0.0: Javax servlet API
 dev-java/jakarta-xml-soap-api 1.4.2-r1: SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)
-dev-java/jakartaee-migration 1.0.4 1.0.5: Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9
+dev-java/jakartaee-migration 1.0.4 1.0.6: Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9
 dev-java/jal 20031117-r6: Partial port of the C++ Standard Template Library
 dev-java/janino 3.1.7: An embedded compiler for run-time compilation purposes
 dev-java/jansi 1.13 2.4.0-r1: Jansi is a java library for generating and interpreting ANSI escape sequences.
@@ -5177,10 +5177,10 @@ dev-java/swingx-ws 1.0_p20110515-r2: Utilities and widgets to integrate Swing GU
 dev-java/swt 3.7.2-r3 3.8.2-r4 4.10-r2: GTK based SWT Library
 dev-java/system-rules 1.19.0: A collection of JUnit rules for testing code which uses java.lang.System.
 dev-java/testng 6.9.10-r1: Testing framework inspired by JUnit and NUnit with new features
-dev-java/tomcat-el-api 8.5.83-r1 8.5.84 9.0.68-r1 9.0.69 10.0.27-r1 10.1.1 10.1.2: Tomcat's EL API 5.0 implementation
-dev-java/tomcat-jsp-api 8.5.83-r1 8.5.84 9.0.68-r1 9.0.69 10.0.27-r1 10.1.1 10.1.2: Tomcat's JSP API 3.1 implementation
+dev-java/tomcat-el-api 8.5.83-r1 8.5.84 9.0.68-r1 9.0.69 9.0.70 10.0.27-r1 10.1.1 10.1.2: Tomcat's EL API 5.0 implementation
+dev-java/tomcat-jsp-api 8.5.83-r1 8.5.84 9.0.68-r1 9.0.69 9.0.70 10.0.27-r1 10.1.1 10.1.2: Tomcat's JSP API 3.1 implementation
 dev-java/tomcat-native 1.2.35: 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.83-r1 8.5.84 9.0.68-r1 9.0.69 10.0.27-r1 10.1.1 10.1.2: Tomcat's Servlet API 6.0 implementation
+dev-java/tomcat-servlet-api 4.1.40 5.5.36 6.0.53-r1 7.0.109 8.5.83-r1 8.5.84 9.0.68-r1 9.0.69 9.0.70 10.0.27-r1 10.1.1 10.1.2: Tomcat's Servlet API 6.0 implementation
 dev-java/treelayout 1.0.3-r1: Efficient and customizable TreeLayout Algorithm in Java.
 dev-java/typesafe-config 1.4.2: A library of arguably useful Java utilities
 dev-java/univocity-parsers 2.9.1: A collection of extremely fast and reliable parsers for Java
@@ -16942,7 +16942,7 @@ sec-keys/openpgp-keys-adamspiers 20210426: OpenPGP keys used by Adam Spiers
 sec-keys/openpgp-keys-alexbarton 20210416: OpenPGP keys used by Alex Barton
 sec-keys/openpgp-keys-antoniodiazdiaz 20220406: OpenPGP keys used by Antonio Diaz Diaz
 sec-keys/openpgp-keys-apache-commons 20221022: OpenPGP keys used by commons.apache.org
-sec-keys/openpgp-keys-apache-tomcat 8.5.84 9.0.69 10.1.2: OpenPGP keys used by tomcat.apache.org
+sec-keys/openpgp-keys-apache-tomcat 8.5.84 9.0.69 9.0.70 10.1.2: OpenPGP keys used by tomcat.apache.org
 sec-keys/openpgp-keys-apache-xalan-c 20221123: OpenPGP keys used to sign Apache Xalan-C
 sec-keys/openpgp-keys-baldurkarlsson 20220415: OpenPGP keys used by Baldur Karlsson
 sec-keys/openpgp-keys-bcl 20210128: OpenPGP keys used by Brian C. Lane
@@ -18560,7 +18560,7 @@ www-client/surf 2.1-r2 9999: A simple web browser based on WebKit/GTK+
 www-client/surfraw 2.3.0-r3 99999: A fast unix command line interface to WWW
 www-client/uget 2.2.1-r1 9999: Download manager using gtk+ and libcurl
 www-client/vivaldi 5.5.2805.48 5.5.2805.50: A browser for our friends
-www-client/vivaldi-snapshot 5.6.2865.3 5.6.2867.22: A browser for our friends
+www-client/vivaldi-snapshot 5.6.2867.22 5.6.2867.29: A browser for our friends
 www-client/w3m 0.5.3_p20210102 0.5.3_p20220216 0.5.3_p20220429 0.5.3_p20220429-r1: Text based WWW browser, supports tables and frames
 www-client/w3mmee 0.3.2_p24-r12: A variant of w3m with support for multiple character encodings
 www-misc/awstats 7.8-r1: AWStats is short for Advanced Web Statistics
@@ -18607,7 +18607,7 @@ www-servers/servefile 0.5.3 0.5.3-r1: Serve a single file via HTTP
 www-servers/sniproxy 0.6.0-r1: Proxies incoming HTTP and TLS connections based on the hostname
 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/tomcat 8.5.83 8.5.84 9.0.68 9.0.69 10.0.27 10.1.1 10.1.2: Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
+www-servers/tomcat 8.5.83 8.5.84 9.0.68 9.0.69 9.0.70 10.0.27 10.1.1 10.1.2: Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
 www-servers/uwsgi 2.0.19.1-r109: uWSGI server for Python web applications
 www-servers/varnish 7.1.1-r1 7.1.2-r1: Varnish is a state-of-the-art, high-performance HTTP accelerator
 www-servers/webfs 1.21: Lightweight HTTP server for static content
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 229fa57cfb30..b8e3cdc0b4b9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Dec 2022 08:52:52 +0000
+Tue, 06 Dec 2022 09:01:55 +0000