Import from java-overlay.

Adds Prefix support and missing use dep, thanks to XU Benda <heroxbd@gentoo.org>. #416367
Remove JAVA_PROVIDE, old style virtuals are dead.

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

6 files changed, 454 insertions, 16 deletions

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index b55d1b96bc9f..c1262d986e5b 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-java/gcj-jdk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.5 2012/04/15 17:51:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.6 2012/06/05 18:32:28 sera Exp $
+
+*gcj-jdk-4.6.3 (05 Jun 2012)
+*gcj-jdk-4.6.2-r1 (05 Jun 2012)
+*gcj-jdk-4.6.1 (05 Jun 2012)
+*gcj-jdk-4.6.0 (05 Jun 2012)
+
+  05 Jun 2012; Ralph Sennhauser <sera@gentoo.org> +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:
+  Import from java-overlay.
+  Adds Prefix support and missing use dep, thanks to XU Benda
+  <heroxbd@gentoo.org>. #416367
+  Remove JAVA_PROVIDE, old style virtuals are dead.
 
   15 Apr 2012; Mike Frysinger <vapier@gentoo.org> gcj-jdk-4.5.3.ebuild:
   Add back ia64 love #349020 by Dennis Schridde.
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 4f73a5f7379a..dc6bb79ac81c 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -8,22 +8,20 @@ EBUILD gcj-jdk-4.4.6.ebuild 3728 RMD160 7bc8ff8fa1203d07a76d9e93fd1a92288adf3065
 EBUILD gcj-jdk-4.5.1-r1.ebuild 3731 RMD160 e12ec4152586b2d0dcbdc91195f269e32ec9a2b8 SHA1 30ac318dc75cb7c8e9e1fdbdeee86ddbf82d26d4 SHA256 0806f5fe7dcb7debc72356275ab796db52e7b929d6e366b1d2dcc0f3edc91019
 EBUILD gcj-jdk-4.5.2-r1.ebuild 3731 RMD160 4f13b80ab0b0c23764455764d20264e6a007dd56 SHA1 0d427b6c747b0b2af25b30351adf62edbbd64fe5 SHA256 f095e83fb2412f61207e70196d94145044f2d36d44e070517f48d03274e71ab1
 EBUILD gcj-jdk-4.5.3.ebuild 3734 RMD160 155fe95de5dd3bf0bd126e7c0e0423482d542c1b SHA1 0cc9311b4b83308822dd270b7e76750ca2f4a5d4 SHA256 5f11991c29201628298018492d0b0fb3a2403625eeaaa81c44d7fe5e9d0bd43d
-MISC ChangeLog 1607 RMD160 a00f72ea1a9f75184c624e26055c595648b3f9c3 SHA1 20bcd16e09b6b1244eaf378ca3e0aa5eb83a6709 SHA256 994e0a6afd070f9833dcf84c86231b85a1b8f0b035cf8268a9a49bfd406181d7
+EBUILD gcj-jdk-4.6.0.ebuild 3682 RMD160 da96f0d3eadc7b8a719cb604bb2f4547a0ee6038 SHA1 d7cf9dbd9c4079f59a27a07014a959725abaf1fb SHA256 fe95e431925daed2668250516f736edf9dc6a490331fae98379447fe24ac5eff
+EBUILD gcj-jdk-4.6.1.ebuild 3682 RMD160 c95ef071c11d63ee0796ca5ef16b9b6e3a859f5e SHA1 52daf48af482f6010487042077d827afd8453aaa SHA256 0710efad7c1b350a3ecc62efae6424bf006a74ae04dd9d948b0aeb663b06c7d2
+EBUILD gcj-jdk-4.6.2-r1.ebuild 3814 RMD160 551467ce95f7a5350586a1b959a975703f16c385 SHA1 d08a55744b714deed89428d1fde2312099091b0a SHA256 52f887c8a0f28f2d9504b809d987dcfb007f76208c1db8538eb1636f099d1f67
+EBUILD gcj-jdk-4.6.3.ebuild 3811 RMD160 622225f7713ad8f247ce4eba35a7d9099e19eed3 SHA1 d5a1b8ced40b52aac4a5fac1f98548722b200e6e SHA256 9ecbb14893ab9de64e39905160c1eb76db4b8d83f3a3171a3644f90da43e1c85
+MISC ChangeLog 2047 RMD160 f5b05718a51b9d1036611157256c2992ad363ae5 SHA1 dcd1df8b36ac407474e62cd27a12573234d43438 SHA256 3d5b852af32d050e73329af0ef6ca13807989f7328a32e2d846ea2bc07626d5a
 MISC metadata.xml 389 RMD160 fe30f951b86f4e84a6bb74e5095aab42a593f284 SHA1 961088df6cf697622fccd36d4940e2e9921da195 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPiwrcAAoJELEHsLL7fEFWCbwP/RQ2HlvrKtqxLzo3tkRShZsB
