gentoo auto-resync : 16:11:2024 - 03:02:52

9 files changed, 24 insertions, 53 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 35af273df2d8..93a4667871ad 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index d29ff23d26fe..115611f800ad 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -3,5 +3,5 @@ DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631
 DIST commons-logging-1.3.4-src.tar.gz 195717 BLAKE2B ba691ea0033c14f54fcb525faeadd4b330e063f73175c5ee40a4f50f159f1b264efb9f40661c4af3902ddca7d43f8f9b84e7a77bf1eeb3b237b31f566fc98aab SHA512 a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44
 DIST commons-logging-1.3.4-src.tar.gz.asc 488 BLAKE2B a9cdc993891ff39bb8ebeaa3eefdecee1adb062ed77449dfa1dad75a43cf5aa5678f014d24765ebff7b761498abfc795d3bb68359a73f8de98cb4ac115cb68da SHA512 1c132b87f03ca54887172e45c36e1d8c66d4f12a2a6a2da84e0d6cf3ac2cd2366193829fac0393837371bc1cd34215cd6318c9e7ea6c406c11d9f0dce28b3143
 EBUILD commons-logging-1.3.1.ebuild 5382 BLAKE2B a69f11a808fe5b093339d82ecce00de9f5912f618b9b74a2b4e8413f38553e257b5d29e63b5d596111a772e9f9966932bf48c42d21e9db26ab4101350c20f1d7 SHA512 6373f332e543b4d791f1a495b8bec95f8af6e88b18d0e256e855ab40ce1e27240f81c5d1f374b3f7c4fd11f8f92645ef22efcb6f7c29e5b5f07314eaede6208a
-EBUILD commons-logging-1.3.4-r1.ebuild 6611 BLAKE2B 09f76d62c0b18315c883ef29bb9adb2b8a53b4700117663cd75a459f97ac83ac81d2865f0af825c1f79a8402ee2fe81b49763baf3dd46a4e47fc76a1ac7aabc7 SHA512 84e68414e3b92856481a5992034fc6f4814297d1f5b1b5d0ec8389097b9d586118eec70ea241ef1e945262b4ac44a35d3a644f9c36415ca1974a0c9be9529670
+EBUILD commons-logging-1.3.4-r1.ebuild 6610 BLAKE2B 13536e9b4cc98d49ce24b2ae1607767d79912a11800ecd5dd8a2f14f90d586ea432c52845b2e9ff295bc4118c0d6185f4ededb9ba463adff62625ef9dc0226da SHA512 d7dcd907eee437fc9c8c8496f6b4024a6b253123d946dd55a4cdc2c39058c221e39847f6f112ba5f978ed9aa99e8cc8c422136b18c2c9cd2b8a06e444e192512
 MISC metadata.xml 549 BLAKE2B b20c8451a73329dbdb8aa88120543b948014115d754a84e8a77a8f61b9134277a7849fc10e35323c028a32d69f6e45702200e06af4481bf5238f5d848b3ccc03 SHA512 105c2bdf3eed380f11be1b8987a08fbcf1b6e6cbbb00c0e38e4813875865abd65c9be85267d5b49486913fdb0635b7329b5c4e84a86d9f93f9dcdad74c336ff0
