summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild1
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild1
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild2
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-14.9999.ebuild2
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild2
-rw-r--r--dev-java/openjdk/openjdk-14.0.2_p12.ebuild37
6 files changed, 12 insertions, 33 deletions
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild
index 6eb5882..3a5096f 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild
@@ -66,6 +66,7 @@ RDEPEND="
DEPEND="
${COMMON_DEPEND}
app-arch/zip
+ dev-lang/nasm
media-libs/alsa-lib
net-print/cups
x11-base/xorg-proto
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
index 7581e94..b40a6bc 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
@@ -66,6 +66,7 @@ RDEPEND="
DEPEND="
${COMMON_DEPEND}
app-arch/zip
+ dev-lang/nasm
media-libs/alsa-lib
net-print/cups
x11-base/xorg-proto
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild
index 771da50..a49564d 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild
@@ -66,6 +66,7 @@ RDEPEND="
DEPEND="
${COMMON_DEPEND}
app-arch/zip
+ dev-lang/nasm
media-libs/alsa-lib
net-print/cups
x11-base/xorg-proto
@@ -123,6 +124,7 @@ pkg_pretend() {
pkg_setup() {
openjdk_check_requirements
java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
}
src_unpack() {
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-14.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-14.9999.ebuild
index 6c1f5db..9ad8ee1 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-14.9999.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-14.9999.ebuild
@@ -66,6 +66,7 @@ RDEPEND="
DEPEND="
${COMMON_DEPEND}
app-arch/zip
+ dev-lang/nasm
media-libs/alsa-lib
net-print/cups
x11-base/xorg-proto
@@ -123,6 +124,7 @@ pkg_pretend() {
pkg_setup() {
openjdk_check_requirements
java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
}
src_unpack() {
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild
index eba4432..57ea6c1 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild
@@ -66,6 +66,7 @@ RDEPEND="
DEPEND="
${COMMON_DEPEND}
app-arch/zip
+ dev-lang/nasm
media-libs/alsa-lib
net-print/cups
x11-base/xorg-proto
@@ -123,6 +124,7 @@ pkg_pretend() {
pkg_setup() {
openjdk_check_requirements
java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
}
src_unpack() {
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() {