commit: d2f39c7aa6eb079434f9000ebd0e663466816625 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Nov 14 19:30:22 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Sat Nov 15 06:26:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f39c7a
dev-java/gson: drop 2.11.0-r2 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/44628 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-java/gson/Manifest | 2 - .../gson-2.10.2-GsonVersionDiagnosticsTest.patch | 13 ---- dev-java/gson/gson-2.11.0-r2.ebuild | 79 ---------------------- 3 files changed, 94 deletions(-) diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest index 31ace9b67fe4..bf96ed828ed6 100644 --- a/dev-java/gson/Manifest +++ b/dev-java/gson/Manifest @@ -1,3 +1 @@ -DIST gson-parent-2.11.0.tar.gz 458360 BLAKE2B 88d242c725b054ac5e7e3ef31f312f77dd03aea29f6604770253564d80f84cd752b43d74dd416785836d08884e462275f8ec924a00e2ffee195c0237bc2bac0b SHA512 1834b7c95f0a40ff1bcf8088f3ffdb8332ae38d452bab4ad2c9271421e75a9236645d1ee0fdb58c2f32eac86cf503afa3de19f08eb422cc91c4d32e370c36eac DIST gson-parent-2.13.2.tar.gz 467484 BLAKE2B 46f60960c35aa268eaa4d1f0264f824f32f44d780a353bf4b2208a5fb7351c88a4d04248ca215dfd11ace6ea8ed8c4080e7342e818ddf1d30aace9d004b92043 SHA512 042eec392b52d040579fa23f48edc08f469d970e04904422e8173893f5c700a4ec3df34fec4feecc9da7197d4784392a37cfc8dbde355dcbbca22fe4e7bc1c11 -DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 diff --git a/dev-java/gson/files/gson-2.10.2-GsonVersionDiagnosticsTest.patch b/dev-java/gson/files/gson-2.10.2-GsonVersionDiagnosticsTest.patch deleted file mode 100644 index 9feeb0aa3797..000000000000 --- a/dev-java/gson/files/gson-2.10.2-GsonVersionDiagnosticsTest.patch +++ /dev/null @@ -1,13 +0,0 @@ -support our versioning schemes - ---- a/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java -+++ b/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java -@@ -35,7 +35,7 @@ import org.junit.Test; - public class GsonVersionDiagnosticsTest { - // We require a patch number, even if it is .0, consistent with https://semver.org/#spec-item-2. - private static final Pattern GSON_VERSION_PATTERN = -- Pattern.compile("(\\(GSON \\d\\.\\d+\\.\\d)(?:[-.][A-Z]+)?\\)$"); -+ Pattern.compile("(\\(GSON \\d\\.\\d+\\.\\d)(?:[-.][A-Z]+|_[a-z]+[0-9]+)?\\)$"); - - private Gson gson; - diff --git a/dev-java/gson/gson-2.11.0-r2.ebuild b/dev-java/gson/gson-2.11.0-r2.ebuild deleted file mode 100644 index da7f2829daf6..000000000000 --- a/dev-java/gson/gson-2.11.0-r2.ebuild +++ /dev/null @@ -1,79 +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="com.google.code.gson:gson:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Gson JSON library" -HOMEPAGE="https://github.com/google/gson"; -SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" -S="${WORKDIR}/gson-gson-parent-${PV}/gson" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -DEPEND=" - dev-java/error-prone-annotations:0 - >=virtual/jdk-11:* - test? ( - dev-java/guava:0 - dev-java/guava-testlib:0 - ) -" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( - ../CHANGELOG.md - ../GsonDesignDocument.md - ../README.md - ../Troubleshooting.md - ../UserGuide.md -) - -PATCHES=( "${FILESDIR}/gson-2.10.2-GsonVersionDiagnosticsTest.patch" ) - -JAVA_CLASSPATH_EXTRA="error-prone-annotations" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR=( - "src/main/java" - "src/main/java-templates" -) - -JAVA_TEST_EXCLUDES=( - # requires the test class to be obfuscated using proguard which we do not have atm - "com.google.gson.functional.EnumWithObfuscatedTest" -) -JAVA_TEST_GENTOO_CLASSPATH=" - guava - guava-testlib - junit-4 -" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - sed -e "s/\${project.version}/${PV}/g" \ - -i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \ - || die "Failed to set version" - grep ^Bundle bnd.bnd > src/main/resources/META-INF/MANIFEST.MF || die - echo "Import-Package: sun.misc;resolution:=optional, com.google.gson.annotations" \ - >> src/main/resources/META-INF/MANIFEST.MF || die -} - -src_test() { - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" - - # src/test/java/com/google/gson/functional/Java17RecordTest.java:78: - # error: records are not supported in -source 11 - JAVAC_ARGS="--source 17 --target 17" java-pkg-simple_src_test -}
