Don't require corresponding gcc to be active. #439228

Backport various fixes to 4.5.4.

Package-Manager: portage-2.1.11.27/cvs/Linux x86_64
Manifest-Sign-Key: 0xDA575EB7

4 files changed, 213 insertions, 9 deletions

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 2be2898d8e15..379296b071ae 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.8 2012/09/28 18:37:53 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.9 2012/10/23 19:28:58 sera Exp $
+
+*gcj-jdk-4.6.3-r2 (23 Oct 2012)
+*gcj-jdk-4.5.4 (23 Oct 2012)
+
+  23 Oct 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.5.4.ebuild,
+  +gcj-jdk-4.6.3-r2.ebuild:
+  Don't require corresponding gcc to be active. #439228
+  Backport various fixes to 4.5.4.
 
 *gcj-jdk-4.6.3-r1 (28 Sep 2012)
 
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index aa8175f4228e..02f31619366d 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -8,21 +8,23 @@ EBUILD gcj-jdk-4.4.6.ebuild 3728 SHA256 bde8e11a1e6942f53de2949c041ab7775fb8abc1
 EBUILD gcj-jdk-4.5.1-r1.ebuild 3731 SHA256 0806f5fe7dcb7debc72356275ab796db52e7b929d6e366b1d2dcc0f3edc91019 SHA512 99d44838b412072ce26f394b6c924c13e45dca087107b8aa165e348b085089c61e6c6b0354653cf4c861c3f904c57a93f6698dcb257be881e4c167927fc38a37 WHIRLPOOL b0b9ca02aae454f947af3c2d4b0bd2e7729ff231844a6f769ffbe9455afa13d85d18b9365d6a8575216a519ea0d6495ddfecd46623e589938ef9d720506b566c
 EBUILD gcj-jdk-4.5.2-r1.ebuild 3731 SHA256 f095e83fb2412f61207e70196d94145044f2d36d44e070517f48d03274e71ab1 SHA512 7b171a18abcec74f51a9718ee13a8dbb95c86169334159abff54a1b7ae8522feec4e24af48c6a2008a5f0f4cd4605cdfbad1031133abdefa351a61b4c1cce416 WHIRLPOOL 973375027d104e627b8d877329c08f0f6a706a4addfd70676aacc220a83d92df069832f67726dfb132d7ff4f09b9c5f727f36e528f156b2c048b5ec71ea86fe0
 EBUILD gcj-jdk-4.5.3.ebuild 3734 SHA256 5f11991c29201628298018492d0b0fb3a2403625eeaaa81c44d7fe5e9d0bd43d SHA512 e2b87b182320bd22661baa789c82125b917a4aae81adbb2bc85c4470d9164b0602be769cae2ab3c9c63bf487febd9885a957d417d6965f63f55fb15f1835ff34 WHIRLPOOL 2e0255b2be10a1687557f1496c234a681cf44207dca649ee5ed7689a9c0006a933ef7be34e557516efe799d0eecf5b559301e64dc3d978c2c1247aa2b4de26e0
+EBUILD gcj-jdk-4.5.4.ebuild 3399 SHA256 e97fb564ac395c241c075143bac48df662b05c75ce4fcacacd73a7bbbf05b498 SHA512 da407a4606efbfb028fa2681113593d0daf6f5e14bb9bcf4fc4a8ab5e3cf201fae16fa7d5ff99f654388906f5766e0f0fdc6956ab232d15424b5211e27948c1f WHIRLPOOL eef35eed58ef22d1288d473855d5405fcd2586b594af4a7d4d5bca3941d64ea32400cf14d38d7641e7986712f96df765320648fe8af44515cf70ab8cf3560e93
 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-r2.ebuild 3418 SHA256 83f62d076d09d027b1507e1138a6d0147b78c86974bc2e61eede0030e3f0c588 SHA512 43e64a693753314a2b33032c117a59b5ac9e9e3bb71ec3ee4d71c90ab61dabaa14a7992e411ca1bca629443891f6b327dfd3a4e6064910984f220c508f04d789 WHIRLPOOL db2842c368f04df2c424f1f23d71d831474f59ed17bba469cda78f61152661950762933d885e4eebeb263f1cd6acdf228555a80df68592ac48123cba08c2f7b7
 EBUILD gcj-jdk-4.6.3.ebuild 3820 SHA256 27b45809157c0055ce6418c103905f412c7c5dd2f70e6b24cf0b5906fcb44bfa SHA512 15e43819132880317a718215eefb9fe26a102c632886fe27bb353ddbd153ecdcb13c9825c56b71f2112be0e53552a95e4b9d790124aa80c17bae5c703411527b WHIRLPOOL dd09140b44bc2c296aacf01db431b338a9654b1acec1a2e5884ca5e6b2cc93dc5dc9180db7fc24ec57234abf5bd3288d039de9d2e04e621e667f7bcd2f3a3bbd
-MISC ChangeLog 2427 SHA256 5685ec91229911c616a49ab775e85bbb0f4caee034084fdc13e2f6b55d74ecb4 SHA512 e6acc1f74a7c26cb0ba6b3580c5ecd571e260d7c1718dc7a86cfb49bbdd907afe21c528f6007770e5b12a133ae41bbf0c88b1ff4d5eaa39ddf89fcd6c8d85f4b WHIRLPOOL 0bbeb5c24a7df8e245a67b84a66d21020f6b15c69390057a6a87218a829ec5e9bd03fce35b8b44fe93f466436daa1e17d49993d6ade6d64436aa3047b954b2b9
+MISC ChangeLog 2682 SHA256 6d649935b3e38b345687398a7445e00a027da9c38f211c64d754c25cc5f0c866 SHA512 e5da6562af279f3292c41c4a0f78380c518a07c5e5f584aa7092bff858ddb2960549e847d714b0f6e726a3b69870e31c2d7fc80ce5e6162739e4c3f29a3d3a31 WHIRLPOOL b01de0b68b8fde6a88c92239b960d53ac7f86ad732c435010083558ea3bd84e5e41278a3dd1b2f914cca32ceef968f1557ec48b277914db07d27d332148a58ed
 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
+iQEcBAEBCAAGBQJQhvAJAAoJEIUJ+svaV163yKkH/3uQ0QirH4B6mDSqG+sQONm1
+bDtJexNlCZ095yApHLiU3BdnEY3Dk4+kKiQlxqjeu/8OfR5fICj2BMBOLg0l+l0j
+Zjhb3zU5MLMmuyVZTOv19GuXCtUqkTJID0A6jdqo77HsA15RGrbioIS32p/hdOLx
+gSnO7W2V4pwide/S2Aui86HA1v9xpgr+cjPfkaCYFxl2K081QdQAZ9uDNArRfOrW
+o5T/dyAq0SSjhlhuWj9FLzu6H97UWsw5cjvNw158U3Dnf3ICaQygnW72OD5fk5ne
+n2xL5LTRqEWgjyR6CxR51siNqOK+JzdDJXcGYrXPW7f3snzW1th4z4R5nUV1MJo=
+=02Zx
 -----END PGP SIGNATURE-----
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild
new file mode 100644
index 000000000000..fdfcb5ee81ec
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild
@@ -0,0 +1,97 @@
+# 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.5.4.ebuild,v 1.1 2012/10/23 19:28:58 sera 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,gtk]
+	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.3-r2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild
new file mode 100644
index 000000000000..565e0a2c2810
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild
@@ -0,0 +1,97 @@
+# 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-r2.ebuild,v 1.1 2012/10/23 19:28:58 sera 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 ~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}"
+
+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"
+}