diff --git a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r3 b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r4
similarity index 70%
rename from metadata/md5-cache/dev-java/cdi-api-4.0.1-r3
rename to metadata/md5-cache/dev-java/cdi-api-4.0.1-r4
index f35c82cb98b28..18d1b1d5bf05d 100644
--- a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r3
+++ b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/injection-api:0 dev-java/jakarta-annotations-api:0 dev-java/jakarta-el-api:5.0 dev-java/jakarta-interceptors:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/testng:0 )
+DEPEND=dev-java/injection-api:0 dev-java/jakarta-annotation-api:0 dev-java/jakarta-el-api:5.0 dev-java/jakarta-interceptors:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/testng:0 )
 DESCRIPTION=APIs for CDI (Contexts and Dependency Injection for Java)
 EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.cdi
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/cdi/archive/4.0.1.tar.gz -> cdi-api-4.0.1.tar.gz
 _eclasses_=java-utils-2	c610b1541a10e37cb26ab5b707a744f1	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=b8d39d6bd225c5065b39315a12f5174d
+_md5_=4b60cca2d818a0529c21a7527528de65
diff --git a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-annotation-api-2.1.1
similarity index 87%
rename from metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
rename to metadata/md5-cache/dev-java/jakarta-annotation-api-2.1.1
index 87a640787db68..af83e2a584cc1 100644
--- a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
+++ b/metadata/md5-cache/dev-java/jakarta-annotation-api-2.1.1
@@ -9,6 +9,6 @@ KEYWORDS=amd64 arm64 ppc64
 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 )
 SLOT=0
-SRC_URI=https://github.com/eclipse-ee4j/common-annotations-api/archive/2.1.1.tar.gz -> jakarta-annotations-api-2.1.1.tar.gz
+SRC_URI=https://github.com/eclipse-ee4j/common-annotations-api/archive/2.1.1.tar.gz -> jakarta-annotation-api-2.1.1.tar.gz
 _eclasses_=java-utils-2	c610b1541a10e37cb26ab5b707a744f1	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=5f1af163ec9ff6012cdc5b3fb9bcdf1c
+_md5_=82e1d0de8668504cf794c84f07487a8e
diff --git a/metadata/md5-cache/dev-java/jakarta-annotation-api-3.0.0 b/metadata/md5-cache/dev-java/jakarta-annotation-api-3.0.0
new file mode 100644
index 0000000000000..e3dc7fbbb8944
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakarta-annotation-api-3.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Jakarta Annotations API
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j.ca
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm64 ~ppc64
+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 )
+SLOT=0
+SRC_URI=https://github.com/jakartaee/common-annotations-api/archive/3.0.0.tar.gz -> jakarta-annotation-api-3.0.0.tar.gz
+_eclasses_=java-utils-2	c610b1541a10e37cb26ab5b707a744f1	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
+_md5_=b9b7170037cddb0b6bb3566d54a7add2
diff --git a/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0 b/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0-r1
similarity index 80%
rename from metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
rename to metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0-r1
index 486a683374a1e..7993919d69968 100644
--- a/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
+++ b/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jakarta-annotations-api:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=dev-java/jakarta-annotation-api:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Jakarta Interceptors
 EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.interceptors
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 SLOT=0
 SRC_URI=https://github.com/jakartaee/interceptors/archive/2.1.0-RELEASE.tar.gz -> jakarta-interceptors-2.1.0.tar.gz
 _eclasses_=java-utils-2	c610b1541a10e37cb26ab5b707a744f1	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=a88c34acc85684bc23f9e651aa3251ed