diff --git a/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild b/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild
index 00830fe4cff1..f958347a176b 100644
--- a/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="log4j"
 
 # src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java:26:
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index da5881f30d16..ff44de2dcd74 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,8 +1,9 @@
+AUX mockito-2.28.2-fix-unused-stubbings-test.patch 1354 BLAKE2B 257240d42d22dbe9686d5bf219ecbdaf971789b8810b922d2fe96f49b17bd5aba2602e9b83f636014aa0bb9087aabe6798f27ee8d5561d0be7ff68eb8e0d492b SHA512 934e1026a76d66fe7cc9e9e0709cae40c454b9fc5d992ddd46e759a3b16b7e78af6dc1adf635e640d484bc8633fb1018b518e9139e42873a847201d7721cc185
 AUX mockito-2.28.2-skip-failing-tests.patch 2622 BLAKE2B 70862d1fe8376ad2514fa53c15e1f6e83dde17d7ff1a8a09701897d89b27ca6a339c532b2615436da727b10c8ec69a0fadda5c841ebb64be12fbd8e8ded6b5ad SHA512 646649ec712b958f02c862ee8d2a52259e5458812f838d9d2622544154c35270a5f5a731c8193850fc804ede87fde1a7d54abef8d4136b5619ac01664f9539e8
 DIST mockito-2.28.2.tar.gz 875085 BLAKE2B d0aab378c028530724156f999700506fe64f5bf19371dc9b957e34924d3d17b8191f093054c6dde4f5879d61ddf9614a60b1fd597aae09b92abf559c08fbcdf7 SHA512 9921fe9ffbdff4d7a9a8de56aa5078e68eb6bee38f379f58059dcc42da07a59b7e5953309d646e1fb760f7135f5076e201529370cc5df56d685f7acb08311ea5
 DIST mockito-4.11.0.tar.gz 1050218 BLAKE2B 7f7298e233c9cdb0b475aa201300a1063fd8efc587f3a4de0cb1caedd6f6506a32f8e9b0548fa5898892515ec96625153a1a2ad65fc8070b7dc6c254206fbbfd SHA512 b1de01c8e9b2fc4eef0013af562efeac7e22babdebbd8c7842ecd55071627e11c5e6ab575436990ea70d4ceefb56fc260333278c8d4b833e454956bf89841fc5
 DIST mockito-core-1.9.5-sources.jar 723074 BLAKE2B e553a923542a1a2574ee0cda5979d168cc3e9644dbbc9fceed2301ae1bac150c4e35dbc4432d50e2479efea2a6cd35ec19c62c3598f61709f1f5dc8959cc0155 SHA512 271e626c3b5be9a7d7c82a2f0bf44077aabd51924b0956a88633ace7fe8c134d8cd1f89ce348ce0d15ccce55a50027e303836d2d2f430500317b6136d308d3d4
 EBUILD mockito-1.9.5-r4.ebuild 712 BLAKE2B bbb94a982384032ed4e2fd38cb32be5feb2b3a7aa35ed054c62d73d5b2dbf8853b594cebfadfa49d3134f89131a4cd875ea0ebbac051c23e00d39378fbe11498 SHA512 34bdf3f6c8182307a41b28371c0e8406aea00e3f47184fde5097076c008992e6cf52341413ccedc003c3685f88d7b52d5aaee161632cec7bb909c1958f3be6b4
-EBUILD mockito-2.28.2.ebuild 3313 BLAKE2B bf834db7ad8f156b722c1b09c8253380c2963f0f90c779e7e06a0a3e0feeed485769783d4cf6d1895a4e4dc364f25b0cd3071d19607c3c30cd5bc4edb1067abb SHA512 b312547ec63abffac426e33386d7910de772d3aba5e11217d6439e80a46e42f57d43dd6dfd47330749e0b5bcccd5173cd875d45b19ba0daf7a1d9f87f0271e74
+EBUILD mockito-2.28.2.ebuild 3376 BLAKE2B eacb33f6976ae1665d984de0a811470335c9e2490bbb78459ed309b4557236d8dfaa140827028fcf110e9ffa28166084e75b898d571b1bf27d88eaa3f4ac5a2e SHA512 77b40fa3984e0fff77846365c21eb8306d6d81a2e8fa1e19f275258e25be764381a2f13d1a4232e1d14c6d97db733db8bd5e927766bd9136f9bd0d115bcb0f17
 EBUILD mockito-4.11.0.ebuild 1228 BLAKE2B 27c976b0ee2e782d471c91ef89708a62002c6e8a385ea67d865ff5430a34ec932146ee57493ce9684c7d566b1d9f1f54b709287bf0b2fb93b465b7596c641957 SHA512 189d3b3d14f847efce028a87c1706a26ded43f45e28299177bfb86f18d11398b2f03428ed48d9c4944cc277e199cb85424b0735a34fa78fbe82ab368bf7b119d
 MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b
