diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
| commit | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch) | |
| tree | c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild | |
| parent | 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff) | |
gentoo resync : 02.06.2019
Diffstat (limited to 'dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild')
| -rw-r--r-- | dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild index 960d7ca146c6..3a4668d70da8 100644 --- a/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild +++ b/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild @@ -115,11 +115,13 @@ pkg_setup() { if has_version --host-root dev-java/openjdk:${SLOT}; then export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} else - JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - export JDK_HOME + if [[ ${MERGE_TYPE} != "binary" ]]; then + JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) + [[ -n ${JDK_HOME} ]] || die "Build VM not found!" + JDK_HOME=${JDK_HOME#*/} + JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} + export JDK_HOME + fi fi } |