Fix package.env entry of rhino. #433283

Remove vulnarable. #433389 (Portage version: 2.1.11.13/cvs/Linux x86_64)
author: Ralph Sennhauser <sera@gentoo.org> 2012-09-26 08:42:27 +0000
committer: Ralph Sennhauser <sera@gentoo.org> 2012-09-26 08:42:27 +0000
commit: 670163cd4f096832476961a9584896e56bc50996 (patch)
tree: 6a42b457d59ded8d2f4f1f2c9d3294307cb5ec20 /dev-java/icedtea
parent: Marked stable on AMD64 based on arch testing by Vicente "peratu" Olivert Rier... (diff)
download: gentoo-2-670163cd4f096832476961a9584896e56bc50996.tar.gz
gentoo-2-670163cd4f096832476961a9584896e56bc50996.tar.bz2
gentoo-2-670163cd4f096832476961a9584896e56bc50996.zip
22 files changed, 22 insertions, 3589 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 77ad0ae071a5..ae178651893c 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,23 @@
 # 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.81 2012/09/02 11:48:02 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.82 2012/09/26 08:42:27 sera Exp $
+
+  26 Sep 2012; Ralph Sennhauser <sera@gentoo.org> -icedtea-6.1.11.2.ebuild,
+  -icedtea-6.1.11.3.ebuild, icedtea-6.1.11.4.ebuild,
+  -files/icedtea-7-compile_for_7_cacao_mem.patch,
+  -files/icedtea-7.2.0-explicit-gthread.patch,
+  -files/icedtea-7.2.0_pax_kernel_support.patch, -icedtea-7.2.1.ebuild,
+  -icedtea-7.2.1.1.ebuild, -files/icedtea-7.2.1.1-pax_mark_rmic_java.patch,
+  -files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch, -icedtea-7.2.2.ebuild,
+  -icedtea-7.2.2.1.ebuild, -files/icedtea-7.2.2.1-pax_mark_rmic_java.patch,
+  -files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch,
+  -files/icedtea-7.2.2.1-warnings_are_errors.patch,
+  -files/icedtea-7.2.2-no_suffix.patch, -icedtea-7.2.3.1.ebuild,
+  -files/icedtea-7.2.3.1-pax_mark_rmic_java.patch, icedtea-7.2.3.2.ebuild,
+  -files/icedtea-7-compiler_detection_cleanup.patch,
+  -files/icedtea-7-no_suffix.patch:
+  Fix package.env entry of rhino. #433283
+  Remove vulnarable. #433389
 
 *icedtea-6.1.11.4 (02 Sep 2012)
 