diff --git a/dev-java/mockito/files/mockito-2.28.2-fix-unused-stubbings-test.patch b/dev-java/mockito/files/mockito-2.28.2-fix-unused-stubbings-test.patch
new file mode 100644
index 000000000000..7689b4e64f65
--- /dev/null
+++ b/dev-java/mockito/files/mockito-2.28.2-fix-unused-stubbings-test.patch
@@ -0,0 +1,14 @@
+--- a/src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java
++++ b/src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java
+@@ -53,7 +53,10 @@ public class UnusedStubbingsTest extends TestBase {
+                                     "[MockitoHint] 2. Unused -> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n",
+             "[MockitoHint] MyTest.myTestMethod (see javadoc for MockitoHint):\n" +  //Java 9
+                                     "[MockitoHint] 1. Unused -> at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" +
+-                                    "[MockitoHint] 2. Unused -> at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n"
++                                    "[MockitoHint] 2. Unused -> at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n",
++            "[MockitoHint] MyTest.myTestMethod (see javadoc for MockitoHint):\n" + //Java 21
++                                    "[MockitoHint] 1. Unused -> at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:0)\n" +
++                                    "[MockitoHint] 2. Unused -> at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:0)\n"
+         );
+     }
+ }
diff --git a/dev-java/mockito/mockito-2.28.2.ebuild b/dev-java/mockito/mockito-2.28.2.ebuild
index e4b9495c0ec1..92706ad5b55e 100644
--- a/dev-java/mockito/mockito-2.28.2.ebuild
+++ b/dev-java/mockito/mockito-2.28.2.ebuild
@@ -38,7 +38,10 @@ RDEPEND="
 "
 
 # see https://bugs.gentoo.org/903897
-PATCHES=( "${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch" )
+PATCHES=(
+	"${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch"
+	"${FILESDIR}/mockito-2.28.2-fix-unused-stubbings-test.patch"
+)
 
 JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
 JAVA_CLASSPATH_EXTRA="junit-4 opentest4j"
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index ecbe07b2309f..9e0b5ba78c0d 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -1,7 +1,4 @@
 DIST xz-java-1.10.zip 179204 BLAKE2B ffe19ed1de7370879bb5c3c3f777e367fff9868c5113a2920c02409e7ab7a325cd03d30ddd2bcc95e1509d2f38723e51eaf21b4aa767792e7a3c9850cd658e36 SHA512 be293545b9510906334ecbc092834599b36abe7498836ab111726a195fd4fc8731d2cb57109b51ac0de7d14da8b59fea7a48aaa2f5c61075b4b16c0e1d4f5579
 DIST xz-java-1.10.zip.sig 566 BLAKE2B 4a0e146f9a8ccffbf62d775b6d7c647611464fbf23fe0f0d9fa0f768487c642c1a9277b820af9ebdaeb9cefb3f5bf399a226000622838c81c02747b31158441b SHA512 e9bfe7eb28a6f9d8f7eb4c7620fc1598fe70c08a03fd2bfc5a1183110b0f8539704921f6224de352080cb3b6affb33163fd739503f4e8f279e06533445ebe8a6
