gentoo auto-resync : 09:03:2023 - 12:02:14

7 files changed, 9 insertions, 20 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4590391b2422..eef3908ed0f0 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest
index c0826d1898fd..d0ff14eb103e 100644
--- a/dev-java/hamcrest/Manifest
+++ b/dev-java/hamcrest/Manifest
@@ -1,4 +1,4 @@
 AUX hamcrest-2.2-java-11.patch 6356 BLAKE2B 4950e452b7e785e575db862902c2deda6fd46575de46e5d429df116e642c9e95077a710f3e74069ec39d6eba177c498580cd81ac398a7f1395b6a9e278dcbf17 SHA512 d8240e2be33bb7594b570da8224f149ddbc36e55249b9e4ced0d03e2851d781a34b1763b8022b59345b90c0033f25c0d4a8a4e03b124abf08c183b30aa8eb556
 DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a
-EBUILD hamcrest-2.2.ebuild 1184 BLAKE2B 5a9bcc2e9ad572cb328f0b1f350c06854162d6b965af673122f619c25b267f697d11b767758afc83f458b2d2b985f648b669d83487ef5eb939fb18d391511152 SHA512 e7eb28035804cba51ef39b2c92676d9ed25b7775a24d7f07fa3616a3c4a350a2bee17ad359d1e63aed3104b4768f92f9a5bede86e2f5e4d21a0658639f1aab2f
+EBUILD hamcrest-2.2-r1.ebuild 912 BLAKE2B c4efa76a1c6b935fd6abdc4bdcec98e1f5bde829aa6316b8fca97c7898f28d05acc22cb34f5affec327fcc5410551c3ef196f0fb6280f028f4adf7df400ed9ae SHA512 81a189bab441d2593cfa2091acdbc4a905ed080f5b86fb505b58c4f565be157c3b124e6b73c9804cf0c47887301a75ee5b1738e077accfec62af94bbe41efef5
 MISC metadata.xml 303 BLAKE2B b415b83e9cd87ea6d0c58b8096930a08d4f3732068be492e201820cfef6599045327972bdc36d5936fc2f04c49b5c82c16b64b808edc882f863047989c94256e SHA512 97de5ee8a7aa583829434d5768522c3d73cebbc70a44874cafc87f0827d595d01b6b545b9709ec24f034e3c62527627828c6c0b0ac158cc6a7c4a633bb26748f
diff --git a/dev-java/hamcrest/hamcrest-2.2.ebuild b/dev-java/hamcrest/hamcrest-2.2-r1.ebuild
index 8660d4f26194..401f297eddd3 100644
--- a/dev-java/hamcrest/hamcrest-2.2.ebuild
+++ b/dev-java/hamcrest/hamcrest-2.2-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom hamcrest-2.2.pom --download-uri https://github.com/hamcrest/JavaHamcrest/archive/v2.2.tar.gz --slot 0 --keywords "~amd64" --ebuild hamcrest-2.2.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -13,8 +10,9 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Core API and libraries of hamcrest matcher framework."
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
 SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/JavaHamcrest-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -32,8 +30,7 @@ PATCHES=( "${FILESDIR}"/hamcrest-2.2-java-11.patch )
 
 DOCS=( {CHANGES,README}.md )
 
-S="${WORKDIR}/JavaHamcrest-${PV}"
-
+JAVA_AUTOMATIC_MODULE_NAME="org.hamcrest"
 JAVA_SRC_DIR="hamcrest/src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="hamcrest/src/test/java"
@@ -42,8 +39,3 @@ src_prepare() {
 	default
 	java-pkg-2_src_prepare
 }
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 0b4d5ba3b2e4..3e12dc3fc319 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,5 +1,5 @@
 DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
 EBUILD junit-3.8.2-r2.ebuild 842 BLAKE2B 01cc39cca58291852a2bd71b97283ce344656648c741792013e7daaf50cccad14551e4d0885d9fa4c3dfe52cfccd18c0943a55c0d479cd49b1d182eaa8252f75 SHA512 25a498140852340c429d965b8770a1844fdcff906164fcdf873e32cd303871b446d80d88fef2772c765254c7396fdd6a3688e9b253f04cf02c289c5a85e99ebe
