dev-java/icedtea: Version bumps to address security vulnerabilities

6.1.13.8 to replace vulnerable 6.1.13.7, plus 7.2.5.6 and 7.2.6.1 to
replace vulnerable 7.2.5.5. 7.2.5.6 is needed for ppc because
non-HotSpot builds are broken under 7.2.6.1. See IcedTea #2058 [1].

Also fixes:

 * Removal of binaries depending on X and ALSA (#401621)
 * Building with IcedTea 6 (#531082)
 * PaX marking (#541462)
 * Building with GCC 5 (#548784)

[1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2058

Package-Manager: portage-2.2.20.1

2 files changed, 0 insertions, 116 deletions

diff --git a/dev-java/icedtea/files/6-more-memory.patch b/dev-java/icedtea/files/6-more-memory.patch
deleted file mode 100644
index a9017fc3f030..000000000000
--- a/dev-java/icedtea/files/6-more-memory.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- patches/cacao/launcher.patch.orig	2015-04-15 01:08:25.659995834 +0100
-+++ patches/cacao/launcher.patch	2015-05-18 22:12:49.492593647 +0100
-@@ -1,11 +1,14 @@
- --- openjdk/jdk/make/docs/Makefile.orig	2010-06-21 21:15:08.000000000 +0000
- +++ openjdk/jdk/make/docs/Makefile	2010-06-23 18:35:55.529822335 +0000
--@@ -70,7 +70,7 @@
-+@@ -68,9 +68,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 = 1024
-++  MAX_VM_MEMORY = 1792
-  else
- -  MAX_VM_MEMORY = 512
--+  MAX_VM_MEMORY = 768
-++  MAX_VM_MEMORY = 1280
-  endif
-  
-  # List of all possible directories for javadoc to look for sources
diff --git a/dev-java/icedtea/files/7-more-memory.patch b/dev-java/icedtea/files/7-more-memory.patch
deleted file mode 100644
index c68ac5333d09..000000000000
--- a/dev-java/icedtea/files/7-more-memory.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- patches/cacao/memory.patch.orig	2015-04-15 01:08:12.571871465 +0100
-+++ patches/cacao/memory.patch	2015-05-18 21:23:17.604748525 +0100
-@@ -6,7 +6,7 @@
-  BOOT_SOURCE_LANGUAGE_VERSION = 6
-  BOOT_TARGET_CLASS_VERSION = 6
- -JAVAC_FLAGS = -g -encoding ascii
--+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
-  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.
-@@ -18,7 +18,7 @@
-  BOOT_SOURCE_LANGUAGE_VERSION = 6
-  BOOT_TARGET_CLASS_VERSION = 6
- -JAVAC_FLAGS = -g -encoding ascii
--+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
-  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.
-@@ -30,7 +30,7 @@
-  BOOT_SOURCE_LANGUAGE_VERSION=6
-  BOOT_TARGET_CLASS_VERSION=6
- -JAVAC_FLAGS=-g -encoding ascii
--+JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-++JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m
-  BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-  
-  ProjectFile=jvm.vcproj
-@@ -42,14 +42,14 @@
-          echo "false"; \
-        fi)
- -    MAX_VM_MEMORY := 512
--+    MAX_VM_MEMORY := 1536
-++    MAX_VM_MEMORY := 1792
-      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,9 +69,9 @@
-+@@ -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)
-@@ -59,8 +59,11 @@
- -  MAX_VM_MEMORY = 1536
- +  MAX_VM_MEMORY = 1792
-  else
--   MAX_VM_MEMORY = 768
-+-  MAX_VM_MEMORY = 768
-++  MAX_VM_MEMORY = 2048
-  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
-@@ -80,7 +83,7 @@
-  BOOT_SOURCE_LANGUAGE_VERSION = 6
-  BOOT_TARGET_CLASS_VERSION = 6
- -JAVAC_FLAGS = -g -encoding ascii
--+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
-  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.
---- patches/boot/compile-for-7-cacao-mem.patch.orig	2015-04-15 01:08:12.519870970 +0100
-+++ patches/boot/compile-for-7-cacao-mem.patch	2015-05-18 21:35:10.136903342 +0100
-@@ -9,7 +9,7 @@
- -BOOT_TARGET_CLASS_VERSION = 6
- +BOOT_SOURCE_LANGUAGE_VERSION = 7
- +BOOT_TARGET_CLASS_VERSION = 7
-- JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
-  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
-@@ -23,7 +23,7 @@
- -BOOT_TARGET_CLASS_VERSION = 6
- +BOOT_SOURCE_LANGUAGE_VERSION = 7
- +BOOT_TARGET_CLASS_VERSION = 7
-- JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
-+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
-  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
-@@ -37,6 +37,6 @@
- -BOOT_TARGET_CLASS_VERSION=6
- +BOOT_SOURCE_LANGUAGE_VERSION=7
- +BOOT_TARGET_CLASS_VERSION=7
-- JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
-+ JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m
-  BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-