commit: 0a3e5941feb8eb74f569e20f0b051b248207856b
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 06:17:06 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 06:31:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a3e5941
dev-java/icedtea: drop nsplugin, webstart useflags
RDEPEND only useflags are QA violation.
to get required functionality installing icedtea-web is enough
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-java/icedtea/icedtea-3.16.0.ebuild | 9 ++++-----
dev-java/icedtea/metadata.xml | 2 --
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/dev-java/icedtea/icedtea-3.16.0.ebuild
b/dev-java/icedtea/icedtea-3.16.0.ebuild
index 0d8a40ccf22..436fb8fe611 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 ee6c54b8598..55c624c0a06 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,6 +34,5 @@
<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>
</pkgmetadata>