summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild13
-rw-r--r--dev-java/icedtea-bin/metadata.xml1
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild (renamed from dev-java/icedtea-web/icedtea-web-1.8.4.ebuild)2
-rw-r--r--dev-java/icedtea/icedtea-3.16.0.ebuild9
-rw-r--r--dev-java/icedtea/metadata.xml2
-rw-r--r--dev-java/openjdk-bin/metadata.xml1
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild5
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild5
-rw-r--r--dev-java/openjdk-jre-bin/metadata.xml1
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild5
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild6
-rw-r--r--dev-java/openjdk/metadata.xml1
-rw-r--r--dev-java/openjdk/openjdk-11.0.8_p10.ebuild7
-rw-r--r--dev-java/openjdk/openjdk-8.265_p01.ebuild8
14 files changed, 15 insertions, 51 deletions
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
index 19b736ac5adb..8b4216b0ce00 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
@@ -30,12 +30,9 @@ HOMEPAGE="https://icedtea.classpath.org"
LICENSE="GPL-2-with-classpath-exception"
SLOT="8"
KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
-IUSE="+alsa big-endian cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source webstart"
+IUSE="+alsa big-endian cups doc examples +gtk headless-awt pulseaudio selinux source"
-REQUIRED_USE="
- gtk? ( !headless-awt )
- nsplugin? ( !headless-awt )
-"
+REQUIRED_USE="gtk? ( !headless-awt )"
RESTRICT="preserve-libs strip"
QA_PREBUILT="opt/.*"
@@ -73,11 +70,7 @@ RDEPEND="
)
"
-PDEPEND="
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )
-"
+PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
S="${WORKDIR}"
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index 83a24dca23c6..7939d6ca74f8 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -11,7 +11,6 @@
</maintainer>
<use>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
- <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
</use>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.4.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
index 03297c31db16..56974b9a4136 100644
--- a/dev-java/icedtea-web/icedtea-web-1.8.4.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
@@ -23,7 +23,7 @@ RESTRICT="test"
BDEPEND="
app-arch/zip
- >=virtual/jdk-1.8
+ virtual/jdk:1.8
virtual/pkgconfig
virtual/rust
doc? ( sys-devel/bc )
diff --git a/dev-java/icedtea/icedtea-3.16.0.ebuild b/dev-java/icedtea/icedtea-3.16.0.ebuild
index 0d8a40ccf226..436fb8fe611e 100644
--- a/dev-java/icedtea/icedtea-3.16.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.16.0.ebuild
@@ -70,8 +70,8 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="+alsa cacao +cups doc examples +gtk headless-awt
- jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
- pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test webstart zero"
+ jamvm +jbootstrap kerberos libressl pax_kernel +pch
+ pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
RESTRICT="!test? ( test )"
REQUIRED_USE="gtk? ( !headless-awt )"
@@ -155,9 +155,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
virtual/pkgconfig
pax_kernel? ( sys-apps/elfix )"
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
+PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
S="${WORKDIR}"/${ICEDTEA_PKG}
@@ -371,6 +369,7 @@ src_install() {
pkg_postinst() {
xdg_icon_cache_update
java-vm-2_pkg_postinst
+ einfo "JavaWebStart functionality provided by icedtea-web package"
}
pkg_postrm() {
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 138075494dee..98e344c22e7b 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -27,7 +27,6 @@
<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
<flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
<flag name="kerberos">Link against Kerberos in order to obtain the cache location.</flag>
- <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>
<flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
<flag name="pch">Build using pre-compiled headers.</flag>
<flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
@@ -35,7 +34,6 @@
<flag name="smartcard">Build the PCSC driver against pcsc-lite</flag>
<flag name="system-lcms">Build against the system LCMS installation rather than the in-tree copy.</flag>
<flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag>
- <flag name="webstart">Enable Web Start support (via NetX).</flag>
</use>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
index 00b8ba3104d9..2f7d0b9daf4b 100644
--- a/dev-java/openjdk-bin/metadata.xml
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -18,7 +18,6 @@
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
<flag name="source">Install JVM sources</flag>
- <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
</use>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
index 4ccc0089139d..6037f69440ec 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
@@ -25,7 +25,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
HOMEPAGE="https://adoptopenjdk.net"
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="alsa cups doc +gentoo-vm headless-awt nsplugin selinux source webstart"
+IUSE="alsa cups doc +gentoo-vm headless-awt selinux source"
RDEPEND="
media-libs/fontconfig:1.0
@@ -45,9 +45,6 @@ RDEPEND="
x11-libs/libXtst
)"
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
RESTRICT="preserve-libs splitdebug"
QA_PREBUILT="*"
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild
index 1d7080434ca7..9374723c43ca 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="amd64 ~arm arm64 ~ppc64"
-IUSE="alsa cups examples headless-awt nsplugin selinux source webstart"
+IUSE="alsa cups examples headless-awt selinux source"
RDEPEND="
media-libs/fontconfig:1.0
@@ -47,9 +47,6 @@ RDEPEND="
)
"
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
RESTRICT="preserve-libs strip"
QA_PREBUILT="*"
diff --git a/dev-java/openjdk-jre-bin/metadata.xml b/dev-java/openjdk-jre-bin/metadata.xml
index d951d012cd72..883c73d57a1f 100644
--- a/dev-java/openjdk-jre-bin/metadata.xml
+++ b/dev-java/openjdk-jre-bin/metadata.xml
@@ -17,7 +17,6 @@
<use>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
- <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
</use>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild
index 23e7a0fbadc0..a6aade59d9e1 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
HOMEPAGE="https://adoptopenjdk.net"
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
+IUSE="alsa cups +gentoo-vm headless-awt selinux"
RDEPEND="
media-libs/fontconfig:1.0
@@ -42,9 +42,6 @@ RDEPEND="
x11-libs/libXtst
)"
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
RESTRICT="preserve-libs splitdebug"
QA_PREBUILT="*"
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
index 512f8678a758..16aae21f0a4a 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="amd64"
-IUSE="alsa cups headless-awt nsplugin selinux webstart"
+IUSE="alsa cups headless-awt selinux"
RDEPEND="
media-libs/fontconfig:1.0
@@ -43,10 +43,6 @@ RDEPEND="
x11-libs/libXtst
)"
-PDEPEND="
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
RESTRICT="preserve-libs splitdebug"
QA_PREBUILT="*"
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index c00c93f44562..a68276db8c5f 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -24,7 +24,6 @@
<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="&gt;=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag>
- <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
</use>
<origin>gentoo-staging</origin>
</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"
}