[gentoo-commits] repo/gentoo:master commit in: dev-java/trident/

[Miroslav Šulc]

commit:     f1f7e7e2b8ada6ae59377d55d7416df77c80168f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 14:06:43 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 18 14:06:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1f7e7e2

dev-java/trident: fixed compilation of 1.3-r1

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/trident/trident-1.3-r1.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-java/trident/trident-1.3-r1.ebuild 
b/dev-java/trident/trident-1.3-r1.ebuild
index 80d22e18305..8a029be2e54 100644
--- a/dev-java/trident/trident-1.3-r1.ebuild
+++ b/dev-java/trident/trident-1.3-r1.ebuild
@@ -35,7 +35,6 @@ S="${WORKDIR}"
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_BUILD_TARGET="timestamp init clean compile.module.trident jar"
 EANT_GENTOO_CLASSPATH="swt-4.10"
-EANT_EXTRA_ARGS="-Djdk.home=${JAVA_HOME}"
 
 src_prepare() {
        default
@@ -43,6 +42,11 @@ src_prepare() {
        rm -r src/org/pushingpixels/trident/android/ || die
 }
 
+src_compile() {
+       EANT_EXTRA_ARGS="-Djdk.home=$(java-config -O)"
+       java-pkg-2_src_compile
+}
+
 src_install() {
        java-pkg_dojar drop/${PN}.jar