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 796FA138334 for ; Sat, 1 Jun 2019 21:45:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BC72E07E0; Sat, 1 Jun 2019 21:45:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6C032E07E0 for ; Sat, 1 Jun 2019 21:45:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 27DF4345505 for ; Sat, 1 Jun 2019 21:45:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0814B5EB for ; Sat, 1 Jun 2019 21:45:33 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1559425481.663da9667916dbb60bdbca097e1b559d6b39bfa9.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/openjfx/openjfx-11.0.3_p1.ebuild X-VCS-Directories: dev-java/openjfx/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 663da9667916dbb60bdbca097e1b559d6b39bfa9 X-VCS-Branch: master Date: Sat, 1 Jun 2019 21:45:33 +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: d874e167-2695-4a16-895b-64096ca6c417 X-Archives-Hash: 7c305f87294cd8c33bb8072224c9786b commit: 663da9667916dbb60bdbca097e1b559d6b39bfa9 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Jun 1 21:43:02 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Jun 1 21:44:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663da966 dev-java/openjfx: fix installing without docs Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjfx/openjfx-11.0.3_p1.ebuild | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild index b22021a3d61..02d8964eaea 100644 --- a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild +++ b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild @@ -173,13 +173,15 @@ src_configure() { #FIXME: should we enable webkit? doubt so # build is very sensetive to doc presense, take extra steps - local jdk_doc - if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then - jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api" - elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then - jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api" + if use doc; then + local jdk_doc + if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then + jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api" + elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then + jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api" + fi + [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" fi - [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" cat <<- _EOF_ > "${S}"/gradle.properties COMPILE_TARGETS = linux