-ypHyL/1zZhHr+VCzvnIzDwV5EYflszHfSFgx8fz+TLmjM81uSEHxPnl42N3Z2vtv
-RrdvKaKbFr41d0Equ/R1LfxzKxURfJ10MHWosBjZ7NDv+1MNGn7JPvqeMKKAN5nm
-GeHYFbhaTKPd9rT7Dg3ZI3GcAw1oAA6a8QZk2r6C03x3Pvfm5Kje+weD824sB6+h
-vRNzAi5INeA96IrVebBQiiGKhvOy6VPio5mWdyfrNaVRLt42FfXvVK1rTPOtekZ8
-D2qG5So+GfDry2MSgLj3gYuuNf/AEUTFel293Y43fyaRkA+qzIieOuwKF6VMO5Kx
-nPDnWirl50Qqml8zNj/pJVSedSfcr/kUR2vjNg2DTMiwgyHDtUXriKWdBQ/lCDQ3
-DaW0xct+w6z4KxRUy4iZvFXjuDEv1Z0KZfXn4qQvNimrA9aQL3+lZSLkRuVIvI4z
-Nlew6ue+R1TEe8d0YaClELoI1nlUQdi7pnNmmo6bojUwqFUA+PNy0OoIFyIMRCy1
-yuMTMq5gRleMF8qhlfCJ1/RFyxFmeHN8lO49UGDqg4xtRJ0+zYDAyjjuD44XSb9l
-pm76GP57wbU2AYbsS98c0HCrWsnLN87vdzl9zJWgv2dyV3gNuvDHRWtAXVKm2M7A
-L6san+WN3fMxB9s9KWE5
-=5vfC
+iQEcBAEBAgAGBQJPzlDOAAoJEIUJ+svaV163i+gIAKOd2KxOB42LbfUQHAo6obCL
+ht946WvSNHP1EnRIQT1Hy1UpYgJ3t19hdfooKb55Y0vJ9J0W/xBSG1lt0lP+kZ1y
+C48Bsc6K489lTCAZrl42xPQT9cYmt+6+dmZLbDCLmDsE8UpA6Bwyg9MBEKTgh+Cb
+H+/Pk6GKtqFWZxJyU1YSsp9YkKDrN5iQET8Sv1PO/ONHaUHB+GoPDgBzew2F0NvO
+Je+5rn5Km/JmhXXhAXuahF2GQWn1u26UvBDZX/u108bZcWGYcaT7U8lM7pw2ntk2
+CGKBB4cfgFFxUyhyTgnkpp5yZl2PPkqJNZUz8iq9XUaDupoiCszpjefG7148Vb4=
+=u9Ql
 -----END PGP SIGNATURE-----
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild
new file mode 100644
index 000000000000..bf8c56c5b673
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2012 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.1 2012/06/05 18:32:28 sera 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
new file mode 100644
index 000000000000..1b8c23826d8d
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2012 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.1 2012/06/05 18:32:28 sera 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
new file mode 100644
index 000000000000..1086a65c54f7
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2012 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.1 2012/06/05 18:32:28 sera 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,gtk]
+	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.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.3.ebuild
new file mode 100644
index 000000000000..ea777a96f889
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2012 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.1 2012/06/05 18:32:28 sera 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,gtk]
+	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"
+
+}