commit: 609aa3dbf9f2fe5ef5e2439700ccc89c8e3d1889 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Sep 17 07:09:55 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 16:31:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=609aa3db
*/*: ~dev-java/mockito-1.9.5 SLOT="0" -> SLOT="1" Changes SLOT="0" -> SLOT="1" for ~dev-java/mockito-1.9.5. SLOT="0" will be used for new mockito-5.19.0. Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/43824 Signed-off-by: Sam James <sam <AT> gentoo.org> ...-framework-7.0.5-r2.ebuild => felix-framework-7.0.5-r3.ebuild} | 8 ++++---- ...ix-resolver-2.0.4-r1.ebuild => felix-resolver-2.0.4-r2.ebuild} | 6 +++--- ...nt-4.5.13-r2.ebuild => httpcomponents-client-4.5.13-r3.ebuild} | 6 +++--- .../{httpcore-4.4.14-r1.ebuild => httpcore-4.4.14-r2.ebuild} | 6 +++--- .../{jtwig-core-5.87.0.ebuild => jtwig-core-5.87.0-r1.ebuild} | 6 +++--- ...reflection-5.87.0.ebuild => jtwig-reflection-5.87.0-r1.ebuild} | 6 +++--- .../mockito/{mockito-1.9.5-r4.ebuild => mockito-1.9.5-r5.ebuild} | 4 ++-- dev-java/qdox/{qdox-2.0.1.ebuild => qdox-2.0.1-r1.ebuild} | 6 +++--- .../{freenet-0.7.5_p1501.ebuild => freenet-0.7.5_p1501-r1.ebuild} | 4 ++-- .../{freenet-0.7.5_p1503.ebuild => freenet-0.7.5_p1503-r1.ebuild} | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild b/dev-java/felix-framework/felix-framework-7.0.5-r3.ebuild similarity index 95% rename from dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild rename to dev-java/felix-framework/felix-framework-7.0.5-r3.ebuild index 2a9511a9f70e..b5626b0a6fc4 100644 --- a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild +++ b/dev-java/felix-framework/felix-framework-7.0.5-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,9 +26,9 @@ DEPEND="${CP_DEPEND} dev-java/osgi-annotation:0 >=virtual/jdk-11:* test? ( - dev-java/asm:9 + dev-java/asm:0 dev-java/easymock:2.5 - dev-java/mockito:0 + dev-java/mockito:1 )" RDEPEND="${CP_DEPEND} @@ -41,7 +41,7 @@ JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation" JAVA_SRC_DIR="src/main/java" JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_TEST_GENTOO_CLASSPATH="asm-9,junit-4,easymock-2.5,mockito" +JAVA_TEST_GENTOO_CLASSPATH="asm,junit-4,easymock-2.5,mockito-1" JAVA_TEST_SRC_DIR="src/test/java" src_prepare() { diff --git a/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild b/dev-java/felix-resolver/felix-resolver-2.0.4-r2.ebuild similarity index 93% rename from dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild rename to dev-java/felix-resolver/felix-resolver-2.0.4-r2.ebuild index 4dca801b9b68..ac5af152bdb5 100644 --- a/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild +++ b/dev-java/felix-resolver/felix-resolver-2.0.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -28,7 +28,7 @@ DEPEND=" ${CP_DEPEND} test? ( dev-java/felix-utils:0 - dev-java/mockito:0 + dev-java/mockito:1 ) " @@ -46,7 +46,7 @@ S="${WORKDIR}/org.apache.felix.resolver-${PV}" JAVA_RESOURCE_DIRS="src/main/resources" JAVA_SRC_DIR="src/main/java" -JAVA_TEST_GENTOO_CLASSPATH="felix-utils,junit-4,mockito" +JAVA_TEST_GENTOO_CLASSPATH="felix-utils,junit-4,mockito-1" JAVA_TEST_RESOURCE_DIRS="src/test/resources" JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r3.ebuild similarity index 93% rename from dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild rename to dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r3.ebuild index 58857b3d2332..225c88505c15 100644 --- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild +++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -32,7 +32,7 @@ DEPEND="${CDEPEND} >=virtual/jdk-1.8:* test? ( dev-java/hamcrest-core:1.3 - dev-java/mockito:0 + dev-java/mockito:1 )" RDEPEND="${CDEPEND} @@ -47,7 +47,7 @@ JAVA_SRC_DIR=( ) JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3" +JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-1,hamcrest-core-1.3" JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" diff --git a/dev-java/httpcore/httpcore-4.4.14-r1.ebuild b/dev-java/httpcore/httpcore-4.4.14-r2.ebuild similarity index 93% rename from dev-java/httpcore/httpcore-4.4.14-r1.ebuild rename to dev-java/httpcore/httpcore-4.4.14-r2.ebuild index 8fc95ded1c04..348839c3df25 100644 --- a/dev-java/httpcore/httpcore-4.4.14-r1.ebuild +++ b/dev-java/httpcore/httpcore-4.4.14-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,7 +26,7 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-httpcore )" DEPEND=">=virtual/jdk-1.8:* test? ( dev-java/commons-logging:0 - dev-java/mockito:0 + dev-java/mockito:1 )" RDEPEND=">=virtual/jre-1.8:*" @@ -39,7 +39,7 @@ JAVA_SRC_DIR=( ) JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito" +JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito-1" JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" diff --git a/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild b/dev-java/jtwig-core/jtwig-core-5.87.0-r1.ebuild similarity index 94% rename from dev-java/jtwig-core/jtwig-core-5.87.0.ebuild rename to dev-java/jtwig-core/jtwig-core-5.87.0-r1.ebuild index 4f96b964098c..ec35a50e8de1 100644 --- a/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild +++ b/dev-java/jtwig-core/jtwig-core-5.87.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -34,7 +34,7 @@ DEPEND=" dev-java/commons-io:1 dev-java/commons-lang:3.6 dev-java/hamcrest:0 - dev-java/mockito:0 + dev-java/mockito:1 ) " @@ -58,7 +58,7 @@ JAVA_TEST_GENTOO_CLASSPATH=" commons-lang-3.6 hamcrest junit-4 - mockito + mockito-1 " JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" diff --git a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0-r1.ebuild similarity index 95% rename from dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild rename to dev-java/jtwig-reflection/jtwig-reflection-5.87.0-r1.ebuild index 44b9944c3e77..659b095e5e60 100644 --- a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild +++ b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,7 +26,7 @@ DEPEND=" test? ( dev-java/commons-io:1 dev-java/hamcrest:0 - dev-java/mockito:0 + dev-java/mockito:1 ) " @@ -52,7 +52,7 @@ JAVA_TEST_GENTOO_CLASSPATH=" commons-io-1 hamcrest junit-4 - mockito + mockito-1 " JAVA_TEST_SRC_DIR="src/test/java" diff --git a/dev-java/mockito/mockito-1.9.5-r4.ebuild b/dev-java/mockito/mockito-1.9.5-r5.ebuild similarity index 93% rename from dev-java/mockito/mockito-1.9.5-r4.ebuild rename to dev-java/mockito/mockito-1.9.5-r5.ebuild index c84fa46afec3..ba2784002595 100644 --- a/dev-java/mockito/mockito-1.9.5-r4.ebuild +++ b/dev-java/mockito/mockito-1.9.5-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/mockito/mockito"; SRC_URI="https://repo1.maven.org/maven2/org/mockito/mockito-core/${PV}/mockito-core-${PV}-sources.jar"; LICENSE="MIT" -SLOT="0" +SLOT="1" KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" diff --git a/dev-java/qdox/qdox-2.0.1.ebuild b/dev-java/qdox/qdox-2.0.1-r1.ebuild similarity index 97% rename from dev-java/qdox/qdox-2.0.1.ebuild rename to dev-java/qdox/qdox-2.0.1-r1.ebuild index 23f8bc254323..9ea83d0c6388 100644 --- a/dev-java/qdox/qdox-2.0.1.ebuild +++ b/dev-java/qdox/qdox-2.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ DEPEND=" >=virtual/jdk-1.8:* test? ( dev-java/junit:4 - dev-java/mockito:0 + dev-java/mockito:1 ) " RDEPEND=">=virtual/jre-1.8:*" @@ -37,7 +37,7 @@ JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" JAVA_TEST_GENTOO_CLASSPATH=" junit-4 - mockito + mockito-1 " src_compile() { diff --git a/net-p2p/freenet/freenet-0.7.5_p1501.ebuild b/net-p2p/freenet/freenet-0.7.5_p1501-r1.ebuild similarity index 99% rename from net-p2p/freenet/freenet-0.7.5_p1501.ebuild rename to net-p2p/freenet/freenet-0.7.5_p1501-r1.ebuild index 685f7131e2a3..84416a59a737 100644 --- a/net-p2p/freenet/freenet-0.7.5_p1501.ebuild +++ b/net-p2p/freenet/freenet-0.7.5_p1501-r1.ebuild @@ -44,7 +44,7 @@ DEPEND=" ${CP_DEPEND} test? ( dev-java/hamcrest:0 - dev-java/mockito:0 + dev-java/mockito:1 dev-java/objenesis:0 net-libs/NativeThread:0 ) @@ -83,7 +83,7 @@ JAVA_SRC_DIR="src" JAVA_TEST_GENTOO_CLASSPATH=" hamcrest junit-4 - mockito + mockito-1 objenesis " # Yes, both variables point to the same directory diff --git a/net-p2p/freenet/freenet-0.7.5_p1503.ebuild b/net-p2p/freenet/freenet-0.7.5_p1503-r1.ebuild similarity index 98% rename from net-p2p/freenet/freenet-0.7.5_p1503.ebuild rename to net-p2p/freenet/freenet-0.7.5_p1503-r1.ebuild index 91863aa0c949..10c10d9c2e66 100644 --- a/net-p2p/freenet/freenet-0.7.5_p1503.ebuild +++ b/net-p2p/freenet/freenet-0.7.5_p1503-r1.ebuild @@ -45,7 +45,7 @@ DEPEND=" ${CP_DEPEND} test? ( dev-java/hamcrest:0 - dev-java/mockito:0 + dev-java/mockito:1 dev-java/objenesis:0 ) " @@ -76,7 +76,7 @@ PATCHES=( "${FILESDIR}/freenet-0.7.5_p1503-ignore-failing-tests.patch" ) JAVA_CLASSPATH_EXTRA="java-service-wrapper,unbescape" JAVA_RESOURCE_DIRS="res" JAVA_SRC_DIR="src" -JAVA_TEST_GENTOO_CLASSPATH="hamcrest,junit-4,mockito,objenesis" +JAVA_TEST_GENTOO_CLASSPATH="hamcrest,junit-4,mockito-1,objenesis" # Yes, both variables point to the same directory # https://github.com/hyphanet/fred/blob/build01497/build.gradle#L169-L173
