No longer install symlinks in /usr/bin to work with recent gcc-config. #431930

Add missing dodir for server vm.
Use get_libdir for vm home.

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

3 files changed, 135 insertions, 2 deletions

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index f4f1650f93fd..2be2898d8e15 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2012/09/16 13:16:05 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.8 2012/09/28 18:37:53 sera Exp $
+
+*gcj-jdk-4.6.3-r1 (28 Sep 2012)
+
+  28 Sep 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.6.3-r1.ebuild:
+  No longer install symlinks in /usr/bin to work with recent gcc-config.
+  #431930
+  Add missing dodir for server vm.
+  Use get_libdir for vm home.
 
   16 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gcj-jdk-4.6.3.ebuild:
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 89c1281517ae..aa8175f4228e 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gcj-jdk.env 624 SHA256 e5236f2d09c1cee14171de780f303007cfa9b4febaf3eafb98f01dfeeedbc6bd SHA512 62652e68cff8ed80750ef38d15f5a5d1d1299ab0e55fccb7cfd9e90c1bbea056128e89138b81f286fd6227afd1b8ffc741d5b9a2cf5ba42d95d7981d5a4d9073 WHIRLPOOL b08c0eddd4bcad5e8e6cf0a47037fb137845dbf0aec333d093ee0d041d47216d20b26ecee55676bd96ce4e3093b90e679fe93d60d29a051a8940ca042dca0f4c
 EBUILD gcj-jdk-4.4.4-r1.ebuild 3731 SHA256 a4840e90e9cb57284dc46c9166030ab6160fa510e5513db35000a41b2f226430 SHA512 da8b2092f604e37c83f8b08ec79a7820f952a59b07fc7789400696c223a9ac8ff55949ba579832cd54fddf7b1067e62cbb24a65c7557023c9fdac941fc7b2da7 WHIRLPOOL 5466fd5ea77ff7d8a4312ce0f782225952f22d455825314b4c4c3e1fcd98af7f64b897169e1df7afb0c9f9bd3770d3f1a79c053e883455e33f98fdf4546b714e
 EBUILD gcj-jdk-4.4.5-r1.ebuild 3731 SHA256 1f8c673e4ab37d313c808cc26a4beead4da8c903c5d27479c0c7093eb284be2d SHA512 695aea351a792f061b5b1bd4e6a48c1d78b6aebaa207c67cbda68fa15ef2d1bfbb569f7aade1adb0389fa00fe4909f45bc5d616cf178cff9ed742a7f35420b41 WHIRLPOOL 3744f81f788e56932bc2ec2a0941703468debae46410008c2ea3e19840e937f40d9fdf8cc70948628ea0e466dec58ff5c7a27fe14a4550a63bab8f37f92ac510
@@ -8,6 +11,18 @@ EBUILD gcj-jdk-4.5.3.ebuild 3734 SHA256 5f11991c29201628298018492d0b0fb3a2403625
 EBUILD gcj-jdk-4.6.0.ebuild 3682 SHA256 fe95e431925daed2668250516f736edf9dc6a490331fae98379447fe24ac5eff SHA512 5a2090bb4577f2f8ddb22b652d8e22491a27406671219d92b13d5e65aa26a4b0f97ef7815250627ca9e284615d9115c4520d84e9b70d6a41ccbfdaad69c266b8 WHIRLPOOL 8d7d84dffa04430d9b20d2cbbde54c178d40b8a8b65db3fbccb5dc39c7d45f5b88d525c136ee47a2befe08e60dc679c48ce743815aff5c6f4b203043d57f7653
 EBUILD gcj-jdk-4.6.1.ebuild 3682 SHA256 0710efad7c1b350a3ecc62efae6424bf006a74ae04dd9d948b0aeb663b06c7d2 SHA512 577ca80dda3e72702b92103c5952126cd9fbf4f91d63096d9cfe1501a82af1ce3606a710e6550b6b6c2c2236a0fc008a1e4d74d8cefdf1aadc1719ae8f8e4a5c WHIRLPOOL 92f221d3e9459b819e2de64ae54e79620d383213876f651cf6e1422b23d011c418906a7aff6460d7fe2f2f276bdd5b2777d19d6287bb812de590f6537a4a81fc
 EBUILD gcj-jdk-4.6.2-r1.ebuild 3814 SHA256 52f887c8a0f28f2d9504b809d987dcfb007f76208c1db8538eb1636f099d1f67 SHA512 2acb433fe8083818493fd8528cf8349874afd4f607e295c687a1071bb4224121debe5b77fc4abe1485ad5022fdd13d76739d42f73ceb1f44dbb5bedcb770034d WHIRLPOOL ccbb0e555fa60179b40656e8bdc2f4b41dfdc93aa1c2071528c66ff85579ed1486c3ba3db4673ca55be5a3d4767709c0b63758948ca32c7e4422830281142259
