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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

16 files changed, 179 insertions, 1021 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/Manifest b/dev-java/gcj-jdk/Manifest
index 7ff291ef1716..670f6d82a9c1 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -2,36 +2,22 @@
 Hash: SHA256
 
 AUX gcj-jdk.env 676 SHA256 d8c8aab55aebe15dd783e273b857da4042d5041f32d31277180b619a9715be68 SHA512 b843774ee68f82f2379fb01a7f5b482993d13cd01cefefee7dcd50292555ff2b459c81ae0c30a5837a145ed559adb62c57811790cfed6c245c37ed395ca1579a WHIRLPOOL 414b00a70a95d13a8b733c0168bb18c95487c553b76c5dff7056883e1e6d9bc23bb3dd84330504805b01930a60e05ef85a63141491203667299f0f9e268e3134
-EBUILD gcj-jdk-4.5.1-r1.ebuild 3731 SHA256 68a04e153f76dc3c94cd9394b48836f75580fbe8d05d1a48cb94bcdad2793005 SHA512 f7b2bde3adec98064e011eee3366635614063aa7dbc4f0c93d3dcd3b2f539973aedee113c34ff3cd633e6f212fc92acaf0bc927edde303048c68ce75b573ce41 WHIRLPOOL bb5b3d3ac30a1e699b723d8d827044881c1ede64eb4dc4b471f592096096f30e1831e12ab4c2a5b547a3501992e7ad7434de7cb690387b4f3c578bf3db1b31c4
-EBUILD gcj-jdk-4.5.2-r1.ebuild 3731 SHA256 b08d6ee4610be920607215e4048c2231c823a40b50b0d3a5cefdb3d9b574ca55 SHA512 1b7411e25507a80f9018773a868eb08e94b178353aee53a545564b2ad1a227b2ab4120343386355610175e4d78e77c0224fc276821dd83925a7769668b605608 WHIRLPOOL de780e37d60b288db117d36a21d92b55212c0ce5e28f565c73856ea2110a5a333c296075c3577daaa1c577e7ea3b21dddf7bdf98c85fd234ebc46ca0b3b1c18d
-EBUILD gcj-jdk-4.5.3.ebuild 3734 SHA256 7f7ec4951b12048d036be015a05f6e68ef9cab94d588a0a3df640f01e9862441 SHA512 4b5829067e744d2fa83c98eb2a01bb570eb5c56aaf3198905ff45bf4c9b4abe4b0542024bd2d3bf95dd1ac34835357572c786e0b0d2ace7e233d469162c11228 WHIRLPOOL cf989e17eb2e67123874ed671abbe78abbb78cfcb928f3443f45509eb8f1f70e93a6a62326c62ef098d6925108bc43fb3f7cb131ae512a7200e232abc5b715cb
-EBUILD gcj-jdk-4.5.4-r1.ebuild 3444 SHA256 dd9cef880fc0a18bc93189dd25ec68bb3b9aea7d5bbf521be000d4937f9232e1 SHA512 33ac8137edcc103f61006a09af4e07bf3e0ab8546c97b7eba0aa6aa7a416d4496e20045ed26bda168dd0723db647e2e1beff3a2eb0c8eed0307ae2c63557c770 WHIRLPOOL b19758ad834562dddedc3ee710dc3b40731c891999834b3ac5c11a3d39794975db743df21f92a3a86c6229131f058686ff1a1cea516a1cc3b514538c0bc338ed
-EBUILD gcj-jdk-4.5.4.ebuild 3401 SHA256 40c18dfd7fd262326e2a505894c09158d318852050b4cbe7a7c27ed587418148 SHA512 01b8b11902e5c392cd6e7838c3ce9b0a3d527bb18bccd6fde75f6e38d4697273d7686661668add456cf82dd2f3d05daf4c5171ecc91f0bb068e286cfb1edcf61 WHIRLPOOL 9869a18bd4ff261c34bac68ecdfd1690c29d2e3a321b07e36cf75c66063cab3102e4cf2ae5453ec273a9049c0daad8235ec410d0ce4b12a5c950d7081bc20851
-EBUILD gcj-jdk-4.6.0.ebuild 3684 SHA256 a8b4e9fbcc360ec5c306f399ee52b1ceff80175707e1d4017de74b93e89d8110 SHA512 9a71c90b61516563bccdc79eb9fdba67515c6d308ce4beaa66b5b34a406f53bcb6805426a9afb3a2f2f131e9b46bce64665586d17ac3bbdf096452f479768dd7 WHIRLPOOL d83c06c960d21dfe6672941a3e1e6718adf920c667f7c854aa05810e22616c272401e2d6930e23ea45d426666b6675563196b70790d0fae35a56cb7353ad52c0
-EBUILD gcj-jdk-4.6.1.ebuild 3684 SHA256 834a8428b7d4e55c2104bffa6d1c61326a4380f63995267180b0a1b777a13bb0 SHA512 57ccbcd5f02b9149118d3e23f4751780c3db211c1f4d5a70676ba7b133c6b4ea27b16e8374c8dfa4b805e49e1ad0395adba6a77aef8aea133ece534b00a2a69e WHIRLPOOL cb02566f0bc08af439158dea233a01c940cbd17693ec26ea8edf9cb3d66f963a598c1add57fb4508cf9bb376b7419f1ff37fd29bad28874bd144173c8101d7fc
-EBUILD gcj-jdk-4.6.2-r1.ebuild 3816 SHA256 33ac1386e6b142b91b86b7e2a74fa595bfa023f7cdab88e03f7b8e88449a74cf SHA512 f39658b1cb591ff5d65e548fb0fd2c27cabd2b2cb068884be54b0dfdc5530f4bf672099e91d2aff25a46c1561c07c4e211fe572f48cadaffe4c26537d1bb17c5 WHIRLPOOL 4f448251171a56a6cc92e9810da0d442342712e983e3e92d7b25f507a866d7186e661a1f3b89de4acef5144fbbfde81dd685f95773b0879071e6c8d813e43ba9
-EBUILD gcj-jdk-4.6.3-r1.ebuild 3764 SHA256 991b3e5b83bc3807cdfa04b9d7697ef09141996db2dfbf1323a1c778bef2aca5 SHA512 467b2ac6ee0fb53d5a567683e933a98df0fd388350239eab149f430fa9c095c97901a0f31277f8161fd2a45e9a9d7eb532a7e8413199af0a18c3381855d4fcbd WHIRLPOOL b5185fd930ef7f10a1d0919d4406e3ff512d93a15610a1853f2062b844aa8427e47e659bea2609a6dc0e7fda437533a414b4997fdfa34e39393cb7c3d108ab70
-EBUILD gcj-jdk-4.6.3-r2.ebuild 3420 SHA256 4d04a1089352a6de0e46a4d251070281886ff4b47c65e5674fd05dfa31a8d7ee SHA512 d3829cfccd0b1dbe8a72fb39c32ef68edbee56e054eaf81637743f25af8f15e18375c6398e2965f0178f76df7b046b011a31f3d89063a3f5034934d234d27132 WHIRLPOOL 50c04d653bf2f8db6d3d9a1bed2757ca504f33e207fd819ed623f202e7fd4993e816e6450598eea51e2249a077a24408e6636d237336a7bc88ded696f68f8a34
-EBUILD gcj-jdk-4.6.3-r3.ebuild 3460 SHA256 de9337f9603c296b5abe9a2e72498fbc58f2fbd38e9d0105542c2265f97ee3a9 SHA512 02793ca4cced539410e1a1477d79679e84e8898d97fe62f5c550df5914cbf76af49ca1c47912e8bc6d17091be8c42835beb421d6a4f032c9fde399483500fcbd WHIRLPOOL a946296ab0238fbc1cba82497b193a935e67fcfbbf2de6afd39a318f1c3cab5d3eb48c1686a8c949905ff6c8a7685524dc5e799600e8bd9e682d005b6416dca8
-EBUILD gcj-jdk-4.6.3.ebuild 3818 SHA256 59cee67ac43b37407354412b15647852028ca000b5dd3a7f2a7bed7ecbf746eb SHA512 9df11529a63e1edb606f0448167adb2ea4578bd51afbd368bbabed788e6813fd95440a41aedc85f38bd6121a19d4865ec50a9586f7fbd2c28d9e5b8c511ce438 WHIRLPOOL ff9ae93c5735c1bc960f0eb7229670033ba5831b736c966149b9b56f333e6c0e47d3462af807acf7f304b031fdb74d581a66881171bafc672c5a7f320aaff9b4
-EBUILD gcj-jdk-4.7.2.ebuild 3457 SHA256 5501f1485baa2d6763e8156051242b2295795576378439330c4a5aa027396995 SHA512 9518ad6a1979f1dd0e5d9a4e1080ccf2a08ec61085d3685ab9e19266ef0ee9993fd128419f1815affd39df65b19056e730ea09ca24c26afbbdc032660c29987e WHIRLPOOL 48bd04bf1b05fcc51b5d5bdcdf316273c74f3d81cc2528f498eb6c8356953d4b6be1d3a68b168092affdd3466c88cd52333de4f56b4eca99d4f602c1f76900e6
+AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8
+EBUILD gcj-jdk-4.7.3-r1.ebuild 3885 SHA256 601caa195678e1e6cca98d763b66a64f8f55712067e335c98fdbf75a0e0f8acb SHA512 61cf6d97d9fccd6b3435669aaa9eb1763044055d54b27f75810046af9f90aed0f1d7d231e2ab1300dff08bdfeaf52721c56617f10b4a308682ba05bb969a048d WHIRLPOOL d3283e3bccbd44e0a44c718fd2e786a3bb3d99f9fc622ca64f25c46b2809366ecb83c2c3cd1893812e02723c7347414d3d361b040f9d624e2c9ca3b96d8906d9
 EBUILD gcj-jdk-4.7.3.ebuild 3457 SHA256 a0ce2126e4b2bc8d403fe16fa4d5a19ec612588ae072aa185f6ea2e4c9ce325a SHA512 22d347a8efdc2a6347f2fcab662cd811bdab1b095482ef17bed67637c9215a106ded02c4bad93c7de14dace8a626711d067379fe8cb4fe4c298a692ada613ed4 WHIRLPOOL cd7c933e5ac02c2fde9dcd4984bb4f67dec49be6a6c5f9703dfc285ebd192fc4f88c955cf7d093284047c4902a9c9f1b8d1c30de3df502581214384bc0901654
