diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12 b/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
new file mode 100644
index 0000000000000..167c634b478b5
--- /dev/null
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* dev-java/jakarta-activation-api:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=istack common utility code
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j/istack-commons/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/3.0.12.tar.gz -> jaxb-istack-commons-3.0.12.tar.gz
+_eclasses_=java-utils-2	eefed04ac580a259ecda1fbd966640b7	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531
+_md5_=8e37b97c94e7d76c618bb50d25da6c88
diff --git a/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8 b/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
new file mode 100644
index 0000000000000..d0ba082ca113a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* dev-java/fastinfoset:0 dev-java/istack-commons-runtime:3 dev-java/jaxb-api:2 dev-java/jaxb-stax-ex:1 ~dev-java/txw2-2.3.8:2 >=dev-java/jakarta-activation-api-1.2.2:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=JAXB (JSR 222) Reference Implementation
+EAPI=8
+HOMEPAGE=https://eclipse-ee4j.github.io/jaxb-ri/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/fastinfoset:0 dev-java/istack-commons-runtime:3 dev-java/jaxb-api:2 dev-java/jaxb-stax-ex:1 ~dev-java/txw2-2.3.8:2 >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/2.3.8-RI.tar.gz -> jaxb-ri-2.3.8.tar.gz
+_eclasses_=java-utils-2	eefed04ac580a259ecda1fbd966640b7	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531
+_md5_=22796e94499c26c6d698742521a56c8f
diff --git a/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3 b/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
new file mode 100644
index 0000000000000..91f5a6e58c7e6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jakarta-activation-api:1 dev-java/jaxb-api:2 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Extensions to JSR-173 StAX API
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j/stax-ex
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=1
+SRC_URI=https://github.com/eclipse-ee4j/jaxb-stax-ex/archive/1.8.3.tar.gz -> jaxb-stax-ex-1.8.3.tar.gz
+_eclasses_=java-utils-2	eefed04ac580a259ecda1fbd966640b7	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531
+_md5_=e703680ef68fcf9f65dcd422c1a473f5
diff --git a/metadata/md5-cache/dev-java/jaxrs-api-2.1.6 b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6
index 735910342e4f1..1700e5c4bf86b 100644
--- a/metadata/md5-cache/dev-java/jaxrs-api-2.1.6
+++ b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/rest/archive/2.1.6.tar.gz -> jaxrs-api-2.1.6.tar.gz
 _eclasses_=java-utils-2	eefed04ac580a259ecda1fbd966640b7	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531
