gentoo auto-resync : 12:05:2024 - 00:01:15

3 files changed, 2 insertions, 50 deletions

diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 1f38e20550e0..b8b76160528f 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,13 +1,11 @@
 AUX junit-4.13.2_p20240222-ignore-failing-test.patch 5184 BLAKE2B d846ac9599216bd9486a26082029dea6a1f1e252f8b023c3e553cc6586365a582b78e20d3a305b7d911ad6a9bd8206057f7ad617e18103c050dd19f46f6c7031 SHA512 bb1f1c13b128fd2a178d58be02b3cc206b030ea421815309dcca3dbed33e529733576e4db0ed5d44d1126ffd077bdad8b9b4cb96d980f8b42d394a32c90d50f6
-DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
 DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1
 DIST junit-5.10.2.tar.gz 2942035 BLAKE2B 4880df74b7cbf23acd34c716f9fce26edd28b31c14d720e129e9e1f06aa35b70c447a0d87904e083a54663fba17e0b2b470678dc32480e0a11c5ebf46d5fe38e SHA512 c36ff7c2bd21f9a64c93b836fc1017a8a96ebcc0079cf1d95b09f5b764435178c2dc2336f2493e7e4df561013693dce4f08dfe0cf3bd76cc9b820313f64d064f
 DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
 DIST junit5-java18-compatibility.patch 742 BLAKE2B 89bfa36330278cdee2f7f66ed5527895e650a7b490d3f3695772a27541be1d8383c1742bab4e8494f3a84c29f93f553880a3bd5cd4d84792cf662fbc33a6e594 SHA512 5a9a562eb61a875764da369ff40da6ff95c6de8b3b3ecb612634112076741d75d6eab385743843b4fe7ca8a1827960e06550f6e90c8b7ef75b55006b41c416cd
 EBUILD junit-3.8.2-r2.ebuild 802 BLAKE2B dd3ad766b9070457499af970d037ed6c5e96208a609d68149c37f348e4d678d950b963e62f54e655a4930b77c09048394da85821d0de2886f28a6693cab23486 SHA512 0e21cbde4dd60723044e9fcfd01ef5991fc62bdcc186e05e86c4fe4a0e04ddb038aaa16b130eeacf1d23b37e4ef3e16e0051e6bb1d40748c66b69ce3ad335755
-EBUILD junit-4.13.2-r1.ebuild 1372 BLAKE2B 1a355c8f614a9960caf4730bed58545b5ee7cc7d94ffe5f5331d1d4b22fb090ce6bed7565ad61c9086150835ccdff24ee17daf6b8da7cee41671c7631534b466 SHA512 81c8dec8a28df07f9e726bc81b28c9c9c4819e4c27cfd43cb4d24326f4f721baa25adaebc99a59fe1758be4f7fd0a0ff1efbf4fe13901a000780206b052ff474
-EBUILD junit-4.13.2_p20240222.ebuild 1544 BLAKE2B bcd585a30d369b48358f32f65fa9926f1504a24386131e01f5a67cf4eb6c19f181eaa5216835a4a969f9c1416a4760e6d5c753c448d7f06365c8f97b494ba44d SHA512 ee171e4b3588ea585744067222bd52ba69a3ebc91f4a37d4c0dc41c623a6b2501f9573da8829dbd6d5f4620369c27491758990be78084e4f4d590db9b658c214
+EBUILD junit-4.13.2_p20240222.ebuild 1540 BLAKE2B 7f740473dfb9d3bb5555dddcbc7569e39f431bffc712f9640b57dd1cb48027e1a39d13e8d2c3063df94ac198d91562804572a82f1c77737796f33e2014db424a SHA512 7c527ec394a595e9e320216f76ef1e301f941e473d7b354c8c7bd735e6f94a060196761d5d24149e44833772dfdd68d626ad9603bd0770aca2b80e655d5e0915
 EBUILD junit-5.10.2.ebuild 12399 BLAKE2B b8d9b3b79f8250d4090afbd623db3312995232600079b19a3a9a0758079f7e17dd22bf244cf708d1d1b90a7ce07cd3433c74190bee671454b9de6c8a8c2dcd0e SHA512 a9850156900fb50ed8b11ea9cea32931997766a43e220f97cd2d97bcf2512375293e24bb375e0fa0f5842901997e55215c7bc4c3fe662750f9e26b4b5059c58b
 EBUILD junit-5.9.2.ebuild 12008 BLAKE2B 1fa16dfc90e0e5327d6c0f0878b9fbcc82a7c5893e5bc6d02e8efb8e1eb7a0b58dba867ee4648bc45f47a27dcc72c3ae1fd38666f6196c610ee3129c820bad95 SHA512 96efdd8f81036253b3990aee756be23394611acf52101aee929e837648bfbbe3358e5d1d97985c45044690e2a98b32624dde122d9e46f264c6a154c654b67798
 MISC metadata.xml 894 BLAKE2B d0f5c989f8a49dc923dfaf51a7d42d6fdc79a9c2cccd48cd31e687bcc5b7d7f25b15f1e7f91ebfe8f87cc15ce11b37c95e06dcf17611b03066f2b079efc6624b SHA512 7d40683565d1e4ff8ceb183fa26d8d6e3ae77dc1f7335a6ea452589f0f794bae8479a9e97c257a7d2332f3fa83b6721b334557944a4f0d6d064b66e0bcda9bd1
diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild
deleted file mode 100644
index 0fa825c0272c..000000000000
--- a/dev-java/junit/junit-4.13.2-r1.ebuild
+++ /dev/null
@@ -1,46 +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="junit:junit:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-HOMEPAGE="https://junit.org/junit4/"
-SRC_URI="https://github.com/${PN}-team/${PN}4/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}4-r${PV}"
-
-LICENSE="EPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CP_DEPEND="dev-java/hamcrest-core:1.3"
-# not suitable for jdk:21 #916398
-DEPEND="${CP_DEPEND}
-	<=virtual/jdk-17:*
-	test? ( dev-java/hamcrest-library:1.3 )"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="junit"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_test() {
-	cd "${JAVA_TEST_SRC_DIR}" || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	# pom.xml lines 264-268
-	java -cp "${CP}" -Djava.awt.headless=true \
-		org.junit.runner.JUnitCore org.junit.tests.AllTests || die "Running junit failed"
-}
diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild
index 3ca8e79546cc..6a2ce43fc405 100644
--- a/dev-java/junit/junit-4.13.2_p20240222.ebuild
+++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}4-${MY_COMMIT}"
 
 LICENSE="EPL-1.0"
 SLOT="4"
-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"
 
 CP_DEPEND="dev-java/hamcrest-core:1.3"
 DEPEND="${CP_DEPEND}