From 95026e0f95eb51c60b70a400d1f1e6ab4aa33c49 Mon Sep 17 00:00:00 2001
From: Vlastimil Babka <caster@gentoo.org>
Date: Fri, 4 Nov 2011 09:39:43 +0000
Subject: [PATCH] Prepare for icedtea VMHANDLE change. Remove old.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64
---
 dev-java/icedtea-web/ChangeLog                |   7 +-
 dev-java/icedtea-web/Manifest                 |   9 +-
 dev-java/icedtea-web/icedtea-web-1.1.1.ebuild | 136 ----------------
 .../icedtea-web/icedtea-web-1.1.2-r1.ebuild   | 145 ------------------
 dev-java/icedtea-web/icedtea-web-1.1.2.ebuild | 143 -----------------
 dev-java/icedtea-web/icedtea-web-1.1.3.ebuild |   9 +-
 dev-java/icedtea/Manifest                     |   3 +-
 7 files changed, 17 insertions(+), 435 deletions(-)
 delete mode 100644 dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
 delete mode 100644 dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild
 delete mode 100644 dev-java/icedtea-web/icedtea-web-1.1.2.ebuild

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 42fe60d5c1ce..169c19237ea9 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea-web
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.11 2011/09/29 13:06:23 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.12 2011/11/04 09:39:42 caster Exp $
+
+  04 Nov 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.1.1.ebuild,
+  -icedtea-web-1.1.2.ebuild, -icedtea-web-1.1.2-r1.ebuild,
+  icedtea-web-1.1.3.ebuild:
+  Prepare for icedtea VMHANDLE change. Remove old.
 
 *icedtea-web-1.1.3 (29 Sep 2011)
 
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index dc9ab444de84..6150be62b0f8 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,11 +1,6 @@
 AUX 0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch 1210 RMD160 d151ee610070429d73d676e07a4bc9b876f1b5b0 SHA1 3a9983dabe0387e9bc396326d937e98830fdaf34 SHA256 90ad27ff80dc42159aef9f4950511328f4ed78941911ce1f89608c08632808c7
 AUX 0002-Respect-LDFLAGS.patch 352 RMD160 350d3e85929372dc4193834e6994787aceed7003 SHA1 66a60a87bf6b5487a55e036bef9df42918988b9d SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866
-DIST icedtea-web-1.1.1.tar.gz 806633 RMD160 7267f279726bc1aa70f298721f757822b5189cfb SHA1 332874daf5f01fd6db3e60b4dbe3b40b8b269014 SHA256 0051005302e698f2468e6cae275b8c58869c85be04c269f2f266389a4e6a66c7
-DIST icedtea-web-1.1.2.tar.gz 807736 RMD160 7ca33e6759aec27567a22b07f02afc775339d513 SHA1 f862220b4504e688706b743f68f62c81e57bc183 SHA256 3051f3bf1e1d07ad7aaa28b204821a7c0631848d20ba7942fc23440e774649e4
 DIST icedtea-web-1.1.3.tar.gz 810141 RMD160 7f3c7063e538d15730337e1991fe9f1038cf83fe SHA1 5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37 SHA256 012390dfa8bb9a4b17b30640dfc21011c848f5017d2a21d945e933f5d514edb3
-EBUILD icedtea-web-1.1.1.ebuild 3939 RMD160 b3eef443697d0cafb9e1a70c6bb9c93c33038584 SHA1 ff96d27e0bb41d218706a41ad5350d77d17ac2dd SHA256 25a42a88413bdd32f83517ed201ccccfb216407f3e2ac6e2653bb57c91b0ea43
-EBUILD icedtea-web-1.1.2-r1.ebuild 4164 RMD160 bdc174191805228a6dce4c9fdaf787abf1ef3049 SHA1 819a5d3b8d59ac436ff62b48ea1a824de7a98d7e SHA256 d31679bb1080ea28d5697ab14a5939dd93d12fe31071ea5375d83a3f1cb1e869
-EBUILD icedtea-web-1.1.2.ebuild 4097 RMD160 4afc897e9040e85afc810a82e21632cfbc8641da SHA1 49521a25026cf2d15b37270e251e3a8fe1a35258 SHA256 d42f088e62c25c0fa3b134c364a5b941d360f4bfe78cc292e31bbb94222420b4
-EBUILD icedtea-web-1.1.3.ebuild 4075 RMD160 15a81c768a451be3f3c98167855da552c8bdcb37 SHA1 1ddcce719a73a3bc544a5d5a52b050fe7e878135 SHA256 7011df5604f6d756615c7713d3471ffd3c08a874bbec0e7254aa458058e4b775
-MISC ChangeLog 2266 RMD160 e4288b15e108cb87fbc83df4c11598c9afa35888 SHA1 0568b3e55bdb617e20fce03db86995ba651601e5 SHA256 fc98c136f0a7498f3c68c5ab8f7801769c7366d41bc3affbf60d2d8c8b951a4f
+EBUILD icedtea-web-1.1.3.ebuild 4195 RMD160 1d61450b58ec4fec85f91f990373754d0f7723da SHA1 6f6ccc4c3e3639583672f52931fbec4be4bd0a82 SHA256 e704b48597cdf1a6538cc1a37f7b938e60de88a6cf435adec9dd2cffba195df4
+MISC ChangeLog 2483 RMD160 aa7746dcf7c4dd8fed0611653471f1fd69b68b1f SHA1 179f9632bcdfcd17e72b785f14ffe832515bcef3 SHA256 35dadcfdc6fd10c68401277cacc05744facc85f498adc16f58bffbf75f9462ac
 MISC metadata.xml 666 RMD160 0b4a727787334a8fb0755705a9a9abbea0ed2540 SHA1 529ff0c8f099d6b65d47880b4f5a338ef94c63fd SHA256 39c40293e8df643512c54fdfe6c2cae952fa38229b137c039c1477e4fb758bb6
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
deleted file mode 100644
index e68dac07c5e6..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild,v 1.2 2011/09/06 09:57:09 caster Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="2"
-
-inherit eutils java-pkg-2 java-vm-2
-
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-HOMEPAGE="http://icedtea.classpath.org"
-
-IUSE="build doc +nsplugin"
-
-RDEPEND="dev-java/icedtea:${SLOT}"
-DEPEND="${RDEPEND}
-	 nsplugin? ( >=net-libs/xulrunner-1.9.1 )"
-
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
-JAVA_PKG_WANT_SOURCE="1.6"
-JAVA_PKG_WANT_TARGET="1.6"
-
-pkg_setup() {
-	# 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="icedtea${SLOT}"
-	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
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_unpack() {
-	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
-		die "Unable to find a supported VM for building"
-	fi
-
-	default
-}
-
-src_configure() {
-	local vmhome=$(java-config -O)
-
-	if use build; then
-		icedteadir="${ICEDTEA_BIN_DIR}"
-		installdir="/opt/icedtea${SLOT}-web-bin"
-	else
-		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
-		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
-	fi
-
-	unset_vars
-
-	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
-		VMHANDLE="icedtea${SLOT}"
-	else
-		die "Unexpected install location of IcedTea${SLOT}"
-	fi
-
-	einfo "Installing IcedTea-Web in ${installdir}"
-	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
-	if [ ! -e ${vmhome} ] ; then
-		eerror "Could not find JDK install directory ${vmhome}."
-		die
-	fi
-
-	# we need to override all *dir variables that econf sets
-	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
-	# the suffix the man page will end up compressed with, anyway
-	econf \
-		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
-		--with-jdk-home=${icedteadir} \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
-src_install() {
-	# parallel make problem bug #372235
-	emake -j1 DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS README NEWS || die
-
-	if use nsplugin; then
-		local arch=${ARCH};
-		use x86 && arch=i386;
-		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
-	fi
-
-	for binary in javaws itweb-settings; do
-		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
-		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
-	done
-}
-
-pkg_postinst() {
-	java-vm_check-nsplugin
-	java_mozilla_clean_
-
-	if use nsplugin; then
-		elog "The icedtea 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
-}
-
-pkg_prerm() {
-	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
-	:;
-}
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild
deleted file mode 100644
index 761bc26c4512..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild,v 1.1 2011/09/18 21:53:18 caster Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="2"
-
-inherit autotools eutils java-pkg-2 java-vm-2
-
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-HOMEPAGE="http://icedtea.classpath.org"
-
-IUSE="build doc +nsplugin"
-
-RDEPEND="dev-java/icedtea:${SLOT}"
-DEPEND="${RDEPEND}
-	nsplugin? (
-		|| ( net-misc/npapi-sdk
-			>=net-libs/xulrunner-1.9.1 ) )"
-
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
-JAVA_PKG_WANT_SOURCE="1.6"
-JAVA_PKG_WANT_TARGET="1.6"
-
-pkg_setup() {
-	# 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="icedtea${SLOT}"
-	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
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_unpack() {
-	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
-		die "Unable to find a supported VM for building"
-	fi
-
-	default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
-	# bug #356645
-	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
-	eautoreconf
-}
-
-src_configure() {
-	local vmhome=$(java-config -O)
-
-	if use build; then
-		icedteadir="${ICEDTEA_BIN_DIR}"
-		installdir="/opt/icedtea${SLOT}-web-bin"
-	else
-		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
-		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
-	fi
-
-	unset_vars
-
-	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
-		VMHANDLE="icedtea${SLOT}"
-	else
-		die "Unexpected install location of IcedTea${SLOT}"
-	fi
-
-	einfo "Installing IcedTea-Web in ${installdir}"
-	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
-	if [ ! -e ${vmhome} ] ; then
-		eerror "Could not find JDK install directory ${vmhome}."
-		die
-	fi
-
-	# we need to override all *dir variables that econf sets
-	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
-	# the suffix the man page will end up compressed with, anyway
-	econf \
-		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
-		--with-jdk-home=${icedteadir} \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
-src_install() {
-	# parallel make problem bug #372235
-	emake -j1 DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS README NEWS || die
-
-	if use nsplugin; then
-		local arch=${ARCH};
-		use x86 && arch=i386;
-		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
-	fi
-
-	for binary in javaws itweb-settings; do
-		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
-		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
-	done
-}
-
-pkg_postinst() {
-	java-vm_check-nsplugin
-	java_mozilla_clean_
-
-	if use nsplugin; then
-		elog "The icedtea 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
-}
-
-pkg_prerm() {
-	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
-	:;
-}
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.2.ebuild
deleted file mode 100644
index 3b54b93cd9ed..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.2.ebuild,v 1.1 2011/09/06 09:57:09 caster Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="2"
-
-inherit autotools eutils java-pkg-2 java-vm-2
-
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-HOMEPAGE="http://icedtea.classpath.org"
-
-IUSE="build doc +nsplugin"
-
-RDEPEND="dev-java/icedtea:${SLOT}"
-DEPEND="${RDEPEND}
-	nsplugin? (
-		|| ( net-misc/npapi-sdk
-			>=net-libs/xulrunner-1.9.1 ) )"
-
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
-JAVA_PKG_WANT_SOURCE="1.6"
-JAVA_PKG_WANT_TARGET="1.6"
-
-pkg_setup() {
-	# 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="icedtea${SLOT}"
-	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
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_unpack() {
-	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
-		die "Unable to find a supported VM for building"
-	fi
-
-	default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
-	eautoreconf
-}
-
-src_configure() {
-	local vmhome=$(java-config -O)
-
-	if use build; then
-		icedteadir="${ICEDTEA_BIN_DIR}"
-		installdir="/opt/icedtea${SLOT}-web-bin"
-	else
-		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
-		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
-	fi
-
-	unset_vars
-
-	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
-		VMHANDLE="icedtea${SLOT}"
-	else
-		die "Unexpected install location of IcedTea${SLOT}"
-	fi
-
-	einfo "Installing IcedTea-Web in ${installdir}"
-	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
-	if [ ! -e ${vmhome} ] ; then
-		eerror "Could not find JDK install directory ${vmhome}."
-		die
-	fi
-
-	# we need to override all *dir variables that econf sets
-	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
-	# the suffix the man page will end up compressed with, anyway
-	econf \
-		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
-		--with-jdk-home=${icedteadir} \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
-src_install() {
-	# parallel make problem bug #372235
-	emake -j1 DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS README NEWS || die
-
-	if use nsplugin; then
-		local arch=${ARCH};
-		use x86 && arch=i386;
-		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
-	fi
-
-	for binary in javaws itweb-settings; do
-		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
-		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
-	done
-}
-
-pkg_postinst() {
-	java-vm_check-nsplugin
-	java_mozilla_clean_
-
-	if use nsplugin; then
-		elog "The icedtea 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
-}
-
-pkg_prerm() {
-	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
-	:;
-}
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild
index 63998f207507..a2551ea24118 100644
--- a/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild,v 1.1 2011/09/29 13:06:23 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild,v 1.2 2011/11/04 09:39:42 caster Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
 
 EAPI="2"
@@ -34,7 +34,12 @@ pkg_setup() {
 	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="icedtea${SLOT}"
+		# migration logic
+		if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then
+			JAVA_PKG_FORCE_VM="icedtea${SLOT}"
+		else
+			JAVA_PKG_FORCE_VM="icedtea-${SLOT}"
+		fi
 	else
 		JAVA_PKG_FORCE_VM=""
 		# don't die just yet if merging a binpkg - bug #258423
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 0850b338efe4..60d2fd880ea3 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -10,6 +10,7 @@ DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
+EBUILD icedtea-6.1.10.4-r1.ebuild 10901 RMD160 35a1922c192469bde056e28556e8a979f4c7a20a SHA1 8106276634f574457bee03144ab065076f60fcf8 SHA256 b5f474d18853e4d0be6b0e1d0a51e100fc02f155aef917969dda30f0c772e395
 EBUILD icedtea-6.1.10.4.ebuild 10669 RMD160 7d9eadb3b2553f8f0e881c5732fa9b8a486f34f4 SHA1 b52ba57da1427d5e0844818a2c2ced43d508dccc SHA256 5bf2ed661c49f530e1b3382454a52149eb6e36b08dcd1e0559bf40d50d1f5349
-MISC ChangeLog 6874 RMD160 ace6fc374146e7bf003e91b3b12d444644388070 SHA1 829c2e7e70e9c000233e9eba9411dccca020e3af SHA256 b44afd1327f5a6b33aaff0fbac7ec99da73556b12b346cfbadcf99e6cae2fcaf
+MISC ChangeLog 7174 RMD160 c7b18cba7431b3ee496309831960d874cd1eddfd SHA1 65ae30f91dda5a240df2483bece5fcec7ac504cc SHA256 ca690b452cedf470ad90b71f74f6304f7e58c25c4d1c00e3e78509c4420b45b1
 MISC metadata.xml 1631 RMD160 72e61e27b431b353472ca7c0469dc1adaab14971 SHA1 6010b4cfbf447ec6bfce758b42283f3e4d3ffb21 SHA256 dec15c576e0651a896199d0282487de83b2413779097ca4845cde4e85c0a92aa
-- 
2.26.2