-EBUILD junit-4.13.2.ebuild 1982 BLAKE2B eed71c56ec37e6ab4e248594e8a8692fc9fb9199f72a62c478cb4c4d7f2ac274f7f4bab6f8e3bda64fa377411d2689e810f470623e225769ab27477ccecc1fc8 SHA512 81b57201f7c6c9909aa3b1d26e644d288bbc2a1b2930c18ea6010691957004915d4d9d8dfb34cbc3d4fdd4e2fa475ae5f18c044cfb1d03cf3857c37e32d39e5d
+EBUILD junit-4.13.2.ebuild 1982 BLAKE2B 36fb397f0cad9ab1553e56736038cdc8503ed90fa414155337f0a7ffb90b014b01c4b11ae553df1f013f906b767500451f6fa0c20617ac933c3a27579b9c07d7 SHA512 4412a06609d3b35ccb6261ef6f398d9fd6a0147c8448d12caa7547e9d8536c2bf212cf4ef208f45466370a0d13dd155f4f4166092cd76af13c5ed9fd23597e21
 MISC metadata.xml 369 BLAKE2B d22798c3ef0deeb9a6ca453bf3777a755aeab5e77b733502b802610cd1203db31121bbe93bbbc2c565e45fca350294e54ee7e00e00b07420176df55728b2095a SHA512 343f2067945c5398dc2a7c643ac84d25344c8ea6287a697ba0246d53b797e03b4ceee2576b4b4b568347087b58de00e2913880ad347c92d4c43eb951760848b2
diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild
index 507d4c051dd5..d6441a248c00 100644
--- a/dev-java/junit/junit-4.13.2.ebuild
+++ b/dev-java/junit/junit-4.13.2.ebuild
@@ -12,7 +12,7 @@ MAVEN_ID="junit:junit:4.13.2"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Simple framework to write repeatable tests"
-HOMEPAGE="https://junit.org/junit5/"
+HOMEPAGE="https://junit.org/junit4/"
 SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="EPL-1.0"
diff --git a/dev-java/picocli/Manifest b/dev-java/picocli/Manifest
index a2f473984ea2..0c320009f2e7 100644
--- a/dev-java/picocli/Manifest
+++ b/dev-java/picocli/Manifest
@@ -1,3 +1,3 @@
 DIST picocli-4.6.3-sources.tar.gz 56087383 BLAKE2B ce9aaada241358fd570332696b1ac529a9a1e300911aaf2e1f927a94a44a3e38cae96df3d99a7a7e287fb48d429097624004b4ddd792ba564cc9c67ec975d9e0 SHA512 34b8388c6cf268799f06d465aa06e8d5c39c2673806cdfa1b346dac4aaf32ae5b033ae975333b7401bb79c77c4e34b9b932f8699344d6cc00f35a00c1b7bc504
-EBUILD picocli-4.6.3-r1.ebuild 1289 BLAKE2B 03b722e6310baade57f76d0e9d327503847865010414ca72a21997f540fc11b4bff85940d1f3f20be24cd7d67d99d3e8063feefba2e99ab1eae56f37750d3410 SHA512 ddc48dea62cef2c708497fac3d9d60ebd8d258981d36cefbaff5f4e31aaddc10b0870a0d6ec532d1acad86d3265b42f62d5b9fb0673b921db8c225de2c23c2ca
+EBUILD picocli-4.6.3-r1.ebuild 1049 BLAKE2B 826d3e51d8cae503ea6fc6d473e610c145f10a99bb1801443ade1c9204ff4e86aa7b54ad6506efa7a9d93a64e9f80a96dad5d0d5c0ccc315174800908c9cf94a SHA512 a9fd05e2b46f903bedb83d759933defeb887188f04d68a6cefc435ad768652c928609843d397aa8a2a0238c315e9e0b26f17713c397d1dc127dffae6519ff59d
 MISC metadata.xml 701 BLAKE2B 67e85243551f69c831b4a91807a5dc0661da92e2e7c21fcb8fc9936dd047defa9382d659b7910d5929e193a0a97397c1bf7f8a4d20c86ce46185f5fec4ec15c7 SHA512 6c6056c3e204886ccdc9c6ca28911cf6a5e3cf64e1830fc5c3acca736d28f4c050dba5d1a4ae4bab6c3ae48ae3e34d6b3187d695b2275d20bfb2722bfea753a6
diff --git a/dev-java/picocli/picocli-4.6.3-r1.ebuild b/dev-java/picocli/picocli-4.6.3-r1.ebuild
index 98e5a9c62a30..d4ce6e528166 100644
--- a/dev-java/picocli/picocli-4.6.3-r1.ebuild
+++ b/dev-java/picocli/picocli-4.6.3-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/remkop/picocli/archive/refs/tags/v4.6.3.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild picocli-4.6.3.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"