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

[Georgy Yakovlev]

commit:     663da9667916dbb60bdbca097e1b559d6b39bfa9
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 21:43:02 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> 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 <gyakovlev <AT> 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