Drop 1.10 and 2.0 branches.

(Portage version: 2.1.10.65/cvs/Linux x86_64)

6 files changed, 6 insertions, 1110 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 974d00eebcd6..1b5cd6d25f8c 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.75 2012/06/19 20:30:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.76 2012/06/19 21:02:24 sera Exp $
+
+  19 Jun 2012; Ralph Sennhauser <sera@gentoo.org> -icedtea-6.1.10.6.ebuild,
+  -icedtea-6.1.11.1.ebuild, -files/icedtea-6.1.11.1-cacao_jvm.cfg.patch,
+  -icedtea-7.2.0.1.ebuild, metadata.xml:
+  Drop 1.10 and 2.0 branches.
 
 *icedtea-7.2.2.1 (19 Jun 2012)
 *icedtea-7.2.1.1 (19 Jun 2012)
diff --git a/dev-java/icedtea/files/icedtea-6.1.11.1-cacao_jvm.cfg.patch b/dev-java/icedtea/files/icedtea-6.1.11.1-cacao_jvm.cfg.patch
deleted file mode 100644
index 24dea5fac383..000000000000
--- a/dev-java/icedtea/files/icedtea-6.1.11.1-cacao_jvm.cfg.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -332,7 +332,6 @@
- 	patches/jtreg-LastErrorString.patch \
- 	patches/openjdk/6663040-com.sun.awt.patch \
- 	patches/openjdk/6775317-non-AA-simple-shape-performance.patch \
--	patches/pr600-arm-jvm.cfg.patch \
- 	patches/openjdk/6887494-NPE-in-pisces.patch \
- 	patches/openjdk/6967436-6967433-floating-pt-conversion.patch \
- 	patches/openjdk/6976265-stroke-control.patch \
-@@ -982,6 +981,10 @@
- 	fi
- endif
- endif
-+if ENABLE_CACAO
-+	mkdir -p openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)
-+	cp jvm.cacao.cfg openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)/jvm.cfg
-+endif
- 	mkdir -p stamps
- 	touch stamps/extract-openjdk.stamp
- 
-diff --git a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -863,6 +863,7 @@
-   AC_MSG_RESULT(${ENABLE_CACAO})
-   AM_CONDITIONAL(ENABLE_CACAO, test x"${ENABLE_CACAO}" = "xyes")
-   AC_SUBST(ENABLE_CACAO)
-+  AC_CONFIG_FILES([jvm.cacao.cfg])
- ])
- 
- AC_DEFUN([IT_WITH_CACAO_HOME],
-diff --git a/jvm.cfg.in b/jvm.cacao.cfg.in
-copy from jvm.cfg.in
-copy to jvm.cacao.cfg.in
-diff --git a/patches/pr600-arm-jvm.cfg.patch b/patches/pr600-arm-jvm.cfg.patch
-deleted file mode 100644
---- a/patches/pr600-arm-jvm.cfg.patch
-+++ /dev/null
-@@ -1,44 +0,0 @@
--Index: openjdk/jdk/src/solaris/bin/arm/jvm.cfg
--===================================================================
----- /dev/null	1970-01-01 00:00:00.000000000 +0000
--+++ openjdk/jdk/src/solaris/bin/arm/jvm.cfg	2011-02-18 15:40:24.083043645 +0100
--@@ -0,0 +1,39 @@
--+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
--+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--+#
--+# This code is free software; you can redistribute it and/or modify it
--+# under the terms of the GNU General Public License version 2 only, as
--+# published by the Free Software Foundation.  Oracle designates this
--+# particular file as subject to the "Classpath" exception as provided
--+# by Oracle in the LICENSE file that accompanied this code.
--+#
--+# This code is distributed in the hope that it will be useful, but WITHOUT
--+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
--+# version 2 for more details (a copy is included in the LICENSE file that
--+# accompanied this code).
--+#
--+# You should have received a copy of the GNU General Public License version
--+# 2 along with this work; if not, write to the Free Software Foundation,
--+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--+#
--+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--+# or visit www.oracle.com if you need additional information or have any
--+# questions.
--+#
--+# 
--+# List of JVMs that can be used as an option to java, javac, etc.
--+# Order is important -- first in this list is the default JVM.
--+# NOTE that this both this file and its format are UNSUPPORTED and
--+# WILL GO AWAY in a future release.
--+#
--+# You may also select a JVM in an arbitrary location with the
--+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
--+# and may not be available in a future release.
--+#
--+-server KNOWN
--+-client IGNORE
--+-hotspot ERROR
--+-classic WARN
--+-native ERROR
--+-green ERROR
---- /dev/null	2012-03-07 15:45:21.947999929 +0000
-+++ a/jvm.cacao.cfg.in	2012-03-16 12:58:18.683839114 +0000
-@@ -0,0 +1,44 @@
-+#
-+# @(#)jvm.cfg   1.7 07/05/05
-+#
-+#
-+# Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# This code is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation.  Sun designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Sun in the LICENSE file that accompanied this code.
-+#
-+# This code is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+# version 2 for more details (a copy is included in the LICENSE file that
-+# accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License version
-+# 2 along with this work; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+#
-+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+# CA 95054 USA or visit www.sun.com if you need additional information or
-+# have any questions.
-+#
-+#
-+#
-+# List of JVMs that can be used as an option to java, javac, etc.
-+# Order is important -- first in this list is the default JVM.
-+# NOTE that this both this file and its format are UNSUPPORTED and
-+# WILL GO AWAY in a future release.
-+#
-+# You may also select a JVM in an arbitrary location with the
-+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-+# and may not be available in a future release.
-+#
-+-server KNOWN
-+-hotspot ERROR
-+-classic WARN
-+-client IGNORE
-+-native ERROR
-+-green ERROR
diff --git a/dev-java/icedtea/icedtea-6.1.10.6.ebuild b/dev-java/icedtea/icedtea-6.1.10.6.ebuild
deleted file mode 100644
index dab2845d0135..000000000000
--- a/dev-java/icedtea/icedtea-6.1.10.6.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.6.ebuild,v 1.3 2012/05/03 07:42:50 jdhore Exp $
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="4"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-OPENJDK_BUILD="22"
-OPENJDK_DATE="28_feb_2011"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-JAXP_TARBALL="jaxp144_01.zip"
-JAXWS_TARBALL="jdk6-jaxws-b20.zip"
-JAF_TARBALL="jdk6-jaf-b20.zip"
-HOTSPOT_TARBALL="f0f676c5a2c6.tar.gz"
-CACAO_TARBALL="c7bf150bfa46.tar.gz" # 17 Mar 2011
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-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://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
-	hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )
-	!amd64? ( !sparc? ( !x86? (
-		http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	) ) )"
-
-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 ~ppc ~ppc64 ~x86"
-
-IUSE="+X +alsa cjk +cups debug doc examples +hs20 javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	dev-libs/glib
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	>=media-libs/libpng-1.2
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea6
-	X? (
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			!ppc? ( !ppc64? ( media-fonts/lklug ) )
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.7.1-r2 and later properly respect environment variables.
-# xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly)
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# !eclipse-ecj-3.7 - bug #392587
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.7.1-r2
-	dev-java/ant-nodeps
-	>=dev-java/xalan-2.7.0:0
-	>=dev-java/xerces-2.9.1:2
-	dev-lang/perl
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/lsb-release
-	|| ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )
-	${X_DEPEND}
-	jbootstrap? (
-		|| ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
-	)
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
-	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751
-	eautoreconf
-}
-
-src_configure() {
-	local config bootstrap
-	local vm=$(java-pkg_get-current-vm)
-
-	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
-		use jbootstrap && bootstrap=yes
-	elif has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
-		bootstrap=yes
-	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)"
-	fi
-
-	if [[ ${bootstrap} ]]; then
-		config="${config} --enable-bootstrap"
-
-		# icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		# Don't use eclipse-ecj-3.7 #392587
-		local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
-		ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
-		if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
-			ecj_jar="${ecj_jar%/lib/ecj.jar}"
-			ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap"
-			ewarn "Found usable: ${ecj_all[@]##*/}"
-			ewarn "using ${ecj_all##*/} instead"
-			ecj_jar="${ecj_all}"/lib/ecj.jar
-		fi
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	else
-		config="${config} --disable-bootstrap"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO
-	if ! has "${ARCH}" amd64 sparc x86; then
-		config="${config} --enable-cacao --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	if use hs20 ; then
-		config="${config} --with-hotspot-build=hs20 --with-hotspot-src-zip=${DISTDIR}/${HOTSPOT_TARBALL}"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# ant -diagnostics in Ant 1.8.0 fails without xerces-2 and xalan
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="xerces-2 xalan ant-nodeps"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake -j1 check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS THANKYOU
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/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 "${EPREFIX}"/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
-
-	# Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
-		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
-		elog "If you had icedtea6 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
diff --git a/dev-java/icedtea/icedtea-6.1.11.1.ebuild b/dev-java/icedtea/icedtea-6.1.11.1.ebuild
deleted file mode 100644
index c77e1db060c2..000000000000
--- a/dev-java/icedtea/icedtea-6.1.11.1.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.1.ebuild,v 1.6 2012/05/03 07:42:50 jdhore Exp $
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="4"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-OPENJDK_BUILD="24"
-OPENJDK_DATE="14_nov_2011"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-JAXP_TARBALL="jaxp144_03.zip"
-JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
-JAF_TARBALL="jdk6-jaf-b20.zip"
-CACAO_TARBALL="cff92704c4e0.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-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://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
-	!amd64? ( !sparc? ( !x86? (
-		http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	) ) )"
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	dev-libs/glib
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	>=media-libs/libpng-1.2
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea6
-	X? (
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			!ppc? ( !ppc64? ( media-fonts/lklug ) )
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# !eclipse-ecj-3.7 - bug #392587
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/lsb-release
-	|| ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )
-	${X_DEPEND}
-	jbootstrap? (
-		|| ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
-	)
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
-	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751
-	epatch "${FILESDIR}"/${P}-cacao_jvm.cfg.patch
-	eautoreconf
-}
-
-src_configure() {
-	local config bootstrap
-	local vm=$(java-pkg_get-current-vm)
-
-	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
-		use jbootstrap && bootstrap=yes
-	elif has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
-		bootstrap=yes
-	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)"
-	fi
-
-	if [[ ${bootstrap} ]]; then
-		config="${config} --enable-bootstrap"
-
-		# icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		# Don't use eclipse-ecj-3.7 #392587
-		local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
-		ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
-		if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
-			ecj_jar="${ecj_jar%/lib/ecj.jar}"
-			ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap"
-			ewarn "Found usable: ${ecj_all[@]##*/}"
-			ewarn "using ${ecj_all##*/} instead"
-			ecj_jar="${ecj_all}"/lib/ecj.jar
-		fi
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	else
-		config="${config} --disable-bootstrap"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO
-	if ! has "${ARCH}" amd64 sparc x86; then
-		config="${config} --enable-cacao --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake -j1 check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS THANKYOU
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/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 "${EPREFIX}"/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
-
-	# Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
-		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
-		elog "If you had icedtea6 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
diff --git a/dev-java/icedtea/icedtea-7.2.0.1.ebuild b/dev-java/icedtea/icedtea-7.2.0.1.ebuild
deleted file mode 100644
index 5abc4912baa3..000000000000
--- a/dev-java/icedtea/icedtea-7.2.0.1.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0.1.ebuild,v 1.3 2012/05/03 07:42:50 jdhore Exp $
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="4"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_PKG=icedtea-$(get_version_component_range 2-)
-OPENJDK_TARBALL="4b063ca7483f.tar.gz"
-CORBA_TARBALL="d37539e7e838.tar.gz"
-HOTSPOT_TARBALL="9dfaed4a95e2.tar.gz"
-JAXP_TARBALL="ae891cd6ba73.tar.gz"
-JAXWS_TARBALL="1107cfa36f53.tar.gz"
-JDK_TARBALL="891fb0050add.tar.gz"
-LANGTOOLS_TARBALL="f0faea84413f.tar.gz"
-JAMVM_TARBALL="jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}
-	!amd64? ( !sparc? ( !x86? (
-		http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}
-	) ) )"
-
-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="7"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=dev-libs/atk-1.30.0
-	>=dev-libs/glib-2.26
-	media-libs/fontconfig
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/cairo-1.8.8
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	>=x11-libs/pango-1.24.5"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	media-libs/lcms:2
-	>=media-libs/libpng-1.2
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	X? (
-		${CUPS_COMMON_DEP}
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:7
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:7
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/attr
-	sys-apps/lsb-release
-	|| ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )
-	${X_DEPEND}
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
-	nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-7 icedtea-bin-7 icedtea7
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${PN}-7.2.0_pax_kernel_support.patch #389751
-	epatch "${FILESDIR}"/${PN}-7.2.0-explicit-gthread.patch #402481
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-	local config bootstrap
-	local vm=$(java-pkg_get-current-vm)
-
-	# Whether to bootstrap
-	bootstrap="disable"
-	if use jbootstrap; then
-		if bootstrap_impossible "${vm}"; then
-			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
-		else
-			bootstrap="enable"
-		fi
-	fi
-	if has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		bootstrap="enable"
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use JamVM as it's the only possibility right now
-	if ! has "${ARCH}" amd64 sparc x86; then
-		config="${config} --enable-jamvm --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake -j 1
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake -j1 check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/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 "${EPREFIX}"/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
-
-	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
-	# install it anyway. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-7.2.0:7"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
-		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
-		elog "If you had icedtea7 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 913fe391e410..00275e9b06b7 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -18,7 +18,6 @@
   <flag name="alsa">Make alsa buildtime-only dependency.</flag>
   <flag name="cacao">Build CACAO virtual machine on platforms supporting HotSpot. (experimental)</flag>
   <flag name="cups">Make CUPS build-only dependency.</flag>
-  <flag name="hs20">Use the new version of HotSpot (20).</flag>
   <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
   <flag name="nss">Enable NSS security provider support.</flag>
   <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>