diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-12-02 19:38:54 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-12-02 19:38:54 +0000 |
| commit | fb289ea0e33a1da4a1854e35ec4eae53d8a50b79 (patch) | |
| tree | afbab86c7d2f075fd3a09921649e88948b23494f /dev-java/icedtea | |
| parent | 0.7.31 version bump. (diff) | |
| download | gentoo-2-fb289ea0e33a1da4a1854e35ec4eae53d8a50b79.tar.gz gentoo-2-fb289ea0e33a1da4a1854e35ec4eae53d8a50b79.tar.bz2 gentoo-2-fb289ea0e33a1da4a1854e35ec4eae53d8a50b79.zip | |
Check that webstart flag is enabled if nsplugin flag is enabled. Document this in metadata.xml.
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/icedtea')
| -rw-r--r-- | dev-java/icedtea/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-6.1.9.3.ebuild | 7 | ||||
| -rw-r--r-- | dev-java/icedtea/metadata.xml | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index aa7671b46669..b9083244ece2 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.15 2010/12/02 17:16:32 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.16 2010/12/02 19:38:54 caster Exp $ + + 02 Dec 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.3.ebuild, + metadata.xml: + Check that webstart flag is enabled if nsplugin flag is enabled. Document + this in metadata.xml. *icedtea-6.1.9.3 (02 Dec 2010) diff --git a/dev-java/icedtea/icedtea-6.1.9.3.ebuild b/dev-java/icedtea/icedtea-6.1.9.3.ebuild index bc1f1b997b46..45e1f8161d8f 100644 --- a/dev-java/icedtea/icedtea-6.1.9.3.ebuild +++ b/dev-java/icedtea/icedtea-6.1.9.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.9.3.ebuild,v 1.1 2010/12/02 17:16:34 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.9.3.ebuild,v 1.2 2010/12/02 19:38:54 caster Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -122,6 +122,11 @@ pkg_setup() { # fi # fi + if use nsplugin && ! use webstart ; then + eerror "WebStart is required if building the plugin." + die 'Re-try with USE="webstart"' + fi + # quite a hack since java-config does not provide a way for a package # to limit supported VM's for building and their preferred order if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml index 3d87256bd997..4c8c6f68b308 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -18,6 +18,7 @@ <flag name="hs19">Use the new version of HotSpot (19).</flag> <flag name="nio2">Enable backport of NIO2 to OpenJDK6.</flag> <flag name="nss">Enable NSS security provider support.</flag> + <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag> <!-- <flag name="shark">Enable Shark JIT support</flag> --> <flag name="systemtap">Enable SystemTap probes in HotSpot.</flag> <flag name="webstart">Enable Web Start support (via NetX).</flag> |