Add missing versions for 4.7 and 4.8

Fix 4.7.3 to be able to build ant-core-1.9 #489266
Thanks to Andrew John Hughes <gnu_andrew@member.fsf.org> for the javac wrapper und for providing new API diffs
Drop 4.5 and 4.6 as they are to old to build current icedtea:7
Drop ia64 ppc ppc64 on 4.8 as the correspondig gcc is missing those keywords

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)

15 files changed, 165 insertions, 993 deletions

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 5c6b5c380b60..154a87afb4b2 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for dev-java/gcj-jdk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.15 2014/01/18 09:30:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.16 2014/07/14 18:45:53 sera Exp $
+
+*gcj-jdk-4.8.3 (14 Jul 2014)
+*gcj-jdk-4.8.2 (14 Jul 2014)
+*gcj-jdk-4.7.4 (14 Jul 2014)
+*gcj-jdk-4.7.3-r1 (14 Jul 2014)
+
+  14 Jul 2014; Ralph Sennhauser <sera@gentoo.org> -gcj-jdk-4.5.1-r1.ebuild,
+  -gcj-jdk-4.5.2-r1.ebuild, -gcj-jdk-4.5.3.ebuild, -gcj-jdk-4.5.4.ebuild,
+  -gcj-jdk-4.5.4-r1.ebuild, -gcj-jdk-4.6.0.ebuild, -gcj-jdk-4.6.1.ebuild,
+  -gcj-jdk-4.6.2-r1.ebuild, -gcj-jdk-4.6.3.ebuild, -gcj-jdk-4.6.3-r1.ebuild,
+  -gcj-jdk-4.6.3-r2.ebuild, -gcj-jdk-4.6.3-r3.ebuild, -gcj-jdk-4.7.2.ebuild,
+  +gcj-jdk-4.7.3-r1.ebuild, +gcj-jdk-4.7.4.ebuild, +gcj-jdk-4.8.2.ebuild,
+  +gcj-jdk-4.8.3.ebuild, +files/javac.in:
+  Add missing versions for 4.7 and 4.8
+  Fix 4.7.3 to be able to build ant-core-1.9 #489266
+  Thanks to Andrew John Hughes <gnu_andrew@member.fsf.org> for the javac
+  wrapper und for providing new API diffs
+  Drop 4.5 and 4.6 as they are to old to build current icedtea:7
+  Drop ia64 ppc ppc64 on 4.8 as the correspondig gcc is missing those keywords
 
   18 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -gcj-jdk-4.4.4-r1.ebuild,
   -gcj-jdk-4.4.5-r1.ebuild, -gcj-jdk-4.4.6.ebuild:
