summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-22 07:31:18 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-22 07:31:18 +0100
commit908778078736bd36f7a60a2d576d415cb8e000fa (patch)
treec6a4796c48b608c14dc7e9674cdbd38f905e3c15 /dev-java
parent185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
gentoo resync : 22.05.2021
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin88713 -> 86943 bytes
-rw-r--r--dev-java/ant-eclipse-ecj/Manifest2
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild (renamed from dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild)8
-rw-r--r--dev-java/ant-owanttask/Manifest3
-rw-r--r--dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild36
-rw-r--r--dev-java/ant-owanttask/metadata.xml8
-rw-r--r--dev-java/antlr/Manifest6
-rw-r--r--dev-java/antlr/antlr-2.7.7-r9.ebuild (renamed from dev-java/antlr/antlr-2.7.7-r8.ebuild)8
-rw-r--r--dev-java/antlr/antlr-3.2-r1.ebuild (renamed from dev-java/antlr/antlr-3.2.ebuild)27
-rw-r--r--dev-java/antlr/files/3.2-test-fixes.patch16
-rw-r--r--dev-java/apt-mirror/Manifest3
-rw-r--r--dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild23
-rw-r--r--dev-java/apt-mirror/metadata.xml8
-rw-r--r--dev-java/assertj-core/Manifest2
-rw-r--r--dev-java/assertj-core/assertj-core-2.3.0.ebuild2
-rw-r--r--dev-java/avalon-framework/Manifest2
-rw-r--r--dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild2
-rw-r--r--dev-java/avalon-logkit/Manifest2
-rw-r--r--dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild2
-rw-r--r--dev-java/classmate/Manifest5
-rw-r--r--dev-java/classmate/classmate-0.9.0-r1.ebuild47
-rw-r--r--dev-java/classmate/classmate-1.2.0.ebuild45
-rw-r--r--dev-java/classmate/metadata.xml11
-rw-r--r--dev-java/commons-cli/Manifest2
-rw-r--r--dev-java/commons-cli/commons-cli-1.4.ebuild2
-rw-r--r--dev-java/commons-codec/Manifest4
-rw-r--r--dev-java/commons-codec/commons-codec-1.15.ebuild2
-rw-r--r--dev-java/commons-codec/commons-codec-1.7.ebuild42
-rw-r--r--dev-java/commons-collections/Manifest2
-rw-r--r--dev-java/commons-collections/commons-collections-4.1-r1.ebuild2
-rw-r--r--dev-java/commons-configuration/Manifest4
-rw-r--r--dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild67
-rw-r--r--dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch19
-rw-r--r--dev-java/commons-configuration/metadata.xml13
-rw-r--r--dev-java/commons-io/Manifest2
-rw-r--r--dev-java/commons-io/commons-io-2.8.0.ebuild2
-rw-r--r--dev-java/commons-jelly/Manifest4
-rw-r--r--dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild63
-rw-r--r--dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch59
-rw-r--r--dev-java/commons-jelly/metadata.xml8
-rw-r--r--dev-java/commons-lang/Manifest4
-rw-r--r--dev-java/commons-lang/commons-lang-3.11-r1.ebuild49
-rw-r--r--dev-java/commons-lang/commons-lang-3.12.0.ebuild2
-rw-r--r--dev-java/commons-logging/Manifest2
-rw-r--r--dev-java/commons-logging/commons-logging-1.2-r3.ebuild2
-rw-r--r--dev-java/commons-math/Manifest2
-rw-r--r--dev-java/commons-math/commons-math-3.6.1-r1.ebuild2
-rw-r--r--dev-java/commons-text/Manifest2
-rw-r--r--dev-java/commons-text/commons-text-1.9.ebuild2
-rw-r--r--dev-java/easymock/Manifest2
-rw-r--r--dev-java/easymock/easymock-3.3.1-r1.ebuild2
-rw-r--r--dev-java/ezmorph/Manifest3
-rw-r--r--dev-java/ezmorph/ezmorph-1.0.6.ebuild44
-rw-r--r--dev-java/ezmorph/metadata.xml22
-rw-r--r--dev-java/ical4j/Manifest4
-rw-r--r--dev-java/ical4j/files/1.0.5-build.xml.patch80
-rw-r--r--dev-java/ical4j/ical4j-1.0.5.ebuild57
-rw-r--r--dev-java/ical4j/metadata.xml24
-rw-r--r--dev-java/ini4j/Manifest7
-rw-r--r--dev-java/ini4j/files/ini4j-0.5.1-remove.patch22
-rw-r--r--dev-java/ini4j/files/ini4j-0.5.2-remove.patch22
-rw-r--r--dev-java/ini4j/ini4j-0.5.1.ebuild24
-rw-r--r--dev-java/ini4j/ini4j-0.5.2.ebuild32
-rw-r--r--dev-java/ini4j/metadata.xml14
-rw-r--r--dev-java/jackcess/Manifest2
-rw-r--r--dev-java/jackcess/jackcess-4.0.0.ebuild2
-rw-r--r--dev-java/jakartaee-migration/Manifest4
-rw-r--r--dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild54
-rw-r--r--dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild89
-rw-r--r--dev-java/jaxen/Manifest7
-rw-r--r--dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml200
-rw-r--r--dev-java/jaxen/jaxen-1.1.4-r1.ebuild51
-rw-r--r--dev-java/jaxen/jaxen-1.1.6-r2.ebuild2
-rw-r--r--dev-java/jaxen/jaxen-1.2.0-r1.ebuild10
-rw-r--r--dev-java/jdom/Manifest3
-rw-r--r--dev-java/jdom/jdom-2.0.6-r4.ebuild64
-rw-r--r--dev-java/jdom/jdom-2.0.6-r5.ebuild2
-rw-r--r--dev-java/jflex/Manifest2
-rw-r--r--dev-java/jflex/jflex-1.6.1-r1.ebuild2
-rw-r--r--dev-java/joda-time/Manifest5
-rw-r--r--dev-java/joda-time/files/joda-time-2.7-build.xml262
-rw-r--r--dev-java/joda-time/joda-time-2.10.10-r1.ebuild2
-rw-r--r--dev-java/joda-time/joda-time-2.7-r1.ebuild61
-rw-r--r--dev-java/junitparams/Manifest2
-rw-r--r--dev-java/junitparams/junitparams-1.1.1.ebuild2
-rw-r--r--dev-java/libreadline-java/Manifest2
-rw-r--r--dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild (renamed from dev-java/libreadline-java/libreadline-java-0.8.0-r4.ebuild)8
-rw-r--r--dev-java/log4j/Manifest2
-rw-r--r--dev-java/log4j/log4j-1.2.17-r3.ebuild2
-rw-r--r--dev-java/objenesis-test/Manifest2
-rw-r--r--dev-java/objenesis-test/objenesis-test-3.2.ebuild2
-rw-r--r--dev-java/objenesis/Manifest2
-rw-r--r--dev-java/objenesis/objenesis-3.2.ebuild2
-rw-r--r--dev-java/odfdom/Manifest4
-rw-r--r--dev-java/odfdom/files/build-0.8.6.xml270
-rw-r--r--dev-java/odfdom/metadata.xml8
-rw-r--r--dev-java/odfdom/odfdom-0.8.6-r1.ebuild65
-rw-r--r--dev-java/openjdk-bin/Manifest2
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild2
-rw-r--r--dev-java/openjdk/Manifest2
-rw-r--r--dev-java/openjdk/openjdk-8.292_p10.ebuild2
-rw-r--r--dev-java/oracle-javamail/Manifest2
-rw-r--r--dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild2
-rw-r--r--dev-java/poi/Manifest2
-rw-r--r--dev-java/poi/poi-5.0.0.ebuild2
-rw-r--r--dev-java/saaj/Manifest4
-rw-r--r--dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch13
-rw-r--r--dev-java/saaj/metadata.xml8
-rw-r--r--dev-java/saaj/saaj-1.3.19-r2.ebuild74
-rw-r--r--dev-java/slf4j-api/Manifest2
-rw-r--r--dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild2
-rw-r--r--dev-java/snakeyaml/Manifest4
-rw-r--r--dev-java/snakeyaml/snakeyaml-1.16.ebuild50
-rw-r--r--dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild2
-rw-r--r--dev-java/sparsebitset/Manifest2
-rw-r--r--dev-java/sparsebitset/sparsebitset-1.2.ebuild2
-rw-r--r--dev-java/sun-jai-bin/Manifest1
-rw-r--r--dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild52
-rw-r--r--dev-java/sun-jms/Manifest2
-rw-r--r--dev-java/sun-jms/sun-jms-1.1-r3.ebuild (renamed from dev-java/sun-jms/sun-jms-1.1-r2.ebuild)10
-rw-r--r--dev-java/swt/Manifest2
-rw-r--r--dev-java/swt/swt-4.10-r1.ebuild (renamed from dev-java/swt/swt-4.10.ebuild)12
-rw-r--r--dev-java/tapestry/Manifest6
-rw-r--r--dev-java/tapestry/files/Version.properties5
-rw-r--r--dev-java/tapestry/files/build.properties32
-rw-r--r--dev-java/tapestry/files/common.properties94
-rw-r--r--dev-java/tapestry/metadata.xml15
-rw-r--r--dev-java/tapestry/tapestry-3.0.4-r3.ebuild70
-rw-r--r--dev-java/tomcat-servlet-api/Manifest12
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.6.ebuild98
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild99
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild99
-rw-r--r--dev-java/trident/Manifest1
-rw-r--r--dev-java/trident/trident-1.3-r1.ebuild54
-rw-r--r--dev-java/velocity/Manifest4
-rw-r--r--dev-java/velocity/velocity-1.7-r2.ebuild67
-rw-r--r--dev-java/velocity/velocity-2.3.ebuild2
-rw-r--r--dev-java/xom/Manifest9
-rw-r--r--dev-java/xom/files/xom-1.2.6.patch49
-rw-r--r--dev-java/xom/files/xom-strip-fallback-parser.patch18
-rw-r--r--dev-java/xom/xom-1.2.10.ebuild79
-rw-r--r--dev-java/xom/xom-1.3.2.ebuild42
-rw-r--r--dev-java/xom/xom-1.3.7.ebuild2
146 files changed, 629 insertions, 2680 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d02bb438d885..9f17fadd32a0 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 47dfc2729ce9..95139d30f00d 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -10,7 +10,7 @@ DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6
DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
EBUILD ant-eclipse-ecj-4.10-r1.ebuild 1247 BLAKE2B fec5a58b0569cd24b4f992cce0aa3b3957365ac8e33e9ecd44d1198ee4c368272d8b7c825181519c573a1878d131608acc2bd9b06cf07e4f6007a906d3fe5077 SHA512 04f59d6699ec060918496fdfecfd3214f45ef41e86f81bd80b7d5e29dde9c65bd46cc8346b3751bbb5bd00d2456583a967b31428feeb24f525d10b4ccec9a297
EBUILD ant-eclipse-ecj-4.13.ebuild 1252 BLAKE2B 697a4bfae3f28eda5f91137c1f31198c64f530374218f1b69f2ec3dadc04fd085583f950ef852c410abd0688355c31c5cf715a359ceaf8b2f2422d03c00535dc SHA512 3f6897bc51f8c1b641dee6c7735a38b4d00903d8920c2112f863b185f62fcb67a79a1feedcd09bd103cf9f3d58bfd818f10d3043f862f775df9643b9d01757e8
-EBUILD ant-eclipse-ecj-4.15.ebuild 1252 BLAKE2B de96e1f93f2992a3c9052413e0f87d708ccaeddf1a92f5fa1e9bc8113fe4af43f182e258e92e17fff1b8950dd16f7353896a25c3a46118d686ff26c7fe184971 SHA512 723278db7ebc5c3b812923cfd71e1db9526ad3f05dcfa840d9dba27696b271771f63496e9d67206ee644267853ffa7f9f77980053bbd0a46b00e99de55d3b491
+EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 08dc9cfa8f20c917346ce4bc50492bfde4391107c3748184aae7f91aeb364b0fa3623ff41d69582694c7818562e791566e85c9a6387322f007a659c19592b29c SHA512 718a7717a2cc2762c9220db8da478cb3b96194936ee4dc8b359f843fff768813aec83a482cb651cb7245fc0cb9175ef34ec753811bf83a2f1bfec6b99972e34f
EBUILD ant-eclipse-ecj-4.4.2.ebuild 1248 BLAKE2B dd7249882bbb0c2511e424165dcc12ccdee58baf9985da2182d31d451fa1fb94f736407e303bc1a61d9d43355a7142fd7af1078ff7277122540e1bc0a47786f5 SHA512 310dd8cb237d922b55186fcfad23136e0861464dc6aaa252ea8615a9dcf61a3f6042c5edc463af1147fb1f9d4c76b61fca15a035b8b9718252cc8d9ef85c4277
EBUILD ant-eclipse-ecj-4.5.1.ebuild 1249 BLAKE2B 4f0fd6db9c642716d87396a421521a5087d014c41235436596a1e3d81c32ffc71d6734d1dd858b1d3c4ec088b8adf1cf2920402575910f51f1bda35c6a6f964d SHA512 45c87738ac2c850d2fbbcf1fb2cdbb03b271900b63324f6d9418337431da7fb260371a39814354e6abae1115fa9e84ffd43d6036be7bca724ff0e32780bef69f
MISC metadata.xml 546 BLAKE2B 1d3e6201cf0f0e87bf1ede2db78c4c706d9a59df9321a0820a9d180c7da9736c4af6a3442c1abf175e45969447ef9c8e0a0f8d73ce50985405c445f14c694903 SHA512 999312c6cfed7b52584e3e80ac1a9f5b372a05b1f6523f859b367080e7989c988e2773fd2b0f5ec5fb11da42386e37dffedf761324a41b43c309b3ab5a57fd36
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
index 27aab2586f93..478fe1efa829 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,10 +21,10 @@ IUSE=""
CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
dev-java/ant-core:0"
RDEPEND="${CDEPEND}
- >=virtual/jre-11"
+ >=virtual/jre-11:*"
DEPEND="${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-11"
+ >=virtual/jdk-11:*"
+BDEPEND="app-arch/unzip"
JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
diff --git a/dev-java/ant-owanttask/Manifest b/dev-java/ant-owanttask/Manifest
deleted file mode 100644
index 582590f00729..000000000000
--- a/dev-java/ant-owanttask/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ow_util_ant_tasks_1.3.2.zip 1170518 BLAKE2B bf0792c7ea18f8122a6a8755d976e109bf0d4bc6b26e8ae5dd7e9bdc8d6f1e16e4e0ff40ded79ebb571b57a433e96dd9e259843091be1efa18ac4bb227ea8e89 SHA512 c2ca84d34864b075c39e9699ac1a41c2980615ea6d813d007ee503fe19cfd5c869cdd0f6be27cbfdafc33aa49c32022b99ced2387381fdb6816925957207a603
-EBUILD ant-owanttask-1.3.2.ebuild 858 BLAKE2B d0daab63fbfa81c27ec0cc32c961bd4ae48f2c72d7db9ecc7c57d6bb4c4e213a13cd8fb3c08e0b26a99db751109448208fa574122adab30f5fb052c7e24223e0 SHA512 acf214fb6afc3174c15ade508d414ea9af08fb32430b83898cf3e4f2286441b785e475c6ed849923acd32b97cf37828c646d55b1cc73859adebd17ce48bb3249
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
deleted file mode 100644
index 86f6b6170ee6..000000000000
--- a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="ObjectWeb's Ant tasks"
-HOMEPAGE="http://monolog.objectweb.org"
-SRC_URI="http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_${PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-COMMON_DEP="dev-java/xalan"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
- >=dev-java/ant-core-1.7.0
- ${COMMON_DEP}"
-
-S=${WORKDIR}
-
-src_prepare() {
- rm -f output/lib/*.jar
-}
-
-src_install() {
- java-pkg_dojar output/lib/ow_util_ant_tasks.jar
-}
-
-pkg_postinst() {
- ewarn "The MultipleCopy task is not compatible with ant-1.7.0 and newer"
- ewarn "Attempt to use it will break building."
-}
diff --git a/dev-java/ant-owanttask/metadata.xml b/dev-java/ant-owanttask/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-java/ant-owanttask/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 04140315f67e..271f24335c11 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,5 +1,5 @@
AUX 3.2-java-8.patch 1318 BLAKE2B f7cf19e6da346c50ed066782905fffeac9b9f42c9988bc3ba0d18bc434fecfaa6d4ad3e74d2c84c87854716435be4a596c47b919ce42b310e48dc70d184bc7f5 SHA512 70c9dc23ec64ba75bfcfc0597544b13c2c35c523c6f2c9d82dbc54a44c30a5432a56b6193db74ca9c3d92235bdadc5427857c364abc4df79ffdc1d2b55221d32
-AUX 3.2-test-fixes.patch 10278 BLAKE2B 868e9dc24f26b9933fe169f93b9156b3965473da7e636058ac630455b4f9347f465f86151681ee9734bcf1e435345abb033fbfb7cfbd845d6d41b423ae6478e0 SHA512 b593da8fb05d8ac51b0fd72172b740aeae060bd18c58413c67ff0c5242609b419d4a1b0a4f5ae66d5a3b2103007d4511ece41da6b09dab5f12ffd5f905d45d31
+AUX 3.2-test-fixes.patch 10294 BLAKE2B e2bed0bc4acd8c7de9eacfa6755f81db2cab78fb20518a51051d5a38fb33e25442e5e39ced3a94b525f3dcb5d0bad4c640c3df9da5b431efdf6d76764b11c5bd SHA512 0af15f7e315182f54c65ebcd298ebc02d6715f2233996d0effe7f44eb433e73ed7a33ee12e96d29f72b4437cead864c99150fee60c3c1740b6451619396be72b
AUX 3.5.2-test-fixes.patch 2093 BLAKE2B 4016d770a226f1fb86f7f6e630df38c0d2ed0b4a025991f6b88e88506d2a44838c17097fc4ad5f63e506a839ebce0fcfa8e57f22415f777b0bd4c37afc93a0b1 SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533
DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
@@ -11,8 +11,8 @@ DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55
DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
EBUILD antlr-2.7.7-r7.ebuild 1076 BLAKE2B 49124667f298ebfad5989d19972baed8e3f66c0cdb6ff4027d4c0b1692430debbe2844d87fcfd04d885b728aeaa38554337bff7a1ec227151f43fccdb0559653 SHA512 b9fe195653c78a3bd7ae0ffcee143ccd8bfb770567fb83fe9ff9e7e2201c0ae4683520addaeddd759e0f82fcfb034788c1e933776b3d87e0206eb05cc5f60b08
-EBUILD antlr-2.7.7-r8.ebuild 1087 BLAKE2B c6bdc1f7d552392aa67ef176906a1166015198d5fd2ae67c1c323d664f3313d7333e8669a2b5f354953b7618045a1bd6d9a5dc733c393dcba00732b5745c6852 SHA512 01d07904b06d66fe88467846734466ff8510c0e3c6bec84d03f52ce9db38bbc2e761157ccb5480a59647da4605b6093673c0d71ce0d9290fc545a2251db37b5f
-EBUILD antlr-3.2.ebuild 3258 BLAKE2B d5421808caca91f7b1d15a304c0f37fa6a4216920cf0aef7c66df36a5b622144f23db838cdd7b248037bd45864847368d2b921157fe340b571237df4805b0011 SHA512 63234889e423852a17067dcf253ba63f70443de7e0df4be6dddc423f5035aa582796ecd32906ef4e9421bebfa6c0b419bcfcbe125643715eaf3004f25066f7d0
+EBUILD antlr-2.7.7-r9.ebuild 1126 BLAKE2B d39a0e5d9d46d345dd23ce49cf44c1f40bb1a8c2929dfe98acb0265fb24c06466ead638cfc004999bd60b4a163439846a589062dcc2d1a829b8b7b14ac82c09e SHA512 6af7b69db4a2eab58bdc2ec16872b67e76027c40bfb8d13426c2036d4a788ebc3ce0599dd2bc84f12535325a9c0c68f4ab606dc8a5b2c0412ec3f5f8f78d1f24
+EBUILD antlr-3.2-r1.ebuild 3250 BLAKE2B c167679ccfd464a16bc0bdb59dc41ed59df58861bc2b38acbd042d9237d3ba6ca7d5b593d2edd4f9d9d61bace967490ddb7bea8d8b9f44a0243448f97b613dec SHA512 1df42dea6115d437fd875eb04571f3dad91ca95ce1299b20181faecad2a56277497093068d51c0fa537ac85f3c051524b9e2ffeeb911de5c104ba4f410e46195
EBUILD antlr-3.5.2-r1.ebuild 3022 BLAKE2B 6f3a8b1716d3206391d5f657f732ee1ffe9a02075560afb39ba33b452b03f70b75d953ead0b09a8fd0e96262ef470a39cdb9f852be2e31cfede284d2982d3b0d SHA512 9f19d2fa54a8cfcd0c3d7bc8d6fb0d23886435e0ca6b78da5db97a84598224d9e1a5b68db2d4a4521a3afa60f1e4faa15085d17507e87abe3cfff17417302f74
EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
EBUILD antlr-4.5.3.ebuild 2511 BLAKE2B d1e36cee6e8d101a265a337071c19020528f42a70976b554f2eecf8ec7200ab020e2d971fcc2f0bdcba0be0b4d96f738face2492df498ddf6012aec56a2f4c69 SHA512 ce63e0a89420501f9a7580c409fd30d5714d49ab18cc5f04ecbdba569f9b73307878f3617151146b0c099584eb142166c485dfb4ba24980c78a6ed453a6e4d19
diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index 3ca31ab70cf0..f7a428518635 100644
--- a/dev-java/antlr/antlr-2.7.7-r8.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r9.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc source"
@@ -10,13 +10,14 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A parser generator for many languages"
HOMEPAGE="https://www.antlr2.org/"
SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
+
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
S="${WORKDIR}/${P}"
@@ -43,5 +44,6 @@ src_install() {
use examples && java-pkg_doexamples examples/java
use source && java-pkg_dosrc antlr
+ # https://bugs.gentoo.org/789582
einstalldocs
}
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2-r1.ebuild
index 3efa97660287..fba666dc5ad6 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2-r1.ebuild
@@ -1,30 +1,38 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-inherit epatch java-pkg-2 java-pkg-simple
+JAVA_PKG_IUSE="doc test"
+
+inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A parser generator for many languages"
HOMEPAGE="https://www.antlr3.org/"
SRC_URI="https://www.antlr3.org/download/${P}.tar.gz
https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
+
LICENSE="BSD"
SLOT="3"
KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
RESTRICT="!test? ( test )"
CDEPEND=">=dev-java/antlr-2.7.7-r7:0
dev-java/stringtemplate:0"
RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8:*"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
+ >=virtual/jdk-1.8:*
test? ( dev-java/junit:4 )"
+PATCHES=(
+ # These fixes have been applied in 3.5.
+ "${FILESDIR}/${PV}-test-fixes.patch"
+ "${FILESDIR}/${PV}-java-8.patch"
+)
+
S="${WORKDIR}/${P}"
JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
JAVA_GENTOO_CLASSPATH="antlr,stringtemplate"
@@ -33,13 +41,10 @@ src_unpack() {
unpack ${P}.tar.gz
}
-java_prepare() {
+src_prepare() {
+ default
java-pkg_clean
- # These fixes have been applied in 3.5.
- epatch "${FILESDIR}/${PV}-test-fixes.patch"
- epatch "${FILESDIR}/${PV}-java-8.patch"
-
# Some tests fail under Java 8 in ways that probably aren't limited
# to the tests. This is bad but upstream is never going to update
# 3.2 even though other projects still rely on it. If any issues
@@ -54,7 +59,7 @@ java_prepare() {
src_compile() {
cd "${S}/runtime/Java/src/main" || die
- JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
+ JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" java-pkg-simple_src_compile
cd "${S}/tool/src/main" || die
diff --git a/dev-java/antlr/files/3.2-test-fixes.patch b/dev-java/antlr/files/3.2-test-fixes.patch
index 0544b7006170..28068edb76ba 100644
--- a/dev-java/antlr/files/3.2-test-fixes.patch
+++ b/dev-java/antlr/files/3.2-test-fixes.patch
@@ -1,5 +1,5 @@
---- tool/src/test/java/org/antlr/test/BaseTest.java.orig 2010-11-30 01:54:04.000000000 +0000
-+++ tool/src/test/java/org/antlr/test/BaseTest.java 2015-09-24 22:25:36.872191194 +0100
+--- a/tool/src/test/java/org/antlr/test/BaseTest.java.orig 2010-11-30 01:54:04.000000000 +0000
++++ b/tool/src/test/java/org/antlr/test/BaseTest.java 2015-09-24 22:25:36.872191194 +0100
@@ -130,8 +130,8 @@
try {
Process process =
@@ -43,8 +43,8 @@
buf.append(line);
buf.append('\n');
line = in.readLine();
---- tool/src/test/java/org/antlr/test/TestTopologicalSort.java.orig 2009-09-23 19:36:14.000000000 +0100
-+++ tool/src/test/java/org/antlr/test/TestTopologicalSort.java 2010-11-30 01:54:04.000000000 +0000
+--- a/tool/src/test/java/org/antlr/test/TestTopologicalSort.java.orig 2009-09-23 19:36:14.000000000 +0100
++++ b/tool/src/test/java/org/antlr/test/TestTopologicalSort.java 2010-11-30 01:54:04.000000000 +0000
@@ -49,7 +49,7 @@
g.addEdge("F", "H");
g.addEdge("E", "F");
@@ -72,8 +72,8 @@
List nodes = g.sort();
String result = nodes.toString();
assertEquals(expecting, result);
---- tool/src/test/java/org/antlr/test/TestSemanticPredicates.java.orig 2009-09-23 19:36:12.000000000 +0100
-+++ tool/src/test/java/org/antlr/test/TestSemanticPredicates.java 2015-12-05 13:52:05.923411552 +0000
+--- a/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java.orig 2009-09-23 19:36:12.000000000 +0100
++++ b/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java 2015-12-05 13:52:05.923411552 +0000
@@ -731,19 +731,23 @@
"c : a\n" +
" | b\n" +
@@ -111,8 +111,8 @@
}
@Test
---- tool/src/test/java/org/antlr/test/TestAttributes.java.orig 2015-12-05 13:55:55.392843185 +0000
-+++ tool/src/test/java/org/antlr/test/TestAttributes.java 2015-12-05 14:04:38.120599871 +0000
+--- a/tool/src/test/java/org/antlr/test/TestAttributes.java.orig 2015-12-05 13:55:55.392843185 +0000
++++ b/tool/src/test/java/org/antlr/test/TestAttributes.java 2015-12-05 14:04:38.120599871 +0000
@@ -439,20 +439,15 @@
ErrorManager.setErrorListener(equeue);
Grammar g = new Grammar(
diff --git a/dev-java/apt-mirror/Manifest b/dev-java/apt-mirror/Manifest
deleted file mode 100644
index 60796ca322a3..000000000000
--- a/dev-java/apt-mirror/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST apt-mirror-1.0.tar.bz2 21396 BLAKE2B 996253732f3aeaffeb57d6ac26d5e18ae47a40843a60ffe570edcbd325691b43c69fdd866e44d1d35295b2ccc64f5042f1dbe588a3700cd01ad10927ded702b4 SHA512 fdb58498bc5ff1f77858716b67dd952a3f3bea55d06d7190b1a1d283d11843ebf03c7403ba58f23478c1c553402d21c2089c2dca52f216d693ab713a43f5c1ff
-EBUILD apt-mirror-1.0-r1.ebuild 470 BLAKE2B 91bb7b33aac10fdcc9d548423b6beba8aaaabcb886d6c41f342c27bc02dea4a2c859df3c0ea8828be81f40e17b07c2869f28e7e3a6b0f4039e6299ae69c33998 SHA512 da54c738c49411f69485b732f833a59ca97e7b2285ef3f5a1f405b4b14cf1e1214dbd46fa5897c08395c67b8a9abff06f2a0639936dba41e04693f15e1c76795
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild b/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
deleted file mode 100644
index 67d7bdd5497b..000000000000
--- a/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Annotation processing apt mirror API introduced in J2SE 5.0"
-HOMEPAGE="http://aptmirrorapi.dev.java.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}/apt"
diff --git a/dev-java/apt-mirror/metadata.xml b/dev-java/apt-mirror/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/apt-mirror/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
index 81dd83bf8317..3a5de87e5017 100644
--- a/dev-java/assertj-core/Manifest
+++ b/dev-java/assertj-core/Manifest
@@ -1,3 +1,3 @@
DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3
-EBUILD assertj-core-2.3.0.ebuild 784 BLAKE2B 108ee65b0b2e90be50f290c56fc68bbe8a905018d384e9523a80c74a9d450fcbfaf0f8fc5e0658a0278c7abf55a6d405b03c9158391ffcd3e69ea493bed1ffef SHA512 2b642a8d64dbade28ded16649d64d5d8dcac7d0b6a74f3dc6007226f53e7d499b2061bc6a67b47ed70220d1f7a77de44d82f5dbf60f98609916575af16ad3d48
+EBUILD assertj-core-2.3.0.ebuild 798 BLAKE2B e7589421a5969795660a378cf5c5c0ad63423408a95f26ec3a5476321d6f27f09ec5a77aeae3efe4b765563f4508320b4a97d7d29e5160cfaca78bbab7841c0b SHA512 23b88adc178ce45fcf9579900fb49ed064a3e6fb26e80c21231ad157b5ba937a12cfe314cebbaab13c69a86510cdd00b9653963d828b5e51224fdfe0d1f055f8
MISC metadata.xml 639 BLAKE2B 838a5321ee12c23f8d85c9767a15085724c1fb872fefdc9412d67f113de7e1515dca16afe11c5f5fd55790bb9e4feaac3bd26027a33f728655592bb7bbd448cc SHA512 ae023f76f4d256b3efc4b8393370db21600ebd381066691574ef9f02b962bd49996af10eb74fc009b94860e29b3a18d747943ddb3642e0501c14b41bbe428359
diff --git a/dev-java/assertj-core/assertj-core-2.3.0.ebuild b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
index 6ef61f2b87f5..72ee40183061 100644
--- a/dev-java/assertj-core/assertj-core-2.3.0.ebuild
+++ b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Java library that provides a fluent interface for writing assertion
HOMEPAGE="http://joel-costigliola.github.io/assertj/"
SRC_URI="https://github.com/joel-costigliola/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
SLOT="2"
CDEPEND="dev-java/cglib:3
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index 33658be88b83..57a9c51602a3 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -1,4 +1,4 @@
AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4ba0e45381e18d96c3266769fa23af60888d1baeb86e9456abb091f08cf92a54389e579a05d4 SHA512 a6dafeac52a7e7421c6e97972407b7b5424a8e35bae66153c52b92419c038d0cf31a049619b843ece7f26bcb1fbd675ea36475857609820ab6c66d03d4f8da2b
DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
-EBUILD avalon-framework-4.2.0-r2.ebuild 980 BLAKE2B f370e2378c75139af859c0095ec886fa35053651b2425e684a788b69fdf4befb38d55bbf52c3e211fb526cc0b7bda87a5335e43a27baf04d17ab307f0e816c20 SHA512 00d74942a47021077d7bbc7a6175e68d0dc2e9e7e5f16f1f219edc7fdecb650c96367ac8081ed9ee24cd50e39c0dd5b4a6bd20362b3e7d5964f7ed4c162781c6
+EBUILD avalon-framework-4.2.0-r2.ebuild 979 BLAKE2B 0167018c458b2611ac2ae2b8fb3aab70791126fa5a7dbfc0bc6e485e119aeb1bd50c52d14d457eb34375b0f711fdbe7588fa81dc57b0fef29e7f5d4b9774be24 SHA512 a95563add2e7484edf89c8b2a82ed477dddb35a746ece4e14f26d2dc9a23ae60c146ac1abcd145192139500c22206223286866ca73b39c32bb354d961a79a3d4
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
index 71b22b19ab46..b04d776db7a1 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="4.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
CDEPEND="dev-java/avalon-logkit:2.0
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index 51c09a157b30..cc400b441ebe 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,4 +1,4 @@
AUX avalon-logkit-2.1-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
DIST avalon-logkit-2.1-src.tar.gz 60218 BLAKE2B 1c35b38a22d95cffabb19e099d42697adf7aa6ad471f6cb62e02a30b6612c8405b9f7473ca61ea4f7f9c1f3b1ece6ee68f7ec711b79672330db3ac9e57642e0d SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a
-EBUILD avalon-logkit-2.1-r9.ebuild 1441 BLAKE2B 3bed0691e2f5c4129665612733dde3d231fbfb0f4a09b3ba858cfc80a75e9a35d4b134f1b3c41240ce0205811febbc36ae75648c1af8dae7bed83714315eccbe SHA512 bca49c8f24d197aa35f90636967572d9b398f6dedabe42f99882240de3cb7583b4c3f21cb17677211b8cad6589be7027bd096f1f5de132a230e28c031ed73ae1
+EBUILD avalon-logkit-2.1-r9.ebuild 1440 BLAKE2B 0e757ab22e27ef536cc65e00326d6ff11f070e56fe9805d2d0315945c0c86aa2e27453fd461cf18fa36053b4e552eca4934658b07862f15a883c13a1a6b9a65d SHA512 6af94ed631c817a3db09535925542a4049fafbf4a2cf7dad13fe7473c1e7777c2ab3197fc3cfbeb4b760e52e3f43759dc23fca47fa7fb50b9dd521a2000c0052
MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
index f66302f731e8..efbc19a52df0 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
HOMEPAGE="https://avalon.apache.org/closed.html"
SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
LICENSE="Apache-2.0"
SLOT="2.0"
IUSE=""
diff --git a/dev-java/classmate/Manifest b/dev-java/classmate/Manifest
deleted file mode 100644
index ae0736f6ccfc..000000000000
--- a/dev-java/classmate/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST classmate-0.9.0.tar.gz 57752 BLAKE2B 31247d159be4898b9ae71024da41c8602fe4d82f4ee10edab3146355cac06b23991fe926397737c43341085f35b392fc3f8a6b8278b9e47706f6fd06012f4c59 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2
-DIST classmate-1.2.0.tar.gz 62150 BLAKE2B fac7cb24e527f69863cfb4c59e634ac77165aa5a1ecae9d887511818a87ae9cd2652eb47e72844f3e38bed3c4856185020db6ece90553d14ce84cf6ce859cae7 SHA512 82f38229cbe57531354300b967589afcf064970a2b41ac56ad3520582719416ca878d9a4adc46d46a4470077e5f14ddcf2906b0af03156863301dca0b20d4151
-EBUILD classmate-0.9.0-r1.ebuild 1153 BLAKE2B 8930a2941a6ba2dc88912ad163b6a90959b378b5589c762e35dd0a360337ba0695f554162e21bc5797cb84da76eaa5faf2e8274b35a18d978bfeb8581250bdbe SHA512 3f65f469845ed7e6d86e6f5e0473cac8d0a6c606270a0c256a01f78a5896267c975bf4b9dfbb4f36e25092c20e2baa1fc808ceb1ac18227aba3bee18ba24cfe4
-EBUILD classmate-1.2.0.ebuild 1116 BLAKE2B 25424340aa51ee12ea829a0c53e730eac4c7efe3ce275fde5b89f0d784c869b3c7d98cf66c9f5d53310ac232b5e7d9db54cc57a4a4bf7f9f5b2d031fa98ea23f SHA512 3e3ef8cc197635ea6e0e271bfc632def2a893b38d1549f0f2248c279880fb92b232b0a3e496e0534a7ebb6460fa3ba8c0ec57eae0f829fe3b1c216ef07d84982
-MISC metadata.xml 328 BLAKE2B b3f4d20d37178f91bc06a2b989603370c97231531d8221d2aed030b538e9b0a93e4ae1e906b5a2b56b6877ec175abe04e4bf7b5ef9768bbb17c88879d0721184 SHA512 ed87fc70d548ed88634183da0afb2548e74bbf5f7435edfa25e71392438df87cc1e18aa90264519009f445810ccd750626460dccb66e0f68ac844c44ba8d9430
diff --git a/dev-java/classmate/classmate-0.9.0-r1.ebuild b/dev-java/classmate/classmate-0.9.0-r1.ebuild
deleted file mode 100644
index f6deb6b4e717..000000000000
--- a/dev-java/classmate/classmate-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
-
-DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
-HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
-SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-# This one test is buggy.
-JAVA_RM_FILES=(
- src/test/java/com/fasterxml/classmate/AnnotationsTest.java
-)
-
-java_prepare() {
- rm pom.xml || die
-}
-
-src_test() {
- testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
-
- mkdir target/tests || die
- ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
-
- tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
- | sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
- | grep -vP '\$');
- ejunit4 -cp "${testcp}" ${tests}
-}
diff --git a/dev-java/classmate/classmate-1.2.0.ebuild b/dev-java/classmate/classmate-1.2.0.ebuild
deleted file mode 100644
index 5b084f9f2a6c..000000000000
--- a/dev-java/classmate/classmate-1.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
-HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
-SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >=virtual/jre-1.6"
-
-DEPEND="
- >=virtual/jdk-1.6
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/java-${PN}-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
- default
- rm -v pom.xml \
- src/test/java/com/fasterxml/classmate/AnnotationsTest.java || die
-}
-
-src_test() {
- testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
-
- mkdir target/tests || die
- ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
-
- tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
- | sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
- | grep -vP '\$');
- ejunit4 -cp "${testcp}" ${tests}
-}
diff --git a/dev-java/classmate/metadata.xml b/dev-java/classmate/metadata.xml
deleted file mode 100644
index b333734bceaa..000000000000
--- a/dev-java/classmate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="github">cowtowncoder/java-classmate</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index b9f2e7e50ec0..24985b51a08a 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,5 +1,5 @@
DIST commons-cli-1.3.1-src.tar.gz 145886 BLAKE2B 951dd516a2b80089cbd3029e456dec295adef12a6e2225a99cf3acf88cb7434bbe0ea3b2dd40190ac1cbbaaf099a88405ac7c4cd9ae096ceeb13c9a13bd0198e SHA512 b5c569bea3c213a1959ae698894f2234477a7a5ed246f8e81142041173f668802959be018011bce6aa2a5631081378e67d69eeba9136fa19c96193dbdf2a7d15
DIST commons-cli-1.4-src.tar.gz 148530 BLAKE2B 72460ee073b4e8c5179da03c3d599cf04b37b5b3aff89e4927b07765bd879acc9ac56f52e7dee03214e21f7ba9e5af3adf54d2f943aebb266bfa9b4983ba0380 SHA512 a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f
EBUILD commons-cli-1.3.1.ebuild 1075 BLAKE2B 8d8ab4b92f22e80245d27ea1085add0e1c4c68e01349ba23c262f309ed85242e556db93f78951c6f54d03b9821a36bc795bd74600cc66b1a13dbf2703d2eeca3 SHA512 b344ecb5000fe89157cd20969b29e01ca7345605af4414b3e6d3afdf5c655532f6f2805d98ec260f61c5533f833bad19f0b0e39c38dfda3e563d7ac1f5ce2db7
-EBUILD commons-cli-1.4.ebuild 1076 BLAKE2B eec7ba4faa1574174ba009fe59dc0081a7d988cf49ba3ba169a2655fcf231c4889b8d7785c357428d7ba749d764d0b23a0429747ca0d9411d34b52cc2cbc5de9 SHA512 b14324b3bd74190946d6779f95c064e0621f7ca65687f303641f814d45b435c036ba585d93769d20f3990536e8b98804c2afaf6b8ee6f2fa196921dbc621329b
+EBUILD commons-cli-1.4.ebuild 1073 BLAKE2B 47369d5c19d43c955e2cfafed597607929c8cac3d940a7bfd07abad0a9f7527453c55e6ce47c98ec53c2f741884c1049015a5b4d02f1187c0558367865d6068c SHA512 6158af3b2d265f06499174fd392f95ac46feaad3d5b76b8e85448600e724ebbfd6de2614b35d8e3f31b6bd120baf0265403487c42d1c20e2271a1a0df0ed8750
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-cli/commons-cli-1.4.ebuild b/dev-java/commons-cli/commons-cli-1.4.ebuild
index de78b6499639..cfe05d27ae26 100644
--- a/dev-java/commons-cli/commons-cli-1.4.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://commons.apache.org/cli/"
SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 123edbc39886..f93932979b81 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,5 +1,3 @@
DIST commons-codec-1.15.tar.gz 423639 BLAKE2B 5d9d3dd44fda7eee77048eaa1e28f54f9baff7ad276f7e718f4a4d6c5b26605914809db538e9832bf06b1468a65432645ef9de74aec9f9af9973668a82bd996f SHA512 dcf0b86f269a96362dca5b36b9e764a07e390634804b359d4dbd1a0c50bfcc9f778e3797f196e1f553d76dd25b3c6fd016f0ffbbca856fa6c88d3d55791889ce
-DIST commons-codec-1.7-src.tar.gz 291251 BLAKE2B b8fecdb9b88a21ceb3106a13332493617ecd2c8064c84a1514dec1c1c254e18116ff4926f7445bef4171000ba77da411efd6a93fe80a4795e887832035373e10 SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6
-EBUILD commons-codec-1.15.ebuild 1367 BLAKE2B 8543341062ccf924560573600273bd34a989f62a65fbac2fa09ab1eca097994c683af80542c28691f5ba97c8c4cc2736ad129bef4c2d12a0975d7a120c1e9327 SHA512 1bb458fea0f4dd10f6f4f777ca7a0389204bd083c4a9986a68f16d7392030db67fece5b5c0e9df9a31e09cbc08fe7cb83f5bbe88ba821e2d752899fd7ab92a9a
-EBUILD commons-codec-1.7.ebuild 908 BLAKE2B 54d95f6e45fb34815077188bd9ba7b0370d565ab9a2175715e8e90f2b0d3fffcdb4d0fbe547b68bea1e70e996716bf7187dd06dc6510e5873b0a1309aaa08ec5 SHA512 8f0fd884b856b8c1796fcb6c905b70869fee94d753f442f94531045fa39f4f32ff30dc9aadbdba24135139b59c9bc6e5b6d618b335563149e22e7ee05d6e6c8e
+EBUILD commons-codec-1.15.ebuild 1364 BLAKE2B c672f1bd6d6ef10613ce90e077d50956f1a253aaabebbcb51e8d9315f04459db6b8262ceee4c4cd8daadd0b3ebb2ee08f661ed0a88c1cfb9f4554fe694700273 SHA512 e12d1b08bb1aaa5d17d5ab3193f8453ad57f1a7439766fc7d9ac24e894f1ff310c3b93e6ce4918519d85804cad25f822dc984aa4535da84970aed9c1be37c6fe
MISC metadata.xml 1360 BLAKE2B 5e996a35877486521352b61fdb44872970caab9497267c9d95d1364bd299838486f1853b46f35ec140259d33e7158bca7224488f21c388caa4fa9e7a153006bb SHA512 d16f70860d4880e50d25e6297823fb71955c147eedd115ca7eda0a0bf6c4cbc6121bf8b12062241192facd4583f10df56a838c84940b5914f75d13f10c96e9ae
diff --git a/dev-java/commons-codec/commons-codec-1.15.ebuild b/dev-java/commons-codec/commons-codec-1.15.ebuild
index 8ab0f3bb6464..92af3cd6ce23 100644
--- a/dev-java/commons-codec/commons-codec-1.15.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.15.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
# Compile dependencies
# POM: ${P}-src/pom.xml
diff --git a/dev-java/commons-codec/commons-codec-1.7.ebuild b/dev-java/commons-codec/commons-codec-1.7.ebuild
deleted file mode 100644
index 600806b1cef7..000000000000
--- a/dev-java/commons-codec/commons-codec-1.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementations of common encoders and decoders in Java"
-HOMEPAGE="http://commons.apache.org/codec"
-SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
- test? (
- dev-java/ant-junit:0
- dev-java/junit:4
- )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar dist/${P}*.jar
-
- dodoc RELEASE-NOTES.txt
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 3ca373c74bc5..0f7922e30b0c 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -2,6 +2,6 @@ AUX commons-collections-3.2.2-fixes.patch 9913 BLAKE2B 0582b3c2e06275ddc75fdaf05
DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
EBUILD commons-collections-3.2.2.ebuild 1378 BLAKE2B ca87bc67d684eae78f9816803456c1ef52cc0d3571514dba7cf2d8017f9ce72bddd35a0de681b4c33b0db1bb9e37f3e5a85cc4620819c8bcd98a70f308fc38a0 SHA512 ba6ec8a82736e39dfd41681e87e6587edd163be81ea5f80b56a37e529b7d681292627a308373ac8d2330bfd69206dd54fe1c04c34b4e63cd6255bef712042d2b
-EBUILD commons-collections-4.1-r1.ebuild 1269 BLAKE2B d041b1fa76158cab26bf507dccaf3bbf7b18b236116efe33ee40cc2e5c01856feeb937b570d5a5eac4fa7b1081cc663dacfa328eb7f046d9fb3921c1cf4afa62 SHA512 484d1a0dcb1a7a17a245768cbd31930bcf6cdf755df380a77193f4999166d53a4374ad756748e5551bc5ca1f16c4105490807bf11ce20cdf821cc488057f58a2
+EBUILD commons-collections-4.1-r1.ebuild 1267 BLAKE2B 9183580e99a30c85c61ad045bde305a5e43ede963c38aa0b33bb7ab052e240291845a3ebdbc9553228ff58d5432122879ebd7b6f4af2e9a2c05666061c85adcd SHA512 2218be50d5e2d00e1a2c1783d46b9ac159c7f72dabffa506d50df8f0ed4e669a908544fb7afaa4b0404867cf931cea14960ce7cc28a769afe6a2c736e71307bf
EBUILD commons-collections-4.1.ebuild 1261 BLAKE2B f307b979f9614cefe6d4f5eea916abb9591b277f16118b6cdc76a9425eda268845f8cc7860f990d0007449b9ca5d19fbeaf560569a814ace95f79297bfce5f40 SHA512 ef8287e70b9d9995365f24db5f98232207e21c05726eaf27cdd223dc1da52c154addbd0c2bd7bb1f79b2c79a5d90748fa7c2af3ff9e236dc0d1664f5e4039a99
MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
index 32f0472c33a4..228b947a439d 100644
--- a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Extends the JCF classes with new interfaces, implementations and ut
HOMEPAGE="https://commons.apache.org/collections/"
SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/commons-configuration/Manifest b/dev-java/commons-configuration/Manifest
deleted file mode 100644
index 85aefb6deefb..000000000000
--- a/dev-java/commons-configuration/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX commons-configuration-1.6-gentoo.patch 979 BLAKE2B 37076bf72f33c69dd00a0b1715cdff1746c0ccdf6d59dfe11a40960b0c317c280a30ee2a70d5d3534d5eb22edba0d489c186e7a813c455918cde6f81ce32d906 SHA512 6e0e3e69a77b31a39ad2f160a80ff08b9cdac2b0788b58b06e09f9a07a90a36bc1a4171e6bd739495b8e4c6271cc49ffbfe221dda73756f3407cf268dafec5a7
-DIST commons-configuration-1.6-src.tar.gz 559621 BLAKE2B ce6ca821c03b4948796c46fe796684dbcc8eafbc6004e2abace573f8fa316f638056c03684d10d29c0f3126554bc8cf2c9195228044a2db7203f847d2b71b22e SHA512 5d82b844cf39162976820d030d05afeeec1151aa33bf4353f9ca844e552c55ea26daa1b74158baa31d0677e311e9dd83a1d9721c8d5f4e23d21068c4ca2eeb01
-EBUILD commons-configuration-1.6-r2.ebuild 1676 BLAKE2B b93e2286f021264bdd4b735268b9da21af968f9f7a11f7864a12e0aab4c0ae7fd651064985b0b884879d36956b73430585e097493d558752a94f03d020d62d65 SHA512 eed998eae2ae393ea56ec39f953301ed9ecf1681060a5aa36ed2bdb7e9640d474d844c94d7b4b21b18a135922fa6dee467d2efb649e4df41b77b9fd0d3acfcc2
-MISC metadata.xml 429 BLAKE2B 5a7d59e205a26abfec76c9391d4c8b66710b082ba4a9362e70c4b40775d8d448ed531185dd4f65a04fc19643764364e3a885a4215e883127a781c8af39752cf0 SHA512 eda224d5bad6200ce652d798d7ddd2f5f7de3652419728d05068c2bde19caa2486b1060b8d98d9dc5adca2d00014e868b93dac646ee129d57c7239a6917a260e
diff --git a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
deleted file mode 100644
index 4402e78cf004..000000000000
--- a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch java-pkg-2 java-ant-2
-
-DESCRIPTION="Generic interface for reading configuration data from a variety of sources"
-HOMEPAGE="http://commons.apache.org/configuration/"
-SRC_URI="mirror://apache/commons/configuration/source/${P}-src.tar.gz"
-
-# it needs functionality from ant-core, although not providing an ant task
-# the functionality is apparently needed only for 1.4 jdk
-# but I don't feel like adding virtual for this
-CDEPEND="
- >=dev-java/commons-beanutils-1.7.0:1.7
- >=dev-java/commons-codec-1.3:0
- >=dev-java/commons-collections-3.1:0
- >=dev-java/commons-digester-1.8:0
- >=dev-java/commons-jxpath-1.2:0
- >=dev-java/commons-lang-2.4:2.1
- >=dev-java/commons-logging-1.1.1:0
- java-virtuals/servlet-api:3.0
- dev-java/ant-core:0"
-
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-java_prepare() {
- # Tweak build classpath and don't automatically run tests
- epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-EANT_GENTOO_CLASSPATH="
- commons-beanutils-1.7
- commons-codec
- commons-collections
- commons-digester
- commons-jxpath
- commons-lang-2.1
- commons-logging
- servlet-api-3.0
- ant-core"
-
-# Would need mockobjects with j2ee support which we don't have
-# Check overlay for ebuild with test support
-RESTRICT="test"
-
-src_install() {
- java-pkg_newjar target/${P}.jar
- dodoc RELEASE-NOTES.txt
- use doc && java-pkg_dohtml -r dist/docs/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch b/dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch
deleted file mode 100644
index 0cfa8f6511e7..000000000000
--- a/dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- build.xml.orig 2006-10-13 00:00:17.000000000 +0200
-+++ build.xml 2006-10-13 00:02:37.000000000 +0200
-@@ -97,13 +97,13 @@
- </copy>
- </target>
-
-- <target name="jar" description="o Create the jar" depends="compile,test">
-+ <target name="jar" description="o Create the jar" depends="compile">
- <mkdir dir="${classesdir}/META-INF"/>
- <copy file="LICENSE.txt" todir="${metadir}"/>
- <copy file="NOTICE.txt" todir="${metadir}"/>
-- <copy file="${conf.home}/manifest.mf" todir="${defaulttargetdir}" filtering="on"/>
-+ <copy file="${conf.home}/MANIFEST.MF" todir="${defaulttargetdir}" filtering="on"/>
- <jar jarfile="${defaulttargetdir}/${final.name}.jar" basedir="${classesdir}"
-- manifest="${defaulttargetdir}/manifest.mf" excludes="**/package.html">
-+ manifest="${defaulttargetdir}/MANIFEST.MF" excludes="**/package.html">
- </jar>
- </target>
- <target name="clean" description="o Clean up the generated directories">
diff --git a/dev-java/commons-configuration/metadata.xml b/dev-java/commons-configuration/metadata.xml
deleted file mode 100644
index a4125a7186f5..000000000000
--- a/dev-java/commons-configuration/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <longdescription>
- Commons Configuration provides a generic configuration interface
- which enables an application to read configuration data from
- a variety of sources.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index a48999714011..8ae9da05992c 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,3 +1,3 @@
DIST commons-io-2.8.0-sources.tar.gz 445833 BLAKE2B 4fc6f9b66fa88adfc110742bd3eab55cbe165552f71d665f70fd54d4b0b79c4e76b45fccdb78c6ef64e476f54efc8b51adc9b2d7e880c71dbdb6bc5883d2fe55 SHA512 6189c72eff8661bfb8cfed95dd7ee32578b24b50f6586d4628a4dbfd3618853a72eb73da311729e55742ace47b2d38d3ce130ab87b684494d8ce33d1ccf14a2d
-EBUILD commons-io-2.8.0.ebuild 1032 BLAKE2B db544b790131b095e00e2966a7633a949e71f32d75545e02491bd0bf59e9ee7a49854dc6d98422167b02fe62d45a84ceff51970c53f62ff40e5f08316d410777 SHA512 a4b5f9b49eb8729afee00b0b29eeb14b5bc15f0f0ffd28da7241fa44335070d0ce7a078159dfdd69553710e82ada47ed947ff71f616dd25913fe01fc9c34cdf6
+EBUILD commons-io-2.8.0.ebuild 1031 BLAKE2B eed3f1516b0a4b9382ee69b133363be093018abf28ef84c056f725e904ca78eeac9902aa51210e0ca8ed46dbd11cbe0638d2ef8c6be80dacc938eb4e2f5a8f21 SHA512 7dbaecd92f51898e047efe48fd47c013d6a96ace64f5921307eb0caaff1182c719c5f268a77da1bb09769535e0fbd03ec098bf10900fce1929893f5e46e82a01
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-io/commons-io-2.8.0.ebuild b/dev-java/commons-io/commons-io-2.8.0.ebuild
index 6b1a3a17f7b6..730f099a18c1 100644
--- a/dev-java/commons-io/commons-io-2.8.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-io/"
SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
deleted file mode 100644
index 5d1b39553502..000000000000
--- a/dev-java/commons-jelly/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX commons-jelly-1.0-gentoo.patch 2224 BLAKE2B bc79266243cf9016690cecfc414076f4aaa67a8b10074ccd77971c4b8f00d251315712d8769ef58c188cb67f3534b16946beabbb3c31d3d2601eb7b018949629 SHA512 726b64273320f1a089ce9d9b8121359cc377e070ce4b49155de52ce31559d0601b137fb6e208b8c5ab696c64224047592c26957ad3d7a49dc390b523c821f7b5
-DIST commons-jelly-1.0-src.tar.gz 174769 BLAKE2B 2dc43eef28c76252976616f0509aacbfed31ec0b99916730d86d084ec54bacc4f49000d04a953002717670d17a4ae2ae7249d57b327258414c3515dbb8abde7f SHA512 a72ae2dc8eea3fc19838f386dca38807a16326a3a93f483219212844f8ec033088b7721c78a4370f78a06cbee0c685144a2b16f171d54134822d06f653bcef35
-EBUILD commons-jelly-1.0-r8.ebuild 1532 BLAKE2B 4a5e03526aad413813976978508e57073ef73297d4955f25a8bb4a13e9b3d43523343b65c146494262b78573995ac3dc1da8266a4ad0dd8d4af4f9f0416f6ea0 SHA512 413a6099bc5213931f28c67f4ae19395a46029ef9a13439acac47c30a74b8e789734533f3b56fb68bde9f5a6553facc4acb508df4bd947703d41f304a9d5d65a
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
deleted file mode 100644
index 6cdda5bfc129..000000000000
--- a/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://commons.apache.org/jelly/"
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
- dev-java/dom4j:1
- dev-java/junit:0
- dev-java/jaxen:1.1
- dev-java/commons-cli:1
- dev-java/commons-lang:0
- dev-java/commons-jexl:1.0
- dev-java/commons-logging:0
- dev-java/commons-discovery:0
- dev-java/commons-collections:0
- dev-java/commons-beanutils:1.7
- dev-java/tomcat-jstl-spec:0
- java-virtuals/servlet-api:3.0"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
- # disables dependency fetching, and remove tests as a dependency of jar
- epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dlibdir=."
-EANT_GENTOO_CLASSPATH="
- commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
- commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec
- jaxen-1.1,junit,servlet-api-3.0"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
- dodoc NOTICE.txt README.txt RELEASE-NOTES.txt
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch b/dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch
deleted file mode 100644
index 8fafca81ea79..000000000000
--- a/dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ru commons-jelly-1.0-src/build.xml commons-jelly-1.0-src-patched/build.xml
---- commons-jelly-1.0-src/build.xml 2005-06-16 10:39:44.000000000 -0400
-+++ commons-jelly-1.0-src-patched/build.xml 2005-09-04 19:39:19.000000000 -0400
-@@ -37,6 +37,8 @@
- <property name="proxy.password" value="">
- </property>
- <path id="build.classpath">
-+ <fileset dir="${libdir}" includes="**/*.jar"/>
-+ <!--
- <pathelement location="${libdir}/servletapi/jars/servletapi-2.3.jar">
- </pathelement>
- <pathelement location="${libdir}/commons-cli/jars/commons-cli-1.0.jar">
-@@ -67,6 +69,7 @@
- </pathelement>
- <pathelement location="${libdir}/xerces/jars/xerces-2.2.1.jar">
- </pathelement>
-+ -->
- </path>
- <target name="init" description="o Initializes some properties">
- <mkdir dir="${libdir}">
-@@ -92,7 +95,7 @@
- </and>
- </condition>
- </target>
-- <target name="compile" description="o Compile the code" depends="get-deps">
-+ <target name="compile" description="o Compile the code" depends="">
- <mkdir dir="${classesdir}">
- </mkdir>
- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-@@ -120,10 +123,12 @@
- <copy todir="${classesdir}/META-INF" file="${basedir}/LICENSE.txt">
- </copy>
- </target>
-- <target name="jar" description="o Create the jar" depends="compile,test">
-+
-+ <target name="jar" description="o Create the jar" depends="compile">
- <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
- </jar>
- </target>
-+
- <target name="clean" description="o Clean up the generated directories">
- <delete dir="${defaulttargetdir}">
- </delete>
-@@ -213,7 +218,7 @@
- </fileset>
- </copy>
- </target>
-- <target name="javadoc" description="o Generate javadoc" depends="get-deps">
-+ <target name="javadoc" description="o Generate javadoc" depends="">
- <mkdir dir="${javadocdir}">
- </mkdir>
- <tstamp>
-@@ -432,4 +437,4 @@
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
- </unjar>
- </target>
--</project>
-\ No newline at end of file
-+</project>
diff --git a/dev-java/commons-jelly/metadata.xml b/dev-java/commons-jelly/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-java/commons-jelly/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index f7eb90f4bfec..b56c4f3b7113 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,11 +1,9 @@
DIST commons-lang-2.0-src.tar.gz 440989 BLAKE2B d71d73504c740138bdb9c1e190e0f4e846fb08a35d8ee2430ac2e24b0094e83cfc8cab9eaa44230c0d7fd26ec768bf7b448f04e123467acc20d49af6efe3008b SHA512 aecbbdd8eb2712981dcd8615bac2ec69e3ea7ae137407287d2a9b3eeaddb48e5367bc9c5cb8d232429ac6091548dac8af67e0593366365c04fcfe39984c3e549
DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87
-DIST commons-lang-3.11.tar.gz 1054329 BLAKE2B 7d198e2e7f09f3711909a168cbef405d06aff7482d8ab87059aa11584e82d950ea32f1c1a4d0c9c6c54729396e6b5ee6165a7689b3c38081af31b7a3dad23657 SHA512 ebcb13e47c24e6984835d9d6904fe33077aa3ba781cd61db109fa7005517e4e74cf086c4789a1d65cf3d6c4924b32337c98827a75f91aab908d8e8b9d3b92087
DIST commons-lang-3.12.0-sources.tar.gz 1072858 BLAKE2B d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215 SHA512 80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57
DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
EBUILD commons-lang-2.0-r3.ebuild 839 BLAKE2B 0d2d338ce391a152b73127792904096a744f18aa0ab5cf426bf8e48226a13924de745e43c91866db7e7b5a70cf558285654e2fb4efcac352b9faa323bcf65d9f SHA512 c8f1172157f4ecc2c2b44443a4c9fe14d824164869692b6e3d52684d17792f19c125b23bbebf5b5ab67d4a4e2718f629d9d5600ad98663e024040f0246acc41d
EBUILD commons-lang-2.6-r1.ebuild 869 BLAKE2B 014e28d08de2cd8bd5ca9dd2d5492566f14864a00ac86cf4e262953396a74aef22882704c2c136c23070758bc5d832a0986c478e1fc0f141b9e4f5727841ebc5 SHA512 6575b1287b05a662f34d80bba40fad7b75f357331f4723900c0e2a5c6294a308acccb2664d9ce0dec0bec87fc0c819efb31f667dc242c22cc18ce508bee5388f
EBUILD commons-lang-3.1.ebuild 825 BLAKE2B 828fefecb0daecd2c0dee1da07be43d676a55e152ff630e967626fa74e6a58abd6918a6e558e8bf6120435c62b64956aa6e9c05fdd0c44917dbe0241ad4a33a4 SHA512 7d2158fabad2919520b3fe56c78c6b6fe584711fbb0a2f21335f785bc82f842ab947078c0c93a7e641918f3c6d8c0152c41e2f2e09d43524aee44afb5900915b
-EBUILD commons-lang-3.11-r1.ebuild 996 BLAKE2B 4d54b5a13578969627f1171a6e64ed6dd573250ad03bbbbdc601b3abc833b8634efc2aba5d50ff2ce9aaf29f0e767ecd0b81fae4fa4d9cd46fb7170f27e15133 SHA512 a67800e8302e5a413cae003d3c3d1bdb1db3ab28b41b250b1e842c43d7f478caf37f158cb5454366cdc0fb51913351da94ef131c060706de417069c9ac0921a2
-EBUILD commons-lang-3.12.0.ebuild 1040 BLAKE2B 776631cfa442dfe17533e1d65ac9b816837fd3bb6a5f19b82a61aa27c9349d52b90184fde0aa7241dd170fd04a3be0abac4e7cdbdde8dc1533f842c199b85514 SHA512 f1f56b70a2aad5f6f17723ffd0d04c70bdd4bb5b07eb682689d54442162ccc72908b52a3dddf4f7fe0d18d4d470d795fdf4432dae9d702734a967a6636f24ecc
+EBUILD commons-lang-3.12.0.ebuild 1036 BLAKE2B 23160f04bf20a6431d0b569a93c56bbdd08a4ea5ea3a135d1da55c52800fda51524877c507ac244e8e0cba93c7cae8d9210e13df1590ab5021cd2b0e01b9e706 SHA512 530f95c61531f1a1dd96e15dfc48e1224908bb76cb2d1e1edd3b6cf7ab629a8c482344f0a78b28a74bc196fc8606a838e5a86f9c3061620f1d49174ab7b26097
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-lang/commons-lang-3.11-r1.ebuild b/dev-java/commons-lang/commons-lang-3.11-r1.ebuild
deleted file mode 100644
index bb2399c94a7a..000000000000
--- a/dev-java/commons-lang/commons-lang-3.11-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.commons:commons-lang3:3.11"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}3-${PV}"
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="https://commons.apache.org/lang"
-SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-
-CDEPEND="
- dev-java/easymock:3.2
- dev-java/commons-io:1"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_GENTOO_CLASSPATH="
- easymock-3.2
- commons-io-1"
-
-DOCS=( CONTRIBUTING.md NOTICE.txt RELEASE-NOTES.txt LICENSE.txt README.md )
-
-src_prepare() {
- default
- rm -rv src/test || die
-}
-
-src_install() {
- einstalldocs
- java-pkg-simple_src_install
-}
diff --git a/dev-java/commons-lang/commons-lang-3.12.0.ebuild b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
index a3ff872376f8..26e34f109aa1 100644
--- a/dev-java/commons-lang/commons-lang-3.12.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 8f407747db70..41fb3ebd911a 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,5 +1,5 @@
AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-EBUILD commons-logging-1.2-r3.ebuild 2352 BLAKE2B ad555871569da38ea2a881bb9320d8d8611292d20e7e93c6724d5fc37d25ebb163b5038d64919a98d6224ca29c235cc3ac7ec13d07588f682ca5f1f4bb964b1a SHA512 4f61d2a39de676f9498444ca339ab833f02b311e9d7058b35b68a62fc0e2f1e6a6428d25d9fbf3ca9110f51375cf2959996d1f29d1c02a042d02493d65623e8c
+EBUILD commons-logging-1.2-r3.ebuild 2351 BLAKE2B 304d8ff9c8d4db50002257fc9584f02b8308c81137b04f20500c17b4762773e1f64ff85ba69b6d2f65730023bc296ca756b8160a423a2f1625e94cf4171c3370 SHA512 80065144f0cda04d4850d12b5e36412cbc96ce43214ed3d448e7fdf02f01ef41e30f311cc7f34de08f5bd3e94ff3d74b4b7931e069192187ef9332e7a41b5c1b
MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index adffeb36c057..1be76e85241d 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="avalon-framework avalon-logkit log4j servletapi test"
RESTRICT="!test? ( test ) !servletapi? ( test )"
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index 75cfbcf7c271..4c86292df88e 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1,3 +1,3 @@
DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
-EBUILD commons-math-3.6.1-r1.ebuild 737 BLAKE2B 7356804ac820438617cd44edf4c4b2fb71355973277471b36eef8eac9f65807513e252f8f22bd66886ba4d5048938f1e1a1c1a970dec27baf461d9156613784a SHA512 373c0ed90b28d739005641a564fe6c07f0d5694ae11cadd6caacd87aa86145a2425c35c532643a913c87ba88f474bbd57fcf0bcc74304897bc70b3a2bf713fc2
+EBUILD commons-math-3.6.1-r1.ebuild 736 BLAKE2B ee236d80c075b8472ae2770b2c21b8d9910854ee6a6de20409f5c031c6bbbea88693fd3cadaf305f2d8488220b4b8f2bb9149e1c4b4699e9020e66f86c644b25 SHA512 ede63024c1a18b9ccacd1de71182d17a60eeccdeeab86adc28777fea29a61ef3f8c43bd8eaa5f78c7f83f51f518e7b5b6d54dbba95727236d10171327ec24bea
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
index fd1f6c61c92c..3ef7e38716d8 100644
--- a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
@@ -21,4 +21,4 @@ RDEPEND=">=virtual/jre-1.8:*"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/commons-text/Manifest b/dev-java/commons-text/Manifest
index 5d731ba7a250..48f7a008eb9f 100644
--- a/dev-java/commons-text/Manifest
+++ b/dev-java/commons-text/Manifest
@@ -1,3 +1,3 @@
DIST commons-text-1.9-sources.tar.gz 312764 BLAKE2B 44b628c418a910ff38b5a1fb3b4c9f14a1f9818afd12540f8c8cf8b1a99fd7abd365e704142bcec901e5e067b303ff44f9c992f8714eae68b94819780a270dd2 SHA512 53f993e79aaa6789d3388aa96b6b2a14cf646b27ff3774524390e511241a85288947cc929519eff61a8734578f25bdf3d9969d84da20c1a749b19d90a55da8ae
-EBUILD commons-text-1.9.ebuild 1146 BLAKE2B 9882537d8d97d5aca783eb51c077b1cd62f8206f4a3f533df0b35768f786cf3d545a5b4fc3cb22e3184be1f7a6b4562204c8990b305097ff5817e11d6b74b62d SHA512 9a344db49a970c045c1ff4ce1c26df2fa9f1c9e22fee584549d09d9902a64b0014d52f9e1c434eec6495d067b01ea0ddca890c3703626cc54dbf12516178cc9a
+EBUILD commons-text-1.9.ebuild 1143 BLAKE2B 1616648ac3c24caea3f78a60fb1b037026a41b68bc41abf113c76aecda63466af202af533ea9da4eb6ea2122878b9b9fe1c66e91bc71f327211d04eef7a8a912 SHA512 45d442d13ac8b586759a17a2e5bdc05887787cf84b8f434446f35e7900dc3778ab2a0a1f052952e258236aea08aefdd2cb85a6e55b714275c0fe59de2b0713c7
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-text/commons-text-1.9.ebuild b/dev-java/commons-text/commons-text-1.9.ebuild
index d62ffb66df8e..67823fa867ac 100644
--- a/dev-java/commons-text/commons-text-1.9.ebuild
+++ b/dev-java/commons-text/commons-text-1.9.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-text"
SRC_URI="https://downloads.apache.org//commons/text/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index 5649fcf47000..75215a18801e 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,4 +1,4 @@
AUX 3.3.1-r1-no-android.patch 590 BLAKE2B 1fd2493bc0208516421c31adead309adfaad4b30a137739a082588f38b8d85933258718aca277f8f863f468c2775ec1c4ce107948b7d10cc8a4fc8b07cb47383 SHA512 ba9fcb6c5922869511f421b9f1c005c7656840762fac0d9aecf87b5db615dd181bae24d9ce491191c2a7ee8a863ebf14aaf42f94e40d40d8f2192ad4296ece7f
DIST easymock-3.3.1.tar.gz 624460 BLAKE2B bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43 SHA512 93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
-EBUILD easymock-3.3.1-r1.ebuild 1478 BLAKE2B 917b09c220baf610511dddae5f5ed0deedcc788cafdf2184399eba177b2b7f825e306bdb9db9f4423b4f58b055a1de084120761900f9a78cd1d9431dc8248adf SHA512 a15f005149d48806f34e1452f43f116a00da270d0542552e911f685de99fab16a734504a044d3b23f15f8b0de631f4a2d8ff1409596055421670a34494aecf3f
+EBUILD easymock-3.3.1-r1.ebuild 1477 BLAKE2B 3992332702132fbbd04e689d08f95d00452ff56c2a24aa46ec5e6902269901131e0c89423915b4f145d4a2ebf285c834b7bba015617e594d8160ddfdd80ba48e SHA512 69263f2d9cd8956129a870a31ab35ce6ec782df5e56d596c6659c52a875574baf31fecbb0718d914b2102b06bb522d98ed5da75f35adb598f724ef9d4b07d970
MISC metadata.xml 486 BLAKE2B 90b0a999f8cf928fb74f6b80f15137fcbb4d3bf881f080dee4b424281d95ce0a342f41bf041cfa9d3e72624ca85849bbca1bf2aeebe317a8768951c20d1ab0b2 SHA512 3fc28642c63761d234abf049fa6e33e6548a381e9b15e10a71d1263e1b80e93b4fa773831e0021751ce9736282f50480e93f07aa4f5fc6da5e19c7875f78b3c7
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index 3b4e321ccffe..bef9d66247ab 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
CDEPEND="
dev-java/cglib:3
diff --git a/dev-java/ezmorph/Manifest b/dev-java/ezmorph/Manifest
deleted file mode 100644
index 9a41684efc4b..000000000000
--- a/dev-java/ezmorph/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ezmorph-1.0.6-sources.jar 68198 BLAKE2B c8df2da6282361932041de5cb7200119dd70279b1b4a0aa0ecdb8b87d5582fddd8716c593850af6d3da972b51dcee9f62eb5bfee83e698a1ce1c3b6f23f359df SHA512 a8f88ff38e2d2815ee64436af87c4dc5a9858edec729c8db3ebda6d64d2fe2644b5e56deafedcf242caffa523643ccb978cd775c85793df6e2e5487c6d878cea
-EBUILD ezmorph-1.0.6.ebuild 960 BLAKE2B 851ce459b6b7c177443be776a96a3e7d7e97c836fa00f0090f0327616031259d731a75a21d72536de434a277db1b1517c1de2e0b0a60743dcaf0631189adf912 SHA512 50abfd78fbe1afa2d6dbceb2f2b0f89ff2a40c1c0462f11581afe964aa7cbeb40565c2a62f5753bcaed768a7b4e2f27a10bcf2ebae4435fbf2de0ab67188f033
-MISC metadata.xml 680 BLAKE2B 9137d55198fb79ceb04257fe148118219677862fe68032439c0564eff62ae82534597572730000e3311b85920275c198221a182621f373335d29e061b2d0e021 SHA512 08bd4ceaa2a3cc59113e92e3f89a39de8cc17677456fc78a2b12aa9de1def12d521cf09d44e9c2369bc3ec4208a7df7cf54ae14757d4d23c3b984c8515871f61
diff --git a/dev-java/ezmorph/ezmorph-1.0.6.ebuild b/dev-java/ezmorph/ezmorph-1.0.6.ebuild
deleted file mode 100644
index 688dca1ce89a..000000000000
--- a/dev-java/ezmorph/ezmorph-1.0.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A simple Java library for transforming an Object to another Object"
-HOMEPAGE="http://ezmorph.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="dev-java/commons-lang:2.1
- dev-java/commons-beanutils:1.7
- dev-java/commons-logging:0"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
-
-JAVA_GENTOO_CLASSPATH="
- commons-lang-2.1
- commons-beanutils-1.7
- commons-logging"
-
-RESTRICT=test #564158
-
-java_prepare() {
- # Don't build tests all the time
- if ! use test ; then
- rm -r net/sf/ezmorph/test || die
- fi
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- use doc && java-pkg_dojavadoc target/api
- use source && java-pkg_dosrc net
-}
diff --git a/dev-java/ezmorph/metadata.xml b/dev-java/ezmorph/metadata.xml
deleted file mode 100644
index c4670b98a2e4..000000000000
--- a/dev-java/ezmorph/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <longdescription lang="en">
- EZMorph is simple java library for transforming an Object to another Object.
-
- EZMorph's key strengths are:
-
- Supports transformations for primitives and Objects
- Supports transformations for multidimensional arrays
- Supports transformations with DynaBeans
- JDK 1.3.1 compatible
- Small memory footprint (~76K)
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">ezmorph</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/ical4j/Manifest b/dev-java/ical4j/Manifest
deleted file mode 100644
index f2e61a298140..000000000000
--- a/dev-java/ical4j/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.0.5-build.xml.patch 3196 BLAKE2B 307ce2025eea059b3f18567782978f7a03807179b768fd14c3f72a92d299115fac0cc30db03df01860d6a91d47ef8e379eae487d6a899a4ce7edd2063a68f963 SHA512 888a57e0c2ca9bec191c14dde8b33235b024e5ee764c0fc44e61cd51040f30a8ba4698c5457c1b4acf4180092b152c635ac14521b7bee958c533ce4ad3854e34
-DIST ical4j-1.0.5-src.tar.bz2 9307268 BLAKE2B f72cb77a73e1b1740f52accf5296630ba4e2ef9d4610a384a400ea50e84f245c2d320e05b2702e963ef3d7097e073687343fe2e924eca5e64b80a8f2dc1adcdf SHA512 1c2c1eb6207094fd12036d4eb93afaef820c19c7bce99611ddb9115cd62ece76972b7280364b49643147e4456ef4afca4df23ce4413e0288804183f33c2cc286
-EBUILD ical4j-1.0.5.ebuild 1450 BLAKE2B be13dd724d2f7e22c0ffdf3f8656ea1549d215f3c7b26cef6d14f7edf18e125c313543863a437d9226706ba9acfe9c40dd6649961ffd8edaee92737f5abc2a19 SHA512 5fbd008813eb539e1a83db013355b223ea4db777c30993a4c96f7dbe7741d852857ed31c7023f5665ea6c4513231f602d4e242465276d2179dd7cadd26da1ec6
-MISC metadata.xml 984 BLAKE2B 81e4a28b90f79647765ccb0738a683f1e350450efda561e693332ce39be4291091ac08068135e24c4227ad9151874d6c9177ae8f0088d5aed2a17384eb825537 SHA512 23aa711de73797e43a847aa485a1d652b4b02cc6f37ea0b79ced99e101c332c4dfb3ebd90d65a1057f8dbf0f9090f6a7d5e582c9d6f7cef5c61afb8289cc804a
diff --git a/dev-java/ical4j/files/1.0.5-build.xml.patch b/dev-java/ical4j/files/1.0.5-build.xml.patch
deleted file mode 100644
index 7e68876616d8..000000000000
--- a/dev-java/ical4j/files/1.0.5-build.xml.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/ical4j-1.0.5/build.xml b/ical4j-1.0.5/build.xml
-index 512738c..be5aac9 100644
---- a/ical4j-1.0.5/build.xml
-+++ b/ical4j-1.0.5/build.xml
-@@ -14,7 +14,7 @@
- <property file="build.properties" />
-
- <!-- Project paths -->
-- <property name="source.dir" location="source" />
-+ <property name="source.dir" location="src" />
- <property name="test.source.dir" location="test" />
- <property name="output.dir" location="bin" />
- <property name="package.dir" location="build" />
-@@ -99,7 +99,7 @@
- <echo message="Compiling source from classpath: ${project.classpath}" />
- <mkdir dir="${output.dir}" />
-
-- <copy file="${source.dir}/net/fortuna/ical4j/model/tz.alias" todir="${output.dir}/net/fortuna/ical4j/model" />
-+ <copy file="src/main/resources/net/fortuna/ical4j/model/tz.alias" todir="${output.dir}/net/fortuna/ical4j/model" />
-
- <javac source="1.4" target="1.4" srcdir="${source.dir}" destdir="${output.dir}" debug="true" debuglevel="lines,source,vars" deprecation="true" classpathref="project.classpath" />
- </target>
-@@ -123,7 +123,7 @@
- <attribute name="Class-Path" value="commons-logging.jar,commons-codec.jar,commons-lang.jar" />
- </manifest>
- <jar basedir="${output.dir}" compress="true" jarfile="${package.dir}/${package.file}" manifest="etc/manifest.mf">
-- <zipfileset dir="etc/zoneinfo" prefix="zoneinfo" excludes="zones.h,zones.tab" />
-+ <zipfileset dir="/usr/share/zoneinfo" prefix="zoneinfo" excludes="zones.h,zones.tab" />
- </jar>
- </target>
-
-@@ -187,10 +187,8 @@
- <instr instrpathref="coverage.classpath" destdir="${out.instr.dir}" metadatafile="${coverage.dir}/metadata.emma" merge="true" />
- </emma>
-
-- <junit printsummary="withOutAndErr" showoutput="yes" fork="yes">
-- <!--
-- <classpath path="${project.classpath}"/>
-- -->
-+ <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-+
- <classpath>
- <pathelement location="${out.instr.dir}" />
- <path refid="coverage.classpath" />
-@@ -198,22 +196,19 @@
- </classpath>
- <jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
- <jvmarg value="-Demma.coverage.out.merge=false" />
-- <test name="net.fortuna.ical4j.AllTests" />
-- <!--
-- <batchtest>
-- <fileset dir="${test.source.dir}">
-- <include name="**/*Test.java"/>
-- </fileset>
-- </batchtest>
-- -->
--
-- <!--
-- <test name="net.fortuna.ical4j.data.CalendarOutputterTest"/>
-- <test name="net.fortuna.ical4j.model.component.VTimeZoneTest"/>
-- <test name="net.fortuna.ical4j.model.component.VEventTest"/>
-- <test name="net.fortuna.ical4j.data.CalendarBuilderTest"/>
-- -->
-- </junit>
-+
-+
-+ <sysproperty key="basedir" value="."/>
-+ <formatter type="xml"/>
-+ <formatter type="plain" usefile="false"/>
-+
-+ <batchtest>
-+ <fileset dir="${test.source.dir}">
-+ <include name="**/*Test.java"/>
-+ <exclude name="**/*Abstract*Test.java"/>
-+ </fileset>
-+ </batchtest>
-+ </junit>
-
- <emma enabled="${emma.enabled}">
- <report sourcepath="${src.dir}">
diff --git a/dev-java/ical4j/ical4j-1.0.5.ebuild b/dev-java/ical4j/ical4j-1.0.5.ebuild
deleted file mode 100644
index e82a71816b02..000000000000
--- a/dev-java/ical4j/ical4j-1.0.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="a Java library for handling iCalendar data streams"
-HOMEPAGE="http://ical4j.sourceforge.net/"
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP="
- dev-java/commons-logging:0
- dev-java/commons-codec:0
- dev-java/commons-lang:2.1
- dev-java/backport-util-concurrent:0"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- dev-java/emma:0
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
- epatch "${FILESDIR}"/${PV}-build.xml.patch
- rm -v lib/*.jar || die "rm jar failed"
- #mkdir bin || die "mkdir bin failed"
- java-pkg_filter-compiler jikes
-}
-
-EANT_ANT_TASKS="emma"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="package"
-EANT_GENTOO_CLASSPATH="commons-logging,commons-codec,commons-lang-2.1,backport-util-concurrent"
-EANT_EXTRA_ARGS="-Demma.dir=/usr/share/emma/lib/ -Dsource.dir=src/main/java"
-
-RESTRICT="test"
-# two tests fail with maven, they work in HEAD
-
-src_install() {
- java-pkg_dojar build/*.jar
- dodoc README AUTHORS CHANGELOG etc/FAQ \
- etc/TODO etc/standard_deviations.txt
- use doc && java-pkg_dojavadoc docs/api
- use source && java-pkg_dosrc src/main/java/net
- use examples && java-pkg_doexamples etc/samples
-}
diff --git a/dev-java/ical4j/metadata.xml b/dev-java/ical4j/metadata.xml
deleted file mode 100644
index 4299d5f0c299..000000000000
--- a/dev-java/ical4j/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <longdescription lang="en">
- iCal4j is a Java library used to read and write iCalendar data streams
- as defined in RFC2445. The iCalendar standard provides a common data
- format used to store information about calendar-specific data such as
- events, appointments, to-do lists, etc. All of the popular calendaring
- tools, such as Lotus Notes, Outlook and Apple's iCal also support the
- iCalendar standard.
-
- Providing both a parser and an object model, iCal4j allows you to either
- modify existing iCalendar data or create new data models. Validation is
- also provided to ensure the data maintains a state consistent with the
- specification.
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">ical4j</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/ini4j/Manifest b/dev-java/ini4j/Manifest
deleted file mode 100644
index f56964999a9c..000000000000
--- a/dev-java/ini4j/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ini4j-0.5.1-remove.patch 801 BLAKE2B 2c2ea35db73107056de71dced69f84b6e4c2bf20efe74f99e4dca28a6633d6faf9a8f34bd6146ee80d042673ba52c8b8afebd322a04f38c03568d5b4e5ec2f34 SHA512 e2e2a69311f0efc9887c089bc41ad7921b04d8a32add9bd5eb68ad528d82640bf6bf30b990ba2dba3989140c3d47fa155b81c1cb98260fe2b902dff3e28fef3f
-AUX ini4j-0.5.2-remove.patch 799 BLAKE2B 1ab11eb06ca088b2c021df564af1adaeb51c6879447671466efe8a18002458376770daed5dd0630486c454fb7c12652cfdc38c9483fc312c978f35bd69a0a5a5 SHA512 ed7a49b7475dfe45e0ec2afc1c051bbb48f21e0986177e057d4f21d2185c7befda3fcaa4e36f7578038e76ef02e8b528cf0ea374daaf5dfbbbfb8b69e0bbb4d5
-DIST ini4j-0.5.1.jar 61117 BLAKE2B dedeefed13b66d21f185b786ed9cf5b045a06cf6ab8db108258597ed51e2625ec41e9c23fb032b4d77110f415a10641ad3e673f958842dfcde192bfb9d693d68 SHA512 1c4b5218d092cab9374070c8ae55c7a2483b30893f5af5cfe5d74054b2f5261fe2e1a477a650589d2fc7518b4dcce91a2308ab35bba6b3d918f5e5c19a55eb9a
-DIST ini4j-0.5.2.jar 63258 BLAKE2B 130cf84292295138f8893bcc30aed5b5dcd9eadb6d7f0b984a40388a160ce1f007b4728a13b06cb291a67436fad3bd987b28a068c22cb31e480b35378ff95263 SHA512 eab45f21a9f8f8bc8fdb8654e914ffc9e7eb829169f56a7e1b548a4237eb94e616abe84d78649037ff6254fb00e83b9167bafaf1fe5d97fbf3787838e9bf0fab
-EBUILD ini4j-0.5.1.ebuild 576 BLAKE2B 61babe60b320f38587eb3b4de0438f075a2f9d0ec7bc338358beea6f6c3fbe22bac3e8019bce120f90379d850c7977ad48da158ba9c077b8456f722db6d18211 SHA512 3b428d07dfae00a1db50663df64a647f89b0a8f94bd2856bd2668dda0a8f109d61890eca5c18781c7910f63c53902d21ae612669879667c66b794ae257ed2ffc
-EBUILD ini4j-0.5.2.ebuild 595 BLAKE2B a240f611efb2dda072468a90ad322556bc3ad504e64aa5b9fa1493f549ade5252872aa9de0d81f080928bb198fcdd76bcf310d697dc583a517d7a35d5d1cdee0 SHA512 89b0881542da6e66192acdbcab9fe699cfd5a7ed71c5f957d142141e8b851ee7356219517d4b52b7eeddfebfc6559865fdbb71f56077c0ad2447ddf05e3c3aad
-MISC metadata.xml 406 BLAKE2B 078000cb59e2896dd632727b6fcb873dfd63d82f55bdab2c4930d879e0ce7117f0dd08e7b4833569dc270a79abfa045320983bf96e95a87d4872a176e3afb7c8 SHA512 089ac1e2bec5324bf326f74f516e5d60f7019e12598b65a1cbc4004d41bb73bc0b2f0f1934204f3b39b0c92f1dba0a1a6b1c09b9269e03fa7567e0c4b269beee
diff --git a/dev-java/ini4j/files/ini4j-0.5.1-remove.patch b/dev-java/ini4j/files/ini4j-0.5.1-remove.patch
deleted file mode 100644
index 60a1195d4288..000000000000
--- a/dev-java/ini4j/files/ini4j-0.5.1-remove.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- org/ini4j/Profile.java.orig 2015-11-03 22:49:34.854486000 +0000
-+++ org/ini4j/Profile.java 2015-11-03 22:49:53.412486000 +0000
-@@ -43,7 +43,7 @@
-
- Section remove(Profile.Section section);
-
-- String remove(Object sectionName, Object optionName);
-+ String removeString(Object sectionName, Object optionName);
-
- interface Section extends OptionMap
- {
---- org/ini4j/BasicProfile.java.orig 2015-11-03 22:50:28.101486000 +0000
-+++ org/ini4j/BasicProfile.java 2015-11-03 22:51:09.338486000 +0000
-@@ -138,7 +138,7 @@
- return remove((Object) section.getName());
- }
-
-- @Override public String remove(Object sectionName, Object optionName)
-+ @Override public String removeString(Object sectionName, Object optionName)
- {
- Section sec = get(sectionName);
-
diff --git a/dev-java/ini4j/files/ini4j-0.5.2-remove.patch b/dev-java/ini4j/files/ini4j-0.5.2-remove.patch
deleted file mode 100644
index 444cdb3cd5c0..000000000000
--- a/dev-java/ini4j/files/ini4j-0.5.2-remove.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/org/ini4j/Profile.java 2015-11-03 22:49:34.854486000 +0000
-+++ b/org/ini4j/Profile.java 2015-11-03 22:49:53.412486000 +0000
-@@ -43,7 +43,7 @@
-
- Section remove(Profile.Section section);
-
-- String remove(Object sectionName, Object optionName);
-+ String removeString(Object sectionName, Object optionName);
-
- interface Section extends OptionMap
- {
---- a/org/ini4j/BasicProfile.java 2015-11-03 22:50:28.101486000 +0000
-+++ b/org/ini4j/BasicProfile.java 2015-11-03 22:51:09.338486000 +0000
-@@ -138,7 +138,7 @@
- return remove((Object) section.getName());
- }
-
-- @Override public String remove(Object sectionName, Object optionName)
-+ @Override public String removeString(Object sectionName, Object optionName)
- {
- Section sec = get(sectionName);
-
diff --git a/dev-java/ini4j/ini4j-0.5.1.ebuild b/dev-java/ini4j/ini4j-0.5.1.ebuild
deleted file mode 100644
index 515f27e97129..000000000000
--- a/dev-java/ini4j/ini4j-0.5.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple Java API Windows style .ini file handling"
-HOMEPAGE="http://ini4j.sourceforge.net/"
-SRC_URI="http://central.maven.org/maven2/org/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip"
-
-java_prepare() {
- epatch "${FILESDIR}"/"${P}-remove.patch"
-}
diff --git a/dev-java/ini4j/ini4j-0.5.2.ebuild b/dev-java/ini4j/ini4j-0.5.2.ebuild
deleted file mode 100644
index adbc494a4746..000000000000
--- a/dev-java/ini4j/ini4j-0.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple Java API Windows style .ini file handling"
-HOMEPAGE="http://ini4j.sourceforge.net/"
-SRC_URI="http://central.maven.org/maven2/org/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND="
- >=virtual/jre-1.6"
-
-DEPEND="
- >=virtual/jdk-1.6"
-
-PATCHES=(
- "${FILESDIR}"/${P}-remove.patch
-)
-
-src_prepare() {
- default
-
- java-pkg-2_src_prepare
-}
diff --git a/dev-java/ini4j/metadata.xml b/dev-java/ini4j/metadata.xml
deleted file mode 100644
index 90b68d528005..000000000000
--- a/dev-java/ini4j/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- </maintainer>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">ini4j</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
index 10c6ca7c66be..ab9c20a5d4c1 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1,4 +1,4 @@
AUX jackcess-4.0.0-fix-tests.patch 665 BLAKE2B 6e2cc60406b84c64e896478dbed520834b193749121241abd97ea1d54079a1faed4830347ab4d99623244e344ae502a10e8cadcdd4dbd1ffce83fdd273af3e33 SHA512 70a1325cbf955b032fada56a05635175f285e722c4c2a4c0a3d59401fec2b8261ff8c4717cf3e4c05cdbe53517a142ce348bd6309883334519fcf05e37afccce
DIST jackcess-4.0.0-sources.tar.gz 12140889 BLAKE2B 44bdd0ba74e9e462364506e563b2e5db8a6581686a0b1ab7d9995d2dfce164593eb533986ac666a7f79180478a8a16ccc8ef57a7af08045cb671a3a5269f84a6 SHA512 514ecf235943183e0b3813550adf801cc4ab1734137ae0b131f5e3dca9f774f2a866bec397ccc8d37d65e9c3f0c4c995baee091480eb8e2bb91e85894c2a27e6
-EBUILD jackcess-4.0.0.ebuild 1992 BLAKE2B f7fd903c96a66293b3b38fed51f2b7bfbe2de4db849c895602aedc19c81c1b61f714071f8c29cc8bad443d07a2422f35709f4923b9bda255d504390d4e02b14d SHA512 b96c338a634bb0b5881e8f9f7e88dd69d5781c90b5bfa9c8284513608c9ce78a84d9b60194d07341e9f8b5b6c24dddde079516ec3c19e899e7dac6e75e19542f
+EBUILD jackcess-4.0.0.ebuild 1989 BLAKE2B d433e8ae866e9f13c4da2b3c1a5912d2fb24870f6d01a15560cb7dc8b4148bf6d23a8d21cc3196b9938de7e3e548a361ac03b8a8476951d53bd934b3435e014d SHA512 3c95487efccef386b673fba6dbeb1edf0da21442df7b92ae93aa3bb9a2ff2df0c05d8198199ff98bf777658224c283f4665d01211c97f442c74c5da0ed3a102e
MISC metadata.xml 314 BLAKE2B 0a48c521ff5b9916de7132a86ece393d4c01e648eadfc633bc0e5cea8fe64cc4a1163258b36c0c1e35743fac87224101f5661255bc6c8ca2ba31c59325d75c44 SHA512 84fc5b3b58171d3e96ab9cd24fad7df6ad3181e8099d1e597ad2c5e08e390fc598e5c7d210d05f722c001e4939a73052781c76322e52612d3ff4df126e5c4460
diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild
index eead7d280ca6..7d2a8161da68 100644
--- a/dev-java/jackcess/jackcess-4.0.0.ebuild
+++ b/dev-java/jackcess/jackcess-4.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 308d1d8855f0..f072aad95712 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,3 +1,3 @@
-DIST jakartaee-migration-0.2.0-sources.tar.gz 34495 BLAKE2B 98e281d4a0a2c27215131b4b72406fbf9d6b335602df6e44be8eec252071482305182ab8d3554317650f69197438c1634982ba77297c93603835ded1fe43d105 SHA512 c3874cf036051a0636287b3afa78af96458816601a7a79117994389f31ad8f253d9b0a9bb1530de3263f1b8ca2f63fcdf113b3ad933a545136559ca80ae7700f
-EBUILD jakartaee-migration-0.2.0.ebuild 1389 BLAKE2B 3ad313f6831a5515aabdb82fdacf79b8f5c797ffb2795cd69f3cebb30c52b4d8084cab5a74adef3b8fe0618d54d89702edeffa136c138727a929377d8a8a37be SHA512 ead7d25c89c56bf8c7e7a5731addd40b6ef4d984a0c653926230b3944069a8cbf310c1122d1f03304faad98799f9a20b78a29e98c5d69ebeb209f547ab8bedcf
+DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f SHA512 f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c
+EBUILD jakartaee-migration-1.0.0.ebuild 2877 BLAKE2B c6fc88baf5abd7df3c31b25326154c546f259cfc697b4cea9581b4b900ec5d1bffc3d017eac1b201c728cfa4b3056da72ba102f13ba0171e27e8229c8e2ca344 SHA512 eee4baddab8ec054a4001b77bf5291ce755d6ea3385e76b2ee7577b970284fd1789ff3894ce194ac09a137ce0893c0434dd3dbaf4252b99e80a5e32bd729469f
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild
deleted file mode 100644
index 7815b0e6bc20..000000000000
--- a/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v0.2.0/source/jakartaee-migration-0.2.0-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild jakartaee-migration-0.2.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:0.2.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9."
-HOMEPAGE="https://tomcat.apache.org"
-SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="
- dev-java/ant-core:0
- >=dev-java/bcel-6.5.0:0
- >=dev-java/commons-compress-1.20:0
- dev-java/commons-io:1
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}
-"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
-JAVA_SRC_DIR="src/main/java"
-JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
-JAVA_RESOURCE_DIRS=(
- "src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
- "src/test/resources"
-)
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
new file mode 100644
index 000000000000..a5a06c63d545
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.0/source/jakartaee-migration-1.0.0-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9."
+HOMEPAGE="https://tomcat.apache.org"
+SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
+# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
+# org.apache.commons:commons-compress:1.20 -> >=dev-java/commons-compress-1.20:0
+
+CDEPEND="
+ dev-java/ant-core:0
+ dev-java/bcel:0
+ >=dev-java/commons-compress-1.20:0
+ dev-java/commons-io:1
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
+JAVA_SRC_DIR="src/main/java"
+JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
+JAVA_RESOURCE_DIRS=(
+ "src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+ "src/test/resources"
+)
+
+src_prepare() {
+ default
+ sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
+}
+
+src_test() {
+ # we need to create jar files for the tests the same way as it's done using pom.xml
+ local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
+ mkdir -p target/test-classes/META-INF || die
+ pushd target/test-classes || die
+ echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
+ ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
+ jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
+ ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
+ jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
+ for enc in rsa dsa ec; do
+ cp hellocgi.jar hellocgi-signed-${enc}.jar || die
+ jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
+ done
+ popd
+
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 90a3aa24f546..631ada4b1358 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,8 +1,5 @@
-AUX jaxen-1.1.4_maven1-build.xml 13148 BLAKE2B c5f6421878e732db00b2d5daede8d93cdf1d349c1dfdbb6f83a607d734dc05f0847ce5f8cc86ec1a2be5855d96dfc1a3128c0811846f4a5c7679dd60ad730c12 SHA512 2f3625a2a14066289b20e1118a87168e6cf1ce252becdccbc6f4eeefac446e528298e1e6af7d1304ff9d1d4ee8c394c2cf67f6799d3062091d53cce7ff5b1e42
-DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690 SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031
DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
-EBUILD jaxen-1.1.4-r1.ebuild 1082 BLAKE2B 5a63323c265e84a70008b4f44788ab50f0c370906f63d46aecd4e476b23c31aa37162b21d9d6ad950c3e59e758ffd711d204b8d8bf05fe1ee3e4076ec07d5daf SHA512 82a7a8b205958e9e81d28887c747a9731077458f213af8c30551fd9eed78cdcf9cd7e29fe385e3c9513f3421fb222c4aad8f959bc1c59d1e42da38847e3e1f0d
-EBUILD jaxen-1.1.6-r2.ebuild 862 BLAKE2B 9ff56c92543733c389227c44b32b219cc84374e96dbd1aacabe123de5d9c940862cc93e0f9822312112e93b585c10fa0905e2a5adbd8076a818e39e295f9e89b SHA512 13e3ab9d0223f7b9448e0c125d29422652b4d6298d1d4b002b1cf66a3a11e480478e03d16fed59650b97b61438a425f2e6b87e5a4eb4601e5a23daada78ee128
-EBUILD jaxen-1.2.0-r1.ebuild 1919 BLAKE2B 90a69225c4086bf95f16cb8308842f703970cdc0ebd95e354d6868d29172ec6b9af479fa3ef546f1f8432afc807643bcf2de6ea937524fd32ee26a7f10807d8b SHA512 51df4c02d9ff569fb37b2f4629f2ea9b7817fdb3030d303728401c424f0feec73528b328af05e910de5a9b7b1dee7e48cda55e5662a903a0c0272df842ef3990
+EBUILD jaxen-1.1.6-r2.ebuild 861 BLAKE2B 97da05063fd187441941327f16b6091c87559bf4b569f5a89caffae5b4d19e439901705272d2614747e89bcef84f27788155c903f26566aa9ad15eab33ba2698 SHA512 e5ccdf47ac5886a9f58d520a7cf587292c47f5adffdb668fcbc47eba8d3b2d70d2875561aa69dc6b6fad2bcda4a9db530bd47dc87a0fe72da644adaf5890d874
+EBUILD jaxen-1.2.0-r1.ebuild 1913 BLAKE2B b25661c32fe81cfbbedc1cec06a8473c107c8b4e7b854df1d725e97b6211b34bdba4663398d155ce2d5549cba144f4ceddcc4e11d10f0afed2a4ba076f2c046a SHA512 91b9f4fbd7a2f80b6125cceaedb67097f122613143314f81e0b291717241fec783c230067aab717cd7b6ec124cd4a07dc4adf45d9ffe50ac5acbb53e5a7829f9
MISC metadata.xml 718 BLAKE2B 14654870dfbaef53f3fc46124c5df04970de2699ed0d3f453a1b98603dee6f805fc6018477b08ea82c01617d17969a06233c0cc1e41038dc43c5ae4ffe3d16b8 SHA512 d37502fe1c0e32f28599da74657433561cddb87d15b80c3fe05242cbb0032a7abcb04180890126f89ff5c30b39f9614b1eb255bce7af01ca51eda3807902aafa
diff --git a/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml b/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml
deleted file mode 100644
index efbdd2074bb2..000000000000
--- a/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.1.4
- on date October 14 2012, time 0755-->
-<project default="jar" name="jaxen" basedir=".">
- <!--Load local and user build preferences-->
- <property file="build.properties"></property>
- <property file="${user.home}/build.properties"></property>
- <!--Build properties-->
- <property name="defaulttargetdir" value="${basedir}/target"></property>
- <property name="libdir" value="${user.home}/.maven/repository"></property>
- <property name="classesdir" value="${basedir}/target/classes"></property>
- <property name="testclassesdir" value="${basedir}/target/test-classes"></property>
- <property name="testreportdir" value="${basedir}/target/test-reports"></property>
- <property name="distdir" value="${basedir}/dist"></property>
- <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
- <property name="final.name" value="jaxen-1.1.4"></property>
- <property name="proxy.host" value=""></property>
- <property name="proxy.port" value=""></property>
- <property name="proxy.username" value=""></property>
- <property name="proxy.password" value=""></property>
- <path id="build.classpath">
- <pathelement location="${libdir}/dom4j/jars/dom4j-1.6.1.jar"></pathelement>
- <pathelement location="${libdir}/jdom/jars/jdom-1.0.jar"></pathelement>
- <pathelement location="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar"></pathelement>
- <pathelement location="${libdir}/xerces/jars/xercesImpl-2.6.2.jar"></pathelement>
- <pathelement location="${libdir}/xom/jars/xom-1.0.jar"></pathelement>
- <pathelement location="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar"></pathelement>
- <pathelement location="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar"></pathelement>
- </path>
- <target name="init" description="o Initializes some properties">
- <condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}"></equals>
- </condition>
- <!--Test if JUNIT is present in ANT classpath-->
- <available property="Junit.present" classname="junit.framework.Test"></available>
- <!--Test if user defined a proxy-->
- <condition property="useProxy">
- <and>
- <isset property="proxy.host"></isset>
- <not>
- <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
- </not>
- </and>
- </condition>
- </target>
- <target name="compile" description="o Compile the code" depends="get-deps">
- <mkdir dir="${classesdir}"></mkdir>
- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
- <src>
- <pathelement location="${basedir}/src/java/main"></pathelement>
- </src>
- <classpath refid="build.classpath"></classpath>
- </javac>
- </target>
- <target name="jar" description="o Create the jar" depends="compile,test">
- <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
- </target>
- <target name="clean" description="o Clean up the generated directories">
- <delete dir="${defaulttargetdir}"></delete>
- <delete dir="${distdir}"></delete>
- </target>
- <target name="dist" description="o Create a distribution" depends="jar, javadoc">
- <mkdir dir="dist"></mkdir>
- <copy todir="dist">
- <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
- <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
- </copy>
- </target>
- <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
- <fail message="There were test failures."></fail>
- </target>
- <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
- <mkdir dir="${testreportdir}"></mkdir>
- <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
- <sysproperty key="basedir" value="."></sysproperty>
- <formatter type="xml"></formatter>
- <formatter usefile="false" type="plain"></formatter>
- <classpath>
- <path refid="build.classpath"></path>
- <pathelement path="${testclassesdir}"></pathelement>
- <pathelement path="${classesdir}"></pathelement>
- </classpath>
- <batchtest todir="${testreportdir}">
- <fileset dir="${basedir}/src/java/test">
- <include name="**/*Test.java"></include>
- </fileset>
- </batchtest>
- </junit>
- </target>
- <target name="junit-present" unless="Junit.present" depends="init">
- <echo>================================= WARNING ================================</echo>
- <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
- <echo>==========================================================================</echo>
- </target>
- <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
- <mkdir dir="${testclassesdir}"></mkdir>
- <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
- <src>
- <pathelement location="${basedir}/src/java/test"></pathelement>
- </src>
- <classpath>
- <path refid="build.classpath"></path>
- <pathelement path="${classesdir}"></pathelement>
- </classpath>
- </javac>
- </target>
- <target name="javadoc" description="o Generate javadoc" depends="get-deps">
- <mkdir dir="${javadocdir}"></mkdir>
- <tstamp>
- <format pattern="2001-yyyy" property="year"></format>
- </tstamp>
- <property name="copyright" value="Copyright &amp;copy; Codehaus. All Rights Reserved."></property>
- <property name="title" value="jaxen 1.1.4 API"></property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java/main" packagenames="org.jaxen.*">
- <classpath>
- <path refid="build.classpath"></path>
- </classpath>
- </javadoc>
- </target>
- <target name="get-dep-dom4j.jar" description="o Download the dependency : dom4j.jar" unless="dom4j.jar" depends="init,setProxy,noProxy,get-custom-dep-dom4j.jar">
- <mkdir dir="${libdir}/dom4j/jars/"></mkdir>
- <get dest="${libdir}/dom4j/jars/dom4j-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/dom4j/jars/dom4j-1.6.1.jar"></get>
- <get dest="${libdir}/dom4j/jars/dom4j-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//dom4j/jars/dom4j-1.6.1.jar"></get>
- </target>
- <target name="get-custom-dep-dom4j.jar" if="dom4j.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/dom4j/jars/"></mkdir>
- <get dest="${libdir}/dom4j/jars/dom4j-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="${dom4j.jar}"></get>
- </target>
- <target name="get-dep-jdom.jar" description="o Download the dependency : jdom.jar" unless="jdom.jar" depends="init,setProxy,noProxy,get-custom-dep-jdom.jar">
- <mkdir dir="${libdir}/jdom/jars/"></mkdir>
- <get dest="${libdir}/jdom/jars/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/jdom/jars/jdom-1.0.jar"></get>
- <get dest="${libdir}/jdom/jars/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//jdom/jars/jdom-1.0.jar"></get>
- </target>
- <target name="get-custom-dep-jdom.jar" if="jdom.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/jdom/jars/"></mkdir>
- <get dest="${libdir}/jdom/jars/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${jdom.jar}"></get>
- </target>
- <target name="get-dep-xml-apis.jar" description="o Download the dependency : xml-apis.jar" unless="xml-apis.jar" depends="init,setProxy,noProxy,get-custom-dep-xml-apis.jar">
- <mkdir dir="${libdir}/xml-apis/jars/"></mkdir>
- <get dest="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xml-apis/jars/xml-apis-1.3.02.jar"></get>
- <get dest="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//xml-apis/jars/xml-apis-1.3.02.jar"></get>
- </target>
- <target name="get-custom-dep-xml-apis.jar" if="xml-apis.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/xml-apis/jars/"></mkdir>
- <get dest="${libdir}/xml-apis/jars/xml-apis-1.3.02.jar" usetimestamp="true" ignoreerrors="true" src="${xml-apis.jar}"></get>
- </target>
- <target name="get-dep-xercesImpl.jar" description="o Download the dependency : xercesImpl.jar" unless="xercesImpl.jar" depends="init,setProxy,noProxy,get-custom-dep-xercesImpl.jar">
- <mkdir dir="${libdir}/xerces/jars/"></mkdir>
- <get dest="${libdir}/xerces/jars/xercesImpl-2.6.2.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xerces/jars/xercesImpl-2.6.2.jar"></get>
- <get dest="${libdir}/xerces/jars/xercesImpl-2.6.2.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//xerces/jars/xercesImpl-2.6.2.jar"></get>
- </target>
- <target name="get-custom-dep-xercesImpl.jar" if="xercesImpl.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/xerces/jars/"></mkdir>
- <get dest="${libdir}/xerces/jars/xercesImpl-2.6.2.jar" usetimestamp="true" ignoreerrors="true" src="${xercesImpl.jar}"></get>
- </target>
- <target name="get-dep-xom.jar" description="o Download the dependency : xom.jar" unless="xom.jar" depends="init,setProxy,noProxy,get-custom-dep-xom.jar">
- <mkdir dir="${libdir}/xom/jars/"></mkdir>
- <get dest="${libdir}/xom/jars/xom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xom/jars/xom-1.0.jar"></get>
- <get dest="${libdir}/xom/jars/xom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//xom/jars/xom-1.0.jar"></get>
- </target>
- <target name="get-custom-dep-xom.jar" if="xom.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/xom/jars/"></mkdir>
- <get dest="${libdir}/xom/jars/xom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${xom.jar}"></get>
- </target>
- <target name="get-dep-maven-cobertura-plugin.jar" description="o Download the dependency : maven-cobertura-plugin.jar" unless="maven-cobertura-plugin.jar" depends="init,setProxy,noProxy,get-custom-dep-maven-cobertura-plugin.jar">
- <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
- <get dest="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar"></get>
- <get dest="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//maven-plugins/plugins/maven-cobertura-plugin-1.3.jar"></get>
- </target>
- <target name="get-custom-dep-maven-cobertura-plugin.jar" if="maven-cobertura-plugin.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
- <get dest="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar" usetimestamp="true" ignoreerrors="true" src="${maven-cobertura-plugin.jar}"></get>
- </target>
- <target name="get-dep-maven-findbugs-plugin.jar" description="o Download the dependency : maven-findbugs-plugin.jar" unless="maven-findbugs-plugin.jar" depends="init,setProxy,noProxy,get-custom-dep-maven-findbugs-plugin.jar">
- <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
- <get dest="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar"></get>
- <get dest="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar" usetimestamp="true" ignoreerrors="true" src="http://dist.codehaus.org//maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar"></get>
- </target>
- <target name="get-custom-dep-maven-findbugs-plugin.jar" if="maven-findbugs-plugin.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/maven-plugins/plugins/"></mkdir>
- <get dest="${libdir}/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar" usetimestamp="true" ignoreerrors="true" src="${maven-findbugs-plugin.jar}"></get>
- </target>
- <target name="get-deps" unless="noget"></target>
- <target name="setProxy" if="useProxy" depends="init">
- <!--Proxy settings works only with a JDK 1.2 and higher.-->
- <echo>Proxy used :</echo>
- <echo>Proxy host [${proxy.host}]</echo>
- <echo>Proxy port [${proxy.port}]</echo>
- <echo>Proxy user [${proxy.username}]</echo>
- <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}"></setproxy>
- </target>
- <target name="noProxy" unless="useProxy" depends="init">
- <echo>Proxy not used.</echo>
- </target>
- <target name="install-maven">
- <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
- </target>
-</project>
diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
deleted file mode 100644
index 8968d7a7d6f0..000000000000
--- a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.org"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
- dev-java/xom:0
- dev-java/jdom:0
- dev-java/dom4j:1"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.4"
-
-DEPEND="
- ${CDEPEND}
- test? ( dev-java/ant-junit:0 )
- >=virtual/jdk-1.4"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="dom4j-1,jdom,xom"
-EANT_TEST_EXTRA_ARGS="-DJunit.present=true"
-
-java_prepare() {
- cp -v "${FILESDIR}"/${P}_maven1-build.xml build.xml || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar "target/${P}.jar"
-
- use doc && java-pkg_dojavadoc dist/docs/api
- use examples && java-pkg_doexamples src/java/samples
- use source && java-pkg_dosrc src/java/main/*
-}
diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index 90a7eed0092f..be43e2578b5a 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
LICENSE="JDOM"
SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
RDEPEND="
${CDEPEND}
diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index 3722e883f75b..211abc53f20a 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz ->
LICENSE="BSD-2"
SLOT="1.2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="dom4j jdom xom"
# It seems that most tests depend on dom4j, jdom and xom which all depend back on jaxen
@@ -47,13 +47,13 @@ RDEPEND="
>=virtual/jre-1.8:*
"
-S="${WORKDIR}"
+S="${WORKDIR}/${P}"
-DOCS=( "${P}"/{LICENSE.txt,README.md} )
+DOCS=( "${S}"/{LICENSE.txt,README.md} )
-JAVA_SRC_DIR="${P}/src/java/main"
+JAVA_SRC_DIR="src/java/main"
-JAVA_TEST_SRC_DIR="${P}/src/java/test"
+JAVA_TEST_SRC_DIR="src/java/test"
JAVA_TEST_GENTOO_CLASSPATH="junit"
src_prepare() {
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 218db5fc84d1..c314dc5b3213 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -2,6 +2,5 @@ AUX build-xml-2.patch 1528 BLAKE2B f9ba4714bfe2ad46019c71655128512c639b8dfb54f53
DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
EBUILD jdom-1.1.3-r1.ebuild 1252 BLAKE2B 1f13d6f90843dd28a886d5b8158d33602239d6fe7540655166a7bf8aa6f3201cb9a3700a7a1ea669c04a7aa8a94432ed6b8e6c1df5a3b1ed36243ec1bb3d0f1d SHA512 bf245f0d9e759c1c0ebe8937d980e391480687eb53ba0234e5f7b02f124b4a55b61bf6001d391da7fbb58de4a82d7ec90b9bd63a101d869e1d96c14d43a792a6
-EBUILD jdom-2.0.6-r4.ebuild 1394 BLAKE2B 15121dd00dbe1b5b35ed9848d22bbd97483644869a0662712679cb6addb9d6f27f7914e93d0fc2548ababc37b865561ec92dcc420584fcb16139d6f8b4c444b4 SHA512 e5419858ca9241520c7906818e353f309a8ed9687075ed1c41c597e7e1c2a58570c248f612db420b66d19dfafbf88bd02250cb63f371523d3ce2f4e09d99f2b6
-EBUILD jdom-2.0.6-r5.ebuild 1375 BLAKE2B c45228fb66d7a5c68c820029f1d5a65ad57210f74a2830115b9d5d6d210b86742263cde95ed8f66a5c90788b1a6769f2367be7d3e111d066d89de2314aeecd25 SHA512 ea1527f581d69177aa11b4468d7fa0d47298457d3a6d74d38f6f2ced2171c6bf0868d1d6d345935ecdfbb6ce5657b37c4bffadecfee9e96fdda3f8a7042c6a41
+EBUILD jdom-2.0.6-r5.ebuild 1374 BLAKE2B e317fd9ddda54ad8b1302b2cbdb77b32b8a0be05b0644634b1a00605f5a3b97332735ac6f978d618ef66baca93b684fb357fd97e3f03e7f0ac208467e9513e44 SHA512 64fd4bdb5771f313e2e4a9a8054e092c9f21041fc2c3438e6dff319138533362473f891bfba4f30c6c4dc64db6bc39f6ab42a445a8679bc3d6c25645b62daf16
MISC metadata.xml 318 BLAKE2B cbcc3f9c0ce67aa9619d21197006bffc71f6ae3d0707a5bdd3902a0d51f90724f3ce81e21c80f6a011885cd036f397d2cb679335d05a0e1bf7e4bff3470c9019 SHA512 1587f961d80cba775d94e97a9c41516766d6a502f9b144f401ebcd0ee0b21b2e04220730c03a44986af8bc860a0311acdd6e721d4de201defcbc89599df5803b
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
deleted file mode 100644
index 8549f9e42e10..000000000000
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="JDOM-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- dev-java/xalan:0
- dev-java/jaxen:1.1
- dev-java/iso-relax:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- test? ( dev-java/ant-junit:0 )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="junit"
-EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.1,xalan"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/build-xml-2.patch"
-)
-
-java_prepare() {
- java-pkg_clean
-
- epatch "${PATCHES[@]}"
-
- # Remove Android stuff to avoid junit RDEPEND.
- rm -vr contrib/src/java/org/jdom2/contrib/android || die
-}
-
-src_install() {
- java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
- java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
-
- dodoc {CHANGES,COMMITTERS,README,TODO}.txt
- use doc && java-pkg_dojavadoc build/apidocs
- use source && java-pkg_dosrc {contrib,core}/src/java/*
-}
-
-src_test() {
- java-pkg-2_src_test
-}
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
index 74fde49b3c18..772c36da6de7 100644
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.jdom.org"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 5f356dd5e603..88ff58647ff1 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,5 +1,5 @@
AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
-EBUILD jflex-1.6.1-r1.ebuild 3545 BLAKE2B 219107bfae4e1bc96e05cc7829ab67e59c343610244e62d5a65232ad711932582213f310b04c4685385c71074ce47fd8a0bb4f6ae2963ffd5a42a2c6211870d7 SHA512 1f429d17f63ce37116fbd0f5a36dfb48434b4bfe5b0a2eab5bd8026634a010b9e03ed87dd08ae91d16cd5c46d37b7f74993b44e8af19c07a3ec19e142ed7b558
+EBUILD jflex-1.6.1-r1.ebuild 3544 BLAKE2B 07454e651d891b2da9e4785575c6c31f65af2dbd13d3cc0c9f00f238f3a73040218ef666dc0cea8c7ee089d0ba90c4e190ca3112fcc87d00e85d0f117ae2dc07 SHA512 373529d569d7e4ad8db0d0a96da1f9aa64c536ffe23d5f22c6e9912f665bb23b59f13c3c7ee5db13e1e3125eb0227dc45de220e1c7e05722832b01c994c6ca02
EBUILD jflex-1.6.1.ebuild 3550 BLAKE2B 68ff187aaa48cefb2018bd12098d7f334859166d7dd03694613c9ec3cdc4050d93daffda51f2cf8f4d55546314c3f4a11cf3e5927e4df455a58a77d59b0263cd SHA512 92cba8225532e333f950dbf078c6c1b71404b044f058e4be1d0a66c10cc29c3b2cc4dd8d7875db5ad8636854cac4f0800b5b8c41694076a22bda334ab6dfe469
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild
index 7df78eee922a..80b924fcbda7 100644
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.de/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
IUSE="examples test vim-syntax"
RESTRICT="!test? ( test )"
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index dc9fd435e23e..8c1ec02c2a34 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,6 +1,3 @@
-AUX joda-time-2.7-build.xml 11231 BLAKE2B 9b7350270773c59f3497be28581408f9984f1151b812f3ddc4bbf8fbfe50505e36cb5fdbfc330f7f07416275adc92a8176b25d7c4cb4cecbdc9d239f711bc9e7 SHA512 c614cc2425b0cefdc5f9def196cd5014d6d65552038dd22f876bbb64ee25131ead57aa94ef967491e292cf1ddefef933d9827dd588056d58c9a311640a5af63f
DIST joda-time-2.10.10.tar.gz 1052384 BLAKE2B 656efddf6b98f10ce6729c6fa4c76ddfeb86dd94971c2637af3ddcb8a3a47f83948dbd58b04a6249445ef2857c5c5edb994a6d56349ed4ff4130ce9aaebd57e9 SHA512 e7917fd28cd10d7fbee02016b1f13a15a80af099b952cc0e8978bfc7fa389109553804670492c206f2b49bcf910ea093fc1838cb45ce4b7a3a885aac2aaf5943
-DIST joda-time-2.7-dist.tar.gz 4007765 BLAKE2B ed34c988dae1f1fb3359e06cccc148f680a04244987464770024635e72d5693036ec4d1648245f44db2fd57c47d9842a964d39e04e9ba510ecda7ec25c853ee7 SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209
-EBUILD joda-time-2.10.10-r1.ebuild 1956 BLAKE2B 508bd4cb9e23db7dbfe5562c46c11373cea5fa16034b3976ce31c94b3bd29be4e253c39f8c0d54514faa2d1bea8c506e6f5855a542c162c4e61d0c684c26fa6b SHA512 04f796eb9f496b6161c76005571b8e8aaec916249d32469e8d9abdecc1375666fd816b19679e3157257eb02606a31bf15fc875821f568b3bd3ed1c9af64db938
-EBUILD joda-time-2.7-r1.ebuild 1907 BLAKE2B 3a7d17a4e108eee44161a1cfe148e799e3307fa18e86322626d8a825a7eea1f59c3c5cbaa9183e431a7619c487538507a68f98c22c67f4ea8ad6c178c5b5a58b SHA512 edbaa5dfbcafd27a1899d1759f4488dacb7b007e7f3061eb0ab4ff5eca0be8ba36df0b758d7fead35497e3cabaec91ba483ee656a6a59b4c92ba5cf5a50ac977
+EBUILD joda-time-2.10.10-r1.ebuild 1955 BLAKE2B b122e651f5473fc5facd6ea265cbe6bf56363d26a2ad3c8b17890172e8a38d690f4b13ccb6a88e23457a0a0e4bf24985c42464758370fb705acb6dbcf4395bc2 SHA512 97600dbda51c1593abcd4a34faa18496ebbdd42db941a8f075506fc636d0caa8556081427f3ac6ca911884a69e9cea1529c737a5ef086851f3b4896b650069ee
MISC metadata.xml 496 BLAKE2B 1305c141e2009564578f1028c915296d4a1d12c75b350bb2d37e3e5e4fba89631ed750c58944285a493b7b3590d76ba6b72cae1dd711e3a021226c5b1b6e6944 SHA512 b411a78e0160f6866682e6f5df59b9e06835250710182a66e5f4d1527f81820f88ac1a8d13e93021a05161b8b72587205404902db97afa2a239d1fe7bc8a84f6
diff --git a/dev-java/joda-time/files/joda-time-2.7-build.xml b/dev-java/joda-time/files/joda-time-2.7-build.xml
deleted file mode 100644
index fa1fd5e25a39..000000000000
--- a/dev-java/joda-time/files/joda-time-2.7-build.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 3/22/15 5:59 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="joda-time-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="${user.home}/.m2/maven.properties"/>
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="joda-time-2.7"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="."/>
- <property name="maven.build.resourceDir.1" value="src/main/java"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <pathelement location="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
- </path>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
- <pathelement location="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar"/>
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" depends="get-deps" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="true"
- deprecation="false"
- target="1.5"
- verbose="true"
- fork="true"
- source="1.5">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- <mkdir dir="${maven.build.outputDir}/META-INF"/>
- <copy todir="${maven.build.outputDir}/META-INF">
- <fileset dir="${maven.build.resourceDir.0}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- nowarn="false"
- debug="true"
- optimize="true"
- deprecation="false"
- target="1.5"
- verbose="true"
- fork="true"
- source="1.5">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- <copy todir="${maven.build.testOutputDir}">
- <fileset dir="${maven.build.testResourceDir.0}"/>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${maven.test.reports}"/>
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="."/>
- <formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- <pathelement location="${maven.build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/TestAllPackages.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- encoding="UTF-8"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="true"
- breakiterator="false">
- <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
- <group title="User packages"/>
- <group title="Implementation packages"/>
- </javadoc>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html">
- </jar>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <mkdir dir="${maven.repo.local}"/>
- <mkdir dir="${maven.repo.local}/org/joda/joda-convert/1.2"/>
- <get src="https://repo.maven.apache.org/maven2/org/joda/joda-convert/1.2/joda-convert-1.2.jar"
- dest="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/junit/junit/3.8.2"/>
- <get src="https://repo.maven.apache.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar"
- dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
index c1d6e61dba70..ac875a454202 100644
--- a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
+++ b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
# Common dependencies
# POM: ${P}/pom.xml
diff --git a/dev-java/joda-time/joda-time-2.7-r1.ebuild b/dev-java/joda-time/joda-time-2.7-r1.ebuild
deleted file mode 100644
index f492d319c95b..000000000000
--- a/dev-java/joda-time/joda-time-2.7-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc examples source test"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A quality open-source replacement for the Java Date and Time classes"
-HOMEPAGE="https://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/"
-SRC_URI="https://github.com/JodaOrg/${PN}/releases/download/v${PV}/${P}-dist.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-RESTRICT="test"
-
-DEPEND=">=virtual/jdk-1.8
- dev-java/joda-convert:0
- test? (
- dev-java/junit:0
- dev-java/ant-junit:0
- )"
-RDEPEND=">=virtual/jre-1.8"
-
-src_prepare() {
- default
-
- rm -v *.jar || die "Failed to remove bundled jars."
- cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file."
-
- mkdir -p "${S}"/target/classes || die "Failed to create target classes directory."
- cp -Rv "${S}"/src/tz-data/* "${S}"/target/classes/ || die "Failed to copy timezone data."
-
- mkdir -p "${S}"/target/classes/org/joda/time/format || die "Failed to create target classes subdirectory."
- cp -Rv "${S}"/src/main/java/org/joda/time/format/*properties "${S}"/target/classes/org/joda/time/format/ || die "Failed to copy message bundles."
-}
-
-src_compile() {
- EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar)"
-
- java-pkg-2_src_compile
-}
-
-src_test() {
- EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar):$(java-pkg_getjar --build-only junit junit.jar)"
-
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar
-
- dodoc NOTICE.txt RELEASE-NOTES.txt
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use examples && java-pkg_doexamples src/example
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/junitparams/Manifest b/dev-java/junitparams/Manifest
index cdb39ab768a0..b607c3ea9db4 100644
--- a/dev-java/junitparams/Manifest
+++ b/dev-java/junitparams/Manifest
@@ -1,4 +1,4 @@
AUX junitparams-1.1.1-test.patch 1894 BLAKE2B 8c2aacc726a9d5ac733971f20aa06ab21e1ac31cfa14cf23e11b0541777f22291417710f944fd3f6554791ea8deae022e42ea0af5177f6d97a542d55f510b8d4 SHA512 cae119b7c22b65e42a252d70bc92ad05cae568b2257d9640a498bc7cb15e3917f32c9fafd6b06ded8f739b4825c1662a8c4625114aab1252f4adf58cf52f1f34
DIST junitparams-1.1.1.tar.gz 96180 BLAKE2B 0b12d61841d13c893d90f1a28e6b881930a66a9359b368b601a9ee9ced1fa82ff17c9142610e1ed122684e454b86a46d9d2cf451544a900b0a86399484df141c SHA512 77e25bff2f821e8be4f3747c58e550b728aace1dac4ac98f0cd8f99235d6a2b0129e61d7f90063d5f85dd3dd4b0e5d0614e3591633bdcf5dfa452c62a114acae
-EBUILD junitparams-1.1.1.ebuild 1640 BLAKE2B 8aa9fd7add5c23199e9ad8ecb18a2a379428c5bab592731ccc538df9814e12b956aea7b83c47598f223efc56101a3911a77c8843fbe7cb7366b1d8ed1649cb84 SHA512 b666ca63f3644afba27612eda3788e1388b3fdb48271871135925c10733add9c467bcaa09d55879737c9e9b9338b786be7287c288e3203ad0793b3af69b9d198
+EBUILD junitparams-1.1.1.ebuild 1654 BLAKE2B f26470a6311d04eebd935ed63a092281c7a0fe4b770909caa19b93a3bc28b7ed69095f753e2566eb523f14b8197666d9bf23aab12306fe76cf9b30ad7fab6321 SHA512 b69411e98be590375d4be029b5426e90a2d5fc5319d6509f790d59858574dfc935038bdcb7c8474fbaca1e315546267e588e2a9645d83bde4afb37bd801c46d9
MISC metadata.xml 441 BLAKE2B bb19fcc1426ce3b532fba9d7bc04c796ff08a132f84860fa5bc51b0b6f6371ab1ed670e1e680b641fd858dcbb934bf83a800ee8e8ca4385d9b900d0f2dd255c3 SHA512 fd015a318961bdb03541ea34ccbd91183ce19abd7d73bb78970ced8e95325ba2525dbaa35f898475347dc59b87b005d57ff9b090d298d270624a46557573b1ba
diff --git a/dev-java/junitparams/junitparams-1.1.1.ebuild b/dev-java/junitparams/junitparams-1.1.1.ebuild
index 8177e81b47d4..fdc7ef0929dc 100644
--- a/dev-java/junitparams/junitparams-1.1.1.ebuild
+++ b/dev-java/junitparams/junitparams-1.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParam
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
index ee184e3fffb4..0cfd0124104a 100644
--- a/dev-java/libreadline-java/Manifest
+++ b/dev-java/libreadline-java/Manifest
@@ -2,5 +2,5 @@ AUX libreadline-java-0.8.0-gmake.patch 367 BLAKE2B 149491acf9d5383fe095a8533b6ff
AUX libreadline-java-0.8.0-respect-flags.patch 651 BLAKE2B e8c4fe1901fb87b5f8b7fa9faa21e5446385e029aa034a482b883df174c0889c65ca09d7f34a7728d7dc2d8fc90ea3373f8dcb16f740befe5b9183481ed32844 SHA512 b3419484c6732d3396ae90fba0c77bec656bb705d63c8ec2bd999222c8e687d6fbecebfa10bcb91c8780e6ffa922e2d58318978073f382c4b7601cd569ec7abd
AUX termcap-to-ncurses.patch 502 BLAKE2B 4695fdfcb2329e8f2ba555fc06be7e9b3d1039509e046aa1059e8bd954840f641d1b0f8be7dff04850ef5dd54435a204cfe468e778f4767f1a8c6ddf1391cef1 SHA512 a7d157fe3455b10641ea15285ab610a1ef3d4c8b8906408e9caa483f8453c96143e02dcdd193bb11514a4e4c1e53c810de5346e88ea843ad39166a624c33f8f9
DIST libreadline-java-0.8.0.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
-EBUILD libreadline-java-0.8.0-r4.ebuild 1401 BLAKE2B 181f24049a3a7ab1418d943763317de428dc297869983ab5f8d02ffae7e6fb53f48501ae5eb4029917e110eb53b61d2d683efb64bcfc1d63ba8970ab8f4b42db SHA512 c4ab6c49ee4a19f29365373793d46c4a55d7d3cd94eef1cb4090ec3e6e92cb6638be771257cde9fcf98d46d463ec2fcc817fa24beac95cfdf5370c2c63bf93a9
+EBUILD libreadline-java-0.8.0-r5.ebuild 1401 BLAKE2B 6b0a9a489e55326bec9b2bd7a20d395538a4e32ca811379554491b89804672f6ec66ff4ef83b22a8d52c45fe1697031bc6e7b0a1b28e2b9b45981cfc601182ff SHA512 b9ae06546b2860a3145cd2f31e67c7ef1c826f5896f898ab914ed5c7b97e92248ee1713af1a99bd4497c0228069ade1a4a09315dba3edfb9c724ef0755d5dd25
MISC metadata.xml 319 BLAKE2B e82b45bce13253c5e40fffb3429166c0613d8841af08a626d6a9d70bfe5f69c036e8fdc4248cfe632ab8ccc54b6901df0ba02ce2faf0ad18b649ef87f92d9bed SHA512 e13714611711ecb54943d5d3ccc5a8ae8f9dcfb6e9a6e6c6e96d04d7d80dec6a07d76225850cb2cdbb6b2d6a99f0c5c5fd0c9c4a9a3c0724c6e8ed7b21a75e8f
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r4.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild
index ba0a6235e08f..32411ad2c864 100644
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r4.ebuild
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc source"
@@ -19,11 +19,11 @@ IUSE="elibc_FreeBSD"
CDEPEND="sys-libs/ncurses:0="
RDEPEND="
- >=virtual/jre-1.6
+ >=virtual/jre-1.8:*
${CDEPEND}"
DEPEND="
- >=virtual/jdk-1.6
+ virtual/jdk:1.8
${CDEPEND}"
RESTRICT="test"
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index 974faf0e5574..39a962002db5 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,3 +1,3 @@
DIST log4j-1.2.17.tar.gz 2864448 BLAKE2B 233763dbe53f92b5408d3e278b291dff8a7d74657f367ec8b7c7ae1e685ddc0170783c8a5e4b48ec2590b6dda13f45e91bd66066f2c6b515e5d692caca31660b SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8
-EBUILD log4j-1.2.17-r3.ebuild 1444 BLAKE2B 4a054c942e2aeef1e869c8e1344485ebeeb0836db214dff9887c5f8027036cd6c733c4a4dbacc04b875d283b0bb8c7b08d78d792a7d8bab09c494ebcaae70721 SHA512 00fd7c4612b730b6ee5fe8561222985a39e6125f18aaf30ffe1f75b648816e53989036b62d59ab8c4ce85585608ea398162aec8eab6cbbcb9b74c4a93ef56a3d
+EBUILD log4j-1.2.17-r3.ebuild 1443 BLAKE2B 86775c41449ff2536ae73fd2c937654d2f08bc3cfab29d359bc91d3981e7e54037053a2a1c3cf6778c13e20da6d07029d58b82c59d196cf52426c077a30a26fc SHA512 818202c1ac5c3e8541a8df20089fb952ce85ab60b82b111025ccc15e34c16a8fecc74604fc3a65e566597accb5cba3432e75bac9a5c9325b5d4258440e0a4133
MISC metadata.xml 365 BLAKE2B c7d4eddda426c4ba6e5749a60c60c1ec3a169e545e119b4987703c13bbbea8fb59ea52055c1dad743b0374a13b32869fb39ee846e5fad2237cd11426b612f69e SHA512 0a4edf2fd6a980baad45c3282db2f991b7c806d8a36a06bed355a4491472b58e0e79f96c5dd2210d0ea51f5f4e83731165345c21b0b439bb2a36584b543b18a7
diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
index 0fa931af9d40..ee8247958b42 100644
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
HOMEPAGE="http://logging.apache.org/log4j/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux"
IUSE="javamail jms"
CDEPEND="
diff --git a/dev-java/objenesis-test/Manifest b/dev-java/objenesis-test/Manifest
index 8f1870667b22..69e465cc2656 100644
--- a/dev-java/objenesis-test/Manifest
+++ b/dev-java/objenesis-test/Manifest
@@ -1,3 +1,3 @@
DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
-EBUILD objenesis-test-3.2.ebuild 871 BLAKE2B 07f8bf1132db0ea5c4a6029db31a09858e16b0b9d4b94caf4cb955b0337f8d79e101f50d2a9b6c7288210b4dca24307551afdb9c144ae30e062d56d1deb41357 SHA512 554f86111bdc3ca361e267b1028efb0672ad82045fc30b6b251a9c4445bcea8b7fb5875ebddbb6cca2a1ab8c594b4b99e981d03642ea409469c11087a47ddf40
+EBUILD objenesis-test-3.2.ebuild 870 BLAKE2B c54276ad677b993b8d0ffd7287a67f3aef784b19098ed396748a5ed4dec4bac0530b3cdc591c1bcd1f224e2e0b9574014ce0d1e3ff878dd7e3f542da5aad3ad9 SHA512 e19f19b8b82bbc40a271630f93ca39ac26aa6df1362684ae1ac7698ae45dcebba32e3aca7d595bcb7c9e37219a78d34de999106ff99bcc69775b8f581fcb357b
MISC metadata.xml 385 BLAKE2B 21b4ff5cdc9b66726d00f32aec998bd89bff2a75929eb15bed2aa688bfe1a04ac5a5df209ad2e732c0b168f0af0124fa7e74512721222a94fe5d155bd8a48d4c SHA512 51de98336149b818cfd1ba47b9a7ee5d09cba8669273f673db5491aa1d9e9b675cbcabae43a4bb4061ca2654f03ff998d01480b71e741ebe7cdaead2f786710a
diff --git a/dev-java/objenesis-test/objenesis-test-3.2.ebuild b/dev-java/objenesis-test/objenesis-test-3.2.ebuild
index d3ef97a3bf1a..a4285de9bf73 100644
--- a/dev-java/objenesis-test/objenesis-test-3.2.ebuild
+++ b/dev-java/objenesis-test/objenesis-test-3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/easymock/objenesis/archive/refs/tags/${PV}.tar.gz ->
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index 2f66dbc0fa3a..401136d07386 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,3 +1,3 @@
DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
-EBUILD objenesis-3.2.ebuild 1214 BLAKE2B fa8ce944f4e5af256cc4a66791a5d1863184f3c794e698ebf3554e438156df12cac745de878c52510d729babeb7f062194a5fe559979a8f2da1e6a9918233159 SHA512 f5b19271aed8002d501b467f4234b5eb69cfb627f08c9ef818197a9532141bac8032d0eccdea1fa966f0e2672b7a2f0c636e0b33f503427c3b696ce70189cf34
+EBUILD objenesis-3.2.ebuild 1213 BLAKE2B 027f06e2a9302ee45c21d10ea59841587f6c54af015e21873339bf8dc6bf982da87be0f3da92f1b90ccc09ef5c959c05bc2ab4af5a0443c419aa529b762c7a15 SHA512 acad4c6c0b79bfd9020ce7fe3540c93c4516999691907724c54ac59c1b1508d56f95030fa8fa832e2299410dcdac463ebb880871826946e865cf6e8f943bce70
MISC metadata.xml 385 BLAKE2B 21b4ff5cdc9b66726d00f32aec998bd89bff2a75929eb15bed2aa688bfe1a04ac5a5df209ad2e732c0b168f0af0124fa7e74512721222a94fe5d155bd8a48d4c SHA512 51de98336149b818cfd1ba47b9a7ee5d09cba8669273f673db5491aa1d9e9b675cbcabae43a4bb4061ca2654f03ff998d01480b71e741ebe7cdaead2f786710a
diff --git a/dev-java/objenesis/objenesis-3.2.ebuild b/dev-java/objenesis/objenesis-3.2.ebuild
index 87362be1d570..893f78715071 100644
--- a/dev-java/objenesis/objenesis-3.2.ebuild
+++ b/dev-java/objenesis/objenesis-3.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/easymock/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
# Compile dependencies
# POM: ${P}/main/pom.xml
diff --git a/dev-java/odfdom/Manifest b/dev-java/odfdom/Manifest
deleted file mode 100644
index 31f95fbd69ce..000000000000
--- a/dev-java/odfdom/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX build-0.8.6.xml 11328 BLAKE2B 73af33dddbcb829fa0a5e6354a8ac176836fbc975336f633709fb6519e834cc237af80b8bfc4822af58a85dbc89e452e891dcbbc16425f3c245ecc2ad6de5943 SHA512 6db30e3cf5b154e07bba0374beed2781c0aceb4000d73d1e44c9041f876c2aad3510f9d07d7838c7d427755819cb7e57907843a52140755bfdf8818bb15664ef
-DIST odfdom-0.8.6-sources.zip 33171275 BLAKE2B ac509fad6891a715196e36b945071a44e6c1b096d69df1ad08690dead00f9f1ed5811f070859c81da546333fb12bbccf3eed5cbe06efe9520952cde2ed509d0f SHA512 7b71d55da01d604d89c5e0c7b9efcfd67e926db6807c885cb34cb9bd2e1fb1dc4a38d8e75967e08913b7ab1dcd85e7165d561fd3585a3d0c63df35a1a12c44e0
-EBUILD odfdom-0.8.6-r1.ebuild 1740 BLAKE2B 316376eb1caaaf1d88e23471253a64bc5018a5f45a8b143d543402d37ba651e5a91e9192f5f26ad696af9b13c814a7a519b364eb7829d22d8073e07200c49651 SHA512 c4b32318400379bcacd0e14b94a5b29972cedaea87d56129a4aca6a9c4a38fd1933df3007a8094fc6024f3c56bf9b5afdefbd3eaa50764d3224f7ba0b08d6c76
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/odfdom/files/build-0.8.6.xml b/dev-java/odfdom/files/build-0.8.6.xml
deleted file mode 100644
index a2750f73a117..000000000000
--- a/dev-java/odfdom/files/build-0.8.6.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 1/17/11 1:59 AM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- Also contains some hand made modifications -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="odfdom-java-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="odfdom"/>
- <property name="maven.build.version" value="0.8.6"/>
- <property name="maven.build.odfversion" value="1.2"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="lib"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <fileset dir="lib">
- <include name="xercesImpl-2.9.1.jar"/>
- <include name="xml-apis-1.3.04.jar"/>
- </fileset>
- </path>
- <path id="build.test.classpath">
- <fileset dir="lib">
- <include name="xercesImpl-2.9.1.jar"/>
- <include name="xml-apis-1.3.04.jar"/>
- <include name="junit-4.5.jar"/>
- <include name="hamcrest-core.jar"/>
- </fileset>
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.5"
- verbose="false"
- fork="false"
- memoryMaximumSize="512m"
- memoryInitialSize="1024m"
- source="1.5">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- <copy todir="${maven.build.outputDir}">
- <fileset dir="${maven.build.resourceDir.0}"/>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.5"
- verbose="false"
- fork="false"
- memoryMaximumSize="512m"
- memoryInitialSize="1024m"
- source="1.5">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- <copy todir="${maven.build.testOutputDir}">
- <fileset dir="${maven.build.testResourceDir.0}"/>
- </copy>
- <copy todir="${maven.build.outputDir}">
- <fileset dir="${maven.build.testResourceDir.0}"/>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${maven.test.reports}"/>
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="."/>
- <sysproperty key="odfdom.version" value="${maven.build.version}"/>
- <formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- <pathelement location="${maven.build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java"/>
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="true"
- windowtitle="ODFDOM API v0.8.6 - http://odftoolkit"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"
- maxmemory="1024m">
- <doctitle>&lt;![CDATA[ODFDOM]]&gt;</doctitle>
- <link href="http://java.sun.com/javase/6/docs/api/"/>
- <link href="http://xerces.apache.org/xerces-j/apiDocs/"/>
- </javadoc>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="true"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"
- value="org.odftoolkit.odfdom.JarManifest"/>
- <attribute name="version" value="${maven.build.version}"/>
- <section name="ODFDOM">
- <attribute name="ODFDOM-Built-By" value="Gentoo"/>
- <attribute name="ODFDOM-Built-Date" value="${TODAY}"/>
- <attribute name="ODFDOM-Name" value="odfdom"/>
- <attribute name="ODFDOM-Supported-Odf-Version" value="${maven.build.odfversion}"/>
- <attribute name="ODFDOM-Version" value="${maven.build.version}"/>
- <attribute name="ODFDOM-Website" value="http://odftoolkit.org"/>
- </section>
- </manifest>
- </jar>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
-</project>
diff --git a/dev-java/odfdom/metadata.xml b/dev-java/odfdom/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/odfdom/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
deleted file mode 100644
index 1555263da739..000000000000
--- a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The ODFDOM reference implementation, written in Java"
-HOMEPAGE="http://odftoolkit.org/projects/odfdom"
-SRC_URI="http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252F${P}-sources.zip -> ${P}-sources.zip"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86-linux ~sparc-solaris ~x86-solaris"
-
-CDEPEND="dev-java/xerces:2
- dev-java/xml-commons-external:1.4"
-
-BDEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
- ${CDEPEND}
- test? (
- dev-java/ant-junit4:0
- dev-java/hamcrest-core:0
- dev-java/junit:4
- )"
-
-S="${WORKDIR}/${P}-sources"
-
-EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-external-1.4"
-EANT_BUILD_TARGET="package"
-EANT_JAVADOC_TARGET="javadoc"
-EANT_EXTRA_ARGS="-Dmaven.test.skip=true"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
- cp "${FILESDIR}/build-${PV}.xml" build.xml || die
-
- mkdir lib || die
-
- # These tests fail.
- rm -v src/test/java/org/odftoolkit/odfdom/doc/DocumentCreationTest.java \
- src/test/java/org/odftoolkit/odfdom/doc/PresentationTest.java \
- src/test/java/org/odftoolkit/odfdom/doc/ImageTest.java \
- src/test/java/org/odftoolkit/odfdom/incubator/meta/MetaDocumentStatisticTest.java \
- src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java \
- || die
-
- default
-}
-
-src_test() {
- EANT_EXTRA_ARGS="" java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar target/odfdom.jar
-
- dodoc README.txt LICENSE.txt
- use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 8f934b4e443f..3da9b42b7787 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -22,5 +22,5 @@ DIST OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz 103785976 BLAKE2B 81f4b24f2b2
EBUILD openjdk-bin-11.0.11_p9-r1.ebuild 3625 BLAKE2B 4397d7271d15583b6f47fa5235ea55a240e53bcdbf23a59df15a0be7087278de2bb28776922243702ae2ca2bb750f2d85358c6704ac9e47ae65e20440c60596a SHA512 d8a7aff506f41ecd1f69c13ba36d64e33b93b96879740c3cf00f2af16a5a12381f2743c7613d96b392f1bccc85d23afc0eb722a1538412050408a09164a5fc38
EBUILD openjdk-bin-8.272_p10.ebuild 2150 BLAKE2B e5491e066b77dba9da871523bfbcda4c54ae8c1a81b714fecaf8e9dba08a4a13034ad512e0fa1bae65e4d6148015a8118a314b8fc1476acc1a66e9649a7545fe SHA512 406c0f47ec88471786a7742290ee20723b66e09fcff0ec867bc010085144a643d22cd69d208e1466f6475daf2a3f8e8878cffff03a392bfb6c988f97bc68fafd
EBUILD openjdk-bin-8.282_p08.ebuild 3021 BLAKE2B 735b8008dfc7ebaf4fe04eeeed41fb1f3f4a4ce511aa5df1872f06cecf5adf1358c73b32bf9dd66196a081951eb8bb0c4e171935f329bd41416da40f55b34e3c SHA512 4d8465e324810fa5f828a6aca1a6bb3a8547741ba87e59e80bf722398106a97bbbd0ab3bc81099795052fac78c5a3a492ebe1fcd300cc51002e6d0a41432f51c
-EBUILD openjdk-bin-8.292_p10.ebuild 2991 BLAKE2B 32ed8e5a2a2ebd637a6f7dcc1e9c12b5689dca7d51008b297fce4fc169fd343f95e0c13818b21f1ff9f1969eb7151144bd00db1c251a11616aff4ed8a2f32bab SHA512 eb66ab3117ce8dde396d04972f9d2525ada57c73d581dd23b5ff9d79f9edb3d2676dff239c202b6c84e524f505ba781f6299258a2e46531eea3146e4deefa34d
+EBUILD openjdk-bin-8.292_p10.ebuild 2990 BLAKE2B 30fd8d4a745ec3f8635ec9186505f1b3affcec34afb2a78f5fd9daf104a093d70661ed77437e7917088fc1b0ecb7098ed0a9f5eacedf9bf7bea6ce15a16f0b71 SHA512 4a6de5b9d6ae9ad3b1db2352cbc4169839a0f371275d1fb1631c6b7eedebd51e82b4c00c1e65813aa12ee3061e37df29f2d74c6e06f920190d064f8a911bf085
MISC metadata.xml 940 BLAKE2B 0b643a9707b0f85db0717d766c1491a4a6110342024a3fcca4455852d96c73e62e44607fdbc7f7069514d796134f1b0b82a36d1c88e166a4d2506646f17dc9f0 SHA512 990f19188c833dbcc6a4dac9f63e8d20604bf4ba1c74f6d42227e1f41528447cf5ea040b55cd813d073dfcd80c12f5ad626f97014fca99365fadc8539d446b2c
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
index 3e3c69836295..ed94c334091a 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
@@ -34,7 +34,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
IUSE="alsa cups examples headless-awt selinux source"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index cf5fe1c2c3f0..f3d80fe3a174 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -53,5 +53,5 @@ DIST openjdk-nashorn-8.292_p10.tar.bz2 2849397 BLAKE2B d875dea02ec8a3a3cba49f173
EBUILD openjdk-11.0.11_p9-r1.ebuild 7795 BLAKE2B 302d1b466151f220899fa03e0a1da8a25c399499a9594264b474d0fac46557fe3327d5977fd2167bbcc899edc7dd924237fa99d243b29cf578f2d8725e615802 SHA512 f286fc0657a2a43405ce040829fb0c196ed8ecbc6affe833484bcd0091a4e645cd1e1d492d466ff58b5dcbe19f832f3529cbcd8d481e80daaa133aee42c4ea85
EBUILD openjdk-8.272_p10.ebuild 7239 BLAKE2B e1543b8b5f1a15ead1feb98a03cde07657734ec0fcd33066d425d7f704ddb906ca5ffd99e3c14fdde4bae7924552616ee7fea0c189a935d5b71a8903afdd445b SHA512 f59a740c3acec9a47e13dfa1be11ad14a14f24576313add1fb9092bf0bf9cc2f55be0e17c2ead9004f154b3fa4f5bd7c717bfc93baaa052203e12f7fb9d59bbf
EBUILD openjdk-8.282_p08-r1.ebuild 7312 BLAKE2B c2771e19437b22e234a5be8deec7642688f377bc66d67a81cfb0911addf16c7a71560966ac5321268876244525ac47a6f136224136772b3d88272eb135dbaa56 SHA512 abf540f2160c45add83e8e64dc9c9d7605ee6e46ee879c16664bcb9008e6bd5deae0a5352c3bfb6b3bc5e9bd9f1f0cc9cd43235b10757cad839f3d9a48df9552
-EBUILD openjdk-8.292_p10.ebuild 7309 BLAKE2B b572ae29c8c2d8811cc6acf3b13f6fee147ae0d3fea374884910ad1cf91d97991f8840c0e98249f1987449a3df71a8941467bcb70bdaec1838381ab0251a774b SHA512 6d94c0dd8ee3f9ec7fed554deab7418d6e125a38c5a8a93859fa8c5f1614ee1a3610cdeff21b72b3766d05150d21da742c5e10fcc3b9ddce4a34c8314a7c6fe7
+EBUILD openjdk-8.292_p10.ebuild 7308 BLAKE2B cd181ac6880639f21fb6d91eb78bf3539c9221a3a271da18be8888b504e8ce5e098d5a6084be16f20f9e657b84517314151c444a13cd971b8e1202fcbdbf25fa SHA512 68fba677c735e3a5b11e352112bdcba32cb9c0d228bca094bda3b15b6d4e31e92d800587471573eb8874f946d1c77cda10daf555911eb44099603c409d5cd2fb
MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
diff --git a/dev-java/openjdk/openjdk-8.292_p10.ebuild b/dev-java/openjdk/openjdk-8.292_p10.ebuild
index 2c2c77c7bbbc..4cf0ec14f0b5 100644
--- a/dev-java/openjdk/openjdk-8.292_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.292_p10.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
COMMON_DEPEND="
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
index 312ca54c2d19..ae048af98e69 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -1,3 +1,3 @@
DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
-EBUILD oracle-javamail-1.5.6-r1.ebuild 1316 BLAKE2B a7165622d773eac307a5ca900b53c68473c6ffee19c3bfd13b6de77fa79986ac87fd162dcb802b624eb571c8f1ebdc338086db53901b6dc9062fa5ded2f20748 SHA512 673ea0ccecdbae8e2bb424f0b59f7d64af22f6cb5f624d2cd78e10f1c732e3971e0621cc9189ff98a565f9634a292ed612186c35bfcb05d14daf49a15ba3ef3c
+EBUILD oracle-javamail-1.5.6-r1.ebuild 1315 BLAKE2B 25b78259ed0a8c7c65ee5dbdeb36b1965b18cc301d40c34bafda6a5f8c62fb96647fec6a367ccae1e7c1eeea2c679c15c73428b68544ad2e101afaf8852f2993 SHA512 f774febcdc5cea9ecb01af6ead62830aceaa99f38637276f52b39715ae36e08400910e96c6d24f69770c11f0829b2f387e6bef2d9ce2db9f22b88610433a6fa6
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
index 8e469d1a6cc7..f56700c34bec 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
# either of these
LICENSE="CDDL GPL-2 BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index a816e798b3f8..6c3bf2896024 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,3 +1,3 @@
DIST poi-5.0.0.tar.gz 111429369 BLAKE2B b29e754fb709d01ff4d68e9227f4c4739384bd02934b6860e8a0e96552d9e9ff1c5c665bc0b701f79226505fd98373fe6ad160c72735903eae388f0cd6618337 SHA512 e79d15b42d8ec389fd15b7714faf7b49b9fb4d57014cb341fff0f061393f4ea7dfcbd3810a6ec19539eabddbb1d0690aa56de4a1a412d05a527e11797047023a
-EBUILD poi-5.0.0.ebuild 1950 BLAKE2B 11ced0830c3e72de700b95d10235efa998dddbb4a713ce479afe6ad40f81c3c8f494b5dd18d01d46db05ecdf17e97a453c8bdec0c797b55b64777726f2a0d5f0 SHA512 f9a60017946cf2145e9243f5304dcdd28aa2e00732540aebbc66488e48e189947e817950b878c7b39b6e9dd65640a9ff29e9ab716d70081da4b55866191654c1
+EBUILD poi-5.0.0.ebuild 1947 BLAKE2B 92f6d749ce72b3d139d296c728dc3e39a9578a37a3baa957d7badabdfaf6691a204582e78499277a4b2329304775fe0688cdefe92b8386304baea5429e19d870 SHA512 3095e7a2b1793a33908e8f2d3cf0ed7ca29fd7b9dc109953ad41da34c1145b2ae6351e7c74c6142c23c3421944f646dda344344e6341cfceeef3a146aa3cbb29
MISC metadata.xml 428 BLAKE2B 3c635a18242ab2a097c37707bc6ce85d05144fe8142b6b2fed764f785ca9885171d84bc2c8422160eaa0b8d868180295f49de953ada22c26d85a72b39e11e3ff SHA512 f43292d507ae9a54941544ac52d678907440c5c663a50131cd170b97159f2d8045f38a5f9dda418a518c6ab711a77c600062416438fcf802ee03cd69801252bc
diff --git a/dev-java/poi/poi-5.0.0.ebuild b/dev-java/poi/poi-5.0.0.ebuild
index afdf198efed6..17710fa6007b 100644
--- a/dev-java/poi/poi-5.0.0.ebuild
+++ b/dev-java/poi/poi-5.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://poi.apache.org/"
SRC_URI="https://archive.apache.org/dist/${PN}/release/src/${PN}-src-${PV}-20210120.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
# Common dependencies
# POM: ${P}/sonar/main/pom.xml
diff --git a/dev-java/saaj/Manifest b/dev-java/saaj/Manifest
deleted file mode 100644
index c5adeb297292..000000000000
--- a/dev-java/saaj/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX saaj-1.3.19-java-5-bootclasspath.patch 502 BLAKE2B 6c753863bb79bfa13caf57b944e654768d77a809829196fd540619cebe72e9ecd7098164938d934dbb93619db7fee9ba6419670cc240ef0b2e367585c5e08432 SHA512 8477fac7d1a33b0ac7fc365c0eb385597cc0ae5cb65bc6ad45ebfb70a023b343adafbfbcf71cd226e14f4e282eee5654a5b0d310703aa4386b4238a4c55f0bd1
-DIST saaj-1.3.19.tar.bz2 2266558 BLAKE2B ea198273be03e8c01d66c2b088df99761eee46e264ac80987845af0fe8fb3992f5dfdd323a5e719241759c31dcc1da0d52cf4506eef1577d2e617eda0565bf29 SHA512 12a439e296117abeac5de4694f2efec74c7f2b15cd86cb8759bfba6867f68dfe6c2f5b86ac2f8884eb86dddb3221e19f6c47c976cbcedcebe28570b51280ef71
-EBUILD saaj-1.3.19-r2.ebuild 1675 BLAKE2B 1d80a4b46e189bb79a07348ad41abae94463be2ecfdb66c6d35485e581d7c510fb2d33148fa809cf22d2acb0befdb24e9516c83910460c861713ec9517c2c6f3 SHA512 b43964117da68ae030ca47a8ac6b277732d8a0876a0c301dae90be8dbfa0fd50ca3ab9bbe30129f638555707dd7b3c67a5722b8848446cbb3ab4aff280a1967c
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch b/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch
deleted file mode 100644
index 9b92b18944c9..000000000000
--- a/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/java/com/sun/xml/messaging/saaj/soap/ImageDataContentHandler.java
-+++ b/src/java/com/sun/xml/messaging/saaj/soap/ImageDataContentHandler.java
-@@ -83,7 +83,9 @@
- * @return The DataFlavors.
- */
- public DataFlavor[] getTransferDataFlavors() {
-- return (DataFlavor[]) Arrays.copyOf(flavor, flavor.length);
-+ DataFlavor[] copyOf = new DataFlavor[flavor.length];
-+ System.arraycopy(flavor, 0, copyOf, 0, flavor.length);
-+ return copyOf;
- }
-
- /**
diff --git a/dev-java/saaj/metadata.xml b/dev-java/saaj/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/saaj/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-java/saaj/saaj-1.3.19-r2.ebuild b/dev-java/saaj/saaj-1.3.19-r2.ebuild
deleted file mode 100644
index 5fb094560cfa..000000000000
--- a/dev-java/saaj/saaj-1.3.19-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="SOAP with Attachments API for Java"
-HOMEPAGE="https://saaj.dev.java.net/"
-
-# svn export https://svn.java.net/svn/saaj~svn/tags/saaj-impl-1.3.19 saaj-1.3.19
-# tar cjf saaj-1.3.19.tar.bz2 saaj-1.3.19
-SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# saaj-api only for java 5
-CDEPEND="
- dev-java/mimepull:0
- dev-java/xerces:2
- dev-java/xml-commons-external:1.4
- java-virtuals/saaj-api:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-# servlet-api 2.5 for java 5. 3.0 is java 6.
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- test? (
- dev-java/ant-junit:0
- dev-java/xalan:0
- java-virtuals/servlet-api:2.5
- )"
-
-PATCHES=( "${FILESDIR}"/${P}-java-5-bootclasspath.patch )
-
-HTML_DOCS=( docs )
-
-src_prepare() {
- default
-
- java-pkg_clean
-
- # YES! There's nothing like using com.sun...internal ! YAY!
- find src -name '*.java' -exec sed -i \
- -e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \
- -e 's,com.sun.org.apache.xalan.internal.xsltc.trax,org.apache.xalan.xsltc.trax,g' \
- {} + || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="mimepull,saaj-api,xerces-2,xml-commons-external-1.4"
-
-EANT_TEST_TARGET="test-all"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},servlet-api-2.5,xalan"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar build/lib/saaj-impl.jar ${PN}.jar
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/java/*
- einstalldocs
-}
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 386872b99478..a11a4e6582cf 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,3 +1,3 @@
DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
-EBUILD slf4j-api-1.7.30-r1.ebuild 1366 BLAKE2B c64200dd8cf2359c7b1af7dcb7a0d9fb15e2ef6e06657c6412b2f3516b2abe27717945467f567583300807bc0fddd1f90df4fa60aa2c1b757dd69b1174adf617 SHA512 613c39180fd45c9df7862946d0d1fbfb9591a55e7385dbfa7d6337c1efb0ed718f8c2fa0307d2bc579283efaadad83df1a2d06271fcc3dd6e6bcf6e3e40f4470
+EBUILD slf4j-api-1.7.30-r1.ebuild 1365 BLAKE2B 3bea2f16ae8b2180146426855f896e65764db90c822988045dd2d706704487cadd86d22223e4b76f8d8cc67f6cffab32c9781996e0db7318b90822f6dec77ebb SHA512 b193257213af552180060750e3be79ff83d2bc67addc46134c8c83080b15ceb0b6431a089b88229104f959c632b1a76626b7d056f0ab72e97e30dd12b76fc139
MISC metadata.xml 366 BLAKE2B fcc9f77c9b83f1d612815cd6e9e8814ba364c8407422ec822f0c60ccc2176dc724e826ce9fdbdd7fb1290f669fd332b93a74650628840d30d1dd2d68184d9893 SHA512 628c4e1ed007e31d4b8a3769fb2f4bd5c4f8041d99ef656508927302345a16573713abe0da228546f8a976d8e3e5de4538f838437623149c7f5b14bfee12abd1
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
index b1522d481d56..ef4a91e9b8c8 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 589c8a95c95f..4347153a4202 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,6 +1,4 @@
AUX snakeyaml-1.28-fix-test-check.patch 728 BLAKE2B 3c2e1607f03cfb00dba8808fec19b7a705afcc6ad8b1a3c2ee9b2b38e05e0e4e50b00413e5da236827ba4d7ca715b27158d0354dd7ce3950645a2a3bc9057540 SHA512 81bd69b9780e75df4d0964119a0c15684b54533ce2eebc94de3d481b7cf521b26f82f62279eabf3fc0e41eefb9c1648fb2700d6f07ae3b1fd99c6a5f55cbecd8
DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
-DIST snakeyaml-1.16.tar.bz2 234954 BLAKE2B dea06c3501ceab4e92b4d125dc882ce7b7773d67ac5526fdf39fafb421f339fe892cfd3f8e80e413aa080fecbc94425842ccabd099d97e1c705eab7025c489e9 SHA512 77ef0b1fa2ebe7ab1618745c407436ac6965159e29e1271b0d571006b967bcd94658eb3a8047180ea7c3160eb66ecbac1f24414537a24a81c11fb735ce65e3a4
-EBUILD snakeyaml-1.16.ebuild 1330 BLAKE2B bc4ec2b97f5e12b611340669485f71e44fe56905c554761dd9628f14bfb8d501e57d2f322b8d0ef8bc8159720e05d643f7cc5626358ec71e029bd4fb73497608 SHA512 65553fab3d53a9feba2dbf1a5754a68710d796b8d5f182696869aa2c6224291b81156753c8cce6807c9c622b214bf9ab4dba70cdffdfdf36ecc6a0ffe7bf32a5
-EBUILD snakeyaml-1.28-r1.ebuild 2949 BLAKE2B 1d7e3c60472fe80e9d5b2a2bc8f22da593aac2c9fd395e48934a51f3aaa06aea6a06dfb7a90d6d8333387469f2e044ab2546ac7e717d1824a979fd2e2294abd8 SHA512 5baa8e3330d69f29d59f3f7fee4813955968b32c817d095333de39933ecbfc929da1ec4848ed7503d881a09bf77f1c31506564a34dd32e874ba17642a4f73bb9
+EBUILD snakeyaml-1.28-r1.ebuild 2947 BLAKE2B 69b449227dd2df1c5aa3b00a69a62f582eae7e30bb9b277c56b66ff815473f3a47c84cc081b83af33e98648d3afc1f62e835fedfd721dc2aef0d5b4f277291df SHA512 f8ea7dd4a7942ba7f7f1d34271d583ca457776a895b61634e2dc4717412d542c5347068c4537ad690bbc95c94958474cf8b9326cc12d4d229ee73cdd159eea0f
MISC metadata.xml 320 BLAKE2B f5e0df5b735f9728165a2b8a6cd9c5f6d0142878f75ace80705d73e6948654f4761ef4fa4715b23ae4f5d97ed25e2ab6aa72582a80790a3f7a13d8c59f73ad40 SHA512 149372d821a11d3dfce7ec38ddb98c9b5b5e64c513fdd1e27b74dce17f398eec6d24b5a61ad62fb5e6e0ee31f206f1ed005db953f5f2358177f1a1d56420d5cc
diff --git a/dev-java/snakeyaml/snakeyaml-1.16.ebuild b/dev-java/snakeyaml/snakeyaml-1.16.ebuild
deleted file mode 100644
index 84d47f987398..000000000000
--- a/dev-java/snakeyaml/snakeyaml-1.16.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
-
-DESCRIPTION="A YAML 1.1 parser and emitter for Java 5"
-HOMEPAGE="https://bitbucket.org/asomov/snakeyaml"
-SRC_URI="https://bitbucket.org/asomov/${PN}/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.6
- test? (
- dev-java/joda-time:0
- dev-java/junit:4 )"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
- # Remove some tests with tricky dependencies.
- rm -rv src/test/java/{examples/SpringTest.java,org/yaml/snakeyaml/{emitter/template/VelocityTest.java,issues/issue9}} || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc README.md src/etc/announcement.msg
-}
-
-src_test() {
- local DIR="src/test/java"
- local CP="${DIR}/../resources:${DIR}:${PN}.jar:$(java-pkg_getjars joda-time,junit-4)"
-
- local TESTS=$(find "${DIR}" -name "*Test.java" ! -name AbstractTest.java ! -name PyImportTest.java)
- TESTS="${TESTS//src\/test\/java\/}"
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
index f7a00cefc146..74a3ef6af086 100644
--- a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/sparsebitset/Manifest b/dev-java/sparsebitset/Manifest
index 560b70881e29..6b2c89bf88b5 100644
--- a/dev-java/sparsebitset/Manifest
+++ b/dev-java/sparsebitset/Manifest
@@ -1,3 +1,3 @@
DIST sparsebitset-1.2.tar.gz 1669439 BLAKE2B abfd88fb21f72d22bbb1f7bff11bd2a9b4e2af84689cbe8013f27f1f138512ecf843a60b8c5c196b622d024614e7f197b349a6cd510eb1c17bd757f7c1a0d90d SHA512 0c7c182556240886e0732626561401aa8695fd46ba90e5e95c5b28c90abaf5f6fd4c3b791171cdde71f61111c6b08ae8f56de105779f71d0448635cbe3b0b247
-EBUILD sparsebitset-1.2.ebuild 1047 BLAKE2B 0bb635cd768502e0516aca43525c6b8c8ec1ff18eeba8d3d2e45c4626fac49e56e453a36b086eb3c54345e77dbc0f47b0c4310a46bd602544a0a0713922e93b3 SHA512 48c4dd2b14ae75f50f8ffe306b769167a179204e9a04437871535f39132f7209f087bffea224b67c6e70d5ba9dcdba1e5ee6159c741c7ae51bd4a97233486b80
+EBUILD sparsebitset-1.2.ebuild 1044 BLAKE2B 46ad495b50c6c4f329abbf8cb412ec9cbdf017353607116aba94e02cca68a48b100dae571ef894c1c118c536f25f6c97e347be86bd69de7256fedd978e0cc796 SHA512 f813d0513c686880ba350de498bd88b1aab21b2848666849f0c7b4b79dcf984b6dc869e3ffa1e13035caa53269a82714b1f84539d316eb928798a3c6d42c6a45
MISC metadata.xml 385 BLAKE2B 7c290911ac6a6ab2657efba2c525b9b5f72cdb730f3612f452ac97d635a51784421e43c64a601fd7c5a73a25642c7c7c2cd550553de34d6bf6d2888571a4c395 SHA512 74d05d5f3c3595a9a686e5d807910ed1d73ff29c4bcf875dc08ec2e05c7e0495b48208d81e075f8fe7d0ca9de6420acb506684ac5e673e33086e0f7276d1d940
diff --git a/dev-java/sparsebitset/sparsebitset-1.2.ebuild b/dev-java/sparsebitset/sparsebitset-1.2.ebuild
index 1b2f2ecf1264..05457982154c 100644
--- a/dev-java/sparsebitset/sparsebitset-1.2.ebuild
+++ b/dev-java/sparsebitset/sparsebitset-1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/Spars
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index 892eaed76c7b..0e8b76d8be0e 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,5 +1,6 @@
DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 BLAKE2B c16dc0e04127bf57df6390dc9d99a1e44040c0fe81ccacc88698493d3fd3483aae12d664a89bc13939655d21ce2d92b64537b073c0d1063bbf91e18129da5eb4 SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56
DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 BLAKE2B eec4976124a9701367e7b61c652ed619df69fa12eb02c5288d9d1ba4845ca7e2315514fba1f75f15c8bbb90cba981972961e8d1e843a8a8ac2b000e5e4917975 SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860
EBUILD sun-jai-bin-1.1.3-r1.ebuild 1099 BLAKE2B 0257abd4b7fd290f56200786782459183a09c1c55e7cfe8702b85447f8f05b8e80e21a688e26bdb000b5ae28cae43bd9f9ea3b234df2cc5e3723781c6f0c3e34 SHA512 621448fc993b3376701632312d1efc7d8e675b7f3eeaf1ed2391a58b3e0e10e212a8dae9b69f2d52473703ff695e1c0edd5fc416ba9fcf8dd4e98dd2c74e0150
+EBUILD sun-jai-bin-1.1.3-r2.ebuild 1091 BLAKE2B dc4eaaa13002d5c337ebf76af5804a17505c2d5d6bf57d5b51a574bb37b46531b709d650f84d0d5d1b04f95fb9409c53a055a4b2f6ca4ef97fea054ebe121f32 SHA512 4b3bb1f789012d207d9d8ad0b407a9491195f079f7c2df72024bedae8003bc8f0767898f77fe8e8bf854b8f8eac040d1eb7a5de464d8c76d5e7cfdb1ef025740
EBUILD sun-jai-bin-1.1.3.ebuild 973 BLAKE2B 07e9e2c6e99b48b56f5ea8dc8d1bc8efc9d5a353b79b398ba078d92e1d92e286d61bad00a81a580e108a64317b3c87644889cb87dd1a69f51683f59380ab4a83 SHA512 2a2e4756e1b32c14d25642d912cba5b08371d4722b69fd0bf0db0f8c8d0348a7f4bbd136b9d28fe9355f3baeed54492c3b22bffce8f616c3d3c992feb518bc0e
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..1f5ba79b8b0c
--- /dev/null
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PV=${PV//./_}
+DESCRIPTION="JAI is a class library for managing images"
+HOMEPAGE="https://jai.dev.java.net/"
+
+BASE=https://download.java.net/media/jai/builds/release/${MY_PV}
+MY_P="jai-${MY_PV}"
+SRC_URI="
+ !amd64? ( ${BASE}/${MY_P}-lib-linux-i586.tar.gz )
+ amd64? ( ${BASE}/${MY_P}-lib-linux-amd64.tar.gz )"
+
+LICENSE="sun-bcla-jai"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="virtual/jre:1.8"
+
+RESTRICT="bindist mirror"
+QA_PREBUILT="*"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+ rm LICENSE-jai.txt || die
+}
+
+src_compile() { :; }
+
+src_install() {
+ dodoc *.txt
+
+ java-pkg_dojar lib/*.jar
+ use x86 && java-pkg_doso lib/*.so
+ use amd64 && java-pkg_doso lib/*.so
+}
+
+pkg_postinst() {
+ elog "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
+ elog 'To use you need to pass the following to java'
+ if use x86 || use amd64; then
+ elog '-Djava.library.path=$(java-config -i sun-jai-bin)'
+ fi
+ elog '-classpath $(java-config -p sun-jai-bin)'
+}
diff --git a/dev-java/sun-jms/Manifest b/dev-java/sun-jms/Manifest
index bfc2bb275f58..8be4a0f20ab2 100644
--- a/dev-java/sun-jms/Manifest
+++ b/dev-java/sun-jms/Manifest
@@ -1,3 +1,3 @@
DIST jms-1_1-fr-apidocs.zip 361922 BLAKE2B 75342eaeb56ba329948a226f48304e0a520e83f7284d5d8b46b981531b7f8c78283e38b2a488177349aaabb70276fd4ca09bc86993800906aea1469a6549f318 SHA512 ac2c7925b7f5bd3918f0c69a7b18dfa2a15f58243aef7cb429c0571ea218860fc146fd355c905e17310072263f64385b9010eafb1050158f42f498d7f21dfe1d
-EBUILD sun-jms-1.1-r2.ebuild 1330 BLAKE2B d39c97ba5613b160a380eeee4104027897bea4990788a6a064d2f4ac561b306051aa1cc1f4f50fc79ecc39b5de9f7386b3ca06f643969aeb9e8829f66efefe4c SHA512 9e3865734c6eb046f36532be3c273f9e7d64c0e6f6f931255a0a0af13af38fa9b0dfa81f2ef2049bdbfbec89c1d3631fc554ffe4f9ea619f9e7bac29be7ec1f8
+EBUILD sun-jms-1.1-r3.ebuild 1383 BLAKE2B 49651a405e48318f28436a6a213af699074fcf012a475fa5ceb2fce92ee592cb904621db79bb7eb41ef0f71d8ec057a49f61a463fd7bceed30d13cbe112d0078 SHA512 c08b0034bd75e5f9833e532be25ef5273e001709c840cb35eadff213c99afa132c25d80b610eb5c240b1e739820f7fef905ecc7d53e73e738ea72f4c7ae330d9
MISC metadata.xml 420 BLAKE2B d00cdddbce707b1fbe67e796c7f62bc4f942c6f4e3c5af1aa3a643846dabded18b41b1e35d4e93cca068d2d0656fd5a88d65abfdc303cf5b6293d8fcd39be61d SHA512 60f2556340ffa7951c69e1bef1a5eda1905a02f3a1e72199c7af02225844c805fa2154ce6629b6d8bafcece22fc3d1c75349021af6932dff3ffaf952fdcb818c
diff --git a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild b/dev-java/sun-jms/sun-jms-1.1-r3.ebuild
index fc11510e058b..3772dd7778f5 100644
--- a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
+++ b/dev-java/sun-jms/sun-jms-1.1-r3.ebuild
@@ -9,17 +9,17 @@ DOWNLOAD_PAGE="http://download.oracle.com/otndocs/jcp/7542-jms-1.1-fr-doc-oth-JS
At="jms-${PV/./_}-fr-apidocs.zip"
DESCRIPTION="The Java Message Service (JMS) API"
-HOMEPAGE="http://java.sun.com/products/jms/"
+HOMEPAGE="https://www.oracle.com/java/technologies/java-message-service.html"
SRC_URI="${At}"
LICENSE="sun-bcla-jms"
SLOT=0
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="doc"
-RDEPEND=">=virtual/jre-1.3"
-DEPEND="app-arch/unzip
- >=virtual/jdk-1.3"
+DEPEND=" >=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
RESTRICT="bindist fetch"
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 7025c6b6912c..478eccdd018e 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -18,5 +18,5 @@ DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936
DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 3c08a0ee771d859e07af9d01c9796571ec9295bc0be4058abb330bd62194f20c77744795fcd27412a7397e7a341b7556080d3a7589faa9548ab1f1ac97433005 SHA512 f5c8f79cb9c801062d21d17f6ccdc30b28d5d1716e63ecae00872fce2c7c1b8a6152882ab90ddf6a39d4f525429462415cef6597a9425ec59060d6d0fdbe5099
-EBUILD swt-4.10.ebuild 4613 BLAKE2B b666b2a3bc964012c12b568c24f3a9239b9de956df76c804a76029ad30a0279f240d2b967ac86e51500a8f524dca31c4982b77be3268fcfaada4dc8212de7416 SHA512 b4b1c33f0cb51603730ae2b950c652b27bd1e669ad2e6b62e08c4d640ae98393d442b41a2eb88f42a136c2952582f9240154f7ffc06ebca9a943b71248bffab8
+EBUILD swt-4.10-r1.ebuild 4629 BLAKE2B 6ec4fff913b3f0fb72615009644556e2ebfa1247619000c16a41025099f21948dc0c5a78f9f93ca0f380501ff6a00e834a050a9fc58b0938917d6eff678d64db SHA512 4a944f03e1ba887c5cc2fa638369e72638395558268c57b8a0a7d542eb2e34cf17b6b9a6fa79e10f99152186c88719ff730f1741f6989a80039c2501affec961
MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10-r1.ebuild
index 13b1abd63b38..527f20631194 100644
--- a/dev-java/swt/swt-4.10.ebuild
+++ b/dev-java/swt/swt-4.10-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
@@ -34,16 +34,18 @@ COMMON_DEP="
net-libs/webkit-gtk:4
)"
DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.8
- app-arch/unzip
- virtual/pkgconfig
+ >=virtual/jdk-1.8:*
x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
>=x11-libs/libXtst-1.1.0"
RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.8"
+ >=virtual/jre-1.8:*"
+BDEPEND="
+ app-arch/unzip
+ virtual/pkgconfig
+"
S="${WORKDIR}"
diff --git a/dev-java/tapestry/Manifest b/dev-java/tapestry/Manifest
deleted file mode 100644
index dc654c08346f..000000000000
--- a/dev-java/tapestry/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX Version.properties 162 BLAKE2B ebc22304b272f3862d87d0f838408c8e1d839c80d76f86f83e265b3f737273d8baedd5eced689f119e079e7d164820ae0a9ff3916b8b0969ca2ad14ebcf34f19 SHA512 f2b2c2fab2c670cd21f9b5a1ed0940d5a568230c3a0b13b59bee92310c47755c12f020454e2891c2561c978a2427677b15690ab21159ed6d79676e3e83e4622f
-AUX build.properties 1141 BLAKE2B 02c5b606d35bf1e94b147f04da4f6c626276fd85e8634514c00c7a610726c734ee83ef8c9e5f283703eaf12bfa958ebce345ef2d74138d49b1524ca5fa29f642 SHA512 3cfe36782bed225811884e97a2261719c6d7c82470621e54701114c0e4e18ca0ba673f5f97861840c0e822ede9dd86097d8c77aecf3a392de82cd5573049d0bc
-AUX common.properties 2850 BLAKE2B e1745cd8c7cc162f3c8d8d797b88ecbc1fa4e35831d581639fbab512c31311793f8beee3f147c267d675e0960f0a753c3f5e74230f825551973d58c9367b0623 SHA512 a00b28fde7e90100c017238150fd7c830cacc4bc6a24e7a9bd90fbd32bd6bf8a3787a8a178f6ed78033621a47503b1517e9485ffc60d5ffbfe5752254713283b
-DIST Tapestry-3.0.4-src.zip 1174780 BLAKE2B 2f2ad5e3860ed6852962b282431df15ae4f6f17f0d08e4246dcef69bcdd033acafe881ea3ba33bd38c2dcf8843caf37fb0b46da84c5b107c2d1c4a0d77aaf89a SHA512 ab94cee9745fceeecbc98a27ace90567b3bc8ab880408da0a32526ba3a68b24f90daeca5d2ea0180b5693ae4fd12f01f0db98e78f176cdc0a0370b5554aa9d10
-EBUILD tapestry-3.0.4-r3.ebuild 1696 BLAKE2B a58b497e0b93d8a4d976590087e5fe35cfd8a37011fb53dc86cf5d925a83cb40344acd6bd21645d354c8f39dc7181d8b4cb5b9065ac9592cc74f48b9d1087f32 SHA512 212b05c25ff7d036c73574597fb91c72bea5616abea5616cc1deeee97d1a2c99544fa3602be0b7481965cb147b7d4b08685415dc61d335423b7fb3ee3eb569ae
-MISC metadata.xml 750 BLAKE2B 57a35e8c3abe2476a1d35896ef702db76748f91065a68fca93b8f9f5117c7bc6d3ad9a100bf9c4164e2aea8e2f51db5ae77debe651e5a915d48aa6b120c19f4e SHA512 65e251c97e3c5fff6f3bd40910a5ee7b2e5152a86d3638aeb870283f8e415c833da3666647fc25add19e96c0534d5fac39090646cccc9cc10a2b07f5bcc5885f
diff --git a/dev-java/tapestry/files/Version.properties b/dev-java/tapestry/files/Version.properties
deleted file mode 100644
index 4b67c327efa1..000000000000
--- a/dev-java/tapestry/files/Version.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id: Version.properties 390452 2006-03-31 11:34:17 -0500 (Fri, 31 Mar 2006) jkuhnert $
-#
-# Stores the version number of the framework.
-
-framework.version=3.0.4
diff --git a/dev-java/tapestry/files/build.properties b/dev-java/tapestry/files/build.properties
deleted file mode 100644
index b82007cc4202..000000000000
--- a/dev-java/tapestry/files/build.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: build.properties.sample 243768 2004-02-04 13:04:22Z mindbridge $
-# This file is used to configure the Tapestry build.
-# Copy it as "build.properties" and fill in the necessary data.
-
-# The absolute path to the directory where external distributions
-# used in the building process will be downloaded and installed
-base.path=/usr/share/java
-
-# The absolute path to the directory containing the JBoss installation.
-# Required to execute the configure and run-jboss targets.
-jboss.dir=
-
-# The absolute path to the directory containing the Tomcat installation.
-# Required to execute the deploy-tomcat target.
-#
-tomcat.dir=
-
-# The absolute path to the directory containing the Jetty installation.
-# Required to execute the run-workbench target.
-jetty.dir=
-
-# The absolute path to the directory containing the Jython installation.
-# Required to execute the junit target.
-jython.dir=
-
-# Home for xml-forrest, used to build documentation.
-# Available from :pserver:anoncvs@cvs.apache.org:/home/cvspublic as module xml-forrest
-# Build forrest, then set to the shbat directory, i.e.
-# C:/workspace/xml-forrest/build/dist/shbat
-
-forrest.home=
-
diff --git a/dev-java/tapestry/files/common.properties b/dev-java/tapestry/files/common.properties
deleted file mode 100644
index 775eec976ea3..000000000000
--- a/dev-java/tapestry/files/common.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: common.properties 385802 2006-03-14 13:47:10Z jkuhnert $
-#
-# Specifies some general properties used throughout.
-# Each build.xml must specify root.dir (as a relative path).
-
-lib.dir=lib
-
-root.lib.dir=${root.dir}/${lib.dir}
-
-ext.dist.dir=${root.dir}/ext-dist
-
-root.config.dir=${root.dir}/config
-
-framework.jar=tapestry-${framework.version}.jar
-contrib.jar=tapestry-contrib-${framework.version}.jar
-
-examples.dir=${root.lib.dir}/examples
-
-vlib.war=vlib.war
-vlib.ear=vlib.ear
-vlibbeans.jar=vlibbeans.jar
-workbench.war=workbench.war
-wap.war=wap.war
-
-ext.download.dir=${ext.dist.dir}/downloads
-
-# Names of directories under lib
-
-ext.dir=ext
-j2ee.dir=j2ee
-runtime.dir=runtime
-
-jboss.lib.dir=${jboss.dir}/lib
-jboss.client.dir=${jboss.dir}/client
-jboss.server.all.lib.dir=${jboss.dir}/server/all/lib
-
-# Directory containing source code and package resources
-src.dir=src
-
-# Directory containing compiled Java code
-classes.dir=classes
-
-# Used as part of copyrights
-
-copyright.years=2000-2004
-
-# ----- JUnit Unit Test Suite, version 3.8 or later -----
-junit.home=${ext.download.dir}/junit3.8.1
-junit.lib=${junit.home}
-junit.jar=${junit.lib}/junit.jar
-junit.ext.jar=${ext.dist.dir}/junit.jar
-junit.loc=http://telia.dl.sourceforge.net/sourceforge/junit/junit3.8.1.zip
-
-# ----- JDOM Library, version 1.0 -----
-jdom.home=${ext.download.dir}/jdom-1.0
-jdom.lib=${jdom.home}
-jdom.jar=${jdom.lib}/build/jdom.jar
-jdom.ext.jar=${ext.dist.dir}/jdom-1.0.jar
-jdom.loc=http://www.jdom.org/dist/binary/jdom-1.0.tar.gz
-
-# ----- McKoi Pure Java Database, version 1.0.2 -----
-mckoi.home=${ext.download.dir}/mckoi1.0.2
-mckoi.lib=${mckoi.home}
-mckoi.jar=${mckoi.lib}/mckoidb.jar
-mckoi.ext.jar=${ext.dist.dir}/mckoidb.jar
-mckoi.loc=http://www.mckoi.com/database/ver/mckoi1.0.2.zip
-
-# ----- DocBook XML, version 4.1.2 -----
-docbookxml.file=${ext.dist.dir}/docbkx412.zip
-docbookxml.loc=http://www.docbook.org/xml/4.1.2/docbkx412.zip
-
-# ----- DocBook XSL, version 1.64.1 -----
-docbookxsl.file=${ext.dist.dir}/docbook-xsl-1.64.1.zip
-docbookxsl.loc=http://telia.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.64.1.zip
-
-# ----- Apache Forrest, version 0.5.1 -----
-forrestdl.home=${ext.download.dir}/apache-forrest-0.5.1-bin
-forrestdl.ant.xml=${forrestdl.home}/forrest.antproxy.xml
-forrestdl.loc=http://archive.apache.org/dist/forrest/pre-0.6/apache-forrest-0.5.1-bin.zip
-
-# ---- OGNL ----
-ognl.version=2.6.7
-ognl.loc=http://ognl.org/${ognl.version}/ognl-${ognl.version}.jar
-ognl.dest=${root.lib.dir}/${ext.dir}/ognl-${ognl.version}.jar
-
-# ---- Javassist ----
-
-javassist.version=2.5.1
-javassist.loc=http://umn.dl.sourceforge.net/sourceforge/jboss/javassist-${javassist.version}.zip
-javassist.dest=${ext.download.dir}/javassist-${javassist.version}
-javassist.ext.jar=${root.lib.dir}/${ext.dir}/javassist-${javassist.version}.jar
-javassist.jar=${javassist.dest}/javassist.jar
-
-
diff --git a/dev-java/tapestry/metadata.xml b/dev-java/tapestry/metadata.xml
deleted file mode 100644
index 63cc3f846416..000000000000
--- a/dev-java/tapestry/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
-<longdescription lang="en">
-Tapestry is a powerful, open-source, all-Java framework for creating leading edge web applications in Java.
-
-Tapestry reconceptualizes web application development in terms of objects, methods and properties instead of URLs and query parameters.
-
-Tapestry is an alternative to scripting environments such as JavaServer Pages or Velocity. Tapestry goes far further, providing a complete framework for creating extremely dynamic applications with minimal amounts of coding.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/tapestry/tapestry-3.0.4-r3.ebuild b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
deleted file mode 100644
index 0d12ef740137..000000000000
--- a/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Dynamic, robust, highly scalable web framework in Java"
-HOMEPAGE="https://tapestry.apache.org/"
-SRC_URI="mirror://apache/${PN}/Tapestry-${PV}-src.zip"
-
-IUSE="${JAVA_PKG_IUSE}"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
- dev-java/bsf:2.3
- dev-java/commons-beanutils:1.7
- dev-java/commons-codec:0
- dev-java/commons-digester:0
- dev-java/commons-fileupload:0
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/jakarta-oro:2.0
- dev-java/javassist:2
- dev-java/ognl:3.0
- dev-java/tomcat-servlet-api:2.4
-"
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.4
-"
-DEPEND="
- ${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-1.4
-"
-
-S="${WORKDIR}/Tapestry-${PV}"
-
-EANT_GENTOO_CLASSPATH="commons-logging,commons-fileupload,commons-lang-2.1"
-EANT_GENTOO_CLASSPATH+=",commons-codec,commons-beanutils-1.7,commons-digester"
-EANT_GENTOO_CLASSPATH+=",tomcat-servlet-api-2.4,ognl-3.0,bsf-2.3,jakarta-oro-2.0"
-EANT_GENTOO_CLASSPATH+=",javassist-2"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_prepare() {
- default
-
- mkdir config lib || die
- cp "${FILESDIR}/Version.properties" config/ || die
- cp "${FILESDIR}/build.properties" config/ || die
- cp "${FILESDIR}/common.properties" config/ || die
-}
-
-src_compile() {
- cd "${S}/framework" || die
- eant -Dgentoo.classpath="$(java-pkg_getjars ${EANT_GENTOO_CLASSPATH})"
- use doc && javadoc -sourcepath src/ org.apache.tapestry -d ../javadoc
-}
-
-src_install() {
- java-pkg_newjar "lib/${P}.jar"
- use source && java-pkg_dosrc framework/src/org
- use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index a63b6e7493a5..dbafb0f597db 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -4,19 +4,25 @@ AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e
AUX tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 718 BLAKE2B f6e5fb4b569cb54dd6274023e155abf988c1efe724b4e42e31d96e897f8a1cc8afb64ca673d32ef30e2b44d74afcafd8cf7e1fb33372e95b802e17d9c6354270 SHA512 c7d5d2babde536adff9c5fa2ff41405ef7ab8013ebf91cd5f9ff7aeb5f5bfebe6e1e0dd9ceb7c031a4905258701156060a26ee5555ca1e3077181afe4d351c9f
AUX tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 710 BLAKE2B 177affee37d70208942c709324c4a7a4c561a28197792683a1f21dd747cb90f2d9fc2c32cf28cab0ad575c22dfa93efeaf7ba7f5254dbe67fe1a8b6fe5fd504f SHA512 0233b3fa6f6e3de36d62056035c84f9a22e866ff61e4cfd0976b7aa7e8ae019421bad25e49430e47a0476d09b5c1037d453e807ea02605a4f161d876f303c24a
DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 5441bec39ddaa74a7a4b39e48ecb524f6edb230760272678e6bf8d0a26b4a39e9a6c276b591d5d7962d8cae7d211486d65a334f363931d7cd8750a902c8aaf98 SHA512 177e497b2355b260fc59cfcfb8b1fc2fabf5fe5a0f5705b5feee2c330881545aad359a746074c9fb180acb54035d0c2f25b23daac84202788178a256e48f0c9f
+DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4 SHA512 229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100
DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa
+DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682 SHA512 e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
+DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
EBUILD tomcat-servlet-api-10.0.5.ebuild 3168 BLAKE2B 0ccf3292c4a661229d1c9f8341dddeefc7e8247169397f59d2e9e039ea65f24782a60f4d806cead97364b9d9e4080329e5f24cff6b75024e11637fb202b6dfb0 SHA512 aecc5b1b3a2ffc970aadad28e0f0fb6961f93259ae77a8af76d124204cbf11f5eac46effdfb6e9b8460be3948b002d542a95a35b78bbe04168688c97126da4f2
+EBUILD tomcat-servlet-api-10.0.6.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a
-EBUILD tomcat-servlet-api-7.0.108.ebuild 2987 BLAKE2B 58215b6b83dd299746d8a57bb9dd09b0ca04868f8de442b894d2a06ee68d901041a12594390bf87bc291f96f78cc6e5c207d01766948e9eaa0fbd29d1f194e6a SHA512 c93c1e035d0fce24fcb6a2fa28cb6713d8f38114a6ba76081d6eb1b5e42b2087fa9920c7a443c8b36fdf5d2d157886d70e2ddefbf901c33c53236c5e8901cb11
+EBUILD tomcat-servlet-api-7.0.108.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
EBUILD tomcat-servlet-api-7.0.109.ebuild 2990 BLAKE2B 08f62ce9a014e01926a2d2eaac5daf393e8df8f2dff737d1215b5304b9ab8bc92f794bd00a3bb6f2fd17b00b921b3445d86c44743a5e915a8e4fb33c762ac81f SHA512 c4db6d1df1fedf89adbbb90e8197dde37c5f656034e3629420096ad40af1e50644de527b0eab432e20463d811192ff889a06a72fe949084168bcbcc3e5ea5b79
-EBUILD tomcat-servlet-api-8.5.65.ebuild 3003 BLAKE2B b8bbaaed51e3d2d25497f6a5f4ba493cd249edef833ac72171d5f8e19c83c11ce00928ceff8ff1348842ea85c3196791103608fc3b7ceca184519a6eaa2e8364 SHA512 68ae1a904dc5c9cf2824db5fe7ef4ce1a07b41becbb69ea14f3717cc02b0f8d5ced6c860bac740c78a4ee80c5862811465850772d741841e4b4dd9d91e55edb5
-EBUILD tomcat-servlet-api-9.0.45.ebuild 3175 BLAKE2B 996c4285297fa2560227d87381d06be9c7120cce6d802ee9ada2387e7589726be83c76d57c5a6cbfbcf42dd5670194ced0de72268ff237861ce900959eef9b40 SHA512 dca2fac51ed5a98f4004c9536a9623dab69e38f5b7e02edc98dd1365a98321caeb78ea03a9e68a0db517cdc559a253a394e812b2e03306944d9c73718d30d53b
+EBUILD tomcat-servlet-api-8.5.65.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
+EBUILD tomcat-servlet-api-8.5.66.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
+EBUILD tomcat-servlet-api-9.0.45.ebuild 3174 BLAKE2B 8142c3911554979940a3ef71fd28d834cd10dd7cbe6c2ecaa46198a8873b5a1b787c499f59e1f4ae42ad1b2a9f8fded31f93e9af8fbec6e486b214ae526e6ef7 SHA512 cc57dd3eb335d5fc4d650ddf85bda93472330b86b7f91513efcdfa006df4f3e360e85a7984ad44a53fdf5df06616e157b83a17c46920982170921bcf9251ea16
+EBUILD tomcat-servlet-api-9.0.46.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.6.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.6.ebuild
new file mode 100644
index 000000000000..fb739b89bf7a
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.6.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+ default
+
+ # The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
+ mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+ ${EL_API_SRC} ${EL_API_RESOURCES} \
+ ${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
+ ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+ pushd java || die "Failed to cd to java dir"
+
+ cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+ mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
+ cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+ popd
+
+ for file in $(find src -type f | grep -vE "\.java$"); do
+ target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+ mkdir -p ${target_dir} || die "Failed to create resource directory"
+ mv $file ${target_dir} || die "Failed to move resource file"
+ done
+
+ mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ JAVA_SRC_DIR="${SERVLET_API_SRC}"
+ JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+ java-pkg-simple_src_compile
+ rm -fr target || die "Failed to remove compiled files"
+
+ JAVA_SRC_DIR="${EL_API_SRC}"
+ JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${EL_API_JAR}"
+ java-pkg-simple_src_compile
+ rm -fr target || die "Failed to remove compiled files"
+
+ JAVA_SRC_DIR="${JSP_API_SRC}"
+ JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${JSP_API_JAR}"
+ JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ JAVA_SRC_DIR="${SERVLET_API_SRC}"
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+ java-pkg-simple_src_install
+
+ JAVA_SRC_DIR="${EL_API_SRC}"
+ JAVA_JAR_FILENAME="${EL_API_JAR}"
+ java-pkg-simple_src_install
+
+ JAVA_SRC_DIR="${JSP_API_SRC}"
+ JAVA_JAR_FILENAME="${JSP_API_JAR}"
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
index c750d5ea6f6f..0a4f99352d99 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild
index d5d3aa1096eb..8846bfbc900c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild
new file mode 100644
index 000000000000..eaffc40f4037
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+ default
+
+ # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+ mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+ ${EL_API_SRC} ${EL_API_RESOURCES} \
+ ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+ ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+ pushd java || die "Failed to cd to java dir"
+
+ cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+ mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+ cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+ popd
+
+ for file in $(find src -type f | grep -vE "\.java$"); do
+ target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+ mkdir -p ${target_dir} || die "Failed to create resource directory"
+ mv $file ${target_dir} || die "Failed to move resource file"
+ done
+
+ mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ JAVA_SRC_DIR="${SERVLET_API_SRC}"
+ JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+ java-pkg-simple_src_compile
+ rm -fr target || die "Failed to remove compiled files"
+
+ JAVA_SRC_DIR="${EL_API_SRC}"
+ JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${EL_API_JAR}"
+ java-pkg-simple_src_compile
+ rm -fr target || die "Failed to remove compiled files"
+
+ JAVA_SRC_DIR="${JSP_API_SRC}"
+ JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${JSP_API_JAR}"
+ JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ JAVA_SRC_DIR="${SERVLET_API_SRC}"
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+ java-pkg-simple_src_install
+
+ JAVA_SRC_DIR="${EL_API_SRC}"
+ JAVA_JAR_FILENAME="${EL_API_JAR}"
+ java-pkg-simple_src_install
+
+ JAVA_SRC_DIR="${JSP_API_SRC}"
+ JAVA_JAR_FILENAME="${JSP_API_JAR}"
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild
index 12c59541c7f8..6a6fd33a63f6 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild
new file mode 100644
index 000000000000..4a8d22d12869
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+ default
+
+ # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+ mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+ ${EL_API_SRC} ${EL_API_RESOURCES} \
+ ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+ ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+ pushd java || die "Failed to cd to java dir"
+
+ cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+ mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+ cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+ popd
+
+ for file in $(find src -type f | grep -vE "\.java$"); do
+ target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+ mkdir -p ${target_dir} || die "Failed to create resource directory"
+ mv $file ${target_dir} || die "Failed to move resource file"
+ done
+
+ mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ JAVA_SRC_DIR="${SERVLET_API_SRC}"
+ JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+ java-pkg-simple_src_compile
+ rm -fr target || die "Failed to remove compiled files"
+
+ JAVA_SRC_DIR="${EL_API_SRC}"
+ JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${EL_API_JAR}"
+ java-pkg-simple_src_compile
+ rm -fr target || die "Failed to remove compiled files"
+
+ JAVA_SRC_DIR="${JSP_API_SRC}"
+ JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${JSP_API_JAR}"
+ JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ JAVA_SRC_DIR="${SERVLET_API_SRC}"
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+ java-pkg-simple_src_install
+
+ JAVA_SRC_DIR="${EL_API_SRC}"
+ JAVA_JAR_FILENAME="${EL_API_JAR}"
+ java-pkg-simple_src_install
+
+ JAVA_SRC_DIR="${JSP_API_SRC}"
+ JAVA_JAR_FILENAME="${JSP_API_JAR}"
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/trident/Manifest b/dev-java/trident/Manifest
index 0aad2d0124b4..9a75933c7b7e 100644
--- a/dev-java/trident/Manifest
+++ b/dev-java/trident/Manifest
@@ -1,4 +1,5 @@
AUX 1.3-build.xml.patch 2112 BLAKE2B e014eb8632086256f7abf0068bc076b544dae4e4bcb1f8ffb7cd7ea132d87663f44e672aef93e6d18071d555486f9e526a70d2436d72c26c75592b82636310d1 SHA512 f4790f0f7551d2734c0db2495c1dff5f6580c1734aab596fd0e419447b8c085d3ba2b4010dea972e6e3c400141d619a10baed10a2d4b8f4135e9855e9ec9b6e6
DIST trident-1.3.zip 112050 BLAKE2B 62f5ae9266714524c50e92c00d3d13810d47727596b0247786c056490b5366015fd35b2e859925734eae26c01b8070474d24e0770ac2eb644024f32754a6c5b7 SHA512 2ecccf80c654ad8cff6a2907d4f81409034bd5cc07542e87db7b53a646fb63ee38a472eb778f6f77f6cf1885f8dc5b85d50a6a033ab430e7e03a07000463f68b
+EBUILD trident-1.3-r1.ebuild 1076 BLAKE2B b7fb0039969e284aeb48741725ff053f945a77e1f6f1cf1000c96be69341c6faa251c6294edd95a79dfccba01024f25eb591008cd0806b40abc0cc247642e5fb SHA512 32149bad27add78161bc7bfae10b5f12f277eba5c3743b19424105e8a461ac8f7fe04fc78ef1831205c9d2bc94ff5a360098e3fe0fe9e6a9edf580abd9455ded
EBUILD trident-1.3.ebuild 998 BLAKE2B 8356f3bfcfc2e909b897738f4b40bf23e01eda8b8aa2aee5b8a62e8db2c6ff24ce849567e0a70260db1ca71a3a89e295ba7bf95884e1edc4c9bbdb3e790829ae SHA512 859285924da73f45e601a0cb9553e301f908718f79cce6ad104688fc8f9486f13324ea8cb8aaabe212184e0004671c01b9edede2ffcbc128787243159c804282
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/trident/trident-1.3-r1.ebuild b/dev-java/trident/trident-1.3-r1.ebuild
new file mode 100644
index 000000000000..8a029be2e54a
--- /dev/null
+++ b/dev-java/trident/trident-1.3-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java animation library"
+HOMEPAGE="https://kenai.com/projects/trident/pages/Home"
+SRC_URI="https://kenai.com/projects/trident/downloads/download/version%20${PV}%20-%20stable/${PN}-all.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+CDEPEND="dev-java/swt:4.10"
+
+DEPEND=">=virtual/jdk-1.8:*
+ ${CDEPEND}"
+RDEPEND=">=virtual/jre-1.8:*
+ ${CDEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+ "${FILESDIR}"/1.3-build.xml.patch
+)
+
+S="${WORKDIR}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="timestamp init clean compile.module.trident jar"
+EANT_GENTOO_CLASSPATH="swt-4.10"
+
+src_prepare() {
+ default
+ mkdir build/classes -p || die
+ rm -r src/org/pushingpixels/trident/android/ || die
+}
+
+src_compile() {
+ EANT_EXTRA_ARGS="-Djdk.home=$(java-config -O)"
+ java-pkg-2_src_compile
+}
+
+src_install() {
+ java-pkg_dojar drop/${PN}.jar
+
+ use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index e99a35ffbbe0..b0a561cd1efc 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,5 +1,3 @@
-DIST velocity-1.7.tar.gz 5882643 BLAKE2B 4c1499bb015fe1c6b87257a60d247b1b0fb8558e6f879a3d04cf9ef0561ed69b89491c9ebba55cc54d14f6d377b300ee0f7e55ae4118236bba60dc632b5686b3 SHA512 542c9cc0efa118693bf1c952ac4b0c7c3d0229ef804afaa4f0f1c01ad40b0112055c21df7f800c302bf173d58461a864b29b9bc4b9174029d9748f88f2fcf9ab
DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
-EBUILD velocity-1.7-r2.ebuild 1199 BLAKE2B 9f49ea54fd948039507d236e2b1cc9519212d9ed3b3075dd8b209974ed4ddbe6190d22b5b5a6621a890d8b6eed04853f78d028fc4029c6626c3e18924a372a9c SHA512 39d3fa723ec7dfb4c98c91025364836b8e0c3ec03cc19de744aca2504960fab9f4aefe37828df14dee8377096067c1573f99568dd9941d64d38525dc116a4ea1
-EBUILD velocity-2.3.ebuild 5213 BLAKE2B 3a159172994cbaf4d0ef6c3e5150ffaf64eb34b11a41133ca1e11254f007351a309419bdbfd16827049c076ae255d1549c4ec3dbb42c7b495cda5fe37cc67b17 SHA512 de97e153f3fe9d807791a0a7e01abd35d0888828ca15c19c25371669088c63c678f4dcc18a88041d4c8cd2f5f327f1117482cdcad94bfae987b21f4de4721e7e
+EBUILD velocity-2.3.ebuild 5211 BLAKE2B 888ca363c1ff75907d25741d4805df26734c8b9e1cf0364e93ee71fbd5c5f1a21c24556cea107e102a6c4b6013612a4b12346534e03f9038b4659e5ac41b6ba6 SHA512 d1785107bd8363fc501246e8dc09ce9a3572e9f2b2e617248f49f5b9441c21547cb566c2b0b007881dac2d2e5bff1e7ddb223369454bb697667890a2171e5fd7
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
deleted file mode 100644
index facc1a8d7f55..000000000000
--- a/dev-java/velocity/velocity-1.7-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="examples doc source"
-MAVEN_ID="org.apache.velocity:velocity:1.7"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java framework for easy creation/rendering of documents"
-HOMEPAGE="http://velocity.apache.org"
-SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="
- dev-java/jdom:0
- dev-java/log4j:0
- dev-java/ant-core:0
- dev-java/werken-xpath:0
- dev-java/jakarta-oro:2.0
- dev-java/avalon-logkit:2.0
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/commons-collections:0
- java-virtuals/servlet-api:2.3
-"
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
-"
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-JAVA_GENTOO_CLASSPATH="
- jdom
- log4j
- ant-core
- werken-xpath
- jakarta-oro-2.0
- servlet-api-2.3
- commons-logging
- commons-lang-2.1
- avalon-logkit-2.0
- commons-collections
-"
-
-JAVA_SRC_DIR="src"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}"
-
-java_prepare() {
- java-pkg_clean
- rm -rv test src/test || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 495e3056411d..d26c79aa3f66 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 7bfd89cf10cf..79e5aa3b361f 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,11 +1,4 @@
-AUX xom-1.2.6.patch 2096 BLAKE2B 041c55199398e37fcb4a481d7deb1c8c3fb8d980fa6ebc207236cf1e85e91c7b28f2c5e551153ac52b17272b8f02324dce7ae2b9948f9c0880a900eed84d9f62 SHA512 7d864f9178a5fd846572a17eb345a74510e7a3880c203054d7156849c10c678421ed688965d821daafcff91888be9a485c5409937055a56139066aaa6d32aca0
AUX xom-1.3.7-disable-invalid-test.patch 672 BLAKE2B a58012a6152e0b9d8b064c32b5dfa0de3c5c008c44001963c6d4f81a7230c9d4b0aacedf99936ccb8ceb84ef5926eaee228e488846c15b47ee1caeaa47ce6279 SHA512 bd6bc466b36f5095b8b74109ea5b5e740317b81d1a844571c7dd6212536d8abaaf576e4c57b66eb997efa2b24fffcbf8c79a2c28361785e710ba6736c9b8491d
-AUX xom-strip-fallback-parser.patch 690 BLAKE2B c8135a026905fc16560be949598a48e02000aa29b3d1ddc6b40bd16ceb7ae60983ce703715f01e550fa2b643bcb1febb032387ab5431367d9dbc54079ed5f551 SHA512 e61defbc5c8da65561709be6431b0b15069759ec94de2f1f356d518b8b9d90a7ab1ccfd6db6148a3dbcc999b19c9607cd7586ef4c30f70e627968e726e953830
-DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309
-DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680
-DIST xom-1.3.2.jar 317416 BLAKE2B cd891743b6c83eaf39be0e7c973b0221330532464dc433f64b769d07e7dd4f43341e01cb6bc4c237b7cab2a939280acde2dfc7f1da4467f87af6458409e7b37c SHA512 958c25262d297280ab87b000a8a9a0fa0842c062a52229f818568f937d5adc69f7b2214b9463a9a75b5d1714487ecc2b434a47c4627d9350e497367787e98aa4
DIST xom-1.3.7-src.tar.gz 5898676 BLAKE2B 963190849bcdb1b4e786a099dd2abd2ed8f17e5b486bce9df48d9f6ddab4f381c3c5c7d70388f9d74710547ff7a62bbd6a2eb9c2a6d6ff8cd06156b83e98aba0 SHA512 9b574f23c9394f5b54dc9b33e41e89638d041337c08336f44f968a55a1633dcc90ff1b520f7ad57cdbe68a1f81e221ac7e83336eb472876ab43939d9ce940262
-EBUILD xom-1.2.10.ebuild 2166 BLAKE2B 65380004dc447dd45c034599259b11e28ebc3988be9528782de0568b73b6e31632101d024b941b2acec78a8736dff7ad2b4a01d1303b9ba96c7c1b5c6c0e02ac SHA512 0858697d6ff1fc61930e42162d4e67b67e662b29e166d2e15da0fa51cf8563e06599359e6b04bd470902363988d6d61730a78a94244ff7b0ffca778afdeebeab
-EBUILD xom-1.3.2.ebuild 819 BLAKE2B 95c1a0236273676e598936b570f6304ed86b51b03b7368c6e1d112c6234bb92f3c0d1e5d36bb271e264fcf869d8d990124ffedaee7dcf0067a959a66d6374326 SHA512 92cfc4188b4b1d59d169481ec95c63bf6534f42df3f98c680beb8a69b3ecb7dd26b9ffaf0386e8536191008dd8789bc4312a750decbc867eab5c3e0639c959a3
-EBUILD xom-1.3.7.ebuild 1671 BLAKE2B 5b7516cf4626f3213a2105b6cf17b0223f948948ef7336db09e7c3dd1727d7417ffe12b8b55a63e752474cd594ee63d5fef09451537fdf9de2fe75599dac188f SHA512 f2fea9d1218bdb5672b6789f7f722aa8a2066261e107659f809d7f76890676e99af1fe32178808116f74b48d1d744db0969e141f6752f4d2e619319787b4f3b2
+EBUILD xom-1.3.7.ebuild 1670 BLAKE2B 7be5543510ceaf1a9a97110417493b51c2481fdff6f985392456063fdd035175cc5dd58bcf475eb6b9345573f14d2d7bdd20dd2d93ea5fc910fc5bc6ef1e18ec SHA512 3b25b044d20351d9eb5d51e1b497cdb731c70e6b25e313e7a0d5bbd2248fe00d09ba0d6013db98811965186b8ac5610d9d1a0387b9ad2a1f93fa49b641c3b889
MISC metadata.xml 407 BLAKE2B 2486554418b17502be636181d1dc619a50143016a72e05d5bef8a42c631b9f09913040bc868cefae0759075f26853c605e6a11179b20f3ca3081dd091536b56e SHA512 4ec08597d54cbea6121f240565ff7b7ee614c370357b551bebd18d31749c1863e30bc8b7935caa00051f9946cc927cd34c1bad02be07eca40c89d2c6e0e7b2f6
diff --git a/dev-java/xom/files/xom-1.2.6.patch b/dev-java/xom/files/xom-1.2.6.patch
deleted file mode 100644
index 3187e437306b..000000000000
--- a/dev-java/xom/files/xom-1.2.6.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nur XOM/build.xml XOM_patched/build.xml
---- XOM/build.xml 2010-06-21 06:03:14.000000000 +0300
-+++ XOM_patched/build.xml 2011-03-13 07:05:01.000000000 +0200
-@@ -21,7 +21,6 @@
- subject line. The XOM home page is http://www.xom.nu/
- -->
- <project name="XOM" default="help" basedir=".">
--
- <description>
- Build XOM
- </description>
-@@ -71,7 +70,7 @@
- <property name="jaxen.dir" value="${build.dir}/jaxen-classes"/>
-
- <property name="xml-apis.jar" value="${lib.dir}/xml-apis.jar"/>
-- <property name="parser.jar" value="${lib.dir}/dtd-xercesImpl.jar"/>
-+ <property name="parser.jar" value="${lib.dir}/xercesImpl.jar"/>
- <property name="xslt.jar" value="${lib.dir}/xalan.jar"/>
- <property name="serializer.jar" value="${lib.dir}/serializer.jar"/>
- <property name="tagsoup.jar" value="${lib2.dir}/tagsoup-1.2.jar"/>
-@@ -226,7 +225,7 @@
- encoding="UTF-8"
- fork="true"
- includeAntRuntime="false"
-- excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
-+excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/">
- <classpath refid="compile.class.path"/>
- </javac>
- <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/>
-@@ -323,7 +322,7 @@
-
- <target name="jar" depends="compile" description="Create xom.jar">
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
-- classpath="${lib.dir}/jarjar-1.0.jar"/>
-+ classpath="${lib.dir}/jarjar.jar"/>
- <jarjar jarfile="${build.dir}/${name}-${version}.jar"
- basedir="${build.dest}"
- index="no"
-@@ -862,8 +861,8 @@
- </target>
-
-
-- <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen">
-- <javac srcdir="${build.dir}/jaxen-${jaxenversion}/src/java/main"
-+ <target name="compile-jaxen" description="Compile Jaxen">
-+ <javac srcdir="lib/jaxen-${jaxenversion}/src/java/main"
- destdir="${build.dir}/jaxen-classes"
- debug="${debug}"
- optimize="${optimize}"
diff --git a/dev-java/xom/files/xom-strip-fallback-parser.patch b/dev-java/xom/files/xom-strip-fallback-parser.patch
deleted file mode 100644
index 49a324ef2dad..000000000000
--- a/dev-java/xom/files/xom-strip-fallback-parser.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-Don't build and install fallback parser relying on internel classes of
-SUNs/Oracles JVM >= 1.5. This allows building xom using ibm-jdk-bin. #399119
-
---- /tmp/build.xml
-+++ /tmp/build.xml
-@@ -235,10 +235,6 @@
- <echo file="${build.dest}/nu/xom/version.txt">${version}</echo>
-
- <copy file="${build.src}/nu/xom/compositions.dat" tofile="${build.dest}/nu/xom/compositions.dat" />
--
-- <!-- This file requires Java 1.5 to generate so we compile it with a
-- different target and copy it over here. -->
-- <copy file="classes15/nu/xom/JDK15XML1_0Parser.class" tofile="${build.dest}/nu/xom/JDK15XML1_0Parser.class"/>
- </target>
-
-
diff --git a/dev-java/xom/xom-1.2.10.ebuild b/dev-java/xom/xom-1.2.10.ebuild
deleted file mode 100644
index 434b57752e5d..000000000000
--- a/dev-java/xom/xom-1.2.10.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-JAXEN_V="1.1.6"
-JAXEN_P="jaxen-${JAXEN_V}"
-
-DESCRIPTION="A new XML object model"
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-# Bundled jaxen as its moved under XOM's namespace
-SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz
- http://dist.codehaus.org/jaxen/distributions/${JAXEN_P}-src.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="dev-java/xerces:2
- dev-java/xml-commons-external:1.3
- examples? ( java-virtuals/servlet-api:2.4 )"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
- dev-java/jarjar:1
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/XOM"
-
-# Test require network access to pass.
-# They need a redirected http document on public web.
-RESTRICT="test"
-
-java_prepare() {
- epatch "${FILESDIR}/${PN}-1.2.6.patch"
- epatch "${FILESDIR}/${PN}-strip-fallback-parser.patch" #399119
-
- # Delete test files as they aren't installed
- rm -vr src/nu/xom/tests || die
-
- # Delete bundled jars
- rm -v *.jar lib/*.jar || die
-
- # Delete bundled classes
- find . -name "*.class" -delete -print || die
-
- # Move bundled jaxen to where the build.xml expects it
- mv "${WORKDIR}"/${JAXEN_P}/ lib/ || die
-
- java-pkg_jar-from --into lib/ xml-commons-external-1.3
- java-pkg_jar-from --into lib/ xerces-2
- java-pkg_jar-from --build-only --into lib/ jarjar-1
-
- # Tagsoup is only needed to run betterdoc but we use the pregenerated ones.
-}
-
-src_compile() {
- local ant_flags="-Ddebug=off"
- use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servlet-api-2.4 servlet-api.jar)"
-
- ANT_TASKS="jarjar-1" eant jar ${ant_flags}\
- $(use examples && echo samples)
-}
-
-src_install() {
- java-pkg_newjar build/${P}.jar ${PN}.jar
- use examples && java-pkg_dojar build/xom-samples.jar
- dodoc Todo.txt
-
- use doc && java-pkg_dojavadoc apidocs/
- use source && java-pkg_dosrc src/*
- use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples
-}
diff --git a/dev-java/xom/xom-1.3.2.ebuild b/dev-java/xom/xom-1.3.2.ebuild
deleted file mode 100644
index b7321e970a26..000000000000
--- a/dev-java/xom/xom-1.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XML Object Model"
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-CDEPEND="
- dev-java/xerces:2
- dev-java/jaxen:1.1
- dev-java/xml-commons-external:1.3"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
- xerces-2
- jaxen-1.1
- xml-commons-external-1.3"
-
-JAVA_SRC_DIR="nu"
-
-src_prepare() {
- default
-
- rm -r nu/xom/integrationtests/ || die
-}
diff --git a/dev-java/xom/xom-1.3.7.ebuild b/dev-java/xom/xom-1.3.7.ebuild
index 87dbb6c9df9b..5289b1b22b80 100644
--- a/dev-java/xom/xom-1.3.7.ebuild
+++ b/dev-java/xom/xom-1.3.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/elharo/${PN}/releases/download/v${PV}/${P}-src.tar.g
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
CDEPEND="
dev-java/jaxen:1.2