diff options
| author | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2020-09-01 21:29:32 -0400 |
|---|---|---|
| committer | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2020-09-01 21:29:32 -0400 |
| commit | 06cbb13462d848aab853a91d6a7838b02e980fec (patch) | |
| tree | ff3c57897a43ce2dc82e12e3bace9559d260ce40 /dev-java/openjdk | |
| parent | 4e5feb9f0844a76f33f9dc7b134dd14a8d9a107b (diff) | |
| download | gentoo-overlay-06cbb13462d848aab853a91d6a7838b02e980fec.tar.xz gentoo-overlay-06cbb13462d848aab853a91d6a7838b02e980fec.zip | |
dev-java/*openjdk: fixes
Diffstat (limited to 'dev-java/openjdk')
| -rw-r--r-- | dev-java/openjdk/openjdk-14.0.2_p12.ebuild | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/dev-java/openjdk/openjdk-14.0.2_p12.ebuild b/dev-java/openjdk/openjdk-14.0.2_p12.ebuild index 35a2c27..9155c09 100644 --- a/dev-java/openjdk/openjdk-14.0.2_p12.ebuild +++ b/dev-java/openjdk/openjdk-14.0.2_p12.ebuild @@ -61,11 +61,8 @@ DEPEND=" x11-libs/libXrender x11-libs/libXt x11-libs/libXtst + virtual/jdk:14 javafx? ( dev-java/openjfx:${SLOT}= ) - || ( - dev-java/openjdk-bin:${SLOT} - dev-java/openjdk:${SLOT} - ) " PDEPEND=" @@ -99,39 +96,13 @@ pkg_pretend() { pkg_setup() { openjdk_check_requirements - java-vm-2_pkg_setup - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} openj9-openjdk-${SLOT} openj9-openjdk-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" JAVA_PKG_WANT_TARGET="${SLOT}" - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - - if has_version --host-root dev-java/openjdk:${SLOT}; then - export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} - else - 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 + java-vm-2_pkg_setup + java-pkg-2_pkg_setup } src_prepare() { |