--- gcj-jdk-4.6.3.ebuild.old	2012-05-17 19:21:39.000000000 +0900
+++ gcj-jdk-4.6.3.ebuild	2012-05-18 00:13:42.000000000 +0900
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.3.ebuild,v 1.2 2012/04/15 17:51:54 vapier Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit java-vm-2 toolchain-funcs multilib versionator
 
@@ -11,15 +11,16 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
-#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~x86-linux"
 SLOT="0"
 IUSE=""
 
 ECJ_GCJ_SLOT="3.6"
 
-RDEPEND="~sys-devel/gcc-${PV}[gcj]
+RDEPEND="~sys-devel/gcc-${PV}[gcj,gtk]
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
 DEPEND="${RDEPEND}"
+S="${WORKDIR}"
 
 JAVA_PROVIDE="jdbc-stdext jdbc2-stdext gnu-jaxp"
 
@@ -38,10 +39,14 @@ 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
@@ -71,9 +76,9 @@ src_install() {
 	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 ${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