Cleanup old versions.

(Portage version: 2.2.0_alpha68/svn/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

svn path=/java-overlay/; revision=8866

10 files changed, 8 insertions, 1098 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 361f6a52..7c94dd0f 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Oct 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.0.4.ebuild,
+  -icedtea-web-1.0.4-r7.ebuild, -icedtea-web-1.1.1.ebuild,
+  -icedtea-web-1.1.1-r7.ebuild, -icedtea-web-1.1.2.ebuild,
+  -icedtea-web-1.1.2-r1.ebuild, -icedtea-web-1.1.2-r7.ebuild,
+  -icedtea-web-1.1.2-r8.ebuild:
+  Cleanup old versions.
+
   30 Sep 2011; Miroslav Šulc <fordfrog@gentoo.org>
   icedtea-web-1.1.3-r7.ebuild:
   Fixed problem with sandbox access violation
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 380d77b9..bd849cdd 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,18 +1,7 @@
 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.0.4.tar.gz 752372 RMD160 a3cd7abba8c189e801c1a02d82a6a69fcfe14744 SHA1 0bf7d86e15efac68228d8e23d0b3e14d0c054021 SHA256 d3e841be0cca8daef70404df5fdfe678559e1b12cd0ae3d658da68f61ab888e1
-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.0.4-r7.ebuild 3040 RMD160 54cfaab237025a54ace6c3ad465025dce6de6938 SHA1 ab3c27bdae7ab00c9d4990e278df74a040a2a148 SHA256 c195a136a08908c65853df32679192c93b59b7b6123313c161d7da49adc95c18
-EBUILD icedtea-web-1.0.4.ebuild 3038 RMD160 90669a807f2160d4f1061d0c6b592422220d7d05 SHA1 b222c3f754ab65feb81bdfd2806e0a5c7c75ce87 SHA256 80cdf6727094ae66bca47ba326a3ed677bd7bf5e47d519692ca55177e385ab6d
-EBUILD icedtea-web-1.1.1-r7.ebuild 3832 RMD160 780514d0814550b672cc07da61bb18cba20b836f SHA1 14fb64de0770c764d9f794104f2c2b84f44781e6 SHA256 7cb365b3d699c555e489c8aec7c34e121af1c0f031ca2911be612488e53f6844
-EBUILD icedtea-web-1.1.1.ebuild 3832 RMD160 a3c0642419bd9ab1617aa48d028aa191ff0ed0da SHA1 f8af5f96c63b93e1699eb8986011d8da23735d55 SHA256 3518b6986253380bf7f6c687f0ca70f9628e395538da61b2c34e13c861a47307
-EBUILD icedtea-web-1.1.2-r1.ebuild 4164 RMD160 bdc174191805228a6dce4c9fdaf787abf1ef3049 SHA1 819a5d3b8d59ac436ff62b48ea1a824de7a98d7e SHA256 d31679bb1080ea28d5697ab14a5939dd93d12fe31071ea5375d83a3f1cb1e869
-EBUILD icedtea-web-1.1.2-r7.ebuild 3990 RMD160 6922f8a1d4568b049b2ad89016a17a6ec8b28cce SHA1 43b27e6ae1afe3708e99a91788fb906c1d5bdaa5 SHA256 16d738240a4cad4fda3316c402c53d856139239408072d5839c805c8e4f2b425
-EBUILD icedtea-web-1.1.2-r8.ebuild 4164 RMD160 df43ecf7acd7e875f239d19be47129c0e7b86150 SHA1 32b21fbce3d596c47f43676478502cac04752514 SHA256 f9041c6ff956c2f3e9d937bbb5620b3394421be06981de33d632621f0bcaaa2b
-EBUILD icedtea-web-1.1.2.ebuild 3990 RMD160 874138b0474cf405c08cd2049b5f9ef7194ef400 SHA1 8cc99e868b60d32fd6eeec1f26a3b0ec8b21e9b9 SHA256 77d97f9f526296109deceb9188b9cef51ce8998aff9ee50efd651d87bd51ec32
 EBUILD icedtea-web-1.1.3-r7.ebuild 4166 RMD160 3b6eede244d97b9c605c5edd78e67c3f32bbf120 SHA1 72ac0a7cfb5c306de52261732acedca45fe3a0ed SHA256 d1df5e1090536da012ad9b01c1972b21a7bab28c5f2e8f92ea038978ca219713
 EBUILD icedtea-web-1.1.3.ebuild 4078 RMD160 1d6a5e1da68dfb05333ae057dafa7376e63363c4 SHA1 a70db8bdb07a7d9a50891d471aae4428b5ea8bdd SHA256 df54544b42efa9687b423b3daad11dc0a293c755993b9578e26f294a9df3ed05
-MISC ChangeLog 3945 RMD160 d55e909db1a343b12cc627949fe261558e65f6f9 SHA1 559edd734a9c5e3b14bac95825a84045b3d5c593 SHA256 77bb87476f8a7b38efe61d83136c2f93931ce7c8df7f2d1b592aa7b633bbf925
+MISC ChangeLog 4260 RMD160 fcef2de457d751ff8814a100ff25db82758b7419 SHA1 09bc66d92589e807324a402763091fbc06a0186e SHA256 2a2f17007432bd5b21a4d5a1e7233711bff7a82e3f3be5f06d694eda2fc145bb
 MISC metadata.xml 443 RMD160 a2bfb7f863c94745550d4aebc1f19564fa09314c SHA1 09a86a74d70473db1f0a54d30a6097643b05a763 SHA256 7cf17d4708e0cb7051686986429baa43dc1345d3f295e57d7a020a637473e217
diff --git a/dev-java/icedtea-web/icedtea-web-1.0.4-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.0.4-r7.ebuild
deleted file mode 100644
index ac3cdf04..00000000
--- a/dev-java/icedtea-web/icedtea-web-1.0.4-r7.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# 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="7"
-#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="doc +nsplugin"
-
-RDEPEND="dev-java/icedtea:7"
-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:7; then
-		JAVA_PKG_FORCE_VM="icedtea7"
-	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)
-	local icedtea7dir="${ROOT}usr/$(get_libdir)/icedtea7"
-
-	unset_vars
-
-	if [[ ${vmhome} == ${icedtea7dir} ]] ; then
-		installdir=${vmhome}
-		VMHANDLE="icedtea7"
-	else
-		die "Unexpected install location of IcedTea7"
-	fi
-
-	elog "Installing IcedTea-Web in ${installdir}"
-	if [ ! -e ${installdir} ] ; then
-		eerror "Could not find JDK install directory ${installdir}."
-	fi
-
-	econf \
-		--prefix=${installdir} \
-		--with-jdk-home=${vmhome} \
-		$(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() {
-	emake 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}/jre/lib/${arch}/IcedTeaPlugin.so";
-	fi
-}
-
-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.0.4.ebuild b/dev-java/icedtea-web/icedtea-web-1.0.4.ebuild
deleted file mode 100644
index b0402294..00000000
--- a/dev-java/icedtea-web/icedtea-web-1.0.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# 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="doc +nsplugin"
-
-RDEPEND="dev-java/icedtea:6"
-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:6; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	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)
-	local icedtea6dir="${ROOT}usr/$(get_libdir)/icedtea6"
-
-	unset_vars
-
-	if [[ ${vmhome} == ${icedtea6dir} ]] ; then
-		installdir=${vmhome}
-		VMHANDLE="icedtea6"
-	else
-		die "Unexpected install location of IcedTea6"
-	fi
-
-	elog "Installing IcedTea-Web in ${installdir}"
-	if [ ! -e ${installdir} ] ; then
-		eerror "Could not find JDK install directory ${installdir}."
-	fi
-
-	econf \
-		--prefix=${installdir} \
-		--with-jdk-home=${vmhome} \
-		$(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() {
-	emake 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}/jre/lib/${arch}/IcedTeaPlugin.so";
-	fi
-}
-
-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.1-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.1-r7.ebuild
deleted file mode 100644
index 4d8b32f4..00000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.1-r7.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# 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="7"
-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.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
deleted file mode 100644
index f5d1a20e..00000000
--- 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: $
-# 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 761bc26c..00000000
--- 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-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.2-r7.ebuild
deleted file mode 100644
index 956c7323..00000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.2-r7.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# 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="7"
-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.2-r8.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.2-r8.ebuild
deleted file mode 100644
index 8160cf67..00000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.2-r8.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="7"
-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 2774f9c7..00000000
--- 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: $
-# 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
-	:;
-}