1 |
commit: 0a3e5941feb8eb74f569e20f0b051b248207856b |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 5 06:17:06 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=0a3e5941 |
7 |
|
8 |
dev-java/icedtea: drop nsplugin, webstart useflags |
9 |
|
10 |
RDEPEND only useflags are QA violation. |
11 |
to get required functionality installing icedtea-web is enough |
12 |
|
13 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
14 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
15 |
|
16 |
dev-java/icedtea/icedtea-3.16.0.ebuild | 9 ++++----- |
17 |
dev-java/icedtea/metadata.xml | 2 -- |
18 |
2 files changed, 4 insertions(+), 7 deletions(-) |
19 |
|
20 |
diff --git a/dev-java/icedtea/icedtea-3.16.0.ebuild b/dev-java/icedtea/icedtea-3.16.0.ebuild |
21 |
index 0d8a40ccf22..436fb8fe611 100644 |
22 |
--- a/dev-java/icedtea/icedtea-3.16.0.ebuild |
23 |
+++ b/dev-java/icedtea/icedtea-3.16.0.ebuild |
24 |
@@ -70,8 +70,8 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M |
25 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
26 |
|
27 |
IUSE="+alsa cacao +cups doc examples +gtk headless-awt |
28 |
- jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch |
29 |
- pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test webstart zero" |
30 |
+ jamvm +jbootstrap kerberos libressl pax_kernel +pch |
31 |
+ pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero" |
32 |
|
33 |
RESTRICT="!test? ( test )" |
34 |
REQUIRED_USE="gtk? ( !headless-awt )" |
35 |
@@ -155,9 +155,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_ |
36 |
virtual/pkgconfig |
37 |
pax_kernel? ( sys-apps/elfix )" |
38 |
|
39 |
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
40 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) |
41 |
- pulseaudio? ( dev-java/icedtea-sound )" |
42 |
+PDEPEND="pulseaudio? ( dev-java/icedtea-sound )" |
43 |
|
44 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
45 |
|
46 |
@@ -371,6 +369,7 @@ src_install() { |
47 |
pkg_postinst() { |
48 |
xdg_icon_cache_update |
49 |
java-vm-2_pkg_postinst |
50 |
+ einfo "JavaWebStart functionality provided by icedtea-web package" |
51 |
} |
52 |
|
53 |
pkg_postrm() { |
54 |
|
55 |
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml |
56 |
index ee6c54b8598..55c624c0a06 100644 |
57 |
--- a/dev-java/icedtea/metadata.xml |
58 |
+++ b/dev-java/icedtea/metadata.xml |
59 |
@@ -27,7 +27,6 @@ |
60 |
<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag> |
61 |
<flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag> |
62 |
<flag name="kerberos">Link against Kerberos in order to obtain the cache location.</flag> |
63 |
- <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag> |
64 |
<flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag> |
65 |
<flag name="pch">Build using pre-compiled headers.</flag> |
66 |
<flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag> |
67 |
@@ -35,6 +34,5 @@ |
68 |
<flag name="smartcard">Build the PCSC driver against pcsc-lite</flag> |
69 |
<flag name="system-lcms">Build against the system LCMS installation rather than the in-tree copy.</flag> |
70 |
<flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag> |
71 |
- <flag name="webstart">Enable Web Start support (via NetX).</flag> |
72 |
</use> |
73 |
</pkgmetadata> |