| 1 |
caster 10/12/02 19:38:54 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog icedtea-6.1.9.3.ebuild |
| 4 |
Log: |
| 5 |
Check that webstart flag is enabled if nsplugin flag is enabled. Document this in metadata.xml. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 dev-java/icedtea/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/metadata.xml?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/metadata.xml,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- metadata.xml 25 Nov 2010 21:22:46 -0000 1.5 |
| 23 |
+++ metadata.xml 2 Dec 2010 19:38:54 -0000 1.6 |
| 24 |
@@ -18,6 +18,7 @@ |
| 25 |
<flag name="hs19">Use the new version of HotSpot (19).</flag> |
| 26 |
<flag name="nio2">Enable backport of NIO2 to OpenJDK6.</flag> |
| 27 |
<flag name="nss">Enable NSS security provider support.</flag> |
| 28 |
+ <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag> |
| 29 |
<!-- <flag name="shark">Enable Shark JIT support</flag> --> |
| 30 |
<flag name="systemtap">Enable SystemTap probes in HotSpot.</flag> |
| 31 |
<flag name="webstart">Enable Web Start support (via NetX).</flag> |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.16 dev-java/icedtea/ChangeLog |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.16&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?rev=1.16&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/ChangeLog?r1=1.15&r2=1.16 |
| 40 |
|
| 41 |
Index: ChangeLog |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v |
| 44 |
retrieving revision 1.15 |
| 45 |
retrieving revision 1.16 |
| 46 |
diff -u -r1.15 -r1.16 |
| 47 |
--- ChangeLog 2 Dec 2010 17:16:32 -0000 1.15 |
| 48 |
+++ ChangeLog 2 Dec 2010 19:38:54 -0000 1.16 |
| 49 |
@@ -1,6 +1,11 @@ |
| 50 |
# ChangeLog for dev-java/icedtea |
| 51 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 52 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.15 2010/12/02 17:16:32 caster Exp $ |
| 53 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.16 2010/12/02 19:38:54 caster Exp $ |
| 54 |
+ |
| 55 |
+ 02 Dec 2010; Vlastimil Babka <caster@g.o> icedtea-6.1.9.3.ebuild, |
| 56 |
+ metadata.xml: |
| 57 |
+ Check that webstart flag is enabled if nsplugin flag is enabled. Document |
| 58 |
+ this in metadata.xml. |
| 59 |
|
| 60 |
*icedtea-6.1.9.3 (02 Dec 2010) |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.2 dev-java/icedtea/icedtea-6.1.9.3.ebuild |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.9.3.ebuild?rev=1.2&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.9.3.ebuild?rev=1.2&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/icedtea-6.1.9.3.ebuild?r1=1.1&r2=1.2 |
| 70 |
|
| 71 |
Index: icedtea-6.1.9.3.ebuild |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.9.3.ebuild,v |
| 74 |
retrieving revision 1.1 |
| 75 |
retrieving revision 1.2 |
| 76 |
diff -u -r1.1 -r1.2 |
| 77 |
--- icedtea-6.1.9.3.ebuild 2 Dec 2010 17:16:34 -0000 1.1 |
| 78 |
+++ icedtea-6.1.9.3.ebuild 2 Dec 2010 19:38:54 -0000 1.2 |
| 79 |
@@ -1,6 +1,6 @@ |
| 80 |
# Copyright 1999-2010 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
-# $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 $ |
| 83 |
+# $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 $ |
| 84 |
# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org) |
| 85 |
|
| 86 |
# ********************************************************* |
| 87 |
@@ -122,6 +122,11 @@ |
| 88 |
# fi |
| 89 |
# fi |
| 90 |
|
| 91 |
+ if use nsplugin && ! use webstart ; then |
| 92 |
+ eerror "WebStart is required if building the plugin." |
| 93 |
+ die 'Re-try with USE="webstart"' |
| 94 |
+ fi |
| 95 |
+ |
| 96 |
# quite a hack since java-config does not provide a way for a package |
| 97 |
# to limit supported VM's for building and their preferred order |
| 98 |
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then |
Archives