Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/trident/
Date: Tue, 18 May 2021 14:07:04
Message-Id: 1621346817.f1f7e7e2b8ada6ae59377d55d7416df77c80168f.fordfrog@gentoo
1 commit: f1f7e7e2b8ada6ae59377d55d7416df77c80168f
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 18 14:06:43 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Tue May 18 14:06:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1f7e7e2
7
8 dev-java/trident: fixed compilation of 1.3-r1
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 dev-java/trident/trident-1.3-r1.ebuild | 6 +++++-
14 1 file changed, 5 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-java/trident/trident-1.3-r1.ebuild b/dev-java/trident/trident-1.3-r1.ebuild
17 index 80d22e18305..8a029be2e54 100644
18 --- a/dev-java/trident/trident-1.3-r1.ebuild
19 +++ b/dev-java/trident/trident-1.3-r1.ebuild
20 @@ -35,7 +35,6 @@ S="${WORKDIR}"
21 JAVA_ANT_REWRITE_CLASSPATH="true"
22 EANT_BUILD_TARGET="timestamp init clean compile.module.trident jar"
23 EANT_GENTOO_CLASSPATH="swt-4.10"
24 -EANT_EXTRA_ARGS="-Djdk.home=${JAVA_HOME}"
25
26 src_prepare() {
27 default
28 @@ -43,6 +42,11 @@ src_prepare() {
29 rm -r src/org/pushingpixels/trident/android/ || die
30 }
31
32 +src_compile() {
33 + EANT_EXTRA_ARGS="-Djdk.home=$(java-config -O)"
34 + java-pkg-2_src_compile
35 +}
36 +
37 src_install() {
38 java-pkg_dojar drop/${PN}.jar