-MISC ChangeLog 4059 SHA256 8c540c2becca0a5f80564f22d1944aafaf6e0b5952d6fb3c17b8c006cbb57b44 SHA512 37b0608bf9c06791a2f1c027eb11925549163366bc82e8f59b884ed6daaa0a157330ca1581760a7d3e211a2d8fe17a709ba912062c731f959a485308ecf46f9f WHIRLPOOL db2c708a68b2022d0333a4f2ed93d0ae0a42a4deb8ef5dfcd94af5be2944481a4a791ca24c3327e326a6a2d638d9853633de04183ae6541789696dcd6d67998b
+EBUILD gcj-jdk-4.7.4.ebuild 3882 SHA256 1b10b7841091dfd197bda4623128f7e93dca4caaeb6b15c324869d279a5cbfda SHA512 bd465de6478047c8d17f465a9be60ff482e7eef6b92710904ca1ee035b77c5868effe96a89ba96691eaab761d7f66b09c408c57e980969608f39fba70e61f577 WHIRLPOOL 20548d84eeb40daf9486bbb46005cd99c780992c526bfc721d8a4fc38d27c5e3b3f8d146538b98bacd48e2112dc45e1d1e8e510d66e025dbf4e08dafbdf61ab2
+EBUILD gcj-jdk-4.8.2.ebuild 3864 SHA256 13064360c8f47fb751cbc136344a6651dac86c3318947365f38a5c158b781069 SHA512 59465c04124a005548cf3c3e3c9847f2f6f92ddbe0d9a7cd180acb8aaa5ddfd8fa221878724f84995440a28cc1d7cb6e5dead541e1eae4993c1b285ea8983d41 WHIRLPOOL df6eb78fe0822eec12996bdfbfed6f824a98d910307b8ff911b3774b89bc578b2e5d168b345477ff6433838e3a5063ea58e8f21881d6bb6430b9cbdbf8264f1b
+EBUILD gcj-jdk-4.8.3.ebuild 3864 SHA256 a70e3b9ea5b638c8e58c8923d3c3ed9c9d1905dd3e025b76ad8204e743dd7be1 SHA512 1421fb3b19ffebb5cdaba9ba05d497e68feef4127c1aa6c72bd47c9e1a936d6daa223689277a0a86bfd4daeb4a5d29db73fd97b2312d3563f67177a5a4f07388 WHIRLPOOL 8ac408c20601f4046bd2d00e42d97b18a0a564c996a3bc180cd3011ff46157b80c7fe13faf7995feecc60044aa23100b70f276e32e708c55e2a0a4fd51af92a4
+MISC ChangeLog 5017 SHA256 bbd1fe781cdab976f2b2f352fb104b01c0fd935bd9cc730ee7ec80f613d0cf30 SHA512 1551566e7320e34aaad1a0e816642b05c5ff0160162e606c2fd2583c8dfa8a9e63479de4fff7811f15f16e5d77882bfe8dc99da2b12a3fd7e133207817124a81 WHIRLPOOL 6cc3075f2f6f3f65eeadce9be6124cf978ef5341f9119db5fda3f7c327f461d60aa58dd0bd941e06844fc5c25c7141498cd59519075b801c65f105957be0969d
 MISC metadata.xml 420 SHA256 b939a23db890e627c3f9435964b7d4b9d9ecb0896af86b288a81d41e825c25b9 SHA512 6a9921186f1cc07e32515e9837c41a7ec1c802809b30ce8c28520d64ee3d7123c57b58c7ec57f556f7f991792b87b8605514681c4cdf5843628daa0d12b082f2 WHIRLPOOL 526bd3b1a989e90dea71b50e80cbc7c3bf899efbd1f3d8825b920ce0c572daa32c58bd6b5458345d0681feb906862f9a80873d888f744f7d7b0a1aeae6f23d1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS2kmkAAoJEPiazRVxLXTFrkgP/2gxmgo/bPp3ZBOfJWud/WQ3
