diff --git a/dev-java/openjdk/openjdk-17.0.19_p10-r1.ebuild b/dev-java/openjdk/openjdk-17.0.19_p10-r1.ebuild index 98c7ebb11ba1a..b17d48699c534 100644 --- a/dev-java/openjdk/openjdk-17.0.19_p10-r1.ebuild +++ b/dev-java/openjdk/openjdk-17.0.19_p10-r1.ebuild @@ -55,10 +55,9 @@ LICENSE="GPL-2-with-classpath-exception" SLOT="$(ver_cut 1)" KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86" -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs system-bootstrap systemtap" +IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs system-bootstrap systemtap" REQUIRED_USE=" - javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap ) " @@ -105,7 +104,6 @@ DEPEND=" x11-libs/libXrender x11-libs/libXt x11-libs/libXtst - javafx? ( dev-java/openjfx:${SLOT}= ) system-bootstrap? ( || ( dev-java/openjdk-bin:${SLOT} @@ -239,15 +237,6 @@ src_configure() { $(tc-is-clang && echo "--with-toolchain-type=clang") ) - if use javafx; then - local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - # Workaround for bug #938302 if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace ) diff --git a/dev-java/openjdk/openjdk-21.0.11_p10-r1.ebuild b/dev-java/openjdk/openjdk-21.0.11_p10-r1.ebuild index 6870973daff37..678977ee00e85 100644 --- a/dev-java/openjdk/openjdk-21.0.11_p10-r1.ebuild +++ b/dev-java/openjdk/openjdk-21.0.11_p10-r1.ebuild @@ -51,10 +51,9 @@ LICENSE="GPL-2-with-classpath-exception" SLOT="$(ver_cut 1)" KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs +system-bootstrap systemtap" +IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs +system-bootstrap systemtap" REQUIRED_USE=" - javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap ) !system-bootstrap? ( || ( ppc64 x86 ) ) " @@ -102,7 +101,6 @@ DEPEND=" x11-libs/libXrender x11-libs/libXt x11-libs/libXtst - javafx? ( dev-java/openjfx:${SLOT}= ) system-bootstrap? ( || ( dev-java/openjdk-bin:${SLOT} @@ -238,15 +236,6 @@ src_configure() { use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" ) - if use javafx; then - local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - # Workaround for bug #938302 if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace ) diff --git a/dev-java/openjdk/openjdk-25.0.3_p9-r1.ebuild b/dev-java/openjdk/openjdk-25.0.3_p9-r1.ebuild index 0b62bfee8d9a2..a56f6205ff93a 100644 --- a/dev-java/openjdk/openjdk-25.0.3_p9-r1.ebuild +++ b/dev-java/openjdk/openjdk-25.0.3_p9-r1.ebuild @@ -73,10 +73,9 @@ LICENSE="GPL-2-with-classpath-exception" SLOT="$(ver_cut 1)" KEYWORDS="amd64 arm64 ~ppc64 ~riscv" -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs +system-bootstrap systemtap" +IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs +system-bootstrap systemtap" REQUIRED_USE=" - javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap ) !system-bootstrap? ( ppc64 ) " @@ -124,7 +123,6 @@ DEPEND=" x11-libs/libXrender x11-libs/libXt x11-libs/libXtst - javafx? ( dev-java/openjfx:${SLOT}= ) system-bootstrap? ( || ( dev-java/openjdk-bin:${SLOT} @@ -257,15 +255,6 @@ src_configure() { use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" ) - if use javafx; then - local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - # Workaround for bug #938302 if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace ) diff --git a/dev-java/openjdk/openjdk-27_beta25.ebuild b/dev-java/openjdk/openjdk-27_beta25.ebuild index fa0ea097683a9..e1336fab77077 100644 --- a/dev-java/openjdk/openjdk-27_beta25.ebuild +++ b/dev-java/openjdk/openjdk-27_beta25.ebuild @@ -73,10 +73,9 @@ LICENSE="GPL-2-with-classpath-exception" SLOT="$(ver_cut 1)" # KEYWORDS="" # Not an LTS candidate -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs +system-bootstrap systemtap" +IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs +system-bootstrap systemtap" REQUIRED_USE=" - javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap ) !system-bootstrap? ( ppc64 ) " @@ -117,7 +116,6 @@ DEPEND=" media-libs/alsa-lib net-print/cups !headless-awt? ( x11-base/xorg-proto ) - javafx? ( dev-java/openjfx:${SLOT}= ) system-bootstrap? ( || ( dev-java/openjdk:26 @@ -253,15 +251,6 @@ src_configure() { use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" ) - if use javafx; then - local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - # Workaround for bug #938302 if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )