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 | c982967f4018aa0659dafff5b93e33d862657e04 (patch) | |
| tree | 22a9c648d5bccf418526ab0b65506f8cbe2e550b /dev-java/icedtea | |
| parent | 0.7.31 version bump. (diff) | |
| download | historical-c982967f4018aa0659dafff5b93e33d862657e04.tar.gz historical-c982967f4018aa0659dafff5b93e33d862657e04.tar.bz2 historical-c982967f4018aa0659dafff5b93e33d862657e04.zip | |
Check that webstart flag is enabled if nsplugin flag is enabled. Document this in metadata.xml.
Package-Manager: portage-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/Manifest | 6 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-6.1.9.3.ebuild | 7 | ||||
| -rw-r--r-- | dev-java/icedtea/metadata.xml | 1 |
4 files changed, 16 insertions, 5 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/Manifest b/dev-java/icedtea/Manifest index 0ee6edbaed50..0be9378d90ff 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -12,6 +12,6 @@ DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 DIST openjdk-6-src-b20-21_jun_2010.tar.gz 45078703 RMD160 5248e9b3ed762829c33bf2ff7e3ca0cbf4bee5d2 SHA1 39fc162a740f16aa18afa855fea9d5daf8cf03d4 SHA256 fcf8f1d614e5965e90ef1b1a6d5eecc2bcc3078eaffbb62b83dfba52da62e54b EBUILD icedtea-6.1.9.1.ebuild 10608 RMD160 6d210b5ca9c3926928d92eec707353df86df92e0 SHA1 d643e30f32f859b6ca15d8e65acbc6b4d102bbe9 SHA256 db4936fac710825238335187dea5d6ad4d7b4b58d034c804f57dd9d696bc770e EBUILD icedtea-6.1.9.2.ebuild 10613 RMD160 aaaaea5202090207a3136888d357fc77e84d6987 SHA1 bb34379f15eaf0628c30d7bbb3c9a889006aa5a1 SHA256 ebef769c7e234cf4a14afbef0b195b44b2c7d905b60b70ff60b75aa2afe28498 -EBUILD icedtea-6.1.9.3.ebuild 10613 RMD160 4a4c1c76d64a35ac918b178bcf3229f3d570db9d SHA1 f8efd34f0c3e9445a17c7c28a8acc215b94ddd6e SHA256 ef858dba81d0f494d04cf9ac2c3d6be4573a806d947fe22e07d9fb24e559e5d7 -MISC ChangeLog 3222 RMD160 3e00dc91d10f4e5d2d576564813663faf6558fa6 SHA1 a99ddff8dd380609ecc81436689e8e719b6e37b7 SHA256 286c05e4b058caf2b7a85b62efe8a2d924bdde045770bd2c2b31a1ac842f7e04 -MISC metadata.xml 1376 RMD160 383a4459bf18e1a4a8062d4dec0ab32ed4e51d45 SHA1 5cf5916a1c85de3924fa6f67468e220c1a3129e1 SHA256 0ff71d8db2740303f586a811773b8a2e1023d724723468c2ea82344642d84820 +EBUILD icedtea-6.1.9.3.ebuild 10751 RMD160 ec1a105da62d3986090921ba5de5d60d2d3fbf3f SHA1 d77c0fa320667d21fcf384386d5ef9c86774d49d SHA256 633a976e54494606111ce5e18c17e25e89a6c66aac3e766a2b2c3e45fec1f237 +MISC ChangeLog 3414 RMD160 ab959614f6e1098e63d4f6fc358332cc7d5f9414 SHA1 1dcc1867e496e8c8a5d3b544b9aa03420183edc7 SHA256 32ef95a0570d1340cb6dbd6f490d3021e75c63073b9057b6468d2f3f99927873 +MISC metadata.xml 1488 RMD160 c219e274f64f63b4c4592f2e3e9a3ad057164c40 SHA1 7f502d7b065098357570a5e88066008eec7532b5 SHA256 cc617d5cc3325f92365746d0fcdb62cd247fa2077b2b8686dbe553c05c8c1311 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> |