summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin57261 -> 57943 bytes
-rw-r--r--dev-java/angus-activation/Manifest2
-rw-r--r--dev-java/angus-activation/angus-activation-1.0.0.ebuild2
-rw-r--r--dev-java/animal-sniffer-annotations/Manifest3
-rw-r--r--dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild4
-rw-r--r--dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild22
-rw-r--r--dev-java/ant-core/Manifest1
-rw-r--r--dev-java/ant-core/ant-core-1.10.9-r2.ebuild161
-rw-r--r--dev-java/ant-javamail/Manifest1
-rw-r--r--dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild18
-rw-r--r--dev-java/antlr-runtime/Manifest3
-rw-r--r--dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild38
-rw-r--r--dev-java/antlr-runtime/metadata.xml10
-rw-r--r--dev-java/antlr-tool/Manifest5
-rw-r--r--dev-java/antlr-tool/antlr-tool-3.5.2.ebuild76
-rw-r--r--dev-java/antlr-tool/files/3.5.2-test-fixes.patch36
-rw-r--r--dev-java/antlr-tool/metadata.xml11
-rw-r--r--dev-java/antlr/Manifest1
-rw-r--r--dev-java/antlr/antlr-3.5.2-r2.ebuild63
-rw-r--r--dev-java/avalon-logkit/Manifest1
-rw-r--r--dev-java/avalon-logkit/avalon-logkit-2.1-r10.ebuild63
-rw-r--r--dev-java/bcel/Manifest2
-rw-r--r--dev-java/bcel/bcel-6.5.0-r3.ebuild (renamed from dev-java/bcel/bcel-6.5.0-r2.ebuild)28
-rw-r--r--dev-java/bcmail/Manifest1
-rw-r--r--dev-java/bcmail/bcmail-1.69-r1.ebuild61
-rw-r--r--dev-java/c3p0/Manifest4
-rw-r--r--dev-java/c3p0/c3p0-0.9.5.1.ebuild59
-rw-r--r--dev-java/c3p0/c3p0-0.9.5.5.ebuild2
-rw-r--r--dev-java/checker-framework-qual/Manifest3
-rw-r--r--dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild26
-rw-r--r--dev-java/checker-framework-qual/metadata.xml16
-rw-r--r--dev-java/commons-beanutils/Manifest4
-rw-r--r--dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild64
-rw-r--r--dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild4
-rw-r--r--dev-java/commons-digester/Manifest5
-rw-r--r--dev-java/commons-digester/commons-digester-2.1-r2.ebuild68
-rw-r--r--dev-java/commons-digester/commons-digester-3.2-r3.ebuild77
-rw-r--r--dev-java/commons-digester/metadata.xml11
-rw-r--r--dev-java/commons-imaging/Manifest4
-rw-r--r--dev-java/commons-imaging/commons-imaging-0.97.ebuild49
-rw-r--r--dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild41
-rw-r--r--dev-java/commons-jxpath/Manifest4
-rw-r--r--dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild63
-rw-r--r--dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild4
-rw-r--r--dev-java/commons-logging/Manifest2
-rw-r--r--dev-java/commons-logging/commons-logging-1.2-r3.ebuild3
-rw-r--r--dev-java/cpptasks/Manifest2
-rw-r--r--dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild3
-rw-r--r--dev-java/emma/Manifest1
-rw-r--r--dev-java/emma/emma-2.0.5312-r4.ebuild52
-rw-r--r--dev-java/error-prone-annotations/Manifest2
-rw-r--r--dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild27
-rw-r--r--dev-java/failureaccess/Manifest3
-rw-r--r--dev-java/failureaccess/failureaccess-30.1.1.ebuild28
-rw-r--r--dev-java/failureaccess/metadata.xml18
-rw-r--r--dev-java/glassfish-ejb-api/Manifest3
-rw-r--r--dev-java/glassfish-xmlrpc-api/Manifest1
-rw-r--r--dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1-r1.ebuild (renamed from dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild)32
-rw-r--r--dev-java/gnu-jaf/Manifest4
-rw-r--r--dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild35
-rw-r--r--dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild2
-rw-r--r--dev-java/gson/Manifest4
-rw-r--r--dev-java/gson/gson-2.8.7.ebuild39
-rw-r--r--dev-java/gson/gson-2.8.8.ebuild13
-rw-r--r--dev-java/guava/Manifest2
-rw-r--r--dev-java/guava/guava-30.1.1.ebuild58
-rw-r--r--dev-java/j2objc-annotations/Manifest3
-rw-r--r--dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild4
-rw-r--r--dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild23
-rw-r--r--dev-java/jackson/Manifest3
-rw-r--r--dev-java/jackson/jackson-2.9.10.ebuild59
-rw-r--r--dev-java/jackson/metadata.xml11
-rw-r--r--dev-java/jakarta-oro/Manifest2
-rw-r--r--dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild4
-rw-r--r--dev-java/jakarta-regexp/Manifest6
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild (renamed from dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild)16
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild (renamed from dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild)17
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild (renamed from dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild)15
-rw-r--r--dev-java/jakarta-xml-soap-api/Manifest3
-rw-r--r--dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild65
-rw-r--r--dev-java/jakarta-xml-soap-api/metadata.xml11
-rw-r--r--dev-java/jansi/Manifest2
-rw-r--r--dev-java/jansi/jansi-2.4.0-r1.ebuild78
-rw-r--r--dev-java/javax-inject/Manifest6
-rw-r--r--dev-java/javax-inject/javax-inject-1-r2.ebuild4
-rw-r--r--dev-java/javax-inject/javax-inject-1-r3.ebuild4
-rw-r--r--dev-java/javax-inject/javax-inject-1-r4.ebuild2
-rw-r--r--dev-java/javax-mail/Manifest5
-rw-r--r--dev-java/javax-mail/javax-mail-1.6.2-r1.ebuild77
-rw-r--r--dev-java/javax-mail/javax-mail-1.6.7.ebuild79
-rw-r--r--dev-java/javax-mail/metadata.xml (renamed from dev-java/glassfish-ejb-api/metadata.xml)7
-rw-r--r--dev-java/jcifs/Manifest2
-rw-r--r--dev-java/jcifs/jcifs-1.3.19-r1.ebuild (renamed from dev-java/jcifs/jcifs-1.3.19.ebuild)9
-rw-r--r--dev-java/jdepend/Manifest4
-rw-r--r--dev-java/jdepend/jdepend-2.10.ebuild28
-rw-r--r--dev-java/jdepend/jdepend-2.9-r6.ebuild4
-rw-r--r--dev-java/jmh-core/Manifest2
-rw-r--r--dev-java/jmh-core/jmh-core-1.21.ebuild2
-rw-r--r--dev-java/joda-convert/Manifest5
-rw-r--r--dev-java/joda-convert/files/joda-convert-1.3.1-build.xml248
-rw-r--r--dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild43
-rw-r--r--dev-java/joda-convert/joda-convert-2.2.2.ebuild4
-rw-r--r--dev-java/jopt-simple/Manifest1
-rw-r--r--dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild23
-rw-r--r--dev-java/jsch/Manifest2
-rw-r--r--dev-java/jsch/jsch-0.1.55.ebuild38
-rw-r--r--dev-java/jsr305/Manifest3
-rw-r--r--dev-java/jsr305/jsr305-3.0.2-r1.ebuild2
-rw-r--r--dev-java/jsr305/jsr305-3.0.2.ebuild18
-rw-r--r--dev-java/jsr67/Manifest3
-rw-r--r--dev-java/jsr67/jsr67-1.3-r1.ebuild24
-rw-r--r--dev-java/jsr67/metadata.xml8
-rw-r--r--dev-java/jython/Manifest2
-rw-r--r--dev-java/jython/jython-2.7.0-r4.ebuild1
-rw-r--r--dev-java/jzlib/Manifest2
-rw-r--r--dev-java/jzlib/jzlib-1.1.3-r2.ebuild1
-rw-r--r--dev-java/mill-bin/Manifest2
-rw-r--r--dev-java/mill-bin/metadata.xml2
-rw-r--r--dev-java/mvel/Manifest6
-rw-r--r--dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch43
-rw-r--r--dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch51
-rw-r--r--dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch26
-rw-r--r--dev-java/mvel/metadata.xml11
-rw-r--r--dev-java/mvel/mvel-2.3.2-r1.ebuild81
-rw-r--r--dev-java/netty-buffer/Manifest2
-rw-r--r--dev-java/netty-buffer/netty-buffer-4.0.36.ebuild4
-rw-r--r--dev-java/netty-common/Manifest2
-rw-r--r--dev-java/netty-common/netty-common-4.0.36.ebuild4
-rw-r--r--dev-java/netty-transport/Manifest2
-rw-r--r--dev-java/netty-transport/netty-transport-4.0.36.ebuild2
-rw-r--r--dev-java/openjdk-bin/Manifest33
-rw-r--r--dev-java/openjdk-bin/files/openjdk-bin-11.env.sh2
-rw-r--r--dev-java/openjdk-bin/files/openjdk-bin-17.env.sh2
-rw-r--r--dev-java/openjdk-bin/files/openjdk-bin-8.env.sh2
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild2
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild135
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild4
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild (renamed from dev-java/openjdk-bin/openjdk-bin-17.0.1_p12.ebuild)15
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild4
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild122
-rw-r--r--dev-java/openjdk-jre-bin/Manifest17
-rw-r--r--dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh2
-rw-r--r--dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh2
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild (renamed from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild)13
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild83
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.302_p08.ebuild83
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild6
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.322_p06.ebuild (renamed from dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07.ebuild)13
-rw-r--r--dev-java/openjdk/Manifest13
-rw-r--r--dev-java/openjdk/metadata.xml1
-rw-r--r--dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild287
-rw-r--r--dev-java/openjdk/openjdk-17.0.2_p8.ebuild313
-rw-r--r--dev-java/openjdk/openjdk-8.322_p06.ebuild224
-rw-r--r--dev-java/plexus-classworlds/Manifest2
-rw-r--r--dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild4
-rw-r--r--dev-java/protobuf-java/Manifest8
-rw-r--r--dev-java/protobuf-java/metadata.xml4
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.18.2.ebuild (renamed from dev-java/protobuf-java/protobuf-java-3.16.0.ebuild)4
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.19.3.ebuild55
-rw-r--r--dev-java/randomized-runner/Manifest2
-rw-r--r--dev-java/randomized-runner/randomized-runner-2.7.8.ebuild4
-rw-r--r--dev-java/resin-servlet-api/Manifest6
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild2
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild47
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild4
-rw-r--r--dev-java/sac/Manifest3
-rw-r--r--dev-java/sac/sac-1.3-r3.ebuild32
-rw-r--r--dev-java/sac/sac-1.3-r4.ebuild2
-rw-r--r--dev-java/sax/Manifest2
-rw-r--r--dev-java/sax/sax-2.2.1-r5.ebuild (renamed from dev-java/sax/sax-2.2.1-r4.ebuild)15
-rw-r--r--dev-java/slf4j-api/Manifest2
-rw-r--r--dev-java/slf4j-api/slf4j-api-1.7.32.ebuild62
-rw-r--r--dev-java/slf4j-nop/Manifest2
-rw-r--r--dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild55
-rw-r--r--dev-java/slf4j-simple/Manifest2
-rw-r--r--dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild76
-rw-r--r--dev-java/stringtemplate/Manifest4
-rw-r--r--dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch28
-rw-r--r--dev-java/stringtemplate/stringtemplate-4.3.1.ebuild74
-rw-r--r--dev-java/sun-jai-bin/Manifest2
-rw-r--r--dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild4
-rw-r--r--dev-java/swt/Manifest3
-rw-r--r--dev-java/swt/swt-3.8.2-r3.ebuild149
-rw-r--r--dev-java/swt/swt-3.8.2-r4.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/Manifest8
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild98
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild4
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild99
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild99
-rw-r--r--dev-java/typesafe-config/Manifest6
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.2.1.ebuild22
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild22
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild4
-rw-r--r--dev-java/xerial-core/Manifest3
-rw-r--r--dev-java/xerial-core/metadata.xml2
-rw-r--r--dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild48
-rw-r--r--dev-java/xml-commons-external/Manifest2
-rw-r--r--dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild2
-rw-r--r--dev-java/xmlgraphics-commons/Manifest2
-rw-r--r--dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild66
-rw-r--r--dev-java/xmlunit/Manifest1
-rw-r--r--dev-java/xmlunit/xmlunit-1.6-r1.ebuild56
-rw-r--r--dev-java/xmpbox/Manifest2
-rw-r--r--dev-java/xmpbox/xmpbox-2.0.24.ebuild4
204 files changed, 3800 insertions, 1467 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f1ae5e89fb5d..3abb09037fe2 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/angus-activation/Manifest b/dev-java/angus-activation/Manifest
index 3a316f6825aa..7ea7b0f9d9d2 100644
--- a/dev-java/angus-activation/Manifest
+++ b/dev-java/angus-activation/Manifest
@@ -1,3 +1,3 @@
DIST angus-activation-1.0.0.tar.gz 26068 BLAKE2B 45151d8d0bc3c2b1835d2ceab62e9d4ab5294dcfbbf606d3298013f0dd5f27a7bbe950effbd053a6e54ec1179884870c167e8967b3536dd79902dbda506bb8c8 SHA512 e6e7b32f1aab8d293d5855a3e6b155922c18aeddf13b3daab6928c1b95b4af6dd292c5670351a70870723bc80a58ef4366e8b4fe40c5f5b995266751bccfdef6
-EBUILD angus-activation-1.0.0.ebuild 1320 BLAKE2B edd03c0bf4a99b55c80645c8ad76516e06c507988c7d959e60ba2cdc5de32392f67399406288c2212f9e225712bce51f2440573cb79d684700054bc4d5e41dfa SHA512 1baff59164c1f5c07645ec3b4002d27db586ddf7c5c52af1b099442bd2de3246488adf47add06cc4013bcb9c641265f22d062859e44208ebc8dc615e8c53eb6c
+EBUILD angus-activation-1.0.0.ebuild 1319 BLAKE2B 7b7f4c64684f3bb5eb2363288f0271aad1e13f5e66afc000ed09eb61f17d536c504a16eb43bfbbeb60bb6105bb04701b8cb0a56d080d827da40b0e9e5110c322 SHA512 5a8262cc7e11123d18f6d8216999a49d6786b504c857800896541b868aa3066252db2334f9b1c0006ce472af9d24d1877c3d3474f7872a44a4e67e02e91a12ed
MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/angus-activation/angus-activation-1.0.0.ebuild b/dev-java/angus-activation/angus-activation-1.0.0.ebuild
index 5b1f08a8969d..effcb2f8468a 100644
--- a/dev-java/angus-activation/angus-activation-1.0.0.ebuild
+++ b/dev-java/angus-activation/angus-activation-1.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz ->
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/animal-sniffer-annotations/Manifest b/dev-java/animal-sniffer-annotations/Manifest
index 52f9dbbcd8b8..f0f1c0a0920a 100644
--- a/dev-java/animal-sniffer-annotations/Manifest
+++ b/dev-java/animal-sniffer-annotations/Manifest
@@ -1,4 +1,3 @@
DIST animal-sniffer-parent-1.15.tar.gz 77766 BLAKE2B 6d99959c457d032e69f5a5109dc9ae80660db0a3fa34e2ebfdd7e3941a33e19f0078a05f3c6d561760a89584b2826bca6ef40dd7f5ea943b32ae43a4f2ed403b SHA512 8d0f6baa86fcb79fc54b826eff0f7c390d236d3cfc285914d3645e3bd9c72612c039eb0f1c3c2a9fbaca43040d967a2a69e10a9e5713682d1e441e44f3b55eb1
-EBUILD animal-sniffer-annotations-1.15-r1.ebuild 653 BLAKE2B 66b80fcb62f2686dbc13d709c40c98c2ca6fcac8b2a83b13ba97b646c62777cc371a71337275896e98ab4cac373bf2cc75519c92543c984d7dce0b26e8eeaf2d SHA512 39dd3a582ae8f60a721a1669ee690d393233517ff0f7ba6f75e05feae302fafc04721b37d56cf7439cb4e531505b2f62205036f714a9f79ff4cc0798456c6e36
-EBUILD animal-sniffer-annotations-1.15.ebuild 650 BLAKE2B 72764cac3ee858835f51d6273b1c165e3cf3b62cb088a89f1af0f5ca6555bcb101494f33d3928995a10faa56f27fdaadddd747d5eccb04a3c639edb9fca0a168 SHA512 5250adc6b1460bfe834a3d90e0b0090fc46b99b499389d4f6e540e4615fbc270357c8e35c80f86138cb6945b0b1455944df039f10d2dd80a3b389562ce79ef2b
+EBUILD animal-sniffer-annotations-1.15-r1.ebuild 654 BLAKE2B 89caf59ab9ea56307ef9894ba5d3e297466a5baf6251d1f16bb56659d8eba8ca58189204ada14137e015358a0332fb2616c877f6d68950ddda9a71ce8223816e SHA512 e3388314a81b0e13c35c2ac338d2a1dbe8df6f243209a63c73a6b7fcb9a4f607b160debbe51f6f73e7ec004c4a0adf10126c47c2a4b50753c1a8955b460d8d7a
MISC metadata.xml 325 BLAKE2B 96e92a307063c6d997316abf0b9395c65445907c3141313f07aa336eed839cb909f624bce9b67d6960c7703b79537e136beaf01025d7cf39dcbbe6262a0093f8 SHA512 032db77bc61e5e86c039cb49faa6d50363e4b94c0b14b2ef5192e8ee6fdba3592616e1970ad6f87d662ad01b187627e7b6fb6774664839fa549e76aa3e9bbe7b
diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
index deb9566f57c0..12973df6f557 100644
--- a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
+++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/"
SRC_URI="https://github.com/mojohaus/${MY_PN}/archive/${MY_PN}-parent-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
deleted file mode 100644
index 31cdb3a0a326..000000000000
--- a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN%-annotations}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java annotations for marking methods that Animal Sniffer should ignore"
-HOMEPAGE="http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/"
-SRC_URI="https://github.com/mojohaus/${MY_PN}/archive/${MY_PN}-parent-${PV}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_PN}-${MY_PN}-parent-${PV}/${PN}"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index a5f0f8779903..20d29c22da0a 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,5 @@
DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
+EBUILD ant-core-1.10.9-r2.ebuild 4184 BLAKE2B 8dcd76c074ca62e965c8b1409ec98f9d777753b8dc3ed797aa3cc033159ce3e3473c20548131d57ea5ae8d54100279dea4ba5516429ad0e8f1a539baa047e420 SHA512 ed42bfe69d3b4ff4e69e74253ebeb338d662a413c7761808df45ad62cba0afb83d531212bcb297d45fc11c8a0e877c3bb7ca1a1da53782265a2b23cd7280dfdc
EBUILD ant-core-1.10.9.ebuild 2743 BLAKE2B 5cfca20522c55dd4894f3ab31d027d68343b363fff462bc4cc0acfcebc4f2f0552676ce8c10caed56577cc87325f3ac91f63d74a4c6b30b8a34243cdbe248e7d SHA512 cd338b8e765ee7081d49d8ccb21c5353a49c4af9f6600a7ff103252edadb093da33348e5b4695b69eb4bb4417a01bb265685f4c7b746e88bd41d4018544d91cc
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-core/ant-core-1.10.9-r2.ebuild b/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
new file mode 100644
index 000000000000..d43683dda998
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.9-r2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Don't depend on itself.
+JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
+
+# Rewriting build.xml files for the testcases has no use at the moment.
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="https://ant.apache.org/"
+SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
+ https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Some dependencies for building Javadoc are unavailable on these architectures
+REQUIRED_USE="doc? ( !arm !arm64 )"
+
+CDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${CDEPEND}
+ doc? ( !arm? ( !arm64? (
+ dev-java/bcel:0
+ dev-java/bsf:2.3
+ dev-java/commons-logging:0
+ dev-java/commons-net:0
+ dev-java/jakarta-activation-api:1
+ dev-java/jakarta-regexp:1.4
+ dev-java/jakarta-oro:2.0
+ dev-java/jdepend:0
+ dev-java/jsch:0
+ dev-java/log4j:0
+ dev-java/javax-mail:0
+ dev-java/sun-jai-bin:0
+ dev-java/xalan:0
+ dev-java/xml-commons-resolver:0
+ dev-java/xz-java:0
+ ) ) )"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${WORKDIR}/${PV}-build.patch"
+ "${WORKDIR}/${PV}-launch.patch"
+)
+
+src_prepare() {
+ default
+
+ eprefixify "${S}/src/script/ant"
+
+ # Fixes bug 556008.
+ java-ant_xml-rewrite -f build.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v "false"
+
+ # See bug #196080 for more details.
+ java-ant_bsfix_one build.xml
+ java-pkg-2_src_prepare
+
+ # Remove JDK9+ stuff
+ einfo "Removing JDK9+ classes (Jmod and Link)"
+ rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
+}
+
+src_compile() {
+ export ANT_HOME=""
+ # Avoid error message that package ant-core was not found
+ export ANT_TASKS="none"
+
+ local bsyscp
+
+ # This ensures that when building ant with bootstrapped ant,
+ # only the source is used for resolving references, and not
+ # the classes in bootstrapped ant but jikes in kaffe has issues with this...
+ if ! java-pkg_current-vm-matches kaffe; then
+ bsyscp="-Dbuild.sysclasspath=ignore"
+ fi
+
+ CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal ||
+ die "build failed"
+
+ if use doc; then
+ # All Java packages imported by the source files need to present in
+ # the classpath, otherwise it would be https://bugs.gentoo.org/780531
+ local doc_deps=(
+ bcel
+ bsf-2.3
+ commons-logging
+ commons-net
+ jakarta-activation-api-1
+ jakarta-oro-2.0
+ jakarta-regexp-1.4
+ jdepend
+ jsch
+ log4j
+ javax-mail
+ sun-jai-bin
+ xalan
+ xml-commons-resolver
+ xz-java
+ )
+ for dep in "${doc_deps[@]}"; do
+ java-pkg_jar-from --build-only --into lib/optional/ "${dep}"
+ done
+ # This file imports netrexx.lang.Rexx, which is not available
+ # from ::gentoo. Fortunately, there is not a dev-java/ant-*
+ # package for it, so even if we could generate documentation
+ # for it, it would be irrelevant
+ rm src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java ||
+ die "Failed to remove Java source file blocking Javadoc generation"
+ ./build.sh ${bsyscp} javadocs || die "Javadoc build failed"
+ fi
+}
+
+src_install() {
+ dodir /usr/share/ant/lib
+
+ for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
+ java-pkg_dojar build/lib/${jar}
+ dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
+ done
+
+ dobin src/script/ant
+
+ dodir /usr/share/${PN}/bin
+ for each in antRun antRun.pl runant.pl runant.py ; do
+ dobin "${S}/src/script/${each}"
+ dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
+ done
+ dosym ../${PN}/bin /usr/share/ant/bin
+
+ insinto /usr/share/${PN}
+ doins -r dist/etc
+ dosym ../${PN}/etc /usr/share/ant/etc
+
+ echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+ doenvd "${T}/20ant"
+
+ dodoc NOTICE README WHATSNEW KEYS
+
+ if use doc; then
+ dodoc -r manual/*
+ java-pkg_dojavadoc --symlink manual/api build/javadocs
+ fi
+
+ use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index c047110a022d..5a6fd0da69d8 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -1,4 +1,5 @@
DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
+EBUILD ant-javamail-1.10.9-r1.ebuild 511 BLAKE2B 7df30d50b3881fed6f85d3a4cb721f6076f17c65cbe85668efbe1460ebcec484b4d0e28f1b94c305a58446568ae3510702718805501c9e9bd4264906258cc34e SHA512 eb4a58ec4762aa1c99d3be44b9252eaf832e754dc5eade459de6f6c533ac86ebc46f7be899ac048d1aea0742f80ba6df7e11e00cd433f01e77844e2c44c16ed8
EBUILD ant-javamail-1.10.9.ebuild 518 BLAKE2B 6f4246e708ddb2b3de9971dccca451957f90d4d3ef09214b782ed31e6375a3dabfa729a262abc4388a67d210b3c7657a45697722da9e99fa8e29b557de92f846 SHA512 8959fc1ef8b032140cef7ccb356a907b6a935a3811bc6ccb26781754520103652cd0b39e7077e3251bafaabd91d37280ff47265cc5ab71e83163363a917bbf24
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
new file mode 100644
index 000000000000..4168b32358bc
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME=( "gnu-jaf-1" "javax-mail" )
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# needs some classes from javax.activation.* which are not in jdk 11
+DEPEND="virtual/jdk:1.8
+ dev-java/gnu-jaf:1
+ dev-java/javax-mail:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/antlr-runtime/Manifest b/dev-java/antlr-runtime/Manifest
new file mode 100644
index 000000000000..d4e17964331a
--- /dev/null
+++ b/dev-java/antlr-runtime/Manifest
@@ -0,0 +1,3 @@
+DIST antlr-runtime-3.5.2-sources.jar 206095 BLAKE2B 62b5ca08b13b80e1cdfe82d7354f75dcd3d82d7618bb2d20c4973c0b588d60cc034a8bc265d1cba6b3fc09f5583450a48948dc0beb86c4b13c6b9fdb32de37fd SHA512 fda8b0b1d6f779098c885360ea5f5e93eac5153f5bf761f3dbc954209b69b76edd21a8e4915bb9e567e5c095f1d173e19429bea34da9698bf241d17599858847
+EBUILD antlr-runtime-3.5.2.ebuild 1016 BLAKE2B 9a6e1c257499efad2c9c25488ef5e3707c863ce5660888763b9f29e7c5fec55fb26b698bfe791440fe42356dc3f0262294f7afa70105ae328096e136772a3e68 SHA512 bd128a0a0a6e7746154cb9e1da027f7a35a77941d35e263852859a0b080e9710bed143cb86e8c2ceb00db4af72885fddfb8d34a238c2aef8da87535a98d95f61
+MISC metadata.xml 402 BLAKE2B 8a48b0d50a6356a3bf1f8f2545269d5d21b75af4ba38b07dea53d5660216a8580f5c87b58dc6c235c79f7b5d15f7e4f6925105a2402f557413cf942d21153686 SHA512 26faab37f0c4c1c44000705ee08ec536c6503b70d972b353fcebbd48236688f3d7b5604b2db55753a9b38ac5b86a2d214a937cc68676e1356bec00045cacfe2b
diff --git a/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild b/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
new file mode 100644
index 000000000000..27593c24d267
--- /dev/null
+++ b/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom antlr-runtime-3.5.2.pom --download-uri https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-sources.jar --slot 3.5 --keywords "~amd64 ~arm ~arm64~ppc64 ~x86" --ebuild antlr-runtime-3.5.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.antlr:antlr-runtime:3.5.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="ANTLR 3 Runtime"
+HOMEPAGE="https://www.antlr3.org/"
+SRC_URI="https://repo1.maven.org/maven2/org/antlr/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="BSD"
+SLOT="3.5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: ${P}.pom
+# org.antlr:stringtemplate:3.2.1 -> >=dev-java/stringtemplate-3.2.1:0
+
+CP_DEPEND="
+ >=dev-java/stringtemplate-3.2.1:0
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
diff --git a/dev-java/antlr-runtime/metadata.xml b/dev-java/antlr-runtime/metadata.xml
new file mode 100644
index 000000000000..aa2f0f4c744d
--- /dev/null
+++ b/dev-java/antlr-runtime/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ A framework for constructing recognizers, compilers, and translators from grammatical descriptions containing Java, C#, C++, or Python actions.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-java/antlr-tool/Manifest b/dev-java/antlr-tool/Manifest
new file mode 100644
index 000000000000..b2db4e7789c5
--- /dev/null
+++ b/dev-java/antlr-tool/Manifest
@@ -0,0 +1,5 @@
+AUX 3.5.2-test-fixes.patch 2093 BLAKE2B 4016d770a226f1fb86f7f6e630df38c0d2ed0b4a025991f6b88e88506d2a44838c17097fc4ad5f63e506a839ebce0fcfa8e57f22415f777b0bd4c37afc93a0b1 SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533
+DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
+DIST antlr-tool-3.5.2-sources.jar 957096 BLAKE2B 39b75824e129c8111f302eb71407a683c59e91e79a3fa13c5386c4ba4aa322e706deb10b36df3591ab0843faff5702091d543272ee85d63cd92cb36cc72e1ceb SHA512 50fece361b69299be0c0941e6fe2bfacfc39c0b3dad3320126a9a80cd0f053fbaa6332612e2bab2872db122025d6abfe4b35a4636ef1c101e9131bbd2cdf5e28
+EBUILD antlr-tool-3.5.2.ebuild 1983 BLAKE2B 9bda797c081b361738b42c6092f567bcee6673479cdfd9e1324b4d15c97f1c4dc1135a4db57f41705804294560cc5f4b708056ecf6502cc9a111ad236ee6aaa0 SHA512 dc692632192d2998c28488574ad4478247d12efeb1744389750a2583ecb0988c75b851df4c0e5dc4cdf12fa0a64df39a011f215491fa7cc38744156d061624cc
+MISC metadata.xml 314 BLAKE2B 44614e69318b15302910048bed9f1a4acd92a1eb737e1861563d855aeec4e6f8f1a201f0bcbc039420a820e17f15d7deef68fb54b104d0c621def437c0457da3 SHA512 d03626431b434fe0b4fbbaaf7c860fd55390a1511c1f93f95747cc6a058795f166b73846b038bba3e843b6afdde2655ac3b7776a33276230efbaaa6d7b469d84
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
new file mode 100644
index 000000000000..214b8c4d199c
--- /dev/null
+++ b/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Artifact ID for antlr-tool is 'antlr'
+# https://github.com/antlr/antlr3/blob/3.5.2/tool/pom.xml#L4
+MAVEN_ID="org.antlr:antlr:3.5.2"
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN%-tool}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The ANTLR 3 tool"
+HOMEPAGE="https://www.antlr3.org/"
+# Maven Central sources JAR for *.java sources pre-generated from *.g files;
+# the source generation requires this package itself.
+# Tarball for resources, the test suite, and DOCS files
+SRC_URI="
+ https://repo1.maven.org/maven2/org/antlr/antlr/${PV}/${MY_P}-sources.jar -> ${P}-sources.jar
+ https://github.com/antlr/antlr3/archive/${PV}.tar.gz -> ${MY_P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="3.5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+ ~dev-java/antlr-runtime-${PV}:${SLOT}
+ dev-java/stringtemplate:4
+"
+
+BDEPEND="
+ app-arch/unzip
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+S="${WORKDIR}"
+TARBALL_S="${S}/${MY_PN}3-${PV}"
+
+JAVA_SRC_DIR="org"
+JAVA_RESOURCE_DIRS=( "${TARBALL_S}/tool/src/main/resources" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${TARBALL_S}/tool/src/test/java"
+
+DOCS=( "${TARBALL_S}/tool/CHANGES.txt" )
+
+src_prepare() {
+ java-pkg_clean
+ eapply -p0 "${FILESDIR}/${PV}-test-fixes.patch"
+ java-pkg-2_src_prepare
+
+ # 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.5. At the time of writing, we only use it to build 4 anyway.
+ rm -v "${JAVA_TEST_SRC_DIR}/org/antlr/test/"Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-java/antlr-tool/files/3.5.2-test-fixes.patch b/dev-java/antlr-tool/files/3.5.2-test-fixes.patch
new file mode 100644
index 000000000000..f2609ac1f0b5
--- /dev/null
+++ b/dev-java/antlr-tool/files/3.5.2-test-fixes.patch
@@ -0,0 +1,36 @@
+diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java
+--- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java 2014-03-25 11:47:54.000000000 +0000
++++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java 2015-10-02 22:42:56.921263410 +0100
+@@ -2131,7 +2132,7 @@
+ assertEquals(expecting, found);
+ }
+
+- @Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
++ @org.junit.Ignore @Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
+ String grammar =
+ "grammar T;\n"+
+ "options {output=template;}\n"+
+diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java
+--- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java 2014-03-25 11:47:54.000000000 +0000
++++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java 2015-10-02 22:43:07.303105023 +0100
+@@ -339,7 +340,7 @@
+ assertEquals("b:alt 2 a:alt 1\n", found);
+ }
+
+- @Test public void testSynPredWithOutputTemplate() throws Exception {
++ @org.junit.Ignore @Test public void testSynPredWithOutputTemplate() throws Exception {
+ // really just seeing if it will compile
+ String grammar =
+ "grammar T;\n" +
+diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java
+--- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java 2014-03-25 11:47:54.000000000 +0000
++++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java 2015-10-02 22:41:32.235554776 +0100
+@@ -141,7 +142,7 @@
+ assertEquals("alt 1\n", found);
+ }
+
+- @Test public void testTemplateOutput() throws Exception {
++ @org.junit.Ignore @Test public void testTemplateOutput() throws Exception {
+ String grammar =
+ "grammar T;\n" +
+ "options {output=AST;}\n" +
diff --git a/dev-java/antlr-tool/metadata.xml b/dev-java/antlr-tool/metadata.xml
new file mode 100644
index 000000000000..ad571d3247b8
--- /dev/null
+++ b/dev-java/antlr-tool/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">antlr/antlr3</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index deafa2491908..13c699aeb189 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -13,6 +13,7 @@ DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af19947857
EBUILD antlr-2.7.7-r9.ebuild 1151 BLAKE2B c5e4df7a9ddc43f3e1b490dbc9e05d252cfef1350a96ef9d4f8cf01dff06953e949a192d5bd36ba80d0315f33e32d91cab07176a4f0d5e7f368088342751891d SHA512 faf7da062bfbd5558d29d9d4fa2036f1cba91d4921e2b83ea3bf30f966a41536de0d657ef14ec19e45c8ed460e28778bc90e55edc4940b3331eac5ea2e3d4056
EBUILD antlr-3.2-r1.ebuild 3249 BLAKE2B d0c72e2b8052f426e5c001f2860d7af1ca1c1bc213451507fbab4ea6570e3045e1c55307dc1b1dd0820d97d16347ae794d93b64e1b9049976c3b02f56b2ff29d SHA512 5f21e8ab24d2040299e7638d74a2f764a165c31c36128c07414960c317d1895804bc79dffe2c6ea760b21cd1e4a27aa01a8ebb44c4ef21dfae42edc51e4a6080
EBUILD antlr-3.5.2-r1.ebuild 3022 BLAKE2B 6f3a8b1716d3206391d5f657f732ee1ffe9a02075560afb39ba33b452b03f70b75d953ead0b09a8fd0e96262ef470a39cdb9f852be2e31cfede284d2982d3b0d SHA512 9f19d2fa54a8cfcd0c3d7bc8d6fb0d23886435e0ca6b78da5db97a84598224d9e1a5b68db2d4a4521a3afa60f1e4faa15085d17507e87abe3cfff17417302f74
+EBUILD antlr-3.5.2-r2.ebuild 1608 BLAKE2B fadedd1d088db569aad09256c054e5b49c47d3356037e50e018346ee20b08ccd98805cde1aadec086e680004c8c3c3c8eb26bda303529a8a2b647ba3d3d56c9b SHA512 4f72f00bb7660d89b222d1fa3db088563f3ca8357ccb7cb1e59bb1ccfd0dda930d8077a13e98f92952080570197e3bd3d88fb53615249a15340d67adbca7c553
EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
EBUILD antlr-4.5.3-r1.ebuild 2521 BLAKE2B 439d098a1ae5b7238d89f896723418a212ca4fc1c59ab4da70ede8f3d245fe63befc4ae1c81c8c41a5a1aa351b643e56be916cff04d213aad8ef044483a5ce2c SHA512 35fb47714fc1187138706791bee5f352c3c8df99a1e4efbce67df358a311d531be27c4a4214c2e7c114667e5de656b0130e45cfe2cbf47662c08aedaf6e83c10
MISC metadata.xml 314 BLAKE2B 997f9c85d72f9b4cae21a3ecd063374f769f369d66ce8531fb158a17b9408ae3d35f117386acd08b89c16d5e0e8130b26ddada87b448529bf41a02deb5c1cdf2 SHA512 ad99513f6581ce95415e908eeba185cd4b6d03a8297e99735c7e79bf3dca1fa0c61a7ae03e47d8ba7429269a29558fae7321583b4f7d328e1da6a091237d9fde
diff --git a/dev-java/antlr/antlr-3.5.2-r2.ebuild b/dev-java/antlr/antlr-3.5.2-r2.ebuild
new file mode 100644
index 000000000000..c085043de3e4
--- /dev/null
+++ b/dev-java/antlr/antlr-3.5.2-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="https://www.antlr3.org/"
+# Reuse tarball for DOCS files
+SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3.5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+ ~dev-java/antlr-runtime-${PV}:${SLOT}
+ ~dev-java/antlr-tool-${PV}:${SLOT}
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+S="${WORKDIR}/${PN}3-${PV}"
+
+DOCS=( contributors.txt README.txt )
+
+src_compile() {
+ :
+}
+
+src_install() {
+ java-pkg_regjar "$(java-pkg_getjar antlr-runtime-3.5 antlr-runtime.jar)"
+ java-pkg_regjar "$(java-pkg_getjar antlr-tool-3.5 antlr-tool.jar)"
+
+ java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool
+ einstalldocs # https://bugs.gentoo.org/789582
+}
+
+pkg_postinst() {
+ # If upgrading from a version of this slot that installs JARs,
+ # display a message about submodule split
+ local changed_ver="3.5.2-r2"
+ local should_show_msg
+ for replaced_ver in ${REPLACING_VERSIONS}; do
+ if ver_test "${replaced_ver}" -lt "${changed_ver}"; then
+ should_show_msg=1
+ break
+ fi
+ done
+ [[ "${should_show_msg}" ]] || return
+ elog "Since version ${changed_ver}, ${PN}-${SLOT} no longer installs JARs."
+ elog "Please find the JARs from files installed by submodule packages"
+ elog "antlr-runtime-${SLOT} and antlr-tool-${SLOT}."
+}
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index cbe513a0ff4b..9d55d7cbf0cb 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,4 +1,5 @@
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-r10.ebuild 1439 BLAKE2B 76428d98b1fbf65aecc143cb91016d219f642f9f7b9fd3d0f72ca767a46ff1da523b0632187003090ab13e235da7b8ca45c73d717cfac57a9bf0f7fa47b633e7 SHA512 70b417449e861e5dfb2a84765f8a89565243a9522da2a47cc652caae7d4e7fe75e1a4aacc085285c60e4e3756bcfd40378b33d2f207bc875893bf2b3d02edf63
EBUILD avalon-logkit-2.1-r9.ebuild 1445 BLAKE2B 87d3271023f53f5e275c18ae926768186de5122d9b548d26153117c7decadfe47d1b34c384915a03eb118e4215296b417ea2002b6e9c82a7b49c336f1b70d9a0 SHA512 bbd130e50d2da2fa59735aeff1a88bc46599236f3cfb7531d1f63a84d26f27d0066502a63c40fb910022f042b1b5d70e7d200a9071d1398309023ec59c22dc60
MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r10.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r10.ebuild
new file mode 100644
index 000000000000..a79ee489bd88
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 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
+
+# NB: this project is dead and we should look into removing it from the tree.
+# Take a look at the homepage.
+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 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE=""
+
+CDEPEND="
+ dev-java/log4j:0
+ java-virtuals/jms:0
+ dev-java/javax-mail:0
+ java-virtuals/servlet-api:3.0"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/ant-junit:0
+ )"
+
+src_prepare() {
+ default
+ # Doesn't like 1.6 / 1.7 changes to JDBC
+ eapply "${FILESDIR}/${P}-java7.patch"
+
+ java-ant_ignore-system-classes
+
+ java-ant_xml-rewrite \
+ -f build.xml \
+ -c -e available \
+ -a classpathref \
+ -v 'build.classpath' || die
+
+ java-pkg_filter-compiler jikes
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="javax-mail,jms,log4j,servlet-api-3.0"
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar target/${P}.jar
+ use doc && java-pkg_dojavadoc dist/docs/api
+ use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index be711525d722..24f8682b9a35 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,4 +1,4 @@
DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
-EBUILD bcel-6.5.0-r2.ebuild 2906 BLAKE2B a5b768b3cac2ed376918cdb0b0d3c5aa32a747d251d334f27f010c7dc2ef0347894904ad47bfe4bf5c1e1eeb3f055c72fc7d0a49dd4d383cd7b4e1bc536b38df SHA512 854c89beaab4e3c54632f1a78dd06f3233150135089921aafa8f7c750f7bf95ebc714fe1b405e79e816a78266c428c64dd4294d0246017f227cca587f9442f23
+EBUILD bcel-6.5.0-r3.ebuild 2781 BLAKE2B b67bdb276275b99e5e0568f16c0acb563d959e5b03041470f024c72416a65b581b217ad91b35dc5cecbd8d16b39e4871e8b5350a5eb2cb15749c93672e20a27b SHA512 21ea468236a8a199903e9fa659b9b15fa6ed78a470f20f51faec8a977fff1333adf7e644b883e175d8b5caa23d7b4c23a83dec516dc6f95662b9048f082fb540
EBUILD bcel-6.5.0.ebuild 1076 BLAKE2B 53a7a80536e25669860ec17e197bb5219c965690de1c89832187ebea88738908daf8887772090b20fabcf8f5eca07f033a68f628ea3c8675ce743b0a68a79561 SHA512 c1acb164288524653f5f0aa80b7a7bf9cb0e4003015b100a727940d00cab00d4186c33faed1bf02805b9d2944ef0d7c120a7fb571686feda7e7f351d5e4989a8
MISC metadata.xml 820 BLAKE2B a425bc2cd30a5f47f2dc92ef014869042d68c09b1ace76007fdb08d53f52162e75f357af8debf6ab4ca5454960bd44d769190e8aae40b07a5e1ad94306f833b1 SHA512 0cb5154eb87c302868af21bd968b588317584d1f8f932e09444dde078efff02ccdb8e1e45a2e2e7fb9574eb04fd6a1c3a2afb45520261601f81ff9e35783bef7
diff --git a/dev-java/bcel/bcel-6.5.0-r2.ebuild b/dev-java/bcel/bcel-6.5.0-r3.ebuild
index 655c4ef3d8d2..54af8629d599 100644
--- a/dev-java/bcel/bcel-6.5.0-r2.ebuild
+++ b/dev-java/bcel/bcel-6.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -13,7 +13,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Apache Commons Bytecode Engineering Library"
-HOMEPAGE="https://commons.apache.org/proper/commons-bcel"
+HOMEPAGE="https://commons.apache.org/proper/commons-bcel/"
SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
@@ -29,19 +29,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64
DEPEND="
>=virtual/jdk-1.8:*
- !arm? (
- !arm64? (
- !ppc64? (
- test? (
- dev-java/commons-collections:4
- dev-java/commons-io:1
- dev-java/commons-lang:3.6
- dev-java/jna:4
- dev-java/jmh-core:0
- dev-java/oracle-javamail:0
- )
- )
- )
+ test? (
+ dev-java/commons-collections:4
+ dev-java/commons-io:1
+ dev-java/commons-lang:3.6
+ dev-java/jna:4
+ dev-java/jmh-core:0
+ dev-java/javax-mail:0
)
"
@@ -49,13 +43,13 @@ RDEPEND="
>=virtual/jre-1.8:*
"
-RESTRICT="!test? ( test ) arm? ( test ) arm64? ( test ) ppc64? ( test )"
+RESTRICT="!test? ( test )"
S="${WORKDIR}/${P}-src"
JAVA_SRC_DIR="src/main/java"
-JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-io-1,commons-lang-3.6,jmh-core,jna-4,junit-4,oracle-javamail"
+JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-io-1,commons-lang-3.6,jmh-core,jna-4,junit-4,javax-mail"
JAVA_TEST_SRC_DIR="src/test/java"
JAVA_TEST_RESOURCE_DIRS=(
"src/test/resources"
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index b64589e9a00f..3b4bba8c7e51 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,3 +1,4 @@
DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+EBUILD bcmail-1.69-r1.ebuild 1482 BLAKE2B f93ee55d305b3c6b865a49d0b67c988bbe99be8cdb019969b3c4805620d978c576538eb2f098e38b0c33af8d3f42fdc994f525aea43adac85f01e357749e44ba SHA512 e50df18b18f8c933d619fcb1eb2ad2de3dc29a506b70d42b54d828fa54b77c3ff1b7c4a547a2113e3938d5d8e2e482e7845aa6079d4b40f729cb110a48811242
EBUILD bcmail-1.69.ebuild 1488 BLAKE2B e82deb8acd2b93c38e56a259df2f16748944ccc15baa196d192cdbc3659e7deb3b0d93073bd595ae02642c82efd8e80f6dd212279958a10f0be8f4ab5386b6d0 SHA512 7b4e3031902879a51d84df5b7c0a07d97fb408a1ebeed2fc857c85eb1520eb4824bb6e1e630f87c20fba37d9ec3434f70958e5d99bc260b2ce9c528aee11c8c3
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/bcmail/bcmail-1.69-r1.ebuild b/dev-java/bcmail/bcmail-1.69-r1.ebuild
new file mode 100644
index 000000000000..0eabcf7e3584
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.69-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcmail-jdk15on:1.69"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+ ~dev-java/bcpkix-${PV}:0
+ ~dev-java/bcprov-${PV}:0
+ ~dev-java/bcutil-${PV}:0
+ dev-java/jakarta-activation:1
+ dev-java/javax-mail:0
+ "
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/mail"
+
+JAVA_GENTOO_CLASSPATH="bcpkix,bcprov,bcutil,jakarta-activation-1,javax-mail"
+JAVA_SRC_DIR=(
+ "src/main/java"
+ "src/main/jdk1.9" # https://bugs.gentoo.org/797634
+)
+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"
+JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests" # OK (106 tests)
+
+src_prepare() {
+ default
+ cd ../ || die
+ java-pkg_clean
+}
+
+src_install() {
+ default
+ einstalldocs
+ docinto html
+ dodoc -r ../docs
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index a2749b3540da..0a5b5c074274 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,5 +1,3 @@
-DIST c3p0-0.9.5.1.src.tgz 839657 BLAKE2B b8cf89ecb5b3766852355cdeb234698b0d1d8327233152e2e51ddcfe4a6e3be5f0fe4cc12a70d0df90d8ead90b3506b405f267f83bbb4a2a0ea1ac9d86051c64 SHA512 1843696d48e68f6120a68c42f0eb60c342ed8d1ddcc1d78c500d85c3d7e5e48358d100ecb1e0efa192aba34c5d9221437d53c2a968a42b797ff84bc12db4a724
DIST c3p0-0.9.5.5.src.tgz 869069 BLAKE2B 6e1349d1cd02647a7c2424b8e89a8c21cfd8faefd26b7e05ee9e2da1a1a501b2b3102b142eef52f56dea672408d683a6f47b4c89b25d529a578c4b1fe4aa819c SHA512 fa96b5d0042442c773309090b9cf8f0db8e16f334e321ac952afb198ca06cd66f6f7162369f22a439a0e6b45b1ffcddf540af53804f223844d7a5465213bece1
-EBUILD c3p0-0.9.5.1.ebuild 1138 BLAKE2B 7004df7dc46daa60676e330eb4d55db11710cfc5d63a376c6156e2099d384d7e6d88aa960b5096aa235086f4f275d97717332b9f823947942113027265c1ea9d SHA512 41cffb39931a0def7f702c761754ec6ec569ebf77b59092b2b5718e0564921c6554f4b7807b7f8562bab12e7a1cb760843a4dae3dab086690371df8bb35ebff6
-EBUILD c3p0-0.9.5.5.ebuild 1305 BLAKE2B 31e6d6f907dfda103ba8895c0826f0ce4c65f2f0d71b127962158999cdf874ed27c951ff011e747d3cf5e23bd78c85b5bec2b8031714d6e5f25cf1f9f57500b7 SHA512 1804f7d80922dae4be47d92b70bc70ce3295ebcdf8c61b3c27a96bf74f13b903c26f7db8c739c7dc8fb1f90709cd7884d835759386093082609386a15651821f
+EBUILD c3p0-0.9.5.5.ebuild 1304 BLAKE2B 12e0e9d144e0e14582e0ca37c40e4df33d746377697942d62dbeb5811cc76991e7c33d8c59f3dc4b1cdbff48fbf58a10336734932c412156a31e2fe3db8cda0a SHA512 b822c1570529ab43716475125273364df68f973f82155dc1d486b5ac234b68b7fbc7ad00288d7e0b78522fb3137794f509728265b4b6780aec227fc82ffac757
MISC metadata.xml 311 BLAKE2B 94e12506ba1bdd92ded65a3ceb8421881aa0a2bce4a93affc09208ff35b942e10ebc855833056e118fbf3e3d4b04e653b3de9ed2d45266191bd580040fdfbe69 SHA512 d4d0cd654557b0ea5d850a8af90db536b3893d2221aba93449559abd2469725e853e5f1ac4bcd67629f1f5be253106eb0a3d1a53b9da144256a01bd7264b6cfe
diff --git a/dev-java/c3p0/c3p0-0.9.5.1.ebuild b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
deleted file mode 100644
index 15e63cf24a7e..000000000000
--- a/dev-java/c3p0/c3p0-0.9.5.1.ebuild
+++ /dev/null
@@ -1,59 +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 examples test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
-HOMEPAGE="http://c3p0.sourceforge.net/"
-
-MY_P="${P}.src"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND="
- dev-java/log4j:0
- dev-java/mchange-commons:0"
-
-DEPEND="
- ${CDEPEND}
- test? (
- dev-java/junit:4
- )
- >=virtual/jdk-1.6"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-java_prepare() {
- java-pkg_clean
- java-pkg_jar-from --into lib/ mchange-commons
- java-pkg_jar-from --into lib/ log4j
-
-}
-
-EANT_TEST_TARGET="junit-tests"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar "build/${P}.jar"
- dodoc README-SRC
- use doc && java-pkg_dojavadoc build/apidocs
- use source && java-pkg_dosrc src/java/com/mchange/v2
- use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
-}
diff --git a/dev-java/c3p0/c3p0-0.9.5.5.ebuild b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
index fd97f8c6e6d3..a65d10630f90 100644
--- a/dev-java/c3p0/c3p0-0.9.5.5.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.mchange.com/projects/c3p0/"
SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
CP_DEPEND="
dev-java/log4j:0
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
new file mode 100644
index 000000000000..be2b7a465d50
--- /dev/null
+++ b/dev-java/checker-framework-qual/Manifest
@@ -0,0 +1,3 @@
+DIST checker-framework-3.14.0.tar.gz 7788010 BLAKE2B e05647b7a551cb1e53c32ea65c1d5a28ed7a968310223664704722c58b6df188e80581df383937fef6ebed5042e7234281b55069fde1f4cb34853495c4e2fbff SHA512 14be47e823ba67b6fcb7a8033632a2dd56341bd0d2a56c7501b50eab5e471622372eb4b62f4e78e33be019c15f44d075d146ece98fa3316e7cb24346db98c238
+EBUILD checker-framework-qual-3.14.0.ebuild 730 BLAKE2B 7c5a9f44f407f711082ecbeeec31986b621e956ea5801d76b120492f7e87b0a6d9e49b661b2b48e71f9c31cc272a64519119d3725990fc8f544e81a665a61f33 SHA512 8f7bf0fc2ea189945c2db6525c831c8fbe1c84222f46c8cd857a21132352f9d9c32fde781de6e5c6d43a58ec1e95e2450524ffda84b270aa0c24f2f500749546
+MISC metadata.xml 559 BLAKE2B cfdff3f58c4318542e3dd6ac9c98c826607441b11506ab0c2b0357701908c02a5b9e4496550fd81ffeed8b853598885230bf36118b4d36a49f191dfd83bece6d SHA512 fc19ef762da9b61820497c0febb3c5213c661aed64630f8235d06c895588743fa22dbe27930afe2790ee88c32e4744b4f4c44993ca0e251f98add7f5e66ee042
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
new file mode 100644
index 000000000000..a83640e7e91d
--- /dev/null
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%-qual}"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+JAVA_TESTING_FRAMEWORKS="junit"
+MAVEN_ID="org.checkerframework:checker-qual:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for type-checking by the Checker Framework"
+HOMEPAGE="https://checkerframework.org/"
+SRC_URI="https://codeload.github.com/typetools/${MY_PN}/tar.gz/refs/tags/${MY_P} -> ${MY_P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/checker-qual"
+
+JAVA_SRC_DIR="src/main/java/org/checkerframework/"
diff --git a/dev-java/checker-framework-qual/metadata.xml b/dev-java/checker-framework-qual/metadata.xml
new file mode 100644
index 000000000000..ca606ae4ec36
--- /dev/null
+++ b/dev-java/checker-framework-qual/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <longdescription>
+The Checker Framework enhances Java's type system to make it
+more powerful and useful. This lets software developers detect
+and prevent errors in their Java programs.
+
+A "checker" is a tool that warns you about certain errors or
+gives you a guarantee that those errors do not occur.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index 2d1bcb2a0848..a189a5b4002d 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,5 +1,3 @@
-DIST commons-beanutils-1.9.2-src.tar.gz 396910 BLAKE2B 1324c49605c9640aa3eee5c016a43bbb45b1984dd49eeab8f9b7a4ef1c5284ff8869228dda51719c2e6b3576517fdd02018a4f36654efc7f92d3fb7432008d05 SHA512 cf43aace33eb91368f86445874b16d977e827451f1355bb00e9b33bf0707855b5d757b0d58ad617f3a7f86f9065e7c900907dd604ba4de5ae61473d40cb758a9
DIST commons-beanutils-1.9.4-src.tar.gz 412606 BLAKE2B 213a2ad4d976ed4c55c9a73c0970a656e2f03efcba886369c8be164e04618937ad636ce7ffa6aa7b981e9595b24e4cbacc2bc632268bbfede8172091ef6eb4ff SHA512 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73
-EBUILD commons-beanutils-1.9.2.ebuild 1829 BLAKE2B 987acca0c9832be1c004a01d37d88973295cff44640884edbec92aa35e7e70c68cd0721038dc10c5907149c134408bba6598ecae73ae11834b4617cd44d7444e SHA512 b05fec1515bf71928fd9463de580ec191200549cf3a079027725bdf5b0f1029047608de5f893863c22f690b3bffec3d03b3273c1aef0b0e2002ce1b358e530be
-EBUILD commons-beanutils-1.9.4-r1.ebuild 4624 BLAKE2B e8142e5028d4960da7886dae50ed229bea902b1879dbc3e08dc3cfaa25fcc6513aeab438b4bc1edb3389082d798ff6c4fbf10ce3321c34299fe2dfc5dfe039e7 SHA512 16804bc672b5f32a352919bae336578364142f37eeb9a25b0d5a9e63e890d469d5191f8a88f9e1064e994354d4890ea9c3052f21775dd2ae17c37541be365bf0
+EBUILD commons-beanutils-1.9.4-r1.ebuild 4621 BLAKE2B f0359f6b08f91b29150eadca12ef3425aafaf2130d123997ca781256d2ad7619e0091f99240d8cb565645534640433c57b909ec4d21abe07e6eab4973926f2aa SHA512 85f13f5878b7f842524d13d041700777dd09aa1cb65bed19c9a87e729d3be5702dc5a25deaa00e9ae31b7f33d068306725c71af28f60c6d9412ae652a788574d
MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
deleted file mode 100644
index b50bec906c0f..000000000000
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.2.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"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs"
-HOMEPAGE="http://commons.apache.org/beanutils/"
-SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.7"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-CDEPEND="dev-java/commons-collections:0
- dev-java/commons-logging:0"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- test? (
- dev-java/ant-junit:0
- dev-java/junit:0
- )
- ${CDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-# Buggy tests.
-JAVA_RM_FILES=(
- src/test/java/org/apache/commons/beanutils/IndexedPropertyTestCase.java
- src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java
- src/test/java/org/apache/commons/beanutils/bugs/Jira422TestCase.java
- src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java
- src/test/java/org/apache/commons/beanutils/DefaultIntrospectionContextTestCase.java
-)
-
-EANT_GENTOO_CLASSPATH="commons-logging,commons-collections"
-
-java_prepare() {
- JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
-}
-
-src_test() {
- EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
- ANT_TASKS="ant-junit" eant \
- -Dcommons-collections.jar=$(java-pkg_getjar commons-collections commons-collections.jar) \
- -Dcommons-collections-testframework.jar=$(java-pkg_getjar commons-collections commons-collections-testframework.jar) \
- -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar) \
- 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/org
-}
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
index b7f3e06ece9c..96eda55d0e0b 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="1.7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index d930b728fb55..0b82c2810a20 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -2,8 +2,11 @@ AUX 1.8.1-build.xml-jar-target.patch 1099 BLAKE2B e1ce425c943ebb36dd73447aa7d41c
AUX commons-digester-2.1-build.xml 12816 BLAKE2B 7309479a61897c3ecc28e6394714c1fb4691035f2f57f64f8dcccfab407a681e4ca2076ddf2cd783ec3bb0b726d38033b63c10444169d029fe39613ab0760c4c SHA512 f42f80e68e8b6d31b07add393e1adc1714278e9e8e6ccab08dfb6a131bdafeab1ae5c5859e81dabc5acff88d2151093d82a3e089293f653bcab307451839c0ef
DIST commons-digester-1.8.1-src.tar.gz 303266 BLAKE2B 618885c812a9bf40c080bc5736b8b4be4e18fe4d2f732d2a44d39369ae6cf3beb3af0cf500da3d103d7aa8c18b41b84d06907b6fc90f7f10d30840d6cfc83012 SHA512 0a39069662b4792d4856b79b5cedc2b44cb70303a19045d21c233d45ae4dde9e80662bd242a381e759d7cdb5adaf0b9fa6206bb8397b53348fa9eac12e9a4e96
DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88
+DIST commons-digester-3.2.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
DIST commons-digester3-3.2-src.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
EBUILD commons-digester-1.8.1-r2.ebuild 1324 BLAKE2B 2cef18509056f371eb658b67e4a9eff75d6eae6e197eaaf8887a674850399d4f58543913e43113e35e9a5dc2da1ad8397b84711713d82158d6a0fe07ad895117 SHA512 0ac87e54cb3e3ecd4872c9df9ea2bc2174ca8a52922582575ec0006e6e484e6e7e3c878525705de4ba42a58d36fe9235f47065d8837c44c905d8b03ce4481a81
EBUILD commons-digester-2.1-r1.ebuild 1310 BLAKE2B 3e8e5971648240771f5031f90991ee20a5009f42c81ac7cd72f7145331212bf19dba9688ce501081562f08cb01b4bd5510d77ab37638d047d5d6803374e6cc24 SHA512 86db8e1e6fbcc76f64f90f20e14efb30cb29427525147204f6edcb845b90082ba53f0e46f3db4d6a751105c0429da672bbb943b256bafb6a859efb520e63130a
+EBUILD commons-digester-2.1-r2.ebuild 1994 BLAKE2B 9cdff6f6e00f6cc706c02d50d7cacca8aa6ad01e929aa78aa2c8521decdef9d45ee87bd053a6749d2e6ffb7b80250b5d98f52213c80b0dc25a28368041ff1d2f SHA512 261a0882d8f16eba2c2a3b42b5c19ce3ccd8e3f7690a5e7c36327b9f11ad628b59c6ab6723e87e492d1ac471e04fcf59d91a5ba5601a1842e478bb97da6831a2
EBUILD commons-digester-3.2-r2.ebuild 1336 BLAKE2B 4f9b7003b2c7b09cd21d79f0f2fb2e0f970a85c48d502e9921ae2e55883edeb5008630bde20f6428b2d91583527a73b8d9630603a608ea06120797631d909c4b SHA512 4325436fc97d1378b011ab7bde10a6187b8e7e0ef7b305e28d531780bc36225f8838bd5aeb5e7dde2c8da5031e97ff68da4f6932c2bdfa685ba836afe2ea5a75
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
+EBUILD commons-digester-3.2-r3.ebuild 2384 BLAKE2B 26b082902710279cf3b185f928a6a903cee6bec2206fccd1396d81e0ef981d7274388e52eaaf498e223e4537086314da05ceae6832e75935e39cba6af0295845 SHA512 ce7ee2520094c7eeb3b5914f100503f5450ed4c74706cc7634484c7c21971566f8de563812946b5dada35f79f2bcb737b55bff21593252648fea6d0fd2a29d6a
+MISC metadata.xml 482 BLAKE2B 2c8b9ab044dd5e95d9f17fcb0e284c7d8ed87727fa891bc6c15414b8db928346e8af71222bb3e6daec5ce682cfe72c7f315aa55d1dd5d55531554ab7d4ddc863 SHA512 31bd4dd9999a412986ac2dcc5cccffd7dd1f36ce8bf148f93dd35115da003c2663a0f5994a3e2a44ad537c26ee534294c80697f986737c02f434b3646e8f7c40
diff --git a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
new file mode 100644
index 000000000000..7db4511aecd1
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 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 mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz --slot 2.1 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-digester-2.1-r2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-digester:commons-digester:2.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
+HOMEPAGE="https://commons.apache.org/digester/"
+SRC_URI="mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-beanutils:commons-beanutils:1.8.3 -> >=dev-java/commons-beanutils-1.9.4:1.7
+# commons-logging:commons-logging:1.1.1 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+ >=dev-java/commons-beanutils-1.9.4:1.7
+ >=dev-java/commons-logging-1.2:0
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+
+S="${WORKDIR}/commons-digester-${PV}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+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_test() {
+ pushd src/test/java || die
+ # Exclusions according to 212,215 pom.xml
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ ! -name "Abstract*.java" ! -name "TestBean.java" \
+ ! -name "TestRule.java" ! -name "TestRuleSet.java" \
+ -name "*TestCase.java" -o -name "*Test.java")
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
new file mode 100644
index 000000000000..45e85fb373f2
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 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 mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz --slot 3.2 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-digester3.2-r3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-digester3:3.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
+HOMEPAGE="https://commons.apache.org/digester/"
+SRC_URI="mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# 1) atomWithNamespaceParse(org.apache.commons.digester3.xmlrules.SetNamespaceURITestCase)
+# java.net.UnknownHostException: commons.apache.org
+PROPERTIES="test_network"
+RESTRICT="test"
+
+# Common dependencies
+# POM: pom.xml
+# cglib:cglib:2.2.2 -> >=dev-java/cglib-3.3.0:3
+# commons-beanutils:commons-beanutils:1.8.3 -> >=dev-java/commons-beanutils-1.9.4:1.7
+# commons-logging:commons-logging:1.1.1 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+ >=dev-java/cglib-3.3.0:3
+ >=dev-java/commons-beanutils-1.9.4:1.7
+ >=dev-java/commons-logging-1.2:0
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+
+S="${WORKDIR}/commons-digester3-${PV}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+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_test() {
+ pushd src/test/java || die
+ # Exclusions according to 226,229 pom.xml
+ local JAVA_TEST_RUN_ONLY=$(find * -name "*TestCase.java" ! -name "Abstract*.java" ! -name "TestBean.java" ! -name "TestRule.java" ! -name "TestRuleSet.java")
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd
+
+ # Testing with java-17 throws too many test failures
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if [[ "${vm_version}" != "17" ]] ; then
+ java-pkg-simple_src_test
+ fi
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-digester/metadata.xml b/dev-java/commons-digester/metadata.xml
index 6021501589e0..080f8a0f0318 100644
--- a/dev-java/commons-digester/metadata.xml
+++ b/dev-java/commons-digester/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <longdescription>
+ The Apache Commons Digester package lets you configure an XML to Java object mapping module which triggers certain actions called rules whenever a particular pattern of nested XML elements is recognized.
+ </longdescription>
</pkgmetadata>
diff --git a/dev-java/commons-imaging/Manifest b/dev-java/commons-imaging/Manifest
index 4a7fab83ce31..5e4e10b728ed 100644
--- a/dev-java/commons-imaging/Manifest
+++ b/dev-java/commons-imaging/Manifest
@@ -1,3 +1,3 @@
-DIST apache-sanselan-incubating-0.97-src.tar.gz 33317875 BLAKE2B c9db6c30accc308d2c5d5977b84da118ab50b010b3728665a75dab13f9fecb70075e2d2208a62fabc57af7396f7c39b1ec498e0840e5a2c9c8de9b95d2dd597a SHA512 b7e8af01f4b4ca812313bbf573758d9c0e1355266bfb83898336b14c4b492a8979f2a593f00d53c076e83cf807a049df624491a26623cfbceb00560b748f05f2
-EBUILD commons-imaging-0.97.ebuild 1310 BLAKE2B 2afbfb353ca4b79b3213acdd2fb03407f2cd4bec788aaf1be04d1fcefad9c224074e359052972dd962f33a6da9cb66f9806431375fe000278d8e875456e97705 SHA512 c17518c2a4edc116b0311b5a9b97b56b8f6a098448ccea06b15c2b3832f339ff136d897d0c3d120f6deb0fde7947cdce7f40e01ae1c31ddaeb35fa8a87aa35e1
+DIST commons-imaging-1.0-alpha2-src.tar.gz 39798631 BLAKE2B 01d0754689896a1f2ff1401cac7d9f59a6bbb245c0880f24f857efc53975c1203c6857d7a5d107763741a2dec7fb48c4faa258786f574cf2f3c5acca251e368b SHA512 f2479e0dc726a8d1193f4eef6289efe493cfbbe257054b5a13e929f5785f7a2c9c937e3f379e0f0066c591d18be27d12f1e5157e789eebab78fba489cc81e688
+EBUILD commons-imaging-1.0_alpha2.ebuild 1323 BLAKE2B 460e79cfd4ee6e04f6866d59b055bff9e8d485768edd0cbf7d0824a758afd6392f8c61da0783c08417eb42a07d2f08b2c15fd6fe1ab37b5920b22b2208e844ae SHA512 80a72d95cbcdf1ff08747d981fd23a91b326921b25af4372541dcb7bca2343b61ace604e723054b2b2f4da700867d34e1e80e61d934be07ebc7343f4f0131e76
MISC metadata.xml 1078 BLAKE2B e2b1574082b656f2025228403463c5111b3d8174d72f9f4d9e31de9c9f72682b6cdd534d4aee455c30f222ae29fddf516395484a7b7fd5811cbd1f82382f4865 SHA512 812966e93eaea83f94ad0957d2421e73bafceff6c354b822d6936cbea9cd058e7dd0400d8d21e88eaa37a1cf1db625f2d5300317ea9817fc705558092c579cf3
diff --git a/dev-java/commons-imaging/commons-imaging-0.97.ebuild b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
deleted file mode 100644
index f8c2ba3f2ef3..000000000000
--- a/dev-java/commons-imaging/commons-imaging-0.97.ebuild
+++ /dev/null
@@ -1,49 +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="A minimalistic realtime charting library for Java"
-HOMEPAGE="https://commons.apache.org/proper/commons-imaging"
-SRC_URI="mirror://apache/commons/sanselan/source/apache-sanselan-incubating-${PV}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # 5/48 failures, dunno why :(
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/sanselan-${PV}-incubator"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
- # Tsk, Windows developers…
- find src/test/java -name "*.java" -exec sed -i 's:\\:/:g' {} + || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc README.txt RELEASE_NOTES
-}
-
-src_test() {
- local DIR="src/test/java"
- local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
-
- local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "*BaseTest.java" ! -name SanselanTest.java ! -name ByteSourceTest.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/commons-imaging/commons-imaging-1.0_alpha2.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild
new file mode 100644
index 000000000000..9ec64af99b77
--- /dev/null
+++ b/dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 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 mirror://apache/commons/imaging/source/commons-imaging-1.0-alpha2-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-imaging-1.0_alpha2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-imaging:1.0-alpha2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Commons Imaging (previously Sanselan) is a pure-Java image library."
+HOMEPAGE="https://commons.apache.org/proper/commons-imaging/"
+SRC_URI="mirror://apache/commons/imaging/source/commons-imaging-${PV/_/-}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? commons-io:commons-io:2.7 -> >=dev-java/commons-io-2.11.0:1
+# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter:5.6.2 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt README.md )
+
+S="${WORKDIR}/${P/_/-}-src"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index bc2b21e5be2b..4bbe31178302 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1,5 +1,3 @@
DIST commons-jxpath-1.3-src.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
-DIST commons-jxpath-1.3.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
-EBUILD commons-jxpath-1.3-r3.ebuild 1418 BLAKE2B c79ac6ce0e52a8e9d7742ff1dfb270a500ad79329c8cbbf64d7b6c8c4be773f8b64dcd36520fa1241c92e4151c8b9aa73bbe2853fa5260e73307e3be08824780 SHA512 ce9597f2e492e2d7d346d8ef74f50395c5a40bf0b143a06544f49c2aa3f40832aa5425925b864b425584df7070401ec6777ca05bce4409c94346d93c0960ce37
-EBUILD commons-jxpath-1.3-r5.ebuild 1791 BLAKE2B c909ccb9d29baff6e6339387cb74658e22890f03326c2f3b72dc743c20411ad5f7dce16c2ae7d342f0573cf447a5f2e327cce451d882f74372a044ac0dfca0a8 SHA512 762825b9434a362a0407399fa8611406adfcc63b8f3bf8e1a138eba81f3943824669fec9b03278d786a034569e4b1195a780d5e79119cc3058c087739afada89
+EBUILD commons-jxpath-1.3-r5.ebuild 1788 BLAKE2B 2d23caef7b4c7b06c2bf159d4e9d8816e4593d4e303f42a0693d6faa8877d8647e6dc5728dffac01a485de737f9f69d65a2ee0e497c69b575baac899991a79ef SHA512 5cc043334288a3a42f2644b1591f61fc3ce0b8dbdb30294944b451de6e7406527f4f45a700212abdf46d8fca20d8a426e6c68d5bb9119e8a7d3631f1cc201672
MISC metadata.xml 463 BLAKE2B 1b7774556b00869ef427316f8ce3465dfaa4a666ac45e35099054c09c8956743ead7e1f3483169ac15c9bc208e9d72b0abee49d7103db93f8ae8462f3ae2408a SHA512 a703759ea4165486b35c1ce02dfc35ad5cf5899af03c1bc0580288ae51b931c0fd12da6a741a42d365bf452ed1d56f4296fd6afcebc6c490ce7e48f9234087d7
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
deleted file mode 100644
index 270da007b138..000000000000
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 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
-
-DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
-HOMEPAGE="http://commons.apache.org/jxpath/"
-SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-S="${WORKDIR}/${P}-src"
-
-CDEPEND="
- dev-java/jdom:0
- java-virtuals/servlet-api:3.0
- dev-java/commons-beanutils:1.7"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- test? (
- dev-java/ant-junit:0
- dev-java/commons-logging:0
- dev-java/commons-collections:0
- )
- >=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="jdom,servlet-api-3.0,commons-beanutils-1.7"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-logging,commons-collections,ant-junit"
-ANT_TASKS="ant-junit"
-EANT_TEST_TARGET="test"
-
-# This one needs mockrunner. See #259027.
-JAVA_RM_FILES=(
- src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
-)
-
-java_prepare() {
- # Don't automatically run tests.
- sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
index 82e008be5830..af6d503a2289 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -19,7 +19,7 @@ SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.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/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index da3e97f7750f..424d3c98d053 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 2356 BLAKE2B b178d04ad7f2e763be37a4ce2d17c1eeb5af464332ee1cec16d1b9ca73d4d271697c09cd077d4343ed934a811de3eb44beab77d9d03d0fc37715fb2a407e1ecf SHA512 88abe0310581758e23b6fb859583311d7de233589d4a57c7cc4ecc85ad082f83e0a7e2547d133d969eade74a8209d97b007b0de59fa289807627acdf754bd69c
+EBUILD commons-logging-1.2-r3.ebuild 2428 BLAKE2B ec1bb9560770cce42e810c9be98cb90f29951f15b4d86856806b33364b7a0137fb44c886c8b1d8929ace6a62f94cff08da22673846d8650f3d511a7e329d29e9 SHA512 8787240bdaccc05b6ef2dd5ce717a4f4bd5224f37ac8cab943fec9c5ca31c7a11f55e229d4ead8d4f568cfe06f4d15281ceb7c15757cd86c0f04272b1e19206e
MISC metadata.xml 552 BLAKE2B ec2efc6f1e5e694ae68d977b40387ecdf6bff5fd184a4a5cd7c65830108d82522e5951a9b9868f4e94b08ec00c1901f43cd027f328b49cffc90ca971fb041026 SHA512 89c4f003ea15a5201ba713ca1819b9ea35d65c27e4106e6bc8e3806f1667f95b3e96c7b76c77b8545ded8abbb3955f6cf96dea11eeaea7740696bb01a933e077
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 86716083acb8..4635bb99ffe2 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
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="avalon-framework avalon-logkit log4j servletapi test"
+REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
RESTRICT="!test? ( test ) !servletapi? ( test )"
CDEPEND="
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index c9bf087ebe3b..4be6a6bfda8a 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,5 +1,5 @@
AUX cpptasks-1.0_beta5-test-classpath.patch 1070 BLAKE2B eacc916610026d4eb25fe7a217ce23e6ca485400e9f90c8ac37a4fb614fd0ac59d622161f79854b664db0e1cc48d047655479d817fcade448952d4c231d33860 SHA512 4ce1d06f6cb1a32ff8807f9e9ad8deddef26d4ea6ed6b2826d80e3ca16c491ecefb0c850ad9a958fdae3cdbd764852ab3a5f0ad66464b928f4c12061e3cb3e73
DIST cpptasks-1.0b5.tar.gz 902930 BLAKE2B 02cc20ea8e4316f7d0572cd147868219f1cfa326fd87d2edbea8a9b81c88f83173a373a88149bc2da55099bb9a0ac4d1f8927a6c708e6a5640b56220dbdba006 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c
-EBUILD cpptasks-1.0_beta5-r1.ebuild 1259 BLAKE2B 9b087463e02110d1ba06782702f7590269fbcfe281159221d840b65f3ebd2615d7958e7fe1756928072f468a13f84cf88e47b7f2eaf3ad36e98ab5126eabc3ad SHA512 6f4f83a1ee8d704703c52514e14528a25e7d9d3eb0e086c07c434da479727eca7da9ac68faced4276704d3b3f42db04911c278fcfd2f044a2b874371a1aee289
+EBUILD cpptasks-1.0_beta5-r1.ebuild 1306 BLAKE2B 38bb43db3acd2066491481a6fd5beff358cc99974e3bab281ca1697566bdace56b2509f50a4d630e2b07389b53deb6bc03d833e7c9b9e29a1701660740051e7f SHA512 4f776b751b9c2cd22f9f6e82a3f286ed2da4d81687fbe089e7f86cfda41a28db8121a906d8e8d740f9232ffb261d42142a96c4f10971143d4e029bf460af2085
EBUILD cpptasks-1.0_beta5.ebuild 1085 BLAKE2B bf55abda854a6d085fa2787b0eccbbb6abef4c97c2675e80bf91b3aa09509314ba2943d4a9bd427010f190006273d79c4d1269f0fb2bbff058ccc1ae0955be70 SHA512 cc8dc1a06d7a7efae982e6f02e97050eec498d1ccf950d9041f4320deaa712487608c920d0ec492d756649f55032000237704aed24676b28e60659148bbc546d
MISC metadata.xml 318 BLAKE2B 53f5719585c7a4f0479017c4410975aefadcedd17db45949c351329e28761f05ebd89ef0557505a9a3ae03967b9baefe3e2c5b1edf0116a10434755a8d76fbe3 SHA512 b89f13a465ae0f1cad3352319206dc922badf513f63af878b118577e1f6da322b824dd14ca9220cf10aa5c5463c30399f001395a36c45c3b69228a375be379ee
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
index f754a3db0200..d2302a4b865a 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_beta/b}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
CP_DEPEND="
dev-java/ant-core:0
@@ -36,6 +36,7 @@ RDEPEND="
"
JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
EANT_BUILD_TARGET="jars"
EANT_TEST_TARGET="run-tests -Djunit-available=true"
diff --git a/dev-java/emma/Manifest b/dev-java/emma/Manifest
index 7e5724330b79..5fb17123eb62 100644
--- a/dev-java/emma/Manifest
+++ b/dev-java/emma/Manifest
@@ -1,4 +1,5 @@
AUX emma-2.0.5312-java15api.patch 841 BLAKE2B b3a03a2f309303e0966703204a66980081778ca261b7ed82d8471ce3a295e4b5f8af0d6a8547f01150930a7c3378f8472ccef3ccb9382b74d9782e246530bc93 SHA512 cd485a0bd9bb157f9a0e420bd3bd8863ae5b1127401b8ff8944459c04fa2f5a7e6b008d9f86affe25cb24cf007d9dfe780f843745c6fcdfcfe1f734e9bb8fd23
DIST emma-2.0.5312-src.zip 421109 BLAKE2B bca287d7cdd61902fd156eac80596db07801e8dabd342d7cc68d3e0b4c0ff7b4de2b14d8b01d3521a291f7401ddc0ead67db6f9c601b26669ce9265bc28e0209 SHA512 d99b7ff1c4682a97f714f74cc6142bb766cde47bcb33932dc466f1e505e836883f01faa0a959dad77c0837fca3ae744754e0fcdc34d7a8d14720b0b7ce90ee4b
EBUILD emma-2.0.5312-r3.ebuild 1039 BLAKE2B b2de84bac7d81c2af8a0ccd6cbc7df2ef24671d32e76ea768026a2f38f01599c0ddc3b4f152af084d2c7f4d121e083c74951df52a37af79717a20b3dda053c77 SHA512 6f0ee5d7c95a68765a83ef268ffac1b5d8f05ba7a2c270332e7f86ca929274cf7359f5abb29a9b75c00b6d4d41202a70b15f1c46ba40db3168c5305f40320475
+EBUILD emma-2.0.5312-r4.ebuild 1081 BLAKE2B e41af9bdce0beb1047eb07426bc1e43210a6e4121b0137df125b042a09d1d79b326ec8b8551873ab5b40a60fe4fc495f4b02ce1917a6cf1d23cb1e878531fea3 SHA512 ebd081024dc67609c0908ec00047532a95df9d859c2824ca409bbc7765d565887715699d75c5ad3beb433ab5b58195bc04c0957e2c46abe515bc71f2f345be27
MISC metadata.xml 860 BLAKE2B 9e3723bdb2d6d82a4b6882e6e495367b94717dcc6b62154fa76a275bb39bd8418d0a748c990b28e9c21ef7a7c4703d6a80374cbeae69f7655e36f57110433d7f SHA512 2de0835234df8151fc96f57a6662357589eed19f6b528f4e9084633a79c60bc0e82dfb0447e5398f0f810fe481c278e75220f14fce5a26c65aeb6e0dbe43883a
diff --git a/dev-java/emma/emma-2.0.5312-r4.ebuild b/dev-java/emma/emma-2.0.5312-r4.ebuild
new file mode 100644
index 000000000000..5e00f2ec4a50
--- /dev/null
+++ b/dev-java/emma/emma-2.0.5312-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Free Java code coverage tool"
+HOMEPAGE="http://emma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+launcher"
+
+CDEPEND="
+ dev-java/ant-core
+ launcher? ( !sci-biology/emboss )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+EANT_BUILD_TARGET="build"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}/${P}-java15api.patch"
+ # bcp mangling unneccessary for 1.4+ and breaks with IBM 1.6 - bug #220463
+ sed -e '/bootclasspathref/d' -e '/extdirs/d' -i build.xml || die
+}
+
+src_install() {
+ java-pkg_dojar "dist/${PN}.jar"
+ java-pkg_dojar "dist/${PN}_ant.jar"
+ java-pkg_register-ant-task
+
+ use launcher && java-pkg_dolauncher ${PN} --main emmarun
+
+ # One of these does not have java sources
+ use source && java-pkg_dosrc */*/com 2> /dev/null
+}
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index d6ab232d4e48..f9fb64872215 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,3 +1,5 @@
DIST error-prone-2.0.14.tar.gz 677991 BLAKE2B e247249b385b4d5ff46cd9faaeb88b7c2053204c17a2a81846c554e2eb95389a17ca340f02dbab187f7b9e297fb13c030912e49bfbe5b29c7158391b1a7c50da SHA512 0bf2c869638e03fea5395e2b84a690c42df320903e48a171537e68a60ae7a47a8a83de07fa0a8dfb03340c035878b4380fd6677ba3bf1d13eeffcfaee4e63658
+DIST error-prone-2.7.1.tar.gz 1576363 BLAKE2B a204a6a0dfcc88e06ff4f9288764c33c72e1d0c692ba20ce34a1440025abbb96d510129e335a475ffecc037806c72a0e1a85f0ad55a5ee4402d7b731eabd057b SHA512 2e8ff78b2fc65a0a53244711a3b5dd3d42cd09c0c9cca8dde5c814ee3e9dbc6e2c44f8bdb778111c93cd867f9b85b8afae4fd0551eda9326c0a9b1aa1dcaaf92
EBUILD error-prone-annotations-2.0.14.ebuild 606 BLAKE2B 2358c936d84ca4a9d05a1472fdef821f7f5d76f029fe630c320f865513281b2e6d984026e6ed54ebe470a40c6cf77a87e2e1e5b5c14fb4db5db1a9111c4db2ee SHA512 2b3fa928f1931785c0516cc4c54331800e0319c9efc15f31e5be4908d28fbbbfa4f1eeecab93663f5e6979759d0e85adf2019e5fb569184fe9ae88afb3bf5aab
+EBUILD error-prone-annotations-2.7.1.ebuild 932 BLAKE2B efd3e8a8d8e79d09c569da66aeea11589fe84380d7d3abbe166db4b65f9329c2abc3bb329407510bb193d60851ffa530c7bcc6a6a1b73b490190f2b3dd04b09b SHA512 7ed32107d31f20790255fa13d451b76022bb57420abebcf626d87eef1456290792e37ddf0cadd2d0376f0fa236541a06e2506e5a8d3e1c2dd127783dba7dfdff
MISC metadata.xml 320 BLAKE2B 2e99f822caa8b83ed1ababb800cd9d3b1c8027e5623bc4498a475b7e0e72943c2140ec07c42a1d967472186094a0933fcc82b5cbfe45d1111f0fec9924e161dc SHA512 c47744406f133d3553b5982f0a7f690ca4bb360e76e633c30015489bb6489ee74629f4d6cd1986558932acc7b18449cd9840f9080f71d682cc6fbf97981cbf21
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild
new file mode 100644
index 000000000000..4c854a1d49ac
--- /dev/null
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 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://codeload.github.com/google/error-prone/tar.gz/v2.7.1 --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild error-prone-annotations-2.7.1-r1.ebuild
+
+EAPI=7
+
+MY_PN="${PN%-annotations}"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.errorprone:error_prone_annotations:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java annotations for the Error Prone static analysis tool"
+HOMEPAGE="http://errorprone.info"
+SRC_URI="https://codeload.github.com/google/${MY_PN}/tar.gz/v${PV} -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/annotations"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/failureaccess/Manifest b/dev-java/failureaccess/Manifest
new file mode 100644
index 000000000000..8d2f08003bab
--- /dev/null
+++ b/dev-java/failureaccess/Manifest
@@ -0,0 +1,3 @@
+DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
+EBUILD failureaccess-30.1.1.ebuild 922 BLAKE2B 09c7b52bcb0cbcf75b943094681c351fedefe73f181affe88aacfd4c7b26443e5052399036bf767572b1500c60b1f6e20a575a9cf03a2d8a74a11e03bc7d62f8 SHA512 56a42a4f7dacb75af71a9f65445f154476896e6a034a6b51d4a10ee9f9af24ac03e0a9c1ae7628558ecb4c3ac340047e60c84e97f5dcdc30f653c93de7b0c5b5
+MISC metadata.xml 755 BLAKE2B af0cc772ea1dab11a52db3dad6ea865af7cfcda4189778c444810dc03162db63baa1a48379bc16b603669bbb7fbc7ed29db47fbefca65887cb8e05d9f1d87e03 SHA512 caeefc4d01c0e0864858fc7a2c50526df15c27a3ff39f3dd577e508d79893eba8c4849aa685ffcd35382b685b298e0626d44bddc62e960274c43e129abd70ece
diff --git a/dev-java/failureaccess/failureaccess-30.1.1.ebuild b/dev-java/failureaccess/failureaccess-30.1.1.ebuild
new file mode 100644
index 000000000000..fb3c8c35a826
--- /dev/null
+++ b/dev-java/failureaccess/failureaccess-30.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 --slot 0 --keywords "" --ebuild failureacess-30.1.1.ebuild
+
+EAPI=7
+
+MY_P=guava-${PV}
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:failureaccess:1.0.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Guava's InternalFutureFailureAccess and InternalFutures classes."
+HOMEPAGE="https://github.com/google/guava/failureaccess"
+SRC_URI="https://codeload.github.com/google/guava/tar.gz/refs/tags/v${PV} -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="futures/${PN}/src/com/google/common/util/concurrent/internal/"
diff --git a/dev-java/failureaccess/metadata.xml b/dev-java/failureaccess/metadata.xml
new file mode 100644
index 000000000000..599c42537433
--- /dev/null
+++ b/dev-java/failureaccess/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <longdescription lang="en">
+Contains com.google.common.util.concurrent.internal.InternalFutureFailureAccess
+and InternalFutures. Most users will never need to use this artifact. Its
+classes are conceptually a part of Guava, but they're in this separate artifact
+so that Android libraries can use them without pulling in all of Guava (just as
+they can use ListenableFuture by depending on the listenablefuture artifact).
+ </longdescription>
+ <upstream>
+ <remote-id type="github">google/guava</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/glassfish-ejb-api/Manifest b/dev-java/glassfish-ejb-api/Manifest
deleted file mode 100644
index c9acb4d84eae..000000000000
--- a/dev-java/glassfish-ejb-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glassfish-ejb-api-3.2.tar.xz 37052 BLAKE2B c281a98a98181c5f19d3d11830a4c67b818f1ea43b41f335ffb0181e43e1351d4279462d68151a7cd98ad0a040fa15e3102e7e01b66713ee46198bc2967d9b34 SHA512 1692bbff05242b0af5141b35151ff65f029e19f45c5dac07ed9b706635e3f42d8d512819f38a49b564c9dee51be33c36fb871ea5267000536a0fb1e1b5d6a00a
-EBUILD glassfish-ejb-api-3.2.ebuild 851 BLAKE2B a7165e1e4df20487e70360842e53fb1761deb4f59a3abcc382c671d49242b775ea7f60c8c16025ab0c2545b1f39d11b61b3c5ab560bfc69152e1d47635addd3d SHA512 f9558f5e3a1152d06360c99eb9e7c11772b19489528b0fda91001a7d871858b83e72214edd10431f626eb38fe6f94b06787fe40f95787b8f90888613c5cd37c3
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/glassfish-xmlrpc-api/Manifest b/dev-java/glassfish-xmlrpc-api/Manifest
index 17a37a7ad617..0dba03601b86 100644
--- a/dev-java/glassfish-xmlrpc-api/Manifest
+++ b/dev-java/glassfish-xmlrpc-api/Manifest
@@ -1,3 +1,4 @@
DIST glassfish-xmlrpc-api-1.1.1.tar.xz 35180 BLAKE2B 6121f16400b0aab16c7926636ebcefbd9e363bc5c1d76fde575da468179e32a54722d9ac6d14582a8947c3f990dda50f209c8e09223ea684e0477984fbdcf597 SHA512 7de8d5959c0f9f09cca6a169d4e4293fca378aa497389e9a9a0af953b698322b9bbae6288b8cba2cd34abf58a0d0f4272294dcdf201a84ba5cc14d426843daa8
+EBUILD glassfish-xmlrpc-api-1.1.1-r1.ebuild 835 BLAKE2B f9c321b935777dc351966bb596c330f6d12cfbfc0360050ef85f7f7a505fe1b67f4523fdbaefb279f115373e6925c856cffd8fc1a0ce8e15bafa6fc0e2dfcc03 SHA512 89c7b38bccf58fc1525397c355fea0e1787e9d3c09c53fae0f8b571f247d9d88865543eb2a511884fc5d9105274d41c609d0431b08a946251bb392e497260a3a
EBUILD glassfish-xmlrpc-api-1.1.1.ebuild 802 BLAKE2B 4ffe7e89ee09908477759d19e0b9510f378c9d901f502d17d286ae2d27ba28d77416a5e28cb0944dedf86e91f5b791a36dfea04789c4ff734c1a9614dc11ec9b SHA512 f60e1c459c13a4f9e5978d9915d0b966fb0b614ae65005fdc6b099604c87f8792010f6850440b3a2e483ed5c551cf052eab6addbd915a3f2e96b0e478dc42f4f
MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1-r1.ebuild
index b02a9bfeab6f..71dc46ecd5a2 100644
--- a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
+++ b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1-r1.ebuild
@@ -1,37 +1,41 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=8
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
-TOMEE_PV="1.5.2"
-
-DESCRIPTION="Project GlassFish Enterprise JavaBean API"
+DESCRIPTION="Project GlassFish XML RPC API"
HOMEPAGE="https://glassfish.java.net/"
SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
-CDEPEND="java-virtuals/xmlrpc-api:0
- java-virtuals/transaction-api:0"
+CP_DEPEND="
+ dev-java/jakarta-xml-soap-api:1
+ java-virtuals/servlet-api:3.0
+"
-DEPEND=">=virtual/jdk-1.7
- ${CDEPEND}"
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
-RDEPEND=">=virtual/jre-1.7
- ${CDEPEND}"
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="xmlrpc-api,transaction-api"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
JAVA_PKG_BSFIX_NAME="maven-build.xml"
src_install() {
- java-pkg_newjar target/javax.ejb-api-${PV}.jar
+ java-pkg_newjar "target/javax.xml.rpc-api-${PV}.jar"
use doc && java-pkg_dojavadoc target/site/apidocs
use source && java-pkg_dosrc src/main/java/javax
diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest
index dca4539a113e..1ba4a91a18fd 100644
--- a/dev-java/gnu-jaf/Manifest
+++ b/dev-java/gnu-jaf/Manifest
@@ -1,5 +1,3 @@
-DIST activation-1.1.1.tar.gz 157018 BLAKE2B e9135b4c0996601c7963a46363e8ede3ba81e83e532637a92d83c89586eb52bd11be84ee37f5e8f31e372564f7c14aac4123726ba20712f5cef89a1e4bcd01f3 SHA512 d323644df13a4572bf1c10e7175c1c4cfa3078483886bba7b308989c215a23e12939b054124dbaf0437a4c5fdcb551b4e2189c09afc078218963389e4b3c3b7d
DIST activation-1.1.2.tar.gz 290644 BLAKE2B 15ec89a5c757bb134b9ec71e384a80dea5394b9b6463ca1fe44e2e622993fa8809231379b262b0a54595c32451a49ef508bea45ce82120138efe07d81939a817 SHA512 26534f7bb47daddf97b850ab74fc8ef2c5bd62d12cfb96e28e235071af7dcfc7761fa15f2d8f3a2d194f035665cef127812b7476af6cc81f6d6374f1fa725584
-EBUILD gnu-jaf-1.1.1-r1.ebuild 736 BLAKE2B 7bd012d21fbfc76e25906aa9a1ea8012b758ef4a8877349a8b31eeea99ad1e6ef893da92b02fed8ad6e4bd144a99182bb97fe4d1663eb5747b8e051615943ad4 SHA512 1f789fcaeea02de0faa50ec70fef2498aca541aec2d2d51f7067b6e9155b7810284bb892d0ac2ba50508a615958db7d8764f1508b3720028d48f916eea623eca
-EBUILD gnu-jaf-1.1.2.ebuild 705 BLAKE2B 8f226eb61fd6e4626ae94207d29d3f9499d38cb55e6e55408265c97b7f085d8dee5fb8e81cea30258443fbe1cd8b9c3912c95adc93d0bb9f65f0543c64423559 SHA512 33fb09bdec5829d7f1e0071ae5e7f96ad5803ab4d98c2e37d8ee58f233c8e17e6e21e83f5f19426fb8d38f2a9036cacdc43d46a29075eb33038a4dbafd19d05e
+EBUILD gnu-jaf-1.1.2.ebuild 704 BLAKE2B d1b3e89e599dee2eda8aabc1dd158efd5183bf1d943487ee11f7a5f2927beca1a896f0252fd08d542cde03a8cdf293e6883d7876876f9fe02899ce6b469f9f82 SHA512 5f969065bd4d92e251ceb8c3152dfc2826ec59a2115f66030585f1ebb4f3fe3a580d3b4dfc936075139026c46d9dc678e3aba18f16e66000914cf234bf4d9b0e
MISC metadata.xml 1073 BLAKE2B 34bda1c508acadfec823c9e621452efd7184f5b8b6491d85fce1c4286a983914511e8fe160afb09d71161a1564de0a6e6bcaa7fa85c3a74b65e7e72d117379c9 SHA512 ce26ee9c2e7eb00599548ac00130c7e3485c45f63d7dc040b69267a417d53f0a56fbd1a3d481d69bb26e3f332c8ff0fefac6cc4a0bbaf226f06fd712397e0dab
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild
deleted file mode 100644
index efb519edd970..000000000000
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,35 +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-ant-2
-
-DESCRIPTION="GNU implementation of the JavaBeans Activation Framework"
-HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html"
-SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="1"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND="
- >=virtual/jdk-1.8"
-
-RDEPEND="
- >=virtual/jre-1.8"
-
-S=${WORKDIR}/activation-${PV}
-
-EANT_BUILD_TARGET="activation.jar"
-
-DOCS=( AUTHORS ChangeLog )
-
-src_install() {
- java-pkg_dojar activation.jar
- einstalldocs
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc source/*
-}
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
index 6d6fbdfc459a..4af0a6d691ba 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
LICENSE="GPL-2-with-linking-exception"
SLOT="1"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8"
RDEPEND=">=virtual/jre-1.8"
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 5b51e9e18fa4..052668c08614 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,5 +1,3 @@
DIST gson-2.8.8-sources.tar.gz 393941 BLAKE2B ebdd1088a069eea58e5ea4e2eddea0d42064c53f7284778b1b7217c8bc7abeb7e14350e19d838af1d94f78c5c38aca6de0f37674b022f0e528ed65eef803c3f1 SHA512 f90ad679c99c5e9a6ee9e397e59ab1d7d94a9c82366902b808addc40ebbab101fdba7fc83e4666c4f35e52d8b127e6f901e65072a7de210496466074dcd043c5
-DIST gson-parent-2.8.7.tar.gz 391617 BLAKE2B 2c0fa3927d44c4a5c961518955dfbe6fee60dd61026002d0152d25d6f22dd4ac08b4323256af1053d0f17ef5d9f2a2a3ee86cedebd52a112d258e8c8c37e545d SHA512 044032b24ec1198d054807ccbfd91301307992b6e7d03a2e8578be79a2cdb28ba0ba57a954f11ad43022ec696c1522d242ed6b1045f831c9a370e0621e674fe0
-EBUILD gson-2.8.7.ebuild 1119 BLAKE2B e66e3e74c3fe71e4592e98295c72bc2b5a01b278a9a7ea181f952eac17561e5e0e14d4c8ccfcb39bacf65be8bb92b9134431b2282dd7e59569d88b1a467ee5ff SHA512 00b338365151df1f0312b32b9544a57a1f8660e4cd821706e595f2bf3d794b606c2c12c5e42d63866e21de4d1797ab131d39c8da47c171a423cae457a5f0a99a
-EBUILD gson-2.8.8.ebuild 1557 BLAKE2B 3fbbb41510c29d69da762d743b281a2351c7daaf3301152d03931462e8940d2f9e528162f85e401434c848117c2fc7d3fb1931a9f7a2f5514ba482a71930226a SHA512 f1bd31abc3a3e3bd0b9497b65ab19dc4fe5ab039cdd534d9fb4320ab0cb2e38cf2df3299a53539f38f10f6cd582063b3fd8c0ae3ad562cc79cc07d9dcede835e
+EBUILD gson-2.8.8.ebuild 1750 BLAKE2B e0b59437e868dc049ce0ea9d70fb9f09ea14302c4a5d9131097ddf8cc1cb711d24e2f65d88c4983bab24025b6e49a84d84428c9da06817e552c5b1b65cc28d61 SHA512 01ee9babce849f123f7bd9468130909ae380487e617d77c4e536399695b36ac6e6848879d0b2ed124fbdd6dd3d5a6b194a9527d438d083bc6de1e7c4bca3e9a7
MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.8.7.ebuild b/dev-java/gson/gson-2.8.7.ebuild
deleted file mode 100644
index cf9e81cf77cf..000000000000
--- a/dev-java/gson/gson-2.8.7.ebuild
+++ /dev/null
@@ -1,39 +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 gson/pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.8.7.tar.gz --slot 2.6 --keywords "~amd64 ~ppc64 ~x86" --ebuild gson-2.8.7.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.code.gson:gson:2.8.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Gson JSON library"
-HOMEPAGE="https://github.com/google/gson/gson"
-SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.6"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${PN}-parent-${PV}/${PN}"
-
-JAVA_SRC_DIR=(
- "src/main/java"
- "src/main/java-templates"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- default
- sed -i "s/\${project.version}/${PV}/g" src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java || die "Failed to set version"
-}
diff --git a/dev-java/gson/gson-2.8.8.ebuild b/dev-java/gson/gson-2.8.8.ebuild
index b01f741b2d88..a4d0f7c1d6f9 100644
--- a/dev-java/gson/gson-2.8.8.ebuild
+++ b/dev-java/gson/gson-2.8.8.ebuild
@@ -13,11 +13,12 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Gson JSON library"
-HOMEPAGE="https://github.com/google/gson/gson"
+HOMEPAGE="https://github.com/google/gson"
SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${P}-sources.tar.gz"
+
LICENSE="Apache-2.0"
SLOT="2.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Compile dependencies
# POM: ${PN}/pom.xml
@@ -54,3 +55,11 @@ src_prepare() {
default
sed -i "s/\${project.version}/${PV}/g" src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java || die "Failed to set version"
}
+
+src_test() {
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if [[ "${vm_version}" == "1.8" ]] ; then
+ JAVA_TEST_EXCLUDES+=( "com.google.gson.JsonArrayTest" )
+ fi
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index a77edcf13545..b3b6d0dc56b0 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,4 +1,6 @@
DIST guava-20.0.tar.gz 2522092 BLAKE2B 2ca76a71d0c169b80bfaa3e9847b2e465c57aabc0a67622a69519808fa8455146228747dc20e999ebc20ef7cd5fec1cfa82f6c025e9378011619cfedbc2c7d6c SHA512 e89eee8e66502f208878af286c660393712b12fb37647ec70719ca7c5184686c8dc5fc59d45c1813d792ecad9421e2c077dab075f76b1907c04f9f6e80567ac9
+DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
EBUILD guava-20.0-r1.ebuild 848 BLAKE2B 9eabed972891b3e2284c3133181fab6188ddfd0ab3988cf6ee5391d028bb8e762d5e6faf947f734e5f732f1a9f424daba4d0f2cf72344e936d93eccdea5df95e SHA512 c4be9028b341fbf960f160e94839af2b2d2672bbfd191336d7d8aa8fb4462086eba3e4f4fc6415451b590200853bd1d31f09d44b02635dacd4e73c5886ec6d75
EBUILD guava-20.0.ebuild 845 BLAKE2B 0df28f19f6916d03bb9624755c88bb8c5d3a6706e8aedab3dfb49c2a7d0d449040875aa5a554388ca716f6d221f78eb4d5d329b89c4bedfa1fa05d81d7eb6744 SHA512 31cc84e2b174b988b2b5449cdeb629360e7e17d6cdfae350f7929c9756dcc7cb3fd387cbd9ad069971f09afc833608b001bca9421986efa526715e9bc4537156
+EBUILD guava-30.1.1.ebuild 1819 BLAKE2B cc291cec8e7b233fc0cd30ac433249910ea885ff4aa1c957cad2933ef56e3df9d74ee1c9ff5db91305e35585521266bfe4da822b2f0307bcefbb35cf3b0760d4 SHA512 aca5a2e9eb40b7bfcd6ea9bc893935d6aefbf11c111664a957dc9c82fdd83690ad6ac39efb6b8bdbd91cf79486e3f8a8e0f3b75276f4d74fdf1d2acecb9eb647
MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-30.1.1.ebuild b/dev-java/guava/guava-30.1.1.ebuild
new file mode 100644
index 000000000000..339f4b0e446b
--- /dev/null
+++ b/dev-java/guava/guava-30.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 --slot 0 --keywords "" --ebuild guava-30.1.1.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+#JAVA_TESTING_FRAMEWORKS="junit-5"
+MAVEN_ID="com.google.guava:guava:${PV}-jre"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://codeload.github.com/google/guava/tar.gz/v${PV} -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+# Common dependencies
+# POM: pom.xml
+# com.google.code.findbugs:jsr305:3.0.2 -> !!!groupId-not-found!!!
+# com.google.errorprone:error_prone_annotations:2.5.1 -> >=dev-java/error-prone-annotations-2.7.1:0
+# com.google.guava:failureaccess:1.0.1 -> >=dev-java/failureaccess-30.1.1:0
+# com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -> !!!artifactId-not-found!!!
+# com.google.j2objc:j2objc-annotations:1.3 -> !!!groupId-not-found!!!
+# org.checkerframework:checker-qual:3.8.0 -> >=dev-java/checker-framework-qual-3.14.0:0
+
+CDEPEND="
+ >=dev-java/error-prone-annotations-2.7.1:0
+ >=dev-java/failureaccess-30.1.1:0
+ dev-java/jsr305:0
+"
+
+DEPEND="
+ >=dev-java/checker-framework-qual-3.14.0:0
+ dev-java/j2objc-annotations:0
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}
+"
+
+RDEPEND=">=virtual/jre-1.8:*
+ ${CDEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="error-prone-annotations,failureaccess,jsr305"
+
+src_configure() {
+ JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only checker-framework-qual,j2objc-annotations)"
+}
+
+JAVA_SRC_DIR="${PN}/src"
+
+JAVA_TEST_SRC_DIR="${PN}-tests/"
diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest
index 09c86ac096b0..97865e03f892 100644
--- a/dev-java/j2objc-annotations/Manifest
+++ b/dev-java/j2objc-annotations/Manifest
@@ -1,4 +1,3 @@
DIST j2objc-1.2.tar.gz 9718769 BLAKE2B 370a52fe9821814c12dd7a13072930f178e041d14baa2e912de3379030828ae62114b213f38f849934e68060fa51d8017a28772a794658aa23272ac5d254d933 SHA512 d2b4d12ba8107728ca33cfe18124eae092a2c2b9ce0b588374180d35816d83d6d6c9d029c3524537ac48f052dfa4c88b273405cddf56c54966216b1ed1a160eb
-EBUILD j2objc-annotations-1.2-r1.ebuild 603 BLAKE2B 5e4c80fb81dfce5187eeb9a84bf5ec3269d538ed67e74caa976293b93a707e178c8e0c8f4e56c3b5f99d908616807bb90b1a5a4c96ed17c357da1d8597323878 SHA512 6bc412682c0dd7bbbb69997fcf1aef906c76c50d3d4a076f0b523b2a7f36dd1f140d444900fa0bdc3d656801beae7fcf9989bd2a252e1ce6d466a2344dac1d40
-EBUILD j2objc-annotations-1.2.ebuild 600 BLAKE2B 7cc1aede87b5658af25d0a25d779ebdff809e7531e383f00b5bfed6496b2f35d3401e8ea0c01eb0914e0e789da0ce87758092213c134bff250e364be39be4522 SHA512 86a64a151c31d0ea31742b783f57f57f20907f6a31c3dd26e440c7b450e3be50a91fada6a7f8d570233f16e99c569dc59a460d4f9dea1af0a13da2938c810542
+EBUILD j2objc-annotations-1.2-r1.ebuild 604 BLAKE2B f89ef5a8c49a6669abd3e1402f8c5b5a2ff89f210ef424e1659ddcdac116cffdf8735cb111e8a1e1b08028496b5c51bbdf6de4e2e52669dbd608755c31c850cb SHA512 780fe50fd29bd85779f9b88c73432b183a63363c6d946073b97f52c8db38ac698f1a738fed45d860a376508e08ceb995e1573a0f54c7334a809744daf3f4695c
MISC metadata.xml 315 BLAKE2B 5403ef9a3b61aa4b5bef35fe46ff921be35190630f344563cdd60c8ca0fa6e3f8b1e612ad05df478f69257d85f30c36cd265e2f9664cc41d67e05fc47622f784 SHA512 fd176c272bbae6a6c861625828e363bebee5d92298540a8ec0bd9574d8adbc3f44f273ccb9ac576ac097a9d1c9deb8ff28c9f59ae001e951b030d5276f3a95ec
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild
index c4d6059dcd6c..8e90d442f377 100644
--- a/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild
+++ b/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="http://j2objc.org"
SRC_URI="https://github.com/google/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
deleted file mode 100644
index 4e612b1d0221..000000000000
--- a/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN%-annotations}"
-MY_P="${MY_PN}-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Annotations for the J2ObjC Java to Objective-C translator"
-HOMEPAGE="http://j2objc.org"
-SRC_URI="https://github.com/google/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}/annotations"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jackson/Manifest b/dev-java/jackson/Manifest
deleted file mode 100644
index 105b68bdf82d..000000000000
--- a/dev-java/jackson/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jackson-core-2.9.10.tar.gz 416803 BLAKE2B 9d8efc39b09b9619da301dc7fec3bd6339133c3fea3af46bbd77530883662b3b1d4ba2536cb8bd7ff7609a79ae6cfce135a3a5d75076bb7884e5e2878ac0107b SHA512 26b22e3fa60190877f5227c936ee32fdb4014347307904b140a6c787bb732df598b0ed48e7014cb6e51172abe52783e4d866f135706c8ebc77e24bdf087e9e71
-EBUILD jackson-2.9.10.ebuild 1502 BLAKE2B 40a35ecba9eec0ce42df3e90654e4004edb213b64252a22c9c62e2dff9255477422f24e8b4c0004bd2ee578bdf7ca9a04e1e3c6664874d2c5e0d1d50f9a6713b SHA512 12045c6457733ef6d8c67ab94052ca543c293482ae3027756601acc99bf4b1cac99bc035e163c714200f7fdc915b8683bf8a824d21ac9f2eb09e608c278c0711
-MISC metadata.xml 334 BLAKE2B 1652db13c6c56c4dc16c628714f7d064bb4e2a284db2afe86c064f4f7414832e1e213a2ae2110b2ddbddd693f7cefb6a27f030fcf1352758c527ba131dfd2b4e SHA512 e6f4cb025ab98dffc21d978b66dbe326664d70df8f021a7724165d8cb5427c2f421c7a16cd36442ebf87ff67220ebe1fde813b7dd7ffd65b40ea24848ad9a3cb
diff --git a/dev-java/jackson/jackson-2.9.10.ebuild b/dev-java/jackson/jackson-2.9.10.ebuild
deleted file mode 100644
index b495fe7cf278..000000000000
--- a/dev-java/jackson/jackson-2.9.10.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="High-performance JSON processor"
-HOMEPAGE="https://github.com/FasterXML/jackson-core"
-SRC_URI="https://github.com/FasterXML/${PN}-core/archive/${PN}-core-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}-core-${PN}-core-${PV}"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
- default
-
- sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
- -e 's:@projectartifactid@:jackson-core:g' \
- "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
- > "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die
-
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc README.md release-notes/{CREDITS,VERSION}-2.x
-}
-
-src_test() {
- cd src/test/java || die
-
- local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
- local TESTS=$(find * -name "Test*.java")
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jackson/metadata.xml b/dev-java/jackson/metadata.xml
deleted file mode 100644
index bfc88552f0fb..000000000000
--- a/dev-java/jackson/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="github">FasterXML/jackson-core</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jakarta-oro/Manifest b/dev-java/jakarta-oro/Manifest
index 67a3be154dfe..dfa9e3bce3c4 100644
--- a/dev-java/jakarta-oro/Manifest
+++ b/dev-java/jakarta-oro/Manifest
@@ -1,3 +1,3 @@
DIST jakarta-oro-2.0.8.tar.gz 345304 BLAKE2B a52b14f2753cb5ce07d16d417e943009dbb9268fddc62850daebb703ba2da3d83a3d05828479c89cab96174582514af75efedc73050a5f933cc0b26fbd51c948 SHA512 a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920
-EBUILD jakarta-oro-2.0.8-r5.ebuild 848 BLAKE2B 090c3b7f2dbded4c2b76fc61f2418526aa45f03eae9df9b6a2d639a8f1abaa008fd0ade91132285fa349ce29d0db772bef04d8a11dfd920933410771bf758896 SHA512 f9e6a74e228b84626d92616d3c80ad3726e5e9517de28f4da28e8168ff48716bd9f5669e4ea69b8c3ffcf431de308304f00b03996e4b3257f6f7ad730f196af1
+EBUILD jakarta-oro-2.0.8-r5.ebuild 860 BLAKE2B 060eb301ce8d61d81594dcf03c18cb46d9384e3f82608e218f5c87e2f246a264e0344da6f82946b008151c4ef3e780c178fb05012fce9661afc3084abdf1a822 SHA512 a7aa6eb673f5e189ce34e0b81bd0cb7e586c616a64128aed3ea02a4061272454f10203c51d8560ed658976a776a20f962c2eb13a91c781d3e8dc6601c4e7a3d2
MISC metadata.xml 514 BLAKE2B bfab1f301fcf0ae2db49f612bc82d42535d943559f894e1bfc4cd97c20536686e518229d41d6ea0c48bda1dd9d32d9b9f1848d11a26bbe72781faa95b0c35a82 SHA512 aacf03d805c50b656b2e3b8c22d72096949f59e98e6b766476fc8a2082572846828114587468d289c83ff705b7e546e3e72749a120125d2292d68a6f45dcf746
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
index 1f821c693d20..52bdf68ec975 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
LICENSE="Apache-1.1"
SLOT="2.0"
-KEYWORDS="amd64 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"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-regexp/Manifest b/dev-java/jakarta-regexp/Manifest
index 0bb263e0a69f..7f964b3695cf 100644
--- a/dev-java/jakarta-regexp/Manifest
+++ b/dev-java/jakarta-regexp/Manifest
@@ -1,7 +1,7 @@
DIST jakarta-regexp-1.3.tar.gz 127069 BLAKE2B c6bb7383459a4cacc3af40ec65d83f7d16ae723585fee06b4c874995455924e000d8bdc0b07615028f81fc7d6ba2927755e11bc9e7a726ffb4adf34be034ce63 SHA512 20e932856a2e761ac2c8b62617a0e661eb9ef309230ea8379cf3582a1a9308b50334bea66405fa47fade9b92a3cf9609c0a3e42cb7db85af4af63acaec553112
DIST jakarta-regexp-1.4.tar.gz 137768 BLAKE2B f6732f6a856736d1394b429453fd8958deb9f3f651f24accf641fee8b5ccc39e9807510135b07452f80fff55423406afc1aed88cef7d80e16ac013a1436b2649 SHA512 209b3f960cd16f05d3fd609b3b6ddb119e056f428b831788caaed6ebcb64c00279b18484845456dd07b8b761a7181f6772dbe9fd578f0401a5d8b1dcf98afc35
DIST jakarta-regexp-1.5.tar.gz 170142 BLAKE2B f245a3d53eb0be3ed2494269eee956aec7a7459872219f1bb8ecb3e5f544070b0792a690b4a52f70f0e2ba6963842868cfcbf40cdfea0155831f216636d943cf SHA512 428e5971140dd29246ec41e698813d244efc0e871c69d2d83685d8ae3691f0e20ac44aedad3c59f3c356d24384461de83921e40f0cc4d69c95813f02e8aaba82
-EBUILD jakarta-regexp-1.3-r5.ebuild 639 BLAKE2B db437320c32c11251eaebedc14de6bd049bf978bfe66e53f5ee3f9283bc4348029f7b119b97a2b79623eef3c10b28d1b3c6960d828ef34a368a47932be4214a4 SHA512 f7e6b8e1de65ade622b7b5446e856aa5fb6a9167b0ea2a08a7f9d2165de512f59a8a7913221b9111f680d04012dc6378087f4ccdc922f8ef1b377a62ed63414e
-EBUILD jakarta-regexp-1.4-r2.ebuild 639 BLAKE2B db437320c32c11251eaebedc14de6bd049bf978bfe66e53f5ee3f9283bc4348029f7b119b97a2b79623eef3c10b28d1b3c6960d828ef34a368a47932be4214a4 SHA512 f7e6b8e1de65ade622b7b5446e856aa5fb6a9167b0ea2a08a7f9d2165de512f59a8a7913221b9111f680d04012dc6378087f4ccdc922f8ef1b377a62ed63414e
-EBUILD jakarta-regexp-1.5.ebuild 639 BLAKE2B db437320c32c11251eaebedc14de6bd049bf978bfe66e53f5ee3f9283bc4348029f7b119b97a2b79623eef3c10b28d1b3c6960d828ef34a368a47932be4214a4 SHA512 f7e6b8e1de65ade622b7b5446e856aa5fb6a9167b0ea2a08a7f9d2165de512f59a8a7913221b9111f680d04012dc6378087f4ccdc922f8ef1b377a62ed63414e
+EBUILD jakarta-regexp-1.3-r6.ebuild 606 BLAKE2B 5eae2df10f5d79bc562d40dc0c3002425b17eb25f263041200d798081480bd8650bdc00f70e8450eb1fdc7c8a2e930127d2987b40781ed5de6c694ae9942414c SHA512 c29b6112102a774775889c04ad5790b3304067d08842a746ea13498ee877ae9af981f8a17262767ab4768fd2c9809d2d04eee316831e7a8b419c21586a6e4b6f
+EBUILD jakarta-regexp-1.4-r3.ebuild 617 BLAKE2B e6d1018dcab755fbd31e2a3831082da0950c70111619533fd75ebad177de7e609d2427c573201aed7ebe2963d42c799063635e9b6f04822cc0123bfd575a442b SHA512 253ebb20e94128280ffad950b95c336753a702059bc531910c23c9e9788529bc906efa1fd8604c030f77a586a77c99330e992e750d479146974b13e39d569ff5
+EBUILD jakarta-regexp-1.5-r1.ebuild 605 BLAKE2B c4c927c9841c774012bad9f79f10e701d2fa71f12e7c1043ecc445c1e98bcfbe3e7e93bad0cb19a8411789304e048e292cca3fb817323116730f31335ee272ba SHA512 dd86f1822add3b584871cf63ba79db07e70fcc76927584717e8833cc8808625a424e2bca2f1086b6287b0e52023540a4c4db2edf1d70b9a359fb9bbf5f7044cb
MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
index ddfe39278ff9..6a45372245ce 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="100% Pure Java Regular Expression package"
SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/"
+HOMEPAGE="https://jakarta.apache.org/"
SLOT="${PV}"
IUSE=""
@@ -17,17 +17,17 @@ LICENSE="Apache-1.1"
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8:*"
DEPEND="
- >=virtual/jdk-1.6
- source? ( app-arch/zip )"
+ >=virtual/jdk-1.8:*"
S="${WORKDIR}/${P}"
JAVA_SRC_DIR="src/java"
-java_prepare() {
+src_prepare() {
+ default
+
java-pkg_clean
- rm build.xml || die
}
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
index ddfe39278ff9..6fcce04eebce 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -9,25 +9,24 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="100% Pure Java Regular Expression package"
SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/"
+HOMEPAGE="https://jakarta.apache.org/"
SLOT="${PV}"
IUSE=""
LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8:*"
DEPEND="
- >=virtual/jdk-1.6
- source? ( app-arch/zip )"
+ >=virtual/jdk-1.8:*"
S="${WORKDIR}/${P}"
JAVA_SRC_DIR="src/java"
-java_prepare() {
+src_prepare() {
+ default
java-pkg_clean
- rm build.xml || die
}
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
index ddfe39278ff9..40c79264c7f8 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="100% Pure Java Regular Expression package"
SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/"
+HOMEPAGE="https://jakarta.apache.org/"
SLOT="${PV}"
IUSE=""
@@ -17,17 +17,16 @@ LICENSE="Apache-1.1"
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8:*"
DEPEND="
- >=virtual/jdk-1.6
- source? ( app-arch/zip )"
+ >=virtual/jdk-1.8:*"
S="${WORKDIR}/${P}"
JAVA_SRC_DIR="src/java"
-java_prepare() {
+src_prepare() {
+ default
java-pkg_clean
- rm build.xml || die
}
diff --git a/dev-java/jakarta-xml-soap-api/Manifest b/dev-java/jakarta-xml-soap-api/Manifest
new file mode 100644
index 000000000000..5572c574b679
--- /dev/null
+++ b/dev-java/jakarta-xml-soap-api/Manifest
@@ -0,0 +1,3 @@
+DIST jakarta-xml-soap-api-1.4.2.tar.gz 107226 BLAKE2B 4de5b994505d1964b6804010191b7b623322005d7bac6e9295062e821b5e0994a02d04f72d7f1bba9a8bf835ce42f455678af35c8cdf3e9e7208a2fde4151927 SHA512 9df8bb191fee0f6afa46f2d0c4bd5d1760324220be6862ff17df77d0dd4c9341360f18dd935233fdf6d9656d511c5378bd557e3dadd6570dfd3c9d7981179516
+EBUILD jakarta-xml-soap-api-1.4.2.ebuild 1751 BLAKE2B bdc1b17e022051f13b429e81cb28a4c580858b64a8e9fefe7629c8bb042780792ca6713f992deaf993c79f8d9fb2e5b6e314083b8701131e8b59ac0bc4fb20b8 SHA512 c475885c3231129f2341dab67f3edc1e07072b34059b7334bb785f8e14e430c1aaa6f8b41e9f99cafcdb6034026c2257b41b96c05f5374241e47f16da8d12864
+MISC metadata.xml 323 BLAKE2B 4344e9fa5329a4353e4d1c824a0b64b4bcc4c9a59a9e085e2d4d4e075206b8137f36ec01673684881a93da8c4a4fca7f53770d9d0012e347a32e316582e4a709 SHA512 19672c91b0f5da04ad8d44d477a6192a010b57651eda3e6e4e68c0020ace835132a18a519015e49ab06fa4091a8fdb67a3cdeaee1058602c5009df086796a16e
diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
new file mode 100644
index 000000000000..b22fd582fcc8
--- /dev/null
+++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This version provides module java.xml.soap and package javax.xml.soap
+MAVEN_ID="jakarta.xml.soap:jakarta.xml.soap-api:1.4.2"
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxws"
+SRC_URI="https://github.com/eclipse-ee4j/saaj-api/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+# EDL-1.0 equivalent to BSD
+# - 'SPDX-License-Identifier: BSD-3-Clause' in source files' headers
+# - https://www.eclipse.org/org/documents/edl-v10.php
+LICENSE="BSD"
+# Since version 2.0.0, the namespace has changed to jakarta.xml.soap
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+ dev-java/jakarta-activation-api:1
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+S="${WORKDIR}/saaj-api-${PV}"
+
+JAVA_SRC_DIR="api/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="api/src/test/java"
+JAVA_TEST_RESOURCE_DIRS=( "api/src/test/resources" )
+
+DOCS=( CONTRIBUTING.md NOTICE.md README.md )
+
+src_test() {
+ if ver_test "$(java-config -g PROVIDES_VERSION)" -lt 9; then
+ # https://github.com/javaee/javax.xml.soap/blob/1.4.0/pom.xml#L134-L143
+ JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/p:target/classes )
+ else
+ # '-Xbootclasspath/p' removed since JDK 9; '-Xbootclasspath/a' remains
+ # https://openjdk.java.net/jeps/261
+ JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/a:target/classes )
+ fi
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-java/jakarta-xml-soap-api/metadata.xml b/dev-java/jakarta-xml-soap-api/metadata.xml
new file mode 100644
index 000000000000..24700dcb8731
--- /dev/null
+++ b/dev-java/jakarta-xml-soap-api/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">eclipse-ee4j/saaj-api</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index c36cf149c3b4..734052c8fc0c 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1,3 +1,5 @@
DIST jansi-1.13.tar.gz 253219 BLAKE2B 89fc81710bc0860c717241c97fe2e7a148ccbaa5fb1e7db30b978aa69cddccbc9ea45a0e30ef384c42a741d707f5eab73ce8b2a76e1095c66a2c95f9088f28f0 SHA512 9c4bb0b7435c102068718e039900828994f1ba60ed44307eb726eb91a2884bc406688c2747635b9353f3bd68a6bf0e7c082a4069343b59efffc900f59c563fde
+DIST jansi-2.4.0.tar.gz 225579 BLAKE2B f07dfde9b789d62ec31999632e35609143289c5ab0972ce7cb931dea72ba41e6f2b9b74f7b3d82050e9ed4abd89386040d5268c408d787d3edd49fcdf0cce965 SHA512 4172b264463b847d6008dfad5c80246b029c7add2fd659f4b1c636891a86860f8f5ddd0ce0a5150065faeae72b19682339dda2d019c82f45d8f1be7a547e4558
EBUILD jansi-1.13.ebuild 946 BLAKE2B 93adfeeca34d5c12afb71ee93d27f86068d550d45c4017dc80a1b5c47d868edf3d1eae1794d30c7dd6d5f962e496410a37da33183a74d96baac8604a2ee875eb SHA512 085e83dfc7e435bf2824fb196a4cf4fc276befebab7e89a0a6c63281323da860202e4278fc5e797759452d6a7a827820c7325e63436505d6e5f92f30dfd432d8
+EBUILD jansi-2.4.0-r1.ebuild 2347 BLAKE2B 0e50d0695d1dd5810654fa2aa9d2d96630d9e551a9e3cef788d2dca79213775fa73dcac612da58af21e799ad373731a126d61288096a352fac53b403d46f8da4 SHA512 ff09eb4c4a019443991f41176b6bb22a346f6f02edb6a4d18ae067d9c39acc586d1be560c35fad4029cca9c43ecaeec450afbfd14f722ddff68c5fe2407b82ba
MISC metadata.xml 492 BLAKE2B 6620d0d7d7c5cc16b029617d431785e423a84ce8d23e06cc7a7a88c876d62223113be6c867d46b3a8537e3376174d00e2e3db19b3a178354140066a37da9956a SHA512 a460cd0627fa5d6ea41178f6268454f3841e67bbabaa7426d9d0e96caf941881694acd88e6c9a038ad5eafd46c78f7b0a29a3308e13be676f26d73e9fd9af79c
diff --git a/dev-java/jansi/jansi-2.4.0-r1.ebuild b/dev-java/jansi/jansi-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..75e764ffdbfd
--- /dev/null
+++ b/dev-java/jansi/jansi-2.4.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 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://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jansi-2.4.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.fusesource.jansi:jansi:2.4.0"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
+DESCRIPTION="Jansi is a java library for generating and interpreting ANSI escape sequences."
+HOMEPAGE="http://fusesource.github.io/jansi"
+SRC_URI="https://github.com/fusesource/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? info.picocli:picocli-codegen:4.5.2 -> !!!artifactId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter:5.7.0 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.7.0 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-1.8:*"
+
+# junit-jupiter is not available in ::gentoo
+# test? (
+# !!!artifactId-not-found!!!
+# !!!groupId-not-found!!!
+# )
+#"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {changelog,readme}.md license.txt )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_MAIN_CLASS="org.fusesource.jansi.AnsiMain"
+
+# junit-jupiter is not available in ::gentoo
+#JAVA_TEST_GENTOO_CLASSPATH="!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#JAVA_TEST_SRC_DIR="src/test/java"
+#JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+ default
+ # Remove this directory containing libjansi.so, libjansi.jnilib and jansi.dll
+ rm -r "${JAVA_RESOURCE_DIRS}/org/fusesource/jansi/internal/native" || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+
+ # build native library.
+ local args=(
+ CCFLAGS="${CFLAGS} ${CXXFLAGS} -Os -fPIC -fvisibility=hidden"
+ LINKFLAGS="-shared ${LDFLAGS}"
+ CC="$(tc-getCC)"
+ STRIP="$(tc-getSTRIP)"
+ LIBNAME="libjansi-$(ver_cut 1-2).so"
+ )
+ emake "${args[@]}" native
+}
+
+src_install() {
+ # default # https://bugs.gentoo.org/789582
+ # deafult fails with
+ # make: *** No rule to make target 'install'. Stop.
+ java-pkg_doso target/native--/libjansi-$(ver_cut 1-2).so
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/javax-inject/Manifest b/dev-java/javax-inject/Manifest
index b390f0cc6e66..e4d152a92c8e 100644
--- a/dev-java/javax-inject/Manifest
+++ b/dev-java/javax-inject/Manifest
@@ -1,6 +1,6 @@
DIST javax-inject-1.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
DIST javax.inject-1-sources.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
-EBUILD javax-inject-1-r2.ebuild 578 BLAKE2B 060433c8a619ebb3d2538115922820f85a1c63d19998a345160a83d07bc1afde5593de92f60f165acab4bd61d9f60f3281e11a9b29b202a2ac54da905e3853de SHA512 411f1bec81aaf28f8f94fdc42325a71c30bf33a57c872b3fd34184a5603866b15c8f17cfce7727f623e8223086babed3654860449e8ed73dadd1555d05f503b5
-EBUILD javax-inject-1-r3.ebuild 561 BLAKE2B 2d942cf2b7fee90f64e4a633b0abfcf9224ddf01fb264a182b0ac7e6abefb22458a294ac9e50cc068a09439d0e668bdd1cb8b320a7795a9587b643019d10877b SHA512 828cadc3ee982ab376e5854f100b2fd5fc170987b269ea11fb7f0482ea41a896887b4cb2ba8193e605036f287d47b047d52601262eaef45f0de385142ce26bdf
-EBUILD javax-inject-1-r4.ebuild 567 BLAKE2B b9e8c89d7378830a7d2743b394523024fff0e9151ba670a58f72dd15ee4f203a5a0aff99aab1038bd8e1c517f14931bb9786c7cc6bab595dc93587b31448d487 SHA512 82a11764249859cb14fc2ca3dddc4cca474c9f5afa795a07a8779112c5a19ac7192800efbebab0569710d4331c461f3958ef845f82ce3832485276efb197d697
+EBUILD javax-inject-1-r2.ebuild 584 BLAKE2B 08f11573cd4ae71aee344051c4d5d51d508cf3bfabc8d2fad9ff8c9e267514abee7f40890fa308fefa96001ad833a7bf97ac3fa8bfa2368dabce850b71eac047 SHA512 86d614120b41a3ef3e6bdadb7772537a60896946150a065c27850650c9a72d2ca20e38f0e3bbe19568922e6e820cf93d0dc26269c1615969860d907cfd0e63d2
+EBUILD javax-inject-1-r3.ebuild 570 BLAKE2B b618a004012cca3a5414a96896e65d574875e3c7c489e0fdfc8e9bdc3eaa6aeca52242dbd2e790d7fbf047c657a3e3f4a9843bac9e5e5c4de43b67432970e1ef SHA512 42af9eb1625f1860aa3003f4876cd5e143c6977777ed9eb8084823cebe76372f788ae31b4d0fb038ef235ab160310928b9817fa27c08d47d64d51da1139c3f51
+EBUILD javax-inject-1-r4.ebuild 576 BLAKE2B e7065833a4ac47a090c4c0cb66182abbbc913dbbe8c3fbe2c872b6335380ad5dd4780206c1991a643fb8ce1a98b4f5e18a8c183a974fbeb21b7d290544a13452 SHA512 bf9c9708051b248b70616de1e810c9482a17a886ccf157cecc8171c814bbc6626a2959f7eab612965366c769035a87fa1cae6c98c34b45f69a9ceaa200f2291f
MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/javax-inject/javax-inject-1-r2.ebuild b/dev-java/javax-inject/javax-inject-1-r2.ebuild
index 146f331c8330..1e5e418d3cd0 100644
--- a/dev-java/javax-inject/javax-inject-1-r2.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ MY_PN="${PN/-/.}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Dependency injection for Java (JSR-330)"
-HOMEPAGE="https://code.google.com/p/atinject/"
+HOMEPAGE="https://github.com/javax-inject/javax-inject"
SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar"
LICENSE="Apache-2.0"
diff --git a/dev-java/javax-inject/javax-inject-1-r3.ebuild b/dev-java/javax-inject/javax-inject-1-r3.ebuild
index 06b848f3c543..4778a718f69d 100644
--- a/dev-java/javax-inject/javax-inject-1-r3.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ MY_PN="${PN/-/.}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Dependency injection for Java (JSR-330)"
-HOMEPAGE="https://code.google.com/p/atinject/"
+HOMEPAGE="https://github.com/javax-inject/javax-inject"
SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
LICENSE="Apache-2.0"
diff --git a/dev-java/javax-inject/javax-inject-1-r4.ebuild b/dev-java/javax-inject/javax-inject-1-r4.ebuild
index 2b17e6fb0452..24a0d7ec2875 100644
--- a/dev-java/javax-inject/javax-inject-1-r4.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r4.ebuild
@@ -11,7 +11,7 @@ MY_PN="${PN/-/.}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Dependency injection for Java (JSR-330)"
-HOMEPAGE="https://code.google.com/p/atinject/"
+HOMEPAGE="https://github.com/javax-inject/javax-inject"
SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
LICENSE="Apache-2.0"
diff --git a/dev-java/javax-mail/Manifest b/dev-java/javax-mail/Manifest
new file mode 100644
index 000000000000..c4e1bdc715b6
--- /dev/null
+++ b/dev-java/javax-mail/Manifest
@@ -0,0 +1,5 @@
+DIST JAVAMAIL-1_6_2.tar.gz 1107140 BLAKE2B c0f84bad014af1146bc2bb7f4f58924edf8f6762c222f979d1fec787e8dc93861691cd95c23eb663924597277607d2ce5058c232ad1e8626ed2d0f1e17c34a98 SHA512 6c07490fabbcf5969a2d8946bd9f38187cd33b864985e8183f15d9e1ba1508e445f2050633d9054f9ad546fede7790e64d31956bf23eb2ff8dae45129bd43534
+DIST javax-mail-1.6.7.tar.gz 1854297 BLAKE2B 70dac40cdf67c413db3370f9cdf5b9786fcebce4ba12725758bf6120a2b6874e079a5beef08ee1190e30bfe2f14ad21e73ef1710c982e3f658a2f2f11e524f2e SHA512 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08
+EBUILD javax-mail-1.6.2-r1.ebuild 2066 BLAKE2B a1bee101bc627a3a90e48368eb20662bbedda45d573e045869bb1bd4a9f336dd047c2e5d42c830852776335e75422af6b8048fb68aeea22d131c678a170a1de4 SHA512 2b6265523669dd4d7c5eaf68e67ea2b34a141bc07a44f53f229144ab1d19a9a55c2242f834285594ecf8ce8140797d68238668eb9e12309752177c161280a0ec
+EBUILD javax-mail-1.6.7.ebuild 2055 BLAKE2B 279e78b4dddb2bb03502ada8c94d838a42ab67ce5d870a9bee08966a425b78bf2804f3f4c0d46d3f6af04bab9140486e668f7e97b9b3c4b92bcffefc91d30e37 SHA512 43a435d6c4866bc5fcdb7db97995947b2f0f254be98c5ea83c41f1a71e4ef448426fe263488cd30e41a7a01419282d2718b301e72abc6656076f57d30d2be32f
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/javax-mail/javax-mail-1.6.2-r1.ebuild b/dev-java/javax-mail/javax-mail-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..81ac05785694
--- /dev/null
+++ b/dev-java/javax-mail/javax-mail-1.6.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom mail/pom.xml --download-uri https://github.com/javaee/javamail/archive/refs/tags/JAVAMAIL-1_6_2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild oracle-javamail-1.6.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.mail:javax.mail:1.6.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JavaMail API"
+HOMEPAGE="https://javaee.github.io/javamail/"
+SRC_URI="https://github.com/javaee/javamail/archive/refs/tags/JAVAMAIL-${PV//./_}.tar.gz"
+
+LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: mail/pom.xml
+# javax.activation:activation:1.1 -> !!!groupId-not-found!!!
+
+CP_DEPEND="
+ dev-java/jakarta-activation-api:1
+ dev-java/jakarta-activation:2
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( ../{LICENSE.txt,README.md} )
+
+S="${WORKDIR}/javamail-JAVAMAIL-${PV//./_}/mail"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+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
+ mv src/main/{resources,java}/javax/mail/Version.java || die
+}
+
+src_test() {
+ pushd src/test/java || die
+ # Selection according to 201,202 pom.xml
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "*TestSuite.java" -o -name "*Test.java" \
+ ! -name "MailHandlerTest.java" \
+ ! -name "DurationFilterTest.java" \
+ ! -name "CompactFormatterTest.java" \
+ ! -name "CollectorFormatterTest.java" \
+ ! -name "WriteTimeoutSocketTest.java" \
+ )
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd
+
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/javax-mail/javax-mail-1.6.7.ebuild b/dev-java/javax-mail/javax-mail-1.6.7.ebuild
new file mode 100644
index 000000000000..63b23faa0a7e
--- /dev/null
+++ b/dev-java/javax-mail/javax-mail-1.6.7.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom mail/pom.xml --download-uri https://github.com/eclipse-ee4j/mail/archive/refs/tags/1.6.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javax-mail-1.6.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.mail:jakarta.mail:1.6.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Mail API"
+HOMEPAGE="https://eclipse-ee4j.github.io/mail/"
+SRC_URI="https://github.com/eclipse-ee4j/mail/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: mail/pom.xml
+# com.sun.activation:jakarta.activation:1.2.1 -> >=dev-java/jakarta-activation-1.2.2:1
+
+CDEPEND="
+ >=dev-java/jakarta-activation-1.2.2:1
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}"
+
+DOCS=( ../{LICENSE,NOTICE,README}.md )
+
+S="${WORKDIR}/mail-${PV}/mail"
+
+src_prepare() {
+ default
+ mv src/main/{resources,java}/javax/mail/Version.java || die
+}
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_GENTOO_CLASSPATH="jakarta-activation-1"
+JAVA_SRC_DIR="src/main/java"
+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"
+JAVA_TEST_EXTRA_ARGS=( -ea )
+
+src_test() {
+ pushd src/test/java || die
+ # Selection according to 137,138 pom.xml
+ # 1) com.sun.mail.util.logging.MailHandlerTest
+ # java.io.IOException: Permission denied
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "*TestSuite.java" -o -name "*Test.java" \
+ ! -name "MailHandlerTest.java" \
+ )
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd
+
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/glassfish-ejb-api/metadata.xml b/dev-java/javax-mail/metadata.xml
index 6021501589e0..75321cfb5598 100644
--- a/dev-java/glassfish-ejb-api/metadata.xml
+++ b/dev-java/javax-mail/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-java/jcifs/Manifest b/dev-java/jcifs/Manifest
index e005bd2f1d77..1417e4b641ad 100644
--- a/dev-java/jcifs/Manifest
+++ b/dev-java/jcifs/Manifest
@@ -1,5 +1,5 @@
DIST jcifs-1.3.17.tgz 862091 BLAKE2B 67605ebd810caf097a9172c17f31d39c9e16af5885c706f7d8c2c2cff9b8e6a643174c9aaa8bd6aa06c816e312b7170a5aa06535f823a5c5b182e97beecccd0d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc
DIST jcifs-1.3.19.tgz 883534 BLAKE2B ede24f43018a4bf304019aeddb6cf789e3a01622d840dc3f6bfa45104b97a39d256807f766f14b3e215e53519f3838aabeb73bdf7897323fb41ca5ef2b7c9372 SHA512 24ea656469ac7a5666d28dcdf122c80d254af5317a704718d8848858a21b38c6efe9b977854a33130cdb57d2fc8324ac3ee01fb5443360899f9572ec41788eef
EBUILD jcifs-1.3.17-r2.ebuild 794 BLAKE2B 4da988b2dc46f9b33b84a6a18b3309c40cb775c7c5faa6312d89d0ee7444e69831cfccb62d4c4f99713c7c98b1755732cd50234aba5f4429f68a5fb449144c49 SHA512 5fa03afb1988311c5398d01ef9af4618260af25ebc0deafb204378553037eb0243051c14bc372484e2b0995a1791d6352f7eba956b564748e03d48f8c604141b
-EBUILD jcifs-1.3.19.ebuild 797 BLAKE2B 9dd98545ba043ab9ad45aa4337fbd2bf9e07a7a8820d7f8920a1acff96702ce6be8ea5e5b1c1245ed8b875592196ef4f455d9490f8953d61d93d5a97917d067c SHA512 256be2f575be136208dcf58989386d294076f53cc34b99c3e07e6a0f0f39ddfb9196c3b2362a43d539d226d167d368c14ec54a106dc915e02d78edb22399d7ad
+EBUILD jcifs-1.3.19-r1.ebuild 799 BLAKE2B 5602206e47b356a402b35a6243b23b1a3161c9836a9bbe03fa869b41fa24896f5608afbb4c78214985b3ad79702d26651efcfbd243645f5538a8c89b62e0eece SHA512 6c6f86e6c77fb5dec022b7bef80c5c89c3d8893b1afbf14d39d4b33ea54368585a1aef26c6acdc045873177f60e9ca85d500578adaaa0503f46fe7c3f9410c98
MISC metadata.xml 548 BLAKE2B bc7c331f8d53556d450986b25180a144923c7a84dd0aeaff351c4603899d2664fd919f82ff6d9545331855889aa350b7b9d68e8963c2454a79dab7cf26904003 SHA512 339f5cabfc56e1c50cb6d2e1a55992bc593c31ed9b818cd1c071f4c5e07e46cf2c5699287ecf8e27e69ba3f48946856c31723fe9e26e37ef8a1a795f32b70a3d
diff --git a/dev-java/jcifs/jcifs-1.3.19.ebuild b/dev-java/jcifs/jcifs-1.3.19-r1.ebuild
index de48d1147b20..b8169cb79866 100644
--- a/dev-java/jcifs/jcifs-1.3.19.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.19-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
JAVA_PKG_IUSE="doc examples source"
@@ -10,6 +10,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
SRC_URI="https://jcifs.samba.org/src/${P}.tgz"
HOMEPAGE="https://jcifs.samba.org/"
+
LICENSE="LGPL-2.1"
SLOT="1.1"
@@ -19,11 +20,11 @@ CDEPEND="java-virtuals/servlet-api:3.0"
RDEPEND="
${CDEPEND}
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8:*"
DEPEND="
${CDEPEND}
- >=virtual/jdk-1.6"
+ >=virtual/jdk-1.8:*"
JAVA_GENTOO_CLASSPATH="servlet-api-3.0"
diff --git a/dev-java/jdepend/Manifest b/dev-java/jdepend/Manifest
index 0b15819cf99e..a920cd91e4ec 100644
--- a/dev-java/jdepend/Manifest
+++ b/dev-java/jdepend/Manifest
@@ -1,3 +1,5 @@
+DIST jdepend-2.10.tar.gz 1226471 BLAKE2B d4ec55913a882e4796de88bd220e6bf6a13df516653e7f247a4c84c0c6967f642b1633341955704a0d89b1d449368c4b0d1cd4b52034c64caeb5781e9d2c5839 SHA512 7a01ab4311f41c9176e61e6b0ad50e7c50b4d5638550775a6bd8ee9587ea5978b7dde502d5a82b2ff12811c57a6407e2add42e0c5400517680f425e55e04ae3f
DIST jdepend-2.9.zip 302836 BLAKE2B dcf3b9c37037926d3792932327ddeb1e95fbbc47beaffb2197653b32bb919a0f3bb4d80c3b32d8e8d83f58e3c216ae5ae6e7ad923971adb460ef0d7fd6036149 SHA512 93ae1ca82422be0dce9794f25ad98c078da7437bca59c697405806a462f81b52028e0536075e2a2f428d8f8c5a27ae50fa7a580b75edbd4e8c9c750315b1c919
-EBUILD jdepend-2.9-r6.ebuild 839 BLAKE2B cb87f50a0c2666436ffd4a7e27bd92489283ddc202a287503fe2a3a216f07d3c09e31bc8408999987b74da9f06063be7bf3be0d5a4581ed83ed5e6ee60457789 SHA512 de72b9ea1decd14bce618299aaffd13ce3baff49801928157448cfe28f151faa7fa81d7b5c87566c8449b77ae316173aca4096f0c28404b3328b5359b9adc860
+EBUILD jdepend-2.10.ebuild 858 BLAKE2B f2328a3efe10f2d09de3943c8f85bdbeea5a4497bc570028bb1a906b4690453dff43c57f8531215356090fcf0e1de8f6a94628dee135981ea4138b0f4f4615d9 SHA512 4a9e4df5c232c2a662778e16ee18cb50fb02b6dd9ead205267211088a0a70d4c45a029d431bdc5633b626b5d51598b6d0ec39050e086508800fedb9f91bb5c88
+EBUILD jdepend-2.9-r6.ebuild 851 BLAKE2B e088be94b340973d466673a3a8272ab3e0234b3b5c89bad2e0ae823536e6e5350bb25046bb845d695bf195ef66c7adaba32a7047fce2f8e445038b81e2c08779 SHA512 dd2726988f1278b80ab22c6e0f90bfc2546d7f2b01d93bd48bf85f68fbd430044cfed11143d62605aa72d3894085c2ec5514adbdc459dbffc8bc88c4edbf2b8c
MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jdepend/jdepend-2.10.ebuild b/dev-java/jdepend/jdepend-2.10.ebuild
new file mode 100644
index 000000000000..1a92cd4f53c8
--- /dev/null
+++ b/dev-java/jdepend/jdepend-2.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Traverses Java class file directories and generates design quality metrics"
+HOMEPAGE="https://github.com/clarkware/jdepend"
+SRC_URI="https://github.com/clarkware/jdepend/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="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"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_install() {
+ java-pkg_newjar dist/jdepend-${PV}.jar
+ dodoc README.md LICENSE.md ClassFileFormat-Java5.pdf
+ docinto html
+ dodoc -r docs/*
+ use doc && java-pkg_dojavadoc build/docs/api
+ use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jdepend/jdepend-2.9-r6.ebuild b/dev-java/jdepend/jdepend-2.9-r6.ebuild
index 39c2010bf34f..676b7d948b74 100644
--- a/dev-java/jdepend/jdepend-2.9-r6.ebuild
+++ b/dev-java/jdepend/jdepend-2.9-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.clarkware.com/software/${P}.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 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=">=virtual/jdk-1.8
diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest
index 97e89a6e9aad..e71b13e4f500 100644
--- a/dev-java/jmh-core/Manifest
+++ b/dev-java/jmh-core/Manifest
@@ -1,3 +1,3 @@
DIST jmh-core-1.21.tar.gz 615305 BLAKE2B 1a5cfe9784efe0cd7706382eaa89c8bcce0efcce3c2b802ce0772992dd16f0c6900a47d70b72d1c556584adb8afda442f49267ad4e0b53d04c20026979787210 SHA512 ac51d58d9b746157842a3bc9c4828bbff52c5882582e123e04b5ab6c4bfc1ff3cad1f6023ab1fe1eccfa68c73ffbd21b34388547bba544626af87092852ec166
-EBUILD jmh-core-1.21.ebuild 897 BLAKE2B a7de5cd923a099a67571036ba80dabf0fe70d403f063da74a978842bc0bbf1bf830e0a62abfa3da6780997ce3bbaf556c0ccb1d2e0574ae9b8f8b472d5e81781 SHA512 d93df911230fb602667d69cc50f4ce688c6fc84f4d08f578a36a16dd3bc8b36005e7652f910321b247028c1bf44fbbf6e403f236a728c3ceb5d521fa0ff6f2d9
+EBUILD jmh-core-1.21.ebuild 900 BLAKE2B a28984306aa282e05bd15e2504784abf9ed577d716bcb809bc7a2296862f6f19b136130853106310d4b253961f8784c4689a8519298d55f349595da7c7d4a71a SHA512 513a204cbb9a868015a4339fdc8197061c0c5c389463bbc5ae16c19aff6fb05dd8cc53bd7dc5ecda08557e26b8403ba9e7db4e074c8b0bcd4032c73c957383d2
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jmh-core/jmh-core-1.21.ebuild b/dev-java/jmh-core/jmh-core-1.21.ebuild
index 42c501e08dd6..8d9d4c30c7d3 100644
--- a/dev-java/jmh-core/jmh-core-1.21.ebuild
+++ b/dev-java/jmh-core/jmh-core-1.21.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://openjdk.java.net/projects/code-tools/jmh"
SRC_URI="https://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# jopt *must* be 4.6, see https://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
CP_DEPEND="
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index d9a80e6e566a..5018b2489949 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1,6 +1,3 @@
-AUX joda-convert-1.3.1-build.xml 10459 BLAKE2B 79f7930f5d71e046a5e0ad8e4b7bbddb10ce2be67e6d4120685e640d51d201289e02a45bf37a5c295add8cc90404c74c06709b996a946f88b4b2c7a0467c7cb2 SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce
-DIST joda-convert-1.3.1-dist.tar.gz 131288 BLAKE2B 0b7b6cebb7e13e89d838ec10c4edd54b52bf3449b3003cd41ea2628719b8ea52bc00a8681a96fad0de79b4acd56fc4a8d4a31d558841fa268d9ffbeb97ca1ed0 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451
DIST joda-convert-2.2.2.tar.gz 65476 BLAKE2B 9ef8e3b172d31f4e3b748ba5aae807b1d344c3b6bedeb0bf0b84b93009171495f271d03cd9f7b29147a256ddd1081b3fc9640c1df6b45425080ce1d44e2c0f37 SHA512 9660491373d5f7d415ab47cec7164922fc8901803e759bbf8cf7d0cc58040c2c8b245271f33d641a563ffb25b8e42f8197e297da7d1fe68a5c50ebb61536f3ae
-EBUILD joda-convert-1.3.1-r1.ebuild 942 BLAKE2B 96596d5ed6b726d26d1fd810899d670aa0a16deb1f7435408fd3c815a7903fbe5bf1ec3c703099bc5a0b673a2842fa1e210f8be9eca927a91fe14219a74487a5 SHA512 4235f69d1569e7876eae13ac7552df5c393658574a7f4d936f3b6371a973ec2d7af12bb1a673f38cdbf3c6aa5cce6e010a4630f9fe895298fb611ac40262b9ec
-EBUILD joda-convert-2.2.2.ebuild 2019 BLAKE2B 6f1fb5bca8a23ffe7896683703ca4661cd136b0d7bff43cfe7d8890e9e0474b373d226a20692dfe91e7e2ae748f3555d33af453c8f1efd6752757d3a61d859a3 SHA512 cc6ae8c344abc89c76b24f10020dd7e9bf67e251356b7b0a32c71d8feb765766dcdd7471eb98a450b7c60cbf7a860b21f8c3859d63b3a3caf5ef3be2b2b37f8b
+EBUILD joda-convert-2.2.2.ebuild 2015 BLAKE2B 539a3f32140a5796cef6e0dd083dcf26965d68662d5a77e7a843dab9007ea1e4f4f58c8c75f9be2a06807286c2259fad6b0dc07a5e211a5c0cd4174452ad92d6 SHA512 667bb9c85af1ef67a9f3bcd3eb738ef488202f4daabbdaba940f44e1f4d4b61392a77a17fbe03095eba111cfa2590efd39e088eab38f4cecc6c56f77cfddff98
MISC metadata.xml 390 BLAKE2B 50a8eb1f9935a4b0bc775f4c5f069df312da8aec16f6aeb6fb9c66df41f1af3ad4b3a06697e7a2d660275f6cdb19571b99b6d2a9d7418c7d4d9cb177e7660769 SHA512 da06cf231ded50201b189737b5021486c4ec324f6f7e6eb5df1ed2f1ae67a29bd529d4f108eb904c6820994c960c7c6523d69f70378f5d928286736c4ce78cc0
diff --git a/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml b/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml
deleted file mode 100644
index c66dfec9c1d7..000000000000
--- a/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml
+++ /dev/null
@@ -1,248 +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 5/9/13 4:18 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="joda-convert-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-convert-1.3.1"/>
- <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.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"/>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/junit/junit/4.5/junit-4.5.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.6"
- verbose="true"
- fork="true"
- source="1.6">
- <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.6"
- verbose="true"
- fork="true"
- source="1.6">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- </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="**/Test*.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/6/docs/api/"/>
- </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"
- manifest="src/conf/MANIFEST.MF"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </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}/junit/junit/4.5"/>
- <get src="http://repo.maven.apache.org/maven2/junit/junit/4.5/junit-4.5.jar"
- dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
deleted file mode 100644
index 97c617bf57a4..000000000000
--- a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 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="Java library for conversion between Object and String"
-HOMEPAGE="https://www.joda.org/joda-convert/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="virtual/jdk:1.8
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-RDEPEND=">=virtual/jre-1.8"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-src_prepare() {
- default
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
- dodoc NOTICE.txt RELEASE-NOTES.txt
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/joda-convert/joda-convert-2.2.2.ebuild b/dev-java/joda-convert/joda-convert-2.2.2.ebuild
index cfbe6aea21f2..cd9779ad6bd8 100644
--- a/dev-java/joda-convert/joda-convert-2.2.2.ebuild
+++ b/dev-java/joda-convert/joda-convert-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -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 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index 57d0d24bb6d3..94e34a5ecd03 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,5 +1,6 @@
DIST jopt-simple-4.6.tar.gz 107082 BLAKE2B 622144647b24049861398cc99ca3cc268baae045f8ca23cdd5bddb2e656bc97d17397ae752ca9a6edc91b8486e1e55ce19ba335d2afadf6c6df4f858faf43a1e SHA512 c2f467521f6419f91206f6036d420671b02106beadff3fc51d1893e6f3f6302b8fcbb31957327b9e40cbfd7a7d55030e0c999d9570d7e29fe7a4375bab10ed76
DIST jopt-simple-5.0.tar.gz 119502 BLAKE2B 975a0d338fa3154963954fd3b218c944dded023b3a2da59ee2671c73450a578dbf1aee8e52b9f715839e15c1937e0a493c4b37518b73038aa017e1d0ec1ca06a SHA512 f440c62cb307aad7cab64f091c82f78e11a117e60aaadf71883c149a622576531272de3d67859f6df093df658bb0bfb435d9bb33bc729bcda24dcc99d27369ff
+EBUILD jopt-simple-4.6-r1.ebuild 582 BLAKE2B 5c3e60b45a2dbb0e397135d46a05937b429f58ecc00556a1ba04a0a8e6ad0c2fe3bffb4f8046dd250152965cdae7114351091f4db69fb7135a728971d0501ecb SHA512 6c58fb86948bf172dc0449c0f87c1d6d957f0e7ac9e8639775028fa823eb795e8252ee483f88acb5b9d31f39f1dbdb41ec6d85e6907b2f9e138f9a0d05f2eaa7
EBUILD jopt-simple-4.6.ebuild 654 BLAKE2B 0a19b2700df2a68f66a1506f7d877592154af4a11c645919b49078ba316f6e2fd1cf8ef76fdaf3ebfa340eb54611d4168ca5af778caba88dd5da91c21a6acf0a SHA512 d541d7380cb483c18d99fe5048a05952d8afad088f26783e1cfaa0968369d6deec10031abc180feb3e7d154b811bbf78df44d0d126e1f891cde5dabe31ee50dc
EBUILD jopt-simple-5.0.ebuild 648 BLAKE2B 137db3a025327e0e9cc2c57c465f9f8734f523e350ad91263f33ffb3edb761ac99c9f84a897a60387694a61d5cb46c67dd12579dd68dca8321b5e70428ac1934 SHA512 3c2863dbcc4613fe33bdf4e3afac16d8f006e0c958315ad35cfbfb4428a519cf743a2532f8a831c37fc0a5bad7608daecd2aac27fc23588e4d8a95bdcf51903a
MISC metadata.xml 321 BLAKE2B 1165369ebb01fa6f8d30370de45e8b6dbfb6bd57687593395213e2772bdd379a0f4adefa0901f23e79262c6803ea3544b0127fc1e5f5f2a00e3523ef26ad2ce9 SHA512 9306c4766bac17556a01b019139fcdbebdb08ee1f0b56adcf4ffb25805075ae2d5d5007659e897418da012ee05157cec8cdc119715bf88abd8a00a6a7661b89e
diff --git a/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild b/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
new file mode 100644
index 000000000000..ba73eb0fea10
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for parsing command line options"
+HOMEPAGE="https://jopt-simple.github.io/jopt-simple/"
+SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/refs/tags/jopt-simple-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4.6"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+
+S="${WORKDIR}/${PN}-${PN}-8808a39"
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index 9f5c058a3d6d..a8028cc9e06f 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,4 +1,6 @@
DIST jsch-0.1.54.zip 365455 BLAKE2B 5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e
+DIST jsch-0.1.55.zip 369664 BLAKE2B 4a35845e7b9e57c64a890547b2cabdec5bd03fa462ac3c78d8bcb757dbd5b50b366d41c042e904e44b967c85da01396c7dd085b8fe5f69ad243237fab38fa1f1 SHA512 334b550594272fe179f13fb6bbfc0a353334586786db2b3279608b85cdab3dd604e6dd04aa2376b5532816d906133e636b5359dda36c449d90173be501c61418
EBUILD jsch-0.1.54-r1.ebuild 1234 BLAKE2B f6a4146afce8d015bb762ba9c023ea866f5c6379ff295a7dc279693c397432c516dbfdb6fbf0b80657d6cc800d5890bc96daa1293c9ccf264dc78decd43336fa SHA512 e6876ac8e6adc5a4bcf4b1333e5a45f8f6b57992fa4dd0a1e8abedcb60c98b09c9bc73c0b4173a09f95309b4250b4746c767eaae706a44cec5125c94c1c10930
EBUILD jsch-0.1.54.ebuild 1202 BLAKE2B 118bff8b932f70f9fb70f2aab5c934870e89a806c3c8620554093735a2a5c0f6b7341737edbe0784fb215a8c8a18649d26aec29da1c3485b4d7d0621df0d49a2 SHA512 b0b9e7253f695136afbddf241a8690aba1790301dc849eb30f3fd3dd5d319efc1f8e3395f8da6eeed6764b55e72669f08dceef009eaa83196496c5046b30b3fa
+EBUILD jsch-0.1.55.ebuild 947 BLAKE2B 30118130bda8c22499e0e57b6e628b403999db507fd2e3bf61e04fcb0e8acdbf2e3d1ea11133ce23a33db20d2bec702a2b11930a9e91d5693267e52c83a902cb SHA512 6fcbf7a3e817850c4db9aa60a5937b1eff02149fa5e1d7a2b6a8327a503444ad02b33334e26823beb4e7445fa8480894b3a1f8b9aaf7624ff285f4f4fd3a1ef4
MISC metadata.xml 311 BLAKE2B a694ea0db3a5ed039fa56b939a9473672f07c927a6a9ca818ebe826b3a388edf16dfab642179044114bf6b0e7274a959b18361097d72207da5fba4a724781efa SHA512 7dfed16685de8168719b2874d46624ca519933aed410c451d77caf0811dee59391c5fcf05e390dd32f7bf4a1829d5bc8b810b7b7d993fa807d897c86961592d9
diff --git a/dev-java/jsch/jsch-0.1.55.ebuild b/dev-java/jsch/jsch-0.1.55.ebuild
new file mode 100644
index 000000000000..4e12aeb3d7a9
--- /dev/null
+++ b/dev-java/jsch/jsch-0.1.55.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom jsch-0.1.55.pom --download-uri https://repo1.maven.org/maven2/com/jcraft/jsch/0.1.55/jsch-0.1.55-sources.jar --slot 55 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jsch-0.1.55.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.jcraft:jsch:0.1.55"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JSch is a pure Java implementation of SSH2"
+HOMEPAGE="http://www.jcraft.com/jsch/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: ${P}.pom
+# com.jcraft:jzlib:1.0.7 -> >=dev-java/jzlib-1.1.3:0
+
+CP_DEPEND="
+ >=dev-java/jzlib-1.1.3:0
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
diff --git a/dev-java/jsr305/Manifest b/dev-java/jsr305/Manifest
index fa0eaaf7fc3b..ffcafbb53ef9 100644
--- a/dev-java/jsr305/Manifest
+++ b/dev-java/jsr305/Manifest
@@ -1,4 +1,3 @@
DIST jsr305-3.0.2.jar 18102 BLAKE2B fa6c40a63eb3e4683ae70612058420a905428b9ac9b920b2f7f4024579a5ff6fcffa576d50a616ed585b4896cbba87f4496273b860930f047184cf5df77004d0 SHA512 02327071dde09470c8cd0fe39405263146d7e86b15312bc3f909c6a6fa9b11c730bdb833b6cdbdf1aee0c6553e519cecd0257a296947f94636650e88cd8c5b79
-EBUILD jsr305-3.0.2-r1.ebuild 521 BLAKE2B 15c5a1debaab56264a59c23036f063d88de4d3073cd9073bfe71bf9f85c24240bd9088efa7e07c9af22d7cad00fe74995955712ec8f4c38c92c8d0e5b53d1eec SHA512 fa4059c90426c8c422f7d4be83aaf1306fefe54468a7dabba86ca252db3fba2fa61a0011a9cd196fe55a317939e7e22bddfabff005a0983f34d9bd2527fbfc72
-EBUILD jsr305-3.0.2.ebuild 513 BLAKE2B 79d4c6f14f63091c21a709d7829f3fa49351a6953c81b30ff028beb34f2cc60144804f15f4fd63055b2c98c548d169f1997391f567618ff32c8bdb1d37c6b2a0 SHA512 6a08283a0dc7209b71ce0a2aff1bd151d3f82c9aa8b2060ccdcc00a7164042f213b2d441c874792ed7f0d102fe1250a3ea50c115205c2589c0656cadf8629842
+EBUILD jsr305-3.0.2-r1.ebuild 517 BLAKE2B 0c2ae16d235b071cf2f80c72b3ed78ebfd42a21724a2ba17e3490b8fc848e18f019c3c1eca5e0c0e642adc642fc627d3b5470dc742b16966fee73a81319bb3f3 SHA512 13c4b6f38bd729e68c5d294630f8d68a90598bee319320200ac470fb555849a7e13d0248873b356c6d2beb988bf7b954e5feb5681740fecae58ed8710f59ad61
MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/jsr305/jsr305-3.0.2-r1.ebuild b/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
index c8e7a9887dec..64422a96b284 100644
--- a/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
+++ b/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jsr305/jsr305-3.0.2.ebuild b/dev-java/jsr305/jsr305-3.0.2.ebuild
deleted file mode 100644
index ed03d8e64d3c..000000000000
--- a/dev-java/jsr305/jsr305-3.0.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Annotations for Software Defect Detection in Java"
-HOMEPAGE="http://jcp.org/en/jsr/detail?id=305"
-SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr67/Manifest b/dev-java/jsr67/Manifest
deleted file mode 100644
index 2a9f6aad4163..000000000000
--- a/dev-java/jsr67/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jsr67-1.3.jar 327033 BLAKE2B cdfcb6d600a3b6cf6d355906eced551053f2cf608596dacfa477337d54eb47ef5dd6d87f508c59587453972d0eb547e6d6863ff57ec1d3c9e366f812c05a87c4 SHA512 c4145e5870af677542a09a17b7b57d9e5501f6354b26743b9eb9946dbd263114eb705c023af996ddcb256961df28a7ac2420a54fcdd69f73c8595901ee21760a
-EBUILD jsr67-1.3-r1.ebuild 551 BLAKE2B 625582c872f76bed715843e53df91e15213612ddc7c0617ddd0847d443bb8c00b4616d68e68cc4fe1d995fc23794a0ae004e57510d4e27c53f845583bf544bf2 SHA512 e166b2b9e1ab8757b8d56dd057a78c1e03efd88f1aedecf90d3f0d94789f9142b7e7e564dca146376e7d4a0b7fa0d2fc6657216b14219d071d6acf4f1cbe1930
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/jsr67/jsr67-1.3-r1.ebuild b/dev-java/jsr67/jsr67-1.3-r1.ebuild
deleted file mode 100644
index e9e87397f717..000000000000
--- a/dev-java/jsr67/jsr67-1.3-r1.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"
-
-MY_PN="saaj-impl"
-MY_P="${MY_PN}-${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SAAJ 1.3 (AKA JSR-67 MR3) API"
-HOMEPAGE="https://jcp.org/en/jsr/detail?id=67"
-SRC_URI="https://repo1.maven.org/maven2/com/sun/xml/messaging/${MY_PN%%-*}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-
-LICENSE="sun-jsr67"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr67/metadata.xml b/dev-java/jsr67/metadata.xml
deleted file mode 100644
index 6ef2d50cf07e..000000000000
--- a/dev-java/jsr67/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/jython/Manifest b/dev-java/jython/Manifest
index 2ceee8cb0b37..5221e2580e81 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,5 +6,5 @@ AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd
AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18
AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
-EBUILD jython-2.7.0-r4.ebuild 4332 BLAKE2B 4229853c93a65766d19b08ed58e73534e8116c9f915ea9eba7293f422a27af00713d6c566b0cdd1952b9dfcc41127242b356916c217f1ad3a25859dea99eb99a SHA512 6930f9c5d28ccc356c9853caa4cbcc7de8c9e27ce395c164652202d71f3a94bc007d5850ad0b9527b41e71a85222566c4754f26b25c23bbf0705ef1df752ee37
+EBUILD jython-2.7.0-r4.ebuild 4304 BLAKE2B 9ce5b05684c7783b879672eed0fda0773fea00305d77d890283575e2a17ed006ff578aff8286bf24e42580d6345e12e6d9da04e57869bef46335f2d023f5d2f1 SHA512 6cef3e75fb9aac56f970439b331ae91702257ed405106781913f4d1bab1c03a55017bf9366ba0c0f366f94cdd4a2958933af4640985bcd74460627460c094c7f
MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild b/dev-java/jython/jython-2.7.0-r4.ebuild
index c24d236dc549..9a24865883be 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -33,7 +33,6 @@ CP_DEPEND="dev-java/antlr:3
dev-java/jnr-netdb:1.0
dev-java/stringtemplate:0
dev-java/xerces:2
- java-virtuals/script-api:0
java-virtuals/servlet-api:3.0"
RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
index 911d6c0e530f..bfb588e7183e 100644
--- a/dev-java/jzlib/Manifest
+++ b/dev-java/jzlib/Manifest
@@ -1,3 +1,3 @@
DIST jzlib-1.1.3.tar.gz 139424 BLAKE2B cae5f0f6ac8efd99cc916e8cc087280be84e1a2a8b43b8932dc68e2393ac5f1848e4dac1759aa75a54123adba63956463719aaa469ed88cf0c609eaa63647e16 SHA512 d78ed3feaded0bde62b3e2c6fb17b5051a6637bcf12e7fe0f5b1855922358b54b440b05bdba7328c5d2cb9f972bc68195f8f0570ce5d49de9251d7060018d88d
-EBUILD jzlib-1.1.3-r2.ebuild 1324 BLAKE2B cfcb86f96a0f49687e8d2c9bcda9488640d2c88c7dd053ca0bdcdefa8238668101e1cb8862f6bdbc7771b88fc21374f93944d0e2cc9f639908e137138fcb86bf SHA512 101d00a501904b1cd151dee8617fb8b4cbfd0858db905dbd93086148700e75bd3cbd0b543fcd0737d9c564a372af3b9c19da9852c3dc53469a2d5d6df0fae378
+EBUILD jzlib-1.1.3-r2.ebuild 1358 BLAKE2B 0c0daf567ac8a212c23f57b9d20eccca3205e4c1781de8c6cb463ac3cb8be5d172e76ca2c6cf1ab986d8d746aa804de739e779d5d509856fd3f26c1af7f495c4 SHA512 4525ae6863a81ebc1fe3a1054c0d49215bbd0c93c2b32598c48ebb5e385cfbc9d1ec52dd1f938e807c3c169d8d0b7b36cc059f1bc706933cdd3a6eb12a8595a9
MISC metadata.xml 322 BLAKE2B 6222cc2cd2fa5edb23a097bd254a7b7d8f7a4bba7dcda28b0435f1053aa990293d224851143662f2c9cbca6d48bb3576c40d357746cae77c02bd60404ce25c7b SHA512 d775e95ea730463fa57323f5cc0b00488790de6bb13e4aeb0941660573c385c1bf2045fa765b350e00fcba2f6f2035a6871b717399616bbc184222ae6b8fcc93
diff --git a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
index 1cc6a85d66ad..89a304b848fb 100644
--- a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
@@ -4,6 +4,7 @@
EAPI=7
JAVA_PKG_IUSE="examples source test"
+MAVEN_ID="com.jcraft:jzlib:1.1.3"
inherit java-pkg-2 java-pkg-simple
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 4445a16e03b1..738eb38c2b5b 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -4,4 +4,4 @@ DIST mill-bin-0.10.0 65538437 BLAKE2B 1c3583e34a0bea381b6368acf00936adaace5cf3a9
EBUILD mill-bin-0.10.0.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
EBUILD mill-bin-0.9.10.ebuild 462 BLAKE2B 0b33b8aea299741600f108c52c46408ec29442b91cc81716a5c7d7c07face2135d51a9ba107e71711528f9971588d2bd1959aceeeb44ba68b477a7008d027c88 SHA512 de66509bb517bbdb36f1b1fb6c9f64871ace3a859e7d33b552a27685f341ffb95ae3360830ece8fdea7521a2dcf6fbdbba7a1f88aff65eb01644e40fe558f2a3
EBUILD mill-bin-0.9.11.ebuild 463 BLAKE2B 76b3ea412b568cc70308b150c92a97792c3eb49cf9c94caa850d92732f658de051633ad228cd9292a5bea24106340bf1a1306f8517e62d7384d4273d5e6a6d99 SHA512 93dfb789423caa0d06876350adcd789b48e79ad2b6722972f509c67366eb03f69010f6700b629d0632b3cdaf0c813776dabcf13e1c1be2274aceb6ba246c58dd
-MISC metadata.xml 246 BLAKE2B efcbb4db7ac6eb97dc4625930f11c2d780be8fb04e89f2a6d7ef4a853f07b59b3058542d61769f3185b626f35bbe09bd6ee9e34323cef4239f1241dc3ff160ca SHA512 92d34b6d6b6116064cbdd8c79bba97e2f60f56a078c70efbbe87c9cd90cb96bf4522fcf437075bf30417e2ef20f696e6cd4e586203e85a00269aca13f1fb23be
+MISC metadata.xml 247 BLAKE2B 4e1dbdae308a736b571e2a7ab4a90c650461771c024127c95a33990f3973331ba5de3cc8fe960115af9bb06f49908d258211b2a4e07c0f8d2a9536c965d836c3 SHA512 734659aca9188fe48564f64e23622ef0201931c75e1306043902fcf487a4155e8027a378872a48c7e34a903cdd0363a8e237b0965b7f532f80eaf38353940dbc
diff --git a/dev-java/mill-bin/metadata.xml b/dev-java/mill-bin/metadata.xml
index 7a926064dca8..75209e7cb520 100644
--- a/dev-java/mill-bin/metadata.xml
+++ b/dev-java/mill-bin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type='person'>
<email>flow@gentoo.org</email>
diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest
new file mode 100644
index 000000000000..c277bbdcb020
--- /dev/null
+++ b/dev-java/mvel/Manifest
@@ -0,0 +1,6 @@
+AUX mvel-2.3.2-ignore-failing-tests.patch 1722 BLAKE2B 030a8ac91262dda0af70dd73b0a08e61ac050e1667805a2173a0408ab03d8e8fc0b423f10eaeb6feeabc8fb19ed9e35a596120d30f76b73e54c1bcb270b31516 SHA512 6957dde066890fb44d664ffc95029871336a25a4fc92a05f6f2809d35574c06af75909ca2d4abcff7a3f614ebeeadedad3e4da5d3b723b9afd4a23f7f99cc55a
+AUX mvel-2.3.2-update-supported-java-versions.patch 1982 BLAKE2B b32623d0b8bbedf339b34fa7d07b15f3089ea2c1fe52e78852fdf4c82f42eaabae1e29c9d0bf781e28700300a26905379a39767795eecb8bd43a31d8e82c3d0e SHA512 b4441c6dbe721e54e34658d4a04090898ec1a9dcd38638f0fffbfc344889820b3f8138328c05777c5e9b51b4e05e178e9da35a6404fb183b307b9b2742f2ce4b
+AUX mvel-2.3.2-update-version-in-output.patch 1150 BLAKE2B bd69e3a534d62ce7fb822dfd3952490b13986526b2dfc745a1c8d286348dbd4b6554b83b9675de6f497a07ee17f129f98519b41258170df69aa81e2326fc85fe SHA512 762703a7886748a48c10ddc81f25ae545c486a5a00413b1d89e787ce9adebeefa26d9dcc4731c1c8a17957330570a6e6f73e0a1befd6b14db6c97ba150527e5f
+DIST mvel2-2.3.2.Final.tar.gz 2405839 BLAKE2B 5f12652a0f4375f6e24f18313d99a02bb86463cc1acc2f8845b815c9c7afcda410d67c9f1c30544f9ab1cd50a48ce0ab72e9cca94faafab776f3704b1d5fa087 SHA512 9d1c92bfe90aa4cfe5f4bbdd7eef2060bfaec3979c5c07a5baf3ddb4d84a00632dcaec266bab675b31d5b745bfa36a89dd5969ababeb64332069939a4df23dbc
+EBUILD mvel-2.3.2-r1.ebuild 2554 BLAKE2B 4bea05dc8c5319def73c2bda474246d3d013982c8cfd482e96c060bbd8d97e70890d069bc02616e3bffe50e13f4303f7a03788001c95082da21a1697d96d343e SHA512 aa73c6edc34584f271c7ca3c21e575710621688162ed6ae0fe508b0bc1bacc8fbac76c2ec109c64e6caf1d01ef076665a876d8105c5a2598dbe889bd9088a865
+MISC metadata.xml 311 BLAKE2B fd4a83fa02a7d87a3b03c3b99b99f0e87b2dbe54b45eb00172999f629712e499aca3dfa631000d92ba51c1303dacea1499cf0394af8aab8ac53610b6bb7c31d7 SHA512 6ecb610dd945d4cba9764e55ffe05e896536d1deec4cdaa18949943fdb2e7e953f167f87599b4d6ebb16ee85c19e23da63217c4063b8553fa45ecf0680589ed1
diff --git a/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch b/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch
new file mode 100644
index 000000000000..1cfd9e8abc36
--- /dev/null
+++ b/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch
@@ -0,0 +1,43 @@
+From fcf12bd0322556b4396a72a5402124d9543781d9 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 16 Jan 2022 09:48:48 -0800
+Subject: [PATCH] Ignore tests that fail even when run by Maven on JUnit 4.13.2
+
+To reproduce the failure, make sure to edit line 249 of pom.xml to use
+JUnit 4.13.2. Note that the failed tests are JUnit 3 tests, which
+cannot be ignored with the @org.junit.Ignore annotation.
+
+When no tests are ignored, only testMapAccessWithNestedMethodCall() will
+fail. However, ignoring that test will cause
+testMapAccessWithNestedProperty() to fail afterwards.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
+index ea7661bb..1c92c327 100644
+--- a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
++++ b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
+@@ -3431,7 +3431,7 @@ public class CoreConfidenceTests extends AbstractTest {
+ assertTrue(result);
+ }
+
+- public void testMapAccessWithNestedMethodCall() {
++ public void noTestMapAccessWithNestedMethodCall() {
+ String str = "map[aMethod(1)] == \"one\"";
+
+ ParserConfiguration pconf = new ParserConfiguration();
+@@ -3446,7 +3446,7 @@ public class CoreConfidenceTests extends AbstractTest {
+ assertTrue(result);
+ }
+
+- public void testMapAccessWithNestedProperty() {
++ public void noTestMapAccessWithNestedProperty() {
+ String str = "map[key] == \"one\"";
+
+ ParserConfiguration pconf = new ParserConfiguration();
+--
+2.34.1
+
diff --git a/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch b/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch
new file mode 100644
index 000000000000..d019002cda1f
--- /dev/null
+++ b/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch
@@ -0,0 +1,51 @@
+From 04f476bbc3768d9052ae9c8a1b0aa53340a993b3 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 16 Jan 2022 08:01:46 -0800
+Subject: [PATCH] ASMAccessorOptimizer: Update supported Java versions as of
+ 2.4.14
+
+Squashed patch of the following commits:
+
+From: deaddowney <spamcontrol@mac.com>
+Date: Fri, 22 Jun 2018 09:38:24 -0400
+Subject: [PATCH 1/4] Mvel not working with Java 10 (11) GH Issue #159
+
+From: dieter sauvillers <dieter.sauvillers@corilus.be>
+Date: Tue, 2 Apr 2019 10:20:31 +0200
+Subject: [PATCH 2/4] mvel does not work with java 12 #185
+
+From: mmelko <mmelko@redhat.com>
+Date: Fri, 26 Jun 2020 08:55:24 +0200
+Subject: [PATCH 3/4] Fix building on java 14
+
+From: mariofusco <mario.fusco@gmail.com>
+Date: Mon, 24 Aug 2020 08:54:22 +0200
+Subject: [PATCH 4/4] drop compatibility with java versions lower than 1.4
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ .../mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
+index 45520538..4c4c876e 100644
+--- a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
++++ b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
+@@ -118,13 +118,8 @@ public class ASMAccessorOptimizer extends AbstractOptimizer implements AccessorO
+ OPCODES_VERSION = Opcodes.V1_4;
+ } else if (javaVersion.startsWith("1.5")) {
+ OPCODES_VERSION = Opcodes.V1_5;
+- } else if (javaVersion.startsWith("1.6")
+- || javaVersion.startsWith("1.7")
+- || javaVersion.startsWith("1.8")
+- || javaVersion.startsWith("9")) {
+- OPCODES_VERSION = Opcodes.V1_6;
+ } else {
+- OPCODES_VERSION = Opcodes.V1_2;
++ OPCODES_VERSION = Opcodes.V1_6;
+ }
+
+ String defaultNameSapce = getProperty("mvel2.namespace");
+--
+2.34.1
+
diff --git a/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch b/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch
new file mode 100644
index 000000000000..8b7250540b05
--- /dev/null
+++ b/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch
@@ -0,0 +1,26 @@
+From 0a316a5cb0d889220fb3e730ea1471c1b4052736 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 16 Jan 2022 10:21:47 -0800
+Subject: [PATCH] Update program version shown in program output
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/main/java/org/mvel2/MVEL.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/mvel2/MVEL.java b/src/main/java/org/mvel2/MVEL.java
+index eafe17fc..6bbf5f06 100644
+--- a/src/main/java/org/mvel2/MVEL.java
++++ b/src/main/java/org/mvel2/MVEL.java
+@@ -45,7 +45,7 @@ import static org.mvel2.util.ParseTools.optimizeTree;
+ public class MVEL {
+ public static final String NAME = "MVEL (MVFLEX Expression Language)";
+ public static final String VERSION = "2.3";
+- public static final String VERSION_SUB = "0";
++ public static final String VERSION_SUB = "2";
+ public static final String CODENAME = "liberty";
+ static boolean DEBUG_FILE = getBoolean("mvel2.debug.fileoutput");
+ static String ADVANCED_DEBUGGING_FILE = System.getProperty("mvel2.debugging.file") == null ? "mvel_debug.txt" : System.getProperty("mvel2.debugging.file");
+--
+2.34.1
+
diff --git a/dev-java/mvel/metadata.xml b/dev-java/mvel/metadata.xml
new file mode 100644
index 000000000000..74329d8771b3
--- /dev/null
+++ b/dev-java/mvel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mvel/mvel</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/mvel/mvel-2.3.2-r1.ebuild b/dev-java/mvel/mvel-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..0b93cdde5b40
--- /dev/null
+++ b/dev-java/mvel/mvel-2.3.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.mvel:mvel2:2.3.2.Final"
+
+# Note: This package has a mixture of JUnit 3 and JUnit 4 tests, all of which
+# can be run with JUnit 4. As of January 2022, JUnit 3 test launcher will only
+# run 2 tests out of nearly 1100 JUnit 3 tests in total, whereas JUnit 4 test
+# launcher can run all of them
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="MVFLEX Expression Language"
+HOMEPAGE="https://github.com/mvel/mvel"
+SRC_URI="https://github.com/mvel/mvel/archive/refs/tags/mvel2-${PV}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
+
+JAVA_SRC_DIR="src/main/java"
+# Required due to use of '_' as identifiers in source files
+JAVADOC_ARGS="-source 8"
+# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L131
+JAVA_MAIN_CLASS="org.mvel2.sh.Main"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
+JAVA_TEST_EXCLUDES=(
+ # No runnable methods
+ org.mvel2.tests.perftests.CompiledPerformanceTests
+ org.mvel2.tests.perftests.SimpleTests
+ org.mvel2.tests.core.MVELThreadTest
+ org.mvel2.tests.core.res.TestClass
+ org.mvel2.tests.core.res.TestInterface
+ org.mvel2.tests.core.res.TestMVEL197
+ org.mvel2.tests.templates.tests.res.TestPluginNode
+)
+# Significantly speed up test execution
+# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L158-L171
+JAVA_TEST_EXTRA_ARGS=(
+ -Dfile.encoding=UTF-8
+ -Dmvel.disable.jit=true
+ -Dmvel.tests.quick=true
+)
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ # Fix org.mvel2.tests.core.PropertyAccessTests.testMVEL308 failure
+ # on Java 17, caused by java.lang.reflect.InaccessibleObjectException:
+ # module java.base does not "opens java.util" to unnamed module
+ # https://github.com/mvel/mvel/issues/282
+ ver_test "$(java-config -g PROVIDES_VERSION)" -ge 17 && \
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+}
+
+src_prepare() {
+ # Clean up bundled JARs "manually" to prevent
+ # removal of JARs under JAVA_TEST_RESOURCE_DIRS
+ rm -r lib/ || die "Failed to remove bundled JARs"
+
+ eapply "${FILESDIR}/${P}-update-supported-java-versions.patch"
+ eapply "${FILESDIR}/${P}-update-version-in-output.patch"
+ use test && eapply "${FILESDIR}/${P}-ignore-failing-tests.patch"
+ java-pkg-2_src_prepare
+}
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index c2f70d24a234..c1936d9f021a 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -1,4 +1,4 @@
DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
EBUILD netty-buffer-4.0.36-r1.ebuild 2407 BLAKE2B 07c5964301e29d90c755e2c89146f3717fd6ad3d7f8a589637b643478fc16552121047a37abc24f8e3a7f2b492c166d6e8c72449ffa59c85e0191b9ba286fe0c SHA512 ae9862f62ca1ef0c9630da502b27c97e751af7948d7288c64be458fcb9650a5e68bef83c0b701b4d64dbd6d8ac4de6ce3ecb46dfeba1515949f3e211ed7f96a6
-EBUILD netty-buffer-4.0.36.ebuild 1269 BLAKE2B 909d89bf881f11adde18514d4596cd5e76a2fe07f4bb850ef57ead6c7ef74b3ce85f9bff67ade45e795b1b607ece8bcb912ba4f5090827c630d6cb917c30b595 SHA512 2b0f7dc60868f8d6a0b0181b58602efbb2b56c6862808a82ccfcae9a4a10a2a4647ecea17405a8eb0c01add98369fd7a6441a3124aa38afd367e1e5d7e8887cf
+EBUILD netty-buffer-4.0.36.ebuild 1268 BLAKE2B 5bb1f0d8eeed9b7302e9bc9c39ad651301946fbd537ceb223d9b6891aff14d9a3fd2658bc24cb614203c591719441dc34a9fb0a8385c06a718ae0a916148837c SHA512 aaf94d9462f1868372d620cb7aaab5b7d326aa2bbeec45f092ae48dab0d9378a759bb0d11eba9f2697e28cdb0a2f32df29ca30368a66abb8692d61def81f0d99
MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
index 3420d2a1d621..dd39ef8af0bf 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index 41aae878bb20..58fee94589fb 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,4 +1,4 @@
DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
EBUILD netty-common-4.0.36-r1.ebuild 1985 BLAKE2B c7cf7c00ae6c9e38070f469fdd3b15941b3f9d2e52282602dbecd4c923ce847417cafa7af247145fff8eed8fe82208e61a9f56283ed82c061a11953e7afa29d7 SHA512 eea2879c06b4d2eb695cb9f24a1275d2b78408a986a5f845fdaa1174c8bb50ab3807f78ff3ed9ba0d01403bb1086ee8c4fc9eb0e777f8910b615a1d8c97692aa
-EBUILD netty-common-4.0.36.ebuild 1604 BLAKE2B 1fd6224706f910a51e93b64603e2866912893b0083bdcb1ac4a4171a5bf2e12b772663120c8aa80e167478f3c40c5d76ba44609f2760e31e33463e6e169e2626 SHA512 ac48ea4c6910645f0db1831f41f49ed7ed304ce26267c3311fede9d70b3694f55438d2cd207a48aade49148d7412afde4eb79529c971ac7a4552da9f4f344742
+EBUILD netty-common-4.0.36.ebuild 1603 BLAKE2B 20210d9a3d5f26ca914d2ca739c59cfe2ebeac66ba59f1d7a8a00cb0b2cadf0e146f341d3c79b6de762513f89bc00c8fc42df8bd29b80297d810dde211299920 SHA512 d5aa89abcc60bd5313693773b9a24bd0fcde2ad7623f246fbad156c7251831507dbfa6d671fcfe1de0957ce8c165e6e04079df93881bba0c5730dcdf2e70fde0
MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-common/netty-common-4.0.36.ebuild b/dev-java/netty-common/netty-common-4.0.36.ebuild
index b88719b4f10d..6abc0507c74b 100644
--- a/dev-java/netty-common/netty-common-4.0.36.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
index 186a3c82bc3a..0890ffc89001 100644
--- a/dev-java/netty-transport/Manifest
+++ b/dev-java/netty-transport/Manifest
@@ -1,3 +1,3 @@
DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-transport-4.0.36.ebuild 1728 BLAKE2B 91fac677251c251c8ab028cf33f7be732aa23cf803327a133dbf0e259404bfb07cb21814d9584151ffb95224b01cb5581dbb15ed1d190cad94d44eac26e641fc SHA512 e2e91bd50ebdae0ca49583cc32fa401bbf91293aa0b6f7598d5fbd22256b9e1ca3f35baa50d8fed47fabede0a53ee357d9e49a3db72459977bf239bb653bdbfa
+EBUILD netty-transport-4.0.36.ebuild 1727 BLAKE2B 04117cd53f909636b4d76da59162430eee9c9906963f8733fad703af701a39c1ca94ef0125af1d3a901ce905b00f65ce5bae1fe3f6e7ba6ebe8d0487be3bda04 SHA512 92b313780edad4666f80d18c927ab4c0af1d131c2b5b02c23b62404ba9c341f1b03502eb3585542be834402d630e69f7e8990561bc9f3d8c613054fb63f17e4b
MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-transport/netty-transport-4.0.36.ebuild b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
index 7939e8969570..a88cbd296c0a 100644
--- a/dev-java/netty-transport/netty-transport-4.0.36.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 11aa7e77e6ad..121eb9e1c719 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,26 +1,45 @@
-AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
-AUX openjdk-bin-17.env.sh 496 BLAKE2B ccfd99807b5b5990381c8be464d5084159bde9a39872b468eb00acc1832a465cc0ad70bb1e9c97e7632e86ae9854a7f2557f8994e18219c52f281908e975151c SHA512 3591f5b574ab0eff5b414a9414f114c1bc863427144847229041ee0fbab22a925c24b8c3b7b057a6c3d34dce4a9b5aff0c60caeb1dd6d709ddd63aebe870e336
-AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
+AUX openjdk-bin-11.env.sh 503 BLAKE2B 7f7dcdb561612501020b6fa922ad43bab7635796ea2004812f0dbb245d182d9501ec4d4d7497c31728501887168d598aac4561a37f86d4111666fc5a5b4bb1ea SHA512 83a893610b636d0e9f8e13aa5727bddcef1257b37388392945cd137b1efcfd03a325b7b7e5e1437daa27fc373abd0ac675a77e406461818225c66a047e4acf97
+AUX openjdk-bin-17.env.sh 503 BLAKE2B 82823ed5e794188b43bff8bbd644c7796a621275051fd9f68e22b435c75ffb68602af82a8b79d2d76ffb8cd2f77380ecc70e38963ebc8e0e31c2fadcc0f10ce3 SHA512 79a89625c51d4d7f1eb9d976de678347055bbe025b32f76420c8b7fdd7a9f09bc7b57d5d54ee8db9e36be5f7d784cbadd2f1c26b3557936f85ef1d48d6e78c51
+AUX openjdk-bin-8.env.sh 712 BLAKE2B 0b59c28312a5c90e88445c300ae066cc4ed82035837cf47960f481e412848db6e109c87c5e7bd5282a945542f68fbfbe1135730f402768691bded10382acf55a SHA512 831c8993298141679e1aee567e40bebdde65c488279dc8f36565a108c8536a4817420a9721868fb610710dfb58a10b811d7e094ee07e88cfa033d9a347f99367
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.13_8.tar.gz 189667474 BLAKE2B e79c362e30a21871ed56b95a51d17bbcae4d16ccb9f1747c00615537aedaf6b43a675d2fe66638f95d06a7a6bec3c296c5c198ac4595707f434e228e899aec70 SHA512 317cce81d129f823a63d4f1a234826d28bb8e9799b5dcc9c0d6b84fc44d2bab9713875f08416c1db6ca5d8c23bdb63e7837fc640b5931940be365ea059e165d9
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14_9.tar.gz 189849188 BLAKE2B e4d5d5d20b54642cec8941bbfb2a8523ed4f12185bed235d2dded02eca4ef6628ed5b8e36f614278ecad966b2c7cb4ab3b74d696b10718f56faf83834de424db SHA512 299478112d15b335d2cc802e8bcac3a00eb55cfedacbc0c62e462277dce10bfd45de789d760650171a064a574834b2c24e31e70914d63e82362da190e417105d
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.13_8.tar.gz 180757722 BLAKE2B b34bb2c2346609da20bc27db5e1dd0f7aa124ea9ac9e7501ce2a374b61596f96e950a7d69e675dad1dd16037183dbbd155089c6b10d965adff56f000ab19355b SHA512 88500ddbff3c58a69ec450428bfa1ade8e01056c926fbaf77d6908d08b24b0e0536a4d067f32cdb50fb6003cdcc2b22509c5478e080e748c001340334514c711
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.14_9.tar.gz 180888469 BLAKE2B f5fb5a52c4f0b8c997d0a44122262e2754ab0a0adf369d095793ddf07b8189df7f9b2fa6503d5e765b7d0f792d98b88ea1ce7a23abde1c53dc42ffe90e077671 SHA512 a0e9d5aa5d1ccce23f1197e75e412c6a5369e30adcbe07e3c4c4f5b8448d88e0ea68455b42ac766ec825e0076a6d55d82ac745e0081c7ce4a79304f3d623940a
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.13_8.tar.gz 174991442 BLAKE2B 376fe73257f8518599be31262d83d1a01381cd9891fb45c18460bdf33c3569b3032206363593db5b7e3006b895ab855407a1938cbabed0fc58f3bcc86c650cb4 SHA512 d3ef319edc1f29b12e681c09e639cf296ff4e4890c81ecb2c8bb38ea2936f5425ae892420a53db5a0796b192f55a9a8c97b850d8bd400d6d7a8b3c4effc90f34
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.14_9.tar.gz 175127578 BLAKE2B ed7f55434b0273765c78c3efd8a5ae622e2fa7557334af74784f0e99936d489c3d191197fec251a4d8532c66727bdd9188344d3591cce623aa2553e79ee5da67 SHA512 bf4b3f18499420a44ed40fb2d751f294b5354d5b1d278725de97de9be7d2f37fbe5c281c50e33aceebd880d59d35de799454ca0a7bd382b5b3d8729286986d5b
+DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.14_9.tar.gz 192425435 BLAKE2B 3e98f8819bf36aaee0ae009e97c7efa9a26dfc55b856e3d2d098d266621c97b5a8448331888e18eb5a8ea164875020db59cb9be61f3756fa87f9376c2b6e5f6b SHA512 667bc8e6d745c693e5e60e332f491fd485e3f4d99e1543d6e72f1b64956e56b4e6892f3a47e642809378f0a8a8dfaaa034ac96a0aa70b0b7fec51ec53bafbaa7
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz 192958006 BLAKE2B 441d396e0c43c78bb3802800f58779999dfa2275c4e0e0a048e28e3b99a41044b9c66904f1eba435cc22ab1bcf6d6d98723b8b090eefdece4d712279f36a74fa SHA512 abcbc5b781749e3c8fbcfb999e724d4862c03d60c78962d75d31b7cbc71124b04488872bc70f6a6642ec59b6d2289c391b564fc5fd7f465863f96dd4d2b5207d
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz 193109331 BLAKE2B d1f3031c479bc32e3d4d56fb914c33c9e19444ef3b4fd836c52623619872d11cea843904d1425cdbfde2181f41bc63d97c14a479a134ae7280b4b5e49f7789ff SHA512 27d1a8627e6e97d4830f2b8839a7f8455d1e0680853049eb1417f78c5b8e05dc2e8f48520770b422797021a169c80ddbb0c907a5e40e02a4d951a429c5a2c86f
DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz 190666788 BLAKE2B 9248072292727e6ac6d3f1783996c13ad7c78418da444d96e8df3c11ac1f2a7c047dcc16951dbabcfa0e46d7121c91e916940ef0749e982f20b6fc36be516d64 SHA512 603ddb6f01a556040e56a8f1d0769636295e2c1579f07d1f58828ab1db9634cc07cada66496a6144cc6de29469eedd02e6fa788961a9e4e6b5c7c6a5fd94839e
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.14_9.tar.gz 191414234 BLAKE2B abc031558434dc4f800ab2f3251f66cddd49f2296933ae34c58406a1780982693106fe6f37747e48365bd4b6c9f9dd20e0492ddcca62d7e2555df776297d6f96 SHA512 a306fbd6775f4186483e0403f593f599af95e295acc46cba44dd0758dfae8b6a7b1b6ef4581c2ecac1f18b5e98a84e3e3900fae6ca948b74aba2c62a63c00dee
DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.1_12.tar.gz 188878354 BLAKE2B 4e2b4272ae91f12b8a4c7a3c1cf2eab250102ff1590c84f2f3612bc206337477284d63914dddcecd8dc259da1ddd08a1fc6e3c52a37b0cbb5ed0187456c2b24e SHA512 8289fb50b06f08c6288bcbab9e609a24744f123568a901b5ea4f2c1928bfdc236a9a9cfa572708c56f1f7f844b17562f9ddcb502b15df8ac8bc7d1ef758a741b
+DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz 188965124 BLAKE2B 659bf8518b3104e1fedd116cb9af8b0455d323ce883485f5e42cc9d1fb4d9bae5556757b309a7473559bd67c17a9aa0e0c51934e549141b25dcaeb9032a55b80 SHA512 5eadc730b39f6300be7b64a0a4e9d87873cdfa7b0a031923ddfab473affd5b22788a33e2f01412c99c2e42ffb2774cc655c732e7721a6fc02c2b34a42dc9088d
+DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz 182550014 BLAKE2B 24a7aae5c6d282a416c996f6b35ff5c92522ac7853d4cc3248a34f642029fb95b798de3159dcd7ee60a9952dd5ef2926a97c82df0708655044fb4faa6d82019f SHA512 50e27087804582a1b124a17762cf24272cbd24ae1d1bc443950bd91c88da220415ca429894bd1d1172cb39fdbff262470276a3b3e9043b5eabf550c05ee2438b
DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz 188832535 BLAKE2B 4ea2e209f7bebde4cfae439773b42cb9d4143eb5b61a5e69fba181946cd3a3dc977966ed14e24ce6b23066450e64bbf204b72b04562f7af381c765bb4ea31d53 SHA512 615806f02c108c08be70d975f3dc402fc2e30f9a961630fe6528eedb7a5ee76ac07851ada5264fe263453eaefc40aa1ded1cefa37d3455af78b04fdf9caf9a93
+DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz 188894874 BLAKE2B 9881d30cc0b4edc1c3a2d5978b08e820833e82c202f39ddf20600e56c596dc5b53d667eafdeb3048ed59a1d4e13f2ecfa136e123d8ae3f14ce43ece6ede9ab55 SHA512 708aa4a6912970ef6ea88ac3a4fcc04d4adaafcb207837dbe6c1f1e731e87faeb985fc8338a9d59f5637778be40690189c5c936ffb819265b558fc06bee99ddb
DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.1_12.tar.gz 187718236 BLAKE2B a55eeb2651d6fbd83b579527761e246bc3babb3858b7c14823e0d512e308a65be1e35899206c1e2458db74ee2aaf4d69578b4045a13a35a0b3d6577d4821d137 SHA512 5179991d451f8736776de933aa44fa726217282da66236f373a0e47d815d03754f28588acf0aca55258ca1085d0e06f53627092bd0cff2c2b60eb6ff9c1df248
+DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.2_8.tar.gz 189073596 BLAKE2B 1303795dd08dedee8ea4723adaeaae4ab7ef28b81da0f5fd8b19ac5f027ec8f7edb67efe37ca47381a44b4a94223a36d37652a290c2f2cf9702520e01b700786 SHA512 beab26ef69c0ed07a14976c01dad4b2a4d708d04b22c86dabff7b87eaefd8e03f627c5c3388a0dbc55b10edaa14004bc0c44ea1fe3edb18e68cb23105d2ca44d
DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.1_12.tar.gz 191355612 BLAKE2B 21c1459c58a10ed6a87a422e70fc4fa27a37a1ea4cbd121e237d82f9ec0991e7245193c5a44cd2826d502301166a48e2d3e7ac0015dcb9a1c3732f03210ff366 SHA512 30ce2ff05d46ea125fc17256420c8bf9dcc3afe802338cd62d0961e6588cf54663aee07c6d4d21fd0f363b58628ee34cf4f9cf622b6da970924aa94d47e6406a
+DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.2_8.tar.gz 191420670 BLAKE2B 901cd6f9e816e1eaa949c97a86d9cfa6d3265b33da483ac5a4ba87621b5a196c7c51305be19745f8aa504ee4471a583180bc36de5a6013ca59e4f0890ea8fa34 SHA512 e80c8f02a35587c9305a92ed20926e79b0bab6b2d0fa3fd62ef7825383f68567c38cb52d2cc82b5def219df1fe2dbb531d0973b3713d1ec18c06c6967a228f73
DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz 191978211 BLAKE2B f0428e67c6f75bc204c8e7c74b25c73a270cff1889c0e3fdcc830f868bcddb58e6c9a480ba0313638a7edf56dd2e61e52b7c4f1dd9ad3643f3e70c9770141c93 SHA512 057fc5c4869bc9113c1a299b125c8bed47e4a841238b42fbd4b39adfd7bbbca0fa9efed7315a98303ff8f4000afd02baaa5b3169be6287d06edbfbbb44728538
+DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz 192041953 BLAKE2B 76b66b6571d50fd00c80bfdfd63023d070b7fb0f4ecacce86fcc10b651fa193a88ac8357e097d83ee4cfb982cd34b15cf4a9b59441066677d19a29073bee3666 SHA512 25ffa17e6d7c402e976823ac90d6fd6c4f07093c3766c6d48a7d1ecfe5908d6d73efe6f732af8fcb3f4f91b6daa0dd8f4a141ce7aae5fc12f0ed23a1c1e2ebb5
DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.1_12.tar.gz 192449459 BLAKE2B 506d31e97c7be57a870e80e1beb0bfa72528cb0e5d006b0dc76667f6ef29624165375a91127e3cc934f3135298d748c43a5adcecb9a07c5d758998bbf6551837 SHA512 8d7afed31b37759ba426d412f70c36e380f0f472d850c9ba9e895e0ebd4a2cf9a7f6118526f0a30f6a1d9d880affca4e1ed9848125509ae97e32f506ad78f541
+DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz 192611208 BLAKE2B ef5e801d3d8b5ace125d62a96ec2b76faf5acf12acd94d3cf6c3f80c84abe9ae91b9e53a85d5f57ff69bd2596cfb5715808d73070c971a5ed8dddec2694a9d64 SHA512 c43075b14450de6763a66c0f73d7836ec880045cc84c1b8f1e72f9e3f1e3ba6057afff27cb3bdcadd89a52c75671ed7cf844299943ba8d3bf86e6c45386fa039
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u312b07.tar.gz 102144826 BLAKE2B b351fe3a82d8ef1e77314890a00c2920dbe5621bb524c4d4ed80b2f3a3b10853f91b0488ab42a5b1691ba66aa9de8eb0630b9325c3dc7fe6b071e2a95dad6bed SHA512 1b58c5453c473d798e5c4871212c484518b44038f81b32623668174fc47c4118120f770ebe3a21534b7f9e01c383a75cb558538e1e635f7c290686825b4ea78a
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz 102170434 BLAKE2B 84755d791d6aea0b58de68f7ced3e023d7d5f705c99ece9cb91f77663643681ea22672bb1dae143475959374193b1bea1068c0a0f73df4e748430495993d1c5c SHA512 cda25392c8d51b720fac9022de0d7cfc1f496b9e5295b90ee6082e6787d483eaf32198092072b6fe9cadfec157a93f66290691b3d1476572ba2097ab5e70b33c
DIST OpenJDK8U-jdk_arm_linux_hotspot_8u312b07.tar.gz 98364180 BLAKE2B 2b7cfffa33e9486637f9274f5a3138d6c1a53afa63d24ecb82aff4c0baa8b765003642c582c0191d0d229754dd9de64ab7cda4d81e9168df3d960baa44a5de9a SHA512 8b7273688a1ee28d0a2f918f2fe02586b8ff9e7962bbf8cd2973001594e627b1eef7a9f1893bf3bd3789fabe0058a916ac2d4d53c72cbd8d586e4e7c3217438e
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u312b07.tar.gz 100571080 BLAKE2B 3a1c5c7488de740210758a34dcc34517c8d5310a9d17c1d251d0ad6d5e7a619595304479b88c807b5d0cd839f85f9b7c819d0dcc297a738052b337b3e962b457 SHA512 0b530ffd0c41fa71962072c70c0712b71573b9d1b66e9b23f6122b770bfa7cc42d8ca0c87a721bb8481104edd062b79ebc09a728f1977699b242b62cd546146b
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz 100615206 BLAKE2B 8956f1ed38732aa8e9880396dce7c477370d128c1a957ba6d135676140f3e8bf233c6563dbcd2f63c2136454a398c49455a96f77224691ded7843f6cac027d1f SHA512 11975e73e6615bcb686703241b0f1589699edfc76a4de97e7066d4d93826dfb8c07a54b6ea3f8a70d231f98d4033c2fbb7741fbf0df374aa810f6cff8b5cda33
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz 103016010 BLAKE2B 9e7b10497bb46a176016f4df6bfa5fa90905bffaaf9668ca39f30a01cccf78c04d1391aed304493159d5b520879762b7e284befdc11c5444b0edff6b363d9c3c SHA512 20ba919c6b4b2f1253b7a9119193f2ee6c16498ed15296ed5d4588284e635fbc53fa368180c1362cb5c3cc2f2446e96d5a752a96d64382ddf73b062319b1ef47
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz 103063877 BLAKE2B 9ca165707b4f02eeb5156a5379d246942eb06ffe4338490600e7a834c49c1199d46cd098bbcd8041e7c58107ccb657818e6ea37cdd39018a17a87e370c32665b SHA512 6ec164df1f95d2c8921b5d90c2dbd208107fa20e66d97e2920dbefd2b616214609392e36b885700bba14571d10848f412194db2f18206c1a21d16e6df7e29e53
DIST OpenJDK8U-jdk_x64_mac_hotspot_8u312b07.tar.gz 107991615 BLAKE2B fb068abc6788c00d8ed51b0beb3a08c6dee80e3fe40bdd5ca79bbaf59159869a9b3234f1ac53321e988152293c938a13202fcd9e57ec133bbd2cde3f849a0fa6 SHA512 fc75b7fe2489ac6fcf7180407db3fa839ef1a0b5de2aedf4c9db902eeb3618e2e1d1436970fc7a002b111c6f6be6250e0e1e62dba28aba21b4c88fa8f765a92e
-EBUILD openjdk-bin-11.0.13_p8-r1.ebuild 3006 BLAKE2B 070db1650cf3f936d4a264f6d759a3daa81afb66101b85d75a0002629aeb42416589b766190a050ec0e3ae14cdce95eae7ed0c66e9cd76359d96b7b08270b703 SHA512 cc99c01de85c794bc0f6519f9e942c0515d822e7628679e858feca2b10a3204def8ce510f8262d5d32a91e29bce91d412f839d215ea3de4738374acc09d408d3
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz 108075347 BLAKE2B 89c81377516b737e1ce096b66c8460c86f77229c8a7021471e6c67ae738c99183dbe4e5d868de0de5251cca9eb5bcf888f88526a8390a56eb33bb6270038ebfb SHA512 5f9e6036ca72b015609c503b8446b79013dd4aac09349e3c65c9df0e91e2541f3672d867006cd1f236cdd8a60e16671c6e4423d5d6e85a5a31f6f97f1d168434
+EBUILD openjdk-bin-11.0.13_p8-r1.ebuild 3004 BLAKE2B e8c59082463b4418045bbe589bb7567f38e68d8a2e06efe6d65ab777e0260effa8c277a866d0c647e39ec018d9f9ac3b8e20f29d6af323e512e879d042c9c9bb SHA512 96c21cc30feb9fbebe6fb63846c50bc9a31e7382a90b32537935aa18ecc7a71e629339bcf99afa3e2974afed74d345da01a1a378eee8818ac23ea15421b24642
EBUILD openjdk-bin-11.0.13_p8.ebuild 3003 BLAKE2B b5bf1a9ec3297e3d417c19f6c9a3cf9d7155694462e6b3f9378bc0af992232e9f8a79677675ea78257215a4a8833620f2053d2da0f969201f1a4898a5eff3f06 SHA512 7f9e47fdafb8d8a7ab5602cda247c6847d7b9b008561ae6590d9b074c31ead43d6ae604aaf827a5af65243ab317f6d4eef96afd5b9d6561386a162ee958e8f47
-EBUILD openjdk-bin-17.0.1_p12-r1.ebuild 3819 BLAKE2B eaea576eaa4ffe4486e8fb0f3b48e3f584aad925e48ea5466f08367b83ac7e77ef8fe97ff04fecd3b7e57595445f51b3658baaf1c87e7a627f5341ef364f840c SHA512 b883e19d4075b247ad9ed251987e376d7dcafebef8e45c99a78eaaed1ad65b4e13dacb5f171a2aea8e521fac4c63c9f106ce1e05b3a1a224312146a0235ef210
-EBUILD openjdk-bin-17.0.1_p12.ebuild 3822 BLAKE2B 46e746cd152d9d389b8b50e0e07ec89ed77c3c040a5441678403f392888197cd838ffdce0c5f3621a3b3811fc71ac5dd72d9fcd723ddb6a5a880dbd8a6ab4836 SHA512 151d8aad48b04f137f95eccf213919ac702cf3e11c96ad78aeaafe8e9e9724508a4f81ca03522ad9c3095c1b40deb4c6a49bac3434c206bb65b64ea77bf21a68
-EBUILD openjdk-bin-8.312_p07-r1.ebuild 3040 BLAKE2B 90208fa931daca30a7e54e2929b64c9400b414b22120b9dc39ca18bbea880eb5b88189c274f1f9c050c06542fad39563d8d69309dd6c5d7b8dde3c74306a91f6 SHA512 4b0a2b496b89c669421331f078a5c5f26bbc2f5ef3dd00efc4c9837d6bc243dd764118d16fb9d8d88be4e428bd6b3ff0d3da4eeff665abcb37784817a8734e79
+EBUILD openjdk-bin-11.0.14_p9-r1.ebuild 3188 BLAKE2B 9fd7ce4ceb0821acf0a11acbd997578074f264786e6db048b89c8bf3d6af33825b981228a25991f5808d8e690e3d1d1dfeaf905fda5757d253e8a586388285fa SHA512 c40239ee1272f03edce613b7d9809a04defa23061fe68ab6badef1fc3da529236badd2f262e2b872c5c734fabaa24477d61804229472b4eec5af909f7647fbe6
+EBUILD openjdk-bin-17.0.1_p12-r1.ebuild 3817 BLAKE2B 730195b2a13f8cf6fb77acc0620ee6a1bf0dec819c4a212483668a8db925d21589367c2e004929b00ee4c9409e5f56ab8b29735ddfb38da215acf76b71d22e3e SHA512 5d690859f283ffe6e15d10faa647b8e28cddd9feea9c6ffc062c9a3f23c9bb6185f13bd8f03fba2f5117fa19db76d1260460970f42ad1912e9c1c3ed2ef71957
+EBUILD openjdk-bin-17.0.2_p8.ebuild 3872 BLAKE2B b9d5dbf7d6a089352848e391db1edca76b9b4b715b569f24ba8bd088195444b3510d96c7ee7d05fab6a4bdce7d07a71c9bff8b8504ae120b44adb09ad84e5a72 SHA512 a256f3d72280d24013cdf4dee55edfd49cb7585609e2f15f1176883cec4e57a1b68ed648b7fa02d2ab17eca8c7f31ad486fbb07a67c3033ff218bc405e10a634
+EBUILD openjdk-bin-8.312_p07-r1.ebuild 3038 BLAKE2B 1fc8d0830bd700d7866f54994c40665de60be274d0e5fa373e2dbbe417a84597435e1d6fea3fee269338036b5f047ba9916b025d883b23cb4b70408e4ef0401a SHA512 2717e11822ef00514783a0dc932a7c7212d70076385337f9c7b8bd4f00791dc1ce3d4168e0e662f9504fe276233eb3398461f1ae2a263f5c1720f568065aa9e8
EBUILD openjdk-bin-8.312_p07.ebuild 3047 BLAKE2B e636d705075e18d16bdb5fab3c018db59af78afb52c189c21400990c11929bec7edba0592fc14e5b800bc0e898cbe13f352e3572426e7320b5d524e6c2cf4152 SHA512 406fc714f07b1e743fd3f5b0570c2a0f9805bacecbe2c97fdae8c8551dd51ad789dfa1ec51b23321801dbe1a0f44575af58485f2d6dc3662e7432b29d95ebd1d
+EBUILD openjdk-bin-8.322_p06.ebuild 3017 BLAKE2B 576d3da76e6c201d2884b4b10cc21c9f1a4bac3c736811c1f10be3810d692609ae3e2b2756021e1cad3de20249b444c76232962fe7a7a095eeb88e4c5246edc8 SHA512 b66fda10d13896bd3fc5c5d566f223605eb36ae9185964a0503cecb413e6c0b79bd9bd9a6672a28d9e3cfd71b21f90bc879ee2ee4022f8ca065de68b3edbf6c6
MISC metadata.xml 941 BLAKE2B 16002011c075cd453721b20649521e7370b0835939bf228e3a66cb6994b98d11ee2b0074bd9ead474c8787301d2be44a2c05d2d49c09b3f2767995153c37a69a SHA512 37681cf8ecc00361d9bc3ab5b26defae227a1d95aec0a5f51b39d412e1d4f62bc3c9db0c1296b394c02f81f0b8eb052ea85212eed0319991f372525c0bf26b09
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
index 9e9c5ec54870..073e66f7ee9c 100644
--- a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
+++ b/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-VERSION="AdoptOpenJDK ${PV}"
+VERSION="Eclipse Temurin JDK ${PV}"
JAVA_HOME="${EPREFIX}/opt/${P}"
JDK_HOME="${EPREFIX}/opt/${P}"
JAVAC="\${JAVA_HOME}/bin/javac"
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
index 6dc16a10bff2..f6d25d57c4a1 100644
--- a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
+++ b/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-VERSION="AdoptOpenJDK ${PV}"
+VERSION="Eclipse Temurin JDK ${PV}"
JAVA_HOME="${EPREFIX}/opt/${P}"
JDK_HOME="${EPREFIX}/opt/${P}"
JAVAC="\${JAVA_HOME}/bin/javac"
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
index 264572a4b219..fe1b484edfa1 100644
--- a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
+++ b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-VERSION="AdoptOpenJDK ${PV}"
+VERSION="Eclipse Temurin JDK ${PV}"
JAVA_HOME="${EPREFIX}/opt/${P}"
JDK_HOME="${EPREFIX}/opt/${P}"
JAVAC="\${JAVA_HOME}/bin/javac"
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
index dabdb239f42e..bc75e084b8ea 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild
@@ -74,7 +74,7 @@ src_unpack() {
src_install() {
local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
+ local ddest="${ED}/${dest#/}"
# on macOS if they would exist they would be called .dylib, but most
# importantly, there are no different providers, so everything
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
new file mode 100644
index 000000000000..81cd7dd0c1fe
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+ local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+ local musl=
+ local os=linux
+
+ case ${2} in
+ *-macos) os=mac ;;
+ *-solaris) os=solaris ;;
+ esac
+
+ if [[ ${3} == musl ]]; then
+ os=alpine-linux
+ musl=true
+ fi
+
+ echo "${2-$1}? (
+ ${musl:+ elibc_musl? ( }
+ ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+ ${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+ $(abi_uri arm)
+ $(abi_uri aarch64 arm64)
+ $(abi_uri x64 amd64)
+ $(abi_uri x64 amd64 musl)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 x64-macos)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups headless-awt selinux source"
+
+RDEPEND="
+ >=sys-apps/baselayout-java-0.1.0-r1
+ kernel_linux? (
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ media-libs/harfbuzz
+ elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+ elibc_musl? ( sys-libs/musl )
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ selinux? ( sec-policy/selinux-java )
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXtst
+ )
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
+src_unpack() {
+ default
+ if [[ ${A} == *_mac_* ]] ; then
+ mv -v "${S}/Contents/Home/"* "${S}" || die
+ rm -Rf "${S}/Contents" # drop macOS executable
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}/${dest#/}"
+
+ # on macOS if they would exist they would be called .dylib, but most
+ # importantly, there are no different providers, so everything
+ # that's shipped works.
+ if [[ ${A} != *_mac_* ]] ; then
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # prefer system copy # https://bugs.gentoo.org/776676
+ rm -vf lib/libharfbuzz.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ # provide stable symlink
+ dosym "${P}" "/opt/${PN}-${SLOT}"
+
+ java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
index bdeb4a67273d..bcac729452c5 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -85,7 +85,7 @@ src_unpack() {
src_install() {
local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
+ local ddest="${ED}/${dest#/}"
# on macOS if they would exist they would be called .dylib, but most
# importantly, there are no different providers, so everything
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
index e90e1c5b5be2..ebe4afd00a4e 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit java-vm-2 toolchain-funcs
@@ -30,11 +30,12 @@ MY_PV=${PV/_p/+}
SLOT=${MY_PV%%[.+]*}
SRC_URI="
- $(abi_uri arm)
$(abi_uri aarch64 arm64)
- $(abi_uri ppc64le ppc64)
+ $(abi_uri arm)
$(abi_uri x64 amd64)
$(abi_uri x64 amd64 musl)
+ $(abi_uri aarch64 arm64-macos)
+ $(abi_uri ppc64le ppc64)
$(abi_uri x64 x64-macos)
"
@@ -51,6 +52,7 @@ RDEPEND="
media-libs/freetype:2
media-libs/harfbuzz
elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+ elibc_musl? ( sys-libs/musl )
sys-libs/zlib
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
@@ -85,7 +87,7 @@ src_unpack() {
src_install() {
local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
+ local ddest="${ED}/${dest#/}"
# on macOS if they would exist they would be called .dylib, but most
# importantly, there are no different providers, so everything
@@ -115,8 +117,7 @@ src_install() {
fi
rm -v lib/security/cacerts || die
- dosym ../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/lib/security/cacerts
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
dodir "${dest}"
cp -pPR * "${ddest}" || die
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild
index 465e0a290547..3144abff510b 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -77,7 +77,7 @@ src_unpack() {
src_install() {
local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
+ local ddest="${ED}/${dest#/}"
rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
new file mode 100644
index 000000000000..9ae60de7a9e9
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+ local os=linux
+ case ${2} in
+ *-macos) os=mac ;;
+ *-solaris) os=solaris ;;
+ esac
+ echo "${2-$1}? (
+ https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
+ )"
+}
+
+# they have different tarball names for different arches...
+# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
+# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+ $(abi_uri aarch64 arm64)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 amd64)
+ $(abi_uri x64 x64-macos)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
+
+IUSE="alsa cups examples headless-awt selinux source"
+
+RDEPEND="
+ >=sys-apps/baselayout-java-0.1.0-r1
+ kernel_linux? (
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ >=sys-libs/glibc-2.2.5:*
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ arm? ( dev-libs/libffi-compat:6 )
+ cups? ( net-print/cups )
+ selinux? ( sec-policy/selinux-java )
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXtst
+ )
+ )
+"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}"
+
+src_unpack() {
+ default
+ # 753575
+ if use arm; then
+ mv -v "${S}"* "${S}" || die
+ elif [[ ${A} == *_mac_* ]] ; then
+ mv -v "${S}/Contents/Home/"* "${S}" || die
+ rm -Rf "${S}/Contents" # drop macOS executable
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}/${dest#/}"
+
+ rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+ # on macOS if they would exist they would be called .dylib, but most
+ # importantly, there are no different providers, so everything
+ # that's shipped works.
+ if [[ ${A} != *_mac_* ]] ; then
+ # this does not exist on arm64 hence -f
+ rm -fv jre/lib/*/libfreetype.so* || die
+
+ if ! use alsa ; then
+ rm -v jre/lib/*/libjsoundalsa.so* || die
+ fi
+
+ if ! use examples ; then
+ rm -vr sample || die
+ fi
+
+ if use headless-awt ; then
+ rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+ {,jre/}bin/policytool bin/appletviewer || die
+ fi
+ fi
+
+ if ! use source ; then
+ rm -v src.zip || die
+ fi
+
+ rm -v jre/lib/security/cacerts || die
+ dosym ../../../../../etc/ssl/certs/java/cacerts \
+ "${dest}"/jre/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ # provide stable symlink
+ dosym "${P}" "/opt/${PN}-${SLOT}"
+
+ java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 7b392c84c56c..f27b3d4b423c 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,12 +1,9 @@
-AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03f453b48e0079670aa20f5a5bc83ed73194508aeda596a62805e5a6273b4668b870d6b7aaa99ddc72498e384c54 SHA512 dfc012876174108b768d6fbd9deaf8b9e20965c2b5dfc2ea4ded556597c0ee4807537f7b29ca1e6f92ba800313457844299fab770b833d8b3a5b3d576369411f
-AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz 42404190 BLAKE2B 5825d8edcb890c4447354414fd5ad6a153fd7b5a36082607a0b41430c8a9be52dec025cb0c388adcc80877c23c389e031c0451d3e109312c0fc9878410633444 SHA512 41f84fb17afe142264a1e10612e67c201b090feda86858a257fe02fc4f4b65b61397e23585f3d9334e1ee407aea11b5b1affb734a2823f3cf749507d1e54ec4d
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz 41355668 BLAKE2B 761358d7e5dd9c96ed13d7302ea5f39719f044a37add7fcadb76ed799d41b17faee014c9e4bec3ce388d4a6965e2c14dd4ddf029baa6dd1f5f84cde7e7b1fcd5 SHA512 fd63dceddcd32b0f48b6d35c14ab3165f2b45152fdbc2bcaf833ed2624d833592cf1001627029fd04f9b77a033e2d4e993830d54c2e7c08adde5cd7a684447fd
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz 41249161 BLAKE2B 643c8cdb50e6d7ff24bdda2fb8e99d0ee33dcf550313db879bcc4661d85b715de4e6e01b979e92005208b004ad1d6e0641e328dfacb81f70541a759f022826a8 SHA512 e435cf0d9e5a8edb26ada1568a6a041b685bd92302ddc60be73acc02aa1aaa43fda08d327d456749405866a0d1e3feaded2796d8a0db65fa650a9e60520bcb96
+AUX openjdk-jre-bin-11.env.sh 516 BLAKE2B f54577d8964ef3f380f622352880e6b030a3063cf51d24c7d4ff3dabb05784b44c121fbbcc72b0c10493684c9a1784a436ce7b23fca9d15c292dda51961b1940 SHA512 4821ebb21a15517da3c7e6f5f61622fc67f26854bc412bb4081b53d829f00f37f37966ea69824fd33fded6f5b1149cab829651efcc578287251931cb27d2580c
+AUX openjdk-jre-bin-8.env.sh 678 BLAKE2B 9cc23ab6e5c7d9e27861e051ea68c074c23789d51e8094eff8c30715cc6df80dd4fa04b371b67b1101afdbaf9e244056816f2998ba100567bc70254c8f3b8a79 SHA512 43e71b9d83149ea622b35a13a7e7184dde9fcafc960e00e190f3e6668856f16443b9b42c40e428be6d24b73dd969f8ce6107e53755651aa7058f56b3632b9d9b
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64
DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915
-EBUILD openjdk-jre-bin-11.0.13_p8-r1.ebuild 2098 BLAKE2B 18782bb34e1c628e683b65df62b0771640eb8a73101b3ab9d40bb5cbb22084c37008f5af5b3f9ff9c160a0eb94b4e4b9a5349d38c37a6af74eb1a0eae220bbb3 SHA512 55907f551e9e25d735cabfff43d61ed9e9f2fa2e241639a814d6fc18e6eecae957ca04190e85b9343f4a9de335ee63ee717d397280b15e748531a6ff2ecb6dae
-EBUILD openjdk-jre-bin-8.292_p10.ebuild 1864 BLAKE2B 1fed435abcd6dc7aac2c71336162c3e4a77117a2387a9bc6ad80bdd60dcdd8f83648701b47baba0a782927ec11f7af78c157067b597f5dd24fdbefccacf93cf7 SHA512 5105f215171f50d0ea487cdc371be630047bc74155012e0a509822a4b55739820b5668511c05611417d9c0c30d6cdaebb26228dcac73ce4fc785d66ac2b9a8a1
-EBUILD openjdk-jre-bin-8.302_p08.ebuild 1859 BLAKE2B 6abad72cdb322bb1c52714b999085eca3a92c7269194e8c03efe1be93c0de274b6e50d72c5c0b804267c074eb76bf9e438ac3c2c565812bd8af8da6157a3e8a6 SHA512 07bc482870ba9810e54aa1e25deeb91f10391e93984ce0fa8321a45965c53324929a6db0374b78037f4d8420d32bf1be755fe80e3258b039da4a7c0bfb96495c
-EBUILD openjdk-jre-bin-8.312_p07-r1.ebuild 1850 BLAKE2B ea4be8535567c81e028316bc42261e396b58de2f3d7717f56ace1d549292349f0b2393fafd49086c6925dde67ca6e9a0c419eb9369819b3449426814fd44d263 SHA512 1eea3c96d83d71178d1914a9234d6652fbb8837f44415091586f2f774a1572654d6cd7faf80002f6fd660f6657ecf208e48143fc161e02cb459dd1e46892d431
-EBUILD openjdk-jre-bin-8.312_p07.ebuild 1859 BLAKE2B 6abad72cdb322bb1c52714b999085eca3a92c7269194e8c03efe1be93c0de274b6e50d72c5c0b804267c074eb76bf9e438ac3c2c565812bd8af8da6157a3e8a6 SHA512 07bc482870ba9810e54aa1e25deeb91f10391e93984ce0fa8321a45965c53324929a6db0374b78037f4d8420d32bf1be755fe80e3258b039da4a7c0bfb96495c
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac
+EBUILD openjdk-jre-bin-11.0.14_p9.ebuild 2021 BLAKE2B 7665a35bf44a845b502d1330d36d86e7d3164fd5d3433bd5d2080b0d9999e9cbbfd72edb18dd61405fb8b61b99d14479fe806ae8878eedb72c240f7b2673ac4f SHA512 5a9fb96346d6d9fc4c2334d02f6dfc343653cb72a272abd0fa74892d618c8d36d13726925d2090c0ee786a2676323016a9d20533a5d7dad47db90bf61731669c
+EBUILD openjdk-jre-bin-8.312_p07-r1.ebuild 1847 BLAKE2B 3c7e883db3d886c57de3aefd89af687733c43ab63b9d260102d86a5992aa7432f763aae7108e7663107e9dbeed927485e211251f7bd64ed89b16c876374057de SHA512 06086af6d8b5e8ba7e290046ebf2e94055a273a3f8557ebb0272d41471cc26d1874f87f412bd722c19b8ff2955777edce3ee4b6ce7160607f5e9b77ac6bc3d73
+EBUILD openjdk-jre-bin-8.322_p06.ebuild 1833 BLAKE2B 3a7cf0e521421f430068e35e9e5817b7f50ea8036c8b2ef5f7708096f40baeed4d6eb9df93538c8eb3d949d477c553e8ce886409ee4581513c4e935fb672d29c SHA512 06250bf0e366cece0d0782a9f66b129990699819a7e6a1bdd4b6ca7fc8e1268ed26d4015f1c925ffb899d87226f8c7ae22787e08851e00a9e3050836ec44e70c
MISC metadata.xml 896 BLAKE2B db8489d7738bb5444ee789ae0dc516941ece1b814ce4c4d0e12284e4027315aa20b141027ca6db8aae7ab6580d881e79bcb1b4dffa8a890f75da6d7177c7c279 SHA512 8833e637b8b935247972eaf7afbf3787cc17013080d9747defad4784ea89c2b147d0f2284327e9ade30100594a0d1e638f0ecd01f0375101372028dbfd0b31a3
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
index ec0dca401e6f..fced31b2be32 100644
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-VERSION="AdoptOpenJDK JRE ${PV}"
+VERSION="Eclipse Temurin JRE ${PV}"
JAVA_HOME="${EPREFIX}/opt/${P}"
JDK_HOME="${EPREFIX}/opt/${P}"
JAVAC="\${JAVA_HOME}/bin/javac"
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
index fabc13c4091c..e3f380e33c60 100644
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-VERSION="AdoptOpenJDK JRE ${PV}"
+VERSION="Eclipse Temurin JRE ${PV}"
JAVA_HOME="${EPREFIX}/opt/${P}"
JDK_HOME="${EPREFIX}/opt/${P}"
JAVAC="\${JAVA_HOME}/bin/javac"
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild
index 163859345679..a6f7f3ee248b 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
$(abi_uri x64 amd64)
"
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
HOMEPAGE="https://adoptopenjdk.net"
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="~amd64"
@@ -48,8 +48,8 @@ QA_PREBUILT="*"
S="${WORKDIR}/jdk-${MY_PV}-jre"
src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
+ local dest="/opt/${PN}-${SLOT}"
+ local ddest="${ED}/${dest#/}"
# Not sure why they bundle this as it's commonly available and they
# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
@@ -67,15 +67,12 @@ src_install() {
fi
rm -v lib/security/cacerts || die
- dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
dodir "${dest}"
cp -pPR * "${ddest}" || die
- # provide stable symlink
- dosym "${P}" "/opt/${PN}-${SLOT}"
-
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
java-vm_set-pax-markings "${ddest}"
java-vm_revdep-mask
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild
deleted file mode 100644
index 49dddf130391..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
- )"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
- $(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >net-libs/libnet-1.1
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}-jre"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
- # this does not exist on arm64 hence -f
- rm -fv lib/*/libfreetype.so* || die
-
- if ! use alsa ; then
- rm -v lib/*/libjsoundalsa.so* || die
- fi
-
- if use headless-awt ; then
- rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
- bin/policytool || die
- fi
-
- rm -v lib/security/cacerts || die
- dosym ../../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- # provide stable symlink
- dosym "${P}" "/opt/${PN}-${SLOT}"
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.302_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.302_p08.ebuild
deleted file mode 100644
index d305daf5c173..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.302_p08.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
- )"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-SRC_URI="
- $(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >net-libs/libnet-1.1
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}-jre"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
- # this does not exist on arm64 hence -f
- rm -fv lib/*/libfreetype.so* || die
-
- if ! use alsa ; then
- rm -v lib/*/libjsoundalsa.so* || die
- fi
-
- if use headless-awt ; then
- rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
- bin/policytool || die
- fi
-
- rm -v lib/security/cacerts || die
- dosym ../../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- # provide stable symlink
- dosym "${P}" "/opt/${PN}-${SLOT}"
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild
index 2d5ee85aa434..ba4007f59544 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="alsa cups headless-awt selinux"
@@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${MY_PV}-jre"
src_install() {
local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
+ local ddest="${ED}/${dest#/}"
rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.322_p06.ebuild
index d305daf5c173..d4b6279fcfac 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.322_p06.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit eapi7-ver java-vm-2
+inherit java-vm-2
abi_uri() {
echo "${2-$1}? (
@@ -21,7 +21,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
IUSE="alsa cups headless-awt selinux"
@@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${MY_PV}-jre"
src_install() {
local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
+ local ddest="${ED}/${dest#/}"
rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
@@ -67,8 +67,7 @@ src_install() {
fi
rm -v lib/security/cacerts || die
- dosym ../../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/lib/security/cacerts
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
dodir "${dest}"
cp -pPR * "${ddest}" || die
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 1730407d2db2..5418f46a332a 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -3,8 +3,11 @@ AUX openjdk-17.env.sh 537 BLAKE2B 64ef0f37bc0fb1f20d5f30751727e8f70a0460ad5917a9
AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
AUX openjdk-8.env.sh 792 BLAKE2B efabd83be56cdbd06419267361b82278bd52bfce8df8f369b7b9cadac74196ad90b9ab83e3abe8ae73e5ac51c49236d24d7762450832236414f98c1f6d13d6b2 SHA512 acdf229fff329c79e2263bd433c953dd18fc0945a0ffb6428c7004baf0bedbe3a9503c22ba1e777e7598412dfa2d2d9255c9007ecd14b4590c558e6a52c48a9f
DIST openjdk-11.0.13_p8.tar.gz 122738754 BLAKE2B 5a60bf4245bc1e3591f4ebdf83a441f95a97a50a72a774612e99792789cd81a9317471cdadf4541efbe9b1549c2738a3cd30d134d3ded8de6d58f8a67b2aebe6 SHA512 38bd1be54533e9eebe407e771b1ece86ead755d1f3f0199e425aa4ad3e8fe511b0024986b7ffc59c571faa3dad510956e98ab1a48cb184c9cf5353bb7512cb06
+DIST openjdk-11.0.14_p9.tar.gz 122803178 BLAKE2B 521d7829b34fa4f9a143c51d61c339c8c7455f12c4f04eda4fdd687dafa842f2a1b1adfe2e897fecdfa4e1c3ee484ec0e3aaf38ab9246f20cd24e7185db6ba25 SHA512 3285d13ba0fbbfd4f1a676b0f099b0742527ff556edfc3387913b59b64126bdfecd2697d7ac83634ed7160adf46edca3b5b2c33d94e9dca068752da5b9d70837
DIST openjdk-17.0.1_p12.tar.gz 104597561 BLAKE2B 9bae16c0c0b973017258076bf8597101538e7ef29cb16357b17b112ae1aa058b17d26f22057cf3d6638104dbd83f5c19b6bcd124f589fc100eae83f78dc1c269 SHA512 220d87a29e1a25b670d721c27069b601a48c833069cb252f81ee6de2ff65fef23fd76e689fc755940f7e457b2419ef93a15cbeca64db2a8798028729df876d25
+DIST openjdk-17.0.2_p8.tar.gz 104741920 BLAKE2B 749b1699f1b4b2bb6ee1139ceb704ba3b3f3789770176e5f0dc4b1d5ce5c2887514fc3c256a64f2ad9bb017339c20ef10110f35b523ee1edcd62924e41f44f03 SHA512 8eeb8b56410178179cc95aa02b0bf827fac3fbf6242a905502a6594763be809a727e55e87866ac65be56c22d6f78ec0c483bdaab9411f07d4b160c49b06921fa
DIST openjdk-8.312_p07.tar.bz2 460874 BLAKE2B 2230d45b74044c894d1c1d25e7354ab9cf3d4df82ef1f149c31e2a755220775f59c76178847f61b99fc0859522fef4106c696e807c70602f9138c5110bcd3ed2 SHA512 483503cf4a54b736a9cb17179246d0fc602450e15d7815d3897d2c5a056483187b96f09280f6bb0522044150eb6733777bbb3a9130e8e34b6f6c865cb306e5a8
+DIST openjdk-8.322_p06.tar.gz 88114268 BLAKE2B 206b8373bacd829682e9203d9fbb14240994b63b7ddb3675cd3380ee7a4ab9c9016cdcc278b63d3110652ad02587d3c7965bc9865fed6c9ddd720e79bb917c71 SHA512 877b56bb11daf7295bd08d2a310cb4dc0478ac7465d4e7f88ba9b9ab2715761b2e83d2e47fb03dc82ec1f1651c9c0772f048360e1f71c0f91a19bda4b46cbcfc
DIST openjdk-aarch64-shenandoah-8.312_p07.tar.bz2 467870 BLAKE2B 5ed4301b942fd2757644d82b1eb8f212d27ae6c39a225fa739b6a665deb42ba85ebb3e95d8563a8031cd08e3fed9ce2fa2aa675e2d348bcbd16d5b82bff74d43 SHA512 157f53f096f7cdf9bc4af2200cf1bc5dea566a839beb59e2d21a8001e0dd1c6596e409b7e21b9484832c9826dbaec97c00f5e980926142c89117650e390ec63e
DIST openjdk-aarch64-shenandoah-corba-8.312_p07.tar.bz2 1053490 BLAKE2B 47ee0c89deddb3aefef02d9a71a8d3bdfddd95977e57c70e2699a18c76bc1724b48609c106126527085bca8892a4b071d26d0d47c72cc0681757c8dacbb85c78 SHA512 49f27951b3b57c10ea996f2490a089e1eb28be4762d57962b6b2616020a3cca248ab61580c6f27842b9986eadcc1bcb208af543832fe839d6fd548a3f7a5a04a
DIST openjdk-aarch64-shenandoah-hotspot-8.312_p07.tar.bz2 8802379 BLAKE2B 53a8fa582f002c19a50d6dea07aa9d21374b59cc0fb973ca84429191060ba60da609ea115d6249d835f7a945279073c896abb534f1b59ed3b5811b70dd8a6503 SHA512 b0b19a9277af9ab0f395367ba010d4574ae4e7d5a0f9c9c44c3222545642ec6a4342bd2caaa8f8db3ade23f4680b8cbfbb74b4cf4526622ce9eb4d16a3190fa5
@@ -13,6 +16,11 @@ DIST openjdk-aarch64-shenandoah-jaxws-8.312_p07.tar.bz2 2559773 BLAKE2B b3c06549
DIST openjdk-aarch64-shenandoah-jdk-8.312_p07.tar.bz2 48837594 BLAKE2B 368caa0a628e3bd0d0343baf7ac6c8854f6998ea5b5f96594e99ac565293bfdbfe733acfdfd398964634ffaf4e0eef298dbed078b0a61626c97711764a45a0bb SHA512 8436daa785fba98ed2c23444673842dc28b18f114ebafd203bc01bd2295a9501c2391c2e51d0f589cd4112243eee2e18a8a71180b2aca3988c58a02f33d13d57
DIST openjdk-aarch64-shenandoah-langtools-8.312_p07.tar.bz2 2403116 BLAKE2B 10c1ca4e78dfad90bf9b8d6745cda41605d5985eddfd8e4c3bfbfcb6458c5b5115813e9aa7b4aec148c4d82f268ab02ca6cef9e68bb902f1944858b6bb6b36d4 SHA512 2c9fc95cb19b1c3a4e7b9c2e305d9a285f1dedb7954cce365738e683c3a52eb7f4e3f3485b947860aee2fd6059b7d2b18e196cc1c585427c6b4b8299f6fc3105
DIST openjdk-aarch64-shenandoah-nashorn-jdk8.312_p07.tar.bz2 2845057 BLAKE2B ff32686b27b767683ae0a670b2509291b6708d371b398cac854210132f555218b9189d3012cf9b45e0584f44425e09aefb8acbef95f1786787067f4d5275fdbe SHA512 71fad14ad6b7a75ee499bc0b3370e5beb22d5a7e32a02d54fc5dff1cf25ede51c3a8a04de6424947ddaa3b5d4a0d7f5a447ba073b62c5c86a49c0543cec3f374
+DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
+DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
+DIST openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz 116557680 BLAKE2B d20e45a5a76e30ee60446993bf5dcf0fa10b8b668ebec637ea02b458a472c642f22740e18f28cbf9923ea4cceb17702115c038b13137442e5f0572477d37f12f SHA512 92e0343f493d094300911625a561f42c47402ca4cdbd2ac18414089e8ed8a50ca58f02ec1ef9a3dce017ab7af99a22ab465ddf732ab9e55728e2b146de56fba7
+DIST openjdk-bootstrap-17.0.1_p12-x86.tar.xz 111479904 BLAKE2B 17d33f8ee81c2846f417d8e7cd1429eb611e916a6b375c76127179dc6afc55b0254248360c892ce37a178fd553934d952ec8955ff5d0613eb66678b8ecefe917 SHA512 094bcc960801e5fd7e1c966c8101c195ac7fa5e222d9c8e79ca64f8a3e6812613c17a0356211e7dd831325fa11af88cc22ed56c434d65504f18dd4f4ceaedfdf
+DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab078085f094bbcc65448458d98a0f521e3b754c5118b1b4f957cfa00c24e896c811c2a477822c469ffcfe0de1ad6a8d0b7db23b0b09ae3b459eaf8c4fc8 SHA512 e30acd6c64a0095f4203129ecf2cff4c6b4293bc017457465d3abb746d280a2f5d89028eed22f7f3d236890d047149c7aa257e3b49593d7a6ab4dd6b777a7c26
DIST openjdk-corba-8.312_p07.tar.bz2 1035097 BLAKE2B 38ae2cf2e61c44a42320b26f7bdea424066ee4568f2f3bbe6e7aa2d8b7aa927429d0b8c2cc757f580867df6c6e5dbe1270da5f91d9c52aa131e66c146a311caa SHA512 9035449c07e5fc9776b40e32de3e4f1c6efac482c14298671e5e719a1f9830fe9a20851dac3f9c6d6c0c8c387a7b44e40019570c1f054fd1d1f24e2f5cef5bfc
DIST openjdk-hotspot-8.312_p07.tar.bz2 8559682 BLAKE2B 776acb83bc065885da90b26c88f0083c3bb7bb1f6dfd0585e37e58f185b5612f6501f2b26e1eeb7533d30f82faea7ccedeeee21dcf454a4e8fe951aca0406a1d SHA512 0c501d284bb22867391de0f8da8b098ca9309173ab6f7415d591d056a2d8859757aaa3da4a9c294dcc434a41771928a9f1edd8a69dad38ef7a9bcad793deeaa8
DIST openjdk-jaxp-8.312_p07.tar.bz2 2686710 BLAKE2B acbfd2a7ebfdcfbfa1c4467dbc6778afbb2b8fab5c70381000b926645197c3bb5537a81574ed98960cae2fd0d70e50ca5976aabd0c49cf833c07f1f3b7935773 SHA512 da3fbd82ff05e48809cf6180d876f09764f5f97e4fc37c4352c7875ccd5bebe66cb51ff4565e6fcd67699ec5b5ae3eebc9c0a1510998697519cfc94d3d04df5f
@@ -21,6 +29,9 @@ DIST openjdk-jdk-8.312_p07.tar.bz2 48705905 BLAKE2B 0e9849a58a05e300441e63702846
DIST openjdk-langtools-8.312_p07.tar.bz2 2403774 BLAKE2B 2eaaf2d23b0d31d566b95075f1e00a8ec01617a48bd860b927fc56f56c0ec1e4232c1d2e316b9b13bf563b89ecc6464bf1e49a86eda1a31d998dbbc85e1fa542 SHA512 b77d8b1864e121a838023da424b0910903cc2b11cd9669e61c0ced84e1210d4902b2a0b97031e6646f26b01f1120d72b6f3382c6aee4d25fcd2d8e4605b8b4ff
DIST openjdk-nashorn-8.312_p07.tar.bz2 2848133 BLAKE2B 4e416ddb38aafb97796233adda615525fb6e583428cdf0b25fd285276b3bef81682d3a607122aa8724dd9ec2ef0890b889ef809aa8f72cb03ac5bc9bfce9192e SHA512 411ac87cf1e8c889330b3fc41ce8cd8ed70c553d079dd46349813b02b171a22c2421075cc6391e46a866ee802df874cf1a6ff3e7dfba20e73564380be24ae843
EBUILD openjdk-11.0.13_p8.ebuild 7470 BLAKE2B 51487f24150b411a085a022f83f539c11e2532b82afafc76f03a15a6ff96b3b04d3ce9078a3cde6b2c91ffcedf55dac2976eb00bdbb0ad4352c7a428df4d5956 SHA512 644cdae2f094d080eb27054a4f2b7fc3dfb6a540567a15e1c07d0cf0540dead5a97f7751747e2d4db2ed9e860611f19bd958eb4732c2db0d95c5119d61df8a34
+EBUILD openjdk-11.0.14_p9-r1.ebuild 7771 BLAKE2B 10a62c7c57432f86fedf3102c9ee278f2a4b55875fea4f199c727d09d9f51bec19871e01a5d0ac27b8435daecbe850be5c8cb42d5298eeeaa30973e667e71aff SHA512 ef6a23ca55993f0b4dfbf2dbe4c330fb82796cb250d10dd4fa85cf8e7e15db185d780c4f11f585dc50f43bdd6b208f9bcd8a19993bff6cbea8c3811d45a5a05e
EBUILD openjdk-17.0.1_p12.ebuild 7855 BLAKE2B cb7a7215afcd9382edd8053ea4182012d46743fdff5ba03ac4ff2f8750b454c352b25ec4ca04b0b3a5dcfeadf64cf24518ebf119a87cde7ca7f2c9a09bf39256 SHA512 5bc08b0e7707725dafd4165d8f7af2964981195d19fc95ae5465ab3f2907bd4c81d2ba2bfbf6eb42dd331dd8a9eb2c8c0584615146163669514a2c2773cf68df
+EBUILD openjdk-17.0.2_p8.ebuild 9144 BLAKE2B 13c56192cf50286fb2c7676b2781f96b9d48439b9dbfbca5c0427dabc74b249754a413cbbcf0360e7e1e6edcdb33c2dbceb30ebfa17f7a413bef3b08a93ae967 SHA512 2c959301483293c2232308c9b16984b17e44a0b037c924a5835fd56363df0a618aa629483d72bd1b363b8914637db8cbd0aaeef21a6dfad88bfb77f3be0375f9
EBUILD openjdk-8.312_p07.ebuild 7399 BLAKE2B b07477683dd271a5c1cf0830137f9c846df5375666ac0d3863f3647f9c0ca3db3bce0e68e4f3931124a071e9b0fb81434733d034194cbee3a764056cfa2721fe SHA512 467b1479f425e9d36be216c24d2f226a2c4a1aec9947fedc73d0b4703e1efaad727c36c427c3010a78576db997d2975623d0209d11ba6adbd65e360265173c10
-MISC metadata.xml 1433 BLAKE2B f1c32727711519e4f3ecbaf9f9be6c025b467d93e2423bb5e6d9f3644242ad8f356204e7a804b0fccb56a3df5b9283cce305e82b19659a1c39bffc6b65676316 SHA512 cee169279a8c13fd3bfbc89eb1e0ecdda9a34214d001cf941f08abf89516f224e1532e916bbdb6597c56bd6a1df18ede2c4bb18e54c5e4ad67be70250f836fb5
+EBUILD openjdk-8.322_p06.ebuild 5859 BLAKE2B fe046363d60b08ca2569669f74a2cc71552086c84fa24df81a937970c5b3d4521720472686caf043e9aa860020ecfaa55e652caacf9d4e02cd8bd88256387055 SHA512 99315a5ba5fa12b4b059cb4787928e8ae02f04cc83c5064597b510da35386408c469af700dc3c99c43cbac4221e23a10501ddb62cb5b1b192a1062b816bd5d66
+MISC metadata.xml 1506 BLAKE2B d56098f4ba9acb9bd5891247f5165beea69a802ae4fe57f6c0e4b54875efd73d3dafaa78f5c182e640028e31840aa6b9d16bafade717a469b4a43ccbe37cbef6 SHA512 84aa8b3bef355e93fea678612e9512ca2ce5df77efbf4f055589ff67387f0571e43eb5308b8c575eb09bf52b68e5fcc68fdd819a6781080755c3f6c24d6eb77d
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index a97614c63101..e4fe12d5b61f 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -24,6 +24,7 @@
<flag name="javafx" restrict="&gt;=dev-java/openjdk-11">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag>
<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
<flag name="source">Install JVM sources</flag>
+ <flag name="system-bootstrap">Bootstrap using installed openjdk</flag>
<flag name="systemtap" restrict="&gt;=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag>
</use>
</pkgmetadata>
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
new file mode 100644
index 000000000000..9b1ca168a49f
--- /dev/null
+++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
+# set build version properly
+MY_PV="${PV%_p*}-ga"
+SLOT="${MY_PV%%[.+]*}"
+
+# variable name format: <UPPERCASE_KEYWORD>_XPAK
+PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
+X86_XPAK="11.0.13_p8"
+
+# Usage: bootstrap_uri <keyword> <version> [extracond]
+# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
+# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
+bootstrap_uri() {
+ local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
+ local suff="tar.xz"
+ local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
+ local ver="${2:?${FUNCNAME[0]}: version not specified}"
+ local cond="${3-}"
+
+ # here be dragons
+ echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
+}
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="
+ https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+ -> ${P}.tar.gz
+ !system-bootstrap? (
+ $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+ $(bootstrap_uri x86 ${X86_XPAK})
+ )
+"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
+
+REQUIRED_USE="
+ javafx? ( alsa !headless-awt )
+ !system-bootstrap? ( jbootstrap )
+"
+
+COMMON_DEPEND="
+ media-libs/freetype:2=
+ media-libs/giflib:0/7
+ media-libs/harfbuzz:=
+ media-libs/libpng:0=
+ media-libs/lcms:2=
+ sys-libs/zlib
+ virtual/jpeg:0=
+ systemtap? ( dev-util/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=sys-apps/baselayout-java-0.1.0-r1
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ app-arch/zip
+ media-libs/alsa-lib
+ net-print/cups
+ x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ javafx? ( dev-java/openjfx:${SLOT}= )
+ system-bootstrap? (
+ || (
+ dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
+ dev-java/openjdk:${SLOT}[gentoo-vm(+)]
+ )
+ )
+"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+ local M
+ M=2048
+ M=$(( $(usex jbootstrap 2 1) * $M ))
+ M=$(( $(usex debug 3 1) * $M ))
+ M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+ CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ openjdk_check_requirements
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+ fi
+}
+
+pkg_setup() {
+ openjdk_check_requirements
+ java-vm-2_pkg_setup
+
+ JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+ JAVA_PKG_WANT_SOURCE="${SLOT}"
+ JAVA_PKG_WANT_TARGET="${SLOT}"
+
+ if use system-bootstrap; then
+ for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+ if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+ java-pkg-2_pkg_setup
+ return
+ fi
+ done
+ else
+ [[ ${MERGE_TYPE} == "binary" ]] && return
+ local xpakvar="${ARCH^^}_XPAK"
+ export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
+ fi
+}
+
+src_prepare() {
+ default
+ chmod +x configure || die
+}
+
+src_configure() {
+ # Work around stack alignment issue, bug #647954.
+ use x86 && append-flags -mincoming-stack-boundary=2
+
+ # Work around -fno-common ( GCC10 default ), bug #713180
+ append-flags -fcommon
+
+ # Strip some flags users may set, but should not. #818502
+ filter-flags -fexceptions
+
+ # Enabling full docs appears to break doc building. If not
+ # explicitly disabled, the flag will get auto-enabled if pandoc and
+ # graphviz are detected. pandoc has loads of dependencies anyway.
+
+ local myconf=(
+ --disable-ccache
+ --disable-precompiled-headers
+ --enable-full-docs=no
+ --with-boot-jdk="${JDK_HOME}"
+ --with-extra-cflags="${CFLAGS}"
+ --with-extra-cxxflags="${CXXFLAGS}"
+ --with-extra-ldflags="${LDFLAGS}"
+ --with-freetype="${XPAK_BOOTSTRAP:-system}"
+ --with-giflib="${XPAK_BOOTSTRAP:-system}"
+ --with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
+ --with-jvm-features=shenandoahgc
+ --with-lcms="${XPAK_BOOTSTRAP:-system}"
+ --with-libjpeg="${XPAK_BOOTSTRAP:-system}"
+ --with-libpng="${XPAK_BOOTSTRAP:-system}"
+ --with-native-debug-symbols=$(usex debug internal none)
+ --with-vendor-name="Gentoo"
+ --with-vendor-url="https://gentoo.org"
+ --with-vendor-bug-url="https://bugs.gentoo.org"
+ --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+ --with-vendor-version-string="${PVR}"
+ --with-version-pre=""
+ --with-version-string="${PV%_p*}"
+ --with-version-build="${PV#*_p}"
+ --with-zlib="${XPAK_BOOTSTRAP:-system}"
+ --enable-dtrace=$(usex systemtap yes no)
+ --enable-headless-only=$(usex headless-awt yes no)
+ $(tc-is-clang && echo "--with-toolchain-type=clang")
+ )
+
+ if use javafx; then
+ # this is not useful for users, just for upstream developers
+ # build system compares mesa version in md file
+ # https://bugs.gentoo.org/822612
+ export LEGAL_EXCLUDES=mesa3d.md
+
+ local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+ if [[ -r ${zip} ]]; then
+ myconf+=( --with-import-modules="${zip}" )
+ else
+ die "${zip} not found or not readable"
+ fi
+ fi
+
+ if use !system-bootstrap ; then
+ addpredict /dev/random
+ addpredict /proc/self/coredump_filter
+ fi
+
+ (
+ unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+ CFLAGS= CXXFLAGS= LDFLAGS= \
+ CONFIG_SITE=/dev/null \
+ econf "${myconf[@]}"
+ )
+}
+
+src_compile() {
+ local myemakeargs=(
+ JOBS=$(makeopts_jobs)
+ LOG=debug
+ CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+ NICE= # Use PORTAGE_NICENESS, don't adjust further down
+ $(usex doc docs '')
+ $(usex jbootstrap bootcycle-images product-images)
+ )
+ emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+ local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+ local ddest="${ED}/${dest#/}"
+
+ cd "${S}"/build/*-release/images/jdk || die
+
+ # Create files used as storage for system preferences.
+ mkdir .systemPrefs || die
+ touch .systemPrefs/.system.lock || die
+ touch .systemPrefs/.systemRootModFile || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if ! use examples ; then
+ rm -vr demo/ || die
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ # must be done before running itself
+ java-vm_set-pax-markings "${ddest}"
+
+ einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+ "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+ java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+ if use doc ; then
+ docinto html
+ dodoc -r "${S}"/build/*-release/images/docs/*
+ dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+ fi
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
new file mode 100644
index 000000000000..09fe2c1ba754
--- /dev/null
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# variable name format: <UPPERCASE_KEYWORD>_XPAK
+ARM64_XPAK="17.0.2_p8" # musl bootstrap install
+PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
+X86_XPAK="17.0.1_p12"
+
+# Usage: bootstrap_uri <keyword> <version> [extracond]
+# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
+# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
+bootstrap_uri() {
+ local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
+ local suff="tar.xz"
+ local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
+ local ver="${2:?${FUNCNAME[0]}: version not specified}"
+ local cond="${3-}"
+ [[ ${cond} == elibc_musl* ]] && local musl=yes
+
+ # here be dragons
+ echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
+}
+
+MY_PV="${PV//_p/+}"
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="
+ https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+ -> ${P}.tar.gz
+ !system-bootstrap? (
+ $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
+ $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+ $(bootstrap_uri x86 ${X86_XPAK})
+ )
+"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
+
+REQUIRED_USE="
+ javafx? ( alsa !headless-awt )
+ !system-bootstrap? ( jbootstrap )
+"
+
+COMMON_DEPEND="
+ media-libs/freetype:2=
+ media-libs/giflib:0/7
+ media-libs/harfbuzz:=
+ media-libs/libpng:0=
+ media-libs/lcms:2=
+ sys-libs/zlib
+ virtual/jpeg:0=
+ systemtap? ( dev-util/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=sys-apps/baselayout-java-0.1.0-r1
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ app-arch/zip
+ media-libs/alsa-lib
+ net-print/cups
+ x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ javafx? ( dev-java/openjfx:${SLOT}= )
+ system-bootstrap? (
+ || (
+ dev-java/openjdk-bin:${SLOT}
+ dev-java/openjdk:${SLOT}
+ )
+ )
+"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+ local M
+ M=2048
+ M=$(( $(usex jbootstrap 2 1) * $M ))
+ M=$(( $(usex debug 3 1) * $M ))
+ M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+ CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ openjdk_check_requirements
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+ fi
+}
+
+pkg_setup() {
+ openjdk_check_requirements
+ java-vm-2_pkg_setup
+
+ JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+ JAVA_PKG_WANT_SOURCE="${SLOT}"
+ JAVA_PKG_WANT_TARGET="${SLOT}"
+
+ # The nastiness below is necessary while the gentoo-vm USE flag is
+ # masked. First we call java-pkg-2_pkg_setup if it looks like the
+ # flag was unmasked against one of the possible build VMs. If not,
+ # we try finding one of them in their expected locations. This would
+ # have been slightly less messy if openjdk-bin had been installed to
+ # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+ # file but disable it so that it would not normally be selectable.
+
+ local vm
+ for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+ if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+ java-pkg-2_pkg_setup
+ return
+ fi
+ done
+
+ if has_version --host-root dev-java/openjdk:${SLOT}; then
+ export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+ elif use !system-bootstrap ; then
+ local xpakvar="${ARCH^^}_XPAK"
+ export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
+ else
+ if [[ ${MERGE_TYPE} != "binary" ]]; then
+ JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+ [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+ JDK_HOME=${JDK_HOME#*/}
+ JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+ export JDK_HOME
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+ chmod +x configure || die
+}
+
+src_configure() {
+ # Work around stack alignment issue, bug #647954. in case we ever have x86
+ use x86 && append-flags -mincoming-stack-boundary=2
+
+ # Work around -fno-common ( GCC10 default ), bug #713180
+ append-flags -fcommon
+
+ # Strip some flags users may set, but should not. #818502
+ filter-flags -fexceptions
+
+ # Enabling full docs appears to break doc building. If not
+ # explicitly disabled, the flag will get auto-enabled if pandoc and
+ # graphviz are detected. pandoc has loads of dependencies anyway.
+
+ local myconf=(
+ --disable-ccache
+ --disable-precompiled-headers
+ --disable-warnings-as-errors
+ --enable-full-docs=no
+ --with-boot-jdk="${JDK_HOME}"
+ --with-extra-cflags="${CFLAGS}"
+ --with-extra-cxxflags="${CXXFLAGS}"
+ --with-extra-ldflags="${LDFLAGS}"
+ --with-freetype="${XPAK_BOOTSTRAP:-system}"
+ --with-giflib="${XPAK_BOOTSTRAP:-system}"
+ --with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
+ --with-lcms="${XPAK_BOOTSTRAP:-system}"
+ --with-libjpeg="${XPAK_BOOTSTRAP:-system}"
+ --with-libpng="${XPAK_BOOTSTRAP:-system}"
+ --with-native-debug-symbols=$(usex debug internal none)
+ --with-vendor-name="Gentoo"
+ --with-vendor-url="https://gentoo.org"
+ --with-vendor-bug-url="https://bugs.gentoo.org"
+ --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+ --with-vendor-version-string="${PVR}"
+ --with-version-pre=""
+ --with-version-string="${PV%_p*}"
+ --with-version-build="${PV#*_p}"
+ --with-zlib="${XPAK_BOOTSTRAP:-system}"
+ --enable-dtrace=$(usex systemtap yes no)
+ --enable-headless-only=$(usex headless-awt yes no)
+ $(tc-is-clang && echo "--with-toolchain-type=clang")
+ )
+
+ if use javafx; then
+ local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+ if [[ -r ${zip} ]]; then
+ myconf+=( --with-import-modules="${zip}" )
+ else
+ die "${zip} not found or not readable"
+ fi
+ fi
+
+ if use !system-bootstrap ; then
+ addpredict /dev/random
+ addpredict /proc/self/coredump_filter
+ fi
+
+ (
+ unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+ CFLAGS= CXXFLAGS= LDFLAGS= \
+ CONFIG_SITE=/dev/null \
+ econf "${myconf[@]}"
+ )
+}
+
+src_compile() {
+ local myemakeargs=(
+ JOBS=$(makeopts_jobs)
+ LOG=debug
+ CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+ NICE= # Use PORTAGE_NICENESS, don't adjust further down
+ $(usex doc docs '')
+ $(usex jbootstrap bootcycle-images product-images)
+ )
+ emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+ local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+ local ddest="${ED}${dest#/}"
+
+ cd "${S}"/build/*-release/images/jdk || die
+
+ # Create files used as storage for system preferences.
+ mkdir .systemPrefs || die
+ touch .systemPrefs/.system.lock || die
+ touch .systemPrefs/.systemRootModFile || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if ! use examples ; then
+ rm -vr demo/ || die
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ # must be done before running itself
+ java-vm_set-pax-markings "${ddest}"
+
+ einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+ "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+ use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+ if use doc ; then
+ docinto html
+ dodoc -r "${S}"/build/*-release/images/docs/*
+ dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+ fi
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+
+ if use gentoo-vm ; then
+ ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+ ewarn "recognised by the system. This will almost certainly break"
+ ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
+ else
+ ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+ ewarn "will not be recognised by the system. For example, simply calling"
+ ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+ ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
+ ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
+ fi
+}
diff --git a/dev-java/openjdk/openjdk-8.322_p06.ebuild b/dev-java/openjdk/openjdk-8.322_p06.ebuild
new file mode 100644
index 000000000000..3d08d57546ea
--- /dev/null
+++ b/dev-java/openjdk/openjdk-8.322_p06.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# we need latest -ga tag from git, but want to keep build number as well
+# as _p component of the gentoo version string.
+
+MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
+SLOT="${PV%%[.+]*}"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
+
+COMMON_DEPEND="
+ media-libs/freetype:2=
+ media-libs/giflib:0/7
+ sys-libs/zlib
+"
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+ ${COMMON_DEPEND}
+ >=sys-apps/baselayout-java-0.1.0-r1
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ app-arch/zip
+ media-libs/alsa-lib
+ net-print/cups
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ || (
+ dev-java/openjdk-bin:${SLOT}
+ dev-java/icedtea-bin:${SLOT}
+ dev-java/openjdk:${SLOT}
+ dev-java/icedtea:${SLOT}
+ )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
+
+PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+ local M
+ M=2048
+ M=$(( $(usex debug 3 1) * $M ))
+ M=$(( $(usex jbootstrap 2 1) * $M ))
+ M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+ CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ openjdk_check_requirements
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+ fi
+}
+
+pkg_setup() {
+ openjdk_check_requirements
+
+ JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
+ JAVA_PKG_WANT_SOURCE="${SLOT}"
+ JAVA_PKG_WANT_TARGET="${SLOT}"
+
+ java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # new warnings in new gcc https://bugs.gentoo.org/685426
+ sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
+ hotspot/make/linux/makefiles/gcc.make || die
+
+ chmod +x configure || die
+}
+
+src_configure() {
+ # general build info found here:
+ #https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
+
+ # Work around stack alignment issue, bug #647954.
+ use x86 && append-flags -mincoming-stack-boundary=2
+
+ # Work around -fno-common ( GCC10 default ), bug #706638
+ append-flags -fcommon
+
+ # Strip some flags users may set, but should not. #818502
+ filter-flags -fexceptions
+
+ tc-export_build_env CC CXX PKG_CONFIG STRIP
+
+ local myconf=(
+ --disable-ccache
+ --disable-freetype-bundling
+ --disable-precompiled-headers
+ --enable-unlimited-crypto
+ --with-boot-jdk="${JDK_HOME}"
+ --with-extra-cflags="${CFLAGS}"
+ --with-extra-cxxflags="${CXXFLAGS}"
+ --with-extra-ldflags="${LDFLAGS}"
+ --with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
+ --with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
+ --with-giflib=system
+ --with-jtreg=no
+ --with-jobs=1
+ --with-num-cores=1
+ --with-update-version="$(ver_cut 2)"
+ --with-build-number="b$(ver_cut 4)"
+ --with-milestone="fcs" # magic variable that means "release version"
+ --with-vendor-name="Gentoo"
+ --with-vendor-url="https://gentoo.org"
+ --with-vendor-bug-url="https://bugs.gentoo.org"
+ --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+ --with-zlib=system
+ --with-native-debug-symbols=$(usex debug internal none)
+ $(usex headless-awt --disable-headful '')
+ $(tc-is-clang && echo "--with-toolchain-type=clang")
+ )
+
+ (
+ unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
+ CFLAGS= CXXFLAGS= LDFLAGS= \
+ CONFIG_SITE=/dev/null \
+ CONFIG_SHELL="${EPREFIX}/bin/bash"
+ econf "${myconf[@]}"
+ )
+}
+
+src_compile() {
+ local myemakeargs=(
+ JOBS=$(makeopts_jobs)
+ LOG=debug
+ CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+ NICE= # Use PORTAGE_NICENESS, don't adjust further down
+ $(usex doc docs '')
+ $(usex jbootstrap bootcycle-images images)
+ )
+ emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+ local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+ local ddest="${ED}/${dest#/}"
+
+ cd "${S}"/build/*-release/images/j2sdk-image || die
+
+ if ! use alsa; then
+ rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ # build system does not remove that
+ if use headless-awt ; then
+ rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
+ {,jre/}bin/policytool bin/appletviewer || die
+ fi
+
+ if ! use examples ; then
+ rm -vr demo/ || die
+ fi
+
+ if ! use source ; then
+ rm -v src.zip || die
+ fi
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+ java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+ if use doc ; then
+ docinto html
+ dodoc -r "${S}"/build/*-release/docs/*
+ fi
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+ einfo "JavaWebStart functionality provided by icedtea-web package"
+}
diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
index 58cde9f297a4..0d20e28975e0 100644
--- a/dev-java/plexus-classworlds/Manifest
+++ b/dev-java/plexus-classworlds/Manifest
@@ -1,4 +1,4 @@
AUX 2.2.3-build.xml 5712 BLAKE2B 334710114da891baa655f4cf6811967af323fb957a97259f13326d3ce16b30d3b13c7cc9a05b26a275eb95d6e220a4b409d66332469699a1e2d063a50905f652 SHA512 575a086222b4cb9728b36c7a8d9eb64e73438023a0a83b94549962d88aea9591fb847c7d866a830e991bff296d66bf9ebd79c5a93922f040c9d5ce432fbc78cc
DIST plexus-classworlds-2.2.3.tar.bz2 41744 BLAKE2B 41ddc64c066bdfb5f2398773790b9fec213070d3dad5e57f7b0643f4347386d5304c435cd60e5b1fad32f2d7fae7b48a2afd0189d115018ed5ee38901c80867a SHA512 d5f3d3dac4df569b91ddea9265b14a2459b0ecd4ac3e4547cbac341f50d18238071a7a560d9771a9f8724c59225ea7fa8645ed72c5a00a684519a46a024c3c61
-EBUILD plexus-classworlds-2.2.3.ebuild 859 BLAKE2B 2292e34f07ca5fcc7b722bb631822d26dfd5adade739cc709955b7197353778efc1e52e30e2d0cd3aeb527f9c7383bd57017b8ad3c1b95228c332f43e81c2b57 SHA512 a604d9a2e78f41b4c17d97db8ba07554785bc0831f61048c53338318e3a2d7acf17db3188adbad83bda9275ea41597ee54a13886211e20cefa80d3b6fc355e11
+EBUILD plexus-classworlds-2.2.3.ebuild 878 BLAKE2B 204ef74a626df9e44bd69be8bae3521f7dd2d7e18b28ca397080c9f2e48f476cce61b8a3c7221b25bb71d9044dc33c7e15fd2c99dfbd87840b11574b7ce076fc SHA512 a220019da40d4af5dd732416c4c1dc9a44d842d24b1dfca66702082e58d4416e5eb5054f353219e89aab6b1257c031e22121c6eb490c88cead6a3efa328872da
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index 49465eea7b4e..bb3af0835423 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
LICENSE="codehaus-classworlds"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE=""
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index f45f95435d82..0e53901b03d4 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,14 +1,16 @@
-DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5
DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
+DIST protobuf-3.18.2.tar.gz 5272935 BLAKE2B f65caa4483d3ff4186f9ea388e2a9ef232ab758cfda846cfb5993df1f991e4574e63a33b175dd00c72f61c0a23ed12d3c62eb658cd397bf43b805c41fb34c47e SHA512 8ca613fdeefcbd93e866fab65effc38aa8508060aa3de0109dbead68f2e27eb22ad0a8aea10c8b4c3e9de181d62185c93b369fb5abf96de02a170f2e5c27e0cd
DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31
-EBUILD protobuf-java-3.16.0.ebuild 1454 BLAKE2B 72947e022e40f1584a085c0b04a4d14f7cbc5481efb650ef6554287aef504d0de7ebc39fd4c6696f75f8d621e2f960c4cd823cc385320e6d31bac51705249612 SHA512 634b18db5449411fed2546618bcd702cd5a8283f0ae00906655784c16de0fc56b39da567daf471833073635be31b152d0ff3149dbe4a18edb86c8c2660bd763e
+DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
EBUILD protobuf-java-3.17.0.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
EBUILD protobuf-java-3.17.1.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
EBUILD protobuf-java-3.17.2.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
EBUILD protobuf-java-3.17.3.ebuild 1451 BLAKE2B 4d08dcb9be366902af79f53bf8cb388ed2fd61192406ccca8089147f3854cef4e9d6824482dc2f35209cfe305e1ac69d1be790eeac87365aefd550c0a9d215ea SHA512 6804911a2b3167a7eb0889b4f7da071c97ec2b7aca9adb613679905f6ae3abb391caefbf3737a5ec30e7aef4ecd9a817df05b7ac16d95f893d4b6cce853cb89c
+EBUILD protobuf-java-3.18.2.ebuild 1454 BLAKE2B f11c30a01fb119f81be90639d0fb2667aaff9753c6559a60430205d5bbaacbac18d6ab3de7d6ce64f0634830c487923ba0a3dc1e5a76c9129325014245713228 SHA512 dcc86b5660d7d27fdefe40cdc1889fad5ea5a29adab114638e1afe9f976df27a3fc43775056fbcc937f93b4d898d367c6b63fc0b01f683c5fc1c50e56e3c7fd0
EBUILD protobuf-java-3.19.1.ebuild 1447 BLAKE2B 2988457aac2d90f55d39efbb976cc7af1d26277f9b810d06786d16660d4eb2412640fdcf595230eab986e35f372c6a559c13db4bb8cf2851cbaab7dd306446f9 SHA512 cebc604c66d76148bf206b3003fa99404a8116a62dad57aeee2fab451897238d75a3e3c47f127216a813af3a8e2e64785c41c437da0a3e342bac0c65361ec9de
+EBUILD protobuf-java-3.19.3.ebuild 1454 BLAKE2B 493b90da2ef5874252e9876e6a8e760b5cef2f672bafbb0789b08b0fdfd7950e00ef78d744a3e85e673b46dff08b924761f4273cfad2519c9529e5c1febc279d SHA512 c8f40fba3ff4333dd4316f59fec5e1165bfabdff0e9d19ff4d79f1995c6bb2c4f0601a4e028f09237dd7e5574aec27177802dd2353ceb81454b2b7ec621cbba4
EBUILD protobuf-java-9999.ebuild 1389 BLAKE2B e7a8e41fade60ff00e35c2cb29c185d68b2b5d41d99611f07eda97968c3b2f0d3e956304ae739a82cd386101dbd9936431483019b7bc38aad35d392674aa2bf4 SHA512 c0f3964bdde178cdf734318c9c5c42d5332401c276fa9513ec42e7729e8105b8129f89a53704f3b0622d831f96068501a131d47636aa95504a6d46df2e093f20
-MISC metadata.xml 550 BLAKE2B 199a2367980d49f3b97fac6fe86fc231d294c3088532a260c8dc7b099cb22f996e016b37f942e8e8db491beab5ad4b04628daccb4061c2b02d0f0f809488f4a1 SHA512 72bb0afbf02d603eb8b50d7bf483dfe9f45f857163856fb7407e88ff509008d9745bd8e5e9f7376720c8c6d5179405e2e7359efb0e5caf2ce3d5e4795b684163
+MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index 56ae0de29aff..7fc9e27ef82d 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -6,8 +6,8 @@
<name>Arfrever Frehtes Taifersar Arahesis</name>
</maintainer>
<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
</maintainer>
<slots>
<subslots>Soname version number of Protobuf</subslots>
diff --git a/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.18.2.ebuild
index 96752936a170..639718e1e00d 100644
--- a/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2021 Gentoo Authors
+# Copyright 2008-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -22,7 +22,7 @@ else
fi
LICENSE="BSD"
-SLOT="0/27"
+SLOT="0/29"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
diff --git a/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild
new file mode 100644
index 000000000000..e5e812ca84c2
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.19.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+ EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/30"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+ >=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/protobuf-${PV}/java"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+src_prepare() {
+ pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+ eapply_user
+ popd > /dev/null || die
+
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ "${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+ JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+}
+
+src_install() {
+ JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+}
diff --git a/dev-java/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
index a230405b72bf..f99e9f41e808 100644
--- a/dev-java/randomized-runner/Manifest
+++ b/dev-java/randomized-runner/Manifest
@@ -1,3 +1,3 @@
DIST randomized-runner-2.7.8.tar.gz 1501825 BLAKE2B e375d4509d8be914829c4ebfad5584e16f8f03be480ed21b52a0ad3db363b7f2761ae6442bb9baa8c929bc182c422963a6e8480165f53b7b820f9f4e2954a243 SHA512 5627f14dc70a6341838ad1ade0fa0f152ec6a5a7f3da4bc31e0ff040ea2c62aeafd669460f61f37db31de379db857ce3d58f0deed22d1cf714f1461988a92cdc
-EBUILD randomized-runner-2.7.8.ebuild 1478 BLAKE2B a5343169066ccd6e511864f3ba7dd60325d9d9e706f461d9d7e908bc9a46e7a3be616bffa63dcd158bad1dda108f4f2b5db88b0ba49e25172e67527fd9f1f7e6 SHA512 864f760005e08b96297e72bf13f33a4f0d01fc0b77ba9b1ecd309bdba189d5fe90ba41b2db4d0fac37078846848327655f267219a8e0a7b9c6a9698324822b28
+EBUILD randomized-runner-2.7.8.ebuild 1490 BLAKE2B b6e71993ef66146482b7df67dfb2ee34b5202ef5e611514e09431d160485fc13739b5a0ae098bea68138a830f4d39648b144763780603cc66d99b875f4d04fca SHA512 e4101cdd2a6302e12fe595a697bb90dd8bbe3bb3fbd584e8fcdf79b416517261ba96e42e6bb1ddbd66514c952c26a2b76a657e0c754047a8ba4e15ab42b89552
MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
index 599c16068738..ee0b27a1d2c6 100644
--- a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/refs/tag
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index c8dfda750cbc..79d67115a080 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,10 +1,8 @@
DIST resin-3.0.25-src.zip 10690692 BLAKE2B dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba SHA512 f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
DIST resin-4.0.27-src.tar.gz 10291608 BLAKE2B f28833923dbc49e255d5be04bd568705da953476fd10554db727f14667e3120b7278494cf8c59e6b58f825c4f50be8e766b648d7347f71dfda6743e26b157468 SHA512 498de18818f8c1e47919db2415292492ba4879765ad01a5c1a44c4b88bad02267aea245d3225197a62574091ef163910fb0c0924e06d9c9e03e8067dd7aacf08
-DIST resin-4.0.27-src.zip 17990178 BLAKE2B 2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
DIST resin-4.0.46-src.tar.gz 32564716 BLAKE2B 6f600cb52ab6f56271a7f75832f300af56d1a2d3a868f5fda208271bd93838e31e49b5f843b668b36a237ced363dd551cf6e8d82fcd70e58c1857667b2b9646a SHA512 649b7204c18e7d3a2144130f07590f2d5af29f3b0567acddd4a8d83caebc45a9dea10a671edebd1ff32df304d7a9f1ce44b0b86fdc0ba353fe01b26d900bd368
DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5 SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
EBUILD resin-servlet-api-3.0.25-r1.ebuild 809 BLAKE2B 3abb178b156dff27a40a39ad9764b9ae1b13cef98b5bc87ec66455e4bffa386e2d787ee07bce268cc7993f3095502addec8684b3bf75e87d0eeb597d480ecc04 SHA512 14afa86b24af0a961600a50904f02cf2fca0b8d87456265e77868c749228140a481eab377ee229abd37c79886ddb31c44f2d799c6a8d6159eeee43982759bf63
-EBUILD resin-servlet-api-4.0.27-r2.ebuild 1063 BLAKE2B 742020b2f3abef7af58a7a76322760ce12649ad31b63218cd4b505d931c0925fe6deb9ecfc5eba7932a731bc0d45f18612f391d615576db391b1fcbb9dfb8a1d SHA512 e96ca44533e321901b733621da9d24251589a83f0e7f34c4dcff10caeca2d4380658d6f43a188bbd28cef2ec45145a69cb7f57c54fa2d1081c13b6cabe9ccd0f
-EBUILD resin-servlet-api-4.0.27.ebuild 1127 BLAKE2B ef2e0779a6ba6ec6bc211fdbffb138aa6dc2442b8c556120e3d3b73abe79942851c3ddc19b560e26037ac04c4e900aaf0e6ea25147237586b7fc14a8260730b1 SHA512 c76c4f45a84e7b1806bdd2b0348e7251e84f4e571ad4c3651a42c5a49672257939a7e9e4a70230d63be6c240d1a4b79d291da5fa7bd94743cbb07332294083db
-EBUILD resin-servlet-api-4.0.46-r1.ebuild 1063 BLAKE2B e94b0bf2467dd09bb70f35ea2f53515a55dd4664ca1ee7d667d38a7c11e1993f0308dd17ffa47ca238a7d852fd10681dee7fbcc2f08594be0f7fa7a69cc7a269 SHA512 3f95b347a8dcc1b33a201ad9210188f1cb133ac946598fdfeb468c7aa19cd607d340feb4676e4497ec21ed8d9afdbc97058e959333dff67bc26c250dc7682c20
+EBUILD resin-servlet-api-4.0.27-r2.ebuild 1060 BLAKE2B c31b4051fc5c63884b42fb8dd94e2e69eb4d203f2735306d3d3379ef9a3014479fc2e2e0fd9db6250c73c59fa3ac0422533004e8770c5f3f6bbb80d85fa7d5be SHA512 3ae168d7d78c5a9a20e9d0b0516ef4f02a1285301e9fc06953f97ab666d7a0b2e79ece901e5df48d67e7f1911691fa4e0b1f586bc8a3ccc59bb8141546316643
+EBUILD resin-servlet-api-4.0.46-r1.ebuild 1060 BLAKE2B 089c853ea094b32d92fdfd134870e23b0f10cc08d05b503fd89d45120a5b6e3045a03f4a4de97abae387a4f91aea5a615775549ff4d5fdcf7d4bdf4a76c14ae3 SHA512 7c46120c9b5dbc2ee9d2ba3f4c4174f834cc4f9a2d57ee02b6dca1eaaad833a650a6bfcc481425e482e6e0106b77facf32387c2527212ae9425716c025d366a0
MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
index e0bc4f832070..62ce67795aea 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz"
LICENSE="GPL-2"
SLOT="3.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
deleted file mode 100644
index 62503ad641b1..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="3.0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-java_prepare() {
- cd "${S}"
- rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
- java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
- java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
- use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
- dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
- java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
- dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
- java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
index 4e73714c0d20..3bab35a2b31c 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz"
LICENSE="GPL-2"
SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/sac/Manifest b/dev-java/sac/Manifest
index 47214a210d66..ca96af1861f0 100644
--- a/dev-java/sac/Manifest
+++ b/dev-java/sac/Manifest
@@ -1,5 +1,4 @@
DIST sac-1.3.zip 163617 BLAKE2B d52ae09cfa7a60afb66ebebb395a93f2e69fb0fc2cdec3153b34350339d179c1621f9cb613889664e008a1ed9d121520431df13938b5d8d9d722e40da01eeb12 SHA512 e179d2e672f1e9e134c4bec92742410bcf2c5d423e5d236856bb53e849d7fcdb2bb09518796d30862685a9ab2344bfeea9b4c7f3c3dd4a1007c8056e120c87b9
EBUILD sac-1.3-r2.ebuild 573 BLAKE2B 99b41c787f0a257b68041bbcc3d5861ab40df88fdeb8cc1a0448dfc05705d8099df924df16eb49456547e61e9d0d8f271daae4ca19624a6499866989f10726ab SHA512 a679ac0fd19c578d74df57aee5e348ddcb897e832651905133c3174974712ef2cdb1031d5398d1bbd1f42ed2dfbff144550914a373e532eb5fdf2912879a76dd
-EBUILD sac-1.3-r3.ebuild 551 BLAKE2B 23f3e04eadcefc1bbcedb7e07414efa71b9452b1f1e3900c40feb43f0501035ccccb6de4d5abc505637dcbd9272ccf72cfcf665f7c08405cc8f59d669a3b04b3 SHA512 b2432e4a3b92c7c11ab5d6ec8237d91ad9a4f68ee63790b8b09bbbbbfa73b50ba89dc7b20bc929239c90e69416f94a5a7f6e436300cdb62276c347d93ae5c44f
-EBUILD sac-1.3-r4.ebuild 626 BLAKE2B 9edb1e8c2ae54d09d4e2c66bac17d4f37bd4e6a0eb6ac0bc14e8522593bef8d3d895854b06a08578d65612bb14ff37a5154d273995ab7beb78ddecd3027a79ca SHA512 5256325c67c83055bd2182b7a6d676adc16d7d60c56f012479edc8c5392c610bcac330f0a923a487a225c1d3d0ce34701e59b354cf19c6bd3f4a0e8d0e069d6c
+EBUILD sac-1.3-r4.ebuild 633 BLAKE2B 536b8c2fdcf557c84e1316dcac41448ea9058ad11c3e55c093b4f02931d94da594a5da53ffa49d7b94b577166d7d76ccd05faea5135cd68fb3490be75db85060 SHA512 6929915abdd0449758fdaf428e421ad655dedd2ca207f27ddf0f1dae031a81a34d2cd843e88911e51350c8884ef828104df8c621107a98979f46840637cdf56d
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/sac/sac-1.3-r3.ebuild b/dev-java/sac/sac-1.3-r3.ebuild
deleted file mode 100644
index 8e4b59d4a0b9..000000000000
--- a/dev-java/sac/sac-1.3-r3.ebuild
+++ /dev/null
@@ -1,32 +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-pkg-simple
-
-DESCRIPTION="SAC is a standard interface for CSS parser"
-HOMEPAGE="http://www.w3.org/Style/CSS/SAC/"
-SRC_URI="http://www.w3.org/2002/06/sacjava-${PV}.zip -> ${P}.zip"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >=virtual/jre-1.6"
-
-DEPEND="
- app-arch/zip
- >=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="org"
-
-src_prepare() {
- default
- java-pkg_clean
-}
diff --git a/dev-java/sac/sac-1.3-r4.ebuild b/dev-java/sac/sac-1.3-r4.ebuild
index 3ce936aea711..53e08b765c02 100644
--- a/dev-java/sac/sac-1.3-r4.ebuild
+++ b/dev-java/sac/sac-1.3-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.w3.org/2002/06/sacjava-${PV}.zip -> ${P}.zip"
LICENSE="W3C"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
DEPEND="
app-arch/zip
diff --git a/dev-java/sax/Manifest b/dev-java/sax/Manifest
index c08211b51c7e..c17302dcc72e 100644
--- a/dev-java/sax/Manifest
+++ b/dev-java/sax/Manifest
@@ -1,4 +1,4 @@
DIST sax-2.2.1.zip 372488 BLAKE2B 27813712e81c8a42f746ac5d84f381f7d5d30b6e11988624a01616632b742ac90f834574c7c1288385b3d6720cd2f3ee0eb9df1644e7cca5eae813ef8a2f9f45 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648
EBUILD sax-2.2.1-r3.ebuild 630 BLAKE2B f194d0451fc5ea9c3357ac464ae1f05657f6838b8024a46ef747ff815a01cb60ad236ffc54af9644647783be49ca01c3c4b215b2fd750fb412af4f3e9dbe5501 SHA512 df55f243bb083c62d112e135d976820ad1558c633df24d4aba3faf4fc2650289285a90da3bd7e4ef157d6a909499d3d05ec81b62789576fb0ec948f00101f751
-EBUILD sax-2.2.1-r4.ebuild 673 BLAKE2B b98cb59dd48e2b701df68e16c576e24979ee788a3371716de72808b9547996d26be33eb499c815f1483af6cefadb0e00a037b01eac90087c9bf0a2d7770aee60 SHA512 3b0d46df350295d584f6cff679afcd3ba50c1b9ebf5233d140ca1ebb3a427a5dc69aa10492e6b9bc9f747bb76939fa470c7b224586930d8b4e659a77ec24364d
+EBUILD sax-2.2.1-r5.ebuild 731 BLAKE2B f9f7ee29aaab765532e1540e576f4b14c801adf65cd9e7f0a1bc0d914aa22e57686a4481db119af3317d069b91c252babe58e9f8edf4be91792f9ab84189ebc4 SHA512 236141029e371486baf1c7c78e3b0ba9514d0214c9da233ef6a388a9112ebec71edc0523e15bb900e4cc70c8be061d6335be7f4f799acb5488647c38b9e22bc3
MISC metadata.xml 310 BLAKE2B 6f27bc088c8ab7cf0461ae4f097031fdc391476fd08dcb33e1780cde6a384e41351b3829558c291ca468a9875f7de9e0aeca96aa645a4316f1c62b6471b310b7 SHA512 bcd71a2b8844f9b91f3f0c93a2da9dd499a93e46a629801c54fe727ee83856716da0c860936aedc4c08bbadd20417fc3b01a02dcbc0c247ff05f60fb4479440b
diff --git a/dev-java/sax/sax-2.2.1-r4.ebuild b/dev-java/sax/sax-2.2.1-r5.ebuild
index dd2aff2873e2..4969e66b47eb 100644
--- a/dev-java/sax/sax-2.2.1-r4.ebuild
+++ b/dev-java/sax/sax-2.2.1-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -17,13 +17,18 @@ LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+DEPEND="
+ >=virtual/jdk-1.8:*"
+
RDEPEND="
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8:*"
-DEPEND="
- >=virtual/jdk-1.6
+BDEPEND="
+ app-arch/unzip
source? ( app-arch/zip )"
+JAVADOC_ARGS="-source 8"
+
S="${WORKDIR}/sax2r3"
src_prepare() {
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 0877fef74c23..247c43622f1f 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,3 +1,5 @@
DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
+DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
EBUILD slf4j-api-1.7.30-r1.ebuild 1370 BLAKE2B 1f3f7b0777335c12c72a2b6cc7b2f86755350d973db339d269fe352317e70ad8b36d0024d08818c959d0f61f2df02ee11ce32c15e7f3818a9b4d972a33bc4d16 SHA512 c505fdcb9b95845e745ab22246728386872a19a26e2b4ba906a1542bc6ebbe50a0f038922494fcec06ed9f7fdc547ae21269fe7270e01830c9d73402a1a5b395
+EBUILD slf4j-api-1.7.32.ebuild 1471 BLAKE2B 955a2641968b81f58383aff9e9ff7337cf26b3845bef655cfaf2beed1a6f3d2ff07d8fcad79a479b717fc40bf6858c810e645a228138dc27a4fecff64b0ebd40 SHA512 9b15a88bd161b70ea887e1b4c080464cac4722a9abb0d59fd0cf0f18e58fa6cdb428e90b03b1e44cecb809d1a2f8bb70d821a9ebcd25237a79a7dc30377073b8
MISC metadata.xml 367 BLAKE2B 086e22a444bd6a3dfab4f0a74e4900ed1f1a7be81b47932e192ebe4d6d1e8d65b63f064848e5cd3f0ad03a40c54e863d48acad905e09b918b9f24fe255820883 SHA512 d80fd3fc9ad1da46807f41251cf2a9bc384ef6566c24627482b4d7d5d3c46c672dcdd19037fd80a482079af86662fd07d35cb33b34c2e14911de7f3fc6b5e3a4
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
new file mode 100644
index 000000000000..40f19bf19cb4
--- /dev/null
+++ b/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
@@ -0,0 +1,62 @@
+# 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://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.32.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-api-1.7.32.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-api:1.7.32"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The slf4j API"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+BDEPEND="app-arch/zip"
+
+DOCS=( LICENSE.txt ../README.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+JAVA_TEST_EXCLUDES=(
+ # java.lang.InstantiationException - not run by upstream anyway
+ "org.slf4j.helpers.MultithreadedInitializationTest"
+)
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+
+ # remove org/slf4j/impl/ from the jar file
+ zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files"
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
index e8a6913018fa..f309d4675ef0 100644
--- a/dev-java/slf4j-nop/Manifest
+++ b/dev-java/slf4j-nop/Manifest
@@ -1,3 +1,5 @@
DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
+DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
EBUILD slf4j-nop-1.7.30.ebuild 1437 BLAKE2B 653e4cf4692273839bef1fd7660d7e34250f3425ecaf710ecfc479f52df8b8b3cc360af22ca5551ebbf4f7a291135b224791fa0c19b35372cb8308d4bab81c93 SHA512 ae23fec76971365baf682fcef61c508e5cc29f1887e56d3fe5c49dd46debc29fb462bf24caaaf2ff2d4c1a39c6e794f07d70571522087126bf9b3d91dc535ff5
+EBUILD slf4j-nop-1.7.32.ebuild 1300 BLAKE2B bc3efc15a5ad22c8641f65f1aaef45201e424687deeb1710804f2ff4e0ba038acf4a3117dea4191402a47014bd7e906d2f6845747f46502f900c2daf7cba3919 SHA512 2ec7a8c5a9004995006f4d66f0125c90fea9b94382fe401acc5738db5714c0dcb519ac735c294bfb6e46f0883a8e0b15789be3f6554634a9f55863d81c935a7a
MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
new file mode 100644
index 000000000000..e480511feede
--- /dev/null
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 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://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.32.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-nop-1.7.32.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-nop:1.7.32"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SLF4J NOP Binding"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
+
+CP_DEPEND="
+ ~dev-java/slf4j-api-${PV}:0
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( LICENSE.txt ../README.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
index 72a0807c7bcb..4ba1d3b6611d 100644
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@@ -1,3 +1,5 @@
DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
+DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
EBUILD slf4j-simple-1.7.30-r1.ebuild 2034 BLAKE2B 148495626c3660c22e6b531a77a6284e9c9a5b27a2d34559ceb910221be7d79e7b6929cc5884eaa326f71162921ba02ce4118014b6905701a371ffe761e39e5c SHA512 4a7e43a61501da86e90830dcc298a21ff9e408238678dc9a85fc6c935853dee0f9303e2979346b4f9dee6755e92d2612ae385ae688ed9bb52823302ad5d6c269
+EBUILD slf4j-simple-1.7.32.ebuild 2074 BLAKE2B 958c5c3d66231934fbde4def1dbbef3853e1f7979905a26a1592d9aad3737ed58856dc1fc850547b73cb5c0d9615dd7919942eaec83e86c282dc4cfaf6773b9a SHA512 06bd156f6abce57ae27919ef4a62a6d87aff65b868bf18f204175b11482e57637428427e3e546d97cc51486f8b5a3e803a4e1ffa9f53cba8ead304cfe2b73cf5
MISC metadata.xml 367 BLAKE2B 086e22a444bd6a3dfab4f0a74e4900ed1f1a7be81b47932e192ebe4d6d1e8d65b63f064848e5cd3f0ad03a40c54e863d48acad905e09b918b9f24fe255820883 SHA512 d80fd3fc9ad1da46807f41251cf2a9bc384ef6566c24627482b4d7d5d3c46c672dcdd19037fd80a482079af86662fd07d35cb33b34c2e14911de7f3fc6b5e3a4
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
new file mode 100644
index 000000000000..c0eeacfedb10
--- /dev/null
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 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://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.32.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-simple-1.7.32.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-simple:1.7.32"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SLF4J Simple binding"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
+
+CP_DEPEND="
+ ~dev-java/slf4j-api-${PV}:0
+"
+
+# Compile dependencies
+# POM: slf4j-v_${PV}/${PN}/pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ ~dev-java/slf4j-api-${PV}:0
+ )"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( LICENSE.txt ../README.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+ # java.lang.InstantiationException
+ "org.slf4j.helpers.MultithreadedInitializationTest"
+
+ # java.lang.AssertionError: 1284 < 1263+16
+ "org.slf4j.helpers.SimpleLoggerMultithreadedInitializationTest"
+)
+
+src_prepare() {
+ default
+ java-pkg_clean
+ cp "../slf4j-api/src/test/java/org/slf4j/helpers/MultithreadedInitializationTest.java" \
+ "${JAVA_TEST_SRC_DIR}/org/slf4j/helpers/" || die
+ cp "../slf4j-api/src/test/java/org/slf4j/LoggerAccessingThread.java" \
+ "${JAVA_TEST_SRC_DIR}/org/slf4j/" || die
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index af7952104798..606801ffc188 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,8 +1,12 @@
AUX 4.0.8-r1-test-fixes.patch 3059 BLAKE2B 8b278f4d13067c5abc4994aca7cf7a011712d59fbe4595eb86a07a095680bba4a14fb5f1ae4ccee2705b21e0ad857562725c4e773a361eb4d392d64e8031dd09 SHA512 d1ed78332950c1ee81846f51086acec62e19c84293cf45d01a07379e4e96d0dfcfc3af933e78eb986d087a1083eeeead0d5bd80c2ed040861ca931df112d795d
AUX stringtemplate-4.0.8-fix-tests.patch 2956 BLAKE2B 698727b248f9ebbeda46f099c3880b104a6713c600d820f7576757ba69f72d207ff4ecb7271afd8113a4250d51dd63d16f908a3f2aeff76f6112637934dce411 SHA512 29d33536a6abbbb3b0c99263b15a3ba4cc90b5beb03965884598c5d946c41a4727d582b5143d3e7356c9f22fc148ad899efa3281927bf3aca0c4d9dc758d1a8e
+AUX stringtemplate-4.3.1-BaseTest-javac-source-target.patch 1318 BLAKE2B 6b93c9591b220584c8dca11a10c7012801f54d922a2dc938ce87cb7c996b0eec1124fb5ec57725a71c482c18922f8bae585f7aacc5609ac9e40715553f96d8e8 SHA512 618b10a46373cc0be12e3bbc6cf4d2177b300b52e65385d1babd1af67236f080a848ab61271c84102a305552de48071945e5f66c40aa084bf4aa8705ed92a267
+DIST ST4-4.3.1-sources.jar 198002 BLAKE2B d1bd78dac71800e342291920ba78ab39c9a43b1f3866e2afcb0e1d61d439592663a625efe2a5a215c6032469e7ebeeebb31267e1681536ca0cc524cc58781a3d SHA512 bd06940b629ab0378afd6342b6f5beef002023387843cefd866ebe6ae8e94996edc3f21a0c70ed3570d3fcb7194bf354d0e42d4eff32522b3c01c51369867be0
DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3 SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
+DIST stringtemplate-4.3.1.tar.gz 432541 BLAKE2B c5b4124524e36a7104908dabf9ed258d2397095d8dc86eef401d0da1ac245629e88a1b2d0e35417ed7735ad6b8495fd2cc82970601a16ee856f5456fdc24b48f SHA512 afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c
EBUILD stringtemplate-3.2.1-r2.ebuild 1557 BLAKE2B 23393c4b73e75d1dd536957bceef00194eef22db42db38a6423f3fbc515e9bcd89a554d725735c94040c8abdae462e712ed92e2f58594338710c8790b8ef3c0c SHA512 244089013be014dbc4de338339ead998c9aa19464e651f7fcc02fa56410218e8289e1d91b5deb6b3905a11696b4ff6c44a0d19f783157b96acf8f3d85647a7d6
EBUILD stringtemplate-4.0.8-r1.ebuild 2227 BLAKE2B 10d792caffab1e99e83eb551fc53603107f9be7f662fab164bc8b1573fbe577c777d509e8dbf1b1ea0e2cc899cf1c1b168f7314a5d98c817a74b019772ae785e SHA512 281ce1c2835412d72dd327dce4fb1df38a5e493ebb2f76ee59ce75945ecf4b4c4a45c6ea2e417e287ca1f422dd319bf693eafe19b4c52e84e04876454dab8b97
+EBUILD stringtemplate-4.3.1.ebuild 1878 BLAKE2B 9e8400a938e0ad81c1bb31e420e46ef0271b139b0ca6d4ebbfe06bc7aff06765f8154a4aa64ee9340494dd2ae616c09a09c07bed46b1dc1f7a1c52d5fe16002d SHA512 115ce9b075824cf3b3575ff9209a1a5cd191371b1780b14f71ae34f208b8c831e8d4f97c1e7e4eb592a3ce607a4bd7f6b9919736c4c2420fbd99374c9072a7f7
MISC metadata.xml 323 BLAKE2B 4b53767b7c81b78dfcfb69b4175baba46ee266cf145dff77dc855838f8b3209edf2fa1949b17aa88b284f0cc92d68250c0b64d4966253de734f1263d46b6b6be SHA512 9f7523f1186535db76c503816be7b41a6f58fb07469347d43acfbee68effdb5e748ebae3cc9cba2c9ac45b0c504b64eabd4947c48f040efa2d42f11328ae100c
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
new file mode 100644
index 000000000000..5824425ce35b
--- /dev/null
+++ b/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
@@ -0,0 +1,28 @@
+From 4e12a210f2b933c92ded6ee141f6399144a866f5 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Mon, 24 Jan 2022 06:17:03 -0800
+Subject: [PATCH] BaseTest.java: Change javac source/target to 1.8 for JDK 17
+
+JDK 17 no longer supports 1.6 as the source or target version.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ test/org/stringtemplate/v4/test/BaseTest.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/org/stringtemplate/v4/test/BaseTest.java b/test/org/stringtemplate/v4/test/BaseTest.java
+index 536d686..74a3949 100644
+--- a/test/org/stringtemplate/v4/test/BaseTest.java
++++ b/test/org/stringtemplate/v4/test/BaseTest.java
+@@ -258,7 +258,7 @@ public abstract class BaseTest {
+ fileManager.getJavaFileObjectsFromFiles(files);
+
+ Iterable<String> compileOptions =
+- Arrays.asList("-g", "-source", "1.6", "-target", "1.6", "-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", workingDirName+pathSep+CLASSPATH);
++ Arrays.asList("-g", "-source", "1.8", "-target", "1.8", "-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", workingDirName+pathSep+CLASSPATH);
+
+ JavaCompiler.CompilationTask task =
+ compiler.getTask(null, fileManager, null, compileOptions, null,
+--
+2.34.1
+
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
new file mode 100644
index 000000000000..3eb42e302549
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.antlr:ST4:4.3.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java template engine"
+HOMEPAGE="https://www.stringtemplate.org/"
+# Maven Central sources JAR for *.java sources pre-generated from *.g files;
+# the source generation requires antlr-tool-3.5, which depends on this package.
+# Tarball for the test suite and DOCS files
+SRC_URI="
+ https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar
+ https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+ dev-java/antlr-runtime:3.5
+"
+
+BDEPEND="
+ app-arch/unzip
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ dev-java/antlr-tool:3.5
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+S="${WORKDIR}"
+TARBALL_S="${S}/${PN}4-${PV}"
+
+JAVA_SRC_DIR="org"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5"
+JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
+
+DOCS=( "${TARBALL_S}/"{CHANGES.txt,contributors.txt,README.md} )
+
+src_prepare() {
+ java-pkg_clean # Just in case Maven Central sources JAR contains binary
+ if use test; then
+ pushd "${TARBALL_S}" > /dev/null ||
+ die "Failed to enter directory storing tarball contents"
+ eapply "${FILESDIR}/${P}-BaseTest-javac-source-target.patch"
+ popd > /dev/null ||
+ die "Failed to leave directory storing tarball contents"
+ fi
+ java-pkg-2_src_prepare
+ # Some of these tests requires a graphical display.
+ rm -v "${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index d28d1e6a5ca6..f70113cd29d1 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,4 +1,4 @@
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-r2.ebuild 1100 BLAKE2B 27bde07cf2f3cf4a3549c6ba772b1ce8281f527058934adc725f248a499b264839de4308c70e57d0eba0cae25c4bbe17b7c0cd403d18ab07f1b1d30532538593 SHA512 9841c2bc9294daf8c6134017e65c25b58fc5b6606f8ca7ee1aa8ff2669f2c37a478933f90596e48c9cfe127523fc00aa9e365c5861a649255a4884c8523d4379
+EBUILD sun-jai-bin-1.1.3-r2.ebuild 1112 BLAKE2B 541e6e4e4ace7dc16c9324dcf66a9eaabd9f83554378331827bca5b5de295911b103fbf7280e5efe97d30935b49bf8dbbe7afc76ac41fcf712e477c58e07e467 SHA512 8b751798fcf86a06def0c2d90dab288921b6058091676a911e532a099d489680d94d067b9f229ef7e74a48433b7db9a0c2ca7c1369a4257c420402a1515b7e6c
MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
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
index 36c1c67af629..ef3446d4185a 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="sun-bcla-jai"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
DEPEND=""
RDEPEND="virtual/jre:1.8"
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index c88b52888380..01604f6c75d7 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -17,7 +17,6 @@ DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f6
DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
EBUILD swt-3.7.2-r3.ebuild 4284 BLAKE2B 4f28f089ffd3e884f6c40c586bf49c7753498dc2f11d08cdbf5da5b30515365ea9f960f8d5ab9b43f7ac2465483d44c52c911a365d755dabb94d3a768b1d23ea SHA512 f22b5af349663407b65fe224dc0f3d993d31ca78de3a591fe506e85749d6442cfa47e46b9378f350b1e8fca64614fb9182211de364073d0bbd88576bfc5640dd
-EBUILD swt-3.8.2-r3.ebuild 4087 BLAKE2B 0407cc0b85e48c2aa97addb67d6b49b06b2d5a721a738cafe8846e69cb4bbed1718a6e398336574b7b37dcef3f33ce390fc12ffb86ea59320fd50ad3779bafa5 SHA512 fb0b2de757edc6e83368b191e0ad44379a9577d13a9e7f95666df91fe2ca2c3a6c46cfc76236ffe861fce7b3603a68ce215dc404496b95f3692f815b3d52cf4a
-EBUILD swt-3.8.2-r4.ebuild 4081 BLAKE2B d1d27cbe0ec2f322443349e570726e317b8aef89cc74cc8cae46d6284eabdf91713b96c3fe680ffa7cc514ccd0e06c8475f27d827103925b3ff7557e0e359552 SHA512 d05a019017a4bb774238833826003fc472685fc5838c515275233c18df1ef10fe18bd38ee542a347833893b3f03cfeac043a7342f00a74d5fe86d6ebf67c663f
+EBUILD swt-3.8.2-r4.ebuild 4078 BLAKE2B b286ec9203e40918a67a8790287392be6d61210c3d27a25ae19b01bbc1486ea0a2c9808c294f2f5019803aac60a6591d1484496c43e4a072e14ad29278982311 SHA512 cfee176de17b3a0ad851d9706db1ee9311453b8a82fe239163b801a66de9be3daf906902db907443d38b65e9c76a7dac38e87dea55bea810ad1bc5532d7f120f
EBUILD swt-4.10-r2.ebuild 4527 BLAKE2B 9f2d0c3eb9bf1903c9f14376a31d4e7e9e7dd0122dc4f8938f4bc38bf8bec5aaeb9257d90c3259257f666f48257176f9a98dd5ea10201a793a6c36a4b305ac61 SHA512 1aa4bba24a5dabcc1173cea8bf930a380eabab23ac26b89a564e683d711287fd6811bdfa7b114480951c914f4a533b4c8c9fda4db6f7377ee2074b1764e3c06c
MISC metadata.xml 519 BLAKE2B 5c132bb4b8d9fbacfae3262a550e34932088ecbd204c3a8c2c13d782b0b0fa37a3b255bc84c388ee13f874b427a87a4321e605d0c614308300c18715c9631ab5 SHA512 ef81d6d7cc9f8e2309dcb8bdd78ea942a7a300ba4ed8506a93f12150c9142a5f62a153c0d77e3000f78637d5523367b7fce1186bbac01cafae10d4d0af6c959d
diff --git a/dev-java/swt/swt-3.8.2-r3.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild
deleted file mode 100644
index 31af30f456c6..000000000000
--- a/dev-java/swt/swt-3.8.2-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="
- amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
- ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
- ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
- x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="3.8"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="cairo opengl"
-
-COMMON_DEPEND="
- >=dev-libs/atk-1.10.2
- >=dev-libs/glib-2.6
- >=x11-libs/gtk+-2.6.8:2
- x11-libs/libXtst
- cairo? ( >=x11-libs/cairo-1.4.14 )
- opengl? (
- virtual/glu
- virtual/opengl
- )"
-DEPEND="${COMMON_DEPEND}
- app-arch/unzip
- virtual/jdk:1.8
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXrender
- x11-libs/libXt
- >=x11-libs/libXtst-1.1.0"
-RDEPEND="${COMMON_DEPEND}
- >=virtual/jre-1.4"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
-
-src_unpack() {
- local DISTFILE=${A}
- unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
- unpack "./src.zip"
-
- # Cleanup the redirtied directory structure
- rm -rf about_files/ || die
-}
-
-java_prepare() {
- # Replace the build.xml to allow compilation without Eclipse tasks
- cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-
- mkdir -p "${S}/src"
- mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
- epatch "${FILESDIR}"/${PN}-3.8-as-needed-and-flag-fixes.patch
- epatch "${FILESDIR}"/${P}-gthread.patch
-}
-
-src_compile() {
- # Drop jikes support as it seems to be unfriendly with SWT
- java-pkg_filter-compiler jikes
-
- local AWT_ARCH
- local JAWTSO="libjawt.so"
- if [[ $(tc-arch) == 'x86' ]] ; then
- AWT_ARCH="i386"
- elif [[ $(tc-arch) == 'ppc' ]] ; then
- AWT_ARCH="ppc"
- elif [[ $(tc-arch) == 'ppc64' ]] ; then
- AWT_ARCH="ppc64"
- else
- AWT_ARCH="amd64"
- fi
- if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
- export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
- elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
- export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
- elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
- export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
- else
- eerror "${JAWTSO} not found in the JDK being used for compilation!"
- die "cannot build AWT library"
- fi
-
- # Fix the pointer size for AMD64
- [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
- local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
- einfo "Building AWT library"
- ${make} make_awt
-
- einfo "Building SWT library"
- ${make} make_swt
-
- einfo "Building JAVA-AT-SPI bridge"
- ${make} make_atk
-
- if use cairo ; then
- einfo "Building CAIRO support"
- ${make} make_cairo
- fi
-
- if use opengl ; then
- einfo "Building OpenGL component"
- ${make} make_glx
- fi
-
- einfo "Building JNI libraries"
- eant compile
-
- einfo "Copying missing files"
- cp -i "${S}/version.txt" "${S}/build/version.txt" || die
- cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
- "${S}/build/org/eclipse/swt/internal/" || die
-
- einfo "Packing JNI libraries"
- eant jar
-}
-
-src_install() {
- swtArch=${ARCH}
- use amd64 && swtArch=x86_64
-
- sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
- use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
- sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
- use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
- sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
- java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
- java-pkg_sointo /usr/$(get_libdir)
- java-pkg_doso *.so
-
- dohtml about.html
-}
diff --git a/dev-java/swt/swt-3.8.2-r4.ebuild b/dev-java/swt/swt-3.8.2-r4.ebuild
index 8bca8e212541..4078770338fb 100644
--- a/dev-java/swt/swt-3.8.2-r4.ebuild
+++ b/dev-java/swt/swt-3.8.2-r4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
SLOT="3.8"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
IUSE="cairo opengl"
COMMON_DEPEND="
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index bb207574c684..d9f955a180a2 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -2,17 +2,23 @@ AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfd
AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
DIST apache-tomcat-10.0.14-src.tar.gz 6074341 BLAKE2B e6607773aebb5b5279720cbcf667e9f82d752833a323dd611d411bcb48d6b0f42a98b9120d2bf29bb53e563f7f421194e92a41c89dadff76db2f6aaa171af64b SHA512 13614a410ecb7d5d1e4e6cc0e5dab9fe21809a8a70b3f42d5b0f75a2006d098857395858cdfacbe84349f73c1ce7eecca59c1bdeac809f434df8ae3f4cff46c1
+DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8
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.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.73-src.tar.gz 5973026 BLAKE2B d3d275b7462a3bd2ce9ce03869e09e42ec0da064eb764cf8168b8d003431d075952f15c083b5486e006629ec1f9dade154b0fceb20f2584168b36599c3c5485b SHA512 6190d78e2dd5d478131443807e464821a337c5c6c24ee91953fece377ad1c758339ce1588a7a5e90443ababac239b45e4aaa0422d68cba988d7c3da5fe95d1c6
+DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad
DIST apache-tomcat-9.0.56-src.tar.gz 6138381 BLAKE2B 5e49287531fcb9bcb80ba124ed83fc3acbf3406b53424c3be5c2b3fb04da86785ba9e3ef89283c3ebb88bc8aadf8211328608edf068f0d7733c2f0ec0401d7ce SHA512 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5
+DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a
EBUILD tomcat-servlet-api-10.0.14.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
+EBUILD tomcat-servlet-api-10.0.16.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
EBUILD tomcat-servlet-api-4.1.40.ebuild 1008 BLAKE2B 982a481d22749c6b7a68688ae81a12235bc3eee0a2a54fe0afc1791970c30186342f1541d080102fe06fbbc58305ed5ce86b4ed3458fdc2218c23503294e022e SHA512 26c604a85510835c146df1ed62ac97de9e9721388692f8e818949bdc9907e4d76b2077c785ae45b04774d493a147411d9ab1fb529a39c6c71b9b68970e468cb2
-EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
+EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 25cca0a5612b56c0c2999c574f3ae6b00f5940eca3d39e6378e5d2686d8fc6a75b728d0609dc3443a38a3edef641825c8862f17693b2920403369eb99d4c2371 SHA512 033a9bbd48a76792d9c00f5bda4c32d9c808484cde33c62206d2753b665f6d99c7668b95f2cf3e4337bcbbd00478de78d98623443be50e84c67e3d9382f44e1d
EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
EBUILD tomcat-servlet-api-8.5.73.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
+EBUILD tomcat-servlet-api-8.5.75.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
EBUILD tomcat-servlet-api-9.0.56.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
+EBUILD tomcat-servlet-api-9.0.58.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild
new file mode 100644
index 000000000000..5ed928878473
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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-5.5.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
index d30225f7f48a..45eff8f89957 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-5/v${PV}/src/${MY_P}.tar.
LICENSE="Apache-2.0"
SLOT="2.4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.8
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild
new file mode 100644
index 000000000000..c6359840b613
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 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.58.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild
new file mode 100644
index 000000000000..09fffd263372
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/typesafe-config/Manifest b/dev-java/typesafe-config/Manifest
index 8cb029a920c2..04f382b3c227 100644
--- a/dev-java/typesafe-config/Manifest
+++ b/dev-java/typesafe-config/Manifest
@@ -1,7 +1,3 @@
-DIST typesafe-config-1.2.1.zip 287878 BLAKE2B bf4d1001bb84d0102b91b7ff383d9313302d95fd854928a40ecfbaae7a18309cf3f8509af0968fa21cedc485a1691c135395ccea5f9e6ba1c94856f2bb7ce81c SHA512 178f0df81f081b9355951debd3a5435c7d6aae25893f049917a25861015eba18a305d5370d914b89a7c46e55b5d9f3939ddd0656cfa9a4691bd16cf32c796502
DIST typesafe-config-1.3.0.tar.gz 257311 BLAKE2B 6df016ef84f8e3f717ac22ea3a8a66ad54ab378645e853fbb5fbb3316dde56e4cf6ba7a256f38d8912514321060290a92c412ad9753c0244b35c20bb0a9e4950 SHA512 e8c0e3100b9e7c50ddd19285a3e33cc708711d0007719bb191012d88ddbd0286529172fce54a369c0dd86ced1c61807f40d5334a69b2c8bc6865a8b65740798e
-DIST typesafe-config-1.3.0.zip 363061 BLAKE2B 94c3f1f4eaaa831a15ef10619b672fb1882cfc472ab4d4ebb3494805f281152f7d01c56cee5f06a70319822d3e4254d540d4a5dde0f1c321b79fc4fbc18da6b8 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4
-EBUILD typesafe-config-1.2.1.ebuild 513 BLAKE2B 4ffefc33dd21ce468a19f2e1ff4dd05859bbfa19d7580cd4c24b3502bb98cee083f6e89e5cc53977cda5b4cd8b60350e867492916136b02b872a5b3c1d0232df SHA512 3325f637f60431c531ecdfdc8f865c83d11efc5c42a91fd36dcbbb6c42267381736cbdbc44cf4d9be97fbaad9dc32d24d986b06b6755713046a4946e275ce20c
-EBUILD typesafe-config-1.3.0-r2.ebuild 513 BLAKE2B 86ed7bdaf3f047441746fad30620efeadcef2fb32d5484f0a1a97277251b980b4dfbc9eccccd919dfcf0432a2f9b61521bf385174a74300fa42c83c24baaa368 SHA512 e8eefc1c7a9e8aa12e10bce89c8e16791c4c7d6b21359eaaa42d76785163f1b0e3358f92641e1ab42d554170ae7ceb2be981eb901fbaba785a53916c09173bf5
-EBUILD typesafe-config-1.3.0-r3.ebuild 515 BLAKE2B 94921deada227a3560d0692fe1f19acbedf04fc6345a4b72dc46b59b5a29a7f0facbd5b78b8e2423e4f2253377aebbdf83dc24e819017565b134a9e22d4b7a31 SHA512 e6da697d00e261a3fad9e37a795b0e4eab91991afaad851e2c0b5ca35d275e818406caf22fb69e72c2fb30173c94394b340e0371e075a385293b330fa43cdf0e
+EBUILD typesafe-config-1.3.0-r3.ebuild 512 BLAKE2B 13f33e7248c0d8d7f15f1bca2e1b63c47bce646602508ac90cd06302fbbbea7c6f39b80c9e05c62fdd89c2ad8563535e36be573bfdfe58b0beacf37bc5abaa5f SHA512 6634d02248b9f9c802d284a6030fab70e1dd9a8e0100ea60e7e840e73e3e74745b7cff0eafbfa10fb02fabb07be6fe002d40364c1c0b951f2106206dbe661b10
MISC metadata.xml 330 BLAKE2B 15d72bc4f4449579e0bc922932f2f6e9249683176213f8dc7e3b20c65d6eaa67f09bedcb87b58c66cce197e0e1f4e65bcb465f2946005ecdf9efe5a33923d3bc SHA512 601bef4eb1b817811252290e3a62e6ec51a2dc0d82c5b6fcdbbe7eb21c25b690168bdaa9952e4d3faa8dd1e97f18daa429cd9514e6d8995009621c83e3f311ed
diff --git a/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild b/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild
deleted file mode 100644
index e845f4083571..000000000000
--- a/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild
+++ /dev/null
@@ -1,22 +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="A library of arguably useful Java utilities"
-HOMEPAGE="https://github.com/typesafehub/config"
-SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip -> ${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="doc source"
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/zip"
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
deleted file mode 100644
index a8d9faf9ac95..000000000000
--- a/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 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
-
-DESCRIPTION="A library of arguably useful Java utilities"
-HOMEPAGE="https://github.com/typesafehub/config"
-SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip -> ${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc source"
-
-RDEPEND=">=virtual/jre-1.8"
-
-DEPEND=">=virtual/jdk-1.8
- app-arch/zip"
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild
index 8437c8eaf023..af9df09e8936 100644
--- a/dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild
+++ b/dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lightbend/config/archive/refs/tags/v${PV}.tar.gz ->
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
IUSE="doc source"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xerial-core/Manifest b/dev-java/xerial-core/Manifest
index 30b1f6e0dd0e..37749085dea8 100644
--- a/dev-java/xerial-core/Manifest
+++ b/dev-java/xerial-core/Manifest
@@ -1,4 +1,5 @@
AUX 2.0.1-build.xml 5674 BLAKE2B dc70ae55f105e36306cc30e71b64fb1008003b2a330dd12b7531a81191e82a6ea376eedd58495b788fa2a526badb5b33b0e72a4627c5cbe0db3ebefbd9eee924 SHA512 fe6cae55b06099f1718fe2d2b70f680b3549c20047884f879d4fcdc7f8765d4b18a5f8b80478b09913013958834f2602ded4e0b9580db96467d89b1bd5c23650
DIST xerial-core-2.0.1.tar.bz2 519709 BLAKE2B 3d81bda265e3b3b37a50a62061298f23de7c2947a9d50ba6eac336c3ec09fcaaeea84d456e344b0d2ae16710870025a869c2359a17f0956c8dda557804e9d5ff SHA512 39236e8a653301a6899ce80d3240d505e91f0cfc8878fa1a698113d06f3af3fd7adef540d72da1c0e1fb7101542c43e92fb9388243d95c3185a561532c18c6fb
+EBUILD xerial-core-2.0.1-r1.ebuild 1454 BLAKE2B 39c8bae5eea1ec987e023bd37a445fda6f38394cc310df81738195abaebacc3d22ebdba415696cac16f979befea37ea0ffad12094a9d38ef3151ffbe61c44d96 SHA512 c3074c29cc04a036755f1c25f401d782a1af7b3364010146f6679acff0e0d14863c81fb08098c648cba51584f8fa1da988cce9bdc978246edaf269549526b9f4
EBUILD xerial-core-2.0.1.ebuild 924 BLAKE2B eeea14596a52313896ec32d3fad773bebb08a8ee73fbb43f7ee16e818896920e3bbc2a230b1de586ec33900701c908b7826c37e44d77ced69806fa5cfb901651 SHA512 1d0e2abac6e6733e1992ea76d87788e489654af275849e4e78a5bfd5bf29fa9ea5f845b82684a39421b4ab4d9332f49140093fc5e7da89570bc42f94b7cf997f
-MISC metadata.xml 313 BLAKE2B 7b24cd808ef8170b3f144fc5f765cd7db4e96bc2e15cf20f711e9e864b28d0bd0170d05ca3f30d64355174e4d800c82b3d80dff06a7f40a870bef667891ec9f8 SHA512 bde10d0164b78ff71730e58393abf3400dc98092faed45960e8b6d101558c90806f8dad16faf928aca5e7f3cd00d72b0128861e7fc7759fc4188600131cbfd23
+MISC metadata.xml 320 BLAKE2B e2b3c6290aa495c539b2b3f7afe9fbbad2011245a00e41dd928649a35256f1882ea2bc0eb95c9b468e041734464f4299c39da87c7727b9f43ad8346a0d68affa SHA512 86ce5a0bed000e534fce286494c981aa6e3d8e7619c549ad666655d51928a62699cfd1638d99dcb66f3a83c5717aacb50211f3e2e3314408c188594e986f7171
diff --git a/dev-java/xerial-core/metadata.xml b/dev-java/xerial-core/metadata.xml
index 779bb7bdf601..7661bbcec79a 100644
--- a/dev-java/xerial-core/metadata.xml
+++ b/dev-java/xerial-core/metadata.xml
@@ -6,6 +6,6 @@
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="google-code">xerial</remote-id>
+ <remote-id type="github">xerial/xerial-java</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild b/dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..93fd310af6bb
--- /dev/null
+++ b/dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 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 mirror://gentoo/distfiles/4f/xerial-core-2.0.1.tar.bz2 --slot 0 --keywords "~amd64 ~x86" --ebuild xerial-core-2.0.1-r1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.xerial:xerial-core:2.0.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core library of the Xerial project."
+HOMEPAGE="https://xerial.org"
+# SRC_URI="https://github.com/xerial/xerial-java/archive/refs/tags/xerial-core-${PV}.tar.gz"
+# Downloading from github is broken
+SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+ "src/test/java"
+ "src/test/resources"
+)
+
+src_test() {
+ # 1) listResoucesInJAR(org.xerial.util.FileResourceTest)
+ # java.lang.AssertionError: at least one resource must be found in org.junit.runner
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if [[ "${vm_version}" != "1.8" ]] ; then
+ JAVA_TEST_EXCLUDES+=( "org.xerial.util.FileResourceTest" )
+ fi
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
index f11a276be129..1ae2ddb0b172 100644
--- a/dev-java/xml-commons-external/Manifest
+++ b/dev-java/xml-commons-external/Manifest
@@ -1,5 +1,5 @@
DIST xml-commons-external-1.3.04.tar.bz2 659665 BLAKE2B b7f51fab7162b905142c5256f1d03d519b4ab387edf8b4c3d738ac138cf6ad71f29fd568c99423f840be6eb02bb50e89cfab3c729d2d5071d8a66e30836d8f5e SHA512 8bc71a0850e751ae4a5057833d57b2235734facbae43c733b0a9d86e5be99af016b737f12f5566c736f71374a709dee9954089db8fbeff4fb4cbb236a9fd6abb
DIST xml-commons-external-1.4.01.jar 656529 BLAKE2B c51ca760c23759d4f4ad11fcb44caa1cb0bcb2785d9095ed56dba9b0d5fe57370a9d9aaeed5a8e0c1fa67918237ce693590bac791200add2e85155ab87ffe40b SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a
EBUILD xml-commons-external-1.3.04-r1.ebuild 1176 BLAKE2B 9ecd949cbe8aa224da80696219c7d43896ea673fc18f33653b138cdf60475b1a6b05186134b8ece5877db98b6788c132f7e7757d587a4f87e4cc1dbb9e604871 SHA512 3bcb0344160d994a5233703239cc667999ef4f12fcbd9bd2e03fc7a4986adca1a9c0815968645664ac25e0d04357381537f0f21f91b1a6349a72ab7070927731
-EBUILD xml-commons-external-1.4.01-r2.ebuild 777 BLAKE2B 128d9741d7d328eef9495af7d34fd160dcb6e32e369a7dfd660f52bc72df62fe48a8b53e47441f8ff8733043bebfa7aff91f5e93af423816339214032e97a726 SHA512 60da15652a5aed745ee0f13aca803048cf803f3c307842acb9778746b4a728b7d78f109baa997b03935e4d4aee1aceddd454eead4b2670846bf6badf51ba08e2
+EBUILD xml-commons-external-1.4.01-r2.ebuild 803 BLAKE2B 35740156a5cc1b08281c2f8f21addaf2cf60f1535818f7a711c8167da736d3fc492a2875048058a7dd19d0e62d0f9c67e61b4fa34095ee70b5da941c88604db0 SHA512 598b497716bf1be8de87dc702d867012137ad376427d9561c67b0ebeca3ed85feb966c4cfb54f783f5f04e14ad5bdfcef4e7518612f1f338a779e92262564559
MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
index ace9a08b3555..3e69a8ea4964 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
@@ -22,3 +22,5 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
BDEPEND="source? ( app-arch/zip )"
+
+JAVADOC_ARGS="-source 8"
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index b0ad98c04377..d53b0ebb1229 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,3 +1,5 @@
DIST xmlgraphics-commons-2.6-src.tar.gz 2718577 BLAKE2B 7be3565d2224adcb1a804a089f6f52810852117a7c13129822bd1a9f27f7c10abf186b5b7d703c0351ef76d50ddb741fae65094af35d2037044ad56220989dfe SHA512 bdf7fb21d076ba722648da016b0686ed3ea6f56b8ba1a8cea34b517095bf91ff900a937e45aba0977389ab736b1815a5733908ad4242911246555dce61cf4cfd
+DIST xmlgraphics-commons-2.7-src.tar.gz 2021218 BLAKE2B a16dda389662a38d5ebf6cbd015ac5bf8154b5e2df9e36fd3a33987b04a4de08cc1ebc71e940c05793ef045249c68e7dbb54c418a7c6888020a800e039b0a188 SHA512 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22
EBUILD xmlgraphics-commons-2.6.ebuild 2254 BLAKE2B 7ca08e13c790345faa8fe692f990d57844acfe3783c85c5bab81ca76d2228fade803134af6730f3d729410b7e52547b620b5a8e023049b9935d2fc49be73b2b3 SHA512 c43bcf61fff6a28b5acf844165ad3f574b23ed59cf77984b3accfc00da07158793a0123316e88c2840919971b698d044c340418d92c67b90ff93b4b148fe9c98
+EBUILD xmlgraphics-commons-2.7.ebuild 1824 BLAKE2B 0d4c08f0640e149b8f6ea258abb91d1e1a5f847608e635bbe818c51ab3cfeb7712a094ee18e48577ff2b585d14e93dde2e3b981af167fc9b918404554ac3797a SHA512 311c751a03dfdfe42ad74dced141743ac2239b57e2d767821ea09d4a44753d188662d130fc64469fb1913baaac88909de8d2b24046b8ed2e8c59026edc0a6e48
MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
new file mode 100644
index 000000000000..62a758d133f1
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 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 mirror://apache/xmlgraphics/commons/source/2.7-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Graphics Commons"
+HOMEPAGE="https://xmlgraphics.apache.org/commons/"
+SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Tests don't even compile with that old mockito version.
+RESTRICT="test"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:1.3.2 -> >=dev-java/commons-io-2.11.0:1
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+ dev-java/commons-io:1
+ dev-java/commons-logging:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:2.28.2 -> !!!suitable-mavenVersion-not-found!!!
+# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/mockito:0
+ dev-java/xml-commons-resolver:0
+ )"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( LICENSE NOTICE README )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,xml-commons-resolver"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/xmlunit/Manifest b/dev-java/xmlunit/Manifest
index 9de97f724748..f888922a1c6e 100644
--- a/dev-java/xmlunit/Manifest
+++ b/dev-java/xmlunit/Manifest
@@ -1,3 +1,4 @@
DIST xmlunit-1.6-src.zip 830899 BLAKE2B 74bc5238667444fac0a6780090a76cf9c2a6fa4f0536bdde36858190cbd0528873b14b5ee05e098840be1b01e0ccfa3d2243ef63f92dae6cbfef1d84732f1f33 SHA512 a7d15905d959ab5bfeb1807c80eab3e0aa58d501a2136335961da842b9571b95b4aab18189e9a21e59afac960ea83f9a2d32e3af398f63c0f839587b60b9f96b
+EBUILD xmlunit-1.6-r1.ebuild 1156 BLAKE2B 3b74d73dd4b2d1a1b3ed35cb6864f8ed570366ae47e826faa64389cc4c3f1dba85a446b023cb32e38e7522ad5be0b844e98ea936d5a1d873ce4dca760a917482 SHA512 235971bfc32ff8ef0098bbe6fdf99d523333231053d92b750c3c63b3445429602b43a5b0051c24ffd2e7b8c89cd93b95379d2915cea78f8aba36fe5e428e51fb
EBUILD xmlunit-1.6.ebuild 1107 BLAKE2B 2d74e0b4b38e2a8bfd7624573de1f7fd50deca0da2eb74d0c9e8f6e6a130dd7b2b55fba7f929cce7c8dd98f9079b0dcee0765837a6557713a81745d7c040d787 SHA512 2f2b130513571653bdf2535af57aa844b6205fd1943d5156220a7d3aed4c18e0f84f786ed5cb8bafebfb0116d5e258bc10d28fbd66643ddfb9fe70b06ae56f9d
MISC metadata.xml 314 BLAKE2B 163bb6e09dcedea6c61c6d6c433b282f69bb76d13623e3386d5068be39db821005028b3dc03b44ae4be8966a57a8ab39a5c241b950ef2267f5c5c63b058c3edf SHA512 8041ce046f9cee5f27744e7d8c39aa39aa82e3e37502b4702b50957bab45560c2da3c4af9ba7c7cd1b0ede5ec464f707c1394c7844fd3d46aeaf69ca5714f1b3
diff --git a/dev-java/xmlunit/xmlunit-1.6-r1.ebuild b/dev-java/xmlunit/xmlunit-1.6-r1.ebuild
new file mode 100644
index 000000000000..c285e2891c96
--- /dev/null
+++ b/dev-java/xmlunit/xmlunit-1.6-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="xmlunit:xmlunit:1.6"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+HOMEPAGE="http://xmlunit.sourceforge.net/"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/junit:0"
+
+DEPEND=">=virtual/jdk-1.8:*
+ app-arch/unzip:0
+ doc? ( app-text/docbook-xsl-stylesheets:0 )
+ test? (
+ dev-java/ant-junit:0
+ dev-java/ant-core:0
+ )
+ ${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+ ${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit"
+
+EANT_DOC_TARGET="users-guide-html javadocs"
+EANT_ANT_TASKS="ant-core"
+EANT_EXTRA_ARGS="-Ddb5.xsl=/usr/share/sgml/docbook/xsl-stylesheets"
+
+src_test() {
+ ANT_TASKS="ant-junit ant-core" eant test
+}
+
+src_install() {
+ java-pkg_newjar "build/lib/${P}.jar"
+
+ dodoc README.txt
+
+ if use doc; then
+ java-pkg_dojavadoc build/doc/api
+ docinto html
+ dodoc -r build/doc/userguide/html/
+ fi
+
+ use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/xmpbox/Manifest b/dev-java/xmpbox/Manifest
index 40adcf557961..31c15b2e0c76 100644
--- a/dev-java/xmpbox/Manifest
+++ b/dev-java/xmpbox/Manifest
@@ -1,3 +1,3 @@
DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
-EBUILD xmpbox-2.0.24.ebuild 1791 BLAKE2B 994e8c6a8bbc8024b8249b35b7c76988f9126552af735b12b6cc85700401c1cd45a13be6647f284533531bfe46bc2188e86b6ca8334e33e90a02b577d918c196 SHA512 a3cc86bee86ff01809459c9fc65ce1f3938e2fdde89ec97d96470be4c6ec04ba57e6bffdb80eeb2700ae66383829281005b391fc7949340e036b18c0e224afd5
+EBUILD xmpbox-2.0.24.ebuild 1787 BLAKE2B d8b899ad760cccea3df9635e6208a5dbfcd6fb5857b603c15d0519673188d2200f2b2499c5b1ba1d86c89aa38532551fc1ce554c71777349c0a457fef621bcd8 SHA512 b6bfd7171448049a706826da3d3c6577e1a801104a7d6d2a1c087295649f16adaaf1c47d197752592d4d216fa5bacf6965f6786721425a0cc01b41ec2bb3596b
MISC metadata.xml 519 BLAKE2B 49b3df59011f9aeb072d3e42abbc7955b3b49198c2be44684d629d47d69a9c48cee8e2b6e48e3983c9d1c06cd9070149b3472716fde75ff3ec110f3d35237b68 SHA512 45f490395e7eb8e0f4bcaf452ec1ac2839232c3f4028e7c3d98d0ae292112ec3290f4d59270343df5ef6f9cc5cc4138a4ec9488656dd19de9501eb226b400566
diff --git a/dev-java/xmpbox/xmpbox-2.0.24.ebuild b/dev-java/xmpbox/xmpbox-2.0.24.ebuild
index 428edda56d82..f7c6fc51fc26 100644
--- a/dev-java/xmpbox/xmpbox-2.0.24.ebuild
+++ b/dev-java/xmpbox/xmpbox-2.0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml