Security version bump, bug #330205. Remove the older 1.7.x.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 37 insertions, 479 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 77f137077f58..d7ed94ab6991 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2010/05/03 12:32:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.8 2010/07/30 11:10:04 caster Exp $
+
+*icedtea-6.1.8.1 (30 Jul 2010)
+
+  30 Jul 2010; Vlastimil Babka <caster@gentoo.org> -files/1.7.2-free.patch,
+  -files/6.1.7.3-systemtap-gcc-4.5.patch, -icedtea-6.1.7.2-r1.ebuild,
+  -icedtea-6.1.7.3.ebuild, +icedtea-6.1.8.1.ebuild, metadata.xml:
+  Security version bump, bug #330205. Remove the older 1.7.x.
 
 *icedtea-6.1.7.3 (03 May 2010)
 
diff --git a/dev-java/icedtea/files/1.7.2-free.patch b/dev-java/icedtea/files/1.7.2-free.patch
deleted file mode 100644
index 423d82363798..000000000000
--- a/dev-java/icedtea/files/1.7.2-free.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# HG changeset patch
-# User doko@ubuntu.com
-# Date 1270024644 -7200
-# Node ID 94084cbf82d3960227b9252d40d286635d5cfefd
-# Parent 6ff10812c44ae360727e752dd2173dc0133c77ea
-Fix typo in IcedTeaNPPlugin.cc.
-
-2010-03-31  Matthias Klose  <doko@ubuntu.com>
-
-        * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_start_appletviewer):
-        Fix typo.
-
---- a/ChangeLog	Wed Mar 31 02:58:12 2010 +0100
-+++ b/ChangeLog	Wed Mar 31 10:37:24 2010 +0200
-@@ -1,3 +1,8 @@ 2010-03-31  Andrew John Hughes  <ahughes
-+2010-03-31  Matthias Klose  <doko@ubuntu.com>
-+
-+	* plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_start_appletviewer):
-+	Fix typo.
-+
- 2010-03-31  Andrew John Hughes  <ahughes@redhat.com>
- 
- 	* configure.ac: Bump version to 1.7.2.
---- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed Mar 31 02:58:12 2010 +0100
-+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed Mar 31 10:37:24 2010 +0200
-@@ -1463,7 +1463,7 @@ plugin_start_appletviewer (GCJPluginData
-       command_line[5] = NULL;
-    } else
-    {
--       command_line = (gchar**) malloc(sizeof(gchar)*3);
-+       command_line = (gchar**) malloc(sizeof(gchar*)*3);
-        command_line[0] = g_strdup(appletviewer_executable);
-        command_line[1] = g_strdup("sun.applet.PluginMain");
-        command_line[2] = NULL;
-
diff --git a/dev-java/icedtea/files/6.1.7.3-systemtap-gcc-4.5.patch b/dev-java/icedtea/files/6.1.7.3-systemtap-gcc-4.5.patch
deleted file mode 100644
index e5004f032e31..000000000000
--- a/dev-java/icedtea/files/6.1.7.3-systemtap-gcc-4.5.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <ahughes@redhat.com>
-# Date 1272471515 -3600
-# Node ID c8d38c28900e01a04d730fc59f899ae0cd1d0779
-# Parent  c30ad39537453fa171d094f3534e79a2faf16fad
-PR476: Enable building SystemTap on GCC 4.5.
-
-2010-04-28  Andrew John Hughes  <ahughes@redhat.com>
-
-	PR icedtea/476
-	* Makefile.am:
-	Add patch when SystemTap is enabled to support
-	building with GCC 4.5.
-	* patches/systemtap-gcc-4.5.patch:
-	Add cast to NULL (doesn't apply to DTrace due
-	to differences between SystemTap and DTrace macros).
-
-diff -r c30ad3953745 -r c8d38c28900e ChangeLog
---- a/ChangeLog	Mon Apr 26 14:11:34 2010 +0200
-+++ b/ChangeLog	Wed Apr 28 17:18:35 2010 +0100
-@@ -1,3 +1,13 @@
-+2010-04-28  Andrew John Hughes  <ahughes@redhat.com>
-+
-+	PR icedtea/476
-+	* Makefile.am:
-+	Add patch when SystemTap is enabled to support
-+	building with GCC 4.5.
-+	* patches/systemtap-gcc-4.5.patch:
-+	Add cast to NULL (doesn't apply to DTrace due
-+	to differences between SystemTap and DTrace macros).
-+
- 2010-03-31  Andrew John Hughes  <ahughes@redhat.com>
- 
- 	* Makefile.am: Add Ant patch.
-diff -r c30ad3953745 -r c8d38c28900e Makefile.am
---- a/Makefile.am	Mon Apr 26 14:11:34 2010 +0200
-+++ b/Makefile.am	Wed Apr 28 17:18:35 2010 +0100
-@@ -374,7 +374,8 @@
- endif
- 
- if ENABLE_SYSTEMTAP
--ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
-+ICEDTEA_PATCHES += patches/icedtea-systemtap.patch \
-+	patches/systemtap-gcc-4.5.patch
- endif
- 
- if ENABLE_NSS
-diff -r c30ad3953745 -r c8d38c28900e patches/systemtap-gcc-4.5.patch
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/patches/systemtap-gcc-4.5.patch	Wed Apr 28 17:18:35 2010 +0100
-@@ -0,0 +1,11 @@
-+--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp	2010-04-28 08:51:29.000000000 +0100
-++++ openjdk/hotspot/src/share/vm/prims/jni.cpp	2010-04-28 09:29:22.000000000 +0100
-+@@ -2723,7 +2723,7 @@
-+ 
-+   if (!directBufferSupportInitializeEnded) {
-+     if (!initializeDirectBufferSupport(env, thread)) {
-+-      DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL);
-++      DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, (uintptr_t) NULL);
-+       return NULL;
-+     }
-+   }
diff --git a/dev-java/icedtea/icedtea-6.1.7.3.ebuild b/dev-java/icedtea/icedtea-6.1.7.3.ebuild
deleted file mode 100644
index d27c275105b5..000000000000
--- a/dev-java/icedtea/icedtea-6.1.7.3.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# 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.7.3.ebuild,v 1.1 2010/05/03 12:32:51 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 autotools 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.7.3"
-ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER}
-OPENJDK_BUILD="17"
-OPENJDK_DATE="14_oct_2009"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-HOTSPOT_TARBALL="62926c7f67a3.tar.gz"
-CACAO_TARBALL="cacao-0.99.4.tar.gz"
-SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-		 http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
-		 http://hg.openjdk.java.net/hsx/hsx16/master/archive/${HOTSPOT_TARBALL}
-		 cacao? ( http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/${CACAO_TARBALL} )"
-HOMEPAGE="http://icedtea.classpath.org"
-S=${WORKDIR}/${ICEDTEA_PKG}
-
-# Missing options:
-# shark - still experimental, requires llvm which is not yet packaged
-# visualvm - requries netbeans which would cause major bootstrap issues
-IUSE="cacao debug doc examples +hs16 javascript nio2 +npplugin 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 )
-	 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
-	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
-
-	if use nsplugin && ! use npplugin && has_version ">=net-libs/xulrunner-1.9.2"; then
-		eerror "The old plugin will not work with xulrunner >= 1.9.2 / Firefox >= 3.6."
-		die "Rebuild with the npplugin USE flag enabled."
-	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
-}
-
-src_prepare() {
-	# Fix build with SystemTap + gcc 4.5
-	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=476
-	if use systemtap; then
-		epatch "${FILESDIR}/${PV}-systemtap-gcc-4.5.patch"
-		eautoreconf || die "eautoreconf failed"
-	fi
-}
-
-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 nsplugin && use npplugin ; then
-		config="${config} --enable-npplugin"
-	fi
-
-	if use hs16 ; then
-		config="${config} --with-hotspot-build=hs16"
-	fi
-
-	unset_vars
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_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"
-
-	# Paludis does not respect unset from src_configure
-	unset_vars
-	emake -j 1  || die "make failed"
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${D}/${dest}"
-	dodir "${dest}" || die
-
-	local arch=${ARCH}
-	use x86 && arch=i586
-
-	dodoc README NEWS AUTHORS THANKYOU || die
-
-	cd "${S}/openjdk/build/linux-${arch}/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
-		use x86 && arch=i386;
-		if use npplugin; then
-		   install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaNPPlugin.so";
-		else
-		   install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so";
-		fi
-	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 can be enabled using eselect java-nsplugin"
-		if use npplugin; then
-			elog "Note that the IcedTeaNPPlugin works only in browsers based on xulrunner-1.9.1 or later"
-			elog "such as Firefox 3.5+, Chromium and perhaps some others too, and it is considered"
-			elog "alpha quality by upstream. The older plugin can be built with USE=\"-nnplugin\""
-			elog "but it does not support xulrunner-1.9.2 (Firefox 3.6) or Chromium."
-		else
-			elog "Note that the IcedTeaPlugin works only in browsers based on xulrunner-1.9.0 or 1.9.1"
-			elog "such as Firefox 3 or 3.5, Epiphany 2.24 and not in older versions!"
-			elog "Also note that you need to recompile icedtea${SLOT} if you upgrade"
-			elog "from xulrunner-1.9.0 to 1.9.1."
-			elog "To support xulrunner-1.9.2 (Firefox 3.6) and Chromium, enable USE=npplugin"
-		fi
-	fi
-}
diff --git a/dev-java/icedtea/icedtea-6.1.7.2-r1.ebuild b/dev-java/icedtea/icedtea-6.1.8.1.ebuild
index 11fdfeb934c8..b4013fb22122 100644
--- a/dev-java/icedtea/icedtea-6.1.7.2-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.8.1.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.7.2-r1.ebuild,v 1.1 2010/03/31 15:36:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.8.1.ebuild,v 1.1 2010/07/30 11:10:04 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -16,16 +16,22 @@ SLOT="6"
 KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies"
-ICEDTEA_VER="1.7.2"
+ICEDTEA_VER="1.8.1"
 ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER}
-OPENJDK_BUILD="17"
-OPENJDK_DATE="14_oct_2009"
+OPENJDK_BUILD="18"
+OPENJDK_DATE="16_feb_2010"
 OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
 HOTSPOT_TARBALL="62926c7f67a3.tar.gz"
+JAXP_TARBALL="jdk6-jaxp-2009_10_13.zip"
+JAXWS_TARBALL="jdk6-jaxws-2009_10_27.zip"
+JAF_TARBALL="jdk6-jaf-2009_10_27.zip"
 CACAO_TARBALL="cacao-0.99.4.tar.gz"
 SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
 		 http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
 		 http://hg.openjdk.java.net/hsx/hsx16/master/archive/${HOTSPOT_TARBALL}
+		 https://jaxp.dev.java.net/files/documents/913/147329/${JAXP_TARBALL}
+		 http://kenai.com/projects/jdk6-drops/downloads/download/${JAXWS_TARBALL}
+		 http://kenai.com/projects/jdk6-drops/downloads/download/${JAF_TARBALL}
 		 cacao? ( http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/${CACAO_TARBALL} )"
 HOMEPAGE="http://icedtea.classpath.org"
 S=${WORKDIR}/${ICEDTEA_PKG}
