| 1 |
commit: 078b41597702e6ed5ca5a5605380bab675b1b701 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 5 06:19:26 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 5 06:31:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=078b4159 |
| 7 |
|
| 8 |
dev-java/openjdk: drop nsplugin, webstart flags. |
| 9 |
|
| 10 |
simply install icedtea-web instead |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 13 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-java/openjdk/metadata.xml | 1 - |
| 16 |
dev-java/openjdk/openjdk-11.0.8_p10.ebuild | 7 +------ |
| 17 |
dev-java/openjdk/openjdk-8.265_p01.ebuild | 8 ++------ |
| 18 |
3 files changed, 3 insertions(+), 13 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml |
| 21 |
index c9555ad9e77..ebcb18f5897 100644 |
| 22 |
--- a/dev-java/openjdk/metadata.xml |
| 23 |
+++ b/dev-java/openjdk/metadata.xml |
| 24 |
@@ -24,6 +24,5 @@ |
| 25 |
<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag> |
| 26 |
<flag name="source">Install JVM sources</flag> |
| 27 |
<flag name="systemtap" restrict=">=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag> |
| 28 |
- <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag> |
| 29 |
</use> |
| 30 |
</pkgmetadata> |
| 31 |
|
| 32 |
diff --git a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild |
| 33 |
index 35a2c27c3f8..403654841b0 100644 |
| 34 |
--- a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild |
| 35 |
+++ b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild |
| 36 |
@@ -17,7 +17,7 @@ SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}. |
| 37 |
LICENSE="GPL-2" |
| 38 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
| 39 |
|
| 40 |
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart" |
| 41 |
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" |
| 42 |
|
| 43 |
COMMON_DEPEND=" |
| 44 |
media-libs/freetype:2= |
| 45 |
@@ -68,11 +68,6 @@ DEPEND=" |
| 46 |
) |
| 47 |
" |
| 48 |
|
| 49 |
-PDEPEND=" |
| 50 |
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
| 51 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) |
| 52 |
-" |
| 53 |
- |
| 54 |
REQUIRED_USE="javafx? ( alsa !headless-awt )" |
| 55 |
|
| 56 |
S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" |
| 57 |
|
| 58 |
diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild |
| 59 |
index d88de6a02a7..df934d0962a 100644 |
| 60 |
--- a/dev-java/openjdk/openjdk-8.265_p01.ebuild |
| 61 |
+++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild |
| 62 |
@@ -28,7 +28,7 @@ SRC_URI=" |
| 63 |
LICENSE="GPL-2" |
| 64 |
SLOT="$(ver_cut 1)" |
| 65 |
KEYWORDS="amd64 ppc64 x86" |
| 66 |
-IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart" |
| 67 |
+IUSE="alsa debug cups doc examples headless-awt +jbootstrap +pch selinux source" |
| 68 |
|
| 69 |
COMMON_DEPEND=" |
| 70 |
media-libs/freetype:2= |
| 71 |
@@ -73,11 +73,6 @@ DEPEND=" |
| 72 |
) |
| 73 |
" |
| 74 |
|
| 75 |
-PDEPEND=" |
| 76 |
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
| 77 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) |
| 78 |
-" |
| 79 |
- |
| 80 |
S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" |
| 81 |
|
| 82 |
# The space required to build varies wildly depending on USE flags, |
| 83 |
@@ -223,4 +218,5 @@ src_install() { |
| 84 |
|
| 85 |
pkg_postinst() { |
| 86 |
java-vm-2_pkg_postinst |
| 87 |
+ einfo "JavaWebStart functionality provided by icedtea-web package" |
| 88 |
} |
Archives