gentoo auto-resync : 26:11:2024 - 02:00:48

10 files changed, 72 insertions, 28 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 270db39c1ec2..c6e1dbd7f923 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 090f3bc0a0e8..bdc77c5cb72b 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -6,7 +6,7 @@ DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f47
 DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
 DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda5868ad979b29c9f4dab97e39cd31e7fc943476c3a854f3e3aee9c1c56384b7fcc893f87548482af5d5d0839fd30 SHA512 c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c
 DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
-EBUILD antlr-2.7.7-r9.ebuild 1097 BLAKE2B 4bdac9e8224bce3e41d519c12b6ea3932b087df7cfd1c4c0d9ee84d52ff59bb3ffbcce8d6be294cba05ed0dc356de08dae65dd0817682683897c12c87a4de30b SHA512 167a2d35e93b2fe5b4c3382ad9c26529fa6595d83ceffb70e43d2aa7ff5395ebeafd3a46291178838ba6d3612c557cb12c38a0923d0bce0c588f9512dda3c0a5
+EBUILD antlr-2.7.7-r10.ebuild 1056 BLAKE2B c27684d657c0c722cdcf38300bd648a2cace798bd44b258bd3c6ab4a1c0722a4a8816ce6d9d1d1bebbd623fe59b12d76d8a123ffe53300133f467f055f690412 SHA512 de732d624b2fc274ab0b61975cbe75673cc32fc4a6aa503593bf102513f97b931b56106da19c81ca311b52a5e0f5730ac1fb2d5872bc674821fb4eec5d28d818
 EBUILD antlr-3.2-r2.ebuild 3252 BLAKE2B 385034794d33199ee0173927286d7e38ef273ed2fa167b746e2d6d36772ca6407c45321d0a2fd170a13354450c23e4eea47397a81784259090bf70f643f5c16d SHA512 01fc9d04d6d4a0a590b5d120fb20d2977da3f0f25dcc72175a00ded53cf01d6fbb890b5d55aa36a02e84b6cc53aafb385ca5d21a5319d8d94cb4d3876846f38e
 EBUILD antlr-3.5.3.ebuild 1558 BLAKE2B 75104219b4a8d64fbbfc3ac91fdf069ec2e12e9449f7122776650a7b48cd981685152aadf7f7f18949a22105474d3ca4b06506dc4cccce6303365b06d59d5ebf SHA512 3d3dd9a86d5ec2c8b2fadc761dc5bdcd2e0b853f34d631d74e7337d6eb2ae8543492bb05ba9a402692419c6caaa7a9bf128ec4022c8878c7f8a33ee38c59a1d8
 EBUILD antlr-4.9.3.ebuild 1586 BLAKE2B 7511feef4786285004c85466eb4ec1ea626b7ecffaa3870c1d27351bf10e41a609d656e23972e580f76826b9d892fa10e0dad960150057e622e1a229ab240390 SHA512 467e38aa07f8094b93a1a84196926f5bbfe22557417e52c7b44a93cf2232f411cc3e27cc3f4d6a9c629a2c1b406e7f88b16334d34d6b7b89e3618d0325c752f6
diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r10.ebuild
index a82c35657a74..10b9b6e1131d 100644
--- a/dev-java/antlr/antlr-2.7.7-r9.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc examples source"
 MAVEN_ID="antlr:antlr:2.7.7"
 
 inherit java-pkg-2 java-pkg-simple
@@ -11,23 +11,23 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="A parser generator for many languages"
 HOMEPAGE="https://www.antlr2.org/"
 SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
+S="${WORKDIR}/${P}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples"
 
-RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/${P}"
-
+JAVA_MAIN_CLASS="antlr.Tool"
 JAVA_SRC_DIR="${S}/${PN}"
 
 DOCS=( CHANGES.txt README.txt )
 
 src_prepare() {
-	default
+	default #780585
+	java-pkg-2_src_prepare
 	java-pkg_clean
 
 	# Delete build files from examples.
@@ -39,12 +39,8 @@ src_configure() { :; }
 
 src_install() {
 	java-pkg-simple_src_install
-	java-pkg_dolauncher antlr --main antlr.Tool
 
 	use doc && java-pkg_dohtml -r doc/*
 	use examples && java-pkg_doexamples examples/java
 	use source && java-pkg_dosrc antlr
-
-	# https://bugs.gentoo.org/789582
-	einstalldocs
 }
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index f63136a2d6f3..2d7bd39546be 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,4 +1,7 @@
 DIST commons-io-2.17.0-src.tar.gz 652908 BLAKE2B c87f10584d7933215aa24e8bde1037eced0738098149e9423371a1fef0255e36e38a6c92cdafd75eecbf56d13c4c38d479fe2706afc86224900fcaf7cae5e5f5 SHA512 5681b7bab9e34e9051e4f7a48925ecdf5d8814894c2626298dfca7aa0566c2dc46c15843850e3e14a3e05613ae9ef9fd08077042931e2fe552057f9c1bee6b69
 DIST commons-io-2.17.0-src.tar.gz.asc 488 BLAKE2B 451dcfbc952994a2402a7657fb0702572c8873c977681236c26326eec15316d543a39a48530760cf8a7c8b8469c7d18b1a7f88a80ab096d1604c33ec050c9b27 SHA512 8708d9cd17a2805c385006fbd5d0db883b593c67ff4afaaac507ca2dbe9f4b2e51cc1c492577b2e2cc6151a766264f1b3cd7c4b526fe16afa814d7ae29d2722c
+DIST commons-io-2.18.0-src.tar.gz 670984 BLAKE2B 3d8ffbd602cf31e89cb42059e9a7f836d46baaf687662a44dd1d110978faa6926008ba5efcbf55e4f89138c5782be848bf8d1ccb5ed4ef10bb3bdbb750905b4d SHA512 0abc1dc252a72825c5256793780a6e1fa91b8a60436bf6badab1eba8a41f44e1e69b2b90b44c641ddfb78c28f95848e13ffc611793dedf68751bbb5272f86f85
+DIST commons-io-2.18.0-src.tar.gz.asc 488 BLAKE2B 2c88e3374a839fb58ef25422c33e120699b319ebdf2baa8f72180e0db8089a4b9b851fc648c0508aad9c7707c463fbb9b849b3eaf545f101195083a4dffae160 SHA512 8101ffb12f3253e71f0234eb8a5a04d88bc7e8777cabfc88ac64f50b416dd6b4be28f8dfd14d09a97a63257c159fab4b512584085550ce965fcfd97cdb637a9e
 EBUILD commons-io-2.17.0.ebuild 1251 BLAKE2B e7e227a79d119ad23301d99e4fe0642c796f0e30f0fc9d01007227768251d5ef1e43065a4a624430160bbf92646968397457f174e8cb420d726dd978ac250906 SHA512 b1300f617b36fb43a085defb7bdf26e2d3131eb7b0036bed3237f0fe2af5e2f83b2c260c0603baf238f2142b37f2f55364ebdf23fe0cb05eb9da11aa7d210a84
+EBUILD commons-io-2.18.0.ebuild 1254 BLAKE2B f306b8263ee111dccad8d4cf3ae14e213fdb89418e7d468e443e65bdda95848f2c1284ae8fe29e02c21968a965329866c82a951b9d7478259e73fc6044e3ab08 SHA512 439df352ded19ec734e51dd568df63bae6f899161e5563cc29ce1b47b90c29572b30afa75b731fbabe85851d85879e2bbfa295f3aef921cc1b60a2bf8f5b9a11
 MISC metadata.xml 319 BLAKE2B 0cf0293595d7916fd34cf3a108f6f79e8ce3fc32d4bc02bcb093578e02c5386ed80b50487fb8e663cbcfa98873ab0a5a3763b3b002ff89323617b30c4a1b4143 SHA512 acbe501db8b7fe74845d68c3c288231b2140473652c12b04d4b4edac4a6031be67c470d4b59a170e743023e1f931a7daae647be0a23bf5d227d1fbd9c4927cfa
diff --git a/dev-java/commons-io/commons-io-2.18.0.ebuild b/dev-java/commons-io/commons-io-2.18.0.ebuild
new file mode 100644
index 000000000000..56e38e5d6014
--- /dev/null
+++ b/dev-java/commons-io/commons-io-2.18.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests, #839681
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-io:commons-io:${PV}"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
+HOMEPAGE="https://commons.apache.org/proper/commons-io/"
+SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz
+	verify-sig? ( https://archive.apache.org/dist/commons/io/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_compile() {
+	JAVA_JAR_FILENAME="org.apache.${PN}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	jdeps --generate-module-info \
+		src/main/java \
+		--multi-release 9 \
+		"${JAVA_JAR_FILENAME}" || die
+
+	JAVA_JAR_FILENAME="${PN}.jar"
+	java-pkg-simple_src_compile	# creates the final jar file including module-info
+}
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index cef88e0bfaf0..cd190fa83b1c 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,5 +1,5 @@
 DIST icu4j-75.1.tar.gz 65866291 BLAKE2B ae9a2a8f9bf6f38a08c46c4c3695fa4096c831beab1af5b654e86c9d681eb32be727930aeb1fd866fe9f93a96abe807fd353d108b5fe7a4d8203ee33cc16d971 SHA512 08f8fce8a4dd85706d9f7c57fd021ba15c403ab2da33d9a122d7cb441e0e148deebf245a661e4ef53a30bfa8b7622c63035946fd8966be3927af322275b87ca3
 DIST icu4j-76.1.tar.gz 67524828 BLAKE2B 949b6b69e2201ba5b4538766d25e72a8d98daeb8b1bf376966a6f410febee8c75c031ce9e52a0e4908d5d01f4d0120526ac84178603ee3968c1a399fc0a7959c SHA512 b92e05f3b5022992dfc7881542ed957dc9a1bc0b86f28fa6123dd4ab295e2a91686672193017acc0e0b659c37c944a1d2222e4881d7c65046a1df9dfaa925f12
 EBUILD icu4j-75.1.ebuild 5507 BLAKE2B 9a07d9854b1675f1a5d29575c87a064e1adb303a91962ef016fad3438e0219e602b2d1461d0cfe2df786fb81d2765d225576c13c4a98b1127394415f2be55ff9 SHA512 b8aa84ce20a437a2de1f106a19bdfa7bafc56e403c77e3cd0d4f3a3a389a846020bc2db849737e02d619b4a1eedfff2ff74cb93b4be0c690c5f6c33e6d3185cb
-EBUILD icu4j-76.1-r1.ebuild 6233 BLAKE2B d558aac183c6327d09d4a82f134a347d1e80c93c55539969bcb8ae5c3a344b89a8924f2f31578a375e673d10d7c83356dcc22efab045a7d89ef612f3a2ef1941 SHA512 cd041b6ecb39a52becf6b14bd7606783bb52864970f4b28fdeb03f8eb448a1b0fd803f935ca2feaf27289a33abb7ef40b7cf88ad4cbcb32c3aaad23029f005e3
+EBUILD icu4j-76.1-r1.ebuild 6230 BLAKE2B cb2dc913efcb4b6232aa5d68763aa9943b4d5930950a03176a714b3d0c3979de12f4cf4e0e5a5ad72bca8062a035d29698f2e9a9788ab7f116db62c6d19bebe7 SHA512 f231676d3ee1027f81145f086fec3a86619e4038a6f5ff2fc94ed75fc7615063e7a6633596c984fc19281156632610780cdd6df710107a273097dc957f7ef313
 MISC metadata.xml 408 BLAKE2B 8d73c37540d7adce52f3f5b316d7c322bdbbacc3fd2dea5e361352bff8efb3ec2a5b49ca4e7b97d15e8c668e52fe32f90ec1972bae78b9b3b3354973d8fc992a SHA512 eb7df20108b1ebcbf5dd9edd72c2089df2c675028824b4c04976e35b4c306dd459a40aa45b0ac7da5392552657cd1dbaf2fb17b269f9d58110a6ac40dc377b0c
diff --git a/dev-java/icu4j/icu4j-76.1-r1.ebuild b/dev-java/icu4j/icu4j-76.1-r1.ebuild
index 0dc67c7d8a23..2d35023cd241 100644
--- a/dev-java/icu4j/icu4j-76.1-r1.ebuild
+++ b/dev-java/icu4j/icu4j-76.1-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
 
 LICENSE="icu"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index 68b980dcbc44..90b09f74a591 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,6 +1,6 @@
 AUX jmock-1.2.0-AbstractMo.patch 1193 BLAKE2B b822ccada923c92a421294549ffb9f02fffeffbd7a57bdc79e0749147a361ad2cd0fed6b5b63166d21078684b235312393fb7af63a3b293d0e8a7a1f18fa70eb SHA512 53ac2c2f603aa8685aa18737b96a05fa590ed9bda8208dc06ceca159eed7dcb609a01cfb113597fad335f5ceed89d796e448c4deaffd3076a29d57c6ed8f15ed
 DIST jmock-1.2.0-jars.zip 153214 BLAKE2B 2c40696229018406f3b60559013b73b5331c223da6e2743830c4c9b8b728484b1ebed8fb347c240f50f6936c2fd1e4ee85b754315682047a87a14414effc3a48 SHA512 5290f1d14cbc3d0f223bdaf59716b037dbc021c8f39a3784d13af8d8be3edbddc5e2eb4754b80e78ae954daf12889210183e7e11c110012b4d9320344efe19da
 DIST jmock-2.12.0.tar.gz 111963 BLAKE2B d4b8c8c4ca68ed8dae3b4906e3163fa5e8e8ea8f4b993386d7fa605e0188dd43462550ae4833ab9dbfe68c24e15cf6d19a6f444ca57f666fdfe8b29734fd32f7 SHA512 b1ba12981e7379f5b07a29749c7640906c02f72f52158921d0ac02abf69c9c8c2dc753f4462ff0afa5807852a06f59a6da9ed9357ae7dc0303b0377a0e3da854
-EBUILD jmock-1.2.0-r2.ebuild 952 BLAKE2B ef9c3bc3ef9d6c863b499f766a6f1e8a31c25b69531f741f389280dc4d4ef9c26ec587f893049ef8d70e43fcd5436b40f7d3b1139359ad5e6a0ea20e12efab38 SHA512 083e562c61b1f72fac639f89af20c29b4a3e7c278d989a4b353a963162d4e508127a75384c17caed7e8e9052f417a25115db7efa31921a282bb52fae1490c225
+EBUILD jmock-1.2.0-r3.ebuild 927 BLAKE2B 1bb6c50b6acf5c5f5bf3959c80d0b5c8781593f60f0af7c1cf341d27c60a624cd549cb50372b8f7c13c36207f4a626ef2f5b45e1b794d6e72ebabc5750bd3f97 SHA512 4dab50f1fccdb82e8a550a3b79ad066c3f57d36ea35edd364b83abb96360bb17bacb18a3841e4482318f9bc0f60cb460c597cb3b42d10d5258f037afe0558a68
 EBUILD jmock-2.12.0.ebuild 2614 BLAKE2B 89d7d46f9d9f7c49ba63ce6c9da357f9420d9896b9900cd72d204948e33f01b1723386f8babb6e09d2fb9cdd1292b14ed00704b8c29c1284d901455552601db8 SHA512 537ca39af0cf853af9bf96281b3f7651fcad6d5cff92b619e937bf26b34eff5f154425acd942789c49044ffcaa4a5a885783e57be2110888b176bdb475e937c8
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
+MISC metadata.xml 325 BLAKE2B cb9fd601f6ddf82fc91d3635a53498c54b2eb7cda6e6fc18c84ee07e5d92d027fb9efac5649593883e0e416628333be45008db7c4910c5b7f46f41f948063804 SHA512 486d66398bc400af781be026fb7bac69908f275420e75d13131ba4397a94afe093839f15e9d4984801a4c2fa48559a5b214463d605df462ce69542675ff215e4
diff --git a/dev-java/jmock/jmock-1.2.0-r2.ebuild b/dev-java/jmock/jmock-1.2.0-r3.ebuild
index 6ba5eb3a2018..7225c30b6999 100644
--- a/dev-java/jmock/jmock-1.2.0-r2.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -10,24 +10,26 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Library for testing Java code using mock objects"
 HOMEPAGE="http://jmock.org/"
 SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
+S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="1.0"
 KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
-CDEPEND="dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
+CP_DEPEND="dev-java/junit:0"
 
-DEPEND="app-arch/unzip
+DEPEND="
+	${CP_DEPEND}
+	app-arch/unzip
 	>=virtual/jdk-1.8:*
-	${CDEPEND}"
+"
 
-S="${WORKDIR}/${P}"
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
 
 JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="junit"
 
 PATCHES=(
 	# This patch isn't changing the behaviour if jmock per se.
@@ -42,7 +44,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
-	find -name "*.class" -delete || die
-	rm *.jar || die
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
 }
diff --git a/dev-java/jmock/metadata.xml b/dev-java/jmock/metadata.xml
index 6021501589e0..2d37bfa76e43 100644
--- a/dev-java/jmock/metadata.xml
+++ b/dev-java/jmock/metadata.xml
@@ -5,4 +5,7 @@
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">jmock-developers/jmock-library</remote-id>
+</upstream>
 </pkgmetadata>