-CP/BClsLeoKIPiTvS3RFsyTzJjW08TQKughyRZNAG8zNRs59YzNxnpV93yT+7Ei2
-C8TDajROhOCsWH+fERJQnwCvyWLtjePRT2dLxNTjjgH3wRB6Uh9Ux6xMoC3gPISj
-/HkY+KTqWVlXAMBsyg4WwMkK7XcR4SgjcNfNIhFc1z0kgs1ji0fYGDAOpa+WP31T
-iIwORVD8/gQCGbhs6PN9waDf15lUad7DGcMJr7h6L31rExVEnsBHToD6V6Bn8BaM
-bV1ku0RJvdeMUDKkOV6gb4ElePQZN1EGc7HvbLUTG5jJ2WXnjBu9+rILfWi3vVjM
-iw4tsBN8J/R7LTM3QE9s+WKwSZ6z+1BX0xDQM0fafnQ1vLIrf/VALROEnkZ3uzg5
-CjXbiZNzXE93P9yNndlwDn37J1Aq/K7CzFNR1hpj5jWoCmy9P19cbs7f7v+wOckE
-brcdv60BE/8wjHGx2CaOe0iZSLrWJ6vB8gMVXSjtV7wb+kaY6fnx8+VeBRop9+ql
-b46jJ9S4hEvJLYhRYeYkDcKWwnSI/wkzYvGz4JSKDsojna9gCFrHL7kdDYWgzhc9
-gv0/CD/zKf9RnKiEsZZG+pnUOhYdC4kxtN32HXEgqj7Xp92YiiWzpSWVP/8HBBYo
-cqiCdTGXkJLMoeKRidNM
-=R4Z/
+iQEcBAEBCAAGBQJTxCVrAAoJELjwI6Q8XPdamkoIAKKfY2mkkLpD5GGZbk9du2Ox
+8tJMm0plJUB+VE1MsIV+MML6+w4hF3GcjotwlA7jOTNHzU5PG4C6kW2dtUHzlumN
+57848rDcsePIHsjuMLciP5CKrc4zHwgt4MlEyBSWzxAlIg+EOXU4tk+x/ZmE0a0I
+uAYpwnEjyjdKM1T+NYQDCrbzuJv2UEjNsOo/23ts+hcY3NRNEgk74RziOAgb+EhD
+lIcxMedGVrWUygsVIw5QAPDUDZG7m+cgtsAGhc2F1Iao70V4/lOxPbMmrB8ojhHt
+8UBDYm4jbYGMpChFW5yqOwlZ62Fb9F/AJj9Cas+A97vqZIkPzubjWmk2W5kID7c=
+=pJhG
 -----END PGP SIGNATURE-----
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