From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 458B01382C5 for ; Tue, 18 May 2021 14:07:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90B99E075F; Tue, 18 May 2021 14:07:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 766D1E075F for ; Tue, 18 May 2021 14:07:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FF19335D59 for ; Tue, 18 May 2021 14:07:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4BDC78C for ; Tue, 18 May 2021 14:07:00 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1621346817.f1f7e7e2b8ada6ae59377d55d7416df77c80168f.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/trident/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/trident/trident-1.3-r1.ebuild X-VCS-Directories: dev-java/trident/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: f1f7e7e2b8ada6ae59377d55d7416df77c80168f X-VCS-Branch: master Date: Tue, 18 May 2021 14:07:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 484fc767-414a-41d4-8669-e7c807bd23d8 X-Archives-Hash: 9c946d03de3c5a5ee5efb14b24a6725a commit: f1f7e7e2b8ada6ae59377d55d7416df77c80168f Author: Miroslav Šulc gentoo org> AuthorDate: Tue May 18 14:06:43 2021 +0000 Commit: Miroslav Šulc gentoo 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 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