commit: 2d0d28a68f7a9bef6808fafa4146f453dc3538d4 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Oct 18 16:20:12 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Oct 19 18:12:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0d28a6
dev-java/*: ~dev-java/jackson-* SLOT="0" -> SLOT="1" Changes slot to SLOT="1" for all 'dev-java/jackson-*' packages and for 'dev-java/snakeyaml'. SLOT="0" will be used for new versions. Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/44063 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/bnd/{bnd-7.1.0-r2.ebuild => bnd-7.1.0-r3.ebuild} | 2 +- ...-2.13.4.ebuild => jackson-annotations-2.13.4-r1.ebuild} | 4 ++-- ...on-core-2.13.4.ebuild => jackson-core-2.13.4-r1.ebuild} | 4 ++-- ...2.13.4.1.ebuild => jackson-databind-2.13.4.1-r1.ebuild} | 8 ++++---- ...4-r1.ebuild => jackson-dataformat-xml-2.13.4-r2.ebuild} | 14 +++++++------- ...-r1.ebuild => jackson-dataformat-yaml-2.13.4-r2.ebuild} | 12 ++++++------ ...ild => jackson-module-jakarta-xmlbind-2.13.4-r2.ebuild} | 10 +++++----- .../{jcommander-1.82.ebuild => jcommander-1.82-r1.ebuild} | 6 +++--- .../{json-path-2.9.0.ebuild => json-path-2.9.0-r1.ebuild} | 2 +- ...-pioneer-1.9.1.ebuild => junit-pioneer-1.9.1-r1.ebuild} | 4 ++-- ...j-core-2.19.0-r1.ebuild => log4j-core-2.19.0-r2.ebuild} | 10 +++++----- ...f-java-4.32.1.ebuild => protobuf-java-4.32.1-r1.ebuild} | 6 +++--- .../{snakeyaml-1.33.ebuild => snakeyaml-1.33-r1.ebuild} | 4 ++-- .../{testng-6.11-r1.ebuild => testng-6.11-r3.ebuild} | 2 +- .../{testng-6.11-r2.ebuild => testng-6.11-r4.ebuild} | 2 +- ...or-1.18.ebuild => testparameterinjector-1.18-r1.ebuild} | 6 +++--- profiles/base/package.use.mask | 2 +- 17 files changed, 49 insertions(+), 49 deletions(-) diff --git a/dev-java/bnd/bnd-7.1.0-r2.ebuild b/dev-java/bnd/bnd-7.1.0-r3.ebuild similarity index 99% rename from dev-java/bnd/bnd-7.1.0-r2.ebuild rename to dev-java/bnd/bnd-7.1.0-r3.ebuild index cddf68c90f4d..d8b6f75976c4 100644 --- a/dev-java/bnd/bnd-7.1.0-r2.ebuild +++ b/dev-java/bnd/bnd-7.1.0-r3.ebuild @@ -30,7 +30,7 @@ CP_DEPEND=" dev-java/osgi-cmpn:8 dev-java/osgi-core:0 dev-java/slf4j-simple:0 - dev-java/snakeyaml:0 + dev-java/snakeyaml:1 dev-java/xz-java:0 " diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.4-r1.ebuild similarity index 96% rename from dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild rename to dev-java/jackson-annotations/jackson-annotations-2.13.4-r1.ebuild index cb9faac05f7e..deb21136a988 100644 --- a/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild +++ b/dev-java/jackson-annotations/jackson-annotations-2.13.4-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 # Skeleton command: @@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/FasterXML/jackson-annotations"; SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"; LICENSE="Apache-2.0" -SLOT="2" +SLOT="1" KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" diff --git a/dev-java/jackson-core/jackson-core-2.13.4.ebuild b/dev-java/jackson-core/jackson-core-2.13.4-r1.ebuild similarity index 97% rename from dev-java/jackson-core/jackson-core-2.13.4.ebuild rename to dev-java/jackson-core/jackson-core-2.13.4-r1.ebuild index 237b13f1d151..f40e4981d7ed 100644 --- a/dev-java/jackson-core/jackson-core-2.13.4.ebuild +++ b/dev-java/jackson-core/jackson-core-2.13.4-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 # Skeleton command: @@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/FasterXML/jackson-core"; SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"; LICENSE="Apache-2.0" -SLOT="0" +SLOT="1" KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" diff --git a/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.4.1-r1.ebuild similarity index 95% rename from dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild rename to dev-java/jackson-databind/jackson-databind-2.13.4.1-r1.ebuild index 8e6624f019b3..7e42b056aad8 100644 --- a/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild +++ b/dev-java/jackson-databind/jackson-databind-2.13.4.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 # Skeleton command: @@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/FasterXML/jackson-databind"; SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"; LICENSE="Apache-2.0" -SLOT="0" +SLOT="1" KEYWORDS="amd64 arm64 ppc64" # Common dependencies @@ -27,8 +27,8 @@ KEYWORDS="amd64 arm64 ppc64" # com.fasterxml.jackson.core:jackson-core:2.13.4 -> >=dev-java/jackson-core-2.13.4:0 CP_DEPEND=" - ~dev-java/jackson-annotations-2.13.4:2 - ~dev-java/jackson-core-2.13.4:0 + ~dev-java/jackson-annotations-2.13.4:1 + ~dev-java/jackson-core-2.13.4:1 " # Compile dependencies diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r2.ebuild similarity index 92% rename from dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild rename to dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r2.ebuild index bbbf48a2f339..345fc414bd06 100644 --- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild +++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.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 # Skeleton command: @@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"; SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"; LICENSE="Apache-2.0" -SLOT="0" +SLOT="1" KEYWORDS="amd64 arm64 ppc64" # Common dependencies @@ -29,9 +29,9 @@ KEYWORDS="amd64 arm64 ppc64" # org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0 CP_DEPEND=" - ~dev-java/jackson-annotations-${PV}:2 - ~dev-java/jackson-core-${PV}:0 - ~dev-java/jackson-databind-${PV}.1:0 + ~dev-java/jackson-annotations-${PV}:1 + ~dev-java/jackson-core-${PV}:1 + ~dev-java/jackson-databind-${PV}.1:1 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 " @@ -47,7 +47,7 @@ DEPEND=" >=virtual/jdk-11:* ${CP_DEPEND} test? ( - ~dev-java/jackson-module-jakarta-xmlbind-${PV}:0 + ~dev-java/jackson-module-jakarta-xmlbind-${PV}:1 dev-java/jaxb-api:4 dev-java/sjsxp:0 ) @@ -64,7 +64,7 @@ S="${WORKDIR}/${PN}-${P}" JAVA_SRC_DIR=( "src/main/java" "src/moditect" ) JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-4,junit-4" +JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind-1,sjsxp,jaxb-api-4,junit-4" JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r2.ebuild similarity index 90% rename from dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild rename to dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r2.ebuild index a63f1c452946..2334ecd8b4c1 100644 --- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild +++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.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 # Skeleton command: @@ -17,13 +17,13 @@ HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text"; SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-${PV}.tar.gz"; LICENSE="Apache-2.0" -SLOT="0" +SLOT="1" KEYWORDS="amd64 arm64 ppc64" DEPEND=" - ~dev-java/jackson-core-${PV}:0 - ~dev-java/jackson-databind-${PV}.1:0 - dev-java/snakeyaml:0 + ~dev-java/jackson-core-${PV}:1 + ~dev-java/jackson-databind-${PV}.1:1 + dev-java/snakeyaml:1 >=virtual/jdk-11:* " @@ -33,7 +33,7 @@ DOCS=( README.md release-notes/{CREDITS,VERSION} ) S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml" -JAVA_CLASSPATH_EXTRA="jackson-core,jackson-databind,snakeyaml" +JAVA_CLASSPATH_EXTRA="jackson-core-1,jackson-databind-1,snakeyaml-1" JAVA_SRC_DIR=( "src/main/java" "src/moditect" ) JAVA_RESOURCE_DIRS="src/main/resources" diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r2.ebuild similarity index 94% rename from dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild rename to dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r2.ebuild index ad03a7d154b7..51dd84d7089c 100644 --- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild +++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.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 # Skeleton command: @@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/FasterXML/jackson-modules-base"; SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0" +SLOT="1" KEYWORDS="amd64 arm64 ppc64" # Common dependencies @@ -29,9 +29,9 @@ KEYWORDS="amd64 arm64 ppc64" # jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3 CP_DEPEND=" - ~dev-java/jackson-annotations-${PV}:2 - ~dev-java/jackson-core-${PV}:0 - ~dev-java/jackson-databind-${PV}.1:0 + ~dev-java/jackson-annotations-${PV}:1 + ~dev-java/jackson-core-${PV}:1 + ~dev-java/jackson-databind-${PV}.1:1 dev-java/jakarta-activation:1 dev-java/jaxb-api:4 " diff --git a/dev-java/jcommander/jcommander-1.82.ebuild b/dev-java/jcommander/jcommander-1.82-r1.ebuild similarity index 91% rename from dev-java/jcommander/jcommander-1.82.ebuild rename to dev-java/jcommander/jcommander-1.82-r1.ebuild index 0f13c5ff3e27..664b5ca6b26f 100644 --- a/dev-java/jcommander/jcommander-1.82.ebuild +++ b/dev-java/jcommander/jcommander-1.82-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 @@ -18,7 +18,7 @@ KEYWORDS="amd64 arm64 ppc64" DEPEND=" >=virtual/jdk-1.8:* - test? ( dev-java/jackson-annotations:2 ) + test? ( dev-java/jackson-annotations:1 ) " RDEPEND=" >=virtual/jre-1.8:* @@ -40,7 +40,7 @@ JAVA_SRC_DIR="src/main/java" # Needs "java-util-2-runner-args.patch" from https://github.com/gentoo/gentoo/pull/21319#issuecomment-878128343 JAVA_TEST_RUNNER_EXTRA_ARGS=( -verbose 3 -usedefaultlisteners true ) -JAVA_TEST_GENTOO_CLASSPATH="jackson-annotations-2,testng" +JAVA_TEST_GENTOO_CLASSPATH="jackson-annotations-1,testng" JAVA_TEST_EXTRA_ARGS=( -Djava.io.tmpdir="${T}" ) JAVA_TEST_SRC_DIR=( src/test/java ) JAVA_TEST_RESOURCE_DIRS=( src/test/resources ) diff --git a/dev-java/json-path/json-path-2.9.0.ebuild b/dev-java/json-path/json-path-2.9.0-r1.ebuild similarity index 96% rename from dev-java/json-path/json-path-2.9.0.ebuild rename to dev-java/json-path/json-path-2.9.0-r1.ebuild index eae3051cc66e..8a9a95006b30 100644 --- a/dev-java/json-path/json-path-2.9.0.ebuild +++ b/dev-java/json-path/json-path-2.9.0-r1.ebuild @@ -20,7 +20,7 @@ KEYWORDS="amd64" CP_DEPEND=" dev-java/tapestry-json:0 dev-java/gson:0 - dev-java/jackson-databind:0 + dev-java/jackson-databind:1 dev-java/jettison:0 dev-java/json:0 dev-java/jsonb-api:0 diff --git a/dev-java/junit-pioneer/junit-pioneer-1.9.1.ebuild b/dev-java/junit-pioneer/junit-pioneer-1.9.1-r1.ebuild similarity index 89% rename from dev-java/junit-pioneer/junit-pioneer-1.9.1.ebuild rename to dev-java/junit-pioneer/junit-pioneer-1.9.1-r1.ebuild index 26581990ea26..d672368a5138 100644 --- a/dev-java/junit-pioneer/junit-pioneer-1.9.1.ebuild +++ b/dev-java/junit-pioneer/junit-pioneer-1.9.1-r1.ebuild @@ -18,13 +18,13 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" - dev-java/jackson-databind:0 + dev-java/jackson-databind:1 dev-java/junit:5 >=virtual/jdk-11:* " RDEPEND=">=virtual/jre-1.8:*" -JAVA_CLASSPATH_EXTRA="jackson-databind junit-5" +JAVA_CLASSPATH_EXTRA="jackson-databind-1 junit-5" JAVA_RESOURCE_DIRS="src/main/resources" JAVA_SRC_DIR=( src/main/{java,module} ) diff --git a/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild b/dev-java/log4j-core/log4j-core-2.19.0-r2.ebuild similarity index 98% rename from dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild rename to dev-java/log4j-core/log4j-core-2.19.0-r2.ebuild index c3bca3cfeaf1..e6e5076d8a37 100644 --- a/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild +++ b/dev-java/log4j-core/log4j-core-2.19.0-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 # Skeleton command: @@ -45,10 +45,10 @@ CP_DEPEND=" dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 - dev-java/jackson-core:0 - dev-java/jackson-databind:0 - dev-java/jackson-dataformat-xml:0 - dev-java/jackson-dataformat-yaml:0 + dev-java/jackson-core:1 + dev-java/jackson-databind:1 + dev-java/jackson-dataformat-xml:1 + dev-java/jackson-dataformat-yaml:1 dev-java/jansi:2 dev-java/javax-mail:0 >=dev-java/jctools-core-4.0.3-r1:0 diff --git a/dev-java/protobuf-java/protobuf-java-4.32.1.ebuild b/dev-java/protobuf-java/protobuf-java-4.32.1-r1.ebuild similarity index 97% rename from dev-java/protobuf-java/protobuf-java-4.32.1.ebuild rename to dev-java/protobuf-java/protobuf-java-4.32.1-r1.ebuild index 055b5380cf1a..e529591e7bb2 100644 --- a/dev-java/protobuf-java/protobuf-java-4.32.1.ebuild +++ b/dev-java/protobuf-java/protobuf-java-4.32.1-r1.ebuild @@ -32,8 +32,8 @@ DEPEND=" test? ( >=dev-java/guava-33.4.8:0 dev-java/mockito:4 - dev-java/snakeyaml:0 - dev-java/testparameterinjector:0 + dev-java/snakeyaml:1 + ~dev-java/testparameterinjector-1.18:0 dev-java/truth:0 ) " @@ -44,7 +44,7 @@ JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" JAVA_JAR_FILENAME="protobuf.jar" JAVA_RESOURCE_DIRS="java/core/src/main/resources" JAVA_SRC_DIR="java/core/src/main/java" -JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4,snakeyaml" +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4,snakeyaml-1" JAVA_TEST_RESOURCE_DIRS="java/core/src/main/resources" JAVA_TEST_SRC_DIR="java/core/src/test/java" diff --git a/dev-java/snakeyaml/snakeyaml-1.33.ebuild b/dev-java/snakeyaml/snakeyaml-1.33-r1.ebuild similarity index 98% rename from dev-java/snakeyaml/snakeyaml-1.33.ebuild rename to dev-java/snakeyaml/snakeyaml-1.33-r1.ebuild index a5d4b02db176..9cd2bcce0e15 100644 --- a/dev-java/snakeyaml/snakeyaml-1.33.ebuild +++ b/dev-java/snakeyaml/snakeyaml-1.33-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 # Skeleton command: @@ -17,7 +17,7 @@ HOMEPAGE="https://bitbucket.org/snakeyaml/snakeyaml"; SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz"; LICENSE="Apache-2.0" -SLOT="0" +SLOT="1" KEYWORDS="amd64 arm64 ppc64" # Compile dependencies diff --git a/dev-java/testng/testng-6.11-r1.ebuild b/dev-java/testng/testng-6.11-r3.ebuild similarity index 99% rename from dev-java/testng/testng-6.11-r1.ebuild rename to dev-java/testng/testng-6.11-r3.ebuild index 40d44ef075f7..9b69765b7e7a 100644 --- a/dev-java/testng/testng-6.11-r1.ebuild +++ b/dev-java/testng/testng-6.11-r3.ebuild @@ -37,7 +37,7 @@ CP_DEPEND=" dev-java/guice:4 dev-java/jcommander:1.64 dev-java/junit:4 - dev-java/snakeyaml:0 + dev-java/snakeyaml:1 " DEPEND="${CP_DEPEND} diff --git a/dev-java/testng/testng-6.11-r2.ebuild b/dev-java/testng/testng-6.11-r4.ebuild similarity index 99% rename from dev-java/testng/testng-6.11-r2.ebuild rename to dev-java/testng/testng-6.11-r4.ebuild index 7825193871c6..1940f7aa0b83 100644 --- a/dev-java/testng/testng-6.11-r2.ebuild +++ b/dev-java/testng/testng-6.11-r4.ebuild @@ -39,7 +39,7 @@ CP_DEPEND=" >=dev-java/guice-7.0.0:0 dev-java/jcommander:1.64 dev-java/junit:4 - ~dev-java/snakeyaml-1.33:0 + ~dev-java/snakeyaml-1.33:1 " DEPEND="${CP_DEPEND} diff --git a/dev-java/testparameterinjector/testparameterinjector-1.18.ebuild b/dev-java/testparameterinjector/testparameterinjector-1.18-r1.ebuild similarity index 92% rename from dev-java/testparameterinjector/testparameterinjector-1.18.ebuild rename to dev-java/testparameterinjector/testparameterinjector-1.18-r1.ebuild index e41248d74e05..88f7a14b570d 100644 --- a/dev-java/testparameterinjector/testparameterinjector-1.18.ebuild +++ b/dev-java/testparameterinjector/testparameterinjector-1.18-r1.ebuild @@ -22,7 +22,7 @@ CP_DEPEND=" >=dev-java/guava-33.4.8:0 dev-java/jsr305:0 dev-java/junit:4 - dev-java/snakeyaml:0 + dev-java/snakeyaml:1 " DEPEND=" @@ -32,7 +32,7 @@ DEPEND=" dev-java/incap:0 dev-java/javapoet:0 test? ( - >=dev-java/protobuf-java-4.30.2:0 + ~dev-java/protobuf-java-4.32.1:0 dev-java/truth:0 ) " @@ -42,7 +42,7 @@ RDEPEND=" >=virtual/jre-1.8:* " -JAVA_CLASSPATH_EXTRA="jsr305,junit-4,snakeyaml" +JAVA_CLASSPATH_EXTRA="jsr305,junit-4,snakeyaml-1" JAVA_SRC_DIR="src/main/java" JAVA_TEST_GENTOO_CLASSPATH="junit-4,protobuf-java,truth" JAVA_TEST_SRC_DIR="src/test/java" diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 487d36bfa2b7..d8380ef78ee7 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -18,7 +18,7 @@ mail-mta/exim pam # Volkmar W. Pogatzki <[email protected]> (2025-10-03) # No suitable versions of dev-libs/protobuf available. -=dev-java/protobuf-java-4.32.1 system-protoc +~dev-java/protobuf-java-4.32.1 system-protoc # Michał Górny <[email protected]> (2025-09-27) # Building NumPy with ILP64 LAPACK can cause revdeps to segfault if they
