From 994fe442814c4d169bb0f1ee9745604928006b39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 26 May 2024 00:07:28 +0100 Subject: gentoo auto-resync : 26:05:2024 - 00:07:27 --- dev-java/gson/Manifest | 2 +- dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild | 87 +++++++++++++++++++++++++ dev-java/gson/gson-2.10.2_pre20231128.ebuild | 87 ------------------------- 3 files changed, 88 insertions(+), 88 deletions(-) create mode 100644 dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild delete mode 100644 dev-java/gson/gson-2.10.2_pre20231128.ebuild (limited to 'dev-java/gson') diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest index 8273c42cd0c9..6ea968fede01 100644 --- a/dev-java/gson/Manifest +++ b/dev-java/gson/Manifest @@ -1,5 +1,5 @@ AUX gson-2.10.2-GsonVersionDiagnosticsTest.patch 615 BLAKE2B ac75e23e48885403f61cd0b078984a7210576fc2567086a9d9af99a212471cead5d2d5961bb6b7958fb956eda6c348c08124c6e2c6cbc7afac6ff6a36b82a424 SHA512 c363625a645df1a7c3db737db39cc2e163fe4975b6bb51930b805ba359e61509e41397022d689874b6fa100917f6dd936c13c8c6457137f55370b48de35e2bed DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb73e969b89acb2598ca34a43faa97a09debc99466ab472176d60d617aa20b2190884def25881f0bf651e96be2c1bb9a976d70 SHA512 37f2073e5eee2cb85626040552ac750f4917abd05e3b7944c30a2d5ace6888424870a95a0ceba89bf2dadf9ab33e6bbae1591509b84f35aba4521780764c0877 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 -EBUILD gson-2.10.2_pre20231128.ebuild 2349 BLAKE2B d6dfbd7cedb55f46be4555af5ed44ab5f354a144f1976f63a2484fb82fdc7bdb223d81c2d14b67500f9fe28b1e083058ce09d1aeb706112a0e06e6f2f3175633 SHA512 387f18057dd39e4d232c5937d3f32b5d888a70ea2a2f63fcb661a9a02e382c4964d4c7b8da0a2835063f7f72628510cf43869bdd15dd8a09bf7a8f60100863ce +EBUILD gson-2.10.2_pre20231128-r1.ebuild 2349 BLAKE2B d6dfbd7cedb55f46be4555af5ed44ab5f354a144f1976f63a2484fb82fdc7bdb223d81c2d14b67500f9fe28b1e083058ce09d1aeb706112a0e06e6f2f3175633 SHA512 387f18057dd39e4d232c5937d3f32b5d888a70ea2a2f63fcb661a9a02e382c4964d4c7b8da0a2835063f7f72628510cf43869bdd15dd8a09bf7a8f60100863ce MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504 diff --git a/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild b/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild new file mode 100644 index 000000000000..4247c08c2190 --- /dev/null +++ b/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild @@ -0,0 +1,87 @@ +# 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" +# S="${WORKDIR}/gson-gson-parent-${PV}/gson" +MY_COMMIT="b17b1a0e98dcaf4b61823e1f0c29dda44c0ea3d5" +SRC_URI="https://github.com/google/gson/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/gson-${MY_COMMIT}/gson" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +DEPEND=" + dev-java/error-prone-annotations:0 + >=virtual/jdk-17:* + test? ( + dev-java/guava:0 + dev-java/guava-testlib:0 + )" +# src/test/java/com/google/gson/functional/Java17RecordTest.java:78: +# error: records are not supported in -source 11 +RDEPEND=">=virtual/jre-17:*" + +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" + # testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest) + # junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest + "com.google.gson.regression.OSGiTest" +) +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" +} + +src_compile() { + if ! use test; then + JAVA_PKG_WANT_SOURCE="1.8" + JAVA_PKG_WANT_TARGET="1.8" + fi + java-pkg-simple_src_compile +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + java-pkg-simple_src_test +} diff --git a/dev-java/gson/gson-2.10.2_pre20231128.ebuild b/dev-java/gson/gson-2.10.2_pre20231128.ebuild deleted file mode 100644 index 4247c08c2190..000000000000 --- a/dev-java/gson/gson-2.10.2_pre20231128.ebuild +++ /dev/null @@ -1,87 +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" -# S="${WORKDIR}/gson-gson-parent-${PV}/gson" -MY_COMMIT="b17b1a0e98dcaf4b61823e1f0c29dda44c0ea3d5" -SRC_URI="https://github.com/google/gson/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" -S="${WORKDIR}/gson-${MY_COMMIT}/gson" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=" - dev-java/error-prone-annotations:0 - >=virtual/jdk-17:* - test? ( - dev-java/guava:0 - dev-java/guava-testlib:0 - )" -# src/test/java/com/google/gson/functional/Java17RecordTest.java:78: -# error: records are not supported in -source 11 -RDEPEND=">=virtual/jre-17:*" - -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" - # testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest) - # junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest - "com.google.gson.regression.OSGiTest" -) -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" -} - -src_compile() { - if ! use test; then - JAVA_PKG_WANT_SOURCE="1.8" - JAVA_PKG_WANT_TARGET="1.8" - fi - java-pkg-simple_src_compile -} - -src_test() { - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" - java-pkg-simple_src_test -} -- cgit v1.2.3