+EBUILD gcj-jdk-4.6.3-r1.ebuild 3762 SHA256 f52f0b5bf3fd1df89842f6a7089e24fd654c819f5b2dbb32b1637270604a04b1 SHA512 f9c370cb10889efbc4c722df7abe40710b48ab2c585b75fc3b85c0dc06aa33ffe0084ba35120fead5528b0d73f8b94e95c7731e505cdeafd077201154c73a2df WHIRLPOOL 201087bd2d610124a32af83aece6b8ad7d230238e19bc89fd69e62635cca71e4c9dd6b6d8c49ca8b49f00f920c3a4ccd80bd0efc3aaaf3e72c618baf92050076
 EBUILD gcj-jdk-4.6.3.ebuild 3820 SHA256 27b45809157c0055ce6418c103905f412c7c5dd2f70e6b24cf0b5906fcb44bfa SHA512 15e43819132880317a718215eefb9fe26a102c632886fe27bb353ddbd153ecdcb13c9825c56b71f2112be0e53552a95e4b9d790124aa80c17bae5c703411527b WHIRLPOOL dd09140b44bc2c296aacf01db431b338a9654b1acec1a2e5884ca5e6b2cc93dc5dc9180db7fc24ec57234abf5bd3288d039de9d2e04e621e667f7bcd2f3a3bbd
-MISC ChangeLog 2173 SHA256 b9afd30595c18e4311c2a672c9ac69a7030e64591af4c46856f59fdd60e359a8 SHA512 05233ec3d444e18e3855d5208f54834ef246e2f3ef2f957535101b32c9153da2c31ff376f369396890ee8f2d5dc95fd4a9db9e28338ba948f3620c89402ef310 WHIRLPOOL f0d29c6364491bda1e6b9e94f73c584950462ec4d63af2c98b9fa5d7a5a439da554da1e8a348c501e5462094211cfba4721dde4f0495c35322ca42bef4c59a60
+MISC ChangeLog 2427 SHA256 5685ec91229911c616a49ab775e85bbb0f4caee034084fdc13e2f6b55d74ecb4 SHA512 e6acc1f74a7c26cb0ba6b3580c5ecd571e260d7c1718dc7a86cfb49bbdd907afe21c528f6007770e5b12a133ae41bbf0c88b1ff4d5eaa39ddf89fcd6c8d85f4b WHIRLPOOL 0bbeb5c24a7df8e245a67b84a66d21020f6b15c69390057a6a87218a829ec5e9bd03fce35b8b44fe93f466436daa1e17d49993d6ade6d64436aa3047b954b2b9
 MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQZe6UAAoJEIUJ+svaV163o6MH/ixPwn8rW2CTttqck37Yfr6m
+TAJAGCewNzjEgk5uLORew/xtQHR7CQbuW7DyerkwieeuieGcCpWq3/ux478MGtoa
+6PJBKv+nRne5qDcsFvWOx335sOaDBH0b7B5U70dbkB8Asj1nqxBsRJ6d2L0+OZnp
+qN27sy5JXp1HmINwNaOMDdZVy9kRC5jgoH5B49OL5+8t1CgP277yrPCzAQ6o6k7P
+T3cIKhAaRFwfhQYxxGMeuaPnXIKaz8NM6ixTGBSmFZkMptUwUvfKhGO+VTYmEL8/
+6gUfXnaxikocZsQNxbRZJjY0Xth8ie80XX1lxWMAOZCCxZuoAtiqZMk9vQMjLYU=
+=+/lZ
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..29c2da672187
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.3-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.3-r1.ebuild,v 1.1 2012/09/28 18:37:53 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 ~arm ~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/$(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"
+
+}