-DIST xz-java-1.9.zip 155868 BLAKE2B e1e355e75b3d14cae9a12dd00105ff38e25ab9c270cecafc83f27a7a03b36aa7a33647b40b7458b3592319a2b574e10cef9786413f0a12af585199a8f00731de SHA512 743f81ac715d7ac2760af8cee4c62d8fbeef156c0d3e0e85e4605ae08d6a71d1e6f6675e0558e7906a92d5fb3ca1feab9db015a1d42b5df73de2dec770a339cb
-DIST xz-java-1.9.zip.sig 566 BLAKE2B 9702fa3021c4274aacc74ef84903429ed5301eac11cae6bf79014a5bad590c51b169c35f64add85c964cb815129acf920a014e5601acfcd075147f5fb8e9df1e SHA512 5f511260da0f5a9338106ac56511b7a105996852103a3f40cc4a44a7e4e03dc39a645bb0a57ae99bcde8267d5a2d514a7c956a8bfe226c0472e1fa3c7d28e3d5
-EBUILD xz-java-1.10.ebuild 1424 BLAKE2B f663a2aea5f2a49255ceb42b8f29583a903af493cbbd88b3619888221604c0ced5f909f6c3168d83e1d5034c95d8815e82b6d5616a0bf4e535efe7171c80beea SHA512 8d160ceb6508e0d57b01ff96149ffccf5961507da69771e09978afa6724e525a449fe8ffbe0e513912d551f60c46205773e8db7739c1d6ba248d62f8badebe05
-EBUILD xz-java-1.9-r2.ebuild 957 BLAKE2B e5567a19d30742138ebb224d89ffd3f8f5fb73e58a0aa58c03fbd8e9dc45dd25d9346c86d165641d873f643291f66395d969b292f6dc5afc43d8a66436b685c5 SHA512 876d10b161b30db2476a53502624ff19f28e545a2473eae77dbc5a4c6b8178e7cc045889afb92bf39c6a1af9eecedd3a61c95f54d37dbba9f68a4e3cc2c8e7d4
+EBUILD xz-java-1.10.ebuild 1423 BLAKE2B 232b08006b1374a2cbef0de2312add7514ee8a63832072aff729c020f1e664adb89b9d2926fdd5c488dd0cc771d8c82a94a0b49480eaab8d1b5864744279ac58 SHA512 01070a5fdd6705c3ead06afbf1fad9eae789751e7f3cd94a3c84a6b933535afbef0562c5b6d35aaa8db0fc607bd3ffc6dde0cccd5e6df589b4f82d72317dba90
 MISC metadata.xml 325 BLAKE2B e4efc81efa3a0ff3f09af74b2c1ae0250b47d94806e3162b2e1d1250a1a34d29d139ea45f42f536f3a86bd1021ae518e847064c1b5e34139427dd3146ac5a033 SHA512 867c7a2b17ad020b9640dc8e85bc9263fb2d80d5d1168cc911f9eac49bbd4a757fe899b0e60b6e6bc845c6cb2a3b0fea585aba4d7046ae9e51bf3c55e5de0559
diff --git a/dev-java/xz-java/xz-java-1.10.ebuild b/dev-java/xz-java/xz-java-1.10.ebuild
index 96ae3db88b29..12039a592e2e 100644
--- a/dev-java/xz-java/xz-java-1.10.ebuild
+++ b/dev-java/xz-java/xz-java-1.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xz-java/xz-java-1.9-r2.ebuild b/dev-java/xz-java/xz-java-1.9-r2.ebuild
deleted file mode 100644
index fbd9a461e6ca..000000000000
--- a/dev-java/xz-java/xz-java-1.9-r2.ebuild
+++ /dev/null
@@ -1,44 +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"
-MAVEN_ID="org.tukaani:xz:1.9"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Implementation of xz data compression in pure java"
-HOMEPAGE="https://tukaani.org/xz/java.html"
-SRC_URI="https://tukaani.org/xz/${P}.zip
-	verify-sig? ( https://tukaani.org/xz/${P}.zip.sig )"
-S="${WORKDIR}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-BDEPEND="
-	app-arch/unzip
-	verify-sig? ( sec-keys/openpgp-keys-lassecollin )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lassecollin.asc"
-
-JAVA_SRC_DIR="src9"
-
-DOCS=( README NEWS COPYING THANKS )
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mv src{,9}/org || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples src/*Demo.java
-	einstalldocs
-}