diff --git a/dev-java/gcj-jdk/files/javac.in b/dev-java/gcj-jdk/files/javac.in
new file mode 100644
index 000000000000..8eeda68c7a5e
--- /dev/null
+++ b/dev-java/gcj-jdk/files/javac.in
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -w
+use strict;
+use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
+use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
+
+my $ECJ_WARNINGS="-nowarn";
+
+my ( @bcoption, @source15, @target15, @cp );
+push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
+    unless grep {$_ eq '-bootclasspath'} @ARGV;
+push @source15, '-source', '1.5'
+    unless grep {$_ eq '-source'} @ARGV;
+push @target15, '-target', '1.5'
+    unless grep {$_ eq '-target'} @ARGV;  
+push @cp, '-cp', '.'
+    unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
+my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
+
+# Work around ecj's inability to handle duplicate command-line
+# options and unknown javac options.
+sub gen_ecj_opts
+{
+    my @new_args = @{$_[0]};
+
+    for my $opt (NO_DUP_ARGS) 
+    {
+	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+	if (@indices > 1) {
+	    shift @indices;    # keep last instance only
+	    splice @new_args, $_, 2 for @indices;
+	}
+    }
+
+    for my $opt (STRIP_ARGS) 
+    {
+	my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+	splice @new_args, $_, 1 for @indices;
+    }
+
+    return \@new_args;
+}
+
+sub split_vm_args
+{
+    my @new_args = @{$_[0]};
+
+    my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
+    my @javac_args = grep $_ !~ /^-J/, @new_args;
+
+    return (\@vm_args, \@javac_args);
+}
+
+my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
+my @CLASSPATH = ('@ECJ_JAR@');
+push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
+$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
+exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.5.1-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.5.1-r1.ebuild
deleted file mode 100644
index 4dc4b4c82422..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.1-r1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="2"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.5"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-JAVA_PROVIDE="jdbc-stdext jdbc2-stdext gnu-jaxp"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "Icedtea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.5.2-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.5.2-r1.ebuild
deleted file mode 100644
index d5d7eb50d3a8..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.2-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.2-r1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="2"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.5"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-JAVA_PROVIDE="jdbc-stdext jdbc2-stdext gnu-jaxp"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.5.3.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.5.3.ebuild
deleted file mode 100644
index b32385dd0c52..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.3.ebuild,v 1.3 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="2"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.5"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-JAVA_PROVIDE="jdbc-stdext jdbc2-stdext gnu-jaxp"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild
deleted file mode 100644
index 2dfe5a26ccba..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.5"
-
-RDEPEND="
-	~sys-devel/gcc-${PV}[gcj,awt]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gcc_version=${PV}
-	local gccbin=$(gcc-config -B ${gcc_version})
-	gccbin=${gccbin#"${EPREFIX}"}
-	local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1)
-	gcclib=${gcclib#"${EPREFIX}"}
-	local gcjhome="/usr/$(get_libdir)/${P}"
-	local gccchost="${CHOST}"
-	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
-	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gccbin}/gij ${gcjhome}/bin/java
-	dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dodir ${gcjhome}/jre/lib/${libarch}/server
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild
deleted file mode 100644
index 2b17e4d09625..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="2"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.5"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.1.ebuild
deleted file mode 100644
index deb8be3080b2..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="2"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild
deleted file mode 100644
index c1bd3b056a9a..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="4"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj,awt]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	gccbin=${gccbin#"${EPREFIX}"}
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	gcclib=${gcclib#"${EPREFIX}"}
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
-	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.3-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.3-r1.ebuild
deleted file mode 100644
index a86e80681bbb..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.3-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.3-r1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="4"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="
-	~sys-devel/gcc-${PV}[gcj,awt]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	gccbin=${gccbin#"${EPREFIX}"}
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	gcclib=${gcclib#"${EPREFIX}"}
-	local gcjhome="/usr/$(get_libdir)/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
-	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gccbin}/gij ${gcjhome}/bin/java
-	dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dodir ${gcjhome}/jre/lib/${libarch}/server
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.3.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.3.ebuild
deleted file mode 100644
index c3b00c7cbf30..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.3.ebuild,v 1.3 2013/12/24 02:08:43 tomwij Exp $
-
-EAPI="4"
-
-inherit java-vm-2 toolchain-funcs multilib versionator
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj,awt]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if [[ $(gcc-fullversion) != ${PV} ]]; then
-		eerror "Your current GCC version is not set to ${PV} via gcc-config"
-		eerror "Please read http://www.gentoo.org/doc/en/gcc-upgrading.xml before you set it"
-		echo "$(gcc-fullversion) != ${PV}"
-		die "gcc ${PV} must be selected via gcc-config"
-	fi
-
-	java-vm-2_pkg_setup
-}
-
-src_install() {
-	# jre lib paths ...
-	local libarch="$(get_system_arch)"
-	local gccbin=$(gcc-config -B)
-	gccbin=${gccbin#"${EPREFIX}"}
-	local gcclib=$(gcc-config -L|cut -d':' -f1)
-	gcclib=${gcclib#"${EPREFIX}"}
-	local gcjhome="/usr/lib/${P}"
-	local gcc_version=$(gcc-fullversion)
-	local gccchost="${CHOST}"
-	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
-	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
-	# correctly install gcj
-	dosym ${gccbin}/gij /usr/bin/gij
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# links
-	dodir ${gcjhome}/bin
-	dodir ${gcjhome}/jre/bin
-	dosym ${gcjhome}/bin/java ${gcjhome}/jre/bin/java
-	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
-	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
-	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
-	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
-	dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
-	dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
-	dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
-	dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
-	dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
-	dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
-	dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
-	dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
-	dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
-	dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
-	dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
-	dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
-	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
-	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-	dodir ${gcjhome}/jre/lib/${libarch}/client
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
-	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
-		${gcjhome}/jre/lib/rt.jar
-	dodir ${gcjhome}/lib
-	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
-		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
-
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac;
-	dosym /usr/bin/gij ${gcjhome}/bin/java;
-
-	set_java_env
-}
-
-pkg_postinst() {
-
-	# Do not set as system VM (see below)
-	# java-vm-2_pkg_postinst
-
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
-	ewarn "Check for existing bugs relating to missing APIs and file"
-	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
-	ewarn
-	ewarn "Due to this and limited manpower, we currently cannot support"
-	ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
-	ewarn "IcedTea without prior binary VM installation. To do that, execute:"
-	ewarn
-	ewarn "emerge -o icedtea && emerge icedtea"
-
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.3-r3.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
index 7613f6e8b8ea..ba7808501d62 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.3-r3.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.3-r3.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $
 
 EAPI="5"
 
@@ -16,11 +16,14 @@ SLOT="0"
 IUSE="X"
 
 ECJ_GCJ_SLOT="3.6"
+API_DIFF_PV="4.8.2"
 
+# perl is needed for javac wrapper
 RDEPEND="
+	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-lang/perl
 	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[awt] )
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
+	X? ( ~sys-devel/gcc-${PV}[awt] )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"
@@ -74,9 +77,17 @@ src_install() {
 	dodir ${gcjhome}/lib
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
 		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
+	dosym ${gcclib}/include ${gcjhome}/include
 
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert
 
 	set_java_env
 }
@@ -85,8 +96,9 @@ pkg_postinst() {
 	# Do not set as system VM (see below)
 	# java-vm-2_pkg_postinst
 
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
+	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
+	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
+	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
 	ewarn "Check for existing bugs relating to missing APIs and file"
 	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
 	ewarn
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild
index 2f85647721e5..ce8672f760ec 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $
 
 EAPI="5"
 
@@ -16,11 +16,14 @@ SLOT="0"
 IUSE="X"
 
 ECJ_GCJ_SLOT="3.6"
+API_DIFF_PV="4.8.2"
 
+# perl is needed for javac wrapper
 RDEPEND="
+	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-lang/perl
 	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[awt] )
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
+	X? ( ~sys-devel/gcc-${PV}[awt] )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"
@@ -74,9 +77,17 @@ src_install() {
 	dodir ${gcjhome}/lib
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
 		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
+	dosym ${gcclib}/include ${gcjhome}/include
 
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert
 
 	set_java_env
 }
@@ -85,8 +96,9 @@ pkg_postinst() {
 	# Do not set as system VM (see below)
 	# java-vm-2_pkg_postinst
 
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
+	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
+	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
+	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
 	ewarn "Check for existing bugs relating to missing APIs and file"
 	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
 	ewarn
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.5.4-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild
index 02c120be4b7b..303d33b779e0 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.4-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.4-r1.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $
 
 EAPI="5"
 
@@ -11,16 +11,19 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
 SLOT="0"
 IUSE="X"
 
-ECJ_GCJ_SLOT="3.5"
+ECJ_GCJ_SLOT="4.2"
+API_DIFF_PV="${PV}"
 
+# perl is needed for javac wrapper
 RDEPEND="
+	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-lang/perl
 	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[awt] )
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
+	X? ( ~sys-devel/gcc-${PV}[awt] )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"
@@ -74,9 +77,17 @@ src_install() {
 	dodir ${gcjhome}/lib
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
 		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
+	dosym ${gcclib}/include ${gcjhome}/include
 
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert
 
 	set_java_env
 }
@@ -85,8 +96,9 @@ pkg_postinst() {
 	# Do not set as system VM (see below)
 	# java-vm-2_pkg_postinst
 
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
+	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
+	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
+	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
 	ewarn "Check for existing bugs relating to missing APIs and file"
 	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
 	ewarn
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.8.3.ebuild
index 84b51ae474b3..49ca8bd8f764 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.8.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild,v 1.2 2013/12/24 02:08:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.8.3.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit java-vm-2 multilib
 
@@ -11,15 +11,19 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
 SLOT="0"
-IUSE=""
+IUSE="X"
 
-ECJ_GCJ_SLOT="3.6"
+ECJ_GCJ_SLOT="4.2"
+API_DIFF_PV="4.8.2"
 
+# perl is needed for javac wrapper
 RDEPEND="
-	~sys-devel/gcc-${PV}[gcj,awt]
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
+	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-lang/perl
+	~sys-devel/gcc-${PV}[gcj]
+	X? ( ~sys-devel/gcc-${PV}[awt] )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"
@@ -66,16 +70,24 @@ src_install() {
 	dodir ${gcjhome}/jre/lib/${libarch}/server
 	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
 	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
-	dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
+	use X && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
 
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
 		${gcjhome}/jre/lib/rt.jar
 	dodir ${gcjhome}/lib
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
 		${gcjhome}/lib/tools.jar
-	dosym ${gcclib}/include ${gcjhome}
+	dosym ${gcclib}/include ${gcjhome}/include
 
-	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert
 
 	set_java_env
 }
@@ -84,8 +96,9 @@ pkg_postinst() {
 	# Do not set as system VM (see below)
 	# java-vm-2_pkg_postinst
 
-	ewarn "gcj does not currently provide all the 1.5 APIs."
-	ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html"
+	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
+	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
+	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
 	ewarn "Check for existing bugs relating to missing APIs and file"
 	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
 	ewarn