-_md5_=19bdf442bae5c4fca38343ac70ee1005
+_md5_=1d234534441cb870a504a24bee569020
diff --git a/metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1 b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1
new file mode 100644
index 0000000000000..2e7cfd0b0b9aa
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* dev-java/jakarta-activation-api:1 dev-java/jaxb-api:2 test? ( dev-java/jaxb-runtime:2 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Jakarta RESTful Web Services API
+EAPI=8
+HOMEPAGE=https://github.com/jakartaee/rest
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64
+LICENSE=EPL-2.0 GPL-2-with-classpath-exception
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jakartaee/rest/archive/2.1.6.tar.gz -> jaxrs-api-2.1.6.tar.gz
+_eclasses_=java-utils-2	eefed04ac580a259ecda1fbd966640b7	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531
+_md5_=1877273c251f62f857611b591c7ef695
diff --git a/metadata/md5-cache/dev-java/txw2-2.3.8 b/metadata/md5-cache/dev-java/txw2-2.3.8
new file mode 100644
index 0000000000000..c54357b04a946
--- /dev/null
+++ b/metadata/md5-cache/dev-java/txw2-2.3.8
@@ -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=TXW is a library that allows you to write XML documents
+EAPI=8
+HOMEPAGE=https://eclipse-ee4j.github.io/jaxb-ri/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2
+SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/2.3.8-RI.tar.gz -> jaxb-ri-2.3.8.tar.gz
+_eclasses_=java-utils-2	eefed04ac580a259ecda1fbd966640b7	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531
+_md5_=4c32592496bc140bb2f79f792dcd849b
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.12 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.12
index 0b81adc3753af..0b892933b18fb 100644
--- a/metadata/md5-cache/dev-ruby/rash_alt-0.4.12
+++ b/metadata/md5-cache/dev-ruby/rash_alt-0.4.12
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/hashie-3.4:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/hashie-3.4:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/hashie-3.4:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/hashie-3.4:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/hashie-3.4:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Rash alt version for Hashie's own Rash
 EAPI=8
 HOMEPAGE=https://github.com/shishi/rash_alt
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/hashie-3.4:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/hashie-3.4:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/hashie-3.4:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/hashie-3.4:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/hashie-3.4:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rash_alt-0.4.12.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	ruby-utils	2412b1152083f1e866ae6df229d51d30	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c
-_md5_=88f73a34895242c3f52a3f831670235c
+_md5_=a1f0aada5f5a86b49df1b0a921cff5c1
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 5bdc60c44e32a..4287ab7060972 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -4611,7 +4611,7 @@ dev-java/icedtea-web 1.8.8-r1: FOSS Java browser plugin and Web Start implementa
 dev-java/icu4j 72.1: A set of Java libraries providing Unicode and Globalization support
 dev-java/injection-api 2.0.1: Jakarta Dependency Injection
 dev-java/iso-relax 20050331-r5: Interfaces useful for applications which support RELAX Core
-dev-java/istack-commons-runtime 4.1.1-r1: istack common utility code
+dev-java/istack-commons-runtime 3.0.12 4.1.1-r1: istack common utility code
 dev-java/j2objc-annotations 2.8: Annotations for the J2ObjC Java to Objective-C translator
 dev-java/jackcess 4.0.0: A pure Java library for reading from and writing to MS Access databases
 dev-java/jackrabbit-webdav 2.10.1-r3: Fully conforming implementation of the JRC API (specified in JSR 170 and 283)
@@ -4659,10 +4659,10 @@ dev-java/javax-mail 1.6.7-r1: Jakarta Mail API
 dev-java/javax-servlet-api 2.5: JavaServlet(TM) Specification
 dev-java/jax-rpc-api 1.1.4: Eclipse Project for Stable EE4J APIs
 dev-java/jaxb-api 2.3.3-r1 3.0.1-r1 4.0.0: Jakarta XML Binding API
-dev-java/jaxb-runtime 4.0.0-r1: JAXB (JSR 222) Reference Implementation
-dev-java/jaxb-stax-ex 2.1.0-r1: Extensions to JSR-173 StAX API.
+dev-java/jaxb-runtime 2.3.8 4.0.0-r1: JAXB (JSR 222) Reference Implementation
+dev-java/jaxb-stax-ex 1.8.3 2.1.0-r1: Extensions to JSR-173 StAX API.
 dev-java/jaxen 1.2.0-r1: Jaxen is a universal XPath engine for Java
-dev-java/jaxrs-api 2.1.6: Jakarta RESTful Web Services API
+dev-java/jaxrs-api 2.1.6 2.1.6-r1: Jakarta RESTful Web Services API
 dev-java/jaxws-api 2.3.3: JAX-WS (JSR 224) API (Eclipse Project for JAX-WS)
 dev-java/jbig2-imageio 3.0.3: PDFBox JBIG2 ImageIO plugin
 dev-java/jbitcollider-core 0.8-r1: Core classes of jBitcollider: org.bitpedia.collider.core
@@ -4808,6 +4808,7 @@ dev-java/tomcat-jsp-api 8.5.85 9.0.71 10.1.5: Tomcat's JSP API 3.1 implementatio
 dev-java/tomcat-native 1.2.36 2.0.3-r1: 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.85 9.0.71 10.1.5: Tomcat's Servlet API 6.0 implementation
 dev-java/treelayout 1.0.3-r1: Efficient and customizable TreeLayout Algorithm in Java.
+dev-java/txw2 2.3.8: TXW is a library that allows you to write XML documents
 dev-java/typesafe-config 1.4.2: A library of arguably useful Java utilities
 dev-java/unbescape 1.1.6: Advanced yet easy-to-use escape/unescape library for Java
 dev-java/univocity-parsers 2.9.1: A collection of extremely fast and reliable parsers for Java
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 3989c0360b796..26433d7e8095d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Mar 2023 06:17:02 +0000
+Tue, 21 Mar 2023 06:47:07 +0000