diff --git a/dev-java/icedtea/files/icedtea-7-compile_for_7_cacao_mem.patch b/dev-java/icedtea/files/icedtea-7-compile_for_7_cacao_mem.patch
deleted file mode 100644
index 497a67fb17a3..000000000000
--- a/dev-java/icedtea/files/icedtea-7-compile_for_7_cacao_mem.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@member.fsf.org>
-# Date 1339588177 -3600
-# Node ID df0999b55509faf1504b3ff55152a61a7cff57fc
-# Parent  e6d81fc2c9439652f903664d51a13732c73485ea
-Make compile-for-7.patch apply after cacao/memory.patch
-
-2012-06-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
-
-	* Makefile.am:
-	Apply compile-for-7-cacao-mem.patch instead of
-	compile-for-7.patch when using a compiler that
-	supports diamond and either USING_CACAO or BUILD_CACAO
-	are set.
-	* patches/boot/compile-for-7-cacao-mem.patch:
-	Version of compile-for-7.patch post applying
-	cacao/memory.patch.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -364,8 +364,16 @@
- if JAVAC_LACKS_DIAMOND
- ICEDTEA_BOOT_PATCHES += patches/boot/ecj-diamond.patch
- else
-+if USING_CACAO
-+ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
-+else
-+if BUILD_CACAO
-+ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
-+else
- ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7.patch
- endif
-+endif
-+endif
- 
- if DTDTYPE_QNAME
- ICEDTEA_BOOT_PATCHES += patches/boot/jaxws-getdtdtype.patch
-diff --git a/patches/boot/compile-for-7-cacao-mem.patch b/patches/boot/compile-for-7-cacao-mem.patch
-new file mode 100644
---- /dev/null
-+++ b/patches/boot/compile-for-7-cacao-mem.patch
-@@ -0,0 +1,42 @@
-+diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make openjdk-boot/hotspot/make/linux/makefiles/rules.make
-+--- openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
-++++ openjdk-boot/hotspot/make/linux/makefiles/rules.make	2012-06-13 03:48:41.838257784 +0100
-+@@ -139,8 +139,8 @@
-+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
-+ 
-+ # Settings for javac
-+-BOOT_SOURCE_LANGUAGE_VERSION = 6
-+-BOOT_TARGET_CLASS_VERSION = 6
-++BOOT_SOURCE_LANGUAGE_VERSION = 7
-++BOOT_TARGET_CLASS_VERSION = 7
-+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+diff -Nru openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make openjdk-boot/hotspot/make/solaris/makefiles/rules.make
-+--- openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
-++++ openjdk-boot/hotspot/make/solaris/makefiles/rules.make	2012-06-13 11:36:03.057522188 +0100
-+@@ -131,8 +131,8 @@
-+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
-+ 
-+ # Settings for javac
-+-BOOT_SOURCE_LANGUAGE_VERSION = 6
-+-BOOT_TARGET_CLASS_VERSION = 6
-++BOOT_SOURCE_LANGUAGE_VERSION = 7
-++BOOT_TARGET_CLASS_VERSION = 7
-+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+diff -Nru openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make openjdk-boot/hotspot/make/windows/makefiles/rules.make
-+--- openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
-++++ openjdk-boot/hotspot/make/windows/makefiles/rules.make	2012-06-13 11:36:19.537797380 +0100
-+@@ -43,8 +43,8 @@
-+ !endif
-+ 
-+ # Settings for javac
-+-BOOT_SOURCE_LANGUAGE_VERSION=6
-+-BOOT_TARGET_CLASS_VERSION=6
-++BOOT_SOURCE_LANGUAGE_VERSION=7
-++BOOT_TARGET_CLASS_VERSION=7
-+ JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
diff --git a/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch b/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch
deleted file mode 100644
index af13d4250196..000000000000
--- a/dev-java/icedtea/files/icedtea-7-compiler_detection_cleanup.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@member.fsf.org>
-# Date 1339484856 -3600
-# Node ID 1a9e619bc32e81697bf4200a607935ee00c8d388
-# Parent  7ceb431c104f1da9cbabebdcc223b008e0177a71
-Bring compiler detection into line with other jdk tools and check java/javac work before running other macros.
-
-2012-03-20  Andrew John Hughes  <ahughes@redhat.com>
-
-	* acinclude.m4:
-	(IT_FIND_COMPILER): Define only once and
-	rename from IT_FIND_JAVA_COMPILER.
-	(IT_FIND_ECJ): Use same form as detection
-	for java, javah, jar and rmic.
-	(IT_FIND_JAVAC): Likewise.
-	(IT_CHECK_JAVA_AND_JAVAC_WORK): New macro to check
-	java and javac actually work together to compile code
-	before running other tests such as the dtdtype one.
-	(IT_CHECK_FOR_CLASS): Depend on java/javac working.
-	(IT_GETDTDTYPE_CHECK): Likewise.  Add -target 5.
-	(IT_JAVAH): Depend on java/javac working.
-	* configure.ac: Invoke IT_FIND_COMPILER rather than
-	IT_FIND_JAVA_COMPILER.
-
-diff --git a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -117,50 +117,41 @@
-   AC_SUBST(OS_PATH)
- ])
- 
--AC_DEFUN([IT_FIND_JAVA_COMPILER],
-+AC_DEFUN([IT_FIND_COMPILER],
- [
--  JAVAC=${SYSTEM_JDK_DIR}/bin/javac
-   IT_FIND_JAVAC
-   IT_FIND_ECJ
-   IT_USING_ECJ
- 
-+  AC_SUBST(ECJ)
-   AC_SUBST(JAVAC)
- ])
- 
--AC_DEFUN([IT_FIND_ECJ],
-+AC_DEFUN_ONCE([IT_FIND_ECJ],
- [
-+  ECJ_DEFAULT=/usr/bin/ecj
-+  AC_MSG_CHECKING([if an ecj binary was specified])
-   AC_ARG_WITH([ecj],
--	      [AS_HELP_STRING([--with-ecj[[=PATH]]],the path to an ecj binary)],
-+	      [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
-   [
--    if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
--      IT_CHECK_ECJ(${withval})
-+    if test "x${withval}" = "xyes"; then
-+      ECJ=no
-     else
--      if test "x${withval}" != xno; then
--        IT_CHECK_ECJ
--      fi
-+      ECJ="${withval}"
-     fi
-   ],
-   [ 
--    IT_CHECK_ECJ
-+    ECJ=no
-   ])
--  if test "x${JAVAC}" = "x"; then
--    if test "x{ECJ}" != "x"; then
--      JAVAC="${ECJ}"
--    fi
-+  AC_MSG_RESULT(${ECJ})
-+  if test "x${ECJ}" = "xno"; then
-+    ECJ=${ECJ_DEFAULT}
-   fi
--])
--
--AC_DEFUN([IT_CHECK_ECJ],
--[
--  if test "x$1" != x; then
--    if test -f "$1"; then
--      AC_MSG_CHECKING(for ecj)
--      ECJ="$1"
--      AC_MSG_RESULT(${ECJ})
--    else
--      AC_PATH_PROG(ECJ, "$1")
--    fi
-+  AC_MSG_CHECKING([if $ECJ is a valid executable file])
-+  if test -x "${ECJ}" && test -f "${ECJ}"; then
-+    AC_MSG_RESULT([yes])
-   else
-+    ECJ=""
-     AC_PATH_PROG(ECJ, "ecj")
-     if test -z "${ECJ}"; then
-       AC_PATH_PROG(ECJ, "ecj-3.1")
-@@ -171,43 +162,45 @@
-     if test -z "${ECJ}"; then
-       AC_PATH_PROG(ECJ, "ecj-3.3")
-     fi
-+    if test -z "${ECJ}"; then
-+      AC_PATH_PROG(ECJ, "ecj-3.4")
-+    fi
-   fi
- ])
- 
--AC_DEFUN([IT_FIND_JAVAC],
-+AC_DEFUN_ONCE([IT_FIND_JAVAC],
- [
-+  JAVAC_DEFAULT=${SYSTEM_JDK_DIR}/bin/javac
-+  AC_MSG_CHECKING([if a javac binary was specified])
-   AC_ARG_WITH([javac],
- 	      [AS_HELP_STRING([--with-javac[[=PATH]]],the path to a javac binary)],
-   [
--    if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
--      IT_CHECK_JAVAC(${withval})
-+    if test "x${withval}" = "xyes"; then
-+      JAVAC=no
-     else
--      if test "x${withval}" != xno; then
--        IT_CHECK_JAVAC(${JAVAC})
--      fi
-+      JAVAC="${withval}"
-     fi
-   ],
--  [ 
--    IT_CHECK_JAVAC(${JAVAC})
-+  [
-+    JAVAC=no
-+  ])
-+  AC_MSG_RESULT(${JAVAC})
-+  if test "x${JAVAC}" = "xno"; then
-+    JAVAC=${JAVAC_DEFAULT}
-+  fi
-+  AC_MSG_CHECKING([if $JAVAC is a valid executable file])
-+  if test -x "${JAVAC}" && test -f "${JAVAC}"; then
-+    AC_MSG_RESULT([yes])
-+  else
-+    AC_MSG_RESULT([no])
-+    JAVAC=""
-+    AC_PATH_PROG(JAVAC, "javac")
-+  fi
-+  AC_SUBST(JAVAC)
-   ])
- ])
- 
--AC_DEFUN([IT_CHECK_JAVAC],
--[
--  if test "x$1" != x; then
--    if test -f "$1"; then
--      AC_MSG_CHECKING(for javac)
--      JAVAC="$1"
--      AC_MSG_RESULT(${JAVAC})
--    else
--      AC_PATH_PROG(JAVAC, "$1")
--    fi
--  else
--    AC_PATH_PROG(JAVAC, "javac")
--  fi
--])
--
--AC_DEFUN([IT_FIND_JAVA],
-+AC_DEFUN_ONCE([IT_FIND_JAVA],
- [
-   JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
-   AC_MSG_CHECKING([if a java binary was specified])
-@@ -1158,6 +1151,7 @@
- ])
- 
- AC_DEFUN([IT_JAVAH],[
-+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
- AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 39408], it_cv_cp39408_javah, [
- SUPERCLASS=Test.java
- SUBCLASS=TestImpl.java
-@@ -1452,6 +1446,44 @@
-   AC_CONFIG_FILES([tz.properties])
- ])
- 
-+dnl check that javac and java work
-+AC_DEFUN_ONCE([IT_CHECK_JAVA_AND_JAVAC_WORK],[
-+  AC_REQUIRE([IT_FIND_JAVA])
-+  AC_REQUIRE([IT_FIND_COMPILER])
-+  AC_CACHE_CHECK([if the VM and compiler work together], it_cv_jdk_works, [
-+  CLASS=Test.java
-+  BYTECODE=$(echo $CLASS|sed 's#\.java##')
-+  mkdir tmp.$$
-+  cd tmp.$$
-+  cat << \EOF > $CLASS
-+[/* [#]line __oline__ "configure" */
-+
-+public class Test
-+{
-+    public static void main(String[] args)
-+    {
-+      System.out.println("Hello World!");
-+    }
-+}]
-+EOF
-+  if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-+    if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
-+      it_cv_jdk_works=yes;
-+    else
-+      it_cv_jdk_works=no;
-+      AC_MSG_ERROR([VM failed to run compiled class.])
-+    fi
-+  else
-+    it_cv_jdk_works=no;
-+    AC_MSG_ERROR([Compiler failed to compile Java code.])
-+  fi
-+  rm -f $CLASS *.class
-+  cd ..
-+  rmdir tmp.$$
-+  ])
-+AC_PROVIDE([$0])dnl
-+])
-+
- dnl Generic macro to check for a Java class
- dnl Takes two arguments: the name of the macro
- dnl and the name of the class.  The macro name
-@@ -1459,6 +1491,7 @@
- dnl replaced by '_' and all letters capitalised.
- dnl e.g. IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER],[java.util.Scanner])
- AC_DEFUN([IT_CHECK_FOR_CLASS],[
-+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
- AC_CACHE_CHECK([if $2 is missing], it_cv_$1, [
- CLASS=Test.java
- BYTECODE=$(echo $CLASS|sed 's#\.java##')
-@@ -1504,7 +1537,8 @@
-   AC_PROVIDE([$0])dnl
- ])
- 
--AC_DEFUN([IT_GETDTDTYPE_CHECK],[
-+AC_DEFUN_ONCE([IT_GETDTDTYPE_CHECK],[
-+  AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
-   AC_CACHE_CHECK([if javax.xml.stream.events.Attribute.getDTDType() wrongly returns a QName], it_cv_dtdtype, [
-   CLASS=Test.java
-   BYTECODE=$(echo $CLASS|sed 's#\.java##')
-@@ -1561,7 +1595,7 @@
-     }
- }]
- EOF
--  if $JAVAC -cp . $JAVACFLAGS -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-+  if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-     if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
-       it_cv_dtdtype=no;
-     else
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,7 +97,7 @@
- IT_CHECK_IF_DOWNLOADING
- IT_CHECK_FOR_JDK
- IT_FIND_JAVA
--IT_FIND_JAVA_COMPILER
-+IT_FIND_COMPILER
- IT_FIND_JAVAH
- IT_FIND_JAR
- IT_FIND_RMIC
diff --git a/dev-java/icedtea/files/icedtea-7-no_suffix.patch b/dev-java/icedtea/files/icedtea-7-no_suffix.patch
deleted file mode 100644
index 61bbd09d84ee..000000000000
--- a/dev-java/icedtea/files/icedtea-7-no_suffix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <ahughes@redhat.com>
-# Date 1338297380 -3600
-# Node ID fb4e64ae06a31c878cc711579fe87a6f626f73fb
-# Parent  2c3c929e038c6c64d79ecf98005f5fd2f4d0f37d
-Don't add a suffix for building the default, IcedTea.
-
-2012-05-25  Andrew John Hughes  <ahughes@redhat.com>
-
-	* Makefile.am:
-	(versioning): Don't add a suffix if building
-	the default project, 'icedtea'.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1435,7 +1435,7 @@
- 	  echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
- 	    >>openjdk/jdk/make/common/shared/Defs.gmk ;
- endif
--	if test x"$(PROJECT_NAME)" != "xjdk7"; then \
-+	if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
- 	  proj_suffix="-$(PROJECT_NAME)"; \
- 	fi ; \
- 	if test x"$(VERSION_SUFFIX)" != "x"; then \
diff --git a/dev-java/icedtea/files/icedtea-7.2.0-explicit-gthread.patch b/dev-java/icedtea/files/icedtea-7.2.0-explicit-gthread.patch
deleted file mode 100644
index 1f13e07df314..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.0-explicit-gthread.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- acinclude.m4.orig	2012-02-25 15:44:58.208371766 +0100
-+++ acinclude.m4	2012-02-25 15:46:03.592027548 +0100
-@@ -2011,7 +2011,9 @@
-   AC_MSG_RESULT(${ENABLE_SYSTEM_GTK})
-   if test x"${ENABLE_SYSTEM_GTK}" = "xyes"; then
-     dnl Check for Gtk+ headers and libraries.
--    PKG_CHECK_MODULES(GTK, gtk+-2.0,[GTK_FOUND=yes],[GTK_FOUND=no])
-+    dnl Explicitly include gthread-2.0 to get g_thread_init even on glib 2.32
-+    dnl where it is deprecated.
-+    PKG_CHECK_MODULES(GTK, gtk+-2.0 gthread-2.0,[GTK_FOUND=yes],[GTK_FOUND=no])
-     if test "x${GTK_FOUND}" = xno
-     then
-       AC_MSG_ERROR([Could not find Gtk+; install Gtk+ or build with --disable-system-gtk to use the in-tree headers.])
diff --git a/dev-java/icedtea/files/icedtea-7.2.0_pax_kernel_support.patch b/dev-java/icedtea/files/icedtea-7.2.0_pax_kernel_support.patch
deleted file mode 100644
index 2d8f8ce1c15a..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.0_pax_kernel_support.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-Author: Ralph Sennhaser <sera@gentoo.org>
-
-The idea is to apply the pax markings before using a freshly built jdk. Be it
-for running tests or building additonal vms or after bootstrap to build the
-final jdk.
-
-There are currently two types of pax markings with the userspace utilities
-chpax and paxctl. Both types of pax marking are base on modifing the ELFs. A
-third type based on xattrs is in development.
-
-The embedded test_gamma.patch is taken from icedtea 2.0 itself.
-
-diff --git a/Makefile.am b/Makefile.am
-index 129edf2..158b149 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -279,6 +279,10 @@ else
- ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
-+if WITH_PAX
-+ICEDTEA_PATCHES += patches/test_gamma.patch
-+endif
-+
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
- 
- # Bootstrapping patches
-@@ -300,7 +304,6 @@ ICEDTEA_BOOT_PATCHES = \
- 	patches/boot/jar.patch \
- 	patches/boot/symbols.patch \
- 	patches/boot/tobin.patch \
--	patches/boot/test_gamma.patch \
- 	patches/boot/tools.jar.patch \
- 	patches/boot/jopt.patch \
- 	patches/boot/jaxp-dependency.patch \
-@@ -320,6 +323,10 @@ ICEDTEA_BOOT_PATCHES = \
- 	patches/boot/ecj-autoboxing.patch \
- 	patches/boot/xsltproc.patch
- 
-+if !WITH_PAX
-+ICEDTEA_BOOT_PATCHES += patches/boot/test_gamma.patch
-+endif
-+
- if CP39408_JAVAH
- ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
- endif
-@@ -1612,6 +1619,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
- 	  $(ICEDTEA_ENV) \
- 	  -C openjdk/ \
- 	  $(ICEDTEA_BUILD_TARGET)
-+	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-@@ -1765,6 +1773,7 @@ stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
- 	  $(ICEDTEA_ENV_BOOT) \
- 	  -C openjdk-boot \
- 	  $(ICEDTEA_BUILD_TARGET)
-+	$(abs_top_builddir)/pax-mark-vm $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
- 	@echo "Bootstrapped IcedTea is served:" \
- 	  $(BOOT_BUILD_OUTPUT_DIR)
- 	mkdir -p stamps
-diff --git a/acinclude.m4 b/acinclude.m4
-index 5310d71..f08f1a9 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2181,3 +2181,49 @@ rmdir tmp.$$
- AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "xyes")
- AC_PROVIDE([$0])dnl
- ])
-+
-+AC_DEFUN_ONCE([IT_WITH_PAX],
-+[
-+  AC_MSG_CHECKING([for pax utility to use])
-+  AC_ARG_WITH([pax],
-+              [AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
-+  [
-+    PAX_COMMAND=${withval}
-+    if test "x${PAX_COMMAND}" = "xno"; then
-+      PAX_COMMAND="not specified"
-+    fi
-+  ],
-+  [ 
-+    PAX_COMMAND="not specified"
-+  ])
-+  case "x${PAX_COMMAND}" in
-+    xchpax)
-+      case "${host_cpu}" in
-+        i?86)
-+          PAX_COMMAND_ARGS="-msp"
-+          ;;
-+        *)
-+          PAX_COMMAND_ARGS="-m"
-+          ;;
-+      esac
-+      ;;
-+    xpaxctl)
-+      case "${host_cpu}" in
-+        i?86)
-+          PAX_COMMAND_ARGS="-msp"
-+          ;;
-+        *)
-+          PAX_COMMAND_ARGS="-m"
-+          ;;
-+      esac
-+      ;;
-+    *)
-+      PAX_COMMAND="not specified"
-+      PAX_COMMAND_ARGS="not specified"
-+      ;;
-+  esac
-+  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
-+  AC_MSG_RESULT(${PAX_COMMAND})
-+  AC_SUBST(PAX_COMMAND)
-+  AC_SUBST(PAX_COMMAND_ARGS)
-+])
-diff --git a/configure.ac b/configure.ac
-index e0b866b..7c665ef 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -146,6 +146,9 @@ IT_WITH_PROJECT
- IT_ENABLE_HG
- IT_WITH_TZDATA_DIR
- 
-+IT_WITH_PAX
-+AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
-+
- AC_PATH_TOOL([HG],[hg])
- if test "x${enable_hg}" = "xyes"; then
-   if test "x${HG}" = x; then
-diff --git a/patches/test_gamma.patch b/patches/test_gamma.patch
-new file mode 100644
-index 0000000..7e8d3d6
---- /dev/null
-+++ b/patches/test_gamma.patch
-@@ -0,0 +1,47 @@
-+diff -Nru ../openjdk.orig/openjdk/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
-+--- ../openjdk.orig/openjdk/hotspot/make/linux/Makefile	2009-10-30 17:37:07.000000000 +0000
-++++ openjdk/hotspot/make/linux/Makefile	2009-10-30 17:45:40.000000000 +0000
-+@@ -287,42 +287,36 @@
-+ 
-+ $(TARGETS_C2):  $(SUBDIRS_C2)
-+ 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-+-	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
-+ ifdef INSTALL
-+ 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-+ $(TARGETS_TIERED):  $(SUBDIRS_TIERED)
-+ 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-+-	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-+ $(TARGETS_C1):  $(SUBDIRS_C1)
-+ 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-+-	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-+ $(TARGETS_CORE):  $(SUBDIRS_CORE)
-+ 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-+-	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-+ $(TARGETS_ZERO):  $(SUBDIRS_ZERO)
-+ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
-+-	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-+ $(TARGETS_SHARK):  $(SUBDIRS_SHARK)
-+    cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
-+-   cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
-+ ifdef INSTALL
-+    cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
-+ endif
-+ 
-diff --git a/pax-mark-vm.in b/pax-mark-vm.in
-new file mode 100644
-index 0000000..118bb61
---- /dev/null
-+++ b/pax-mark-vm.in
-@@ -0,0 +1,13 @@
-+#!/bin/sh
-+
-+# Taken from Gentoo's pax-utils.eclass
-+list_paxables() {
-+	file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//'
-+}
-+
-+if test "@PAX_COMMAND@" != "not specified"; then
-+	for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do
-+		echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
-+		@PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
-+	done
-+fi
diff --git a/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch
deleted file mode 100644
index c66525332b00..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..85ac971 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
- if WITH_PAX
--ICEDTEA_PATCHES += patches/test_gamma.patch
-+ICEDTEA_PATCHES += \
-+	patches/test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
---- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \
diff --git a/dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch b/dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch
deleted file mode 100644
index 17e5f2aa9d45..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.1.1-pr986-cacao_memory_fix.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Nru icedtea-2.1.1.orig/acinclude.m4 icedtea-2.1.1/acinclude.m4
---- icedtea-2.1.1.orig/acinclude.m4	2012-06-13 02:56:54.455836680 +0100
-+++ icedtea-2.1.1/acinclude.m4	2012-06-13 02:57:31.660476528 +0100
-@@ -2258,3 +2258,18 @@
-   AC_SUBST(PAX_COMMAND)
-   AC_SUBST(PAX_COMMAND_ARGS)
- ])
-+
-+AC_DEFUN([IT_USING_CACAO],[
-+  AC_REQUIRE([IT_FIND_JAVA])
-+  AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
-+  if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
-+    it_cv_cacao=yes;
-+  else
-+    it_cv_cacao=no;
-+  fi
-+  ])
-+  USING_CACAO=$it_cv_cacao
-+  AC_SUBST(USING_CACAO)
-+  AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
-+  AC_PROVIDE([$0])dnl
-+])
-diff -Nru icedtea-2.1.1.orig/configure.ac icedtea-2.1.1/configure.ac
---- icedtea-2.1.1.orig/configure.ac	2012-06-13 02:56:54.459836748 +0100
-+++ icedtea-2.1.1/configure.ac	2012-06-13 02:57:31.660476528 +0100
-@@ -101,6 +101,7 @@
- IT_FIND_JAR
- IT_FIND_RMIC
- IT_FIND_NATIVE2ASCII
-+IT_USING_CACAO
- if test "x$enable_bootstrap" = "xyes"; then
-   IT_FIND_ECJ_JAR
-   IT_FIND_TOOL([XSLTPROC], [xsltproc])
-diff -Nru icedtea-2.1.1.orig/Makefile.am icedtea-2.1.1/Makefile.am
---- icedtea-2.1.1.orig/Makefile.am	2012-06-13 02:56:54.403835785 +0100
-+++ icedtea-2.1.1/Makefile.am	2012-06-13 02:57:31.648476322 +0100
-@@ -249,6 +249,11 @@
- 	patches/cacao/launcher.patch \
- 	patches/cacao/jsig.patch \
- 	patches/cacao/memory.patch
-+else
-+if USING_CACAO
-+ICEDTEA_PATCHES += \
-+	patches/cacao/memory.patch
-+endif
- endif
- 
- if ENABLE_CACAO
-diff -Nru icedtea-2.1.1.orig/patches/cacao/launcher.patch icedtea-2.1.1/patches/cacao/launcher.patch
---- icedtea-2.1.1.orig/patches/cacao/launcher.patch	2012-06-13 02:28:23.950879620 +0100
-+++ icedtea-2.1.1/patches/cacao/launcher.patch	2012-06-13 02:59:50.858865063 +0100
-@@ -1,14 +1,3 @@
----- openjdk/jdk/make/docs/Makefile.orig	2010-08-27 20:01:53.000000000 +0200
--+++ openjdk/jdk/make/docs/Makefile	2010-09-07 12:56:00.309691118 +0200
--@@ -70,7 +70,7 @@
-- ifeq ($(ARCH_DATA_MODEL),64)
--   MAX_VM_MEMORY = 1024
-- else
---  MAX_VM_MEMORY = 512
--+  MAX_VM_MEMORY = 768
-- endif
-- 
-- # List of all possible directories for javadoc to look for sources
- --- openjdk/jdk/src/share/bin/java.c.orig	2010-09-07 05:24:49.307192201 +0200
- +++ openjdk/jdk/src/share/bin/java.c	2010-09-07 12:56:00.309691118 +0200
- @@ -174,6 +174,8 @@
-diff -Nru icedtea-2.1.1.orig/patches/cacao/memory.patch icedtea-2.1.1/patches/cacao/memory.patch
---- icedtea-2.1.1.orig/patches/cacao/memory.patch	2012-06-13 02:28:23.954879676 +0100
-+++ icedtea-2.1.1/patches/cacao/memory.patch	2012-06-13 03:01:11.156239098 +0100
-@@ -1,6 +1,70 @@
----- openjdk.orig/langtools/make/build.xml	2010-06-01 11:25:40.145287816 +0100
--+++ openjdk/langtools/make/build.xml	2010-06-21 21:48:41.000000000 +0100
--@@ -554,6 +554,7 @@
-+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make	2012-06-07 19:21:17.000000000 +0100
-++++ openjdk/hotspot/make/linux/makefiles/rules.make	2012-06-13 03:36:26.364575315 +0100
-+@@ -141,7 +141,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make	2012-06-07 19:21:17.000000000 +0100
-++++ openjdk/hotspot/make/solaris/makefiles/rules.make	2012-06-13 03:36:26.364575315 +0100
-+@@ -133,7 +133,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make	2012-06-07 19:21:17.000000000 +0100
-++++ openjdk/hotspot/make/windows/makefiles/rules.make	2012-06-13 03:36:26.364575315 +0100
-+@@ -45,7 +45,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION=6
-+ BOOT_TARGET_CLASS_VERSION=6
-+-JAVAC_FLAGS=-g -encoding ascii
-++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ ProjectFile=jvm.vcproj
-+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
-+--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2012-06-08 14:12:38.000000000 +0100
-++++ openjdk/jdk/make/common/shared/Platform.gmk	2012-06-13 03:36:26.380575614 +0100
-+@@ -447,7 +447,7 @@
-+       else \
-+         echo "false"; \
-+       fi)
-+-    MAX_VM_MEMORY := 512
-++    MAX_VM_MEMORY := 1536
-+     MIN_VM_MEMORY := $(MAX_VM_MEMORY)
-+   else
-+     MB_OF_MEMORY       := unknown
-+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
-+--- openjdk.orig/jdk/make/docs/Makefile	2012-06-08 14:12:38.000000000 +0100
-++++ openjdk/jdk/make/docs/Makefile	2012-06-13 03:36:26.380575614 +0100
-+@@ -69,9 +69,9 @@
-+ #    NOTE: javadoc will not complete without these larger settings.
-+ #    WARNING: This could cause thrashing on low memory machines.
-+ ifeq ($(ARCH_DATA_MODEL),64)
-+-  MAX_VM_MEMORY = 1024
-++  MAX_VM_MEMORY = 1792
-+ else
-+-  MAX_VM_MEMORY = 512
-++  MAX_VM_MEMORY = 768
-+ endif
-+ 
-+ # List of all possible directories for javadoc to look for sources
-+diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
-+--- openjdk.orig/langtools/make/build.xml	2012-02-15 08:26:56.000000000 +0000
-++++ openjdk/langtools/make/build.xml	2012-06-13 03:36:26.380575614 +0100
-+@@ -796,6 +796,7 @@
-                      <compilerarg value="-implicit:none"/>
-                      <compilerarg value="-Xprefer:source"/>
-                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
diff --git a/dev-java/icedtea/files/icedtea-7.2.2-no_suffix.patch b/dev-java/icedtea/files/icedtea-7.2.2-no_suffix.patch
deleted file mode 100644
index 61bbd09d84ee..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.2-no_suffix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <ahughes@redhat.com>
-# Date 1338297380 -3600
-# Node ID fb4e64ae06a31c878cc711579fe87a6f626f73fb
-# Parent  2c3c929e038c6c64d79ecf98005f5fd2f4d0f37d
-Don't add a suffix for building the default, IcedTea.
-
-2012-05-25  Andrew John Hughes  <ahughes@redhat.com>
-
-	* Makefile.am:
-	(versioning): Don't add a suffix if building
-	the default project, 'icedtea'.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1435,7 +1435,7 @@
- 	  echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
- 	    >>openjdk/jdk/make/common/shared/Defs.gmk ;
- endif
--	if test x"$(PROJECT_NAME)" != "xjdk7"; then \
-+	if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
- 	  proj_suffix="-$(PROJECT_NAME)"; \
- 	fi ; \
- 	if test x"$(VERSION_SUFFIX)" != "x"; then \
diff --git a/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch
deleted file mode 100644
index c66525332b00..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..85ac971 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
- if WITH_PAX
--ICEDTEA_PATCHES += patches/test_gamma.patch
-+ICEDTEA_PATCHES += \
-+	patches/test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
---- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \
diff --git a/dev-java/icedtea/files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch
deleted file mode 100644
index c76c9f3620ec..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.2.1-pr986-cacao_memory_fix.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@member.fsf.org>
-# Date 1339542060 -3600
-# Node ID e6d81fc2c9439652f903664d51a13732c73485ea
-# Parent  1a9e619bc32e81697bf4200a607935ee00c8d388
-PR986: Allow CACAO builds of IcedTea to be able to build IcedTea without bootstrap.
-
-2012-06-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
-
-	PR986
-	* Makefile.am:
-	(ICEDTEA_PATCHES): Add memory patch when
-	building using CACAO as well, even if the
-	result is not a CACAO build.
-	* acinclude.m4:
-	(IT_USING_CACAO): New macro; detects use of
-	CACAO as the build VM so memory limits can
-	be raised accordingly.
-	* configure.ac: Call IT_USING_CACAO.
-	* patches/cacao/launcher.patch:
-	Move memory increase to memory.patch.
-	* patches/cacao/memory.patch:
-	Extend with additional cases in HotSpot and
-	the JDK.
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -249,6 +249,11 @@
- 	patches/cacao/launcher.patch \
- 	patches/cacao/jsig.patch \
- 	patches/cacao/memory.patch
-+else
-+if USING_CACAO
-+ICEDTEA_PATCHES += \
-+	patches/cacao/memory.patch
-+endif
- endif
- 
- if ENABLE_CACAO
-diff --git a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2278,3 +2278,18 @@
-   AC_SUBST(PAX_COMMAND)
-   AC_SUBST(PAX_COMMAND_ARGS)
- ])
-+
-+AC_DEFUN([IT_USING_CACAO],[
-+  AC_REQUIRE([IT_FIND_JAVA])
-+  AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
-+  if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
-+    it_cv_cacao=yes;
-+  else
-+    it_cv_cacao=no;
-+  fi
-+  ])
-+  USING_CACAO=$it_cv_cacao
-+  AC_SUBST(USING_CACAO)
-+  AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
-+  AC_PROVIDE([$0])dnl
-+])
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -102,6 +102,7 @@
- IT_FIND_JAR
- IT_FIND_RMIC
- IT_FIND_NATIVE2ASCII
-+IT_USING_CACAO
- if test "x$enable_bootstrap" = "xyes"; then
-   IT_FIND_ECJ_JAR
-   IT_FIND_TOOL([XSLTPROC], [xsltproc])
-diff --git a/patches/cacao/launcher.patch b/patches/cacao/launcher.patch
---- a/patches/cacao/launcher.patch
-+++ b/patches/cacao/launcher.patch
-@@ -1,15 +1,3 @@
--diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
----- openjdk.orig/jdk/make/docs/Makefile	2012-03-21 17:09:55.000000000 +0000
--+++ openjdk/jdk/make/docs/Makefile	2012-03-23 00:46:49.461847958 +0000
--@@ -73,7 +73,7 @@
-- else ifeq ($(ARCH),universal)
--   MAX_VM_MEMORY = 1024
-- else
---  MAX_VM_MEMORY = 512
--+  MAX_VM_MEMORY = 768
-- endif
-- 
-- # List of all possible directories for javadoc to look for sources
- diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c
- --- openjdk.orig/jdk/src/share/bin/java.c	2012-03-21 17:09:55.000000000 +0000
- +++ openjdk/jdk/src/share/bin/java.c	2012-03-23 00:46:49.461847958 +0000
-diff --git a/patches/cacao/memory.patch b/patches/cacao/memory.patch
---- a/patches/cacao/memory.patch
-+++ b/patches/cacao/memory.patch
-@@ -1,6 +1,85 @@
----- openjdk.orig/langtools/make/build.xml	2010-06-01 11:25:40.145287816 +0100
--+++ openjdk/langtools/make/build.xml	2010-06-21 21:48:41.000000000 +0100
--@@ -554,6 +554,7 @@
-+diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/rules.make openjdk/hotspot/make/bsd/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/bsd/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/bsd/makefiles/rules.make	2012-06-12 10:50:20.974290246 +0100
-+@@ -128,7 +128,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/linux/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
-+@@ -128,7 +128,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/solaris/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
-+@@ -120,7 +120,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION = 6
-+ BOOT_TARGET_CLASS_VERSION = 6
-+-JAVAC_FLAGS = -g -encoding ascii
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ # With parallel makes, print a message at the end of compilation.
-+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
-+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
-++++ openjdk/hotspot/make/windows/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
-+@@ -45,7 +45,7 @@
-+ # Settings for javac
-+ BOOT_SOURCE_LANGUAGE_VERSION=6
-+ BOOT_TARGET_CLASS_VERSION=6
-+-JAVAC_FLAGS=-g -encoding ascii
-++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-+ 
-+ ProjectFile=jvm.vcproj
-+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
-+--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2012-06-08 17:12:17.000000000 +0100
-++++ openjdk/jdk/make/common/shared/Platform.gmk	2012-06-12 10:50:20.982290377 +0100
-+@@ -537,7 +537,7 @@
-+       else \
-+         echo "false"; \
-+       fi)
-+-    MAX_VM_MEMORY := 512
-++    MAX_VM_MEMORY := 1536
-+     MIN_VM_MEMORY := $(MAX_VM_MEMORY)
-+   else
-+     MB_OF_MEMORY       := unknown
-+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
-+--- openjdk.orig/jdk/make/docs/Makefile	2012-06-08 17:12:17.000000000 +0100
-++++ openjdk/jdk/make/docs/Makefile	2012-06-12 11:09:31.616702981 +0100
-+@@ -69,11 +69,11 @@
-+ #    NOTE: javadoc will not complete without these larger settings.
-+ #    WARNING: This could cause thrashing on low memory machines.
-+ ifeq ($(ARCH_DATA_MODEL),64)
-+-  MAX_VM_MEMORY = 1024
-++  MAX_VM_MEMORY = 1792
-+ else ifeq ($(ARCH),universal)
-+-  MAX_VM_MEMORY = 1024
-++  MAX_VM_MEMORY = 1792
-+ else
-+-  MAX_VM_MEMORY = 512
-++  MAX_VM_MEMORY = 768
-+ endif
-+ 
-+ # List of all possible directories for javadoc to look for sources
-+diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
-+--- openjdk.orig/langtools/make/build.xml	2012-06-08 17:12:36.000000000 +0100
-++++ openjdk/langtools/make/build.xml	2012-06-12 10:50:20.974290246 +0100
-+@@ -796,6 +796,7 @@
-                      <compilerarg value="-implicit:none"/>
-                      <compilerarg value="-Xprefer:source"/>
-                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
diff --git a/dev-java/icedtea/files/icedtea-7.2.2.1-warnings_are_errors.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-warnings_are_errors.patch
deleted file mode 100644
index 2822155a2e89..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.2.1-warnings_are_errors.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..b20ee99 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -235,7 +235,8 @@ REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
- 
- # Patch list
- 
--ICEDTEA_PATCHES =
-+ICEDTEA_PATCHES = \
-+	patches/warnings-are-errors.patch
- 
- # Conditional patches
- 
-@@ -437,7 +438,9 @@ ICEDTEA_ENV = \
- 	USE_SYSTEM_CUPS="true" \
- 	CUPS_LIBS="${CUPS_LIBS}" \
- 	CUPS_CFLAGS="${CUPS_CFLAGS}" \
--	ALT_STRIP_POLICY=no_strip
-+	ALT_STRIP_POLICY=no_strip \
-+	COMPILER_WARNINGS_FATAL="@WARNINGS_ARE_ERRORS@" \
-+	JAVAC_WARNINGS_FATAL="@WARNINGS_ARE_ERRORS@"
- 
- if ENABLE_CACAO
- ICEDTEA_ENV += \
-diff --git a/acinclude.m4 b/acinclude.m4
-index f0a336f..3dc4aa0 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2244,3 +2244,23 @@ AC_DEFUN_ONCE([IT_WITH_PAX],
-   AC_SUBST(PAX_COMMAND)
-   AC_SUBST(PAX_COMMAND_ARGS)
- ])
-+
-+AC_DEFUN_ONCE([IT_WARNINGS_ARE_ERRORS],
-+[
-+  AC_MSG_CHECKING([whether to treat warnings as errors.])
-+  AC_ARG_ENABLE([warnings-are-errors],
-+                [AS_HELP_STRING(--enable-warnings-are-errors,treat warnings as errors [[default=yes]])],
-+  [
-+    if test x"${enableval}" = "xyes"; then
-+      WARNINGS_ARE_ERRORS="true"
-+    else
-+      WARNINGS_ARE_ERRORS="false"
-+    fi
-+  ],
-+  [
-+    dnl use local defaults
-+    WARNINGS_ARE_ERRORS=
-+  ])
-+  AC_MSG_RESULT([${WARNINGS_ARE_ERRORS}])
-+  AC_SUBST([WARNINGS_ARE_ERRORS])
-+])
-diff --git a/configure.ac b/configure.ac
-index 36c9d77..af52bf1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -54,6 +54,7 @@ IT_DISABLE_TESTS
- IT_DISABLE_HOTSPOT_TESTS
- IT_DISABLE_LANGTOOLS_TESTS
- IT_DISABLE_JDK_TESTS
-+IT_WARNINGS_ARE_ERRORS
- 
- # Use xvfb-run if found to run gui tests (check-jdk).
- AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])
-diff --git a/patches/boot/ecj-opts.patch b/patches/boot/ecj-opts.patch
-index 99ed532..284bd37 100644
---- a/patches/boot/ecj-opts.patch
-+++ b/patches/boot/ecj-opts.patch
-@@ -5,8 +5,8 @@ diff -Nru openjdk-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/jav
-  PACKAGE = java.nio
-  LIBRARY = nio
-  PRODUCT = java
---OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
-+-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial
- +OTHER_JAVACFLAGS += -Xlint:serial -Werror
-- include $(BUILDDIR)/common/Defs.gmk
-- 
-- NIO_SRC = $(SHARE_SRC)/classes/java/nio
-+ ifneq ($(JAVAC_WARNINGS_FATAL),false)
-+   OTHER_JAVACFLAGS += -Werror
-+ endif
-diff --git a/patches/warnings-are-errors.patch b/patches/warnings-are-errors.patch
-new file mode 100644
-index 0000000..7fe1e08
---- /dev/null
-+++ b/patches/warnings-are-errors.patch
-@@ -0,0 +1,129 @@
-+--- openjdk/hotspot/make/linux/makefiles/adlc.make
-++++ openjdk/hotspot/make/linux/makefiles/adlc.make
-+@@ -67,8 +67,10 @@
-+ CXXFLAGS += -DASSERT
-+ 
-+ # CFLAGS_WARN holds compiler options to suppress/enable warnings.
-+-# Compiler warnings are treated as errors
-+-CFLAGS_WARN = -Werror
-++# Treat compiler warnings as errors, unless warnings are allowed
-++ifneq ($(COMPILER_WARNINGS_FATAL),false)
-++  CFLAGS_WARN = -Werror
-++endif
-+ CFLAGS += $(CFLAGS_WARN)
-+ 
-+ OBJECTNAMES = \
-+--- openjdk/hotspot/make/linux/makefiles/gcc.make
-++++ openjdk/hotspot/make/linux/makefiles/gcc.make
-+@@ -149,8 +149,10 @@
-+   CFLAGS += -pipe
-+ endif
-+ 
-+-# Compiler warnings are treated as errors
-+-WARNINGS_ARE_ERRORS = -Werror
-++# Treat compiler warnings as errors, unless warnings are allowed
-++ifneq ($(COMPILER_WARNINGS_FATAL),false)
-++  WARNINGS_ARE_ERRORS = -Werror
-++endif
-+ 
-+ # Except for a few acceptable ones
-+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-+--- openjdk/hotspot/make/solaris/makefiles/gcc.make
-++++ openjdk/hotspot/make/solaris/makefiles/gcc.make
-+@@ -111,8 +111,10 @@
-+ endif
-+ 
-+ 
-+-# Compiler warnings are treated as errors 
-+-WARNINGS_ARE_ERRORS = -Werror 
-++# Treat compiler warnings as errors, unless warnings are allowed
-++ifneq ($(COMPILER_WARNINGS_FATAL),false)
-++  WARNINGS_ARE_ERRORS = -Werror
-++endif
-+ # Enable these warnings. See 'info gcc' about details on these options
-+ ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare 
-+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) 
-+--- openjdk/jdk/make/java/nio/Makefile
-++++ openjdk/jdk/make/java/nio/Makefile
-+@@ -31,7 +31,10 @@
-+ PACKAGE = java.nio
-+ LIBRARY = nio
-+ PRODUCT = java
-+-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
-++OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial
-++ifneq ($(JAVAC_WARNINGS_FATAL),false)
-++  OTHER_JAVACFLAGS += -Werror
-++endif
-+ include $(BUILDDIR)/common/Defs.gmk
-+ 
-+ NIO_SRC = $(SHARE_SRC)/classes/java/nio
-+--- openjdk/jdk/make/java/sun_nio/Makefile
-++++ openjdk/jdk/make/java/sun_nio/Makefile
-+@@ -31,7 +31,11 @@
-+ PACKAGE = sun.nio
-+ PRODUCT = sun
-+ 
-+-OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror
-++OTHER_JAVACFLAGS += -Xlint:serial,-deprecation
-++ifneq ($(JAVAC_WARNINGS_FATAL),false)
-++  OTHER_JAVACFLAGS += -Werror
-++endif
-++
-+ include $(BUILDDIR)/common/Defs.gmk
-+ 
-+ #
-+--- openjdk/jdk/make/sun/native2ascii/Makefile
-++++ openjdk/jdk/make/sun/native2ascii/Makefile
-+@@ -30,7 +30,10 @@
-+ BUILDDIR = ../..
-+ PACKAGE = sun.tools.native2ascii
-+ PRODUCT = sun
-+-OTHER_JAVACFLAGS += -Xlint:serial -Werror
-++OTHER_JAVACFLAGS += -Xlint:serial
-++ifneq ($(JAVAC_WARNINGS_FATAL),false)
-++  OTHER_JAVACFLAGS += -Werror
-++endif
-+ include $(BUILDDIR)/common/Defs.gmk
-+ 
-+ # This program must contain a manifest that defines the execution level
-+--- openjdk/jdk/make/sun/nio/cs/Makefile
-++++ openjdk/jdk/make/sun/nio/cs/Makefile
-+@@ -36,7 +36,10 @@
-+ # This re-directs all the class files to a separate location
-+ CLASSDESTDIR = $(TEMPDIR)/classes
-+ 
-+-OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror
-++OTHER_JAVACFLAGS += -Xlint:serial,-deprecation
-++ifneq ($(JAVAC_WARNINGS_FATAL),false)
-++  OTHER_JAVACFLAGS += -Werror
-++endif
-+ include $(BUILDDIR)/common/Defs.gmk
-+ 
-+ #
-+--- openjdk/jdk/make/tools/Makefile
-++++ openjdk/jdk/make/tools/Makefile
-+@@ -29,7 +29,10 @@
-+ 
-+ BUILDDIR = ..
-+ 
-+-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true JAVAC_WARNINGS_FATAL=true
-++SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
-++ifneq ($(JAVAC_WARNINGS_FATAL),false)
-++  SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-++endif
-+ include $(BUILDDIR)/common/Defs.gmk
-+ 
-+ # Note: freetypecheck is built by Sanity.gmk if needed
-+--- openjdk/langtools/make/Makefile
-++++ openjdk/langtools/make/Makefile
-+@@ -111,6 +111,10 @@
-+   ANT_OPTIONS += -Ddebug.classfiles=true
-+ endif
-+ 
-++ifeq ($(JAVAC_WARNINGS_FATAL),false)
-++  ANT_OPTIONS += -Djavac.lint.opts=-Xlint:all,-deprecation
-++endif
-++
-+ # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
-+ # and the somewhat misnamed CLASS_VERSION (-target NN)
-+ ifdef TARGET_CLASS_VERSION
diff --git a/dev-java/icedtea/files/icedtea-7.2.3.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.3.1-pax_mark_rmic_java.patch
deleted file mode 100644
index c66525332b00..000000000000
--- a/dev-java/icedtea/files/icedtea-7.2.3.1-pax_mark_rmic_java.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..85ac971 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
- if WITH_PAX
--ICEDTEA_PATCHES += patches/test_gamma.patch
-+ICEDTEA_PATCHES += \
-+	patches/test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
---- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \
diff --git a/dev-java/icedtea/icedtea-6.1.11.2.ebuild b/dev-java/icedtea/icedtea-6.1.11.2.ebuild
deleted file mode 100644
index d5e806fe3d9e..000000000000
--- a/dev-java/icedtea/icedtea-6.1.11.2.ebuild
+++ /dev/null
@@ -1,316 +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.2.ebuild,v 1.1 2012/05/14 16:27:04 sera 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
-	${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
-
-	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-6.1.11.3.ebuild b/dev-java/icedtea/icedtea-6.1.11.3.ebuild
deleted file mode 100644
index c8a5d84aea36..000000000000
--- a/dev-java/icedtea/icedtea-6.1.11.3.ebuild
+++ /dev/null
@@ -1,336 +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.3.ebuild,v 1.2 2012/06/24 08:19:48 sera 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"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.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}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	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="6"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="+X +alsa cacao 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
-	${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 #422525
-	epatch "${FILESDIR}"/${PN}-${SLOT}-pass_javac_memory_args_to_vm.patch
-	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 enable_cacao
-	local vm=$(java-pkg_get-current-vm)
-
-	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	# 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"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	if [[ ${bootstrap} == enable ]]; then
-		# 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}"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO
-	if ! has "${ARCH}" amd64 sparc x86; then
-		enable_cacao=yes
-	elif use cacao; then
-		ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-		ewarn 'If so, please rebuild with USE="-cacao"'
-		enable_cacao=yes
-	fi
-
-	if [[ ${enable_cacao} ]]; then
-		config="${config} --enable-cacao"
-	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-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_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 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}
-	docompress -x /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.4.ebuild b/dev-java/icedtea/icedtea-6.1.11.4.ebuild
index 19d3fc557cdb..1146ddaa77e3 100644
--- a/dev-java/icedtea/icedtea-6.1.11.4.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.11.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.1 2012/09/02 11:48:02 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.4.ebuild,v 1.2 2012/09/26 08:42:27 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -213,7 +213,7 @@ src_configure() {
 	einfo "Configuring using --with-parallel-jobs=${procs}"
 
 	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
+		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
 	else
 		config="${config} --without-rhino"
 	fi
diff --git a/dev-java/icedtea/icedtea-7.2.1.1.ebuild b/dev-java/icedtea/icedtea-7.2.1.1.ebuild
deleted file mode 100644
index d795b20cd88c..000000000000
--- a/dev-java/icedtea/icedtea-7.2.1.1.ebuild
+++ /dev/null
@@ -1,340 +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.1.1.ebuild,v 1.2 2012/06/24 08:19:48 sera 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_VER=$(get_version_component_range 2-)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="22cc03983e20.tar.gz"
-CORBA_TARBALL="338c21646c76.tar.gz"
-HOTSPOT_TARBALL="8b7c4c5f6ba9.tar.gz"
-JAXP_TARBALL="7a8825b15df6.tar.gz"
-JAXWS_TARBALL="7edfbfe974f2.tar.gz"
-JDK_TARBALL="d5ddeffc4651.tar.gz"
-LANGTOOLS_TARBALL="b534c4c6cd9b.tar.gz"
-CACAO_TARBALL="a567bcb7f589.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.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-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	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 ~ia64 ~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
-	${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}-${SLOT}-compiler_detection_cleanup.patch
-	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
-	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
-	epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" icedtea7 icedtea-7 icedtea-bin-7 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"
-	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-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_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}
-	docompress -x /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/icedtea-7.2.1.ebuild b/dev-java/icedtea/icedtea-7.2.1.ebuild
deleted file mode 100644
index 1e79a2d6397b..000000000000
--- a/dev-java/icedtea/icedtea-7.2.1.ebuild
+++ /dev/null
@@ -1,334 +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.1.ebuild,v 1.4 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_VER=$(get_version_component_range 2-)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="22cc03983e20.tar.gz"
-CORBA_TARBALL="5617f6c5cc94.tar.gz"
-HOTSPOT_TARBALL="0e651e004747.tar.gz"
-JAXP_TARBALL="1cf75c0e2c96.tar.gz"
-JAXWS_TARBALL="7edfbfe974f2.tar.gz"
-JDK_TARBALL="50f6f276a06c.tar.gz"
-LANGTOOLS_TARBALL="b534c4c6cd9b.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.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-${ICEDTEA_VER}/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/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 ~ia64 ~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}" icedtea7 icedtea-7 icedtea-bin-7 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/icedtea-7.2.2.1.ebuild b/dev-java/icedtea/icedtea-7.2.2.1.ebuild
deleted file mode 100644
index 655481fce78a..000000000000
--- a/dev-java/icedtea/icedtea-7.2.2.1.ebuild
+++ /dev/null
@@ -1,343 +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.2.1.ebuild,v 1.3 2012/06/27 19:08:57 sera 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_VER=$(get_version_component_range 2-)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="0b776ef59474.tar.gz"
-CORBA_TARBALL="38deb372c569.tar.gz"
-HOTSPOT_TARBALL="889dffcf4a54.tar.gz"
-JAXP_TARBALL="335fb0b059b7.tar.gz"
-JAXWS_TARBALL="5471e01ef43b.tar.gz"
-JDK_TARBALL="6c3b742b735d.tar.gz"
-LANGTOOLS_TARBALL="beea46c7086b.tar.gz"
-CACAO_TARBALL="a567bcb7f589.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.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-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	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 ~ia64 ~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
-	${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}-${SLOT}-no_suffix.patch
-	epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
-	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
-	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
-	epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
-	epatch "${FILESDIR}"/${P}-warnings_are_errors.patch #310503 #418359
-	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"
-	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-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		--disable-downloading \
-		--disable-warnings-are-errors \
-		$(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 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}
-	docompress -x /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/icedtea-7.2.2.ebuild b/dev-java/icedtea/icedtea-7.2.2.ebuild
deleted file mode 100644
index fc1b9a185e78..000000000000
--- a/dev-java/icedtea/icedtea-7.2.2.ebuild
+++ /dev/null
@@ -1,334 +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.2.ebuild,v 1.1 2012/06/10 13:56:19 sera 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_VER=$(get_version_component_range 2-)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="49a6fc8f712f.tar.gz"
-CORBA_TARBALL="3231f3e9c517.tar.gz"
-HOTSPOT_TARBALL="bfe5efd70bce.tar.gz"
-JAXP_TARBALL="0036fe6fe7dc.tar.gz"
-JAXWS_TARBALL="abfb890c262a.tar.gz"
-JDK_TARBALL="839d0155f7cc.tar.gz"
-LANGTOOLS_TARBALL="f855bdb37537.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.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-${ICEDTEA_VER}/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/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 ~ia64 ~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
-	${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}"/${P}-no_suffix.patch
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6 icedtea-7 icedtea-bin-7 icedtea7
-}
-
-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} \
-		--disable-downloading \
-		$(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 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}
-	docompress -x /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/icedtea-7.2.3.1.ebuild b/dev-java/icedtea/icedtea-7.2.3.1.ebuild
deleted file mode 100644
index 0c69616e5ae1..000000000000
--- a/dev-java/icedtea/icedtea-7.2.3.1.ebuild
+++ /dev/null
@@ -1,337 +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.3.1.ebuild,v 1.1 2012/08/31 14:28:28 caster 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_VER=$(get_version_component_range 2-)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="a3fa5d49d528.tar.gz"
-CORBA_TARBALL="e9b200124386.tar.gz"
-HOTSPOT_TARBALL="3e0087ab5e92.tar.gz"
-JAXP_TARBALL="9bd1d8e8b802.tar.gz"
-JAXWS_TARBALL="9a744f20cfc5.tar.gz"
-JDK_TARBALL="507eee662587.tar.gz"
-LANGTOOLS_TARBALL="0cf6181d44db.tar.gz"
-CACAO_TARBALL="a567bcb7f589.tar.gz"
-JAMVM_TARBALL="jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.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-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	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 ~ia64 ~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
-	${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}"/${P}-pax_mark_rmic_java.patch #422525
-	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"
-	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-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		--disable-downloading --disable-Werror \
-		$(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 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}
-	docompress -x /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/icedtea-7.2.3.2.ebuild b/dev-java/icedtea/icedtea-7.2.3.2.ebuild
index 358314ffd552..9d2024677f19 100644
--- a/dev-java/icedtea/icedtea-7.2.3.2.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.3.2.ebuild
@@ -1,6 +1,6 @@
 # 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.3.2.ebuild,v 1.1 2012/09/02 10:52:37 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.2.ebuild,v 1.2 2012/09/26 08:42:27 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -205,7 +205,7 @@ src_configure() {
 	einfo "Configuring using --with-parallel-jobs=${procs}"
 
 	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
+		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
 	else
 		config="${config} --without-rhino"
 	fi
author	Ralph Sennhauser <sera@gentoo.org>	2012-09-26 08:42:27 +0000
committer	Ralph Sennhauser <sera@gentoo.org>	2012-09-26 08:42:27 +0000
commit	670163cd4f096832476961a9584896e56bc50996 (patch)
tree	6a42b457d59ded8d2f4f1f2c9d3294307cb5ec20 /dev-java/icedtea
parent	Marked stable on AMD64 based on arch testing by Vicente "peratu" Olivert Rier... (diff)
download	gentoo-2-670163cd4f096832476961a9584896e56bc50996.tar.gz gentoo-2-670163cd4f096832476961a9584896e56bc50996.tar.bz2 gentoo-2-670163cd4f096832476961a9584896e56bc50996.zip