From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- dev-java/gson/Manifest | 4 ++- dev-java/gson/gson-2.8.8-r1.ebuild | 65 ++++++++++++++++++++++++++++++++++++++ dev-java/gson/gson-2.8.8.ebuild | 65 -------------------------------------- dev-java/gson/gson-2.9.0-r1.ebuild | 63 ++++++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 66 deletions(-) create mode 100644 dev-java/gson/gson-2.8.8-r1.ebuild delete mode 100644 dev-java/gson/gson-2.8.8.ebuild create mode 100644 dev-java/gson/gson-2.9.0-r1.ebuild (limited to 'dev-java/gson') diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest index 052668c08614..0a09227d582a 100644 --- a/dev-java/gson/Manifest +++ b/dev-java/gson/Manifest @@ -1,3 +1,5 @@ DIST gson-2.8.8-sources.tar.gz 393941 BLAKE2B ebdd1088a069eea58e5ea4e2eddea0d42064c53f7284778b1b7217c8bc7abeb7e14350e19d838af1d94f78c5c38aca6de0f37674b022f0e528ed65eef803c3f1 SHA512 f90ad679c99c5e9a6ee9e397e59ab1d7d94a9c82366902b808addc40ebbab101fdba7fc83e4666c4f35e52d8b127e6f901e65072a7de210496466074dcd043c5 -EBUILD gson-2.8.8.ebuild 1750 BLAKE2B e0b59437e868dc049ce0ea9d70fb9f09ea14302c4a5d9131097ddf8cc1cb711d24e2f65d88c4983bab24025b6e49a84d84428c9da06817e552c5b1b65cc28d61 SHA512 01ee9babce849f123f7bd9468130909ae380487e617d77c4e536399695b36ac6e6848879d0b2ed124fbdd6dd3d5a6b194a9527d438d083bc6de1e7c4bca3e9a7 +DIST gson-2.9.0.tar.gz 350309 BLAKE2B f17f7a7410744b14cb79c979b35c7f3c46a3d9e922722c41893b872013319a1bd06d81526e8380055aafa47524bfcc50e02629d1c5994e1f9f81df4391a9c651 SHA512 25e57f0e3cbff7e4d33070d250ba4ecf1c659380bce07863c52a3b30edd0ba88c923e55b0f38098b5ce3827a74a21c4d41f9de02f6a84da771ae39fd823667d3 +EBUILD gson-2.8.8-r1.ebuild 1745 BLAKE2B 6df1694112b6a71a33b7e96cb84d227cd96a69e6f55c3a964e3f4cbb585e96f9f457900e47260fb8204e7bdaf5e771f4dd9833090e9f22a63388e224e9fb4d7f SHA512 af2f7b14c43f914a91ab4285c1f702388fc45d9d78bcf9fdb65b918436bc4cfda135269168255df20813c24cfa32c38ec4eabf5a49fc6e22b2c6cd6e5bc3c063 +EBUILD gson-2.9.0-r1.ebuild 2099 BLAKE2B 34a065a1b94566a0c7f032f1bc96c41d55eb238af2943716b8347b2fca15dc9697151c9e00181d2431f08b394be9237b0419c334d119796dafca6b0a8ff1b772 SHA512 c59e4829276a3b3e7a10c1c286dd0f9b7582af7452a9c133ce7a3e79d35d594a810cc2f6a33136874dcd3e7bcd52f4dd253196160ff81cecbe8caa6a701eee7f MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504 diff --git a/dev-java/gson/gson-2.8.8-r1.ebuild b/dev-java/gson/gson-2.8.8-r1.ebuild new file mode 100644 index 000000000000..a69ff0ad0aab --- /dev/null +++ b/dev-java/gson/gson-2.8.8-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom gson/pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.8.8.tar.gz --slot 2.6 --keywords "~amd64 ~ppc64 ~x86" --ebuild gson-2.8.8.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.code.gson:gson:2.8.8" +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}-sources.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2.6" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +# Compile dependencies +# POM: ${PN}/pom.xml +# test? com.github.wvengen:proguard-maven-plugin:2.4.0 -> !!!groupId-not-found!!! +# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 + +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" +) + +src_prepare() { + default + sed -i "s/\${project.version}/${PV}/g" src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java || die "Failed to set version" +} + +src_test() { + local vm_version="$(java-config -g PROVIDES_VERSION)" + if [[ "${vm_version}" == "1.8" ]] ; then + JAVA_TEST_EXCLUDES+=( "com.google.gson.JsonArrayTest" ) + fi + java-pkg-simple_src_test +} diff --git a/dev-java/gson/gson-2.8.8.ebuild b/dev-java/gson/gson-2.8.8.ebuild deleted file mode 100644 index a4d0f7c1d6f9..000000000000 --- a/dev-java/gson/gson-2.8.8.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom gson/pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.8.8.tar.gz --slot 2.6 --keywords "~amd64 ~ppc64 ~x86" --ebuild gson-2.8.8.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.google.code.gson:gson:2.8.8" -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}-sources.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2.6" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Compile dependencies -# POM: ${PN}/pom.xml -# test? com.github.wvengen:proguard-maven-plugin:2.4.0 -> !!!groupId-not-found!!! -# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 - -DEPEND=" - >=virtual/jdk-1.8:* -" - -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" -) - -src_prepare() { - default - sed -i "s/\${project.version}/${PV}/g" src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java || die "Failed to set version" -} - -src_test() { - local vm_version="$(java-config -g PROVIDES_VERSION)" - if [[ "${vm_version}" == "1.8" ]] ; then - JAVA_TEST_EXCLUDES+=( "com.google.gson.JsonArrayTest" ) - fi - java-pkg-simple_src_test -} diff --git a/dev-java/gson/gson-2.9.0-r1.ebuild b/dev-java/gson/gson-2.9.0-r1.ebuild new file mode 100644 index 000000000000..655185099b31 --- /dev/null +++ b/dev-java/gson/gson-2.9.0-r1.ebuild @@ -0,0 +1,63 @@ +# 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.9" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + virtual/jdk:11 +" + +# Set to jre-11:* since jre-1.8:* causes errors: +# error: Invalid SafeVarargs annotation. Instance method assertIterationOrder(Iterable,T...) is not final. +# in src/test/java/com/google/gson/internal/LinkedTreeMapTest.java:164: +RDEPEND=" + >=virtual/jre-11:* +" + +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 -i "s/\${project.version}/${PV}/g" src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java || die "Failed to set version" +} -- cgit v1.2.3