Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/gson/
Date: Mon, 01 Aug 2022 18:08:36
Message-Id: 1659377301.f98b6e431b5a944fcd890f64faa3d0152b979f53.arthurzam@gentoo
1 commit: f98b6e431b5a944fcd890f64faa3d0152b979f53
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Sun Jul 31 19:07:11 2022 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 1 18:08:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98b6e43
7
8 dev-java/gson: drop 2.8.8-r1
9
10 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
11 Closes: https://github.com/gentoo/gentoo/pull/26687
12 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
13
14 dev-java/gson/Manifest | 1 -
15 dev-java/gson/gson-2.8.8-r1.ebuild | 65 --------------------------------------
16 2 files changed, 66 deletions(-)
17
18 diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
19 index 439250dc98ed..e539d331b471 100644
20 --- a/dev-java/gson/Manifest
21 +++ b/dev-java/gson/Manifest
22 @@ -1,2 +1 @@
23 -DIST gson-2.8.8-sources.tar.gz 393941 BLAKE2B ebdd1088a069eea58e5ea4e2eddea0d42064c53f7284778b1b7217c8bc7abeb7e14350e19d838af1d94f78c5c38aca6de0f37674b022f0e528ed65eef803c3f1 SHA512 f90ad679c99c5e9a6ee9e397e59ab1d7d94a9c82366902b808addc40ebbab101fdba7fc83e4666c4f35e52d8b127e6f901e65072a7de210496466074dcd043c5
24 DIST gson-2.9.0.tar.gz 350309 BLAKE2B f17f7a7410744b14cb79c979b35c7f3c46a3d9e922722c41893b872013319a1bd06d81526e8380055aafa47524bfcc50e02629d1c5994e1f9f81df4391a9c651 SHA512 25e57f0e3cbff7e4d33070d250ba4ecf1c659380bce07863c52a3b30edd0ba88c923e55b0f38098b5ce3827a74a21c4d41f9de02f6a84da771ae39fd823667d3
25
26 diff --git a/dev-java/gson/gson-2.8.8-r1.ebuild b/dev-java/gson/gson-2.8.8-r1.ebuild
27 deleted file mode 100644
28 index a69ff0ad0aab..000000000000
29 --- a/dev-java/gson/gson-2.8.8-r1.ebuild
30 +++ /dev/null
31 @@ -1,65 +0,0 @@
32 -# Copyright 1999-2022 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -# Skeleton command:
36 -# 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
37 -
38 -EAPI=7
39 -
40 -JAVA_PKG_IUSE="doc source test"
41 -MAVEN_ID="com.google.code.gson:gson:2.8.8"
42 -JAVA_TESTING_FRAMEWORKS="junit-4"
43 -
44 -inherit java-pkg-2 java-pkg-simple
45 -
46 -DESCRIPTION="Gson JSON library"
47 -HOMEPAGE="https://github.com/google/gson"
48 -SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${P}-sources.tar.gz"
49 -
50 -LICENSE="Apache-2.0"
51 -SLOT="2.6"
52 -KEYWORDS="amd64 ~arm arm64 ppc64 x86"
53 -
54 -# Compile dependencies
55 -# POM: ${PN}/pom.xml
56 -# test? com.github.wvengen:proguard-maven-plugin:2.4.0 -> !!!groupId-not-found!!!
57 -# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
58 -
59 -DEPEND="
60 - virtual/jdk:11
61 -"
62 -
63 -RDEPEND="
64 - >=virtual/jre-1.8:*
65 -"
66 -
67 -S="${WORKDIR}/${PN}-${PN}-parent-${PV}/${PN}"
68 -
69 -JAVA_SRC_DIR=(
70 - "src/main/java"
71 - "src/main/java-templates"
72 -)
73 -
74 -JAVA_TEST_GENTOO_CLASSPATH="junit-4"
75 -JAVA_TEST_SRC_DIR="src/test/java"
76 -JAVA_TEST_RESOURCE_DIRS=(
77 - "src/test/resources"
78 -)
79 -
80 -JAVA_TEST_EXCLUDES=(
81 - # requires the test class to be obfuscated using proguard which we do not have atm
82 - "com.google.gson.functional.EnumWithObfuscatedTest"
83 -)
84 -
85 -src_prepare() {
86 - default
87 - sed -i "s/\${project.version}/${PV}/g" src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java || die "Failed to set version"
88 -}
89 -
90 -src_test() {
91 - local vm_version="$(java-config -g PROVIDES_VERSION)"
92 - if [[ "${vm_version}" == "1.8" ]] ; then
93 - JAVA_TEST_EXCLUDES+=( "com.google.gson.JsonArrayTest" )
94 - fi
95 - java-pkg-simple_src_test
96 -}