[gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/

["Andrew John Hughes" <gnu_andrew@member.fsf.org>]

commit:     840d9f9de7812dbac6004cda8a5bd22dde8a3b9d
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Mon Sep  2 21:48:30 2013 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Mon Sep  2 21:48:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=840d9f9d

Support gcc 4.8.1 and update JAPI URLs.

Package-Manager: portage-2.2.1
Manifest-Sign-Key: 248BDC07

---
 dev-java/gcj-jdk/ChangeLog            |  6 +++
 dev-java/gcj-jdk/Manifest             | 31 +++++------
 dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild | 99 +++++++++++++++++++++++++++++++++++
 3 files changed, 121 insertions(+), 15 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index b30f70a..001b78f 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gcj-jdk-4.8.1 (02 Sep 2013)
+
+  02 Sep 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +gcj-jdk-4.8.1.ebuild:
+  Support 4.8.1 and update JAPI URLs.
+
 *gcj-jdk-4.8.0-r1 (22 Apr 2013)
 
   22 Apr 2013; Andrew John Hughes <andrew@gentoo.org> -gcj-jdk-4.8.0.ebuild,

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 8737fee..561fff2 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -13,22 +13,23 @@ EBUILD gcj-jdk-4.7.1.ebuild 3714 SHA256 044093f56781f04a16a1ffbd86d796537ddbaee4
 EBUILD gcj-jdk-4.7.2-r1.ebuild 3455 SHA256 ad6323aba4b90dfaafbb8543b4939e920927c688e7127671a04dafecb2b8ef3e SHA512 a9248eae1ea293748e11f4a38834c98418e0be876247b31bb4a02c2663faac1d559f365dce1560c0299957487df47ca2e3f1d9cee34134f281d0dc2c53a11be4 WHIRLPOOL 759757dd96b93074dbf418743a93254842cc7a0d7130e4dd67de44c9aa698296611ddc27e08834a4d50ac817a28e74ac5e3511c64516e634ebfc6f869fbacf5b
 EBUILD gcj-jdk-4.7.2.ebuild 3392 SHA256 3a83eb1075f001f21d03149a24eb984a4a6dea8b45e588994398b17b6bfb9aa4 SHA512 de07db229b7042b8b3d527343cad70ac20058dbb0b8c08514be5c625d38546836eae18f837fcf9af25e01f64e8f78fee187a07c0652eec936c34caf202ad440a WHIRLPOOL 17462bef47a255c85b60fd5961ba7778b5acbaa33fbe87401d59e75c3d97167a0e07b0cebeeb575b1788b38a420b6a22662e07d537c60e339d2b7e8f62d276e2
 EBUILD gcj-jdk-4.8.0-r1.ebuild 3410 SHA256 3d74b788a2199f88b0238f39ac4656f16dda23de0400fb3c253c93f493007738 SHA512 a75c1be4f890945c00edcdb41e427a143401c7e3aacdff9ddf79054071287f9a1563bc8a683e4fc8e3da5984023eeb5d73e9d2397108121a3431eff4b32e1918 WHIRLPOOL ed2cbeb89613468bb4e3effae440b81086a4807707dc2dd3d8fb7d751c09b80596f746479b4d42e32f751f2a45c21e3680b98b82becccef2adf9e9ce53e9d46e
-MISC ChangeLog 8628 SHA256 5216a78c263f16ca852d3e6329eb7936f9260d60d3728f4b8f01bce386b49e7c SHA512 64f71c4f9c206bacf25d7a72a55034fc2fe54e486f6c93e9018782641f5d9611357ed14baee45487420c867e4dedfb29510c9cd8ec3d1a962b8ddba2d4c89eca WHIRLPOOL a74b373fda6bc8150f88eb063cce256b034964fca188fbcc257f556313599e775aa8de63b3a7e7ceba102580f1f11c7577dd1749cf9d89e0955b2e3b96403402
+EBUILD gcj-jdk-4.8.1.ebuild 3482 SHA256 8d5dda1aca9b3dadbb23e90d848ace5e662fce9fdd3da148a9d01c0191cda774 SHA512 455d26a2ef6a79f0ca39a15b11d451478b28a0039335f78cd9eb37ae87a95e89e10e866759960efdc198dfce6c91cf6028cf2401b53a20dfe6cbdb3fe77b3fd8 WHIRLPOOL 6a7fe8ca7ef1bd20e3a9158db97e145ac7425c458bbc78e5ffdef1f8abf1fad13fc6ba4ecae8fd38abe14943cd5110cea61962e30876bcdd564a24407b3491c4
+MISC ChangeLog 8784 SHA256 90a0d1af026f3b3ac6e9b55811778ca414019b0c98986aebdd480469b5441c29 SHA512 3a523726ad9c8ae8ffefe4e118e4d3bd2f850a44a6bc429660ff8785211df738660dd3e3558ba27dd8eeb4ca0e8be4fbd75d071b475f89691ee3d61ff3ae89db WHIRLPOOL 9e7024c1ecd1d994e2a4df259efc688869c0c5fa2ab864f5508453b62d559f87640658bbdc33db35d0282363a7319a0db8fecf529fa34296e887fd704596aba4
 MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRdSKuAAoJEDuWpXgki9wH8b0QAJ9yV0fUHFSeHM8tWJPw3Xxp
-qntLxCl2CAxBjkDL5ruyMuYZ3G6tASgXX/XqEYAh4rxg58uynL3vyr+izAikH5Ce
-Q9oz/lujcPP0nZJqtnzqgHZp8I7lKH+dqRB0crNOy+jokE+w08fI7CcOYWjxClaU
-6RoMpC3IxJq79mhQ8jfD0fKwB6PTDztz17VEBX4IQeFOzMO8mtxgo0W1HDYgNEXy
-Kwm889LsVPL8IEMcT9ZyQlvkDyn/zxEDIEog16TAT9MJmw9NveOtw3upwqtRwxRG
-JGn5vepkWdTGixSPU6BPaOtCiazMYBh7PkFlLoRCq0adLTkY6chFfiVj/UiK+Psq
-ya0W21WiVBgnF+VandURCHs2S3fFcYzPOH7VDpMTfW+/2U3bkXG/KaxQvLTOrTWV
-1NU7iOC9bbxEGWsIOawKaiW/zAzhrUvp+byS93B/t3QyWcqHNK/q07yse2tiZPnm
-4igG9hbCPz0O9AUc5nSdhw2CBmsvKFywsFyBxn1/lqoy+kQ3pBxyjCwM8WBe76Ml
-LG1DylrwGVHFMJK8HQ2o6FO38F47dY4XKSIKofYfAnk7PR+vRXdAMm4jMSdGpOLC
-LCTYToCfWord/2nyIBBDla0KGurocWw4NugdLLyWLMSaF+t0xzpoafm+XZxmhSlB
-mAwpbDG6jYiR5vI5+IoO
-=xS55
+iQIcBAEBCAAGBQJSJQeuAAoJEDuWpXgki9wH1SMP+wcH8L7cMwuvj/mZ+CwGmLQw
+v9aXYhWZ3kuDbB+Jn1EgRsgvJcQ93NWins+Jk28FOOeE+jaD38gK/OCSWKK3neSU
+bESyzfiTwNU+LtbLl8n858t0d2Je7vinuc29dEGBMKsePMfTz90/S0Nw1eTKVsGR
+EgGJUxcizqg1+rIdg1Lsx4SA29pJ5mIbI/nhR1hLwr0JDKFmQgat9Vtt/KDUSQ/X
+r2sgXnhhbhSx+WCM/KM7jWm7UhhItaxNeZq2e9f/NH1t8lCkZR5jNAhHVrSwkQ6b
+wt5R6rnDcihq6z/6cwJLnoPvZIWw+0vadTbkN8aWjkT1tPpT15z9hctk2/Rcn5qI
+GKbEOTJdTGXchb61h1CQI+lD2VajJ2tH2LvigLM5NGV4kTqdchkVIzC3FVIwWp8f
+mhsh80td35U/cn/YAsAo1jFUaV2BVuKSErR7U/+DK3AEdjErJ7pjrsSQI/1q8jHc
+anzWt+PdlRGeiluNtaigpRjYc1hTSw3Qzc8qWDXb+RwGFla2rHBk/YOdnfEFAVD1
+tEPH2rpZvzDN1edVDKh5QHigvDVcw5k6kTdQgVSD93zuFhMzJ+4LurO2WVmJ9gJ5
+Sw6oQQYsyevilr8VQU4TmvjzFSAZ9Nwd8Gip14CIb8vsJrP+3Pe8+0ZxcfWPUtZ1
+b/Cf8fP6rkgY9cBtaHOi
+=Ti0w
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild
new file mode 100644
index 0000000..830111e
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 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.7.2.ebuild,v 1.1 2013/01/23 10:30:56 sera Exp $
+
+EAPI="5"
+
+inherit java-vm-2 multilib
+
+DESCRIPTION="Java wrappers around GCJ"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="0"
+IUSE="X"
+
+ECJ_GCJ_SLOT="4.2"
+
+RDEPEND="
+	~sys-devel/gcc-${PV}[gcj]
+	X? ( ~sys-devel/gcc-${PV}[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
+	use X && 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 or 1.6 APIs."
+	ewarn "See http://builder.classpath.org/japi/jdk15-libgcj.html"
+	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${PV}.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"
+}