commit: 95552ad8f808583da0afb128caa4be3c26e9517b Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sun Jul 17 21:15:05 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jul 28 09:10:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95552ad8
dev-java/gson: change slot for version 2.9.0 back to slot 2.6 Conditionally excluding the test class failing with java 17 allows returning to RDEPEND=">=virtual/jre-1.8:*" which makes this version compatible with reverse dependencies, so it can use the existing slot 2.6. Bug: https://bugs.gentoo.org/853136 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-java/gson/gson-2.9.0-r2.ebuild | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dev-java/gson/gson-2.9.0-r2.ebuild b/dev-java/gson/gson-2.9.0-r2.ebuild new file mode 100644 index 000000000000..c5ddf82b4f07 --- /dev/null +++ b/dev-java/gson/gson-2.9.0-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.9.0.tar.gz --slot 2.6 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild gson-2.9.0.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.code.gson:gson:2.9.0" +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/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2.6" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=">=virtual/jdk-11:*" +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}/${PN}-${PN}-parent-${PV}/${PN}" + +JAVA_SRC_DIR=( + "src/main/java" + "src/main/java-templates" +) + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +JAVA_TEST_EXCLUDES=( + # requires the test class to be obfuscated using proguard which we do not have atm + "com.google.gson.functional.EnumWithObfuscatedTest" + # FAILURES!!! + # Tests run: 1090, Failures: 3 + # testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest) + # junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest + "com.google.gson.regression.OSGiTest" + # testSerializeInternalImplementationObject(com.google.gson.functional.ReflectionAccessTest) + # java.lang.IllegalStateException: Expected BEGIN_ARRAY but was BEGIN_OBJECT at line 1 column 2 path $ + "com.google.gson.functional.ReflectionAccessTest" +) + +src_prepare() { + default + sed -e "s/\${project.version}/${PV}/g" \ + -i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \ + || die "Failed to set version" + + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge "17" ; then + JAVA_TEST_EXCLUDES+=( "com.google.gson.internal.bind.DefaultDateTypeAdapterTest" ) + fi +}
