summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2010-10-13 08:22:22 +0000
committerVlastimil Babka <caster@gentoo.org>2010-10-13 08:22:22 +0000
commit6cfbfd87b6b1ec7c8003f9747e3115787f2a3475 (patch)
treeab0a018a7a478c225b63e63f0ec4bf01311e31db /dev-java
parentRespect LDFLAGS. Bug #335519 (diff)
downloadhistorical-6cfbfd87b6b1ec7c8003f9747e3115787f2a3475.tar.gz
historical-6cfbfd87b6b1ec7c8003f9747e3115787f2a3475.tar.bz2
historical-6cfbfd87b6b1ec7c8003f9747e3115787f2a3475.zip
Version bump, security bug #340819.
Package-Manager: portage-2.2_rc91/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/icedtea/ChangeLog8
-rw-r--r--dev-java/icedtea/Manifest7
-rw-r--r--dev-java/icedtea/icedtea-6.1.9.1.ebuild315
-rw-r--r--dev-java/icedtea/metadata.xml1
4 files changed, 328 insertions, 3 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 406b6b31547e..aafa784e3db7 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,12 @@
# 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.9 2010/09/09 13:35:24 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.10 2010/10/13 08:22:22 caster Exp $
+
+*icedtea-6.1.9.1 (13 Oct 2010)
+
+ 13 Oct 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.1.ebuild,
+ metadata.xml:
+ Version bump, security bug #340819.
*icedtea-6.1.9 (09 Sep 2010)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index f2b2e0057d0b..960bff5f02da 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,11 +1,13 @@
AUX 6.1.8.0-systemtap-gcc-4.5.patch 2126 RMD160 df47a4640738ce825106c3607fbaff2f4e863801 SHA1 57cb61e877e06886ff4a259cbc0372bcbf145ac1 SHA256 5a41b9657f07cc9667dbae0bd0d4b01d2afd66fef168f001835fe60cc8bb7cce
AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
AUX icedtea.env 999 RMD160 83d735b0941a9e33c4dd3f3bd3fe16e64c55f5e1 SHA1 6d8da5ad9d396d96f16f148c3a826d9e2a357d0e SHA256 85dc9543de305637739eea7b58e61865bd780aa50fd574ce19ccd95bc1013ec1
+DIST 0803c0f69b51.tar.gz 8394035 RMD160 4b3f252df8f37e227d60714534f30bf567285b25 SHA1 95194930575dbe078a01eb9ed0eae1008cc1cb56 SHA256 e3dbef797c1fd8cd2fc050ce2d998d508baa3f14cab55c6ed0f82d4c724ae08b
DIST 62926c7f67a3.tar.gz 8080848 RMD160 1d9a41c4efddb75181b5cc5e301be4d4d1aead56 SHA1 0cf4d7b56da4edfeab47d413d6bb1b810e347b3f SHA256 fedfee5b5eb0acf4e7c3b90f46c02318e512a67034364d90c411f2b8e3a31cc6
DIST cacao-0.99.4.tar.gz 3917411 RMD160 bde50674e07c3a1e6ed8c4a8fdc6273a2a23dd1a SHA1 d9d159f8f905a9fa53ea7ae0f50a442dbd6b5e84 SHA256 c6090c1d2ed3c60acda0076b62563598267be8dab270ce49ee1035002a2510cf
DIST e321b101a9ee.tar.bz2 2727158 RMD160 16cb5c6f58197dbfd690e578418fadf911935ed7 SHA1 b41d54057cd98bddb8adb6bd4c1e50b08eaef411 SHA256 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
DIST icedtea6-1.8.1.tar.gz 6093074 RMD160 bde307437286a192fd5a0725af92685df45314fd SHA1 ea9264aad1e7de44d2abe90d6a0f726da0260972 SHA256 ebbc11f5f0ba0cfe3cba82471b1cc2611ac1ba28f59fbc5b047f41bd41b51839
DIST icedtea6-1.8.tar.gz 6068172 RMD160 7f536afa37335fc183e7bd52996ca63c5aa1db14 SHA1 8866033807100f5a141f89a21c992b357c6e88bc SHA256 6823ff87969d978fe5523c729be3074142698c89acc8cc96c05b849fde54f61b
+DIST icedtea6-1.9.1.tar.gz 6395453 RMD160 a0b148739a08632c41e8c2da2ab5455d02ee22bf SHA1 d0ff8b854fd0cd8d7ce7ba01f96d25a4428016e6 SHA256 d773a6eb60f560d291206bfdeb83b1da03b79c7c09b7ae53da1877e57ddb3cea
DIST icedtea6-1.9.tar.gz 6330215 RMD160 336b65c2675fa12be487d1618849c7edc5d26063 SHA1 b5201055a2ac9e6beb991a50e7bf60c0ee2433f2 SHA256 829ca9d920b60c62c5568fabf0458a7f8ac25294b07a7befbd82a80fe65da867
DIST jdk6-jaf-2009_10_27.zip 69593 RMD160 f1c635a23efbe88ec364aab53c2adf6eea69a5eb SHA1 92a17d19bec6dbce09cc04ad78abd0682367ba2e SHA256 fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f
DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
@@ -17,6 +19,7 @@ DIST openjdk-6-src-b18-16_feb_2010.tar.gz 44216412 RMD160 7ccb0ad2827f94dd07ebfb
DIST openjdk-6-src-b20-21_jun_2010.tar.gz 45078703 RMD160 5248e9b3ed762829c33bf2ff7e3ca0cbf4bee5d2 SHA1 39fc162a740f16aa18afa855fea9d5daf8cf03d4 SHA256 fcf8f1d614e5965e90ef1b1a6d5eecc2bcc3078eaffbb62b83dfba52da62e54b
EBUILD icedtea-6.1.8.0.ebuild 10923 RMD160 6f7a2624be608a466988eb4c086a78cd02b9ddfd SHA1 7910962f4508f9f9a8a1f675a8468563724e713f SHA256 53c0679f9b7faad90f1377226a0fee31e781a22d4cb3b429643c0ab172c5e456
EBUILD icedtea-6.1.8.1.ebuild 10674 RMD160 543dff9cf335b8ef38023240a59038e0a62caac0 SHA1 465d1a2473a343c1a8b0189df1b88873115c575a SHA256 54412438c24d84f5f4ed743577e96de3539f95d3eb1ba842915b94a97b3778e1
+EBUILD icedtea-6.1.9.1.ebuild 10565 RMD160 3d84a23ded8a71b899ce0cd5eb5add8e99834a83 SHA1 d361ee20cfa022ab3ebc3c1863f6026fc02a0933 SHA256 4a3e9c0877582c1d1f7e4d1fdfd0e6a32d0c5ce30024b071e176abfbd5138310
EBUILD icedtea-6.1.9.ebuild 10371 RMD160 d0bd5e94ba8cd56cf0995fa0e6c23f40541e7188 SHA1 2d4ba36419a290029367c701e6b9e5e69b0fc433 SHA256 febae064d27ff7f49ad7b815ae0234a174274b980e3c25e60d2d0868ed6bce12
-MISC ChangeLog 2191 RMD160 6dae47fc8662510ac68ea8d67a4cd3dc0132d969 SHA1 001c705d2bfb7edf3f847f38dba908329ffd49c1 SHA256 08a11c186e60f8b22618a44427cbe5c32b85f1d5311c040e624e8769c2d14c2b
-MISC metadata.xml 1308 RMD160 7fd0e996d1b10703bdd92c246763b005db93d0bf SHA1 907a526e3ad1c4436a53261f0cc59f7b916933de SHA256 fbd4f14f2da6a4c7052681487d2f306d968a733a6f12143a263a0c8b1a717edb
+MISC ChangeLog 2355 RMD160 d7eaeb4a1e74e1414728addacad4b6a13bf4e136 SHA1 947f9799385ea598481c8a8352e80689ce0cc94c SHA256 79d38471feeacec072cd58c0878a154af4d8de9a2a138c16c144c3a633c98a1f
+MISC metadata.xml 1372 RMD160 c7f6a554a2335f1ac2e7ee2085cc786983762c91 SHA1 dd6f23f35e6dd1714450eba67c58da74450743ea SHA256 19a94c3ce56aa1ea19d57636db087b48f542c67cf90c9dc79cfbf9806b0e1b62
diff --git a/dev-java/icedtea/icedtea-6.1.9.1.ebuild b/dev-java/icedtea/icedtea-6.1.9.1.ebuild
new file mode 100644
index 000000000000..d71a9dd275fd
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.9.1.ebuild
@@ -0,0 +1,315 @@
+# 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.1.ebuild,v 1.1 2010/10/13 08:22:22 caster Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="2"
+
+inherit pax-utils java-pkg-2 java-vm-2
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="6"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies"
+ICEDTEA_VER="1.9.1"
+ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER}
+OPENJDK_BUILD="20"
+OPENJDK_DATE="21_jun_2010"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+JAXP_TARBALL="jdk6-jaxp-b20.zip"
+JAXWS_TARBALL="jdk6-jaxws-b20.zip"
+JAF_TARBALL="jdk6-jaf-b20.zip"
+HOTSPOT_TARBALL="0803c0f69b51.tar.gz"
+CACAO_TARBALL="e321b101a9ee.tar.bz2"
+SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+ http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
+ https://jax-ws.dev.java.net/files/documents/4202/150724/${JAXWS_TARBALL}
+ https://jax-ws.dev.java.net/files/documents/4202/150725/${JAF_TARBALL}
+ https://jaxp.dev.java.net/files/documents/913/150648/${JAXP_TARBALL}
+ http://hg.openjdk.java.net/hsx/hsx19/master/archive/${HOTSPOT_TARBALL}
+ cacao? ( http://mips.complang.tuwien.ac.at/hg/cacao/archive/${CACAO_TARBALL} )"
+HOMEPAGE="http://icedtea.classpath.org"
+S=${WORKDIR}/${ICEDTEA_PKG}
+
+# Missing options:
+# shark - needs adding
+IUSE="cacao debug doc examples +hs19 javascript nio2 nsplugin +nss pulseaudio systemtap +xrender zero"
+
+# JTReg doesn't pass at present
+RESTRICT="test"
+
+RDEPEND=">=net-print/cups-1.2.12
+ >=x11-libs/libX11-1.1.3
+ >=media-libs/freetype-2.3.5
+ >=media-libs/alsa-lib-1.0
+ >=x11-libs/gtk+-2.8
+ >=x11-libs/libXinerama-1.0.2
+ >=x11-libs/libXp-1.0.0
+ >=x11-libs/libXi-1.1.3
+ >=x11-libs/libXau-1.0.3
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXtst-1.0.3
+ >=media-libs/jpeg-6b
+ >=media-libs/libpng-1.2
+ >=media-libs/giflib-4.1.6
+ >=sys-libs/zlib-1.2.3
+ x11-proto/inputproto
+ x11-proto/xineramaproto
+ nsplugin? ( >=net-libs/xulrunner-1.9.1 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
+ javascript? ( dev-java/rhino:1.6 )
+ zero? ( virtual/libffi )
+ xrender? ( >=x11-libs/libXrender-0.9.4 )
+ systemtap? ( >=dev-util/systemtap-1 )
+ !dev-java/icedtea6
+ nss? ( >=dev-libs/nss-3.12.5-r1 )"
+
+# Additional dependencies for building:
+# zip: extract OpenJDK tarball, and needed by configure
+# xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly)
+# ant, ecj, jdk: required to build Java code
+# Only ant-core-1.7.1-r2 and later contain a version of Ant that
+# properly respects environment variables, if the build
+# sets some environment variables.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+DEPEND="${RDEPEND}
+ || (
+ ( >=dev-java/gcj-jdk-4.3 =app-admin/eselect-ecj-0.5-r1 )
+ ( >=dev-java/cacao-0.99.2 =app-admin/eselect-ecj-0.5-r1 )
+ dev-java/icedtea6-bin
+ dev-java/icedtea:${SLOT}
+ )
+ app-arch/zip
+ >=dev-java/xalan-2.7.0:0
+ >=dev-java/xerces-2.9.1:2
+ >=dev-java/ant-core-1.7.1-r2
+ dev-java/ant-nodeps
+ app-misc/ca-certificates
+ dev-lang/perl
+ dev-libs/openssl
+ || (
+ (
+ >=x11-libs/libXext-1.1.1
+ >=x11-proto/xextproto-7.1.1
+ x11-proto/xproto
+ )
+ <x11-libs/libXext-1.1.1
+ )
+ sys-apps/lsb-release"
+
+# a bit of hack so the VM switching is triggered without causing dependency troubles
+JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
+JAVA_PKG_WANT_SOURCE="1.5"
+JAVA_PKG_WANT_TARGET="1.5"
+
+pkg_setup() {
+# Shark support disabled for now - still experimental and needs sys-devel/llvm
+# if use shark ; then
+# if ( ! use x86 && ! use sparc && ! use ppc ) ; then
+# eerror "The Shark JIT has known issues on 64-bit platforms. Please rebuild"
+# errror "without the shark USE flag turned on."
+# die "Rebuild without the shark USE flag on."
+# fi
+# if ( ! use zero ) ; then
+# eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
+# die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
+# fi
+# 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
+ einfo "Honoring user-set JAVA_PKG_FORCE_VM"
+ elif has_version "dev-java/icedtea:${SLOT}"; then
+ JAVA_PKG_FORCE_VM="icedtea6"
+ elif has_version dev-java/icedtea6; then
+ JAVA_PKG_FORCE_VM="icedtea6"
+ elif has_version dev-java/icedtea6-bin; then
+ JAVA_PKG_FORCE_VM="icedtea6-bin"
+ elif has_version dev-java/gcj-jdk; then
+ JAVA_PKG_FORCE_VM="gcj-jdk"
+ elif has_version dev-java/cacao; then
+ JAVA_PKG_FORCE_VM="cacao"
+ else
+ JAVA_PKG_FORCE_VM=""
+ # don't die just yet if merging a binpkg - bug #258423
+ DIE_IF_NOT_BINPKG=true
+ fi
+
+ # if the previous failed, don't even run java eclasses pkg_setup
+ # as it might also die when no VM is present
+ if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+ einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+ java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
+ fi
+
+ VMHANDLE="icedtea${SLOT}"
+}
+
+src_unpack() {
+ if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
+ die "Unable to find a supported VM for building"
+ fi
+ unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+unset_vars() {
+ unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+}
+
+src_configure() {
+ local config procs rhino_jar
+ local vm=$(java-pkg_get-current-vm)
+ local vmhome="/usr/lib/jvm/${vm}"
+
+ # IcedTea6 can't be built using IcedTea7; its class files are too new
+ if [[ "${vm}" == "icedtea6" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then
+ # If we are upgrading icedtea, then we don't need to bootstrap.
+ config="${config} --with-openjdk=$(java-config -O)"
+ elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
+ # For other 1.5 JDKs e.g. GCJ, CACAO.
+ config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \
+ config="${config} --with-gcj-home=${vmhome}"
+ else
+ eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
+ die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
+ fi
+
+ # OpenJDK-specific parallelism support.
+ procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
+ if [[ -n ${procs} ]] ; then
+ config="${config} --with-parallel-jobs=${procs}";
+ einfo "Configuring using --with-parallel-jobs=${procs}"
+ fi
+
+ if use_zero ; then
+ config="${config} --enable-zero"
+ else
+ config="${config} --disable-zero"
+ fi
+
+ if use javascript ; then
+ rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
+ fi
+
+ if use hs19 ; then
+ config="${config} --with-hotspot-build=hs19"
+ fi
+
+ unset_vars
+
+ econf ${config} \
+ --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+ --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
+ --with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
+ --with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+ --with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
+ --with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
+ --with-java="${vmhome}/bin/java" \
+ --with-javac="${vmhome}/bin/javac" \
+ --with-javah="${vmhome}/bin/javah" \
+ --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+ $(use_enable !debug optimizations) \
+ $(use_enable doc docs) \
+ $(use_enable nsplugin plugin) \
+ $(use_with javascript rhino ${rhino_jar}) \
+ $(use_enable cacao) \
+ $(use_enable pulseaudio pulse-java) \
+ $(use_enable xrender) \
+ $(use_enable systemtap) \
+ $(use_enable nio2) \
+ $(use_enable nss) \
+ || die "configure failed"
+}
+
+src_compile() {
+ # Newer versions of Gentoo's ant add
+ # an environment variable so it works properly...
+ export ANT_RESPECT_JAVA_HOME=TRUE
+ # ant -diagnostics in Ant 1.8.0 fails without these
+ # otherwise we try to load the least that's needed to avoid possible classpath collisions
+ export ANT_TASKS="xerces-2 xalan ant-nodeps"
+
+ # Paludis does not respect unset from src_configure
+ unset_vars
+ emake -j 1 || die "make failed"
+}
+
+src_install() {
+ local dest="${ROOT}usr/$(get_libdir)/icedtea${SLOT}"
+ local ddest="${D}/${dest}"
+ dodir "${dest}" || die
+
+ dodoc README NEWS AUTHORS THANKYOU || die
+ dosym "${ROOT}usr/share/doc/${PF}" "${ROOT}usr/share/doc/${PN}${SLOT}"
+
+ cd "${S}/openjdk.build/j2sdk-image" || die
+
+ if use doc ; then
+ # java-pkg_dohtml needed for package-list #302654
+ java-pkg_dohtml -r ../docs/* || die "Failed to install documentation"
+ fi
+
+ # doins can't handle symlinks.
+ cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
+
+ # Set PaX markings on all JDK/JRE executables to allow code-generation on
+ # the heap by the JIT compiler.
+ pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
+
+ dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README || die
+
+ if use examples; then
+ dodir "${dest}/share";
+ cp -vRP demo sample "${ddest}/share/" || die
+ fi
+
+ cp src.zip "${ddest}" || die
+
+ # Fix the permissions.
+ find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+ if use nsplugin; then
+ local arch=${ARCH};
+ use x86 && arch=i386;
+ install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so";
+ fi
+
+ # We need to generate keystore - bug #273306
+ einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/"
+ mkdir "${T}/certgen" && cd "${T}/certgen" || die
+ cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+ for c in /usr/share/ca-certificates/*/*.crt; do
+ openssl x509 -text -in "${c}" >> all.crt || die
+ done
+ ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+ cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+ chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+ sed -e "s/@SLOT@/${SLOT}/g" \
+ -e "s/@PV@/${ICEDTEA_VER}/g" \
+ < "${FILESDIR}/icedtea.env" > "${T}/icedtea.env"
+ set_java_env "${T}/icedtea.env"
+}
+
+use_zero() {
+ use zero || ( ! use amd64 && ! use x86 && ! use sparc )
+}
+
+pkg_postinst() {
+ # Set as default VM if none exists
+ java-vm-2_pkg_postinst
+
+ if use nsplugin; then
+ elog "The icedtea${SLOT} browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
+ elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
+ elog "such as Firefox 3.5+, Chromium and perhaps some others too."
+ fi
+}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index f78b83af5f09..fd5a10e5c73a 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -16,6 +16,7 @@
<use>
<flag name="cacao">Use the CACAO virtual machine instead of HotSpot on x86, amd64 or SPARC architectures.</flag>
<flag name="hs16">Use the new version of HotSpot (16).</flag>
+ <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="shark">Enable Shark JIT support</flag> -->