@@ -33,7 +39,7 @@ S=${WORKDIR}/${ICEDTEA_PKG}
 # Missing options:
 # shark - still experimental, requires llvm which is not yet packaged
 # visualvm - requries netbeans which would cause major bootstrap issues
-IUSE="cacao debug doc examples +hs16 javascript nio2 +npplugin nsplugin +nss pulseaudio systemtap +xrender zero"
+IUSE="cacao debug doc examples +hs16 javascript nio2 nsplugin +nss pulseaudio systemtap +xrender zero"
 
 # JTReg doesn't pass at present
 RESTRICT="test"
@@ -55,7 +61,7 @@ RDEPEND=">=net-print/cups-1.2.12
 	 >=sys-libs/zlib-1.2.3
 	 x11-proto/inputproto
 	 x11-proto/xineramaproto
-	 nsplugin? ( >=net-libs/xulrunner-1.9 )
+	 nsplugin? ( >=net-libs/xulrunner-1.9.1 )
 	 pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
 	 javascript? ( dev-java/rhino:1.6 )
 	 zero? ( virtual/libffi )
@@ -75,14 +81,16 @@ RDEPEND=">=net-print/cups-1.2.12
 #   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}
 	)
-	>=virtual/jdk-1.5
 	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
@@ -96,6 +104,11 @@ DEPEND="${RDEPEND}
 	)
 	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