+_md5_=e339367a92c2b7595ebb03b23c42dbe0
diff --git a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0 b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0-r1
similarity index 66%
rename from metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
rename to metadata/md5-cache/dev-java/memoryfilesystem-2.3.0-r1
index 7ae84f84ab720..1bbcc700462e7 100644
--- a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
+++ b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* dev-java/jakarta-annotations-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-11:* dev-java/jakarta-annotation-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=An in memory implementation of a JSR-203 file system.
 EAPI=8
 HOMEPAGE=https://github.com/marschall/memoryfilesystem
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=amd64 arm64 ppc64
 LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-annotations-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-annotation-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/marschall/memoryfilesystem/archive/2.3.0.tar.gz -> memoryfilesystem-2.3.0.tar.gz
 _eclasses_=java-utils-2	c610b1541a10e37cb26ab5b707a744f1	java-pkg-2	6e6478d8b78f18251c008bad32994df9	java-pkg-simple	8221818a4df90800de803a44fd0875b4
-_md5_=3aecece8ab5db52c360c5965b147117c
+_md5_=cd886b5cb9a958af71cb337af805f337
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index f4fb7becd9e06..438b70531338b 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -4827,7 +4827,7 @@ dev-java/cache2k-api 0.23.1: light weight and high performance Java caching libr
 dev-java/cache2k-core 0.23.1: light weight and high performance Java caching library: core
 dev-java/caffeine 2.6.2-r1 2.9.3: A high performance caching library
 dev-java/cal10n 0.8.1: java library for writing localized messages using resource bundle
-dev-java/cdi-api 4.0.1-r3: APIs for CDI (Contexts and Dependency Injection for Java)
+dev-java/cdi-api 4.0.1-r4: APIs for CDI (Contexts and Dependency Injection for Java)
 dev-java/cglib 3.3.0-r2: cglib is a powerful, high performance and quality Code Generation Library
 dev-java/checker-framework-qual 3.47.0 3.48.3: Annotations for type-checking by the Checker Framework
 dev-java/commons-beanutils 1.9.4-r2: Provides easy-to-use wrappers around Reflection and Introspection APIs
@@ -4909,9 +4909,9 @@ dev-java/jai-imageio-core 1.4.0-r1: Java Advanced Imaging Image I/O Tools API co
 dev-java/jai-imageio-jpeg2000 1.4.0-r1: JPEG2000 support for Java Advanced Imaging Image I/O Tools API
 dev-java/jakarta-activation 1.2.2-r1 2.0.1-r1: Jakarta Activation
 dev-java/jakarta-activation-api 1.2.2-r1 2.1.1: Jakarta Activation API jar
-dev-java/jakarta-annotations-api 2.1.1: Jakarta Annotations API
+dev-java/jakarta-annotation-api 2.1.1 3.0.0: Jakarta Annotations API
 dev-java/jakarta-el-api 5.0.1-r1: Jakarta Expression Language defines an expression language for Java applications
-dev-java/jakarta-interceptors 2.1.0: Jakarta Interceptors
+dev-java/jakarta-interceptors 2.1.0-r1: Jakarta Interceptors
 dev-java/jakarta-json-api 1.1.6-r1: JSR 374 (JSON Processing) API
 dev-java/jakarta-mail 2.0.1: Implementation of the Jakarta Mail API
 dev-java/jakarta-mail-api 2.1.3: Jakarta Mail API 2.1 Specification API
@@ -5023,7 +5023,7 @@ dev-java/lzma 22.01: Java code for LZMA compression and decompression
 dev-java/lzmajio 0.95-r4: LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders
 dev-java/maven-bin 3.8.8-r1 3.9.9: Project Management and Comprehension Tool for Java
 dev-java/mchange-commons 0.2.20: a library of arguably useful Java utilities.
-dev-java/memoryfilesystem 2.3.0: An in memory implementation of a JSR-203 file system.
+dev-java/memoryfilesystem 2.3.0-r1: An in memory implementation of a JSR-203 file system.
 dev-java/mersennetwister 0_pre23765-r3: Modified MersenneTwister java port for Freenet
 dev-java/metainf-services 1.11: Generates META-INF/services files automatically
 dev-java/miglayout 5.3: MiGLayout - Java Layout Manager for Swing, SWT and JavaFX
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b942bcc97b44d..b7ce656e9201d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Dec 2024 17:03:23 +0000
+Mon, 09 Dec 2024 17:33:28 +0000