diff options
| -rw-r--r-- | dev-java/openjdk/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-11.0.8_p10.ebuild | 7 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-8.265_p01.ebuild | 8 |
3 files changed, 3 insertions, 13 deletions
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml index c9555ad9e77e..ebcb18f58970 100644 --- a/dev-java/openjdk/metadata.xml +++ b/dev-java/openjdk/metadata.xml @@ -24,6 +24,5 @@ <flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag> <flag name="source">Install JVM sources</flag> <flag name="systemtap" restrict=">=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag> - <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag> </use> </pkgmetadata> diff --git a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild index 35a2c27c3f85..403654841b0e 100644 --- a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild +++ b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}. LICENSE="GPL-2" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" -IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart" +IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" COMMON_DEPEND=" media-libs/freetype:2= @@ -68,11 +68,6 @@ DEPEND=" ) " -PDEPEND=" - webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) -" - REQUIRED_USE="javafx? ( alsa !headless-awt )" S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild index d88de6a02a77..df934d0962ae 100644 --- a/dev-java/openjdk/openjdk-8.265_p01.ebuild +++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild @@ -28,7 +28,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="$(ver_cut 1)" KEYWORDS="amd64 ppc64 x86" -IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart" +IUSE="alsa debug cups doc examples headless-awt +jbootstrap +pch selinux source" COMMON_DEPEND=" media-libs/freetype:2= @@ -73,11 +73,6 @@ DEPEND=" ) " -PDEPEND=" - webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) -" - S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" # The space required to build varies wildly depending on USE flags, @@ -223,4 +218,5 @@ src_install() { pkg_postinst() { java-vm-2_pkg_postinst + einfo "JavaWebStart functionality provided by icedtea-web package" } |