@@ -110,11 +123,6 @@ pkg_setup() {
 #	  fi
 #	fi
 
-	if use nsplugin && ! use npplugin && has_version ">=net-libs/xulrunner-1.9.2"; then
-		eerror "The old plugin will not work with xulrunner >= 1.9.2 / Firefox >= 3.6."
-		die "Rebuild with the npplugin USE flag enabled."
-	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
@@ -153,10 +161,6 @@ src_unpack() {
 	unpack ${ICEDTEA_PKG}.tar.gz
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/1.7.2-free.patch"
-}
-
 unset_vars() {
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
 }
@@ -172,7 +176,7 @@ src_configure() {
 		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=$(java-pkg_getjar --build-only eclipse-ecj:3.3 ecj.jar)" \
+		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}."
@@ -196,10 +200,6 @@ src_configure() {
 		rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
 	fi
 
-	if use nsplugin && use npplugin ; then
-		config="${config} --enable-npplugin"
-	fi
-
 	if use hs16 ; then
 		config="${config} --with-hotspot-build=hs16"
 	fi
@@ -209,6 +209,9 @@ src_configure() {
 	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" \
@@ -233,7 +236,7 @@ src_compile() {
 	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"
+	export ANT_TASKS="xerces-2 xalan ant-nodeps"
 
 	# Paludis does not respect unset from src_configure
 	unset_vars
@@ -278,11 +281,7 @@ src_install() {
 
 	if use nsplugin; then
 		use x86 && arch=i386;
-		if use npplugin; then
-		   install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaNPPlugin.so";
-		else
-		   install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so";
-		fi
+		install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so";
 	fi
 
 	# We need to generate keystore - bug #273306
@@ -311,18 +310,8 @@ pkg_postinst() {
 	java-vm-2_pkg_postinst
 
 	if use nsplugin; then
-		elog "The icedtea${SLOT} browser plugin can be enabled using eselect java-nsplugin"
-		if use npplugin; then
-			elog "Note that the IcedTeaNPPlugin works only in browsers based on xulrunner-1.9.1 or later"
-			elog "such as Firefox 3.5+, Chromium and perhaps some others too, and it is considered"
-			elog "alpha quality by upstream. The older plugin can be built with USE=\"-nnplugin\""
-			elog "but it does not support xulrunner-1.9.2 (Firefox 3.6) or Chromium."
-		else
-			elog "Note that the IcedTeaPlugin works only in browsers based on xulrunner-1.9.0 or 1.9.1"
-			elog "such as Firefox 3 or 3.5, Epiphany 2.24 and not in older versions!"
-			elog "Also note that you need to recompile icedtea${SLOT} if you upgrade"
-			elog "from xulrunner-1.9.0 to 1.9.1."
-			elog "To support xulrunner-1.9.2 (Firefox 3.6) and Chromium, enable USE=npplugin"
-		fi
+		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 90b861fe369d..f78b83af5f09 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -17,7 +17,6 @@
   <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="nio2">Enable backport of NIO2 to OpenJDK6.</flag>
-  <flag name="npplugin">Enable the new alpha-quality plugin which works with Firefox 3.6+ and Chromium.</flag>
   <flag name="nss">Enable NSS security provider support.</flag>
 <!--  <flag name="shark">Enable Shark JIT support</flag> -->
   <flag name="systemtap">Enable SystemTap probes in HotSpot.</flag>