8 files changed, 20 insertions, 68 deletions
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 421efb44806b..e1aca08ee23b 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/batik-1.16-r2 b/metadata/md5-cache/dev-java/batik-1.16-r2
deleted file mode 100644
index ea39b8aea883..000000000000
--- a/metadata/md5-cache/dev-java/batik-1.16-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/zip verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-java/jacl:0 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons-external:1.4 dev-java/xmlgraphics-commons:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=XML Graphics Batik
-EAPI=8
-HOMEPAGE=https://xmlgraphics.apache.org/batik/
-INHERIT=desktop java-pkg-2 java-pkg-simple xdg-utils verify-sig
-IUSE=doc source test verify-sig
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jacl:0 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons-external:1.4 dev-java/xmlgraphics-commons:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1.16
-SRC_URI=mirror://apache/xmlgraphics/batik/source/batik-src-1.16.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/batik/source/batik-src-1.16.tar.gz.asc )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	4ab397252045e0aeb290efb05ea956c7	java-utils-2	c04e82b700f977924b211c7cdbc2f096	verify-sig	798e0173d334021f14ba78a786c37059	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=100e4ec120e6f7f0bc0acbff89f66664
diff --git a/metadata/md5-cache/dev-java/felix-gogo-runtime-1.1.6 b/metadata/md5-cache/dev-java/felix-gogo-runtime-1.1.6
new file mode 100644
index 000000000000..e6ed05826ea7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/felix-gogo-runtime-1.1.6
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-felix ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=dev-java/osgi-annotation:0 dev-java/osgi-cmpn:8 dev-java/osgi-core:0 >=virtual/jdk-1.8:* test? ( dev-java/mockito:2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Apache Felix Gogo Runtime
+EAPI=8
+HOMEPAGE=https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source test verify-sig
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-java/osgi-annotation:0 dev-java/osgi-cmpn:8 dev-java/osgi-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/felix/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz -> felix-gogo-runtime-1.1.6.tar.gz verify-sig? ( https://dlcdn.apache.org/felix/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz.asc -> felix-gogo-runtime-1.1.6.tar.gz.asc )
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	4ab397252045e0aeb290efb05ea956c7	java-utils-2	c04e82b700f977924b211c7cdbc2f096	verify-sig	798e0173d334021f14ba78a786c37059
+_md5_=d795a69a1998506a99b65d1dc3d74173
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.38 b/metadata/md5-cache/dev-java/tomcat-native-1.2.38
deleted file mode 100644
index 280522cb3ce1..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.38
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/native-doc/
-INHERIT=autotools java-pkg-2 java-pkg-simple verify-sig
-IUSE=static-libs doc source test verify-sig
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.38/source/tomcat-native-1.2.38-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.38/source/tomcat-native-1.2.38-src.tar.gz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	4ab397252045e0aeb290efb05ea956c7	java-utils-2	c04e82b700f977924b211c7cdbc2f096	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=3baad26b16e927356ad1f5b5705fc8d1
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.39 b/metadata/md5-cache/dev-java/tomcat-native-1.2.39
index cec9914a6775..89d9d85b3d6c 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.39
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.39
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/native-doc/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=static-libs doc source test verify-sig
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.39/source/tomcat-native-1.2.39-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.39/source/tomcat-native-1.2.39-src.tar.gz.asc )
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	4ab397252045e0aeb290efb05ea956c7	java-utils-2	c04e82b700f977924b211c7cdbc2f096	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=faaea3f917adbf29f713da317f35c372
+_md5_=e5195fe3f25305391193937eda4a56dd
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.5 b/metadata/md5-cache/dev-java/tomcat-native-2.0.5
deleted file mode 100644
index d53ef8abeab7..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/native-doc/
-INHERIT=autotools java-pkg-2 java-pkg-simple verify-sig
-IUSE=static-libs doc source test verify-sig
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.5/source/tomcat-native-2.0.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.5/source/tomcat-native-2.0.5-src.tar.gz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	4ab397252045e0aeb290efb05ea956c7	java-utils-2	c04e82b700f977924b211c7cdbc2f096	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=52badab560d509da82e425e04ba23f57
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.6 b/metadata/md5-cache/dev-java/tomcat-native-2.0.6
index bf1ab7d66ebe..e8c93c7d134f 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.6
+++ b/metadata/md5-cache/dev-java/tomcat-native-2.0.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/native-doc/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=static-libs doc source test verify-sig
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.6/source/tomcat-native-2.0.6-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.6/source/tomcat-native-2.0.6-src.tar.gz.asc )
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	4ab397252045e0aeb290efb05ea956c7	java-utils-2	c04e82b700f977924b211c7cdbc2f096	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=901ea30bfeaab5bc28e0b8f820360042
+_md5_=375b81a07dfa2406148b83f5ebeefc8a
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
deleted file mode 100644
index 47a75177a0f2..000000000000
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-commons ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jdk-1.8:* test? ( dev-java/mockito:4 dev-java/xml-commons-resolver:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=XML Graphics Commons
-EAPI=8
-HOMEPAGE=https://xmlgraphics.apache.org/commons/
-INHERIT=java-pkg-2 java-pkg-simple verify-sig
-IUSE=doc source test verify-sig
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.8-src.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-2.8-src.tar.gz.asc )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	4ab397252045e0aeb290efb05ea956c7	java-utils-2	c04e82b700f977924b211c7cdbc2f096	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=27fb897dbfca96b035e17332b7265c7c