summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin55192 -> 55156 bytes
-rw-r--r--dev-java/ant-contrib/Manifest2
-rw-r--r--dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild (renamed from dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild)4
-rw-r--r--dev-java/ant-ivy/Manifest2
-rw-r--r--dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild (renamed from dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild)7
-rw-r--r--dev-java/antlr-tool/Manifest4
-rw-r--r--dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild1
-rw-r--r--dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild (renamed from dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild)5
-rw-r--r--dev-java/c3p0/Manifest2
-rw-r--r--dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild63
-rw-r--r--dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch49
-rw-r--r--dev-java/cortado/Manifest3
-rw-r--r--dev-java/cortado/cortado-0.6.0-r2.ebuild37
-rw-r--r--dev-java/cortado/cortado-0.6.0-r3.ebuild2
-rw-r--r--dev-java/coursier-bin/Manifest4
-rw-r--r--dev-java/coursier-bin/coursier-bin-2.1.7.ebuild30
-rw-r--r--dev-java/coursier-bin/coursier-bin-2.1.9.ebuild2
-rw-r--r--dev-java/cpptasks/Manifest3
-rw-r--r--dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild64
-rw-r--r--dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild2
-rw-r--r--dev-java/fec/Manifest1
-rw-r--r--dev-java/fec/fec-1.0.4-r5.ebuild64
-rw-r--r--dev-java/gradle-bin/Manifest2
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.10.ebuild60
-rw-r--r--dev-java/gson/Manifest4
-rw-r--r--dev-java/gson/gson-2.11.0-r2.ebuild (renamed from dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild)36
-rw-r--r--dev-java/iso-relax/Manifest2
-rw-r--r--dev-java/iso-relax/iso-relax-20050331-r7.ebuild (renamed from dev-java/iso-relax/iso-relax-20050331-r6.ebuild)3
-rw-r--r--dev-java/jakarta-activation/Manifest2
-rw-r--r--dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild6
-rw-r--r--dev-java/java-config/Manifest6
-rw-r--r--dev-java/java-config/java-config-2.3.1-r1.ebuild43
-rw-r--r--dev-java/java-config/java-config-2.3.3-r1.ebuild78
-rw-r--r--dev-java/java-config/java-config-2.3.4.ebuild2
-rw-r--r--dev-java/java-service-wrapper/Manifest2
-rw-r--r--dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild (renamed from dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild)12
-rw-r--r--dev-java/javacc/Manifest13
-rw-r--r--dev-java/javacc/files/javacc-4.0-javadoc.patch14
-rw-r--r--dev-java/javacc/files/javacc-4.1-javadoc.patch16
-rw-r--r--dev-java/javacc/files/javacc-4.1-source8.patch134
-rw-r--r--dev-java/javacc/files/javacc-7.0.13-javadoc.patch14
-rw-r--r--dev-java/javacc/files/javacc-7.0.13-source8.patch100
-rw-r--r--dev-java/javacc/files/javacc-7.0.4-javadoc.patch12
-rw-r--r--dev-java/javacc/files/javacc-7.0.4-source8.patch100
-rw-r--r--dev-java/javacc/javacc-4.1-r1.ebuild (renamed from dev-java/javacc/javacc-4.1.ebuild)32
-rw-r--r--dev-java/javacc/javacc-7.0.13-r1.ebuild (renamed from dev-java/javacc/javacc-7.0.13.ebuild)29
-rw-r--r--dev-java/javacc/javacc-7.0.4-r1.ebuild (renamed from dev-java/javacc/javacc-7.0.4.ebuild)21
-rw-r--r--dev-java/javahelp/Manifest1
-rw-r--r--dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild56
-rw-r--r--dev-java/jcalendar/Manifest3
-rw-r--r--dev-java/jcalendar/jcalendar-1.4-r1.ebuild52
-rw-r--r--dev-java/jcalendar/jcalendar-1.4-r2.ebuild2
-rw-r--r--dev-java/jclasslib/Manifest3
-rw-r--r--dev-java/jclasslib/jclasslib-4.3.1.ebuild38
-rw-r--r--dev-java/jdbc-mysql/Manifest2
-rw-r--r--dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild4
-rw-r--r--dev-java/jdom/Manifest3
-rw-r--r--dev-java/jdom/jdom-1.1.3-r1.ebuild51
-rw-r--r--dev-java/jdom/jdom-1.1.3-r2.ebuild2
-rw-r--r--dev-java/jide-oss/Manifest2
-rw-r--r--dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild (renamed from dev-java/jide-oss/jide-oss-3.7.12.ebuild)4
-rw-r--r--dev-java/json/Manifest7
-rw-r--r--dev-java/json/json-20231013-r1.ebuild65
-rw-r--r--dev-java/json/json-20240303.ebuild (renamed from dev-java/json/json-20240205-r1.ebuild)25
-rw-r--r--dev-java/lz4-java/Manifest2
-rw-r--r--dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild (renamed from dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild)2
-rw-r--r--dev-java/maven-bin/Manifest2
-rw-r--r--dev-java/maven-bin/maven-bin-3.9.9.ebuild63
-rw-r--r--dev-java/miglayout/Manifest2
-rw-r--r--dev-java/miglayout/metadata.xml2
-rw-r--r--dev-java/mill-bin/Manifest6
-rw-r--r--dev-java/mill-bin/mill-bin-0.11.12.ebuild (renamed from dev-java/mill-bin/mill-bin-0.11.5.ebuild)9
-rw-r--r--dev-java/mill-bin/mill-bin-0.11.7.ebuild2
-rw-r--r--dev-java/openjdk-bin/Manifest63
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild (renamed from dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.ebuild)13
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild (renamed from dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild)13
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-21.0.4_p7.ebuild135
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-24_p8_beta.ebuild (renamed from dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild)17
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild (renamed from dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild)9
-rw-r--r--dev-java/openjdk/Manifest16
-rw-r--r--dev-java/openjdk/openjdk-11.0.24_p8.ebuild (renamed from dev-java/openjdk/openjdk-11.0.23_p9.ebuild)2
-rw-r--r--dev-java/openjdk/openjdk-17.0.12_p7.ebuild (renamed from dev-java/openjdk/openjdk-17.0.11_p9.ebuild)0
-rw-r--r--dev-java/openjdk/openjdk-21.0.4_p7.ebuild (renamed from dev-java/openjdk/openjdk-21.0.3_p9.ebuild)0
-rw-r--r--dev-java/openjdk/openjdk-8.422_p05.ebuild (renamed from dev-java/openjdk/openjdk-8.412_p08.ebuild)0
-rw-r--r--dev-java/owasp-java-encoder/Manifest2
-rw-r--r--dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild34
-rw-r--r--dev-java/protobuf-java/Manifest10
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.23.0-r1.ebuild (renamed from dev-java/protobuf-java/protobuf-java-3.23.0.ebuild)33
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.23.4.ebuild (renamed from dev-java/protobuf-java/protobuf-java-3.25.2.ebuild)25
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.25.1.ebuild166
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.26.0.ebuild167
-rw-r--r--dev-java/saxon/Manifest7
-rw-r--r--dev-java/saxon/files/9.2-build.xml72
-rw-r--r--dev-java/saxon/files/9.2-edition.properties2
-rw-r--r--dev-java/saxon/saxon-6.5.5-r3.ebuild48
-rw-r--r--dev-java/saxon/saxon-9.2.0.6-r4.ebuild90
-rw-r--r--dev-java/saxon/saxon-9.2.0.6-r5.ebuild2
-rw-r--r--dev-java/scala-cli-bin/Manifest26
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild78
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild78
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild2
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.4.3.ebuild (renamed from dev-java/scala-cli-bin/scala-cli-bin-1.2.1.ebuild)6
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild (renamed from dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild)6
-rw-r--r--dev-java/shrinkwrap-spi/Manifest2
-rw-r--r--dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild (renamed from dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild)4
-rw-r--r--dev-java/stringtemplate/Manifest4
-rw-r--r--dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch (renamed from dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch)8
-rw-r--r--dev-java/stringtemplate/stringtemplate-4.3.4.ebuild9
-rw-r--r--dev-java/swingx-ws/Manifest2
-rw-r--r--dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild2
-rw-r--r--dev-java/swt/Manifest2
-rw-r--r--dev-java/swt/swt-4.32.ebuild2
-rw-r--r--dev-java/tomcat-native/Manifest12
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.3.1.ebuild (renamed from dev-java/tomcat-native/tomcat-native-1.3.0.ebuild)2
-rw-r--r--dev-java/tomcat-native/tomcat-native-2.0.8.ebuild (renamed from dev-java/tomcat-native/tomcat-native-2.0.7.ebuild)2
-rw-r--r--dev-java/xpp2/Manifest3
-rw-r--r--dev-java/xpp2/xpp2-2.1.10-r3.ebuild73
-rw-r--r--dev-java/xpp2/xpp2-2.1.10-r4.ebuild2
118 files changed, 1249 insertions, 1506 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f266b5e2003a..93d34808e846 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 29522d86c154..e48aa0e65b64 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,3 +1,3 @@
DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e
-EBUILD ant-contrib-1.0_beta6_pre20201123-r2.ebuild 1981 BLAKE2B 7a68e3b812ea888204ee5656e71675c0c42484a5b6ea07cceaaf4c557782f2ec594355841aab7146a88446d8662f676ae126b7e0ff88e13966b2000d1f667f80 SHA512 0a7889334bc4515981e6cfbd2206cc73e3c34dc12dcf90210dd9dea7c87542c422673c0443b111c65433496ebdbf49466b3f2182090ff4416f954de866c7cb30
+EBUILD ant-contrib-1.0_beta6_pre20201123-r3.ebuild 1979 BLAKE2B f0edc72d57d0865d09a9994dffd46f0c2384b3bbfefbe22b758da461b7c115da8b5354b197cb1d39187d9b0e67d3a3fe791641974958bba57c5435a6de7d9a84 SHA512 f99925614acf5db260529745891b23be7d2e4c4ef40f9c6411820a59adac470e6d72186ada6706954c8e5a4c4b90eafcac36050bf264afab8fee21694b2b21d1
MISC metadata.xml 376 BLAKE2B 9a2a0c2682879b564c70896325934cbc53ec1289781487f4d82b1d053b5e45ed16a3fb9ff228c29f29975e8a2cc3231e9f9a7694ed2e504025f5d909e0a2e89a SHA512 a54fd5353676f4c1cbe28d463e4d245dccc342dd79d5809f1b130a0b93f9eceb2a93aa4addb8de98cfe26b5999c1bc7cb65fd075117a2b0f14ed41d92c2c144c
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild
index 172467ec6ed4..120a631bc481 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild
@@ -33,7 +33,7 @@ RESTRICT="test"
CDEPEND="
>=dev-java/ant-1.10.14-r3:0
- dev-java/ant-ivy:2
+ dev-java/ant-ivy:0
dev-java/bcel:0
dev-java/commons-httpclient:3
dev-java/xerces:2
@@ -54,7 +54,7 @@ RDEPEND="${CDEPEND}
>=virtual/jre-1.8:*"
# JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
-JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy-2,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy,xerces-2"
JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 8ba724658f42..a239bf2d959a 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,3 +1,3 @@
DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
-EBUILD ant-ivy-2.5.0-r2.ebuild 8507 BLAKE2B f88f6e98d61e346fca76f3e4cdfc1d9ce8cd96fc45bcf7872d2b5e1007ef67346b3a05f02a5b682ca732a014c5f6edfc0e87b28b661635ac38e6d10b46e14491 SHA512 5c6a77d82be45a6e50c4a3ee3615b82a06f36307f5e5436b4f45cf1496e060c650604e0cb300320f19e233e17b307eb40d37c7fd5217b78c3731956f458ab861
+EBUILD ant-ivy-2.5.0-r4.ebuild 8508 BLAKE2B 94f99f12bf306817969e6b38512871a0fe97c8c5841d0f685ea55dd8257771556c4fab68b83cabcb3d642e791e1d54f093b407bc581880944cd1f91783cf1946 SHA512 7ffb7a3df1bd596a4d48e6636683667cba668d48d10ca1e07373f83a07737de740782cb6fca6e299183d1631266415f7e06b289654fd3cdce7c2f25c22b1b971
MISC metadata.xml 853 BLAKE2B 908a789bf1e0310f1cb5fe27b360fb21c8b3569d99c20891a10b68be9162cf3c7009eefe0497c370699d005875d937da59b03d8f844a4d1a1a474f313f4c152a SHA512 af35a6ba951105d6c5e24ab2dcfa84a859184623c3911594bc82d72f3f96307da1dd8f6bef9be1297ec7cd0942680d77d6bdb44e2e5c5afe56cde761e018812f
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild
index 0158c70768f5..32e0a711eb11 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild
@@ -12,9 +12,10 @@ inherit java-pkg-2 java-pkg-simple java-osgi
DESCRIPTION="Ivy is a free java based dependency manager"
HOMEPAGE="https://ant.apache.org/ivy/"
SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+S="${WORKDIR}/apache-ivy-${PV}"
LICENSE="Apache-2.0"
-SLOT="2"
+SLOT="0"
KEYWORDS="amd64 ppc64 x86"
PROPERTIES="test_network"
@@ -24,7 +25,7 @@ CDEPEND="
>=dev-java/ant-1.10.14-r3:0
dev-java/bcpg:0
dev-java/bcprov:0
- dev-java/httpcomponents-client
+ dev-java/httpcomponents-client:4
dev-java/commons-vfs:2
dev-java/httpcore:0
dev-java/jakarta-oro:2.0
@@ -45,8 +46,6 @@ RDEPEND="${CDEPEND}
DOCS=( LICENSE NOTICE README.adoc )
-S="${WORKDIR}/apache-ivy-${PV}"
-
JAVA_GENTOO_CLASSPATH="
ant
bcpg
diff --git a/dev-java/antlr-tool/Manifest b/dev-java/antlr-tool/Manifest
index b3f9b511240f..d2e36d4a8879 100644
--- a/dev-java/antlr-tool/Manifest
+++ b/dev-java/antlr-tool/Manifest
@@ -4,6 +4,6 @@ DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda586
DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
DIST antlr-tool-3.5.3-sources.jar 949247 BLAKE2B f7afa52faae8324093206b7e56dfda58a79815cc2c13baca1cb93b3424c8b310325885ca8c86f0ca8a016a73e30740c2fa5f34ce71ed3a6cfc5fdeb6f2c4a9a7 SHA512 cfbc612c0257c4f0e09451cd76fe904680b6af132596696f2ef9c4e21dcfc53d53501e4d4d2b1c1cf4391355fa3766cf8dabc718dc3580728d24db3ebc14e696
DIST antlr-tool-4.9.3-sources.jar 961749 BLAKE2B 294c7ba6dff9a1039d3e570d7d49f46a564302d1e7a25ac9f662a2c293cbabadd6a5a4a94d026c4e5fcca37c407e104956badbd1cbbf71b957e464dc67cf823e SHA512 7d70e80714b673eb8301def5e66a7133b2ac477e3cc219e37877ef9df673e0599a1148a8c1929ca8eab081d4e7375c9079241765a1f38832b21cfe8608ef4429
-EBUILD antlr-tool-3.5.3-r1.ebuild 1958 BLAKE2B 12fec5c5bced1ba7264ab11b938211898a8b32651d5d6ae38d0bc44bb60ac451f4e7b1bead70c523ef9e2a026c11bf2008b65508b0e02826c3c417f8d009fd9e SHA512 dd2278182ceae5f8d82976fbb42c79296ba30e4c3bc45ec6daf29895e80b18a1a9f5d85f57f9f23d4b395a2f85b7e9616d19d6ac2848e52885ec66c97f558fab
-EBUILD antlr-tool-4.9.3-r2.ebuild 3712 BLAKE2B 981bfaf34c02951be230d694b4d58a9aae8c833742e1fd2f95be860754ddddf4351709b8ef70ce0447aa0722227a9ad20bf9d21c063f61552e1ff23ba385f1df SHA512 cfb3eaa48052d148f8c8025e99b6f367738d76a6b4601500137fe13e4c22d98cfd248de5e800aa72dab3edce2f648584ae8168781263181f1c2a2bdc738a3141
+EBUILD antlr-tool-3.5.3-r1.ebuild 1943 BLAKE2B 1d7a2632ac193d419bad4707f5b4b74a6589eeef9c247e56a2b37badcd2e30726305371ef0e5bd91e318dc2fa36505c2346f60c0c625eed83fe2c4a4dd32b48a SHA512 0cf818a1d04e6d8a755823e5c08376c6275daa5841fef4ff62b348f9228469e6f85c6a2fdd6106d5fc3bbe9beb993d38e73b2f63068b2542944c8805efa00bfd
+EBUILD antlr-tool-4.9.3-r3.ebuild 3724 BLAKE2B 748c8e79f92a94f232a4cd3797de473fddf96fdea205fb20181306d5e275e1b604c61ae7e58c0f9d557ee396d76fd5034e3ef010b915bc33d874920e7d0ad5f1 SHA512 d54d6d08120fcf0521a042a01056059a40c95cac90d7160869309853d5e9a67e121c3c8ed01eb895525956591462b50856f2219edc9c02e2615a4cb8d87c42b3
MISC metadata.xml 366 BLAKE2B 134ea633a45f3e33d57f4761afb1ff2d7f7778d06d66ff6e2e77a0c5777d48e8009697f64a4d50780b84b6672f352f4714a2b61d206cd158fcddd50902485caa SHA512 5b0bb774c494f1e7bbc486732abcea66922e65cd209df3d9fa090d71dabbc9aae59d437c340a5d78941d730388c95554fa80fb9852c8c0ceed05c9197d236301
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
index 1997ce8c081f..2bb054ab64c1 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
@@ -48,7 +48,6 @@ RDEPEND="
${CP_DEPEND}
"
-S="${WORKDIR}"
TARBALL_S="${S}/${MY_PN}3-${PV}"
JAVA_SRC_DIR="org"
diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild
index 2891b009c53f..c45261fa0f91 100644
--- a/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-4.9.3-r3.ebuild
@@ -23,6 +23,7 @@ SRC_URI="
https://github.com/antlr/antlr4/archive/${PV}.tar.gz -> ${MY_P}.tar.gz
https://repo1.maven.org/maven2/org/antlr/antlr4/${PV}/antlr4-${PV}-sources.jar -> ${P}-sources.jar
"
+S="${WORKDIR}/${MY_PN}4-${PV}"
LICENSE="BSD"
SLOT="4"
@@ -51,8 +52,6 @@ RDEPEND="
${CP_DEPEND}
"
-S="${WORKDIR}/${MY_PN}4-${PV}"
-
JAVA_SRC_DIR=(
tool/src
../src/org # For UnicodeData.java
@@ -103,7 +102,7 @@ src_test() {
)
local CP="${S}/${JAVA_JAR_FILENAME}"
for test_dep in "${test_deps[@]}"; do
- CP+=":$(java-pkg_getjars --with-dependencies "${test_dep}")"
+ CP+=":$(java-pkg_getjars --build-only --with-dependencies "${test_dep}")"
done
for res_dir in "${JAVA_TEST_RESOURCE_DIRS[@]}"; do
CP+=":${res_dir}"
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index ca216fdfd52a..6d9377abb69d 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,3 +1,5 @@
+AUX c3p0-0.9.5.5-source-target.patch 1729 BLAKE2B c077cc97c0f8dc880268f7b60175ce705536f8c12294e70450b6cdcf86677cf92f5c541411fa3d2034e90c8ceedcd79f10d70169eced3c3844022709091e84ee SHA512 c69d8223674510557b86b0adf83ea461e09d2d6f7dee559823c5955ee7d01d963c9d6a247d7cb52672743d6f03fc4c5747a6476002512238f4b0ee12cc9bfbf4
DIST c3p0-0.9.5.5.src.tgz 869069 BLAKE2B 6e1349d1cd02647a7c2424b8e89a8c21cfd8faefd26b7e05ee9e2da1a1a501b2b3102b142eef52f56dea672408d683a6f47b4c89b25d529a578c4b1fe4aa819c SHA512 fa96b5d0042442c773309090b9cf8f0db8e16f334e321ac952afb198ca06cd66f6f7162369f22a439a0e6b45b1ffcddf540af53804f223844d7a5465213bece1
EBUILD c3p0-0.9.5.5-r1.ebuild 1360 BLAKE2B 1a1b15eb6de048720a89c42dd934810a9f64eb66b3afad1728a86260f1528cd7ed3a7d69c9f245af468e29680eb866ae3cac046434436cf42656d1f13bd6537a SHA512 77c61f9f98e0f2f5e72289590775b4748b9562e5d661e65a1c7e5c3f71e9c36a337294d87fd55474cfbe4c2a68fa45dd623ef3fd041f7fa3baf3626156428739
+EBUILD c3p0-0.9.5.5-r2.ebuild 1551 BLAKE2B 19d9a5e96bded024bb5b9f2103ed23ff003c5fd9f55d671f121ce1abcb3ffb2b6f7a2ecaad892c1fd8cf3b6e87b3b47eaa549b26325fc3a17532a88f631ce668 SHA512 e55be2dc605cb7c1f38ed1b6b90893c3456df4c2c906fb3c48e9c6b5f7c67abb509b7c95f2bf7942e144651af518b6245742a8c23930f941a6c1d73fbbc1f50b
MISC metadata.xml 364 BLAKE2B 41a7f0e98d0f4de31b20f73cef598f7b92b7978c02a86709698152150e56ff00ab2c38204c270b316f0549961f550b53a50e5b32a40ad479aa6a24906a75e77c SHA512 724b392d317b00aa3f0e4f8e3ca1dd20f52abd03581172a15a54c9f803582fc4be26e92fa5c61786e6db821900a7d23c02655494d4fe33a552ec3aaf086ab5cf
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
new file mode 100644
index 000000000000..89dc72a719c4
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests require an existing running SQL server and 'junit.jar.file' property
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2
+
+DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
+HOMEPAGE="https://www.mchange.com/projects/c3p0/"
+SRC_URI="https://downloads.sourceforge.net/project/c3p0/c3p0-src/c3p0-${PV}/${P}.src.tgz"
+S="${WORKDIR}/${P}.src"
+
+LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+CP_DEPEND="
+ dev-java/log4j-12-api:2
+ dev-java/mchange-commons:0
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+PATCHES=( "${FILESDIR}/c3p0-0.9.5.5-source-target.patch" )
+
+src_prepare() {
+ java-pkg_clean
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_jar-from --into lib/ log4j-12-api-2
+ java-pkg_jar-from --into lib/ mchange-commons
+
+ # Test sources interfere with Javadoc generation on JDK 11
+ # Remove since the tests will never be run
+ rm -r src/java/com/mchange/v2/c3p0/test ||
+ die "Failed to remove unused test sources"
+}
+
+src_compile() {
+ eant jar $(usev doc javadoc) \
+ -Dant.build.javac.source="$(java-pkg_get-source)" \
+ -Dant.build.javac.target="$(java-pkg_get-target)"
+}
+
+src_install() {
+ java-pkg_newjar "build/${P}.jar"
+ einstalldocs
+
+ use doc && java-pkg_dojavadoc build/apidocs
+ use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
+ use source && java-pkg_dosrc src/java/com/mchange/v2
+}
diff --git a/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch b/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch
new file mode 100644
index 000000000000..d066a59fde1b
--- /dev/null
+++ b/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch
@@ -0,0 +1,49 @@
+diff --git a/build.xml b/build.xml
+index 47a0f2a..47f8f2b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -180,8 +180,6 @@
+ <target name="init-codegen" depends="debuggen,subst">
+ <javac destdir="${build.classes.dir}"
+ classpathref="codegen-classpath"
+- source="${jvm.target.version}"
+- target="${jvm.target.version}"
+ debug="true">
+ <src>
+ <pathelement location="${build.codegen.dir}" />
+@@ -224,8 +222,6 @@
+ <target name="compile-common" depends="codegen">
+ <javac destdir="${build.classes.dir}"
+ classpathref="build-classpath"
+- source="${jvm.target.version}"
+- target="${jvm.target.version}"
+ debug="on">
+ <sourcepath>
+ <pathelement location="${build.codegen.dir}" />
+@@ -246,8 +242,6 @@
+ <target name="compile-subst" depends="codegen">
+ <javac destdir="${build.classes.dir}"
+ classpathref="build-classpath"
+- source="${jvm.target.version}"
+- target="${jvm.target.version}"
+ debug="on">
+ <sourcepath>
+ <pathelement location="${build.codegen.dir}" />
+@@ -262,8 +256,6 @@
+ <target name="compile-mgmt" depends="codegen" unless="no-mgmt">
+ <javac destdir="${build.classes.dir}"
+ classpathref="build-classpath"
+- source="${jvm.target.version}"
+- target="${jvm.target.version}"
+ debug="on">
+ <sourcepath>
+ <pathelement location="${java.src.dir}" />
+@@ -318,8 +310,6 @@
+ <target name="compile-junit" depends="compile">
+ <javac destdir="${test.classes.dir}"
+ classpathref="test-classpath"
+- source="${jvm.target.version}"
+- target="${jvm.target.version}"
+ debug="on">
+ <sourcepath>
+ <pathelement location="${java.src.dir}" />
diff --git a/dev-java/cortado/Manifest b/dev-java/cortado/Manifest
index 1534d2b509b4..ae8fa795dbd0 100644
--- a/dev-java/cortado/Manifest
+++ b/dev-java/cortado/Manifest
@@ -1,5 +1,4 @@
DIST cortado-0.6.0.tar.gz 233854 BLAKE2B 54ace339a6038b46bbf2d993eb911f1845f8717dcf4eeaae0fcd807488a0293bb6618fe72ffa5bc425dc9f7d47f5362ff55168191aab15dbed59547f7c1d72dd SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da
DIST cortado-sun.audio-Java-9.patch 1653 BLAKE2B aa365d4c8746cb69aba3c78c1db37560808c99b73a1a0a4b8170e6df630faf526b793f4aaf5bdbaa28ecb9cf63cd97986400c6bc0acf59c9ddd9f12a9022e1be SHA512 e78468ee40b4eaae7da49de0d820a66c0ccb23a75974499de7e7cb9c8c6870521c4c5587b5d791e45c9d2316354dae422ff41ac0c6128381aa820d57f74a5527
-EBUILD cortado-0.6.0-r2.ebuild 921 BLAKE2B e2c4598ece91e7db0676036cbf758f1c1e6fe9ec037e4b6b8bc25cdfe0797c215e03d45bc6dc16039f225816e22e97e9d8120d7c7e956087eb2616352f0cb582 SHA512 451240d260e8701a6845e5134d4368612865cea88548739dfcd2a9774a800f0cf0ec67ee1cd3c66d7f18aed891c8c0e4d9bdef50667038eebaa96b9cba874f5c
-EBUILD cortado-0.6.0-r3.ebuild 883 BLAKE2B 15ca08e348975741b5e2eed2424fb7d2c5ec1718e40a9dc3c5536d101cdd688971c751bdc1299025388fc4a9b2e1695f580b18d6cf033074cf69446341d36a42 SHA512 610c2a0d2a710d0c6ae4ba057af18b2b1bccd5862e3d6e6910a2d0666d7c1f0f5c73670eeffdb62f31791b2a3ef8a9459aa3f63b2f455e78b4045dc6481addfe
+EBUILD cortado-0.6.0-r3.ebuild 880 BLAKE2B b25c85b15e685d7a5fa0936bb5f2e26c64579276ff3abdc45c12ad55f6b536b009406c41d36f7c6dbff1a46abad79a88bc595efa02bc769a126d90bb3ecb5628 SHA512 a9506f926a0d410441d3d5f8b11b14a6d846d71c194cbd6b7bc0050e9995cc5cdc7d6cdf34ba370a1051c1b941b1aeea60e3e65593959934885ff602194fba18
MISC metadata.xml 1039 BLAKE2B 2c718f02922e15112d22a0f9289787c129f7bca4b2d448e31a42edd961b2d238f3e7bb4f24a11a5e029d40fae48c521fb904891f32fc7e80140d51bff1a10925 SHA512 f4a9cb54e8b282812f1e73db192a575ca0cee2827c049ca1585a04c4b2f12557ec3df8b530f95dcf6af056fd7b50a733d29a09eb9b8c4d373ebccd3467a5fd80
diff --git a/dev-java/cortado/cortado-0.6.0-r2.ebuild b/dev-java/cortado/cortado-0.6.0-r2.ebuild
deleted file mode 100644
index 903bdfbfd5bf..000000000000
--- a/dev-java/cortado/cortado-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Multimedia framework for Java written by Fluendo"
-HOMEPAGE="https://www.theora.org/cortado/"
-SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Package 'sun.audio' seems to have moved to 'javax.sound'.
-# More work would be needed. Presently we restrict to jdk:1.8
-DEPEND="virtual/jdk:1.8"
-RDEPEND=">=virtual/jre-1.8:*"
-
-EANT_BUILD_TARGET="stripped"
-
-src_prepare() {
- default
- cat > scripts/get-revision <<-EOF || die
- #!/bin/sh
- echo ${PV}
- EOF
-
-# sed -e '/import/s/sun.audio/javax.sound/' \
-# -i src/com/fluendo/plugin/AudioSinkSA.java || die
-}
-
-src_install() {
- java-pkg_newjar "output/dist/applet/${PN}-ovt-stripped-${PV}.jar"
- dodoc ChangeLog HACKING NEWS README RELEASE TODO
-}
diff --git a/dev-java/cortado/cortado-0.6.0-r3.ebuild b/dev-java/cortado/cortado-0.6.0-r3.ebuild
index 94d8827d6314..5334a3b56737 100644
--- a/dev-java/cortado/cortado-0.6.0-r3.ebuild
+++ b/dev-java/cortado/cortado-0.6.0-r3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest
index 9dc89ceca666..f9f8e5658947 100644
--- a/dev-java/coursier-bin/Manifest
+++ b/dev-java/coursier-bin/Manifest
@@ -1,7 +1,5 @@
-DIST coursier-bin-2.1.7.gz 20790038 BLAKE2B 6e362ae784fcb7007f0adc58604d72dba33cb37f0726883b69f9f298e38759e3acea0232edac30c7cb34c5b837598e6b2c0947345938bce196f7a326a4aa3f0e SHA512 b6df4d7ad89f735989dfb4bb8cacbdf1559dd5ea4f494b7e72df544bd24a3a208738cf37d1cfd7944bb6aebc0e1b6d32b1bfd48c9f333cf54919a055afd5348e
DIST coursier-bin-2.1.8.gz 20863902 BLAKE2B 13ce0a1aa6dd2c1272567a76f3a762e31d9d6794e034e033d5d5accd0b6c534702fc62b5cab83070bb1081c7072ad7a04be86c38b4929d75f2d1f050f320820d SHA512 9cc8f13ecd0c166d46aaeeedb9279eb2885a7edac24c5b106ca30968c4c6fc5f47efe3a38e7aa6864dee517a7bc2cfba71fdd32741d295887bdb62594832bb9e
DIST coursier-bin-2.1.9.gz 20870390 BLAKE2B 720698e6c55a8c070d02f01ec528bab06f397b3c580fa3e533a45cf0073d8b9caf506cfff10d1b68eb9348c8b0da9abab9e7fb183f0561b62a82a96d21d35f5e SHA512 102c351aa0647fe5cd9d00ee164c1cebbcd6bd133a11bdfd653f70a5347da02e32ba74d5b51ea425e9189bb7113ef16c3902219bfa1ef0172bac7955712031c6
-EBUILD coursier-bin-2.1.7.ebuild 669 BLAKE2B 64c5e7d805585716260ef0de20153ea5b0c0b2930fbaf50eb8753663394175ae9998e9818a3e515f67fb562f3f62074966c1e5923c5d4df55b94377f4c7be52d SHA512 b95890ce9de7392330b27f14075f235ab5433c6e3fd79b6a2e72c1588c8795b9af2f9da075bd22fa20b303aa9c1cbd3e1252fa6ef56a0da1296e34db555c2d0c
EBUILD coursier-bin-2.1.8.ebuild 669 BLAKE2B e10123630e504447b5c707a7c262a682273a869c523bb459651ce4d6dac8aadda9f421ab93fd1f607a3a58e431aab4af73c5872a4fb2eaafba91fe2360626548 SHA512 a5e9e2de728bafde5357120bd9cd2a22a0d3e863cfd1d2e0df47a5b4dfacdc1ec7e3e8118122438f3b49c8994b1b89a34c0693b058129c36dd236b347655867e
-EBUILD coursier-bin-2.1.9.ebuild 670 BLAKE2B fe6f9eda270679924d8d3cec39e84815857293dfebd7e3d1c6d9de0f1f58ee96fce332ba48bbd8489a763f20c8869152e3b62948f510b96e442b6f809a23bc93 SHA512 3bcb6e14eb24335a8da591dc4dc58dfc230fad7c224ef3d29a0afa235477b1f2cf1f648a37c5bcbf20015490e582033483ee382ec7add4bd272aed94d8ee9b27
+EBUILD coursier-bin-2.1.9.ebuild 669 BLAKE2B e10123630e504447b5c707a7c262a682273a869c523bb459651ce4d6dac8aadda9f421ab93fd1f607a3a58e431aab4af73c5872a4fb2eaafba91fe2360626548 SHA512 a5e9e2de728bafde5357120bd9cd2a22a0d3e863cfd1d2e0df47a5b4dfacdc1ec7e3e8118122438f3b49c8994b1b89a34c0693b058129c36dd236b347655867e
MISC metadata.xml 465 BLAKE2B 08e5f6319567e09b6a0131e48c4a62ee9ba5b66a5702cdb00a0d247f800a16de842f9183c6050a688cff4134dc71645197fd45413ada2bb3681193add87b19ed SHA512 c7dbbe3df7b88edec56bf74f69d2bf6740924d615ae6b93081245224c6ed8405b3b00b5ba681852c146fd6f6bbd82889651e2e58c2be17213ce5113f2aad125f
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.7.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.7.ebuild
deleted file mode 100644
index 4c77d05f1d13..000000000000
--- a/dev-java/coursier-bin/coursier-bin-2.1.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-get_orig_coursier_pv() {
- local orig_pv=$(ver_rs 3 -)
- orig_pv=${orig_pv/rc/RC}
- orig_pv=${orig_pv/pre/M}
- echo "${orig_pv}"
-}
-
-DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
-HOMEPAGE="https://get-coursier.io/"
-SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
-
-KEYWORDS="amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}"
-
-RDEPEND=">=virtual/jre-8"
-
-QA_FLAGS_IGNORED="usr/bin/coursier"
-QA_TEXTRELS="usr/bin/coursier"
-
-src_install() {
- newbin "${P}" coursier
-}
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild
index af4c8329d0bf..536fb0da7de1 100644
--- a/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild
+++ b/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
HOMEPAGE="https://get-coursier.io/"
SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index b76520d51564..db454f9fd891 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,4 +1,3 @@
DIST cpptasks-1.0b5.tar.gz 902930 BLAKE2B 02cc20ea8e4316f7d0572cd147868219f1cfa326fd87d2edbea8a9b81c88f83173a373a88149bc2da55099bb9a0ac4d1f8927a6c708e6a5640b56220dbdba006 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c
-EBUILD cpptasks-1.0_beta5-r2.ebuild 1332 BLAKE2B 944ccd54edfe0de536f0f5462601da381ba52450008802fc4b9c09cd07d5b041bb045507ebc039bbccc3f5d2bb491c8dfb04edfe783cb3890a45df9f736d3919 SHA512 6c960a332ea92b88ce6b58c642ea3e328ae8732011e92fbc7a8cd0dfa1b7e9ee11ee05b556835ad580e1e910dfd186aae821ab1839db726105d9651cb464c5eb
-EBUILD cpptasks-1.0_beta5-r3.ebuild 1161 BLAKE2B f820bfb90e52a8f1b8807f29ce00340e5c04f962b76f188f7433613bec3e2f3fd0bd249ea7d71aced712b634738b5931eb23ca2bace176dc569e29f6f860ef71 SHA512 971faaca92bf8cb4a8a47424bb0ecfc968e5f8189bc9f43ed58773e0ba20eafbce0beb9dbf48e663e643529b23e0ac22811c754e433719fe1ad18216e50093d7
+EBUILD cpptasks-1.0_beta5-r3.ebuild 1157 BLAKE2B b2c29de250192acd09c03d4120b71ad318018311a5231d0138313fb74769c197785472eb11b48a7e2564557a50a51fc9605e7b0cfd19004fefd21d6939a5c22e SHA512 5db7372ac70c9ab9376185ce566c079e5c1da400e2d1446eb5a57da844eab58a255a4e63565ed50c8efed3714697316898113a1e81fdbac0aedf3b1082d4d479
MISC metadata.xml 318 BLAKE2B 53f5719585c7a4f0479017c4410975aefadcedd17db45949c351329e28761f05ebd89ef0557505a9a3ae03967b9baefe3e2c5b1edf0116a10434755a8d76fbe3 SHA512 b89f13a465ae0f1cad3352319206dc922badf513f63af878b118577e1f6da322b824dd14ca9220cf10aa5c5463c30399f001395a36c45c3b69228a375be379ee
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild
deleted file mode 100644
index 4908c223c0ce..000000000000
--- a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
-HOMEPAGE="https://ant-contrib.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
-S="${WORKDIR}/${P/_beta/b}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
- >=dev-java/ant-1.10.14:0
- dev-java/xerces:2
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
- test? (
- >=dev-java/ant-1.10.14:0[junit]
- dev-java/junit:0
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}
-"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="run-tests -Djunit-available=true"
-EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
-
-src_prepare() {
- java-pkg_clean
- use test && eapply "${FILESDIR}/${P}-test-classpath.patch"
- java-pkg-2_src_prepare
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar target/lib/${PN}.jar
-
- java-pkg_register-ant-task
-
- dodoc NOTICE
- use doc && java-pkg_dojavadoc build/api
- use examples && java-pkg_doexamples src/samples/*
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
index c588ecf5dcc6..22c0fbb9f05f 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_beta/b}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
>=dev-java/ant-1.10.14:0
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index e755e664a6b3..4b736c1b8b08 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -4,4 +4,5 @@ AUX fec-1.0.4-remove-concurrent-util-imports.patch 3146 BLAKE2B 8716fcc73a5e1030
AUX fec-1.0.4-soname.patch 790 BLAKE2B 852ef6ec83d42a15bfb1d67b05364d15c3027a8579d5e90dab4dec4cc99273383d89f5d5174ec8a6e2ab3cb09986d3fd60f39aedec6ae2da3f893325f88756c4 SHA512 1586fc0408274fff7eb3ba2cd95cfac8a94dad9981e2e01e8e11642692d2a27068936b673364c9c2cc70ca848d364648a66c728dc41d85c605a25b7fe79e2ec3
DIST fec-1.0.4.tar.gz 449406 BLAKE2B 132bb87ff0da35b9a1830d014c46fb82209b344d159b88c6dbf36c706de668cdb2dfc10894690009e9a47f461100beaf9cf25ad1c75a3b18194e5499457bcb6b SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343
EBUILD fec-1.0.4-r4.ebuild 1545 BLAKE2B a79eb3864e6a6af9ec3d80314d246b4d06a040f6d08ffaa5ad5cf539a928320bd7dd55caefd598744078b74fe01406648405b8e16fc083d5ec67a7826703154f SHA512 53b032dfe28bddce60b3af59a9c41e6241478574f40820cfcbe2f4ecacf8bcf0de00c9fec4d3f83b70843d4bc189853304960e3d98e84384cb216112633b092b
+EBUILD fec-1.0.4-r5.ebuild 1567 BLAKE2B ce1f459c5baf27e4666c2fc326a61df3c74118ec5f18a376ddffcba81769958ff85cae56d04486b530c0c0f35132e7cd60b84611dfc39997c1e632309cc51d15 SHA512 8cced82ee80ea14f4769ae04e0d65fc70fe77eaca776a3a789bf23c5cb8c7e3f2bdd001a2108db6a27cdd8cda9d2693466b7b8701a3195b1912dae5bdee06b70
MISC metadata.xml 318 BLAKE2B 463fade62b1a73b7fc75e7bd39e0e8f2d6d2450225af9001519bd14aeb48cf6bb8914f33b075388c683869d282f41ab2a1b2eba634ad43ac5c57d21be965dd22 SHA512 2434a4abc9ba27242e805fde38b3bce7785b44c3c9f9f89dcb8cec0b08776c0a4d64e0c9a3be0d86fd600256c8523d4020a3702b753b8f7b3770e6a73983ac7a
diff --git a/dev-java/fec/fec-1.0.4-r5.ebuild b/dev-java/fec/fec-1.0.4-r5.ebuild
new file mode 100644
index 000000000000..e55373ea5fdb
--- /dev/null
+++ b/dev-java/fec/fec-1.0.4-r5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic toolchain-funcs java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Forward Error Correction library in Java"
+HOMEPAGE="https://github.com/hyphanet/contrib/blob/master/README"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+CP_DEPEND="dev-java/log4j-12-api:2"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}"/"${P}-libfec8path.patch"
+ "${FILESDIR}"/"${P}-build.patch"
+ "${FILESDIR}"/"${P}-soname.patch"
+ "${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
+)
+
+JAVA_RESOURCE_DIRS="bin"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean
+
+ # tests have never been enabled on this package. anyway, keeping this
+ # package with sources hosted in dev-space is only a workaround until
+ # we have a solution for bug #936539. the time for bothering with tests
+ # should be saved for that part.
+ #
+ # for the time being we keep removing the tests like before.
+ rm -rf tests || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ einfo "Sucessfully compiled Java classes!"
+
+ cd "${S}"/src/csrc || die
+ append-flags -fPIC
+ emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)"
+ einfo "Sucessfully compiled C files!"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ dolib.so src/csrc/libfec{8,16}.so
+}
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 57bc4442b954..d541d2abc460 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,6 +1,8 @@
+DIST gradle-bin-8.10.zip 227843671 BLAKE2B fefa993dcceb31e6e864c08b67f922c7e797d9c847f286bd549dd181ef129c9d7f1268c9d806d0eb6ca7115be3063b44bdb05b9589eebfc69a4f4e4b60a98bf6 SHA512 b0888ba212c82306de2bef79d8fa091dabfeb5eeebd8f5075b3f9657df81d7263c496a35dd9a8e4d06476cad6879ae5176750e60951cd6900893dc6590739ab8
DIST gradle-bin-8.4.zip 212870963 BLAKE2B da32c1010e85f6cded0c1b539b243db6d41fcd033266be3b03b389e6a2e317bea17ddbe65c597c7ea82628cc5bec913954ec998d018b68daa67d39f9a8958e7e SHA512 52d5f622b8ad0ab36ff84589733b47423b12f94211086a84eca9810690af29e396877f1155ee31279c4325e98cd1d55b32137d52efcf48eb1e258caeece08f22
DIST gradle-bin-8.5.zip 218636663 BLAKE2B 0360f240f6183abec540f7755a966767a8dc175ca0ea047273e05c4b2219fd80cb92e62e9b961481d646157418cc91ea211eb83530cc6ec815ea790f6ad8380a SHA512 37a1c2989c46dad0f843565d05fd29010df10ac199d81f0ccddf56ffd490642039046d43a320ba04d1f87cbbc6d4cebf20ff66ce45ec005931cfc85aee2e0180
DIST gradle-bin-8.7.zip 224435312 BLAKE2B 1926765aea8931b25a9f0b7b9a224dd70756cfd337eecb364c6d288486187dd6311f888c7e1c36b1fc81b454c3514d2807884343e7782f1be45fce03e611496b SHA512 fc18863654cbe8dd2357f388c0fc5f699ca2d40ffd32c283f00cfd5bda94e1711ab7b7a3b154e7da66c17468f00c3c72fe6b6603c4a29617b33b0f292cbac3de
+EBUILD gradle-bin-8.10.ebuild 1103 BLAKE2B 4752cbd8d40e551b56728800e984429eaa52978c517ac005512cf584b0b4fa7508c6a8bcc4fb63f2d86c0c96e4d91ff8b8ec1f478d1da1710b655013b8d39691 SHA512 666b3c53d0efc006da0697a9c0a10a9232b7d8b4712fc10adee2badf17d847ae3c74112d3aad07ee3b0fb6d5e94b19a9e6eb7a9879b3eb59ecbe0b4606ad4655
EBUILD gradle-bin-8.4.ebuild 1108 BLAKE2B 52fe6916771dc8a6c6ae602d803565b94e9747c76393602dce7ac3c99d5604679abc5c47f8adac2e9bdb2e829fcba9b8aa25a583e9805563dde4d38fcfd879ea SHA512 35d80d31a1712384cfe6e98ceb6a17ac3a85b1dcaad76f46dfb818e0e64277a74b9f29a4944f3ace753deef6da6d529d903bf87c96f35d0f6d8067cc5fb23385
EBUILD gradle-bin-8.5.ebuild 1108 BLAKE2B 52fe6916771dc8a6c6ae602d803565b94e9747c76393602dce7ac3c99d5604679abc5c47f8adac2e9bdb2e829fcba9b8aa25a583e9805563dde4d38fcfd879ea SHA512 35d80d31a1712384cfe6e98ceb6a17ac3a85b1dcaad76f46dfb818e0e64277a74b9f29a4944f3ace753deef6da6d529d903bf87c96f35d0f6d8067cc5fb23385
EBUILD gradle-bin-8.7.ebuild 1108 BLAKE2B 52fe6916771dc8a6c6ae602d803565b94e9747c76393602dce7ac3c99d5604679abc5c47f8adac2e9bdb2e829fcba9b8aa25a583e9805563dde4d38fcfd879ea SHA512 35d80d31a1712384cfe6e98ceb6a17ac3a85b1dcaad76f46dfb818e0e64277a74b9f29a4944f3ace753deef6da6d529d903bf87c96f35d0f6d8067cc5fb23385
diff --git a/dev-java/gradle-bin/gradle-bin-8.10.ebuild b/dev-java/gradle-bin/gradle-bin-8.10.ebuild
new file mode 100644
index 000000000000..d02f8b44ef4f
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-8.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+HOMEPAGE="https://gradle.org"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+
+S="${WORKDIR}/${MY_P}"
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+ ${DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+src_compile() {
+ :
+}
+
+src_install() {
+ local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+ if use source; then
+ java-pkg_dosrc src
+ fi
+
+ docinto html
+ dodoc -r docs/release-notes.html
+ if use doc; then
+ dodoc -r docs/{dsl,userguide}
+ java-pkg_dojavadoc docs/javadoc
+ fi
+
+ insinto "${gradle_dir}"
+ doins -r bin/ lib/
+ fperms 755 "${gradle_dir}/bin/gradle"
+ dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+ eselect gradle update ifunset
+}
+
+pkg_postrm() {
+ eselect gradle update ifunset
+}
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 6ea968fede01..614c5483d5ad 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,5 +1,5 @@
AUX gson-2.10.2-GsonVersionDiagnosticsTest.patch 615 BLAKE2B ac75e23e48885403f61cd0b078984a7210576fc2567086a9d9af99a212471cead5d2d5961bb6b7958fb956eda6c348c08124c6e2c6cbc7afac6ff6a36b82a424 SHA512 c363625a645df1a7c3db737db39cc2e163fe4975b6bb51930b805ba359e61509e41397022d689874b6fa100917f6dd936c13c8c6457137f55370b48de35e2bed
-DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb73e969b89acb2598ca34a43faa97a09debc99466ab472176d60d617aa20b2190884def25881f0bf651e96be2c1bb9a976d70 SHA512 37f2073e5eee2cb85626040552ac750f4917abd05e3b7944c30a2d5ace6888424870a95a0ceba89bf2dadf9ab33e6bbae1591509b84f35aba4521780764c0877
+DIST gson-parent-2.11.0.tar.gz 458360 BLAKE2B 88d242c725b054ac5e7e3ef31f312f77dd03aea29f6604770253564d80f84cd752b43d74dd416785836d08884e462275f8ec924a00e2ffee195c0237bc2bac0b SHA512 1834b7c95f0a40ff1bcf8088f3ffdb8332ae38d452bab4ad2c9271421e75a9236645d1ee0fdb58c2f32eac86cf503afa3de19f08eb422cc91c4d32e370c36eac
DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
-EBUILD gson-2.10.2_pre20231128-r1.ebuild 2349 BLAKE2B d6dfbd7cedb55f46be4555af5ed44ab5f354a144f1976f63a2484fb82fdc7bdb223d81c2d14b67500f9fe28b1e083058ce09d1aeb706112a0e06e6f2f3175633 SHA512 387f18057dd39e4d232c5937d3f32b5d888a70ea2a2f63fcb661a9a02e382c4964d4c7b8da0a2835063f7f72628510cf43869bdd15dd8a09bf7a8f60100863ce
+EBUILD gson-2.11.0-r2.ebuild 2085 BLAKE2B 673cd9ea59b630e2c0fc64aa2dce42f075e086599f47fdb4974fb3a34bc20799f79b75bd5a352b9bc05061e4e4065bd5e24787bc2940012197baf32da6bc30cd SHA512 5cf2bea5ae1721f2da8916e97bc2fc42c9f0646073e6b830a7825099dff62a5a9bd3ae0b6d508b0d3d163d8c35a45d65a9a919dd35360e228410d4c05d2a478f
MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild b/dev-java/gson/gson-2.11.0-r2.ebuild
index 4247c08c2190..0284eb26ee8b 100644
--- a/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild
+++ b/dev-java/gson/gson-2.11.0-r2.ebuild
@@ -11,12 +11,9 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Gson JSON library"
HOMEPAGE="https://github.com/google/gson"
-# SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz"
-# S="${WORKDIR}/gson-gson-parent-${PV}/gson"
-MY_COMMIT="b17b1a0e98dcaf4b61823e1f0c29dda44c0ea3d5"
-SRC_URI="https://github.com/google/gson/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz
test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/gson-${MY_COMMIT}/gson"
+S="${WORKDIR}/gson-gson-parent-${PV}/gson"
LICENSE="Apache-2.0"
SLOT="0"
@@ -24,14 +21,14 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
dev-java/error-prone-annotations:0
- >=virtual/jdk-17:*
+ >=virtual/jdk-11:*
test? (
dev-java/guava:0
dev-java/guava-testlib:0
- )"
-# src/test/java/com/google/gson/functional/Java17RecordTest.java:78:
-# error: records are not supported in -source 11
-RDEPEND=">=virtual/jre-17:*"
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
DOCS=(
../CHANGELOG.md
@@ -53,9 +50,6 @@ JAVA_SRC_DIR=(
JAVA_TEST_EXCLUDES=(
# requires the test class to be obfuscated using proguard which we do not have atm
"com.google.gson.functional.EnumWithObfuscatedTest"
- # testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest)
- # junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest
- "com.google.gson.regression.OSGiTest"
)
JAVA_TEST_GENTOO_CLASSPATH="
guava
@@ -71,17 +65,15 @@ src_prepare() {
sed -e "s/\${project.version}/${PV}/g" \
-i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \
|| die "Failed to set version"
-}
-
-src_compile() {
- if ! use test; then
- JAVA_PKG_WANT_SOURCE="1.8"
- JAVA_PKG_WANT_TARGET="1.8"
- fi
- java-pkg-simple_src_compile
+ grep ^Bundle bnd.bnd > src/main/resources/META-INF/MANIFEST.MF || die
+ echo "Import-Package: sun.misc;resolution:=optional, com.google.gson.annotations" \
+ >> src/main/resources/META-INF/MANIFEST.MF || die
}
src_test() {
JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
- java-pkg-simple_src_test
+
+ # src/test/java/com/google/gson/functional/Java17RecordTest.java:78:
+ # error: records are not supported in -source 11
+ JAVAC_ARGS="--source 17 --target 17" java-pkg-simple_src_test
}
diff --git a/dev-java/iso-relax/Manifest b/dev-java/iso-relax/Manifest
index 9ce1e69dddb8..c54caae87140 100644
--- a/dev-java/iso-relax/Manifest
+++ b/dev-java/iso-relax/Manifest
@@ -1,3 +1,3 @@
DIST iso-relax-20050331.tar.bz2 696665 BLAKE2B 4f366818bed5e31fa8fc2f8759a38dddda26b8d379c4ba81ff3679228826890f7383606901440f51d958a2401943822bcb3a03bde9be1a647245563d58316526 SHA512 c327b461785ce647f9913afa6f5b77c41440e806d566884058be76e14a118d14fa305a1bc0157ee150b199b573e75af954311dc79eb8535599544f094526320a
-EBUILD iso-relax-20050331-r6.ebuild 652 BLAKE2B fa5d90b3cb303c1347f751c75cf9382c1cfcb78787db7bb2d1619919b2b8b34b108fbd5ef9bec7a0a86bed76c7f35b568c66302431959659766c676ccbeb70a7 SHA512 09e50d63432cf5329e8963838e1543e779fb3f47ec6189a8d021bd948da2d68a6474a9ee6213a94a1694796bfaa465c362e7c5072f377639918f13e1c94da863
+EBUILD iso-relax-20050331-r7.ebuild 666 BLAKE2B e1d7ab33f16429b9c87267c58bfa40b356f5a66d937b679422fcf9354da7ef0d5a16b64d9d85dc1b0b5e5b253ab71e7d17eb25c955f1d0e84e4d6719adbbb9f7 SHA512 39523c4596c6d39732ac99fe34b053e6ddc92a64b8744d0773afe4866a3cc809e1128834bcb6885103212219f9b8ded475cf33909eba8882728d08f261162b29
MISC metadata.xml 316 BLAKE2B 360a0a89a1c6cf082f7995e4ac740dda2e0197b5bdc1141f0cc2c21dbd7200ff46fa91897663cbb22777322cf49ea876300e792971d2654a9feb3009fca57b06 SHA512 d43cdc8324eca4c92128e04fede85cf82f03de72285ac294599beeee8809e228536a84ee917b18c24ed721e5063e8eb451154dc1eea217ee795d677aa8061745
diff --git a/dev-java/iso-relax/iso-relax-20050331-r6.ebuild b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild
index 6359c5cb8203..de9ed0e1d7b9 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r6.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r7.ebuild
@@ -19,7 +19,8 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-sol
CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
JAVA_SRC_DIR="src"
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index 1c4a33113aef..0f65335f2040 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1,5 +1,5 @@
DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10
DIST jakarta-activation-2.0.1.tar.gz 133817 BLAKE2B bd74e3df8a2d75c137cd3e25c9689296c4827f626c86455da4e10dd8b743e8ffbd5c502162f4f1f7399c4f1e1f2eab6632e9a69e67f017a7f8f111ea4a2ac836 SHA512 f5672f20588e894e7fb5248da7c69c1c8cebb3053342013f713fd58011a2ef069e9abfff8948613b19fd3404151f950d083aeda77ab6a79baaf673658016bfd6
EBUILD jakarta-activation-1.2.2-r1.ebuild 1353 BLAKE2B d5bb39b3a1e6ab97363f818d5067d68f3fbe570156adb22729e844fe6f30203e9ad1d26c9dfda7b0645d029d9e31f2e226834ba8e7b21093b02cb7742738060c SHA512 17b17e4134faf4e837605e2f18cbf10c39377544431eea20c712bd788c32aac4938579559c2383d69d789b47ca84c977b2f087b98cda654ff22aecdc8fdc631e
-EBUILD jakarta-activation-2.0.1-r1.ebuild 633 BLAKE2B 0b2b9305738f91907ad666b0670548691b4132950799d0af7c5c0100cc70fae3685e1a69b354177af320ec85922a587bc7394f9be9b33312516f9a27cde9dc62 SHA512 e4cdb98899920ef0c19c59dd76d57afd3b12165c3f23e6ca2516c6648a42f4f7ec66c9a5777069ac83c0a1f07cc22dd409a882c3564a907d57d56245c48e5f3b
+EBUILD jakarta-activation-2.0.1-r1.ebuild 631 BLAKE2B da99b4c47cd2624e1895decfd911eea50cdfb992e3c284ae6e219d131f31931ed75b15ac4487fcb4140b05c2be3ab540b772c2011dc71a323ef95c8d111625eb SHA512 d32456b263d2018b3bbfd2f842c6f03b46b31c9367aa80ed3729d9a8aee3431d6c3e58aa5e2a23715b3bd17f15d242805d89d826b352cabd6dd0a89e91e99587
MISC metadata.xml 364 BLAKE2B e6d9974b98d8675d21e9bad7ebe4d05bba1855171526218e8aaa403d0b48ec993689dfd7fdc3bf902b1ab9ad51669998d821b29a39cd3d7bc26e627b4803a027 SHA512 a7e1932872dc0660e85faa6371c9026e7325ef20f83e2a5938586f5a1fc2d28db7738f8897c01888277671f01aae2580d5ed33d88dbdeb5fc1d777349c1fe427
diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
index 7b2fc15669ec..4eae70ab60e3 100644
--- a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,8 +17,8 @@ LICENSE="EPL-1.0"
SLOT="2"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND=">=virtual/jdk-11:* "
-RDEPEND=">=virtual/jre-1.8:* "
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 48035f9edf03..469116a8f9fd 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,8 +1,4 @@
-DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
-DIST java-config-2.3.3.tar.gz 33837 BLAKE2B dc522a61775272e520521a06c80ac33cbe40010a40051857df8abdbda72cc064969cb00dbf8f7d06efabd352d9cf2c711808205579c7cef73ce4bb7fe2845c8d SHA512 f999ccbdd47f2552913467d3b0c6704fc6511f2bc9d0a6f62d38a9c2e9899f11b239f2039b025f7fdee5e0713d2aaf13c1a9a9baf4f1551bb97d85b12d3f28e9
DIST java-config-2.3.4.tar.gz 33833 BLAKE2B 36cb628375a05530f515d886d819bc99a7ed233bec2956db3562349ae845be57363a2b6629ab5536be15c5f64387d0760cca7959b76a5685918732ee7bf62300 SHA512 9df42a70aceb400a9fab73668151da783e98e767fa6289c13427095d7a3268bd4bb15de9ef980b82692e7c1cb0eaf5326c19a632679419d78a419294579fb29e
-EBUILD java-config-2.3.1-r1.ebuild 1115 BLAKE2B 56a55948eb49929d4f9852662fcaaa17432abfba9c43367186d017bbc5854fe6a66aafe7313f3000db280500573badbc422dc5ee9f0e82ff15cf48ac4149d4b3 SHA512 8d13961648a6ff645dc1b6bffbc0389cb2b73455e798ab71f87f1d03c540efdef30dd276d70e7c5b6a181a8aa0916c91194a77a7b505b86ffd941a9ea0d69fd6
-EBUILD java-config-2.3.3-r1.ebuild 1717 BLAKE2B d27e002a008385ce859d191512e57932083276b5546a6a454a45fc811b6e2d5eef94ac22d45b89e1916c7dc7d2d0bcc181798800d6acd78678a8ab53a50667df SHA512 2ad4119601732d4827857340c4efe65bbac5fa6ae2082c150713433f52d7aba7cdccae36d81fde32a36d0cc6c0888b80ecc47b9d85bb91b044a312df82e2993e
-EBUILD java-config-2.3.4.ebuild 1745 BLAKE2B 2960c01b67cdf2c21310f3cbcc4f3571568a4224b66894a61c87ad4a1d3b4817aa7af21cc1c6445a05cc6836dcdf3a2da821aad5d5ac186c44fd3d28d6bf6107 SHA512 71492ebdfc527147051260ea5dbaa4f0b6cfdf3117a7044b3e20abd2f14cb8a8e048853f4fada3f2fc0ce8aafc1c5d39cc749a2984ffe919280ad07db83a5a44
+EBUILD java-config-2.3.4.ebuild 1741 BLAKE2B bded2a20c13a7f4564847ac98a22899b43ec9f3755e3c2dbc46fd6d1dec736df46053e746496aa55d367b69c130bcc2fa19262a167c70d2c5ce7e5859f17cf01 SHA512 af216cb651e6b77c0004b469aa75537dc76856b4b9d272c450650d4367c30e4b40b26907d44673f27681650bd6559359c8e6f174bce8cabaffb8584837ad27fe
EBUILD java-config-9999.ebuild 1745 BLAKE2B 27d584230b5fcf22c3e73a2437789e48caac5ad4deab8676914d5d55aef8b2a5a80dbfab45c3078cff7100b8719dc0ca518527ea894a9d6ca24ed5a363ff5a63 SHA512 ffbb3ecde7a588675111ad1908d56016fff4ec72297037fe9a3708abf244515a4fc427385d0448270d4799ad946574524a74be3496053e91d19f98e0fc6622c7
MISC metadata.xml 802 BLAKE2B 300762f5d21abce3b3c37d88e678125c0c760813acb3b3171c1d151da89bd404d6914874d93b52580ca245d14d1fbdfd5801ab7e0204ece3bee7ec084180de1a SHA512 76efa4ab5aaeecce7d952d2a48b0d63027d5dc7d0fed45c947817c4e599e0dd2b8ea664d951a2f4b2fa2885a2a46a9750b5687f328691701d72d93d8ead494d3
diff --git a/dev-java/java-config/java-config-2.3.1-r1.ebuild b/dev-java/java-config/java-config-2.3.1-r1.ebuild
deleted file mode 100644
index 13f2ded5c0e8..000000000000
--- a/dev-java/java-config/java-config-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Java environment configuration query tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-# baselayout-java is added as a dep till it can be added to eclass.
-RDEPEND="
- sys-apps/baselayout-java
- sys-apps/portage[${PYTHON_USEDEP}]"
-
-python_configure_all() {
- # setup.py fails to update this file
- eprefixify src/launcher.bash
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- # This replaces the file installed by java-config-wrapper.
- dosym java-config-2 /usr/bin/java-config
-}
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-java/java-config/java-config-2.3.3-r1.ebuild b/dev-java/java-config/java-config-2.3.3-r1.ebuild
deleted file mode 100644
index ab1cb1b890e9..000000000000
--- a/dev-java/java-config/java-config-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson python-r1
-
-if [[ ${PV} = 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
-else
- SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="Java environment configuration query tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-# baselayout-java is added as a dep till it can be added to eclass.
-RDEPEND="
- ${PYTHON_DEPS}
- sys-apps/baselayout-java
- sys-apps/portage[${PYTHON_USEDEP}]
-"
-
-src_configure() {
- local python_only=false
- python_foreach_impl my_src_configure
-}
-
-my_src_configure() {
- local emesonargs=(
- -Darch="${ARCH}"
- -Dpython-only="${python_only}"
- -Deprefix="${EPREFIX}"
- )
-
- meson_src_configure
- python_only=true
-}
-
-src_compile() {
- python_foreach_impl meson_src_compile
-}
-
-src_test() {
- python_foreach_impl meson_src_test --no-rebuild --verbose
-}
-
-src_install() {
- python_foreach_impl my_src_install
-
- local scripts
- mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die)
- python_replicate_script "${scripts[@]}"
-
- # This replaces the file installed by java-config-wrapper.
- dosym java-config-2 /usr/bin/java-config
-}
-
-my_src_install() {
- meson_src_install
-
- local pydirs=(
- "${D}$(python_get_sitedir)"
- )
- python_optimize "${pydirs[@]}"
-}
diff --git a/dev-java/java-config/java-config-2.3.4.ebuild b/dev-java/java-config/java-config-2.3.4.ebuild
index 90c000f935f3..5e3221048e7a 100644
--- a/dev-java/java-config/java-config-2.3.4.ebuild
+++ b/dev-java/java-config/java-config-2.3.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="Java environment configuration query tool"
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 67dbab84be84..375c695e12d3 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,4 +1,4 @@
AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1292 BLAKE2B 192bb8dc9deb6d39131b4af992dc3e906fcf6d6d21e4d2edcb5e4aea9169c01dff273643c196b47c1f118b44e38083c1092f71e49e5502936945d51cf4c4c8b5 SHA512 075434a9a2067593332f7b0827dcc077102fb1c1ca11347ed3e2d62e499f6022c1948feaa3be66b17891e539c12a77d98bc292ac143bc5acdf387bd1e3ec399f
DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09
-EBUILD java-service-wrapper-3.5.50-r1.ebuild 2388 BLAKE2B f157561b01c9cbd75bc5f4327bdaa1eafb7fc445b024cf75c81c4f01cad3229cc4f542e8c3e932b188c03a09c23ca434536a0f5c83ead8ae3ccde3180add7fef SHA512 8a00fdb945e8cd0053daa3546c56e8000600f4bc81fe8c7fa25206b8d55f68c391e309f4c7a8f504844d8da5d9310324c0751aaa849a3dd99c1b9e7dfcda88dc
+EBUILD java-service-wrapper-3.5.50-r2.ebuild 2401 BLAKE2B f803ff8ba0834d57bc17b8a0ee9dbf3784e67cad21062ce7fbbab440f48621c899ad9fe6ab4865ebf77b330198ced6e296898a1ee0daae2a965244cf4b758247 SHA512 decd48432171932342c37b1e677b03d44ed8245c521b2c302830a013058bd3bf63a3a040436fe962841995b609a2510d17c1ef13cc33ebf1f93b6cfc7d5bdc63
MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
index 8fdfe9ac2063..2576ab85e550 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-pkg-simple toolchain-funcs java-ant-2
JAVA_TESTING_FRAMEWORKS="junit-4"
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
HOMEPAGE="https://wrapper.tanukisoftware.com"
SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz"
+S="${WORKDIR}/wrapper_${PV}_src"
LICENSE="tanuki-community"
SLOT="0"
@@ -24,9 +26,7 @@ DEPEND="
dev-util/cunit
)
"
-BDEPEND="virtual/jdk"
-
-S="${WORKDIR}/wrapper_${PV}_src"
+BDEPEND=">=dev-java/ant-1.10.14-r3:0"
JAVA_SRC_DIR="src/java/"
JAVA_JAR_FILENAME="wrapper.jar"
@@ -38,7 +38,7 @@ PATCHES=(
)
src_prepare() {
- default
+ default #780585
# replaces as-needed.patch
sed -i \
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 52ca3e7f1133..84adcb91fe71 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,8 +1,13 @@
-AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
+AUX javacc-4.1-javadoc.patch 376 BLAKE2B 24d09c2b38493f19a789407c53eb9300a7fa80ba4f86b84ef172bd3595c78ddb83d805e8b8ac09ecc275f77439ac993bb259023f9c27537fa53fe8642f473882 SHA512 befb1dfc7ee46ea8bcaf9495196adadfc5517987059f2985ea7faa50cf178aa05780ff53f34d19fb997d45ae70e989a480b7515ae3de68a92ae00d9c0cc0255d
+AUX javacc-4.1-source8.patch 3965 BLAKE2B 8951d57248b16be28cf404b3d5858b1810417e62c1669d578d49ebbbf08d1b8e2f9364e589a49e6791e6c93ef3808399d1d6443025fc949f1857d5471018cd23 SHA512 58f72973441f2e7bdaad74e3e2bba396193268eb607bea477f3c09e9967af919b8a4dcd34527ba2c1a8e1552af261be4d5d85d4205ae6b058b0a90b4786456e2
+AUX javacc-7.0.13-javadoc.patch 310 BLAKE2B e162fec107faac81615da6a887a904c8b0cae8ab33da81b6c3199b181ab9ca485a37a2f6a2833fe6440054c59cadbee38e81931c0d36d8adb4dc29801e06216a SHA512 012b88dceb5581ebdb7ac23cbbeca25d07a2357fb6f14b880f4cca269a173728d8c1d5183c1d559c041946fd0ecf936c70f09c64e1892adc13f474b0ae77c490
+AUX javacc-7.0.13-source8.patch 4562 BLAKE2B 9fae0163ec4f3392497716c083748603a461067f7d5a28b09050c20481554b42e71f83e5836fd62918b26f307ff81cc99c27a7c5da6f79565014b3165b5d7627 SHA512 33c63fe0efb8b7cda936f3974dee9eb7ca31982a64fbaa546def2fb3021cd8c9d17e59ab3538a8d7b53a78bf078ff0f59a57ae42973df23b2b9022df5e557882
+AUX javacc-7.0.4-javadoc.patch 375 BLAKE2B 41271d7e84e859eb298e65e09372e018fa479984c7224eb31a62239e0522cbea3211859a73edecb89a743a1bfc93d0364a6a2b350bd5401c18bce7b4792c7957 SHA512 2954b59d75a41dc2aafdba48e017353fcc4baac9e8439ffda3e1da2e8890386ce20cc840a0e4a35bd74bdaedd05fdd0461959fec0a0dd24f0fd65a754647e2dd
+AUX javacc-7.0.4-source8.patch 4491 BLAKE2B 57422bdae093197f30b8f2f45f0025625ecd9eb778e1f4976de6844a2313b95a13a24e0a847dc1dfff16fa96a003f43b98465b123dafa03a63efd4d253143ed7 SHA512 3786601b6ddd280250791b2ad829f8094974d350fdcbd80543b2b5dbbd6a896b531573f3b5169bb3cfe04c8da841a1713f33d1400e022c6c7f0de41d14d7b565
DIST javacc-4.1.tar.gz 769476 BLAKE2B c2a22fa78ff4dcf1e36221a23ca1e3cd1eecb473a59ea94ce52e298673f6bd18c0ea0cf757dd68885696ebc8cc724d271c69c923a21ffa433d03c1062b1201ee SHA512 911e5e9f062561ade1748dcef3596e0f25c399c4d52dd174773783dadf24a4ceea8d3feab9ab08880370677959051d8557aed815d4c4184f5ecd5789ee8a5754
DIST javacc-7.0.13.tar.gz 3199783 BLAKE2B 7e3dddbe53a6e417a31bb7386d154c0e9589f17f88e652f5e146a4e344d72cd948d4d8e55fab753bb983e5d31971efc948c1ecdca4e875031bea3f8a38bfc082 SHA512 ed71e47fc4a382c9c53067bbf73bd9736ee0c41d65e328d5e4843cd71c88d3b7715d7a8fe38f10152ef7ef3be064abf9e801c6ea78066c4fcbabf124dfc4e144
DIST javacc-7.0.4.tar.gz 2842349 BLAKE2B e5a2e24c99e5e3883270cf0e3931d7667e5b5b49a11c1d9b79b98767f74f4addf2dc7d3d620550bc1b5bb0bfbef8bf07af48a40d250d0902d97c8215f6cb8e01 SHA512 b93c93e8490aae9a26b0de948896ec6d7a044c205d09584c3908988e24a3ea63a1147365115b17a15c6fb311c44f53ddff7c11f092731cbd05d3ec1950ef57f1
-EBUILD javacc-4.1.ebuild 1474 BLAKE2B 284881056fa0908f182327bc15490b16b061e84692a6a0544c843b9a7ea4af69d0eaac5e776add2f4b0b3231cceff3c6ad75530c49a39f4017086de5b8c1c72d SHA512 c30a3ff8049735df79bed7af32265d1390f3ed089970ac56cc5e28d559345339cdcf7cf235a44aa640e2145359cc1bd9d8a6f23593b9d5715da2041aca74ea9d
-EBUILD javacc-7.0.13.ebuild 1228 BLAKE2B d8c1a6eb01d2a50cfb6283be656cf9c624b5d5456ef43e580236e5b8ba4ac7bc8b2d0039772e1373b7368e44679295d3ed836b6cbce3b3bdd987ce93a30d43b7 SHA512 470ec78a6d3d0badc579a7971b56d476731ffbb3aadb847c0b7837a7540e4e81ffa44e0b1c47529242980bf647387c972ba6d84cd94ec6fa4ec1a75a31d79161
-EBUILD javacc-7.0.4.ebuild 1387 BLAKE2B d8bb05a52eaa591aa9bd904479b59bb564d021734ea91328a3b5d69b5c4e7a3c1bcd1bc8770e43a51e298b820a5e349be1b9101d551a46c2b106c9f644d9de0f SHA512 c001d5c429da55420c56ef2f3e01236a4b6e70047d0f981c07ff5e6fe81521962466ea8be291ded7ab43f2dc606031d621c448cbd7b18905ea72bbd2a798c645
+EBUILD javacc-4.1-r1.ebuild 1542 BLAKE2B 0edb03d1a2e202d23757a094a034efd6bcbf500837b205ce874d5a60ff13f372673d941ed5c40c5fe3422ac4f9d396daa4e1c1e5f5eb563f388f7cef7584637b SHA512 9a67d686000dfbbccef1172753d07270980503b64b462a2969720671b38033fe40d57196d38460e9b1a56f29c723dc30bf07a5881063c1443a863fda701c9b09
+EBUILD javacc-7.0.13-r1.ebuild 1600 BLAKE2B a2514cfa45bae4f7b1aa6efbb8d9d9b1d5472f84cf31b31c20c8e630b9189161a83dd211d1aa992196bfce573fdd71fc2c7a7d2dc46c0631a308e5637f637e45 SHA512 49bdcfb67368f97a5d1657222ac1417069b4aa475b7b9e6c82327b5657ed199bbde87ea409316a6796a9f27dfb66239e193b3e8f3db208a1127ce7641afb175e
+EBUILD javacc-7.0.4-r1.ebuild 1707 BLAKE2B 449dc7db3acf3fd55caf3c056923fa8c8efbb93fc6873531828133f6baa1e12e73086d080497e0f3d49732a3aee20074d02d505c1de0176b680e937c315b130d SHA512 4e81ed92e5758841fb937f41565787390a27bd8871184b59103c10048596164d7eec851e38fcd5598a967e5c6f21ca32856f85a989bf7943e2d76bcc270b2e7e
MISC metadata.xml 308 BLAKE2B 421dc38149fa3d88a66071836b7b00e6218c44f3111bf9e99b3f35f5e6ae3e550290d03b9f4ac960828484c8993b1ae5fe5ba6b4b73e172ddf905127df96eb25 SHA512 d365ba4454a45f49ceadbb4f1700ca58de8b9e0715f02056cbff899507fe39bd64e5d388245d0458ec5be9a30f134a4bcc2d8e678745f0b79502741ae30aeaa0
diff --git a/dev-java/javacc/files/javacc-4.0-javadoc.patch b/dev-java/javacc/files/javacc-4.0-javadoc.patch
deleted file mode 100644
index 41093de26566..000000000000
--- a/dev-java/javacc/files/javacc-4.0-javadoc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru javacc/build.xml javacc-patched/build.xml
---- javacc/build.xml 2003-08-11 15:16:01.000000000 -0400
-+++ javacc-patched/build.xml 2005-06-25 00:37:53.000000000 -0400
-@@ -150,5 +150,10 @@
- <arg line="${version}" />
- </exec>
- </target>
-+ <target name="javadoc" depends="compile">
-+ <javadoc destdir="doc/api" source="1.4">
-+ <packageset dir="src"/>
-+ </javadoc>
-+ </target>
-
- </project>
diff --git a/dev-java/javacc/files/javacc-4.1-javadoc.patch b/dev-java/javacc/files/javacc-4.1-javadoc.patch
new file mode 100644
index 000000000000..134aaa35abc9
--- /dev/null
+++ b/dev-java/javacc/files/javacc-4.1-javadoc.patch
@@ -0,0 +1,16 @@
+--- a/build.xml
++++ b/build.xml
+@@ -150,5 +150,13 @@
+ <arg line="${version}" />
+ </exec>
+ </target>
++ <target name="javadoc" depends="compile">
++ <javadoc destdir="doc/api" source="8">
++ <packageset dir="src"/>
++ <classpath>
++ <pathelement path="lib/junit3.8.1/junit.jar" />
++ </classpath>
++ </javadoc>
++ </target>
+
+ </project>
diff --git a/dev-java/javacc/files/javacc-4.1-source8.patch b/dev-java/javacc/files/javacc-4.1-source8.patch
new file mode 100644
index 000000000000..6dfc3e47382d
--- /dev/null
+++ b/dev-java/javacc/files/javacc-4.1-source8.patch
@@ -0,0 +1,134 @@
+--- a/build.xml
++++ b/build.xml
+@@ -112,6 +112,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <junit printsummary="yes" haltonfailure="yes">
+ <classpath>
+ <pathelement path="classes" />
++ <pathelement path="lib/junit3.8.1/junit.jar" />
+ </classpath>
+ <batchtest fork="no" todir=".">
+ <fileset dir="classes">
+--- a/src/org/javacc/jjdoc/build.xml
++++ b/src/org/javacc/jjdoc/build.xml
+@@ -46,7 +46,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <javac srcdir="${javacc.root}/src"
+ destdir="${javacc.root}/classes"
+ debug="${build.compiler.debug}"
+- source="1.4"
++ source="8"
++ target="8"
+ classpath="${javacc.root}/classes">
+ </javac>
+ </target>
+--- a/src/org/javacc/jjtree/build.xml
++++ b/src/org/javacc/jjtree/build.xml
+@@ -54,7 +54,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <javac srcdir="${javacc.root}/src"
+ destdir="${javacc.root}/classes"
+ debug="${build.compiler.debug}"
+- source="1.4"
++ source="8"
++ target="8"
+ classpath="${javacc.root}/classes">
+ </javac>
+ </target>
+--- a/src/org/javacc/parser/build.xml
++++ b/src/org/javacc/parser/build.xml
+@@ -52,7 +52,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <javac srcdir="${javacc.root}/src"
+ destdir="${javacc.root}/classes"
+ debug="${build.compiler.debug}"
+- source="1.4"
++ source="8"
++ target="8"
+ classpath="${javacc.root}/classes:${junit.jar}">
+ </javac>
+ </target>
+--- a/test/imports/build.xml
++++ b/test/imports/build.xml
+@@ -41,7 +41,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+--- a/test/javaFiles/build.xml
++++ b/test/javaFiles/build.xml
+@@ -52,7 +52,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir/static"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+@@ -74,7 +75,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir/non-static"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+@@ -99,7 +101,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir/non-static"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+@@ -126,7 +129,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir/non-static"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+@@ -152,7 +156,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir/non-static"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+--- a/test/javacodeLA/build.xml
++++ b/test/javacodeLA/build.xml
+@@ -40,7 +40,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
+--- a/test/lom/build.xml
++++ b/test/lom/build.xml
+@@ -40,7 +40,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
+
+ <javac srcdir="out-dir"
+ destdir="out-dir"
+- source="1.4"
++ source="8"
++ target="8"
+ debug="true"
+ classpath="../../bin/lib/javacc.jar">
+ </javac>
diff --git a/dev-java/javacc/files/javacc-7.0.13-javadoc.patch b/dev-java/javacc/files/javacc-7.0.13-javadoc.patch
new file mode 100644
index 000000000000..2849ced4340f
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.13-javadoc.patch
@@ -0,0 +1,14 @@
+diff --git a/build.xml b/build.xml
+index bddc709..52f3626 100644
+--- a/build.xml
++++ b/build.xml
+@@ -202,9 +202,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <fileset dir="${java-src}" />
+ </javadoc>
+
+- <zip destfile="${install-name}-javadoc.jar" basedir="${target-folder}/javadoc">
+- </zip>
+-
+ </target>
+
+
diff --git a/dev-java/javacc/files/javacc-7.0.13-source8.patch b/dev-java/javacc/files/javacc-7.0.13-source8.patch
new file mode 100644
index 000000000000..544da8197eca
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.13-source8.patch
@@ -0,0 +1,100 @@
+--- a/test/exceptions/build.xml
++++ b/test/exceptions/build.xml
+@@ -40,7 +40,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+@@ -83,7 +83,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.7" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" includeantruntime='false'
+ debug="true"
+ classpath="../../target/javacc.jar">
+ </javac>
+--- a/test/imports/build.xml
++++ b/test/imports/build.xml
+@@ -39,7 +39,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+--- a/test/javaFiles/build.xml
++++ b/test/javaFiles/build.xml
+@@ -50,7 +50,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/static" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java fork="true" classname="Parser" classpath="out-dir/static" inputstring="A" failonerror="true"> </java>
+@@ -69,7 +69,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -91,7 +91,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -115,7 +115,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </fail>
+
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -138,7 +138,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </fail>
+
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java fork="true" classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+--- a/test/javacodeLA/build.xml
++++ b/test/javacodeLA/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="javacode.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+--- a/test/lom/build.xml
++++ b/test/lom/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.7" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
diff --git a/dev-java/javacc/files/javacc-7.0.4-javadoc.patch b/dev-java/javacc/files/javacc-7.0.4-javadoc.patch
new file mode 100644
index 000000000000..57699b5249d5
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.4-javadoc.patch
@@ -0,0 +1,12 @@
+--- a/build.xml
++++ b/build.xml
+@@ -201,9 +201,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <fileset dir="${generated-src}" />
+ <fileset dir="${java-src}" />
+ </javadoc>
+-
+- <zip destfile="${install-name}-javadoc.jar" basedir="${target-folder}/javadoc">
+- </zip>
+ </target>
+
+ <target name="unittest" depends="jar" description="run JUnit unit test cases" unless="true">
diff --git a/dev-java/javacc/files/javacc-7.0.4-source8.patch b/dev-java/javacc/files/javacc-7.0.4-source8.patch
new file mode 100644
index 000000000000..620b1c03f78b
--- /dev/null
+++ b/dev-java/javacc/files/javacc-7.0.4-source8.patch
@@ -0,0 +1,100 @@
+--- a/test/exceptions/build.xml
++++ b/test/exceptions/build.xml
+@@ -40,7 +40,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+@@ -83,7 +83,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.5" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" includeantruntime='false'
+ debug="true"
+ classpath="../../target/javacc.jar">
+ </javac>
+--- a/test/imports/build.xml
++++ b/test/imports/build.xml
+@@ -39,7 +39,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+--- a/test/javaFiles/build.xml
++++ b/test/javaFiles/build.xml
+@@ -50,7 +50,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/static" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java classname="Parser" classpath="out-dir/static" inputstring="A" failonerror="true"> </java>
+@@ -69,7 +69,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -91,7 +91,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </condition>
+ </fail>
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -115,7 +115,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </fail>
+
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+@@ -138,7 +138,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ </fail>
+
+
+- <javac srcdir="out-dir" destdir="out-dir/non-static" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir/non-static" source="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+ <java classname="Parser" classpath="out-dir/non-static" inputstring="A" failonerror="true"> </java>
+--- a/test/javacodeLA/build.xml
++++ b/test/javacodeLA/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="javacode.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
+--- a/test/lom/build.xml
++++ b/test/lom/build.xml
+@@ -38,7 +38,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <arg line="Parser.jj" />
+ </java>
+
+- <javac srcdir="out-dir" destdir="out-dir" source="1.5" debug="true" includeantruntime='false'
++ <javac srcdir="out-dir" destdir="out-dir" source="8" target="8" debug="true" includeantruntime='false'
+ classpath="../../target/javacc.jar">
+ </javac>
+
diff --git a/dev-java/javacc/javacc-4.1.ebuild b/dev-java/javacc/javacc-4.1-r1.ebuild
index f74f36d4eb2f..5f0196671842 100644
--- a/dev-java/javacc/javacc-4.1.ebuild
+++ b/dev-java/javacc/javacc-4.1-r1.ebuild
@@ -4,9 +4,9 @@
EAPI=8
JAVA_PKG_IUSE="doc examples source test"
-MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
+MAVEN_ID="net.java.dev.javacc:javacc:${PV}"
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2
DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
HOMEPAGE="https://javacc.github.io/javacc/"
@@ -17,28 +17,34 @@ LICENSE="BSD-2"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-CP_DEPEND="dev-java/junit:0"
+BDEPEND=">=dev-java/ant-1.10.14:0"
-DEPEND="${CP_DEPEND}
+DEPEND="
+ dev-java/junit:0
>=virtual/jdk-1.8:*
- test? ( >=dev-java/ant-1.10.14:0[junit] )"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
+ test? ( >=dev-java/ant-1.10.14:0[junit] )
+"
+RDEPEND=">=virtual/jre-1.8:*"
PATCHES=(
- "${FILESDIR}"/${PN}-4.0-javadoc.patch
+ "${FILESDIR}/${PN}-4.1-javadoc.patch"
+ "${FILESDIR}/javacc-4.1-source8.patch"
)
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
src_prepare() {
+ default #780585
java-pkg-2_src_prepare
java-pkg_clean ! -path "./bootstrap/*"
+ java-pkg_jar-from --build-only --into lib/junit3.8.1 junit
+}
+
+src_compile() {
+ eant
+ use doc && eant javadoc
}
src_test() {
- java-pkg-2_src_test
+ eant test
}
src_install() {
@@ -46,7 +52,7 @@ src_install() {
if use doc; then
java-pkg_dohtml -r www/*
- java-pkg_dojavadoc target/javadoc
+ java-pkg_dojavadoc doc/api
fi
use examples && java-pkg_doexamples examples
diff --git a/dev-java/javacc/javacc-7.0.13.ebuild b/dev-java/javacc/javacc-7.0.13-r1.ebuild
index 3a111cb197bb..d8dfbc20ebc3 100644
--- a/dev-java/javacc/javacc-7.0.13.ebuild
+++ b/dev-java/javacc/javacc-7.0.13-r1.ebuild
@@ -4,9 +4,9 @@
EAPI=8
JAVA_PKG_IUSE="doc examples source test"
-MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
+MAVEN_ID="net.java.dev.javacc:javacc:${PV}"
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2
DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
HOMEPAGE="https://javacc.github.io/javacc/"
@@ -17,19 +17,34 @@ LICENSE="BSD-2"
SLOT="7.0.13"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND="
- >=virtual/jdk-1.8:*
- test? ( >=dev-java/ant-1.10.14:0[junit] )"
-
+BDEPEND=">=dev-java/ant-1.10.14:0[junit]"
+DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
+DOCS=(
+ README.md
+ docs/faq.md
+ docs/release-notes.md
+)
+
+PATCHES=(
+ "${FILESDIR}/javacc-7.0.13-javadoc.patch"
+ "${FILESDIR}/javacc-7.0.13-source8.patch"
+)
+
src_prepare() {
+ default #780585
java-pkg-2_src_prepare
java-pkg_clean ! -path "./bootstrap/*"
}
+src_compile() {
+ eant -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+ use doc && eant javadoc -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+}
+
src_test() {
- java-pkg-2_src_test
+ eant test -Dant.build.javac.source="8" -Dant.build.javac.target="8"
}
src_install() {
diff --git a/dev-java/javacc/javacc-7.0.4.ebuild b/dev-java/javacc/javacc-7.0.4-r1.ebuild
index 58d0ccdccbcb..09d1ce85e478 100644
--- a/dev-java/javacc/javacc-7.0.4.ebuild
+++ b/dev-java/javacc/javacc-7.0.4-r1.ebuild
@@ -4,9 +4,9 @@
EAPI=8
JAVA_PKG_IUSE="doc examples source test"
-MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
+MAVEN_ID="net.java.dev.javacc:javacc:${PV}"
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2
DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
HOMEPAGE="https://javacc.github.io/javacc/"
@@ -14,7 +14,9 @@ SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="7.0.4"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
+
+BDEPEND=">=dev-java/ant-1.10.14-r3:0"
DEPEND="
>=virtual/jdk-1.8:*
@@ -30,15 +32,24 @@ DOCS=(
release.notes
)
-JAVA_ANT_REWRITE_CLASSPATH="yes"
+PATCHES=(
+ "${FILESDIR}/javacc-7.0.4-javadoc.patch"
+ "${FILESDIR}/javacc-7.0.4-source8.patch"
+)
src_prepare() {
+ default #780585
java-pkg-2_src_prepare
java-pkg_clean ! -path "./bootstrap/*"
}
+src_compile() {
+ eant -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+ use doc && eant javadoc -Dant.build.javac.source="8" -Dant.build.javac.target="8"
+}
+
src_test() {
- java-pkg-2_src_test
+ eant test -Dant.build.javac.source="8" -Dant.build.javac.target="8"
}
src_install() {
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index f7825464b1a5..dd2d7ee10eb7 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,3 +1,4 @@
DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
EBUILD javahelp-2.0.05_p20170719-r3.ebuild 1612 BLAKE2B 200c30695215557ec36930715715a0dd758b7b49d09b670a7c705b53c6ddf69e9a28b4f865fa1c341c1815d26d9fd9337c8ed61ce3a904a5b7aba05aeff93a2c SHA512 cd34ea7328258e5d9a36aaff43b17e5734bbcaca80c8bb9bd9a12b114be8713f1883faf4ddda209d0d85afe28c655ead198ed5a267a164d0b14be5f31bc2ca31
+EBUILD javahelp-2.0.05_p20170719-r4.ebuild 1372 BLAKE2B 3bf3aa00c677ce323d193097db305bfb67e38059e59076b14d4748f7975838166010ba9f72c08fd4ec399f98b5375ef14a8661125eb733ac456b8784fdbb1db6 SHA512 9e6375e10264cfcd62dc1239e9ea9fe71b38f6723cc7737a840475f00b026e5037eae6e2d98d519b34b6489a8cc7074521230e52cb73165d60526995d083aae9
MISC metadata.xml 705 BLAKE2B 99d50e7e4960fd92f1b9f34d830ee22246f88c5224beb09eb581fa10b128753985c991b22a002eb8cc6ecb599475d0d88a50cfeb76734a4d687fc3c34d88686b SHA512 c20f79d6b27ea89d68d8f9655804986827e4bb5fff86b525047d8b34cb1c30c051af76d732da63a38ee9b311e78fdaaa4e3e2fa1232cde0230b7e75f6af37b6f
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
new file mode 100644
index 000000000000..453dcfef7068
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The JavaHelp system online help system"
+HOMEPAGE="https://javaee.github.io/javahelp/"
+COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
+SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+ dev-java/javax-jsp-api:2.0
+ dev-java/javax-servlet-api:2.5
+"
+
+DEPEND="${CP_DEPEND}
+ virtual/jdk:1.8"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+JAVA_JAR_FILENAME="jhall.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA="javahelp_nbproject/lib/jdic-stub.jar"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR=(
+ jhMaster/JavaHelp/src/{new,impl}
+ jhMaster/JSearch/{client,indexer}
+)
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ mkdir res || die
+ pushd jhMaster/JavaHelp/src/new >> /dev/null || die
+ find -type f ! -name '*.java' | xargs cp --parents -t ../../../../res || die
+ popd >> /dev/null || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+
+ java-pkg_dolauncher jhsearch \
+ --main com.sun.java.help.search.QueryEngine
+ java-pkg_dolauncher jhindexer \
+ --main com.sun.java.help.search.Indexer
+
+ use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
+}
diff --git a/dev-java/jcalendar/Manifest b/dev-java/jcalendar/Manifest
index b6c69ddbd3d6..4abbd510cef4 100644
--- a/dev-java/jcalendar/Manifest
+++ b/dev-java/jcalendar/Manifest
@@ -1,4 +1,3 @@
DIST jcalendar-1.4.zip 982517 BLAKE2B f82ba64d26aefe44a197d78998427af2173c41d1843e080f12c35984c18be58235ca115bc1f53d17a035e4c1ab7bd590b4993b0509e7408a4af50f4ec4b4697e SHA512 aeab6f98451f4fa8718e127de6c0af345410bebbd1de4fa1ca4b9e7f5a22908f9e455ba96da34ef9e8691b4d462e8a01dbd7881b6565a0f3a65d18fe58b68d9c
-EBUILD jcalendar-1.4-r1.ebuild 920 BLAKE2B 539afb6e0a5e5403a2ade349bdacaf143d577f15381e8a7ff353f7adbf356013042546582f04f84740da807fffbe7e5583e982d75914804f1ed88f3f6063a02e SHA512 8bbff1c750dbb220e39942d315c3748e81a5346a1d065b2e53c4b6dd076be9a35c781e2a47eca5d4c55e0da64ec2c03b8eed16d124330be15238416488f00a5e
-EBUILD jcalendar-1.4-r2.ebuild 938 BLAKE2B b61c1634bcd556b21f815c0aaf83f789ad2e456965aefb346a0713879a962d977d2a43773cd4b67234a7d3c45907a1a7dc5159268c4e534419e46c9c308242bc SHA512 410c18d7d74069162d6469a434279e62becc494219a5e26d45f28505143cb4ec36f8d1c369427e400eef4f703a444314aabe77926c27915f9f5997a92e8da7c3
+EBUILD jcalendar-1.4-r2.ebuild 936 BLAKE2B f288f40beeb5be937e77d4c28f1c1021404eafd9d3a229f904b30689981d59944d3729de0dc302576fad6f5f194c787dd9999f551a5aef434df680ad9f88ff74 SHA512 3ef30be0f13fcc193a2b519112876c3a162214a9827a277488851c44b1787026327681a8d1bf6690c71378a7d7db897d14f8d584dbb210433b19dff0470c41fe
MISC metadata.xml 643 BLAKE2B 8912f34c6db67cfc93128de60b468ff57f33fad59d320c3bde5e724480e3f029772c6709be554ede57151b9295ffeccdf5d2d31b0a6ca0d46249143ae966ca4b SHA512 0fa2211e2fcea4cd103bf43a1903ffaf0bd9432328b9032d30de51c1be238e8aa2b2c5ff40cb6439a864aee10992dffe77d86af846252a728df10e637f7f2e13
diff --git a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild b/dev-java/jcalendar/jcalendar-1.4-r1.ebuild
deleted file mode 100644
index c0de4b6cfb3e..000000000000
--- a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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="Java date chooser bean for graphically picking a date"
-HOMEPAGE="https://www.toedter.com/en/jcalendar/"
-SRC_URI="https://www.toedter.com/download/${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/jgoodies-looks:2.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8:*"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jgoodies-looks-2.6"
-EANT_BUILD_XML="src/build.xml"
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET=""
-
-src_prepare() {
- default
- java-pkg_clean
-}
-
-src_install() {
- java-pkg_newjar lib/${P}.jar
-
- dodoc readme.txt
-
- use doc && java-pkg_dohtml -r doc/*
- use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
index cc3c29b2f91c..2985f2ad4db0 100644
--- a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
+++ b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.toedter.com/download/${P}.zip"
LICENSE="LGPL-2.1"
SLOT="1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest
index 5f8bbd8964a4..27aa19543f26 100644
--- a/dev-java/jclasslib/Manifest
+++ b/dev-java/jclasslib/Manifest
@@ -1,3 +1,6 @@
+DIST annotations-24.1.0.jar 30570 BLAKE2B 55120bf8969384048e0fd438fc96dc6769d6974b96e0e492636351c15466401da623341fe526685e51cd63378fa54c6485fa5dca83b2fc853b85ed4a75dc5d7d SHA512 663395a885561cc97eed411c67b496c06ec9a54906185a871de8743bf53e92152f4bc7c2a0118b7f3cfe85cc0a6c408ac6d589839b8d25c851637f85880331f2
DIST jclasslib-3.1.tar.gz 4630493 BLAKE2B 2dbede05833a6f7ff0f32194ea91aeb071615ee8562541d1b5abc2fc61c3f393bd93f5e444110a6a72df161d488cf21551af8208b1f391951b5ae7002ceb6ef3 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc
+DIST jclasslib-4.3.1.tar.gz 1396903 BLAKE2B 2f070186f75e40be7cb7122e34d3a00688691cb9da49b6c161beaff7da3170b8ddf3e805467b7ecfbd820ca4bd0b335dee765d7318d0f487f2242e5f8bf4ae76 SHA512 25e35b39a39eb09fe7730d70abb4f6f500522f755801f80ece9357a1a90429254eb3bf57ea7a6cd638fcac77b0d04a62e0df9336c8184738acc74901ed4516e9
EBUILD jclasslib-3.1-r1.ebuild 789 BLAKE2B 1a71e7babeebbb55abe6652fa120eed10e97ec49c1a4bebed026b98887781c6a89e43ae1feb056e7ad82ff33a82e80398b8a7f78ad80c721392f3a469dcb2bdc SHA512 ad7b08f1a8f8d77593e775e2066eacb64e0b9bcfe885116121a432f8f0e7bec2a63bc59ba66cdccb7cd13a409b72213ecde77c96972d18de4ea3f6974e0d0db8
+EBUILD jclasslib-4.3.1.ebuild 1094 BLAKE2B 80e0d7690e0862e05fa237e52d062a0597aeade0a2523496d3533de2ff989308469ba88d25386e99628aeee20fcce3a6c4268ab96beb7488e4ffc5a8c2271088 SHA512 1811defae03eaa1761693341100f708103d6807e7c9154b341ba9ff1835d25c2ee12e8348e3918572d1dab40bafa067b849bf63ddb162b71fa1b4292722e5e53
MISC metadata.xml 375 BLAKE2B a604e3c57ee7ec7fc9d48a15cbfeeec58ce11483275d250f5fbeb69d0343f41de2617770a2445c575ce0d66ff4619e4bd2e1a7911d117282e66ee5ea7bc5d9a4 SHA512 c3b644a00bf9a0c92cfdc04c4d03f3974dc151538f67925ab967b8e2e5ce8e3865129f01843cd2c55d23a85365e31d2bb526f6c4c2e4edca13381dabea29c786
diff --git a/dev-java/jclasslib/jclasslib-4.3.1.ebuild b/dev-java/jclasslib/jclasslib-4.3.1.ebuild
new file mode 100644
index 000000000000..79ad0e367e27
--- /dev/null
+++ b/dev-java/jclasslib/jclasslib-4.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 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="Java bytecode viewer"
+HOMEPAGE="https://github.com/ingokegel/jclasslib"
+JAV="24.1.0"
+SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://repo1.maven.org/maven2/org/jetbrains/annotations/${JAV}/annotations-${JAV}.jar"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_GENTOO_CLASSPATH_EXTRA="lib-compile/i4jruntime.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/annotations-${JAV}.jar"
+JAVA_MAIN_CLASS="org.gjt.jclasslib.browser.BrowserApplication"
+JAVA_RESOURCE_DIRS=( modules/browser/src/main/resources )
+JAVA_SRC_DIR=( modules/{data,browser}/src/main/java )
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_dojar lib-compile/i4jruntime.jar
+}
+
+pkg_postinst() {
+ elog "jclasslib uses Firefox by default."
+ elog "Set the BROWSER environment at your discretion."
+}
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 11118c88f965..1b74402a07ca 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -2,6 +2,6 @@ DIST mysql-connector-j-8.1.0.tar.gz 4241696 BLAKE2B 930257a876b1b512b598ebf83971
DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41
DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e
DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430
-EBUILD jdbc-mysql-8.1.0-r1.ebuild 1504 BLAKE2B 041ca21fb16cfc11fc7ee33dc3c9d6b3b6526955e71ca1bfdedcc2721614f60e74357e62e8c07ede49d5cd50f8d38b7714c1d0f5c98c820cf95b2dc8e2e7e041 SHA512 aed6b6d5345a1bdb95fbbc79bb76f0676e55a0646ce8949c13b6b90fd52e13b624d45528ef0e0603e01482909686619ab7c451cb01201d073d70afbdacccb942
+EBUILD jdbc-mysql-8.1.0-r1.ebuild 1502 BLAKE2B 67a0ceee3e07fa1bdeb508844d899864ff9b7e3775651cae9a8df9aa39eb5cce45ebeb6fecfe9bbdbf0af4a0b2bf4d20792a47a373b4089e3fe6061a413c807a SHA512 feaed3f59fc416855b889135d4246bb67066c5e77836a5f80e79fbe3c0adc209626ea3b201991c0da545204ad00c0feb55c59bbe27353b117cc87813e0681320
EBUILD jdbc-mysql-8.3.0.ebuild 1576 BLAKE2B cdb39e83b3d94f048eab504808dcdf93d811cf818524c3b959f6b794208f2ac9f9d7bd63f8ba7cbfe3445bce843c3b10aee4e15452a8e52c5986e59eadef6bd3 SHA512 d0d1754258946ff6db3d45efc2947318324cb383d9d750e15358b92baa1a461cdc81fab2566ea50e1c5851b0b326dbefacccfe7d8d1fa6b0cf049c0ea0d84780
MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild
index 649d226c823b..f358d80435f2 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild
@@ -30,10 +30,10 @@ CP_DEPEND="
<dev-java/protobuf-java-3.26.0:0
dev-java/slf4j-api:0
"
-DEPEND=" ${CP_DEPEND}
+DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*
"
-RDEPEND=" ${CP_DEPEND}
+RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*
"
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 2da633791ce3..267c0ce9a225 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,7 +1,6 @@
AUX jdom-2.0.6.1-skip-failing-tests.patch 8392 BLAKE2B b906e2854f51a534af29fa1d8191ecb53a1cb7f4b390820847f30213db9e58bd4526a20ac4c8763c49382f35fbe67caf12962a720f5edd5e004f9881ee29070f SHA512 bf753bb13b633bbf39d0f55f1a34e273876c2fb7841ab73baa9e03fb1945a61bf19c0aceb6891df6abe8b57cbc81f33773da4fd5e4e3f42b5ace51b666f4ece2
DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1
DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
-EBUILD jdom-1.1.3-r1.ebuild 1252 BLAKE2B 1f13d6f90843dd28a886d5b8158d33602239d6fe7540655166a7bf8aa6f3201cb9a3700a7a1ea669c04a7aa8a94432ed6b8e6c1df5a3b1ed36243ec1bb3d0f1d SHA512 bf245f0d9e759c1c0ebe8937d980e391480687eb53ba0234e5f7b02f124b4a55b61bf6001d391da7fbb58de4a82d7ec90b9bd63a101d869e1d96c14d43a792a6
-EBUILD jdom-1.1.3-r2.ebuild 827 BLAKE2B 880f75219e9e475b63921ffda7bcf8ce1f519291c12743186f1d88ceec0603d43741c0063a4d61e39a83cad8d0a970ca255f1d533131e8cd22046e8503d79cb5 SHA512 94157be7a910cb2ec5a3064c64ca8b2741a6e04fa1d238e0f43557d5eb2ed175e91b67a3bb17d09ef5463f9dd34c28c3d46cd200233067c53ff59d3525c1882d
+EBUILD jdom-1.1.3-r2.ebuild 823 BLAKE2B 80c1bfa3a2bb3472cd246ba5811efbab8198ea2ff39e3b3b51960e703205e016db392f2e3dde0faff3857a37347ca95c5cff44731369187305b4c6da88968e6b SHA512 bbc0f29efbed8d5ffda47e50c02245f9e8e1821a8092b1716110726a4a41b61229a844f073eb0f364a8a084f3f9fae6e248e53ba322aac3dcd44ec0ef99344ee
EBUILD jdom-2.0.6.1.ebuild 2748 BLAKE2B 3e0e6123893a15827ed6202b16387e4403748a33c70132ac0c1edafe6b505046d6fa1896d4cec93dc01d0adb551f1b548e5c2af1c8998c541ff8ac7ef4aa292f SHA512 66ced362fd81ddd13989cac07f6093628ce6166fdfe8f7c6b41fe94376fff4ee5911f7637cf5a43375731674d6410efe0ecfe740e838a45558930293bedf4d46
MISC metadata.xml 870 BLAKE2B 4f720a44e7f3d2c808e81aeebcdb11963cbdc590d61d9edd4ea5794913096b84ad463726071f66848a26d7a6209c466db4a00253793c08d7fc848fc780da1763 SHA512 516809ec60e2c6763949ddac1cd2cce46a52973c3be148a6153b0941787d4a798699206367ba26e707f1e671a5f851b00281b84b18592b3ece442bc4129aafaf
diff --git a/dev-java/jdom/jdom-1.1.3-r1.ebuild b/dev-java/jdom/jdom-1.1.3-r1.ebuild
deleted file mode 100644
index f176d2284a81..000000000000
--- a/dev-java/jdom/jdom-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-
-LICENSE="JDOM"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- default
- java-pkg_clean
-
- rm -r build/apidocs || die
-
- rm -v src/java/org/jdom/xpath/JaxenXPath.java \
- || die "Unable to remove Jaxen Binding class."
-
- sed -i -e 's|${name}-${version.impl}|${name}|g' \
- -e 's|<jar jarfile="${build.dir}/${name}-sources|<!-- <jar jarfile="${build.dir}/${name}-sources|' \
- -e 's|build.javadocs}" />|build.javadocs}" /> -->|' \
- "${S}"/build.xml || die
-
- if ! use doc; then
- sed -i -e 's|depends="compile,javadoc"|depends="compile"|' \
- "${S}"/build.xml || die
- fi
-}
-
-EANT_BUILD_TARGET="package"
-
-src_install() {
- java-pkg_dojar build/*.jar
- dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
- use doc && java-pkg_dojavadoc build/apidocs
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild
index e321b981d167..e4c3088a799d 100644
--- a/dev-java/jdom/jdom-1.1.3-r2.ebuild
+++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
LICENSE="JDOM"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jide-oss/Manifest b/dev-java/jide-oss/Manifest
index 060afd943421..24d61f1bbbb7 100644
--- a/dev-java/jide-oss/Manifest
+++ b/dev-java/jide-oss/Manifest
@@ -1,3 +1,3 @@
DIST jide-oss-3.7.12.tar.gz 4819086 BLAKE2B 9f84b8f9e87b6e74844e11c925546b9a43ae99476c91b84be9269dd8e31658889c3cf38cd67c4a5ec94419d8c5ccecb600c55f747d15e3427e01eb146b0ee755 SHA512 f17ab94fd77237fa0891eb87972b0630a0709fbd7e5d07e6d8389fd18668747d13ca9f631f81cf1153f7d233131a0500e8e76dabf8d33fdce846db14f9958456
-EBUILD jide-oss-3.7.12.ebuild 1808 BLAKE2B 529bdd602f14f22dc744f11581f476b91cd23464830940b21baeebb8ddd4d946fbb19ed1b4a8be42f8010315511bca34460bb2d5e8db7f17ff6a822621e58705 SHA512 dd8b749515c3bb4f0125a32b5c37c0a0e90aea620a9cbc323a574e6c81aacdd0a40b30a918849c33a98c73c5e017d9428dbb883c9155bc3bb676a0a6f95c024b
+EBUILD jide-oss-3.7.12-r1.ebuild 1817 BLAKE2B b0e0863a5e2663c85cb241382b1fb4f6dbd31078050969dacfa1a7de08fa82818eb3644055c6d4f19c46825eee3735351454680a50a4087616563045d07399c4 SHA512 10a630893a8d434ea6c83f649e98290062edcd73bf5f42d5b589ae9aff1b406d4ae481af3063b5ad28951454ca4993d4b31be28de656f9086489447507b0a8ac
MISC metadata.xml 648 BLAKE2B 5cfa79058c3e1e448ea36658dc31dfc7cabad5e9b182c0323a7bfa4b5a2731fb1576077efa90f9b884c02581cb1a27690e4ff36a52d604ffc1fb6add83d2d5d4 SHA512 ec85bfd3f9a4311c5b0ab7314ff9f0e9806eed63cab859f7315b1e693bb74a516ba32786bec62ce826b4eed8e149f4d0e60de4a9cf1311da970f5b7ba443b865
diff --git a/dev-java/jide-oss/jide-oss-3.7.12.ebuild b/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild
index 6445ab563a08..c25d8ee7fdcc 100644
--- a/dev-java/jide-oss/jide-oss-3.7.12.ebuild
+++ b/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -17,7 +17,7 @@ DESCRIPTION="JIDE Common Layer (Professional Swing Components)"
HOMEPAGE="https://github.com/jidesoft/jide-oss"
SRC_URI="https://github.com/jidesoft/jide-oss/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2-with-exceptions"
+LICENSE="GPL-2-with-classpath-exception"
SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index c336f2416348..a559641f469a 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,7 +1,4 @@
-DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
-DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
-DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
+DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9
DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a
-EBUILD json-20231013-r1.ebuild 1494 BLAKE2B 3d43885a8994103e747a25ceb1506b443069e88ebd1bcc14f62d9f67bb6905a09e98c7cea205294f89755f50c292ab558e1dbf4ebb4d01d04a4783a53b5c5901 SHA512 8e790530ae9d77b53b45ee67c68bec7c1f57c448683203d48a91ff688addf7b059e6c69a19d481b1384c4ee92388dac6e4520d5f35b4180c50f79feb67c1fb13
-EBUILD json-20240205-r1.ebuild 1483 BLAKE2B b4c279e5baa9e93de70570cc394d24340bfefd07bdbef1b639557da6f501ed536d8ba6b6229b36f6b279542b30f40367ca563a0110994bf8946353348d6cc2da SHA512 2eb3ca377472c51c337885c41c478cbdce1963d68dd93140147711011ede9563650db58422a21aaf04027dad031d33f4a6b863b487f4fb94b575b24a9d7cde2d
+EBUILD json-20240303.ebuild 1792 BLAKE2B b036e49be8f779de191692dc971693e37df8ccb47bee2ce6f05cfbd567cd9eaca4354a373b0d73b21ca01e624e3d0cf9417d261eaeb98018df25fc61f2940c31 SHA512 5cfbbbcf88c2e4ec5dc745a89dd3ec6c3821a9ad72a81764234dac6b902c6efc5e01f4ffcadfb9a0b0118cdbe4d66c93f742b8f58fe9259b2543b180f36cc072
MISC metadata.xml 1083 BLAKE2B 9dfa3392b02d2bb6ae3198a884c154a52926de81aead27309fd0bbe25011a1b0ea89c0c7fa3694c56fee4cb339c2fd161384c9d7c780369cc3da4464d3abd40a SHA512 3d0f231f0e67e178f838474e6aa07e88dffc26e26261a49515124c3e68120d323cc1a790be017b082af8f27dd051121750c1e1829e7a2fc2714821caf9a8802b
diff --git a/dev-java/json/json-20231013-r1.ebuild b/dev-java/json/json-20231013-r1.ebuild
deleted file mode 100644
index 33b11fb0702e..000000000000
--- a/dev-java/json/json-20231013-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.json:json:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A reference implementation of a JSON package in Java"
-HOMEPAGE="https://github.com/stleary/JSON-java"
-SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz
- test? (
- https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/2.1.0/json-path-2.1.0.jar
- )"
-S="${WORKDIR}/JSON-java-${PV}"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/asm:9
- dev-java/json-smart:2
- dev-java/mockito:4
- dev-java/slf4j-api:0
- )
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,SECURITY}.md )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.json"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
- asm-9
- json-smart-2
- junit-4
- mockito-4
- slf4j-api
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
-}
-
-src_test() {
- JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-2.1.0.jar" # Test compile dependency
-
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if ver_test "${vm_version}" -ge 17; then
- JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
- JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
- fi
- java-pkg-simple_src_test
-}
diff --git a/dev-java/json/json-20240205-r1.ebuild b/dev-java/json/json-20240303.ebuild
index 49f6e727afd8..b039a3797e52 100644
--- a/dev-java/json/json-20240205-r1.ebuild
+++ b/dev-java/json/json-20240303.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
MAVEN_ID="org.json:json:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple check-reqs
DESCRIPTION="A reference implementation of a JSON package in Java"
HOMEPAGE="https://github.com/stleary/JSON-java"
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
LICENSE="JSON"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
DEPEND="
>=virtual/jdk-1.8:*
@@ -49,8 +49,27 @@ JAVA_TEST_GENTOO_CLASSPATH="
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
JAVA_TEST_SRC_DIR="src/test/java"
+check_env() {
+ if use test; then
+ # this is needed only for tests
+ CHECKREQS_MEMORY="2048M"
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_pretend() {
+ check_env
+}
+
+pkg_setup() {
+ check_env
+ java-pkg-2_pkg_setup
+}
+
src_test() {
- JAVA_TEST_EXTRA_ARGS=( -Xss2M )
+ # setting Xms for bug #930723
+ # gradlew: DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"
+ JAVA_TEST_EXTRA_ARGS=" -Xmx${CHECKREQS_MEMORY}"
JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency
local vm_version="$(java-config -g PROVIDES_VERSION)"
diff --git a/dev-java/lz4-java/Manifest b/dev-java/lz4-java/Manifest
index 0de1b1c55682..bda82fb2081f 100644
--- a/dev-java/lz4-java/Manifest
+++ b/dev-java/lz4-java/Manifest
@@ -1,4 +1,4 @@
AUX lz4-java-1.8.0-fix-load.patch 894 BLAKE2B 30e0dfc301a4926d1cb8846c4391dacb20d07f2e33f0e36c48efb220acf994c916f9f592f645352102448e4f69652a55eda739faac8f7ba0378abdd3e9c5fc10 SHA512 d7d40e091ee45bb11bcb95f251707d9b1678ff658d02369def9e92114b16b4b21d55953719d35570d78faec561e6eca571d54e7bf9074ac7147b9578ab5e90db
DIST lz4-java-1.8.0.tar.gz 1069398 BLAKE2B 02ee363fc42eeeade01f04649416dd874513f4517264c6e1b6474d64e8b81e2ee9ff1f55e51b508608929e8d78cb30e98d929cc4a118c03f86b0e69bae237e8a SHA512 ae78748d984d2ede18018d5e9ae6aee0d5fe6ac8b56d717f863968cfad6e9f85b62305692345ba16002bee68278e87a0364aa98aeb92e2af6dc169e5d5b612d4
-EBUILD lz4-java-1.8.0-r4.ebuild 2536 BLAKE2B 20f328d317b8563eb94c4a9c8570227f022695244341b17556d40c16a54efbba229c5bc6ff2f1bca59cce30966972c82542a7cd37093b36fe237b81119a98c72 SHA512 c9f0dbd27d2585b6976ef76d1a9b187e1d977a1a3e6d9e3b704f3cd24163342a3a6ecda0edbecc1b70edd62fc0fe640b140edad8e2699f47b3f67eb35570daa6
+EBUILD lz4-java-1.8.0-r5.ebuild 2545 BLAKE2B 1c1614ad9e256fe2aff8d94812136b3d9d4b7d93965bc9827346daeea899790f033748a95b24da699025bf87c74c3578ad6450ce05bef1ebc0418ff2634b34ae SHA512 6eccf55957cff94df56bedba39673175ee83a6a43be4b103fdf50904df71a6440b461828069da725e60c04e37e50c3135888ae7342665238e14aa26977760c9c
MISC metadata.xml 314 BLAKE2B 029f69d900ca078525f401c897f9ebc3eb63d5fdbc201f8d42cadec684a66d1797fe4217ae4c8e874974fcfe74a2a1c024d7bf8bb165c8a9ec22ea103b11e5d7 SHA512 6a8817e187e78b1f175b35a07c9fa498f4b8af167a971320845148409ba352e5aa560cd907fb7e94336ebda07b7c7b5db407f0e9bdc94356e5d2090ee5f2fc9c
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild
index 9e2b264421f8..1eca00a9a589 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild
@@ -84,7 +84,7 @@ src_compile() {
-Wl,-soname,liblz4-java.so \
-o liblz4-java.so \
build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \
- build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o -llz4
+ build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o -llz4 -lxxhash
}
src_install() {
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index d59d0754288b..82a2bba994a1 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,5 +1,7 @@
DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
DIST apache-maven-3.9.8-bin.tar.gz 9083702 BLAKE2B c636ea861d1c96938490453600cac513caf54843ffc26f45e22a655e737af93689d492e3b3055b184a33a1975aaa50a681a29412ebfd036dfd8e2c61043f6291 SHA512 7d171def9b85846bf757a2cec94b7529371068a0670df14682447224e57983528e97a6d1b850327e4ca02b139abaab7fcb93c4315119e6f0ffb3f0cbc0d0b9a2
+DIST apache-maven-3.9.9-bin.tar.gz 9102945 BLAKE2B a705f18a1e7bdfd5d9ba8c38da02245ed5754fe749416ccc715dcdae21d8a41026778dfb912e3ea3e89e8358aede13d29ce3081ac71b16191e53d5cac557e643 SHA512 a555254d6b53d267965a3404ecb14e53c3827c09c3b94b5678835887ab404556bfaf78dcfe03ba76fa2508649dca8531c74bca4d5846513522404d48e8c4ac8b
EBUILD maven-bin-3.8.8-r1.ebuild 1384 BLAKE2B f07df89e9b3f821f21112a5110c7bce978db18c303e139e939d856d34d1a01cee5fe543943226e64af19d15d45cba4fc605fd228b169f6902d161e04d8cc8fe1 SHA512 02e5fd63a1add7cce804259a3bc6409abdf55eedf458e8c6f909e224a7ae02152b6c82f8afb0775c30f833a101b29d680e0fbb69133df737e6875256d2731fd2
EBUILD maven-bin-3.9.8.ebuild 1383 BLAKE2B 97483b786cf23d33149f8ea7abcf8133da943d6732c0d1287bcaaadff98dceefac9f9005e26072efb5bc06096df37c89023d110473843a99dac48ff62d875fd7 SHA512 902589d27c818d79f38d57451abc68687d3606f7964966efd9f97f5262190654e0efccf13f6a375ae6251838a70bd3700c7d3c3ab7be101784a71b37ae5322bd
+EBUILD maven-bin-3.9.9.ebuild 1385 BLAKE2B 7904a126651d83e60d1948b52319eb3ac7c08caea00104991664751267219a4b1f433b6d82e4fcbf368a96efd1b9885f9d07cdb4ede4209bbcb32af7289be8e3 SHA512 811956914e5abdaf0aea4a258ad11091cb17a40e9130d15b25c450762f3648bd1f1fa2f55f313e45921f16da9763c05397587dd0df45c69ff6673a60bb7ca4ea
MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff
diff --git a/dev-java/maven-bin/maven-bin-3.9.9.ebuild b/dev-java/maven-bin/maven-bin-3.9.9.ebuild
new file mode 100644
index 000000000000..d30a1ed61465
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.9.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+HOMEPAGE="https://maven.apache.org/"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="3.9"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ app-eselect/eselect-java"
+
+RDEPEND="
+ >=virtual/jre-1.8:*"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+QA_FLAGS_IGNORED=(
+ "${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
+ "${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
+)
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+ dodir "${MAVEN_SHARE}"
+
+ cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+ dodoc NOTICE README.txt
+
+ dodir /usr/bin
+ dosym "${MAVEN_SHARE}/bin/mvn" "${EPREFIX}/usr/bin/mvn-${SLOT}"
+
+ # See bug #342901.
+ echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+ doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+ eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+ eselect maven update
+}
diff --git a/dev-java/miglayout/Manifest b/dev-java/miglayout/Manifest
index eb5bb8a8c169..55b63d2eb68c 100644
--- a/dev-java/miglayout/Manifest
+++ b/dev-java/miglayout/Manifest
@@ -1,3 +1,3 @@
DIST miglayout-5.3.tar.gz 627150 BLAKE2B 2b28b3dd95d84db1665308a2908c6ddf8f0e285431ffc03af0275f7005d98117f873b0752f9b1f428b213a30c9e020b626eb0e6709470c62eac46480c3aab542 SHA512 ee711a453a9e2962017eed9363e4b8c2fb1fb28d9b36455d928b60db40262be310e6d2ab6c9f3ac286f3975e9927f8a8a77827a27cd1cb2238b2033c38a67cdb
EBUILD miglayout-5.3.ebuild 2128 BLAKE2B f68acf53bace7adcc182b5d5217af05e70b16abbaafeeaa60d8cd5853686b8c2e530ced6b9f7525beee511bac38311155c5f9311920c61946c13391118fed3ca SHA512 d5d691d610dd9cafd431dd6f7933800b8516d8123032aec817710e39125b6b29813058fcb610f215843ca916c8a93ad7b30ab3de60d61da4e6e19954219c4f38
-MISC metadata.xml 764 BLAKE2B 45c36b89305717fde374653fde915e22cca2ab0bee0284c97542414cee70d86c51be81e5c4f6a4fc633b0079d393e87260ff6d97b3a8f921cf6b34368119146c SHA512 325a0f84fb99a038449c8e31aec6828f3135fb980ce5b6f769074b644af929ae3be29c119e3a866e964bb5ccdfaa6b6727220ed69f938a73ec61aed0eae41de9
+MISC metadata.xml 763 BLAKE2B 205968bd3cbf2230157d4eb6258b8aa3b35ba6e71a6bf5de1b749c2ab8c6e3a6594f7bc76de55c4333a7a776f3afffc324e6173d464880e4c3a79825caf62e07 SHA512 a025a76f65d5e67910aa4396dc420a3d65daabaa3883924199270391b39b60e3603c0e66cf71f461d5d7aa5a4b639c3b2f5653ea594448b30f80abfc17cdeb75
diff --git a/dev-java/miglayout/metadata.xml b/dev-java/miglayout/metadata.xml
index 457503f62795..69fdbc631122 100644
--- a/dev-java/miglayout/metadata.xml
+++ b/dev-java/miglayout/metadata.xml
@@ -9,6 +9,6 @@
For Java developers writing GUI layouts by hand that wants simplicity, power and automatic per platform fidelity, that are dissatisfied with the current layout managers in Swing, JavaFX and SWT, MigLayout solves your layout problems. User interfaces created with MigLayout is easy to maintain, you will understand how the layout will look like just by looking at the source code.
</longdescription>
<upstream>
- <remote-id type="github">mikaelgrev/miglayout</remote-id>
+ <remote-id type="github">mikaelgrev/miglayout</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index c7093cba438b..93fb0a651679 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,7 +1,7 @@
-DIST mill-bin-0.11.5 52760276 BLAKE2B 1583403fba8782d759a5d56513e2d40cd81ffb68d4947b638052cc6108d6d6516f7fc16e9cf516fc7c2c60820d2d6fcb5c15179bcef715c6d75f25c6802fe711 SHA512 673d636fc64fff01289ad642f2f861f6da18d3e652cdd645e3d2487daf1baf4616515e31540a03f67dbc354efff4f48a6881e1ceecfb966eb24d7675abb6dff7
+DIST mill-bin-0.11.12 62116087 BLAKE2B e64e2ec1a2c89e780ada3b779104826398e9ab12801aea937302d71be190dd6caea6c64045e878f202b631c7647d8897054fd120c11f576ed301ffc02e8f7c8e SHA512 920de40ca5d8178d33ce439cc6a48ad4ec5665fa248af24122f7869ef5ddfa21f643fbf9a4bfa0dda40b8c994e088b7e4089c534d809a7a31cd6ca764fb5e741
DIST mill-bin-0.11.6 52778046 BLAKE2B 5f05b14cafba4e6b40b89572310a2b06ddbf1839a2da0dbdfe73a63606c9b1262fed686f7ffb17dc178072242136a4b334a2ae89b2fdc7274bffee928ff3c5fe SHA512 9f187b00d37f8d0bb97b7cd08c57e59e081c835e25f83e6c65bf2ca425f4325a6c641f7082ef700dac30ab6d4f59da5492136eeab21c898f11a259b89d55e9b8
DIST mill-bin-0.11.7 59806165 BLAKE2B bc97d64a692a33a482752828a703cb22d44bafeeb3aa329136d601058b56bf94703f97047be416bcbcfeb9633288f31e5715646aad359be59deffc957fc15b7c SHA512 c7c2cecd5cec6aab735e36182fade4e7360684795af42b528c1a7e5b0a0dc89dc4c68d47400d46121854c455f72e47f51c73ac4f8e70339ce5a7d18ae8b088de
-EBUILD mill-bin-0.11.5.ebuild 481 BLAKE2B 5e3f12b9276ac58db1512bbfc94bd5908a5d8de5a64c72cc4559f205653ac95105e9686215e8b3701ee3eda59ea290fcb58d8d990698dcb19c4b8dd70c4b4b28 SHA512 122745e9909083dc3cccecfd99f6d1d4aacf1698c0115596ebe9e92c7aee9476b9e804356151e3d7c6c2c162e6745515cca686797ddb6e500c8f2075b121f067
+EBUILD mill-bin-0.11.12.ebuild 469 BLAKE2B 1c8c781ac6e146d394e8dc40ff1f72c98516409f3e3297103b364eba1c76277ec128676df90eb030b2802d9ab943fde7b2caeafafd1149b339f36ce6799100b0 SHA512 59b80fe435118ac3fea0d981ade265465341dc291d2f486b18e7530f0b74932aee115b928be3d228fdb8991376a7e611495e12ebf52864503be4c20455d979ea
EBUILD mill-bin-0.11.6.ebuild 481 BLAKE2B 2f809272ef49326bc1e0862b93e8c8319459fffdf7d9e74595039473a04d58380a11ccfa0adaf128f271917ba5b774ad248f9299f9b37733ea5ef4f487455fba SHA512 e84752676e1306967d1dc5a75c5dc098b3ffd263b57c3c64d51349cc63973a562194b70960700ea88f73e31e84731663bd9598d063677e540977aad671fd7d5d
-EBUILD mill-bin-0.11.7.ebuild 482 BLAKE2B 48a456762c6b1cb6567efea750ab65672b803db45b242608fa59829dab165a92f715abf025e2738b6499a61e9e7f20028b0f77a2e63d7d2c3ae96e72f8367552 SHA512 aad6de057c5a45ace8e83024956c86748ef366967e14c54321e736a6d564f52a4ddea5ccac2cb3d69962ae13bff5c7ff8f035f94824aca503e18f73a679f62b8
+EBUILD mill-bin-0.11.7.ebuild 481 BLAKE2B 2f809272ef49326bc1e0862b93e8c8319459fffdf7d9e74595039473a04d58380a11ccfa0adaf128f271917ba5b774ad248f9299f9b37733ea5ef4f487455fba SHA512 e84752676e1306967d1dc5a75c5dc098b3ffd263b57c3c64d51349cc63973a562194b70960700ea88f73e31e84731663bd9598d063677e540977aad671fd7d5d
MISC metadata.xml 462 BLAKE2B 33fc9bc7b46cf529c83a5f554abf0ac46f109b72e9060b45c442aaae815c0845a0d5c8aa799ad369a75b5749e6499458763ca1913e88cae0d07fb6233e6badf6 SHA512 bd8831c79f4f164f509ee6415ef922fee49d40282d655785ec289f06da0e4735f3857041911236f2c7cf319f72458807ee5fb8a008e31774d90f03634161a2d2
diff --git a/dev-java/mill-bin/mill-bin-0.11.5.ebuild b/dev-java/mill-bin/mill-bin-0.11.12.ebuild
index b2461d64d37b..3534e0b8c898 100644
--- a/dev-java/mill-bin/mill-bin-0.11.5.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.11.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,17 +6,16 @@ EAPI=8
MY_PN=${PN%-bin}
DESCRIPTION="A Java/Scala build tool"
-HOMEPAGE="https://com-lihaoyi.github.io/mill/"
+HOMEPAGE="https://mill-build.org/"
SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="amd64 ~x86"
+S="${WORKDIR}"
LICENSE="MIT"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
RDEPEND=">=virtual/jre-1.8:*"
-S="${WORKDIR}"
-
src_unpack() {
:
}
diff --git a/dev-java/mill-bin/mill-bin-0.11.7.ebuild b/dev-java/mill-bin/mill-bin-0.11.7.ebuild
index 5b24c097e25e..95f583ce077d 100644
--- a/dev-java/mill-bin/mill-bin-0.11.7.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.11.7.ebuild
@@ -8,7 +8,7 @@ MY_PN=${PN%-bin}
DESCRIPTION="A Java/Scala build tool"
HOMEPAGE="https://com-lihaoyi.github.io/mill/"
SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 703b0ba15ecf..3317496f5614 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,31 +1,38 @@
AUX openjdk-bin-8.env.sh 607 BLAKE2B 447575fc213003930ba6d6bbbd7cda0d53f53b16e3679fcb13d219cccf3525c7dfda755c79826b4d3c7b238502ed5ecaf4c8514971e576c756f4fc168fd9a0d2 SHA512 4cfbe2dddc89408824621bbd2036afa2966d550e6e189a8835f78b46fe91305221d8fa46219e9c53c83c9f73d83cdb1208bc78a46b9115041511b97b70abbf1b
AUX openjdk-bin.env.sh 398 BLAKE2B b83d85e2a4e0dbeb24b8c21fb442a8964e55eaf01125cd52f5c930cd67b95b7d1744362cbefe436e4f4115f0b7600860200d8f134b241b6b60ffae6b807b476b SHA512 2c2f753a05154d17a7c324e61d3e4513119050f44d2a8d0aea5c6e2542e9989a955689a97d47fc1d5c710a056f2ccc7b239e3eed3b2d516df6b2aa7450c44613
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.23_9.tar.gz 192013902 BLAKE2B 6a4b47b9a3397d3436bd55a16a459a3cab3f8a2a7dc3285b3bde8db13f0e66d5e094803df0c5901a17272e6378161caada6f27845184e2efd17a6761661299c8 SHA512 90e53418efc7c34d7cf0691d566f07a84f02bd2d34cdee0c9c343e27c8d9bfd4d1bf86f104ae33a47274932ab8ba6ec8071a35e7d613129d03e439ae3382452c
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz 182785851 BLAKE2B 453ca29859e749a9050f8b6627696ab6d38ee5e83ab69b1d159eb3b7c0bae68104cf68ca21b87123b4fc61059e528ba4ed0ee29fa4759f33a3cf46182f52a48a SHA512 af8ed3659f8ff07f5e5c135d96a7368d326f5b19e3d73077a3fa701716f6e415d4a784ff6c5f81267eb1b3d2e171a688126253f1c3197fc80ea260826ebad5a0
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.23_9.tar.gz 177453532 BLAKE2B aa98f381f2ac4f208ced4dac4f4b01d20cfd27c8ccc75a0c41db6a57b67ca11d87b8133cb0af96283f646e5e90612f9ad69db5129e6f50518ad2eb0a53c86db1 SHA512 c590fa032593db48531d49977c95d1f884fe751472d927d0d0bc15f36ec35f71ea53c9acafa3dc00c4b25e88d4c18ab590b42f8057a277e16947c3ce31362381
-DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.23_9.tar.gz 193956832 BLAKE2B bc334b59bbb021812ee7064b1915b6106923d41a74a3acf5b5d8fbcf50f6e0d467a96da22f996252422b08f5c7864418c552a102a18f3bd9cb14e5b4904656e5 SHA512 f0992a7fdb1acadf8cb19a94822e7a75f7453033cc0a3432f9efface7827b4a7ebb1ff67a81774da83844afdb046461415f50ddf11192863e88ab06889c86836
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.23_9.tar.gz 195220527 BLAKE2B b2f024fdd2d72e78c86f562fbd37684c9d9639472d66e15b4b882c35241c500c09467e97440249bf69f4e63ef99d3f057b0e79852b67d55c5518d041cba2d657 SHA512 ccccb5003b78cff0cbf471d9b885ebd5805b5a21dd71afdb03a0d447cd6715e781dbf01f11970f7632b8181147fe0090f7fe8fc46c8732d2b17f0978f01934a4
-DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz 187689918 BLAKE2B c1ccebd2bfeccdf64f1ab0c781e4ba5f2701f6c70de81486c6b4d91bb1d1df367f58fa66bf8f073ed47413649905a306ad3f75c6696e1d0510ce02fe3453d255 SHA512 93974938c10d58b182a7bda49e21e26806a01a03fe72915ca559df3e02c694b3b88ed11c49987bc2ca7c1acabda0892d8c22a4ab19ed8b796dd02f29c44dbff0
-DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.11_9.tar.gz 191052267 BLAKE2B 837cd3f3e9cdff7b66d1a8e10e2e8ebb9db1168fad2982fd523eb8067ca017efdc05e577b93af74623558d04a8458dc1d790c9626e7ed2d6568bf7fc22a44925 SHA512 eeeacbd0f8daa1d62663f7ec95fb7dd3ff855a0187347e3c1ddb4a5d13e494c1a940b43b5fdf75480963d65dd4d94330570b751fa7cde540124ed2164c176870
-DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.11_9.tar.gz 178367345 BLAKE2B 7f1c8f77ab8ce9ce401947e51cc3051491df1579409f7ecb73107f091b58d6e7fce2004604951dfad019cd60e8da84fd4ee9f8987f92c9363889b310ee098e54 SHA512 0283452e56b3fbd85af33a7939ec8ae69624241ef07224152de55c5aafb1a5cb8423b8a211b5fadf8f5ea50aa0e5ed8211d02abf1398473ddf3ef13f2ba3f1c4
-DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz 189349607 BLAKE2B 2508ca965c27b1cf6457a595418ee9cd0450f9633a2fb80605a58a4bb7546cebb95b04c0d66bb14107c75fdff9fb678d78cdb879316929a3da6863579d4df9dd SHA512 bb76dcc65f65bbd3a256a54cea00eddb25312f1a1e2ed30fd3088bd44e9f8db7bb2ff3a6776b5ff6733ea7afc02928ef9e2bae296325fb1b8eb9b66b4e6f4a87
-DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.11_9.tar.gz 191737628 BLAKE2B d78a0a64bf936bf85a4f9fe1c9299d1db4773e10cd308afa5167d61ce35ea7415d2a94a1dc160345fa5aa3d3a7b730235801789db147d62dae621572ca060fe7 SHA512 9ae308f12b5c74b48aed4ef2312d7e0b23e9fa73b7d78eb3576037b0fcbcfc3a5381ebc448fb41279e770d5994c46bdda6822b97181fa3d3365da63c8b0ecadf
-DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.11_9.tar.gz 191615499 BLAKE2B 4b342ebf3da0cf49d448b95dec6b04819d2ab2e31327b793b9d9aef86b4e78ce33a54995a5d0608d14214f3d0fde73d0ad334c9b0e3c5d2cbb6d40c4bb22637f SHA512 7773843e3b2a02ccb70c3ea49639c723f5da715dcb3e27ed85dbd2182648621a5822c49728436377c8e8af4d20231ba5b861e45be17efe44a5a81a92c225a851
-DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz 192396023 BLAKE2B 1e5f12041d9c17195f242d7d36edf6995b1f71cb52ca211773faaa0cca6af983ec8c7885d58d4b87b38a0a26f71d088c104cdbcb84fdfffd97643f2a09a2a4ed SHA512 f11e61d91ad27ca31196ded87d06b5e379e4e652c09ffdd5c3d73cdc9fe6c46cd7785838c70514897645213ff6c6948227be27d7fd773949f1055338966ba275
-DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz 180563846 BLAKE2B f9bf368e39d95cce40413caeb98192f88f90cad7dcb486ef5e1d7369cfc346603d37de88c049930b958043621e44c103e020354eb80faff0cf83fac8dc7497a7 SHA512 999ad1fb7c822e9000e734c86e70e73aa572ec1a75d14219b391e9d358d1dba1fd0d9d568df4c28d8ca88fd4341e24feee2f840b6c35c4c530d2cd174dd797b1
-DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz 205794447 BLAKE2B 4d6ac1fa90b81be10cd32be76665dc26bae59a5c288d1b1f87e396ea356bf46f73b58db06b5b09417714f4638550d7ade55792f276f39dabc100345efd18c28f SHA512 b9cea7a7f4405c66722b3562e0ded7362475146753b1fcc4ad0d068264e9f228b8547dae704c6ce2be9c4a879902c2fbd93524176ffa02ddcb3edc4d4f6759cb
-DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz 207595331 BLAKE2B 7358f61aaee85fc5ac584307f1d5372de17aa06676aa823de157236e4332184b9212e74cc4214845a9e834ebac88d41ba185d1823257254174a960db88cb0574 SHA512 dafe0f31867f2ef817f188fe1222adefae72fe4443ec95eba8f18d60c141bdca0f63c2591c834c470c7b15d011618c97c45bbc65e746cdc47ba9be9a2f2ce523
-DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz 203760093 BLAKE2B 6be42a229745d9f8616b2738a3301642b8358b542625af01aa943779a029e4ef16f70eec437a22e2215a720d99420a01d498093c54387374ab8169a517eff9d9 SHA512 d10f6dea263dcf32e4e356f941fd275a64a4ad331db638332788623240f0f30869932542857653a65fca0e18a49d154fe2dce5bcf645c878ce86efa02fe05471
-DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.3_9.tar.gz 207940807 BLAKE2B 331e80062987c1932c24c8ecee8456240261ab43da04df2e5782f28c9683226e74116b2d8b5dac7047ce62e1ccaa5020fb9d94b98c515e9c94445ac8165f9692 SHA512 149dc0e7f058443787e99641b0c996ea7ac15d171abcf03778ca6a44769583cae5e507415b16fd8de5015d2acfef4705910cd43289cdfe624d07280e7b7ad961
-DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz 207698369 BLAKE2B 27dbfba74a3dc46ff98c982208e10c1c40940cfb90db0d756e8038cbb1c5f45e30ac3ca07b408a3593c471d0f5ea75bb652902d49786490e9ad5ba290ca91162 SHA512 cd9e6054989a838004490f6162f6831397e5498033777d90da224f0aa4809e0f5c8a14459e6f30d441fa1238371d7db9718e2c606c38862b803dda824bbdba1f
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u412b08.tar.gz 102116126 BLAKE2B 19f8deee04fe5521323ead5193ff7b383979afa32c4375bdef7ce53b868dd7cb317bcd208b94d373c353f5480433cb3a28beeacbb7f42b501058acdfe6917079 SHA512 e2c5e17eda6a25b8f12c8fe5a50b5c58a9b52bf9cdac7213e2b0eb7ea0c99ba0d3c31ecbaea834443fac12adacfe506ecbe3a487abd16846c6619678ac24c4ee
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz 98318417 BLAKE2B 11ec1cb2e793da8252511dee62ad193b67b3bc5c8aa91dbd6b1e8aa2d2f7e2e342528d145e0eb9e26b17b7e81c9ff17586f068b4d146f6789b157026aff67099 SHA512 84eab7b032fb55e02870013f9a87d0898ece12c52c560c0600d8d2ecb4901cc64e6e5cd44375ec6785a5c8f139263e8b6b32d348149e22200c962438fabea9fe
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u412b08.tar.gz 100529230 BLAKE2B 1498ff1c4d89f65a41a565cf3d6949f715bc8783a33b70e6cf7b44e513ddf7ade1242e2a0a95b582813ab212fb2367a5f17f794f54b5e458f0e23dd22e74123d SHA512 cf80eb66063559d4fbe062d8a198490468e4936c9e0b27ffe04912b4468a2d1f4d12fffe5df5fede38b44870b65a7f0cd85545f7031957b12a7d1a368a7770c6
-DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u412b08.tar.gz 100923084 BLAKE2B 9c9b0d7f95983a44f040efa83c69100163b1450d04102000d4f75361e9164024697380c055fdb31bac2ef4dabc05df592bbf342e716d8f438954b89236ff0986 SHA512 07b721e57225165d3dbc51c1d8f79f269e75fa3fe946ab76e933d1d3645dd19b3e7e8ea924d4f510382b5bcebbf073e262010c0e4655e0282379cce9d411eeab
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz 103005511 BLAKE2B f3df80c160d723df67700363ed6f40f3308a7625635b5afcb1656c77c9f78cc2796c5878aac0bda6cbde8d6551371ed15223de6aa8e75c01ba3e4848285a88eb SHA512 6f7df3fbb34c5971b7bbc4bafbe0179983abfa0aee212cc810e2656697cf0a7f4736cbbf6755cc88cc885d7beb5c15482a21d5287c52bae560988cf80908ca05
-DIST OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz 109506799 BLAKE2B bdf043df0df0f0fe100e80a464a0fe8c60e7c80ab7ca5e7481c8f7458b793a24b0f2d93ec482b5f0de7a65b3d068322b7b3a9e9c9ec5c5b61342cb85232db847 SHA512 4d774c3f0794d7403dfbf953e7e9d635b71c463bb193ffb4cc98e98455ff7a448f0bbf290a28c9290e3d9affc7390eeb4be88ad48cbfb60d9f605e57158f5058
-EBUILD openjdk-bin-11.0.23_p9.ebuild 3174 BLAKE2B c20c05800f5be936ece355f8f4434e8ef6556f680cd7a784b8e40d601a883ae679e3439c33e8ef1db722db3153833ba0f38858483eb226c3236ea3d2c137e78f SHA512 f8a17638440efd97e0588cbd0079ff6b3cf2f9eac9be21f15c2fb17ff2ba84a74c9321b47c89d2a278aa26d23a7d2329d398ca639566edc36f0265fcc64835d8
-EBUILD openjdk-bin-17.0.11_p9.ebuild 3206 BLAKE2B 6d5f39a34005e0eb44836331c1b93a491ee1a6cb78e4a12494626316e1e6813182212c2eeeb480656adc276ff1b3e548ab4b9733f5826ea7b9e51ba469649c99 SHA512 7844a7f79c66356e6a7c5cd18a6793bb4a86a408de72d784c5b888d9facc2aa1706ead137f2a9c140ba00e566c14d0a06389fd9b664aab587307326b1a185311
-EBUILD openjdk-bin-21.0.3_p9.ebuild 3152 BLAKE2B 117b7bd7a864f55568bccf0ed036fa141349e4d6b7994610dcc87b0eb519ebd65142f8b1ef85efec9964cd1bd4a9e97c7942233268379c36f7d4db7376dd2e4e SHA512 9abc73193ed748ab2274e85473100d8859817563b67603921409ce160140e4062f7cff2b7211bd7bf196d0009e627c498ab88974c2bab1003e5730240db35b73
-EBUILD openjdk-bin-8.412_p08.ebuild 2927 BLAKE2B f62bab1ebf203a714edec548e16a08a96333012887a9a122d4f3d4801e50f3e9e5aceef1e40ab41f5fa312ef2884ae9547a96d2e8fa058bb1d69ad24abb74a97 SHA512 4712fb05b86e306c764af75252d4fb1201295bfa92817eb646bb793a56708c7655523b703428ca63e5e63d3a40bf77d4266dc8fa6244357702868787385bc0ef
+DIST OpenJDK-jdk_aarch64_linux_hotspot_24_8-ea.tar.gz 212736873 BLAKE2B 19b1e544e8bb70a2377f9aeb85241ed807167795742e96829dccf8fa5e6ea8d8512fd85f781d40e1428f415775b6ab77c4bdbec4e3ad66b05010665e535d2a8e SHA512 5c7daf6d12bb4acc031ce17dc429f4e3bd2e7bb74ca9b8f3ef90598ef69fd017bd3c73589d64d23919344328869465c3551832d2095311f3b6208c2e62fcc4b1
+DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_8-ea.tar.gz 214372109 BLAKE2B 891f3b1a16fa9ea1ec247a9c68d84fabbe67c9052584580626f67d2cd87504f7eaaf008bfbf59b6250c63b348d6b1cb734b75d7aa0ad334f9738b8f624c0d874 SHA512 d9756fcd2e02f4317c6be0c97e163c6d836c07dcf83f272ca97920433f596bbda01beac6c302a425bed3ca0fb628bc919a2e33ebe754b8bd9672787f1be9d255
+DIST OpenJDK-jdk_riscv64_linux_hotspot_24_8-ea.tar.gz 210709698 BLAKE2B a612df8e357a930ae1bc6f54a5f0f0c55f8fec279ce7ea7f52ff45a097badd1a848dbdad5778adf2a13e622c7ff63b6c10b6feb7e3f8de75016eb9bf404f03d4 SHA512 1c4d93def2a92de4e1a1a8f6ab624de542c4fc177b9d66815d50b1cac823ca6295a4a702402ae09b8b9662ea40c56da836d6a962af8a2fbd7bf6576a3036187e
+DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_8-ea.tar.gz 215051746 BLAKE2B b58ad14f0faa0940621245eeca212ed6112352c9e52833fc5dd2aa740956bce85d69f8d30aa923bc0fe0a0d81ed8dc4d4c9d8cfea5132de03d34d6c40bb7f3c8 SHA512 610a2bc5df2670a214ce39ec426428c3dfca47e5c4c04ed3bfe92fe48ec944324208f4edbb242842508a1964b97bf1085aaadec14d5fe8c4cf7bde57e20d505b
+DIST OpenJDK-jdk_x64_linux_hotspot_24_8-ea.tar.gz 214855714 BLAKE2B 4230cd14375499463872f9c9e879b27ffcff602ca2401634fa0ae1dbfbc9a7aabff67f6f99b7a2e5ce409eabef962775706785268b8bdce8cd3f40dc76042b83 SHA512 55ff9c22d61815e7b4cdf8bdadc75d6ab16c0a6d6a559a71bb11ae9ac3236e4305b9928981d489ca71078e64bb647f8731534d093e1c81249e32d7c168cc9df3
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz 192087968 BLAKE2B 12659ef10cf2728ca5eba2b4eed5f592a5bbff5065f33309498e7a465661957e0e8191bb691a89934a8221e26ae7265f0aca059ba59731b5d9a80e7f6cc55206 SHA512 84dbb810134199cb2f0278ccbcfca2d1abe32bf65bbb399e99c2ea9a027e21c2ace5685adae98930be4a185970640626b5bbbf822d499f815d803fa4485134f7
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz 182800065 BLAKE2B 50158e8e84637ab841226da590f53ef3d0f18aa2dc4ce5c2fabc2260d864a1de65a3021e380fa9a1af1aec92177c2618790ced8c7f12f449fd7ab4851bf37ac0 SHA512 893ab22f39f102724e7b77b7a06e09b33ee0551b166c0154ce19d4e6abd7e346d0a8314fe2e675e102febf93e001679a1c7c665f6b131c04a453cfbfbabb5003
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.24_8.tar.gz 177494491 BLAKE2B acc6c4893a57250284b7be0fe98d6ea3b44f42227174050ac3d035ff68e482a61aeb32b38f1404f597c47dc3090fa49aa27401c6903367cc938b1f4041cb714b SHA512 88d8e3eee4af1f3578ee001516fd9a2a71af6317af404e39b64365ac780f89455dbbac1eccf50aa6d09cb879a79da88e720c344cc527d7313d6abfb8b148c3ae
+DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.24_8.tar.gz 193983794 BLAKE2B 1e2c87450db7dc12c634ae5d12f3a5c0ca9406d85c01e4b5953921b54a144d868b4f5b8fda17865ee42c7ad082177770286367b8ca38e7faaf30a80f438caab1 SHA512 1e55b979254f2ca7c1b53496471a089538fc6c31bb9a40dc1cab5e09f42b0ae23b383f768c2614421868d16d8eb2f3fcb5768fa24a944a8296439fbc31d7f841
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz 195251808 BLAKE2B 920459ebe96477e79fa3e933958c3fdfac476231dbcd7473ef9fdcab0691e807e67bd94b92fe43dfcd66c401b62da0a450892d5561530c17c5f159d44f537f3f SHA512 91e20884152a5d670c05e83e0b2b875b324af2683bbfb063015cfef4956e1ef4f3051955222f854753ea4144d99b30f3f9bd1b5220204f9a9bdc51ef461a1590
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.24_8.tar.gz 187710109 BLAKE2B 7565adb6e64d2c53ffed1d64b8e23ac02b82f4feeb9315327c9825d1b134cd476d3331f64def991b23b5b568379c9e31dfdfd97fe87b6caad7eea039a47b652a SHA512 91d8da2812f8f709916de9f2fd90afbe2caec38c1ca0da2d3ed50d79663aa274126c010c1c19f841845b493c7efb57307b74b28e2f89789ba52c0dd80dd54e04
+DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz 191121494 BLAKE2B 92b72ef8fc0ecc6bd4fa785baf6b799db48de5e82e12a09ec630de854b19a0b17ad2408a7cf8d1cea9a663ddd062e88026bb91ca1d7cbaf51c261e189ece697e SHA512 662ffbeb67238612d56ad5e53abfc11738aef595f96bb8775819c7d78cbcc6888755baeafa9695c1673c1833ea328de67d6d0e4c6736c7e3006b0a886108de9d
+DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz 178427485 BLAKE2B a2ceda0b6b2abd5643517f53bf8e89c7ccbaf1c29d784e8dc4de568a534fff8564561fc48ca64183205754ae453b5fe2027c7881c8904a126f420cb76745bec2 SHA512 2ddb35fa6214f29c254e0f27f401bd7da1f85ff7bb171b12fa477321883b0c31ce6a6f0713c76df2ced18884a0b8261b8772d9c7f6382cb08625aea36e8a3824
+DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz 189408363 BLAKE2B c6569c14d010262b29c1d4b879f9384028c6a6be71fb29fb2cff1407fdd3bace0f22e20af0cec7fbf1277ad4d75000d32a0357776a32ed4166de64630847c59c SHA512 85368a3c6f60847dc1c55f29c8d465e87ec64a690198f68ae9022cf897671fbb2c5f0b509adf90d541ac7ce48f2f7d8159070b64bc5bc7b652e52c95cf20f10a
+DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.12_7.tar.gz 191814558 BLAKE2B 326e3bea419e404be9b8c33640355d7f94e07068779edcebdc59370410e1944d0e4681fc3966b4bc4871989900c296149d82b331061424223f9fbf0c08616f75 SHA512 bcd5a53f82a6dc84aa069651228cf7be3de69195f58954230b34e575be62fe3ed403d57a7870b88ae930fadeda6e29d6af27e3ec7e5bf862e434df0c627985cf
+DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.12_7.tar.gz 191681951 BLAKE2B 40548a12e485b36700726d7fe0826d716feca2d7db9bed403a6b61a13ee929a4ded93d85acdc2cc2170b8d01daf616a9ac7faa7e673ca37484b1f408b201af48 SHA512 28720148b92c7dd0649921a46dcb81aa05203e309ea851bcd41990fe59bc3566cbedb07ef08d7aff5f7399f063a05d56048798b99bb60a6a7b69533a44ca152f
+DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz 192452655 BLAKE2B 1b38d3aa527b585f931235b737e0628fc74e0f1b996dc64b9c3cb84598c66f28d908ca550786f691912ecd03473d43bc87309a479442d4c4de85a67298a69fcd SHA512 59db63a7b25f851153bdf3aef81acae6b7de88eff14d481f14c346d894bd7e3899c40224e51049047687330e1c43a8c23c45bd375966ad9992d4ab538a08aeb1
+DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz 180640890 BLAKE2B 23b97b0bae054210155663e5d92fe6868827d353aa9ee6a0fa46cc53d41e43ba5378ac7901dfa4a323a2aad541a45ecbb2dbf7e4ac367cf58908203c7b216c5b SHA512 06ee1f7d0d3b346cc5c72534f7d00f53d02260d8d41672a94228de805eb0c38b1afa8947504ebf740dea2646f45c5868983c82a6ddb800a577d305a56200d13a
+DIST OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz 205835448 BLAKE2B 12aecce2bde9d78c721a378554de5132a5e4fcd3bf95edf7178b7ad837cf4873717a7c8fc9611a811840f32fb4b2a794c4ad80fe19ed42a55f94430240fc19f9 SHA512 d349ea6ca15f8be8818283ebb11c4eddef57a7d1cc98bcfbaf885366ea44ecf520d2deaef43c7d9443a00dc8eb8b3d0821c1dbf4eff886199ad9f484c3b2fc04
+DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.tar.gz 205880079 BLAKE2B 995b78580e88b922852d3f3ef59e40d11e4c7666790a1590f3672f1fb22f8b58e3a2965507cdd85d75b3bbe03e4daa603519e5d00933b86abbeeddffd5c2475d SHA512 e5f263007f3aa10fb6f4c80ccec503ca08e62bf220d5c90a206edba99e8b9d2c4585dbef7f7a84c3abeeef80a964ac171f11eaa40e5eb9b06310974dd57c42cc
+DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz 207691025 BLAKE2B 5413063795dff4ba6a6c865eeed02c45c3abfe63ca08b91ded278e2da46db721aaa50a4b6cb658600454efb3eceb1178f2759277d2ae0ebc9e1a1f2476ce7059 SHA512 cdcc9546c99edd72c71c7003f04e08919748794ba2f3175254f2d02e9006a3e4eee79592c84f51b115e8dd56ee321b1c078e6173dc75790a6a3b5a1aa7900fe1
+DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz 203854772 BLAKE2B acecfba0619cd5856f2e2c835240729f5d70a1f4fc373c99e7dec2aadc701d5779c8b42b804337653d6e8b99089fcd1622f48232a9a36bd25b4e4b7016ce68e6 SHA512 92a12dad45b80ee25b555b26456a592db65e5cf2373984e7102ee0527a923cc1d015fba0a75177f3f0063c5d1843f4999fb6627b506cd506571b9625871dc892
+DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.4_7.tar.gz 208015131 BLAKE2B b143b83ff40affffd0be90cc19fec59777a80f783c6a4d9d1161d5205dee9a50f88d89fc21e402a14a1849d2dfefb780935acb47b7366b8fb07a3cd10f9ca65b SHA512 9cf65b7ea2cc4e7a21c5832c3522211c53b55fb6f0d4ec4deecb94744dafbf1412c17508ed1c21cb06b03c5bcf8212a0e5d6f2804663833735a1ac2f77dae7a2
+DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz 207789015 BLAKE2B da61c96f082f18bbb64e543b96972d0cf812cbd64ac970a45000506e41f9f54628453d4a24b4090271dc267e21bfe285a04173c106259e67dc72246c43edbe32 SHA512 7675079ac1ed0c0428f806908b21c58549df7fc18043d26c011e063b58772ddb1c1c9648a46ab7d5204d47c2af5d3f08eace30028113d64e09cadc69c4fd0def
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz 102132553 BLAKE2B b59a2d99f9999f86eac2ab15617ee7c58d179a7db2e3606b3296b4bee8bbfaaee2f3cd1f441d90b7462ef9a502f4f351bdb4acc8e723d6b16f208827b813e8a7 SHA512 3856d2e711fd0f93f5efb73ffe5dc115d03dbd0cd015e903b7c2d02b6a3940b10793243edd6a372d7f84306f10c7a41cf13d7b787a33d525f1e86e9975453d06
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz 98342561 BLAKE2B e34d6c959a2100b7c1817ad0fa213331e1cca75229edccf68ed4fcbd3b9bdeb0852dfdf59dac3e9cdae0179af38edc64ff7329af9f44fadcfaa7cf301f8f4e13 SHA512 a667d531b3318e7f75d3d4d9a32248c5c9ae7c1d4bd9bfcbcb5f11418016c1faa179ed748c3eae09c8693885a9401a80de8f3530891883b9f6e9de0b50002ed5
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz 100533202 BLAKE2B b83b926e5bf0fe45bce9a79489422b96c6ab321227a56d8b3c683a26e5b71cbf9ec80a4dc2706aa4853095a4ee3174591cba8725b9e1b645f4c275137a97abee SHA512 e345de1325f9807d1cc3e4b043d650d655ad8a3672edec304023af54c7dd1d8fea0e671781ed46e6d7459909afedb2458c1b45966b55957389ec62449aec6469
+DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u422b05.tar.gz 100948020 BLAKE2B db92e2d9ef5bd15816d2fb3cd6a6dc0accd250fa16ec9b3eea9b23a72e73a32be43527d8f520f39aea1b7a84723e07d24e3de136b6888b869d8e75e446fc04cd SHA512 20b47a527c1b19d6f2779e619507a250316ee3d95d7ad7b5fa45c86e26e90515cace468a0ec6fd37be108f473f92d70eadd0a61ee901594ff0309272af4f61e5
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz 103022651 BLAKE2B e144aee88326b4ed539324d8dfa35db461a3595c23a3bfdf0af557b4402ac4dd65d9000fa875b6570d7475ca7fef90d2e7021938f04918d40a04c04029e2e1bf SHA512 d44bdb72e616771d6b465abb66228f08968afdc0e8e40f73e892ea5c5c441f554d793f1e1643f1f682e0c0f4e25d24ee3f9ddec8c6191c43e77a3820c9f3d2a1
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u422b05.tar.gz 109522911 BLAKE2B 37472be9a5f061ade8e27318ef2a7782f0fd4aa38362c2d19eae47cf18ac0d4085a84aab4630b97e0162d6b8288e3bcce2b1fb1a8f1bc25e8a129137f5407657 SHA512 e6718c635d42d2662a404ac71f5c4cae45714f7e1e7f92af28191dfb5f01ac3c4c9c5335073386a7cf7a0c628d9dd0ae211fc4e9c0bc953e3827362f1fc39344
+EBUILD openjdk-bin-11.0.24_p8.ebuild 3183 BLAKE2B 02e074b8eb4be70ea24d84ba28817e63848531440471c05ff7b0e8c1b085a82670b84af16cf267463bbaf639750d5fe9caa6f78eb5b4a3c4a98d3575a90e8507 SHA512 9b37045ffe35d5c91634737f44e7c4a0733fe569fa2d59d7b077a0af4e4273dbf39b16abdc1ec1a638f6b3a3a13ea08069831a2c896de072fae264dbaa0cb5f9
+EBUILD openjdk-bin-17.0.12_p7.ebuild 3215 BLAKE2B f2ec6fe938342dbdce0a068c391d99520bc657b6d70edbd90b5690a63ab4229724792a1e247ecddce7a207abc448c145f70786fe01f81ad1850050a6553a1d39 SHA512 5c458e8e7001beb6c791ad7b82e1e4d6cb759f4ab3065a8e7b2b1ad82a57488b159c52f1a29afd35aa398f9f76ecd1f80258674de631f9f0a2ed30e40b514d55
+EBUILD openjdk-bin-21.0.4_p7.ebuild 3246 BLAKE2B 0b6a856283cf4554917afd3579f09dc8514c6b20fb5f663de8a3b4dcb64270c81887d6459428fb8252536df0eb7a3bc1393890f8029aa9ea2a17264f355330ea SHA512 78cf14a399dc8a93f00a0f16d08ce03f1227ad62fa2d37644e380e47dc19e66d157c19c5e7e81d5cbcbfef37bb292fdbca610cad0f7564dfbed7b9260ed1a6d0
+EBUILD openjdk-bin-24_p8_beta.ebuild 3213 BLAKE2B 5907e99efc562257ac4af366a984d33694daf506a99fe7ef328e07d5a2871b447bf26710e561e0a1948f98a10d4f6837dffe494d57c9a5e2223a0da1ff92632c SHA512 b0a8bbeffd3beedb36e70de0bbef005ce3c3a9578c191ce29b52a17c398bdf21e1e84a1f7b27bf16e8115de897fa3b118048afd8bcaf69a41d6dc11a72a4b100
+EBUILD openjdk-bin-8.422_p05.ebuild 2936 BLAKE2B 6a60e6aa39cb48a07345b57bb30f8184bc2297957b0b71cc819c395815203ca16978b4008eb05bb21ebb6e54ab533da877e6f6f4a62711163b0b90aa7df46d6a SHA512 6149ff525bc36f48b61ab64f988698d6fca229844f03f3099e9f4d58e47446e711bb06f76bd06910d75f0f2ef040b0e3cb5b0c11019884cd0705162792a9056d
MISC metadata.xml 992 BLAKE2B faf08cbddeb47356eb249430ec21526fbadb95f666be9092a39d26f7167173cff526510c63f920b3891ee2738c915c0cb2319e4737f511f709b721555da2f061 SHA512 1f9fc80bc7bc07a1b6fc3d820368f05f46bcdd818fdba458729ac6c5ae9a55f43a435f9827f6d3986a17d2ef30929723b1f05acfa0017c855dbb3d9cbceda29c
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild
index 879465da18c0..2602fad82147 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild
@@ -6,7 +6,7 @@ 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 baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/"
local musl=
local os=linux
@@ -22,13 +22,14 @@ abi_uri() {
echo "${2-$1}? (
${musl:+ elibc_musl? ( }
- ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+ ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
${musl:+ ) } )"
}
MY_PV=${PV/_p/+}
-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 arm)
@@ -37,10 +38,10 @@ SRC_URI="
$(abi_uri x64 x64-macos)
$(abi_uri x64 amd64 musl)
"
+S="${WORKDIR}/jdk-${MY_PV}"
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
IUSE="alsa cups headless-awt selinux source"
@@ -68,8 +69,6 @@ RDEPEND="
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."
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild
index 43345bca275a..beedcb4f53a4 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild
@@ -6,7 +6,7 @@ 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 baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/"
local musl=
local os=linux
@@ -22,13 +22,14 @@ abi_uri() {
echo "${2-$1}? (
${musl:+ elibc_musl? ( }
- ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+ ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
${musl:+ ) } )"
}
MY_PV=${PV/_p/+}
-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 aarch64 arm64-macos)
@@ -38,10 +39,10 @@ SRC_URI="
$(abi_uri x64 amd64 musl)
$(abi_uri x64 x64-macos)
"
+S="${WORKDIR}/jdk-${MY_PV}"
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
IUSE="alsa cups headless-awt selinux source"
@@ -69,8 +70,6 @@ RDEPEND="
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."
diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.4_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.4_p7.ebuild
new file mode 100644
index 000000000000..7fc34d184029
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-21.0.4_p7.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2024 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$(ver_cut 1)-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$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+ ${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+ $(abi_uri aarch64 arm64)
+ $(abi_uri aarch64 arm64 musl)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 amd64)
+ $(abi_uri x64 amd64 musl)
+ $(abi_uri riscv64 riscv)
+"
+S="${WORKDIR}/jdk-${MY_PV}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+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="*"
+
+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
+ # do not die if not available, -f for bug #934974
+ rm -fv 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}.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-21.0.3_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-24_p8_beta.ebuild
index 664b82161cd3..72e3e2f5c768 100644
--- a/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-24_p8_beta.ebuild
@@ -6,7 +6,7 @@ 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 baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV1}/"
local musl=
local os=linux
@@ -22,13 +22,16 @@ abi_uri() {
echo "${2-$1}? (
${musl:+ elibc_musl? ( }
- ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+ ${baseuri}/OpenJDK-jdk_${1}_${os}_hotspot_${MY_PV2//+/_}.tar.gz
${musl:+ ) } )"
}
MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
+MY_PV1=${MY_PV/_beta/-ea-beta}
+MY_PV2=${MY_PV1/-beta/}
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
SRC_URI="
$(abi_uri aarch64 arm64)
$(abi_uri ppc64le ppc64)
@@ -36,11 +39,11 @@ SRC_URI="
$(abi_uri x64 amd64 musl)
$(abi_uri riscv64 riscv)
"
+S="${WORKDIR}/jdk-${MY_PV%_beta}"
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+SLOT=$(ver_cut 1)
+# KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
IUSE="alsa cups headless-awt selinux source"
RDEPEND="
@@ -67,8 +70,6 @@ RDEPEND="
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."
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild
index f93a2a4afad5..b8735214d026 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild
@@ -6,7 +6,7 @@ EAPI=8
inherit java-vm-2
abi_uri() {
- local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}"
+ local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk${MY_PV}"
local musl=
local os=linux
@@ -22,12 +22,11 @@ abi_uri() {
echo "${2-$1}? (
${musl:+ elibc_musl? ( }
- ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//-/}.tar.gz
+ ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//-/}.tar.gz
${musl:+ ) } )"
}
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"
@@ -39,8 +38,10 @@ SRC_URI="
$(abi_uri x64 amd64 musl)
$(abi_uri x64 x64-macos)
"
+S="${WORKDIR}/jdk${MY_PV}"
LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
IUSE="alsa cups examples headless-awt selinux source"
@@ -70,8 +71,6 @@ RDEPEND="
RESTRICT="preserve-libs strip"
QA_PREBUILT="*"
-S="${WORKDIR}/jdk${MY_PV}"
-
src_unpack() {
default
# 753575
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index f9c7b6370bf4..979c66e2ad03 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -6,10 +6,10 @@ AUX openjdk-8.402_p06-0004-Fix-misc.-warnings.patch 3075 BLAKE2B 8da8de4830a4545
AUX openjdk-8.env.sh 687 BLAKE2B 4bb851545955fafa6a4b08f2589fa9a5441ef37484eb21ac5db06cde111d325903e70b5b7473659973a0bab972386c8f33ded1da57858fdca325cfa29b1122f5 SHA512 a43fc0fcf57108350235d47d6da65a12fb9f77f12f6163c649ceceacb3317c6a25516efa060efe129b74138a529945163343e5a7d1de2b7af36f6580054ed5e5
AUX openjdk.env.sh 432 BLAKE2B 8779a373af2f9e52473cb5e3bc2bbcb7fa83c6d09382d498466888dd322299adc1b736c6e3723fa68e92a80067599228b3511cc2826e1ebc3c5845a7a2f62fa3 SHA512 e6604a88fb857945a618e4b7735d49dbc23bdd4c6fb70fc5753470e9c1047825208a40fe25107bcde95f290656b44f92e1667ebc414454cbae2e71f16fec5fbd
DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45
-DIST openjdk-11.0.23_p9.tar.gz 116316363 BLAKE2B a3745b2afe9d2529daf89aceed43025aca72a353210b0987aacb32af971262077411e9a2b6cfd938ca9d0c93c8762759b9207a13cee0808288674671164e3a36 SHA512 3851063289042ed467a9cb636eba7170a0feeaa3e5d19bda6c30a186ea624e4ae1b308006652acb9c9820c2065382bd719ee130b7a1a0524fe25ecd639f8a51d
-DIST openjdk-17.0.11_p9.tar.gz 106574173 BLAKE2B 3db4763527d1acb83a2d492c3e94dc571065b844cf2ac56b7377a821cf2cb48af405b9fef73f477502bedc2c119ac57a115315140af04d51dbab5a78dfa6c789 SHA512 77baa3ec3ff2d06b28121342357311d1d5ca2ddd9ac7982b1aa5fc745b49519d2f95d14226ad4ac413d9a0ecf0e49d15078cabbba0b2897d0c6883b92ef0b5e9
-DIST openjdk-21.0.3_p9.tar.gz 112404688 BLAKE2B e73688fdd2e4f4da144f66058e4ff68da4a557d9c7693c7854ba6c7e1a12155abec4aa0fcd724f62333060c4b4f7488f827c1b5499fe5667743516101f7f2fa6 SHA512 efc2d03a7e7afed62a2cdc9f7707d056ed62d63f513394d7e3c6bbe11980ac492a2cad144021cea4180f4c93f1a481bdd65cb61156023a3f14ba596fd9c0eb60
-DIST openjdk-8.412_p08.tar.gz 93003614 BLAKE2B 71a3825bf69bb196ae219f5125e8452f634be2ff7b9f42a4829f6581f0a143bfec95013971c6f6b8f402c11efa34443f55a7f89d4133eac0b05a6d1cd6e0324d SHA512 d198f26474a4bd0b5e09c3c3aa53fbf77f217b8cd23499f7e661224048e925e0e020b28264b6ce7401baf83f8ffd8e3247788e2f5e7188509dea8b06f9fa0572
+DIST openjdk-11.0.24_p8.tar.gz 116418943 BLAKE2B cb768b202b42f426f4edaead16ba09800d86c10da4a664176842ee396332284d410191a55dbb35d7604272231e5b3daf8a75ddc03bb819d670622b7682eec7f6 SHA512 ce45efd934b9bacc56c468d92083a85de311b4436a519ae1d6038aff025c2fa8a811abca4cdd99aeb8c09455effff53500f96c287976cd2ae90d4e11da2385a3
+DIST openjdk-17.0.12_p7.tar.gz 106597045 BLAKE2B f0e9baec472ecefbf28359abfc10757dc7cb2a6ddf8428086a6565831f1c13ee1a7cdb87b67d6b3840860ddbf2c74e80ece55f09238fddc2cb8fa77208695b9b SHA512 cc99e9742123f7d8ac7ad78abab0fbe5cff37999b9c06ad14851009a95c9868968e97dd0f3e4dea8bfa8578f8f903fccaa37134466a778375cdf24344138f1fc
+DIST openjdk-21.0.4_p7.tar.gz 112506384 BLAKE2B d58636bc9221d56afcf118a91e41326d2e086c9fe22675429ec50d0b62fefd9e2040140a9d99682547e8bf0d40fa4ca2cbcdf8be55b9a0556b95c90fc0a08d56 SHA512 507524d842fb7c371cf7d3163cdce87e9266d613998b797f2828178b35c087354ae30941384d5afd1d6e3982eddf5c9067553bc2b918a9e223b93893f7f27e76
+DIST openjdk-8.422_p05.tar.gz 93034877 BLAKE2B 2489fea62fbc5a7e3735055656ae89c67caf63e5bc6d5385ee811d0707d056bc3d10dd83f7eae5a5a86b7f57b8da47a9c1a77405f127b6f506bbf3b310ecd2ae SHA512 706db67f9be7509380e96ae2187bdb928e40c4382fd7073dd310da2981eeff324a5871702b087d4466911dbbea8376d5f9fed7029562ca62c9a1a193d931833e
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-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64
@@ -21,8 +21,8 @@ DIST openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz 125375264 BLAKE2B 28802995f393dc7
DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c318b9c32bebdb4c09e42d80416ce1843bc80077f09466b7f54627ab6992f9149fdabdb4d5557c3cad6b5e93b37ba3d89d84f736fc07a57a SHA512 40f0cf60adaebd0c6ae11badb6b71727a5cc64c89077731b0f7cc82f203297b9b780ae43ec74eca9dd5a64de1209f519c2ad0f9083c017cf474d1020206f762c
DIST openjdk-bootstrap-8.402_p06-ppc64.tar.xz 34476368 BLAKE2B 1f896772f5e40a2793c5d9294e65e429c94204f91e91bfd76ff780e1d6318741c2052c3f20e59abcfb7018924983b5c9f386f14f912660e3e86296185f348482 SHA512 7bace068c5ac7604ad9db3ed655a52a4a90195efbf2fc342389cf7929d82d3f7b861fe700c16f513599bf9c064a87c9aa5966d7bd45aa7ed5e55ec317667be6a
DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c158c7e7d9fae9741112230dcd6e314163911921d63e3222cd3f4ab9d08bbaacbf6d9bfce9a1a9336e21088fba6396613489a701b30797 SHA512 fe5719e0bbf9bcd6eb9790ebd4da34e7f6c99fe4b7d41de2b5d00b20ebe76a77d857c726d1a71b7f40657ca2a9aa08eaa9efc1ab4be60016f66af95530b454b5
-EBUILD openjdk-11.0.23_p9.ebuild 8835 BLAKE2B bea1b8c33090c4990cd5c9c8954273b76b5ffb68c68a41959b98367f83f1ccbb398050de0866a18ba3ff7ef6c1dcabcd3add6f68ea8d9ebf1b5b3743fa65e0e1 SHA512 b8f3ad74db69fe48d8ab347d6ff5fdf81271b83aa25fd94c15630bc2c7e265ed73a710803e4098ff8451f2443c4344dfd02f4e73135f4c535733ac069f3eeb35
-EBUILD openjdk-17.0.11_p9.ebuild 9254 BLAKE2B e8fe5423eeb601c2d360041ff68e206d47a9e303c0343e7981fbe14160fce5f805059e57f5a4253c8fea9dd1b2caf7c3c7f2ace4bde2700c97708a38b6999b3d SHA512 0fd70e8c691ff8eaeea3b8c2e722a220d1f978c704fde47431d8893e1d423a36c11a1e364b4eca69dae653dc68cd3c77bb30e0499468af69980b4e4bb7f3f90f
-EBUILD openjdk-21.0.3_p9.ebuild 9222 BLAKE2B a99c8167af247502103af8adccc900ee8cf2a426eb62b506fd44369de32a63b48e22081112de3c65b9b07287a8bd5225d2e87aa80dc8eec3bf37e6a4580d71c9 SHA512 1e001792d4a317b2f68e7a5a888c119c297c74780af7784c30e419ea6361d0e3601c07cca16429635d606336dc1dd8c84e924163bd2a259de9cb4ceda9aea45a
-EBUILD openjdk-8.412_p08.ebuild 7819 BLAKE2B 46ee633ad8c8751885c948f3648e76f973266336fe15fa0016368302719770d9435c5e0db4cb59481e782e2b89adabe8b8cd0b4624749051c066de120509f8b7 SHA512 250754810305bf30ac7ce4dbc15dd1a321f4dc47cf5e49154f26b80b704218b21b6ab2f428a9857096936793460f2471df2fcd921c7fdc40838f11a2d0cce377
+EBUILD openjdk-11.0.24_p8.ebuild 8834 BLAKE2B e10c23f599ce193c329bdd95cf9965704da9951d7eda2521606e4250f9046fa9d66234fe6858c89b9d7849d1bcf687e53f73f629594c54ffeea5ce864af12f5c SHA512 3521115c2cd51c586652dfd53b759cb22028f30b82ccead407d60f2f7f8df096b55a3c9e2b345a723487dac9707471c779d70fad236e961449122290680d7855
+EBUILD openjdk-17.0.12_p7.ebuild 9254 BLAKE2B e8fe5423eeb601c2d360041ff68e206d47a9e303c0343e7981fbe14160fce5f805059e57f5a4253c8fea9dd1b2caf7c3c7f2ace4bde2700c97708a38b6999b3d SHA512 0fd70e8c691ff8eaeea3b8c2e722a220d1f978c704fde47431d8893e1d423a36c11a1e364b4eca69dae653dc68cd3c77bb30e0499468af69980b4e4bb7f3f90f
+EBUILD openjdk-21.0.4_p7.ebuild 9222 BLAKE2B a99c8167af247502103af8adccc900ee8cf2a426eb62b506fd44369de32a63b48e22081112de3c65b9b07287a8bd5225d2e87aa80dc8eec3bf37e6a4580d71c9 SHA512 1e001792d4a317b2f68e7a5a888c119c297c74780af7784c30e419ea6361d0e3601c07cca16429635d606336dc1dd8c84e924163bd2a259de9cb4ceda9aea45a
+EBUILD openjdk-8.422_p05.ebuild 7819 BLAKE2B 46ee633ad8c8751885c948f3648e76f973266336fe15fa0016368302719770d9435c5e0db4cb59481e782e2b89adabe8b8cd0b4624749051c066de120509f8b7 SHA512 250754810305bf30ac7ce4dbc15dd1a321f4dc47cf5e49154f26b80b704218b21b6ab2f428a9857096936793460f2471df2fcd921c7fdc40838f11a2d0cce377
MISC metadata.xml 1549 BLAKE2B 5f7caf2330b7d8eb264df12fe6eebbf1e4acf91b04e37a4c6ea6c45101a39f2e84b4d40152d58c93e63a1d2d6fdb5649b096a314f7269d33ce72da263d392c90 SHA512 8fa15bf9544f2665a47185a3701c3a9ce1654ddedf1aebfb344f77f544a71a3bda33c2d4f3c1d5d65d7ea42b6c1f04a6e1dfaaae723c1a5fcaf63ec48d79f3de
diff --git a/dev-java/openjdk/openjdk-11.0.23_p9.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
index 60f9354ff576..7b836738329f 100644
--- a/dev-java/openjdk/openjdk-11.0.23_p9.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
@@ -302,7 +302,7 @@ src_install() {
if use doc ; then
docinto html
dodoc -r "${S}"/build/*-release/images/docs/*
- dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+ dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
fi
}
diff --git a/dev-java/openjdk/openjdk-17.0.11_p9.ebuild b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
index 0bd209de601f..0bd209de601f 100644
--- a/dev-java/openjdk/openjdk-17.0.11_p9.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
diff --git a/dev-java/openjdk/openjdk-21.0.3_p9.ebuild b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
index 943ac23576da..943ac23576da 100644
--- a/dev-java/openjdk/openjdk-21.0.3_p9.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
diff --git a/dev-java/openjdk/openjdk-8.412_p08.ebuild b/dev-java/openjdk/openjdk-8.422_p05.ebuild
index d006b5c56f80..d006b5c56f80 100644
--- a/dev-java/openjdk/openjdk-8.412_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.422_p05.ebuild
diff --git a/dev-java/owasp-java-encoder/Manifest b/dev-java/owasp-java-encoder/Manifest
index 745a965e44a1..557236fdd886 100644
--- a/dev-java/owasp-java-encoder/Manifest
+++ b/dev-java/owasp-java-encoder/Manifest
@@ -1,4 +1,6 @@
AUX owasp-java-encoder-1.2.3-BenchmarkTest.patch 1971 BLAKE2B 1a4d60fb1b16b98878f1c9bd056d1600327768613a9df9017395f40f8d249b7034bb44b5573638307398ab5296c01f618f0e5348023e84aa526ca0d76ab41113 SHA512 376c5cad6e7cb4ebc3fe6998d90155c71bdfa793ecb132ea49e018169f6fe150485cd0b79984e5f88c96afb3ceb80cfdb68f49fe9aea4cabffc29ec3a7fc40e0
DIST owasp-java-encoder-1.2.3.tar.gz 134303 BLAKE2B 76b9652863fcdfdce82bd26062fa500bb92b21ba6edff7b3f409a1375e135176f826dca4bb02b4dd48905112ae20a0af0a1f09cb4e21ea41c672a44c52fea209 SHA512 19c13894ce68325553bdbee41190cb113d698c79ec74885604fd9db4f083efe0fcdc4313b7191014bfd972d0ee52f0fbe0621d7bb407745bd1feeb2ac9e49783
+DIST owasp-java-encoder-1.3.0.tar.gz 150029 BLAKE2B 31e350f02a7374f809e435d90ee9b4b1424cd9cb2da7d4062dfe0fc5898e02623496e464483bafd550b82b926260ab4df918f9be776e47f66587c6bc3829ebba SHA512 0ccdd6ae63e657ee28a4d9de7664269eff57802bddb03c7163fdb27326668256573d995b0111dc83cc1e5a6acc247e03da443f4b34c08cf99b085ec0a383a439
EBUILD owasp-java-encoder-1.2.3.ebuild 837 BLAKE2B d80fffeab535d7de8a4c227cd29b2afe74861e7fe8a4df5fc8c21053dfb2bf0503fe8091c62c4bfb62dd00e14a6feee6cac9027704b51da32c18c7b8a6d4b256 SHA512 f8c2275ad2397108a07be95d4cd028d18ae896068bf153fcc4c5819cd556a381e90540116a544ef26a811f0aa47032d6e6e72d354076ecf0818060f2fd4de7dc
+EBUILD owasp-java-encoder-1.3.0.ebuild 1244 BLAKE2B 3c78a5ff087f17578b40c66bf7ac9b320eedb3e7b41dbc8851571241513ca587d8d1782c5aa5ff9623e067751b45b2da4874d194e4f8b3934e38872c3682b472 SHA512 cf37a0865cd38f85ae39d291bc15765ae28260b3ffb26da4b4cd7f95b6b0158975e6751c8be83e6d6af610ea64b51dfaf9e08dbe2677abb1a4c21af3ae381ec5
MISC metadata.xml 306 BLAKE2B 8dfe8c2f01f21e1e865973e9865f3a9439a7a378d2acc52a6e148dcf70e3ef0f0fcce4efff20d89c0e2872e5d23fb0795b2d669eb18c278abf3ae6406db8f84a SHA512 c696a3c2763ff1868b3b80ee7c4b47fc697679a0539c2b9b300f0a969ad3bcd168e75f5d0275c10bac5b1ba7052e2e498c2c7daf3290f593cd0be8c9f35940fd
diff --git a/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild
new file mode 100644
index 000000000000..84640fdb1e59
--- /dev/null
+++ b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.owasp.encoder:encoder:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OWASP Java Encoder"
+HOMEPAGE="https://owasp.org/www-project-java-encoder/"
+SRC_URI="https://github.com/OWASP/owasp-java-encoder/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/core"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+# skipping 10 tests because they seem to be unreliable depending on hardware used
+# as some of them fail on some setups because the benchmark results don't align
+# with the hardcoded value 200 for the expected results. here are some examples:
+# Benchmarked Encode.forJavaScript: 442,382250 ns/op (+253,85% on baseline)
+# Benchmarked Encode.forCssString: 446,929231 ns/op (+257,49% on baseline)
+# Benchmarked Encode.forJava: 409,038065 ns/op (+227,18% on baseline)
+JAVA_RM_FILES=( src/test/java/org/owasp/encoder/BenchmarkTest.java )
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 0ccf640b34fa..cd4a58451287 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -2,19 +2,15 @@ AUX protobuf-java-3.23.0-unittest_retention.proto.patch 2122 BLAKE2B b7c7297efaf
AUX protobuf-java-3.26.0-unittest.protos.patch 1828 BLAKE2B 078982186100b1d5466f705967abaa2b0ab09b14a401d406c7d5f9f342cfb4fe596d13b23061951dee8f165eda055ace57f293df12e3fa0bb710c67293ec0862 SHA512 3c2a610f74c7e6520fd781b3771b60e899bd5b94763a5c70873992feacc1e541d326b85250d2be256f9ac20df9af916e0673943533aeb45214dfdac693929b22
DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d
DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
-DIST protobuf-25.1.tar.gz 5878124 BLAKE2B a0b917e4518b07b221afd01e801e45b5b6fa35c7ccf8c21120d6a63f7174e53cc37d0516b1802d9243f8bb37b72b7f460a36dcbf0fffb09e011b05315c53efc3 SHA512 d2fad2188118ced2cd951bdb472d72cc9e9b2158c88eeca652c76332a884b5b5b4b58628f7777272fa693140753823584ea9c7924f1655b1d5a363f59bdf7a4c
-DIST protobuf-25.2.tar.gz 5878387 BLAKE2B 1ee7a48d3a481f523ff240c79e8cacb39b6a7e2c671279812cbffd5ce9be595034461fba41f03bed363133118c1b92bd14bcfd8c4e46ac6368e6407a23fb02ea SHA512 66f0b177eae0e2e40b8b17c8f411cd9dec5355dcfc145b8a79426e6367babcc28b9a8078bbe4ba2de47a82811a2e1a89d36955d6fa0c8d391cfeada4eb160fdb
+DIST protobuf-23.4.tar.gz 5043507 BLAKE2B bf6a50771eb977ef92b779a32fd909693faae6394254c73e3c9b2729bce643f8cbfb5a1bd18b30abf3003b9fbfd24c074cea4085a6ccf14fdb6a3aeac9efcb89 SHA512 b93a4e0339ecbe085796de5b6c61feae35229d40db9019c043090bcaa483a1cce78a99487c5638482c68832fcede5579a0e5ec731221a88359b80db9bb6dc566
DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
-DIST protobuf-26.0.tar.gz 5957426 BLAKE2B 246b81a2c037047c10aeb004bbc4836d1d1cd73eadd0780060bf7fe60cee2cfa4e14afdb07c2a6fa2381e4656a47a148cf77315f1caa8c1bf6c137e06b0de168 SHA512 b350e0be51e4977865bfcc086506e1d85421da5d9386d2b10dada98a9a1a32a7b44e2ace866e605b42f1e2b6a702e6eca7fa9f5346819b55dd7d09f5ded3628c
DIST protobuf-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4
DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
-EBUILD protobuf-java-3.23.0.ebuild 5004 BLAKE2B 1e8d57764ebd6829fc9dac563302ed4478e01daa7ef0b3613f12ce4b217df8bca853207af11dbf27623526414d0cb5ff5890d0ec502c50d974c23555a3cb0e01 SHA512 2f7fef3aa5ba84f7e17ee9d9d49c734867cde32f49aa4769d2e20fcf02079e0fc1a49fd81515e651bc8980d07d96589d3d43e710eb69df8ab1e0b215c7379413
+EBUILD protobuf-java-3.23.0-r1.ebuild 4674 BLAKE2B 42bf12aa651f40c7ab8a9d0262d371be78524097ccd517273807d63ad4ae5bfdae76bf5286c68d0df7e1284907331ed835e2df40a6f384fc0a379bc3d606b8de SHA512 35c74625656430837ac0381ad0b710c45ba099f14378e491853896a2c2009880a093106378baf13dff522ca1f7c279813946b1ea23aa4e5b80c7dbfe83c61961
EBUILD protobuf-java-3.23.3.ebuild 5025 BLAKE2B dc9565c4bc6bae5d650202e20e427f2a5cf4235668ca23638503f94a73a8155352d1fb66613c0d50066b669f80099abd61c3984a29b9f11c09cd53f785a5ed89 SHA512 31cb0f30f2cb25c41b1d0ec4d64bdfc413f7ce267e86026a88a9329affcd8a288a5afa0349018f74b21528cd9a798db145a5c8dd37edbe06eacb42ae0e7fcd47
-EBUILD protobuf-java-3.25.1.ebuild 5070 BLAKE2B 94ca65cd35051f3ae692478f94c6e42ef30935e6c907762c22b13dadc0391610dc9260851c3f730602b1d5ab80db1ab32baaf241dffe37c385a8aed8c3151d52 SHA512 e40407849b72a6dfec24fedb1b575bf67154d9f66d02ccf82c35d3e2ea33564edc7408d796982b92a8e0b60d777feb30f5beff425420fb9c3f80ed095a03e23c
-EBUILD protobuf-java-3.25.2.ebuild 5070 BLAKE2B 9069a213fdd09cc2dd7f2e797941873f1184af848ce4159621b47ef2fcc600574e54ec0603ef63a0160db28530d73ea943591146a31f9861327823e65c28b8f3 SHA512 8999737beee7f393677ce4a5c52cae4a9ae290b085e24f2e563b4eed18fcd4753abe5000849934d8c90f9103669d8163bd1c86a905f566ad986a4202d41ad8cb
+EBUILD protobuf-java-3.23.4.ebuild 5063 BLAKE2B d48f546256aed60a72ce4f27f689d70c8c9cb7f3223d4100ae4aa9fce65d1fb346945f922850434ca353cf667a680f170afe94012908e188e6608ffccf6b0ace SHA512 908cc9c7b684bd3cf8d5c322c7ba15db7e5959a3b884e459f105d0f68d51a92e8a17114e77b3d66cf03889878f1705f5c2d8ae956b5e8378f0f642e384677965
EBUILD protobuf-java-3.25.3.ebuild 5070 BLAKE2B 253564d29b833f09bda7830790bdd120b5807ff75d4ff70949ceca2c1b79410ba4b023e57c0a58763ad8cb037eb2bcefc875198a3385b7dd032c8b709bac45ea SHA512 503911709bf44eb849037f480d813ae45ca55752cedbb9652fb62a155cd2cadaa0c6511c69ed259d16a7799ee19fe57e7c3359d02196185652386da390807f1b
-EBUILD protobuf-java-3.26.0.ebuild 5116 BLAKE2B 7bf78e569da302003f839ea9764859cf2155bab63c4253905abcee1441cfcc6189842f5106d2f08a9556b81bcf3b90b6a580110c8eeb3b18f72f7c9d2c2fc46c SHA512 d8298e6344d0a7b4df019e51efff0f12f85952ba3d2525cbba06ad486e3774ece0000492b9c0970f9632f31edcdb0fb442692977a5487a1110309d78785521bd
EBUILD protobuf-java-4.26.1.ebuild 4758 BLAKE2B 018ffa86d9af50a96db808ee51892e930630ec0709f0effb26522e70bc8d9890a84cb67276b2aab743950b7ba53e77567615f9d1bc63e391521a22696afe1e7b SHA512 4a738022a541fc6b73a13fa7cdc461137adbcfc8f3cf95a522355991c9be2c459b10b99191fb1efa3d23efb4783e539cc5e119fa6e84096b0ed3cc2762675ced
EBUILD protobuf-java-4.27.2.ebuild 5037 BLAKE2B 67330a0834b53ed7a950daea16be0b2cb7c8523cd6b2c0cafcc1468b39b6dd064e07a12d7e90a6b19612d6e82711c07e76cd6a2951ff6ec5709abcab042eac63 SHA512 51187de703cb88ded86536a068725eddb2692ba71150d2fcfb566058f1996edf39491c46363f31aecfb5210d7e7fbf7974da5dd4fbc90e70caa262079ad48d63
MISC metadata.xml 534 BLAKE2B aa3ede54aa4e1479f977cecb9dace36fa5db7025a5d45d142cde5ea2ede794f721abf0ced139b24d4c2c1aac3631ee43f15b4d74850abc56c1fbafb8736adebc SHA512 11f7b1fca223910cd42be952760e32d98a553fd660e1da66542a722eb1e3296c79e702f899dc36ab0e794a19014ede3738fc0959b04a9d44910e9e0068f3feb7
diff --git a/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.0-r1.ebuild
index abeb3464f5e4..6059bd156b76 100644
--- a/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.23.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2023 Gentoo Authors
+# Copyright 2008-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,6 @@ S="${WORKDIR}/protobuf-${PV#3.}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
DEPEND="
>=virtual/jdk-1.8:*
@@ -31,10 +30,9 @@ DEPEND="
)
"
RDEPEND=">=virtual/jre-1.8:*"
-
BDEPEND="
- system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0 )
- !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.2 )
+ >=dev-cpp/abseil-cpp-20230125.2
+ <dev-cpp/abseil-cpp-20240116.2
"
PATCHES=(
@@ -50,20 +48,11 @@ JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
JAVA_TEST_SRC_DIR="java/core/src/test/java"
run-protoc() {
- if use system-protoc; then
- protoc $1
- else
- "${BUILD_DIR}"/protoc $1
- fi
+ "${BUILD_DIR}"/protoc $1
}
src_prepare() {
- # If the corrsponding version of system-protoc is not available we build protoc locally
- if use system-protoc; then
- :
- else
- cmake_src_prepare
- fi
+ cmake_src_prepare
java-pkg-2_src_prepare
mkdir "${JAVA_RESOURCE_DIRS}" || die
@@ -104,19 +93,11 @@ src_configure() {
-Dprotobuf_BUILD_TESTS=OFF
-Dprotobuf_ABSL_PROVIDER=package
)
- if use system-protoc; then
- :
- else
- cmake_src_configure
- fi
+ cmake_src_configure
}
src_compile() {
- if use system-protoc; then
- :
- else
- cmake_src_compile
- fi
+ cmake_src_compile
einfo "Run protoc to generate sources"
run-protoc \
diff --git a/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.4.ebuild
index 5276064d1543..4e75a53cfab4 100644
--- a/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.23.4.ebuild
@@ -4,7 +4,7 @@
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
+MAVEN_ID="com.google.protobuf:protobuf-java:3.23.3"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple cmake
@@ -12,13 +12,11 @@ inherit java-pkg-2 java-pkg-simple cmake
DESCRIPTION="Core Protocol Buffers library"
HOMEPAGE="https://protobuf.dev"
# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.25.2 from the 25.2 tarball in order to allow sharing the tarball with
+# And we build artifact 3.23.4 from the 23.4 tarball in order to allow sharing the tarball with
# dev-libs/protobuf.
-MY_PV3="${PV#3.}"
-MY_PV="${MY_PV3/_rc/-rc}"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz
test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${MY_PV}"
+S="${WORKDIR}/protobuf-${PV#3.}"
LICENSE="BSD"
SLOT="0"
@@ -26,8 +24,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="system-protoc"
BDEPEND="
- system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
- !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
+ system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0 )
+ !system-protoc? (
+ >=dev-cpp/abseil-cpp-20230125.3
+ <dev-cpp/abseil-cpp-20240116.2
+ )
"
DEPEND="
>=virtual/jdk-1.8:*
@@ -68,7 +69,7 @@ src_prepare() {
java-pkg-2_src_prepare
mkdir "${JAVA_RESOURCE_DIRS}" || die
- # https://github.com/protocolbuffers/protobuf/blob/v25.2/java/core/pom.xml#L43-L62
+ # https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/pom.xml#L43-L62
PROTOS=( $(sed \
-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
"${S}/java/core/pom.xml") ) || die
@@ -76,7 +77,7 @@ src_prepare() {
cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
popd > /dev/null || die
- # https://github.com/protocolbuffers/protobuf/blob/v25.2/java/core/generate-sources-build.xml
+ # https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/generate-sources-build.xml
einfo "Replace variables in generate-sources-build.xml"
sed \
-e 's:${generated.sources.dir}:java/core/src/main/java:' \
@@ -85,7 +86,7 @@ src_prepare() {
-e '/project\|echo\|mkdir\|exec/d' \
-i java/core/generate-sources-build.xml || die "sed to sources failed"
- # https://github.com/protocolbuffers/protobuf/blob/v25.2/java/core/generate-test-sources-build.xml
+ # https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/generate-test-sources-build.xml
einfo "Replace variables in generate-test-sources-build.xml"
sed \
-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
@@ -128,7 +129,7 @@ src_compile() {
}
src_test() {
- # https://github.com/protocolbuffers/protobuf/blob/v25.2/java/core/pom.xml#L63-L71
+ # https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/pom.xml#L63-L71
jar cvf testdata.jar \
-C src google/protobuf/testdata/golden_message_oneof_implemented \
-C src google/protobuf/testdata/golden_packed_fields_message || die
diff --git a/dev-java/protobuf-java/protobuf-java-3.25.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.1.ebuild
deleted file mode 100644
index 2c2fc51fb3b6..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.25.1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="Core Protocol Buffers library"
-HOMEPAGE="https://protobuf.dev"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.25.1 from the 25.1 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-MY_PV3="${PV#3.}"
-MY_PV="${MY_PV3/_rc/-rc}"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
- test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
- system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
- !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
-"
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/guava:0
- dev-java/mockito:4
- )
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=(
- "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="java/core/src/main/resources"
-JAVA_SRC_DIR="java/core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_SRC_DIR="java/core/src/test/java"
-
-run-protoc() {
- if use system-protoc; then
- protoc $1
- else
- "${BUILD_DIR}"/protoc $1
- fi
-}
-
-src_prepare() {
- # If the corrsponding version of system-protoc is not available we build protoc locally
- if use system-protoc; then
- default # apply patches
- else
- cmake_src_prepare
- fi
- java-pkg-2_src_prepare
-
- mkdir "${JAVA_RESOURCE_DIRS}" || die
- # https://github.com/protocolbuffers/protobuf/blob/v25.1/java/core/pom.xml#L43-L62
- PROTOS=( $(sed \
- -n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
- "${S}/java/core/pom.xml") ) || die
- pushd src > /dev/null || die
- cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
- popd > /dev/null || die
-
- # https://github.com/protocolbuffers/protobuf/blob/v25.1/java/core/generate-sources-build.xml
- einfo "Replace variables in generate-sources-build.xml"
- sed \
- -e 's:${generated.sources.dir}:java/core/src/main/java:' \
- -e 's:${protobuf.source.dir}:src:' \
- -e 's:^.*value="::' -e 's:\"/>::' \
- -e '/project\|echo\|mkdir\|exec/d' \
- -i java/core/generate-sources-build.xml || die "sed to sources failed"
-
- # https://github.com/protocolbuffers/protobuf/blob/v25.1/java/core/generate-test-sources-build.xml
- einfo "Replace variables in generate-test-sources-build.xml"
- sed \
- -e 's:${generated.testsources.dir}:java/core/src/test/java:' \
- -e 's:${protobuf.source.dir}:src:' \
- -e 's:${test.proto.dir}:java/core/src/test/proto:' \
- -e 's:^.*value="::' -e 's:\"/>::' \
- -e '/project\|mkdir\|exec\|Also generate/d' \
- -i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
-
- # Split the file in two parts, one for each run-protoc call
- awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
- java/core/generate-test-sources-build.xml || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Dprotobuf_BUILD_TESTS=OFF
- -Dprotobuf_ABSL_PROVIDER=package
- )
- if use system-protoc; then
- :
- else
- cmake_src_configure
- fi
-}
-
-src_compile() {
- if use system-protoc; then
- :
- else
- cmake_src_compile
- fi
-
- einfo "Run protoc to generate sources"
- run-protoc \
- @java/core/generate-sources-build.xml \
- || die "protoc sources failed"
-
- java-pkg-simple_src_compile
-}
-
-src_test() {
- # https://github.com/protocolbuffers/protobuf/blob/v25.1/java/core/pom.xml#L63-L71
- jar cvf testdata.jar \
- -C src google/protobuf/testdata/golden_message_oneof_implemented \
- -C src google/protobuf/testdata/golden_packed_fields_message || die
-
- JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
-
- einfo "Running protoc on first part of generate-test-sources-build.xml"
- run-protoc @test-sources-build-1 \
- || die "run-protoc test-sources-build-1 failed"
-
- einfo "Running protoc on second part of generate-test-sources-build.xml"
- run-protoc @test-sources-build-2 \
- || die "run-protoc test-sources-build-2 failed"
-
- einfo "Running tests"
- # Invalid test class 'map_test.MapInitializationOrderTest':
- # 1. Test class should have exactly one public constructor
- # Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
- # 1. Test class should have exactly one public constructor
- pushd "${JAVA_TEST_SRC_DIR}" || die
- local JAVA_TEST_RUN_ONLY=$(find * \
- -path "**/*Test.java" \
- ! -path "**/Abstract*Test.java" \
- ! -name "MapInitializationOrderTest.java" \
- ! -path '*protobuf_unittest/CachedFieldSizeTest.java'
- )
- popd
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.26.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.26.0.ebuild
deleted file mode 100644
index 5c59d510ec97..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.26.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="Core Protocol Buffers library"
-HOMEPAGE="https://protobuf.dev"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.26.0 from the 26.0 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-MY_PV3="${PV#3.}"
-MY_PV="${MY_PV3/_rc/-rc}"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
- test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
- system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
- !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
-"
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/guava:0
- dev-java/mockito:4
- )
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=(
- "${FILESDIR}/protobuf-java-3.26.0-unittest.protos.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="java/core/src/main/resources"
-JAVA_SRC_DIR="java/core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_SRC_DIR="java/core/src/test/java"
-
-run-protoc() {
- if use system-protoc; then
- protoc $1
- else
- "${BUILD_DIR}"/protoc $1
- fi
-}
-
-src_prepare() {
- # If the corrsponding version of system-protoc is not available we build protoc locally
- if use system-protoc; then
- default # apply patches
- else
- cmake_src_prepare
- fi
- java-pkg-2_src_prepare
-
- mkdir "${JAVA_RESOURCE_DIRS}" || die
- # https://github.com/protocolbuffers/protobuf/blob/v26.0/java/core/pom.xml#L43-L62
- PROTOS=( $(sed \
- -n '/>google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
- "${S}/java/core/pom.xml") ) || die
- pushd src > /dev/null || die
- cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
- popd > /dev/null || die
-
- # https://github.com/protocolbuffers/protobuf/blob/v26.0/java/core/generate-sources-build.xml
- einfo "Replace variables in generate-sources-build.xml"
- sed \
- -e 's:${generated.sources.dir}:java/core/src/main/java:' \
- -e 's:${protobuf.java_source.dir}:java/core/src:' \
- -e 's:${protobuf.source.dir}:src:' \
- -e 's:^.*value="::' -e 's:\"/>::' \
- -e '/project\|echo\|mkdir\|exec/d' \
- -i java/core/generate-sources-build.xml || die "sed to sources failed"
-
- # https://github.com/protocolbuffers/protobuf/blob/v26.0/java/core/generate-test-sources-build.xml
- einfo "Replace variables in generate-test-sources-build.xml"
- sed \
- -e 's:${generated.testsources.dir}:java/core/src/test/java:' \
- -e 's:${protobuf.source.dir}:src:' \
- -e 's:${test.proto.dir}:java/core/src/test/proto:' \
- -e 's:^.*value="::' -e 's:\"/>::' \
- -e '/project\|mkdir\|exec\|Also generate/d' \
- -i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
-
- # Split the file in two parts, one for each run-protoc call
- awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
- java/core/generate-test-sources-build.xml || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Dprotobuf_BUILD_TESTS=OFF
- -Dprotobuf_ABSL_PROVIDER=package
- )
- if use system-protoc; then
- :
- else
- cmake_src_configure
- fi
-}
-
-src_compile() {
- if use system-protoc; then
- :
- else
- cmake_src_compile
- fi
-
- einfo "Run protoc to generate sources"
- run-protoc \
- @java/core/generate-sources-build.xml \
- || die "protoc sources failed"
-
- java-pkg-simple_src_compile
-}
-
-src_test() {
- # https://github.com/protocolbuffers/protobuf/blob/v26.0/java/core/pom.xml#L63-L71
- jar cvf testdata.jar \
- -C src google/protobuf/testdata/golden_message_oneof_implemented \
- -C src google/protobuf/testdata/golden_packed_fields_message || die
-
- JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
-
- einfo "Running protoc on first part of generate-test-sources-build.xml"
- run-protoc @test-sources-build-1 \
- || die "run-protoc test-sources-build-1 failed"
-
- einfo "Running protoc on second part of generate-test-sources-build.xml"
- run-protoc @test-sources-build-2 \
- || die "run-protoc test-sources-build-2 failed"
-
- einfo "Running tests"
- # Invalid test class 'map_test.MapInitializationOrderTest':
- # 1. Test class should have exactly one public constructor
- # Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
- # 1. Test class should have exactly one public constructor
- pushd "${JAVA_TEST_SRC_DIR}" || die
- local JAVA_TEST_RUN_ONLY=$(find * \
- -path "**/*Test.java" \
- ! -path "**/Abstract*Test.java" \
- ! -name "MapInitializationOrderTest.java" \
- ! -path '*protobuf_unittest/CachedFieldSizeTest.java'
- )
- popd
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg-simple_src_install
-}
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index c948eb7ecfd4..e8ac05885430 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -1,8 +1,3 @@
-AUX 9.2-build.xml 2061 BLAKE2B fb4e505f9308caf2300b7a1159ff20a973576d974544b1be0b42b71566f8207af7ae48710522c4627bd4879ecfdf14f9f9b983802e6c98c4d1f00cdbc6a363e9 SHA512 9e7c02427041df22a7a5eddc6d9e709635493d079efaba66a9da6320af961d933176105028f8a96fef8f84599724829d582ff64d061d70364f048ed39308e67c
-AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13a97b2994496dd80e1c4e3cac893b35f813bccf4e0a877c7c3f1a6c5c12a9c6005b82efb2c42a70a49e93dc SHA512 2c95fc288bb35f68819edc95e8ce30f921b17196123ee7ce0c9908d210e8758c51204bc7dd222d6b7e4803dceb331bcd83120622fa2bcb6587d150a0f479ca02
-DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
-EBUILD saxon-6.5.5-r3.ebuild 1043 BLAKE2B 49cd6ce20f03ffad87b428f59be7ee797e51727d0640d6131e42047bb3d233923d3a99acd289f24a9d4cf3a0b2a0a05a389c1b281702d3f4dac30a3101f4da82 SHA512 64789d10c642a204fa3bb2444efd891c184888d28c60c24a470733bdaa07f85f19afcd6e941d745f05fcbae546ae33d05c55891021460c28599423d38fc3bfd4
-EBUILD saxon-9.2.0.6-r4.ebuild 2010 BLAKE2B 457aacad3407f5b271d2106f9b783ad36d7eed0f92d5186ae9fc3662e13177e42fbb771472692ac932dfcfeaf8c919d8d2ecab1db16c41008d0d4a9f3b6a854c SHA512 cad6bd60cebe438e2ad1c868a5fd5065c9fb52347e219b14c19e1d489e1c2c48971869f3669f1e75e1539c6d8ca1a12c25e4fb244e5bc52ed3fe93d577025be2
-EBUILD saxon-9.2.0.6-r5.ebuild 1621 BLAKE2B c6b1d6cc2d93cc7c69ef0f6019846f60588533a64c5d7db1c05a676b52aadb0fc688da8f9c80326ad26687db36eb8cf4fb4261841b7de6ba92d545b86a7f2c82 SHA512 12bf571f08171510178498fbcf7bd0b7aabdaeea8353f159ddb5ca42a97c4d55993e1b27984263d44bdb92a9ed7fbffd623307bc945379abada292a73aa850fe
+EBUILD saxon-9.2.0.6-r5.ebuild 1617 BLAKE2B 175ec2bd2b3031e9d04b1187df78259c30b626e9a1656aeeb738444c20a83ec8b3341b7d132fd9ea1f66541502aaf6333fde8571eaa798b064c90d7b3062f1f8 SHA512 18bc35231a23f846fcc8b8b3ec2185421dd42f500014ee717a5a85fee2ff919ac6ef01f0e30e494c9e9d3bdc37fdc6affb8652d450a1b6f33ba6bb2c898ea1e3
MISC metadata.xml 390 BLAKE2B 41b48e05888618320dd9f41627184a0483c753bc8150a0c304aebe18eb512395abbb2250087782784347ff19cc7011f0066d2bc01b4ba1a57144ee3063004bb0 SHA512 a34072ff9c96b6e167cbf3f8e922fdce358c567491e03eaa10b5f1e5107154cc084aff67f3f50e4cc0b8242e24e606bd74c5c2986a59cd2d1608c0763703c274
diff --git a/dev-java/saxon/files/9.2-build.xml b/dev-java/saxon/files/9.2-build.xml
deleted file mode 100644
index 3bd9a64d4fe5..000000000000
--- a/dev-java/saxon/files/9.2-build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- simple generic build file -->
-
-<project name="saxon" default="all" basedir=".">
-
- <!-- Properties -->
-
- <property name="name" value="saxon"/>
- <property name="src" value="src"/>
- <property name="build" value="build"/>
- <property name="build.classes" value="${build}/classes"/>
- <property name="build.doc" value="${build}/api"/>
- <property name="build.lib" value="${build}/lib"/>
- <property name="j2se.javadoc" value="http://java.sun.com/javase/@JDK@/docs/api"/>
- <property name="jdom.javadoc" value="/usr/share/jdom-@JDOM@/api"/>
-
- <!-- Targets -->
-
- <!-- Prepare build directories -->
- <target name="prepare">
- <mkdir dir="${src}"/>
- <mkdir dir="${build}"/>
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${build.lib}"/>
- <mkdir dir="${build.doc}"/>
- <copy todir="${src}">
- <fileset dir="." includes="com/**,org/**,net/**"/>
- </copy>
- </target>
-
- <!-- Kill all the created directories -->
- <target name="clean">
- <delete dir="${build}"/>
- <delete dir="${src}"/>
- </target>
-
- <!-- Build classes -->
- <target name="classes" depends="prepare">
- <javac srcdir="${src}" destdir="${build.classes}" encoding="ISO-8859-1"/>
- </target>
-
- <!-- Build jar archives -->
-
- <target name="jar" depends="classes">
- <jar jarfile="${build.lib}/${name}.jar"
- basedir="${build.classes}">
- <manifest>
- <attribute name="Main-Class" value="net.sf.saxon.Transform"/>
- </manifest>
- </jar>
- </target>
-
- <!-- Build the full JavaDocs -->
- <target name="javadoc" depends="prepare">
- <javadoc sourcepath="${src}"
- destdir="${build.doc}"
- doctitle="${name} JavaDoc"
- windowtitle="${name} JavaDoc"
- package="true"
- author="true"
- version="true"
- packagenames="net.sf.saxon.*,org.w3c.xsl.*"
- encoding="ISO-8859-1"
- >
- <link href="${j2se.javadoc}"/>
- <link href="${jdom.javadoc}"/>
- </javadoc>
- </target>
-
- <!-- Build everything -->
- <target name="all" depends="jar,javadoc"/>
-
-</project>
diff --git a/dev-java/saxon/files/9.2-edition.properties b/dev-java/saxon/files/9.2-edition.properties
deleted file mode 100644
index bb5acee0b19c..000000000000
--- a/dev-java/saxon/files/9.2-edition.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-config=net.sf.saxon.Configuration
-platform=net.sf.saxon.java.JavaPlatform
diff --git a/dev-java/saxon/saxon-6.5.5-r3.ebuild b/dev-java/saxon/saxon-6.5.5-r3.ebuild
deleted file mode 100644
index 8dd6a5a954af..000000000000
--- a/dev-java/saxon/saxon-6.5.5-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Set of tools for processing XML documents"
-HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/saxon/saxon6/${PV}/saxon${PV//./-}.zip"
-
-LICENSE="MPL-1.1"
-SLOT="6.5"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="dev-java/jdom:0"
-
-# Restricting to jdk:1.8 for following reason:
-# src/org/w3c/dom/UserDataHandler.java:1: error: package exists in another module: java.xml
-# package org.w3c.dom;
-DEPEND="${CP_DEPEND}
- virtual/jdk:1.8"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
- unpack ${A}
- unzip -qq source.zip -d src || die "failed to unpack"
-}
-
-src_prepare() {
- default
- java-pkg_clean
-}
-
-src_install() {
- default
- java-pkg-simple_src_install
- use examples && java-pkg_doexamples samples
-}
diff --git a/dev-java/saxon/saxon-9.2.0.6-r4.ebuild b/dev-java/saxon/saxon-9.2.0.6-r4.ebuild
deleted file mode 100644
index 1513e7c8fedb..000000000000
--- a/dev-java/saxon/saxon-9.2.0.6-r4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 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="A XSLT and XQuery Processor"
-HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip"
-S="${WORKDIR}"
-
-LICENSE="MPL-1.0"
-SLOT="9"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CDEPEND="
- >=dev-java/ant-1.10.14-r3:0
- dev-java/dom4j:1
- dev-java/jdom:0
- dev-java/xom:0
-"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-# prepare eclass variables
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-
-src_prepare() {
- default
-
- # Fedora-inspired removal.
-
- # deadNET.
- rm -rv net/sf/saxon/dotnet || die
-
- # Depends on XQJ (javax.xml.xquery).
- rm -rv net/sf/saxon/xqj || die
-
- # This requires a EE edition feature (com.saxonica.xsltextn).
- rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die
-
- # <major>.<minor> version
- local version="$(ver_cut 1-2)"
-
- # generate build.xml with external javadoc links
- sed -e "s:@JDK@:1.6:" \
- -e "s:@JDOM@:1:" \
- < "${FILESDIR}/${version}-build.xml" \
- > "${S}/build.xml" \
- || die "build.xml generation failed!"
-
- # prepare creates the dir for properties
- eant prepare
-
- # properties
- cp -v \
- "${FILESDIR}/${version}-edition.properties" \
- "${S}/build/classes/edition.properties" || die
-}
-
-src_compile() {
- local gcp="$(java-pkg_getjars dom4j-1,jdom,xom)"
- gcp="${gcp}:$(java-pkg_getjar --build-only ant ant.jar)"
- eant -Dgentoo.classpath="${gcp}" jar $(use_doc)
-}
-
-src_install() {
- java-pkg_dojar build/lib/${PN}.jar
-
- java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
- java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
-
- java-pkg_register-ant-task
-
- use doc && java-pkg_dojavadoc build/api
-
- use source && java-pkg_dosrc src
-}
diff --git a/dev-java/saxon/saxon-9.2.0.6-r5.ebuild b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild
index 474bdfb14787..f8d7b5719895 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r5.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe
LICENSE="MPL-1.0"
SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="ant-task"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index 363a5d1f0d02..26fed8b201ec 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,21 +1,13 @@
-DIST scala-cli-amd64-1.0.4.gz 33291617 BLAKE2B bd97626e7e95fb6b2a82fd424673078b89f5f4270087c667193e4de1ceff614076e73b728ba1f0334d5f9d7aa6f52c660487d52bf8fb49a786f7fe4ce18a0428 SHA512 447acafd47041cd173a06b5d113cd30adee76a2c161b2efc98b8ece60082d5b98189fd9b3da1f048061d306343cacb9b67566daa78ce8fe54dc82dd90a1e34bc
-DIST scala-cli-amd64-1.1.0.gz 33673708 BLAKE2B 332f5a974949af49914de8fdb3129b0937fbce842616d6fefe16f7aff89baf6be1ba536d0ee6ff9bc1dd2b5ebfa51943bd0c6279ef83b95bd25a337530fa1295 SHA512 ba7ebb321a27e95f786027257c3f50dac1d12e0cc33abde24dc7c5dffb2f57a11c3ea67d92ed487968c49ff9ec3eaf5d1d62065beda5b6fa373d09b9126f4529
-DIST scala-cli-amd64-1.1.1.gz 33754319 BLAKE2B 91fb5e9b828a2c6c6dd984b421bb101ea1ae03c85d94eda14ba79433d29a88cb2850cb376c212f677c1b8167a0a21b320aeb0e4e63a29e6c8502d76babc1543d SHA512 1e0cd5eee280e208090961e4b6d216d472fef360f13e0f4e28412b9a52883d65c97e3fe70c8ce5cf96e6cd866f14b175454175be9df3bdc5c229fb2f121c925a
-DIST scala-cli-amd64-1.2.1.gz 33851353 BLAKE2B 31c92901f970ec2c0a74cb45d94b98e6d8f282c175cf8deb1a806db4b6d2e9a8b2150bca9fc9e373948e5092bf4bb7d5d1145a133d3b1c234d3cbe383ff9a270 SHA512 169c81bee582c6144501e8bd5436bae0bd3447ed89856a4d4763d13d3083ad26d948729b71bea864986f2c676e50855b8fb036d3a69ed0a316e2c6af0f98ef5f
DIST scala-cli-amd64-1.2.2.gz 33871512 BLAKE2B ef9328b26afb52ada07739539d560239d6ce2ffd72d1e353ce94d45c7358b6789aa0019804e249584ca497d5d15c96caab12eb31fab5b84a14162c00ca30c181 SHA512 02da0915ee140a129f622f973291c98c7dd7b7f16f5a2a5250ac825e09876b616a315fe5e6af43691f43870fa68234efeff73eadd4f6060d2d90fe937302eae7
-DIST scala-cli-arm64-1.0.4.gz 33185346 BLAKE2B 2b0131a56ed3f67fb5d5f25db6c511dc7d9e9128089e6826fa7d859b1457f03a99e290cc63f185820ea849a857f40d667d5db7a378dabcf545cdcdefded6a577 SHA512 3ff1c025a1035aa6a8550de17e85bc5c483007d5f07f03e0d792d6dc9ed1b18eb26909b3c7195fde12056a3b84ffa69dc53c01ec21b34187c1d7188a0a023aaa
-DIST scala-cli-arm64-1.1.0.gz 33575885 BLAKE2B ebccbe86044b4708a356060a16f06bb94df01d261ab7dabe8eba8e644c121864cdee99debf95468d936cbff670413ec47e1ef903a9071b267a61c5fe46738c1a SHA512 6a85529be06a8d43d729c5a795bb0dcdb2680bd7ef3de471fee908e91249401262e8322019c640d4eb45d0a15ed0073ff51b24d61846228f46c36bfb48731408
-DIST scala-cli-arm64-1.1.1.gz 33656505 BLAKE2B b943f370c9375fec5cec3c63628ecd9e416b569ec2d692422f217b2506c104a1c3bb415569581d68c9476bf892b4a087e7b95b2310955dd0f9af52edc90af2e9 SHA512 79836261613bafe4710c1d904ec39e88c1862b3021f7b37ac5004c6079c762e68550522fbb7240e48e7408f844f648ab92c12cb568ebc63bb3e01f1992a7eaf3
-DIST scala-cli-arm64-1.2.1.gz 33769006 BLAKE2B 4bc2c830d17e235a3eba7029bfd018ee4cd12f8ee27a3574b1c2195ab8ad22b79c452a0660fb55f1be99a610be1f4ea38f8e2de622f10277be7f5403b540778a SHA512 90a8f6b4ae2fa90dcdd3c88fdbbd1079db1cbbde80f496da8663223ad79dc4b499b6ae43835067d8fde945d4fb5ed079dec850f688b9d1b62602d186d426f7cb
+DIST scala-cli-amd64-1.4.3.gz 34238734 BLAKE2B ac40427ebd664c147f3134d067143207a024f2fa96be06f452d3b037a5f9866f6d6624c31a5a6045e5d1b6d087c87a14d2a376e050e6d23a10ce66de544b5969 SHA512 09b2ca1615a3c090a195f41237aa448d3535555c976ff4abdade1b8569126794009fcab11bde2087fcfe72c5a7a72b7b74bea647eef3a941bd1af4fb584b5f9b
+DIST scala-cli-amd64-1.5.0.gz 34334438 BLAKE2B 2369f8e4a27975e3bc3a646e9637f885016a7df08c1cbfd1874b2f07037b1452df5eda16fd64bc9182611aaa37e903392764a3cff19439e864cc3ee510e1c163 SHA512 53ec0a5a9079b40189391a7e2e6ef3d8bcf40ebe05af807fbe4bb3b8116975c21266d88eff87b5fc841dfd8584bb6fe8320583f19dbe1e24d0c550bdc086aea5
DIST scala-cli-arm64-1.2.2.gz 33766128 BLAKE2B d5b2d7ab8157f3874b1cfe0b0647ab30f5dd191337e575056eb758d52eda30871c54b20a08a1cda3e28c51afd744b4b8320aee6aef056b39b98f2534184739ba SHA512 004ca188e4ddd01c0e46277fa514b1c9bd061ea26d4318b8daff3ffaae5bb7cc9f4746509401da19774537c7e56f8a5a7da846cd4b5f90c61a3ab1f8d3ed0493
-DIST scala-cli-non-native-1.0.4 7553232 BLAKE2B 9299b20dddec80d12e738af4b283e816de5bae23262510146cd33a9b175f2a343f52932fbd3254974bd4219d2903f32772409f234423d3a027b6b0f02268e584 SHA512 4e5281ef7f8a886ad79746477d852f485ccad317568a64ee513e691dcd9a9121c2aed51f6170b959f0226fb81efe9aa1f8ecf1d94a84a0b387c349adfb756762
-DIST scala-cli-non-native-1.1.0 7728727 BLAKE2B 05deb93b91029721a21bac729aa9b370e05909e67bbade921e00d09c3a37e851e519188bff73dc614c3f5768834ae56f94623347735e756a6bcb0c4c81c8713c SHA512 13e426915794df757b6eb029d2545316bd9f4b9ba6f58cf59a546227d6997741cf681ce0c5e721e8e95cb9e420702f2d28f004df1780637dc9b39fd3bc4c884a
-DIST scala-cli-non-native-1.1.1 7779964 BLAKE2B 08849ce4a6fbf1e6eb2e4fafd2e29522e535c0795d6f1acbcd25ec4523d14dcae4a746f3729786db8f62a3770e6fdbd78a76477b182b32945454ac19a2f8217c SHA512 61c2a1a325f83e19102cd2f5d6b89d37b9914d64f86da6218258f064a6a8e5ab927d28b278363316446611e2cbdc8e4687616ea2b001da00ecbafb4207eabeb2
-DIST scala-cli-non-native-1.2.1 7836408 BLAKE2B a7c191020a65a4420ef7cc9d8fe5f9c6d1548c1cfb14dea94c0d9a798f608c038083bb678bd1a4fbdc9bd3de58f02a11e970cfebec4ac755f7f12af21eeb4dbc SHA512 d889ad3fa96953423fc1d948b6e260f55ffc4234d6e9da05299afe0a6cbc2b66c42a7a65113f887d1bf41a699679d09e02aed6686150551d1e1171d7c1c7331b
+DIST scala-cli-arm64-1.4.3.gz 34137841 BLAKE2B 0e8ed1f1777ac507315b7e8136b85fa1486c5817f8ae49205a7e53eebc15be0f3c90123418890ce1c96110534a962ead961aad0c6fd9230df0a5a6a70147cca3 SHA512 c81a3be8fdb2b396252f5c31b5fd9182864e6bfda14ab3a119d9922ef1e1834521781eaf935ba91d74ba24388e9bf9617e82ad2d61dfe88f845426a16b7b4e7f
+DIST scala-cli-arm64-1.5.0.gz 34240198 BLAKE2B aadb5203d2b2e93e27b4408724c5ebfbfa3a1e14b9bd3f78ccefbd961063451dc16fc0374430088d981208614de82ddf538c0e04975adba46f997fbf71c0d915 SHA512 d5025e91057ba72e9a2aed177356c04c08cc10745c8614db44e7843e6825ec14c619d7c8e24154c168e485bb98ebfb234179fa4a50989c162bcf92d096413379
DIST scala-cli-non-native-1.2.2 7837019 BLAKE2B 799ed83805ba767b687cf9a041a3e23f008e20e3ca55b8c52a9361c0b2465141abb7c17ca7dca59c9307af5a5a07a0cfe0d8035eea14a2adf2580913d67d6a10 SHA512 40aa43ee601c52238989a81884b6acc7a023599abb561bed1c9d31dff6053eff0f3477097a228bc30aab4df22d81b10fbbb64b5557d3067b4715c821c4eacb3e
-EBUILD scala-cli-bin-1.0.4.ebuild 1818 BLAKE2B b6f64c1a87aaeb118f5cea239ec569a77d8593a0963745c9977cc28e60b6538218eca4f8f7dd79205fc97ef6dc5fee1142b93da5f37a4b62a733b292327a06f8 SHA512 304c303924f7485630911d125f92fbdb05d25dc76581ec3a6737808a96e16780bcb33600cedb0078a0ba66c9828316a54e0f67f0e5ecb33445085b8becca4243
-EBUILD scala-cli-bin-1.1.0.ebuild 1818 BLAKE2B 5b07a1917af542f3141556d5de5932ce036254087765630bd3e498088193b8c0cf2862dc9c2abf3e125f3d28ea78f3b5f8333680bd9db3376858f8671b6c1b86 SHA512 3caa40269b85c7bb04517902637fc4eac76801f931fa24163cf4fa86bad9cee2944e89b20d75bb0b6b16a1ada1586240b150a4f56d86a8ecf81a2748052e29c7
-EBUILD scala-cli-bin-1.1.1.ebuild 1819 BLAKE2B 5048953ca83fb189a59272673d715cd98be632b9ee60b6087a82ec38da56e43c9a23073a467a85918d1cba72232a50b1c7230dc11a6d027f8a79a209870f7a9f SHA512 cebdb118fa90c5444d2bbf9ca1052bf11d739e9992c1fa1add031506016412b6a0e5b94d4aa5e9e89bc32656dd34ee6a6ea81f5ddd67b496d38f813fa4a7ef70
-EBUILD scala-cli-bin-1.2.1.ebuild 1819 BLAKE2B 5048953ca83fb189a59272673d715cd98be632b9ee60b6087a82ec38da56e43c9a23073a467a85918d1cba72232a50b1c7230dc11a6d027f8a79a209870f7a9f SHA512 cebdb118fa90c5444d2bbf9ca1052bf11d739e9992c1fa1add031506016412b6a0e5b94d4aa5e9e89bc32656dd34ee6a6ea81f5ddd67b496d38f813fa4a7ef70
-EBUILD scala-cli-bin-1.2.2.ebuild 1819 BLAKE2B 5048953ca83fb189a59272673d715cd98be632b9ee60b6087a82ec38da56e43c9a23073a467a85918d1cba72232a50b1c7230dc11a6d027f8a79a209870f7a9f SHA512 cebdb118fa90c5444d2bbf9ca1052bf11d739e9992c1fa1add031506016412b6a0e5b94d4aa5e9e89bc32656dd34ee6a6ea81f5ddd67b496d38f813fa4a7ef70
+DIST scala-cli-non-native-1.4.3 8004147 BLAKE2B 79b37e21b4aa1335a766ff7a735cf6fd0ae47b054c246371cfe57dca601de9309abc92df60ccba9873bf112f03d61081397eb859754b3287d2f6712946988ab5 SHA512 6c032330c01b2f2730390ea83fbcd9259e498b65cb182c2cf20cec2674f3dac2262d746a8addbe8b856c34bded0805c23b9a6a59e345037ea0b546681ddc7596
+DIST scala-cli-non-native-1.5.0 8117168 BLAKE2B 9b55dec1e329c7242ff5cdcad65a77686498c6c5bf5b872473d18609e4fed59353121fc4e3df4d8c7466daa1590bb09b4c6fdbf5bddd80bcaeab541e31d426a1 SHA512 badf719bdd3d9a289ca1436ca83433ecd49ab9908158188b68682e2c8bcee9e69c0bf73d1791656ecc2d01fe560cc754ef0f5e965ea25a520d73c7f98db266b0
+EBUILD scala-cli-bin-1.2.2.ebuild 1818 BLAKE2B 5b07a1917af542f3141556d5de5932ce036254087765630bd3e498088193b8c0cf2862dc9c2abf3e125f3d28ea78f3b5f8333680bd9db3376858f8671b6c1b86 SHA512 3caa40269b85c7bb04517902637fc4eac76801f931fa24163cf4fa86bad9cee2944e89b20d75bb0b6b16a1ada1586240b150a4f56d86a8ecf81a2748052e29c7
+EBUILD scala-cli-bin-1.4.3.ebuild 1819 BLAKE2B 7bab0342099834960ad00942acd09fd8fd41c2f309284dc944ea5d4cf2ad332142004e2d5f5aa2d167f4cde99194f4881d085fd827b398d0fb8ec96795dd5696 SHA512 d0d38479d38e5f859dec3f9aab5d9a2b8f7072bfb7dba3f79e9fba14e2e3d05e2166d36b515b0ee1b443b253e3786e929c66234eedeff8cf4130dec4fd7517f1
+EBUILD scala-cli-bin-1.5.0.ebuild 1819 BLAKE2B 7bab0342099834960ad00942acd09fd8fd41c2f309284dc944ea5d4cf2ad332142004e2d5f5aa2d167f4cde99194f4881d085fd827b398d0fb8ec96795dd5696 SHA512 d0d38479d38e5f859dec3f9aab5d9a2b8f7072bfb7dba3f79e9fba14e2e3d05e2166d36b515b0ee1b443b253e3786e929c66234eedeff8cf4130dec4fd7517f1
MISC metadata.xml 471 BLAKE2B 651dc485aacabfc581d9f5d5ab1cf524601b38fd2024113fbd8986090131e6c458db3c2d9649e9876df74f0e7471cdc66c8f1307ed71baa18508754143c10411 SHA512 6906a09bc65b6d1887a9a17d9be2e7afc990ea017439cad751fcfee806df0c456006473141b69f52b5373227cfd6e2f66e7750903d4bd9736f40d6c93cbede4e
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild
deleted file mode 100644
index 67f4eefef2f4..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-UPSTREAM_PV=${PV/_/-}
-UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
-
-DESCRIPTION="CLI to interact with Scala and Java"
-HOMEPAGE="https://scala-cli.virtuslab.org/"
-SRC_URI="
- !amd64? ( !arm64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
- -> scala-cli-non-native-${UPSTREAM_PV}
- ) )
- amd64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
- -> scala-cli-amd64-${UPSTREAM_PV}.gz
- )
- arm64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
- -> scala-cli-arm64-${UPSTREAM_PV}.gz
- )
-"
-
-KEYWORDS="amd64 ~arm64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}"
-
-# A JRE is not strictly required if native images of scala-cli are used
-# (amd64, arm64). However we may want a system JRE anyway, and having JRE
-# in RDEPEND reduces the chances that scala-cli needs to install one
-# for the user.
-RDEPEND="
- >=virtual/jre-11
- sys-libs/zlib
-"
-BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
-
-QA_TEXTRELS="*"
-QA_FLAGS_IGNORED="/usr/bin/scala-cli"
-
-src_prepare() {
- default
-
- if use amd64; then
- mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
- elif use arm64; then
- mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
- else
- mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
- fi
-
- chmod +x scala-cli || die
-}
-
-src_compile() {
- for shell in bash zsh; do
- ./scala-cli install-completions \
- --shell ${shell} \
- --env \
- --output "${S}" \
- > ${shell}-completion || die
- done
-}
-
-src_install() {
- dobin scala-cli
-
- newbashcomp bash-completion scala-cli
-
- insinto /usr/share/zsh/site-functions
- doins zsh/_scala-cli
-}
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
deleted file mode 100644
index d73c7e68ad79..000000000000
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-UPSTREAM_PV=${PV/_/-}
-UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
-
-DESCRIPTION="CLI to interact with Scala and Java"
-HOMEPAGE="https://scala-cli.virtuslab.org/"
-SRC_URI="
- !amd64? ( !arm64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
- -> scala-cli-non-native-${UPSTREAM_PV}
- ) )
- amd64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
- -> scala-cli-amd64-${UPSTREAM_PV}.gz
- )
- arm64? (
- https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
- -> scala-cli-arm64-${UPSTREAM_PV}.gz
- )
-"
-
-KEYWORDS="amd64 ~arm64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}"
-
-# A JRE is not strictly required if native images of scala-cli are used
-# (amd64, arm64). However we may want a system JRE anyway, and having JRE
-# in RDEPEND reduces the chances that scala-cli needs to install one
-# for the user.
-RDEPEND="
- >=virtual/jre-11
- sys-libs/zlib
-"
-BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
-
-QA_TEXTRELS="*"
-QA_FLAGS_IGNORED="/usr/bin/scala-cli"
-
-src_prepare() {
- default
-
- if use amd64; then
- mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
- elif use arm64; then
- mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
- else
- mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
- fi
-
- chmod +x scala-cli || die
-}
-
-src_compile() {
- for shell in bash zsh; do
- ./scala-cli install-completions \
- --shell ${shell} \
- --env \
- --output "${S}" \
- > ${shell}-completion || die
- done
-}
-
-src_install() {
- dobin scala-cli
-
- newbashcomp bash-completion scala-cli
-
- insinto /usr/share/zsh/site-functions
- doins zsh/_scala-cli
-}
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild
index dc0659cfd5ec..d73c7e68ad79 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.2.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
)
"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.2.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.4.3.ebuild
index dc0659cfd5ec..e89ddb52ce30 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.2.1.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.4.3.ebuild
@@ -25,11 +25,11 @@ SRC_URI="
)
"
-KEYWORDS="~amd64 ~arm64"
+S="${WORKDIR}"
+
LICENSE="Apache-2.0"
SLOT="0"
-
-S="${WORKDIR}"
+KEYWORDS="~amd64 ~arm64"
# A JRE is not strictly required if native images of scala-cli are used
# (amd64, arm64). However we may want a system JRE anyway, and having JRE
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild
index dc0659cfd5ec..e89ddb52ce30 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild
@@ -25,11 +25,11 @@ SRC_URI="
)
"
-KEYWORDS="~amd64 ~arm64"
+S="${WORKDIR}"
+
LICENSE="Apache-2.0"
SLOT="0"
-
-S="${WORKDIR}"
+KEYWORDS="~amd64 ~arm64"
# A JRE is not strictly required if native images of scala-cli are used
# (amd64, arm64). However we may want a system JRE anyway, and having JRE
diff --git a/dev-java/shrinkwrap-spi/Manifest b/dev-java/shrinkwrap-spi/Manifest
index f32d8dddd45d..8041115c0282 100644
--- a/dev-java/shrinkwrap-spi/Manifest
+++ b/dev-java/shrinkwrap-spi/Manifest
@@ -1,3 +1,3 @@
DIST shrinkwrap-1.2.6.tar.gz 987090 BLAKE2B 0c837b6fae6c3e9c7155b6ddf1923b14320d39ee3fd45af5436f967535e8c3ab290b62b6ca67aafc146558466e8c161fa6527055e48a55b5456fce728c5618f9 SHA512 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c
-EBUILD shrinkwrap-spi-1.2.6.ebuild 744 BLAKE2B 369dec74e9d4506fcd8e7f5c262f2253477b56e4fbf5d2020834caf7787892c64c5bf1343bedd7bb90b5a0bf4b719ce79d7f11a6bbf7985d4b3defce92e5d39d SHA512 5fd30175961b343ade73342e135d35b70002dde74274efbc71db2330ebe3dc817f62b008dd13280ca745c0fcf215c6819169bba6db8b3cae1214372678640b38
+EBUILD shrinkwrap-spi-1.2.6-r1.ebuild 744 BLAKE2B 7a2e9e9eced25c28ac889ffdb8bd518b182a90d8f529555e6edb74eec199f8d368ff7611c965ad791c209962e2186964f8e0f8c3e2ef3e6e6563ba0f22b916d5 SHA512 8134815c89e7d894dba38f11f76252c3dc51de17c9b3fc644012671ab2ee90a0fa58c081925e4ab6676a57f8e005d976d9c4ad3125244a0d7ae0a4c5b7df8056
MISC metadata.xml 303 BLAKE2B 9befb02178286b65db97b836897ace4dab5c9ccccbc4d2a98242960b18acbf9cf0e8ade440125332cbc6555c92b6813a141c2fa61d0ca1db911e625844178543 SHA512 a7417fe5d51ab1a5871cfd2ac6c8d0ae8190cc7bea21f8d2f43b99fab72c73a58fd88ccea32ed59871d043aa6ac4eefb5a1493f1a204d1f3c427d1809c3a5f39
diff --git a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild
index 309ee2cc69c9..fb5680283e62 100644
--- a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild
+++ b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -25,7 +25,7 @@ DEPEND="
"
RDEPEND="
- ${CDP_EPEND}
+ ${CP_DEPEND}
>=virtual/jre-1.8:*
"
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index bd1c71853f2e..21a25290459c 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,10 +1,10 @@
AUX stringtemplate-3.2.1-TestStringTemplate.patch 463 BLAKE2B f4c9b1bce8b48a2d1299e866510a87038d34b636f2da942ca14e2ba9b75a77397abe7b430adcca35380d6362b5e3a6c6150f37b4e1efba521d1b63417cf7d4de SHA512 8f69547dd3e48ce32619f21daff19888f3cdf1d0df41e2f35ac534001c56eaa0e504edf481fd692241e2041c3d62f120df6ab4bb5b961f15662a399b9a915f8c
AUX stringtemplate-4.3.4-BaseTest-javac-source-target.patch 1233 BLAKE2B abafe7d60c9667cb0838b33d67d9e4eee1afe9f5f989e2152fb03a5e88c402bda49b927320ad912990b617b6c60322e99417c5fad0c3e60d48b9e8bb4a69053d SHA512 fc5da02c16109817ab7bb30c31a90ce535560e8bf1e7e1dfb203846e930bbd665aeaf46a4641d67e2960e8ae9d88b21275317b0b6e0494eeac8f20aa4f546a04
-AUX stringtemplate-4.3.4-Java21-TestRenderers.patch 2293 BLAKE2B 48a0ac8fcf10dd67511c5f679c3194d980f22b3c4a471a200a6a5f228bdf5769bf0a89857dd29f0575e2648d71f79a15dd8b63f45bd01543497d5a0dbbd4e4c9 SHA512 094bd4c6f0678579b0f0419a5a2a6c7a1dac1c86602e137d0b66da7d4a49ab4faa85d26b20266a54b3106964521cb33f6690aaa6265a1348fddc0fe3b93eaa74
+AUX stringtemplate-4.3.4-Java21+-TestRenderers.patch 2437 BLAKE2B fec8d2c0726a3bc130e0a43da3e4444d02afd9cd2882b75bb8e52e77caa0a9594682ac59e4f4a0a72b0d6346c98556ccaf422108558f3d1dffe68c275e537a4c SHA512 ea887454b1a26d6f04ac9be69d793bff61340c51c75ba55c1160c76f537e3a8b37a719b5134874b80ad1f894423698621c80c4af940cb78586be8ce5d77e5be4
DIST ST4-4.3.4-sources.jar 198780 BLAKE2B 25f9b4baf43075ddbc946933a517e8361f88d152c4caba29a88770ab229c1b40636ebc4ccdf52a2132d94974e0d81dd114e4018658d178a2c44228007450ab7d SHA512 83ff2e17659c37407b91c83e7fcd3b5d44b206f6fdaaf8034122a3c9490778aeb24ecf90778b9dc9d6836bc59a01d75bacce71e27aadb8a5fa22b9373f7f7878
DIST ST4-4.3.4.tar.gz 436814 BLAKE2B 40aba1cb009b669ad00285b4cdffa66632c38267f42b6b973bdb0a2f57f3c46fc13d1a929ac4745c104d658f127a63081ed5dde4c813c10e60ce7df3490d3517 SHA512 5061663c3130a50b03aaf1800a04103afae7db59758bc7957914b07718e50a139c5d486f90098368500c46d3d751ea1659c63531126fb146fb77eaeb6e244ea2
DIST stringtemplate-3.2.1-4-java21-compatibility.patch 1973 BLAKE2B b48891549f1d9a3386b0a44a78f453a7938122e5b0b5eeba98888bfa843aea4e5732b4dbcf6aac66272c9fe5aeb9ed98aabcf3edcd155f43d5ad0c1d4d4cdd57 SHA512 8dcf841affc0e7da006b13bf4c5d44fc5315aa4790926e8598650b519fd57a4c322e4292ba58561c921308697a4be1b8b6528931eb79e6a9f2e9f7d1370599cc
DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
EBUILD stringtemplate-3.2.1-r3.ebuild 1453 BLAKE2B 21864c434a6d4bd30706ecb52ac4bf74ea95796479288f6112c303918f64aa1cefb5d2ec1bf9cf9e3de0471be049ef2ae5d7beab3e93dee0e43223fd400a6e98 SHA512 63d481137f9254f98921386ce84b213ac36cc9a40b09ad31d600415c84eae37be6bb24187c02bed39cd7e791bfeff1eef9bf68ff22dc5046b31e6f536a29db0b
-EBUILD stringtemplate-4.3.4.ebuild 3075 BLAKE2B 0bb4e03971e0eaf7e075335ab9beb80f9a1d4aaf2b7410590745b1559aba0992978b366899fe7b7ae6cc8c932c01f5deca852e75d8f3a5c1434095a73ecd764d SHA512 20133120b08e0bbcc172029594f0038a227d45312ce2f092b0405017f7a9cffb12a73f0399bfe3955a8f6f7ac53c191a19e378a89695ad83752d101bb2987ae3
+EBUILD stringtemplate-4.3.4.ebuild 2968 BLAKE2B d20d6fdd4f51284f89dfeadc900d51d59cdd3f7c53cb99067ec7d2503c4831655cd32372e763acaa97ee41da4c09540f033664ec4a5855a9d01b8030073f3a34 SHA512 065d2d8045efa3678981cf978b9ec4a1c1481bb05a137ee05294c147fd10707da641848eabb781a8e1627f7e6678a5330226f16816440b171c261b10f5877089
MISC metadata.xml 384 BLAKE2B 16689f763ad8d9c0ce861933ca359a87ff74e2b464b740989a12700c9ad9eb8b2a79b0dd4ca6a2aecfe908b107c6abd907e1a25775783ea911a4a76fdf0d6e19 SHA512 71e70442b1128c1fbddc8ea936584090bf17ab8ecefc0ad35674b7d04bbab4f9981e0b2ea3465a386d43cc3363710fcf0bfd78412f29f387e85b5ebad998dbea
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
index 127f5e0a4b61..22b271671b8d 100644
--- a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
+++ b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
@@ -6,7 +6,7 @@ there are different space characters used in java 21 (narrow space)
String expecting = "datetime: 7/5/05, 12:00 AM";
if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
expecting = "datetime: 7/5/05 12:00 AM";
-+ } else if ( javaVersion.startsWith("21") ) {
++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
+ expecting = "datetime: 7/5/05, 12:00 AM";
}
String result = st.render();
@@ -15,7 +15,7 @@ there are different space characters used in java 21 (narrow space)
String expecting = " datetime: 7/5/05, 12:00 AM ";
if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
expecting = " datetime: 7/5/05 12:00 AM ";
-+ } else if ( javaVersion.startsWith("21") ) {
++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
+ expecting = " datetime: 7/5/05, 12:00 AM ";
}
String result = st.render();
@@ -24,7 +24,7 @@ there are different space characters used in java 21 (narrow space)
String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
-+ } else if ( javaVersion.startsWith("21") ) {
++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
+ expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time ";
}
String result = st.render();
@@ -33,7 +33,7 @@ there are different space characters used in java 21 (narrow space)
ST st = group.getInstanceOf("dateThing");
st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
String expecting = " time: 12:00:00 AM ";
-+ if ( javaVersion.startsWith("21") ) {
++ if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
+ expecting = " time: 12:00:00 AM ";
+ }
String result = st.render();
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
index dd01fef37fd3..0ed931834169 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -53,7 +53,10 @@ JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" )
DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} )
-PATCHES=( "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" )
+PATCHES=(
+ "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch"
+ "${FILESDIR}/stringtemplate-4.3.4-Java21+-TestRenderers.patch"
+)
src_prepare() {
default #780585
@@ -65,10 +68,6 @@ src_prepare() {
}
src_test() {
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if ver_test "${vm_version}" -ge 21; then
- eapply "${FILESDIR}/stringtemplate-4.3.4-Java21-TestRenderers.patch"
- fi
# Make sure no older versions of this slot are present in the classpath
# https://bugs.gentoo.org/834138#c4
local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
diff --git a/dev-java/swingx-ws/Manifest b/dev-java/swingx-ws/Manifest
index a547551a387d..56f23d61caad 100644
--- a/dev-java/swingx-ws/Manifest
+++ b/dev-java/swingx-ws/Manifest
@@ -1,4 +1,4 @@
AUX swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch 1446 BLAKE2B 4abe6f6f22d46cc2f39720f43645098aad3b9e13ffeba1017dfb06e12f2acd1e3c7fa8e328ab421f24cc907dab223c6098fd65fbeeb500d178af75bab6429913 SHA512 5fe1b2af4834bd90183d9cbe0d697e5fbf22b6c401d7c2240fc1cdece71a24ed80ba8e4fbb3beeb4345761a51c1ee214f02206dac0efa1bf97a60523a39745d0
DIST swingx-ws-2011_05_15-src.zip 7010679 BLAKE2B 529507f3a7f48d38eb755001b2d442d040adf884a31a49c00f57fc638855e96b195a50813196fdb7318860b0a547eb8220fdd2d05ed613c2cd7d83cb8b7dd7fd SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da
-EBUILD swingx-ws-1.0_p20110515-r2.ebuild 1886 BLAKE2B f1efab71ab53a8127edc7843813548251640b67ec7eeb86f18e10aba39ac2e4339191bc80c4b15f430a21d50b1fd27677ed4fae48487ef3ee4167fe3e038b05b SHA512 9241fef989fb1e6ac21cd799d78353630ba29c56fa0ef1e2aa0a8d158ba40145d7d482c80074254476c775c1768557a1292c6fc6af4d65c86e7b6f96f615cc71
+EBUILD swingx-ws-1.0_p20110515-r2.ebuild 1881 BLAKE2B 615a2e531486b39aad31024606c37f2959d131d79c87ce1bd1a11a85488dd316a9da6df43cab69037d8f2963ab08a4cf7894477fa544a3f23ce7c33166d4c272 SHA512 e465d7f25e5e36c81fe5600fb97722f79477053bf79df20836b124ea9976ef060ad58991ebabc0fa370266c3eb93bc8e4e56b67c0f889fe5f5db0043061e2bfa
MISC metadata.xml 460 BLAKE2B 745c927a4a496be4c3ea9ce20a9e70bfcd85887421cc7836f056a2c048101c423f1c2e6c7ae39ebbce80e7f35ee659809463138dc37b5ddc50254d28b8871f79 SHA512 7cc9fcc1d808f78b4b38559af09e21dac1e8832b4e2d21e3a81abfa3881e54572d81fe18c5c646cf0e75179942a007a0bbed97e1809610366edc7de701b49121
diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
index 3900e1d0a5c4..fb902a0a9f6b 100644
--- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
+++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://java.net/projects/swingx-ws/"
SRC_URI="https://downloads.sourceforge.net/bt747/Development/${MY_P}.zip"
LICENSE="LGPL-2.1"
SLOT="bt747"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
CP_DEPEND="
dev-java/jakarta-xml-soap-api:1
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 031e7f32e091..3a3c5ffd341a 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -27,5 +27,5 @@ EBUILD swt-4.10-r4.ebuild 4269 BLAKE2B 3ef14892698d8df50f090443a8e15f8b0a048b378
EBUILD swt-4.29-r1.ebuild 3457 BLAKE2B ea98a5170abae41c7e18637b127d4ffc9f67e2e92042dc97ee191780672813d94904758463c48cb5402d9d838b5e12d0a47a5c7218c0f424f2a30773445d0d92 SHA512 ed7a98c317bbb259fb9c732631c33a1291ae986bdf158cc0abc0c81cd3b28600747cc8af5d8bfcf8df5f61a7dff3697d1572358ca352cb7ce8eaa64089bf5504
EBUILD swt-4.30-r2.ebuild 3527 BLAKE2B 0244ca3c7ba1b60277a4ec1a4eaeb53e5f254b0982e49e990a29acaeace91c14d019d7432bccf61598abe8622cb32d4bf035882e53573e0be276c1bcdb59b97c SHA512 d715601364f15c50460bb812f4384a24ecb05275cb833c59e911a292eac009ece65aff95e0fa9425ef04087a6a2311e3772d1a31629b7e4080fd2a2f2d4a0917
EBUILD swt-4.31-r1.ebuild 3597 BLAKE2B 3ebfa0ada9993a92ee67868ee6070b0a4812b455e3e3209e1a00abe4a528c2202be78d413d62123d113edfd22d998d728d2913b4d03296922a01cde4835ce8c8 SHA512 414e93ee4cc2398bb5f7b1b7079a865e48a0d3de4dcd62bba170c2207d4283fe7eace273736335233a6b16848f73890f59646ff763ba311d5aa75ecb5c146870
-EBUILD swt-4.32.ebuild 3600 BLAKE2B 3f16bce5f970f8abd52843dcf1490083c6cb6c08349de1d472adc3627bbe8a958f1a2176a48f3ac4581e492f87bfb9cab6ea9177a4c3fa273ae535507a4c0f5f SHA512 346aea082e34d3d0938b4c3ca328f3502daf9891cacc7f5f2b90a246da3b39e767f81d96a198c8fae325d0c315371175e54ea20fa85a1687d5ea63b9f389dd62
+EBUILD swt-4.32.ebuild 3597 BLAKE2B 6f6b08425ff52668c342394c50437397eeec8621d766f67d8a90999e2e659919da3837cc987f5166a268016351176406e7bbafa7b74cf59176c276bb5eca5402 SHA512 e9b246638d08f0d415f8412913b9369d9ce257f2a4e43e0741f2e5b989aac31d091d5c4f533a7a6ea50a3ea2cd73ee21728ec7e44a4ed7715aab6fe09a2f554c
MISC metadata.xml 761 BLAKE2B f70a4d3ff5fcfad5705772396957664e700bd3ffe9580ac141c5faa11e24562b0cbc199a2f49d61d6a2a08058374dc1b7bfd9ae258e4a692e5b3c340f478da25 SHA512 1e8b8ceb30071c8271365a2d515e094c11ab569c4fee7b7f905d5de0a7613518320a1912b2b958d816e04d9876ed75425e16de9a35e1d6be6466888e08a420b3
diff --git a/dev-java/swt/swt-4.32.ebuild b/dev-java/swt/swt-4.32.ebuild
index 0dc6a896fb7a..5e0f6d998c9b 100644
--- a/dev-java/swt/swt-4.32.ebuild
+++ b/dev-java/swt/swt-4.32.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/library"
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
SLOT="4.32"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="cairo opengl webkit"
BDEPEND="
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index e928213c3115..e80a62be1455 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,8 +1,8 @@
AUX tomcat-native-1.2.39-slibtool.patch 829 BLAKE2B 2af44125d0ac68f8fa23c4a48456646401608980775d2631f9b82c16b0596222b04ecafd2914d95fa01c6fc460de602a0028ef2d58f0a0d77c95d2c81a0145db SHA512 89bdb82f5cca2a32be8cfa4c72122d0e713eea099d081faa8ac5b4af8127a4d36913ec6a2c172511024b223f34fdfcc6c1d1550859a0e96d71820a6997efc078
-DIST tomcat-native-1.3.0-src.tar.gz 345276 BLAKE2B 73e8433e12bdd88036509f4ffbd2c0ed25b367567728829a56918d082627d43643865c492f4bc8eac4551e2ed82648ada71e6decfb45c173a856ab2fda6e01a5 SHA512 5a6c7337280774525c97e36e24d7d278ba15edd63c66cec1b3e5ecdc472f8d0535e31eac83cf0bdc68810eb779e2a118d6b4f6238b509f69a71d037c905fa433
-DIST tomcat-native-1.3.0-src.tar.gz.asc 833 BLAKE2B b7e05447643000ffda0d66143c199192b41843f10ae89874c353d613f612a6d481be3081aa971b640a3bedc6c903be7d052c418e2abc2d7d6db42924c7b3cf91 SHA512 9cfc137cd13086ccf421376a006164e6e6e14844636457db0cf7c0f699a1b1ceab28a52bd80da71dc9e190bdf84676abfdbe07a0cabecfc59b7845ac82a171e5
-DIST tomcat-native-2.0.7-src.tar.gz 538131 BLAKE2B ef973c830e3e3e04f4bf7bd711915b1ac5f28e34832edd0750117a5d6b00f9a7fa9e390858d23bfaeeb08ad825d7dcc1e95967c00d4ada96cac83377fca7bea6 SHA512 625b334271494f7c86c06d6a8c6d13c06d9d6094f65cccbdc8d3df13ee2aae4cb42ad326e20bcbf8a8f141240111778991882f9bf87793b09a2920433d6c8c85
-DIST tomcat-native-2.0.7-src.tar.gz.asc 833 BLAKE2B 081f40de6fdc5ad819a167e0150a2e03ab8d4fd679be0dbabac9a9f2aabffd2fa36fd6a9c764deefd419576dcda07bc1b22ea2f14c04eddbfa7f94e4834bec7e SHA512 16a96a3c3b55d258ad0820c30392f37643f433c563b74a983109492569d06a399471acc42c7f07b87b50bff8711bc10ed278bfa183807bcdde1355e6b8058605
-EBUILD tomcat-native-1.3.0.ebuild 2210 BLAKE2B 34fe48c4c0fca3aa6c7db823ca2fe2957bf6f664af78ed0107164bfae6eefb2db4697817cb8dc3d7c695573535d905362e32b858715041c0910c0b38db14846a SHA512 f26273200fc7b14db5c71fdf6ff20f19ed802355736bfbba067ab5a02247de93617a67ceed14350ddc62b43a84407144e8194aad7a464dd4cdae7c7e55a6c4e2
-EBUILD tomcat-native-2.0.7.ebuild 1964 BLAKE2B 20268866489e1a85e741358b2fea72449b1acb35a00cfaccb8483d8025579450c61762ca4547616148dbdad89a14cfaf7c8457342f4748619cb7a07cb7670170 SHA512 dcca9bd56e243dd7c6d619b0dc2659ffe6d4a2a808e02af06799f5640e6a0fb54d16b01d7744b4d382659c67731dd8db7c7bdca849a1ee643fa19ad9235c8d73
+DIST tomcat-native-1.3.1-src.tar.gz 346588 BLAKE2B 3b979845dd10a0c74c7ed2e6404b217c7bdebf2d432ac904b50f8288cd3cf3b1489b4e5111ce02eca442c45deb805523062862225130386a6d47853cd972d788 SHA512 06951c67d2739ab9205a537d24345e13e4472f192602fc52015ea84612c6e2c9334404b30a82be7d1e7d4ce470ea9df8b1b8ca1a3b8674d82706ff432280724f
+DIST tomcat-native-1.3.1-src.tar.gz.asc 833 BLAKE2B d7483efea5dc4d9cc069a667896950526e22a6b4b0ee1fd6739754196d1b9e84a2b16f766f68419faf2c3fcc87d1fa83c9985de7149849d4f761d2c5b7e45af7 SHA512 3550e38556dab5594aea469cd8ae43505deceeab25bf60ecd61c26ed1106ce88e35634f936cb36e7fc766f30b5c5f0f19dd01a1513ed219ae7f68c8c10e960f1
+DIST tomcat-native-2.0.8-src.tar.gz 471386 BLAKE2B 7fb5e3c4671e4b56bfa5eb546ac1f87fdf1e33b350533ffcadb9005c1f3054013d61d15f4212923d9ec9370d15fd2717e2b446c80818c82d83cd9f1497e321c4 SHA512 fd45533b9c34b008717d18ed49334c7286b93c849c487c1c42746f2998cc4a6ff0362e536a8b5124c6539847a92a9f7631c7638a21cd5d22134fe1a9bb0f0702
+DIST tomcat-native-2.0.8-src.tar.gz.asc 833 BLAKE2B b438034baf5191ce2af55087d1fcd55f196c3cfa75dc2c7fc9d1bfa8fa5b5289181dad6a02e55674e7d685482228df603478ba1f73a9b67169f50390cdd198a7 SHA512 64879cd6f02a6213a2b6cd102dc175d968a7c20bc821877e9f6f5bbaa11069e5cb672b584c47e3a7563a6c872d56646535a59e42331a2ad524c7f85e628085df
+EBUILD tomcat-native-1.3.1.ebuild 2210 BLAKE2B 1a5ff679d8c8dabe6332beec707c6c72676181a95e38204fa2ec63b7dbd2f8616e75e106ae615845de7772aeed742bb903a4a5af93e851d3ef59cfcf503807ef SHA512 1824f6c125e2a2c824ef24e3d233ec1b97a149b73f1ab97bc8c90c3606406067f7458ea8aa4a8983c14d9efa69067f7761092249a2c45a856d3beeaa52e56181
+EBUILD tomcat-native-2.0.8.ebuild 1964 BLAKE2B 447f048bba12b519107abf43163b7a03b55a4d978617e50bf50cd17e4dfc2e7a6ccb8f892804cab3e6c261e8bb5a5be8cd7cad12da0c43547c2717bfa33960ec SHA512 87faf87a03882e7dcc302e2e448493357b317ff5d81405f5369bbc9aa9f30c80ae63da37c6494c33dbbb90194660f8cbc5f089c15f7f4a6631fd5452b6745c92
MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc
diff --git a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
index d560c27c933d..f4e9d9bd6779 100644
--- a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
@@ -16,9 +16,9 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
)"
S=${WORKDIR}/${P}-src/native
-KEYWORDS="amd64 ~x86"
LICENSE="Apache-2.0"
SLOT="0"
+KEYWORDS="amd64 ~x86"
IUSE="static-libs"
DEPEND="
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
index 9507ee4750e0..7dbe994033c0 100644
--- a/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
@@ -16,9 +16,9 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
)"
S=${WORKDIR}/${P}-src/native
-KEYWORDS="amd64 ~x86"
LICENSE="Apache-2.0"
SLOT="2"
+KEYWORDS="amd64 ~x86"
IUSE="static-libs"
DEPEND="
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
index 40312a5ce931..85d7977fd345 100644
--- a/dev-java/xpp2/Manifest
+++ b/dev-java/xpp2/Manifest
@@ -1,5 +1,4 @@
AUX xpp2-2.1.10-fix-java5+.patch 872 BLAKE2B a8fa53326a2fefa40f726a4cd3e5e2828b3d2e50907736be1b2639489692ff2a0ff683d1538123163d5fe52d2935d97832d643d7365829ca1eaa7c7936623e75 SHA512 495dfb83a773d11fb1f9f423f1bfa532770710b4b16c1f6e64e517e8148958a5160ddbbc43dd4cdc7ecc51126fba1062a10277bc9234b58e46a044e81180b3a5
DIST PullParser2.1.10.tgz 2310288 BLAKE2B 0c1f3aedf88aae18e7cab40b04055fa7a20f6bfe05973e6cbe3b459b408dfa193834d22a6d77b3d1ba3802e115d89f73e3f423efc7571efc8f09bb73625950d6 SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590
-EBUILD xpp2-2.1.10-r3.ebuild 1854 BLAKE2B 886333476332b887bfb6e02a235a6d7f50fbca065b5533a774881077d622bd7c12de73632d2cdae2fa9983781fe7ef88f10f51bccf3249b4e936247c93bbf3ae SHA512 4e011582986248939e206b8a2652e2d2a5d902615e29e3f15e87f92121093b73977fc7a36f6c0a354dde4c2562026e73c665a66187b40ba6384902d87ebeb198
-EBUILD xpp2-2.1.10-r4.ebuild 2400 BLAKE2B 9c7e4e9660d9e7b809c7503dad6224e78fe6ef49557888ac66b99ffd44263d50d82eea0be1f16eb7a06dcb05008b7b16702c1e5560608c2b78a0f77160476964 SHA512 d15b1c37d618aa308aa7459fb7628ba9a3f1ad832d77e4e24e6d02373fa75da6a5093be688ba771670d3d4f610d2c2adc2872a62eef3beb0cbd66473e2263a23
+EBUILD xpp2-2.1.10-r4.ebuild 2396 BLAKE2B 9616be3c427fc97b51d9ef43909b9b21188e9a167fd6e2a4edec59c1439d39e4d974dc60f9fdf1ba0d013e27894661ec4c28471aeeaaf8f04e0b2dde49aa7e98 SHA512 0aae9f8c45b4cb1500396a0afb987be8e1914ec882c58ec76e6397a3da798bd3473db8dbf7f24d65561229fde3ae39ccf0bcb802ad58a110e008b6c2b0495242
MISC metadata.xml 459 BLAKE2B 6b230c468ed9a62380563114c50b9b3cbd58237df4327ddc6194dba9524c6a0872c04354927d800544b1095db4a7f3c3ee0b0d37f16d23578da1b84f79628218 SHA512 f41891c17a7ab0a61bff751bdef3cb45f9385de1c10219aa19a8cc194b780b0db7d46ee89ed5403b193f473178828e79e88fa80833b5bdd56f8c9d3a532fff9d
diff --git a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
deleted file mode 100644
index c4b5aaa7a88b..000000000000
--- a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
+++ /dev/null
@@ -1,73 +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"
-MAVEN_ID="pull-parser:pull-parser:2"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="PullParser"
-MY_P="${MY_PN}${PV}"
-
-DESCRIPTION="A streaming pull XML parser used to quickly process input elements"
-HOMEPAGE="https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/"
-SRC_URI="https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/${MY_P}.tgz"
-
-LICENSE="Apache-1.1 IBM"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-# Some failures, partly because we haven't patched Xerces but probably
-# also because this software is ancient. :(
-RESTRICT="test"
-
-CDEPEND="dev-java/xerces:2"
-DEPEND=">=virtual/jdk-1.8:*
- test? ( dev-java/junit:4 )
- ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.8:*
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-java5+.patch"
-)
-
-EANT_GENTOO_CLASSPATH="xerces-2"
-EANT_EXTRA_ARGS="-Dx2_present=true -Djunit.present=true"
-EANT_BUILD_TARGET="intf intf_jar impl x2impl"
-EANT_DOC_TARGET="api"
-EANT_TEST_TARGET="junit"
-
-src_prepare() {
- default
-
- rm -r build/ lib/ || die
-
- # Our usual rewriting stomps over the existing classpath, which
- # isn't helpful here.
- sed -i -r \
- -e 's/\bclasspath="/\0${gentoo.classpath}:/g' \
- -e 's/\$\{java\.class\.path\}/${gentoo.classpath}/g' \
- build.xml || die
-}
-
-src_install() {
- local suffix
-
- for suffix in "" -intf -standard -x2; do
- java-pkg_newjar build/lib/${MY_PN}${suffix}-${PV}.jar ${MY_PN}${suffix}.jar
- done
-
- dodoc README.html
- use doc && java-pkg_dojavadoc doc/api
- use source && java-pkg_dosrc $(find src/java -name org -o -name javax)
-}
-
-src_test() {
- java-pkg-2_src_test
-}
diff --git a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
index 0e785ac7de74..cc77774f1703 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="Apache-1.1 IBM"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
# Some failures, partly because we haven't patched Xerces but probably
# also because this software is ancient. :(