Add 4.4.6 variant and revbump the rest to have the same set of symlinks as added for 4.5.3.

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

7 files changed, 165 insertions, 13 deletions

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 5121cd14fc50..fb15d3ace2b3 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-java/gcj-jdk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.3 2011/08/11 07:06:53 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.4 2011/09/20 15:37:19 caster Exp $
+
+*gcj-jdk-4.5.2-r1 (20 Sep 2011)
+*gcj-jdk-4.5.1-r1 (20 Sep 2011)
+*gcj-jdk-4.4.6 (20 Sep 2011)
+*gcj-jdk-4.4.5-r1 (20 Sep 2011)
+*gcj-jdk-4.4.4-r1 (20 Sep 2011)
+
+  20 Sep 2011; Vlastimil Babka <caster@gentoo.org> -gcj-jdk-4.4.4.ebuild,
+  +gcj-jdk-4.4.4-r1.ebuild, -gcj-jdk-4.4.5.ebuild, +gcj-jdk-4.4.5-r1.ebuild,
+  +gcj-jdk-4.4.6.ebuild, -gcj-jdk-4.5.1.ebuild, +gcj-jdk-4.5.1-r1.ebuild,
+  -gcj-jdk-4.5.2.ebuild, +gcj-jdk-4.5.2-r1.ebuild:
+  Add 4.4.6 variant and revbump the rest to have the same set of symlinks as
+  added for 4.5.3.
 
 *gcj-jdk-4.5.3 (10 Aug 2011)
 
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 0cbb8cea5bee..60ff5f56b250 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -1,8 +1,9 @@
 AUX gcj-jdk.env 624 RMD160 147ee7c2ed4dbe21534e4b4d6e0a7bdc61435b0e SHA1 128b97f56245916ae9d5fb1e17f6d89fb7c14c38 SHA256 e5236f2d09c1cee14171de780f303007cfa9b4febaf3eafb98f01dfeeedbc6bd
-EBUILD gcj-jdk-4.4.4.ebuild 3326 RMD160 1686e98dbd08712216cd45c5c3dbfde99f0ad368 SHA1 20b0106df922de66d195da1fea5d61b497a9731d SHA256 fd1cce4f248e30f02f92c600618b57c24fb212cb899ec5703a120f5360f4f193
-EBUILD gcj-jdk-4.4.5.ebuild 3326 RMD160 6523d0d355aac6395daf679322b78f866a98c7fb SHA1 ee04eb402b118c4af1ce468a08ddc9ab976ec8b7 SHA256 7da76be71600d224d2ed12d2b05819d00434c22417a5badb8bc747f33643c248
-EBUILD gcj-jdk-4.5.1.ebuild 3326 RMD160 13b7f9eb6fe5ddbff4018ce495d763688c1f23f3 SHA1 c06d320fed0d18b011a1e3e18814bd61e5a7c7e7 SHA256 15c4d1889a8491cc6d9f81d0088d416bacc5e17628cfa9e7a14ceed47b2ec5c7
-EBUILD gcj-jdk-4.5.2.ebuild 3326 RMD160 e436bf52efa516292caf770ce70ee62cadfb2403 SHA1 d569f7d1fb50620eec428591fdde8d15fd2f77ce SHA256 abf2c22eca8767517cf8d6e9706fc1e681a29c7c1867e593ae1de3281a8a5e62
+EBUILD gcj-jdk-4.4.4-r1.ebuild 3731 RMD160 dc8e4bd38746c50f8fb40501733d71f47f27fba3 SHA1 c896ebceb611152599799b5b3c3af3f846a10778 SHA256 a4840e90e9cb57284dc46c9166030ab6160fa510e5513db35000a41b2f226430
+EBUILD gcj-jdk-4.4.5-r1.ebuild 3731 RMD160 cf5374be7201b529f6292aac80959c4d33c9d1cf SHA1 34e1e0451066567769562f953120b31571d25cd4 SHA256 1f8c673e4ab37d313c808cc26a4beead4da8c903c5d27479c0c7093eb284be2d
+EBUILD gcj-jdk-4.4.6.ebuild 3728 RMD160 7bc8ff8fa1203d07a76d9e93fd1a92288adf3065 SHA1 8400d47d8fe07bd1390f7f7ed8b4b6bf62633d79 SHA256 bde8e11a1e6942f53de2949c041ab7775fb8abc19882bf3aedbe818e95c923e8
+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 3728 RMD160 852ef74e7ff0c7b08d8be611aea7cb65a9cb05dd SHA1 5b055e12b0224b8c521e757c76bc8401d5bd6a15 SHA256 0e6c460982d479dda2a644a24ac9161c41f1aa27f0de233d877b86e9fdde92d7
-MISC ChangeLog 954 RMD160 978a54a86c6ddea81b3ded54ac92f7ba570da32b SHA1 d1372bb0eb112cf08cbedd606fd53427fa331129 SHA256 ca89cc802ecd7af95061a04f384a3e34058382d9e94759b07eb782d32c8645dc
+MISC ChangeLog 1485 RMD160 7ad0ffe6ca2bd019ff2096ca31752313488ff18e SHA1 467fcb04af37a8e902b076f4540290a922412121 SHA256 3f82a99bcbbf333b94d454801f0b90e521601f1f9a0a27287ec3251f0e6d1f76
 MISC metadata.xml 389 RMD160 fe30f951b86f4e84a6bb74e5095aab42a593f284 SHA1 961088df6cf697622fccd36d4940e2e9921da195 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.4.5.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.4.4-r1.ebuild
index 26ba677f5ed2..de3d1501acb0 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.4.5.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.4.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.4.5.ebuild,v 1.1 2010/11/14 01:04:19 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.4.4-r1.ebuild,v 1.1 2011/09/20 15:37:19 caster Exp $
 
 EAPI="2"
 
@@ -62,6 +62,14 @@ src_install() {
 	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
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.4.5-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.4.5-r1.ebuild
new file mode 100644
index 000000000000..e77367ab9f52
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.4.5-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 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.4.5-r1.ebuild,v 1.1 2011/09/20 15:37:19 caster 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.4.4.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.4.6.ebuild
index 84da1f6ff3c6..c4c2decc084c 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.4.4.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.4.4.ebuild,v 1.1 2010/11/14 01:04:19 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.4.6.ebuild,v 1.1 2011/09/20 15:37:19 caster Exp $
 
 EAPI="2"
 
@@ -62,6 +62,14 @@ src_install() {
 	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
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.5.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.5.1-r1.ebuild
index ad5df897b982..a9b00fe3cc60 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.5.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.ebuild,v 1.1 2010/11/14 01:04:19 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.1-r1.ebuild,v 1.1 2011/09/20 15:37:19 caster Exp $
 
 EAPI="2"
 
@@ -62,6 +62,14 @@ src_install() {
 	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
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.5.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.5.2-r1.ebuild
index a9d0468b88b4..caa59d057be0 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.5.2.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.ebuild,v 1.1 2011/01/07 15:38:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.2-r1.ebuild,v 1.1 2011/09/20 15:37:19 caster Exp $
 
 EAPI="2"
 
@@ -62,6 +62,14 @@ src_install() {
 	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