From 8b24419ee13216f855c502d6c6fca6ec5e1328a5 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Thu, 16 Oct 2025 18:58:33 +0200 Subject: [PATCH] dev-java/mockito: prevent hamcrest-core on classpath MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid a compilation error 'module * reads package org.hamcrest from both org.hamcrest and hamcrest.core' when junit:5 was compiled with the 'vintage' USE flag. Closes: https://bugs.gentoo.org/963753 Signed-off-by: Volkmar W. Pogatzki Part-of: https://github.com/gentoo/gentoo/pull/44205 Closes: https://github.com/gentoo/gentoo/pull/44205 Signed-off-by: Miroslav Šulc --- .../{mockito-5.20.0.ebuild => mockito-5.20.0-r1.ebuild} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename dev-java/mockito/{mockito-5.20.0.ebuild => mockito-5.20.0-r1.ebuild} (93%) diff --git a/dev-java/mockito/mockito-5.20.0.ebuild b/dev-java/mockito/mockito-5.20.0-r1.ebuild similarity index 93% rename from dev-java/mockito/mockito-5.20.0.ebuild rename to dev-java/mockito/mockito-5.20.0-r1.ebuild index d01db40fab88..a3bdf8eac4ac 100644 --- a/dev-java/mockito/mockito-5.20.0.ebuild +++ b/dev-java/mockito/mockito-5.20.0-r1.ebuild @@ -18,6 +18,7 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" + >=dev-java/apiguardian-api-1.1.2-r1:0 >=dev-java/asm-9.8-r1:0 >=dev-java/byte-buddy-1.17.7:0 >=dev-java/hamcrest-3.0:0 @@ -39,13 +40,14 @@ DEPEND=" # symbol: class var RDEPEND=">=virtual/jre-11:*" -JAVA_CLASSPATH_EXTRA="asm byte-buddy hamcrest jna jsr305 junit-5 objenesis opentest4j" +JAVA_CLASSPATH_EXTRA="apiguardian-api asm byte-buddy hamcrest jna jsr305 objenesis opentest4j" JAVA_TEST_SRC_DIR="mockito-core/src/test/java" src_prepare() { java-pkg-2_src_prepare - # junit:4 --with-dependencies seems to pull another hamcrest into classpath. + # prevent junit:{4,5} to pull hamcrest-core on classpath JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjars --build-only junit-4)" + JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only junit-5)" # dev-java/byte-buddy is built from byte-buddy-dep without shaded stuff. sed \