public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
@ 2013-09-02 21:49 Andrew John Hughes
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew John Hughes @ 2013-09-02 21:49 UTC (permalink / raw
  To: gentoo-commits

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"
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
@ 2013-09-04 23:28 Andrew John Hughes
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew John Hughes @ 2013-09-04 23:28 UTC (permalink / raw
  To: gentoo-commits

commit:     4bf7d359e3516c329a27b5d9b3895be9ccf7bbc8
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Wed Sep  4 23:27:34 2013 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Wed Sep  4 23:27:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=4bf7d359

Update JAPI URLs now an up-to-date 1.5 comparison is available.  Use full path for include target.

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

---
 dev-java/gcj-jdk/ChangeLog            |  5 +++++
 dev-java/gcj-jdk/Manifest             | 30 +++++++++++++++---------------
 dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild |  4 ++--
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 001b78f..88dba2e 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Sep 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  gcj-jdk-4.8.1.ebuild:
+  Update JAPI URLs now an up-to-date 1.5 comparison is available.  Use full path
+  for include target.
+
 *gcj-jdk-4.8.1 (02 Sep 2013)
 
   02 Sep 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 561fff2..7d772cb 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -13,23 +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
-EBUILD gcj-jdk-4.8.1.ebuild 3482 SHA256 8d5dda1aca9b3dadbb23e90d848ace5e662fce9fdd3da148a9d01c0191cda774 SHA512 455d26a2ef6a79f0ca39a15b11d451478b28a0039335f78cd9eb37ae87a95e89e10e866759960efdc198dfce6c91cf6028cf2401b53a20dfe6cbdb3fe77b3fd8 WHIRLPOOL 6a7fe8ca7ef1bd20e3a9158db97e145ac7425c458bbc78e5ffdef1f8abf1fad13fc6ba4ecae8fd38abe14943cd5110cea61962e30876bcdd564a24407b3491c4
-MISC ChangeLog 8784 SHA256 90a0d1af026f3b3ac6e9b55811778ca414019b0c98986aebdd480469b5441c29 SHA512 3a523726ad9c8ae8ffefe4e118e4d3bd2f850a44a6bc429660ff8785211df738660dd3e3558ba27dd8eeb4ca0e8be4fbd75d071b475f89691ee3d61ff3ae89db WHIRLPOOL 9e7024c1ecd1d994e2a4df259efc688869c0c5fa2ab864f5508453b62d559f87640658bbdc33db35d0282363a7319a0db8fecf529fa34296e887fd704596aba4
+EBUILD gcj-jdk-4.8.1.ebuild 3490 SHA256 7678476af7d3aee17e8e0334687c19f8e48e46569f60a1c518ff282e59fda2c2 SHA512 dc5ef2155d9be9ead93b634d02c077d697b995fd1447edb9fb1c82ef8d07625a4858831a6d3056ae759c421f33cf6a0013e0dfbe629b41b8cd1d8f428dafa901 WHIRLPOOL 632a8bb533112d1975c3fc990ed81dfefbf6c78ca34c00f10c236bba8b57f2de1ca8535f6f91e9287bd8af066e48c974377a9aaa9a8a6c8aad19f841bc885954
+MISC ChangeLog 8974 SHA256 640ab140b2fffcab018eea2888eb818a616dd7c88ada88873bd0d6374ed51e44 SHA512 ce9c6248adb364993a22a01fc61cd65395b8a0e04fec45ebee71e3ee509f7d1660cec1e19723c974cfab9a58525a54dcb9c95ea17f1ac7b992194c48b21854a4 WHIRLPOOL 060b35fc6469886f8d7c44d587aa7d9f6849738a61928dfa699498b5fefb0f20a574dbc2a1c033125714615efa32e85fc6decf7833c975e715a56c2f998c60cf
 MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJSJ8HmAAoJEDuWpXgki9wHIQoP/13ftj1/IcZmf4UsqQPjtvtH
+f6iS6clTa7ZR+7XXIhJvCA/NMyGtbVjLde08i6l9NYjRX1Q47K108e05RGkT68Y9
+2Oa2lOVe6ubOPmXNculWOVKY1sg1vOn/lAJbzk7/Rqyc8P6SytZi0KRm2DO2OV8e
+s6bugF6bsGtQEgAVcuU6MzdTd72Sbp4sjTdY0sI8P5pyQtjhmkTKI2ZOLHRrGp5p
+MzA4z/tW50y1/u0nFVXQfmGV0AVchADyfzZE3yJPWlqPdn7LAwEye8Hdu0G7l0uv
+oZPfCj6kyTW8Q+JhDBjClDhgbbaqb+VZVZvbqZPH1JO/U5Y2g2xdGwI6oMdIS1uU
+O+ad/jyUTPSjEfvc0rojVkTGIXcGkL2lzj9zx0KaXcKO99T7aDgziDxv8r7puSUp
+3I0jVz706B5HyyXYTcei/PFDr1p3GaRzCJHaJnNi2wtX1uemDtGF9vWIgZVt1fhW
+MoadXgu84uB78ePg3XgLWWaH9ak2gU92Y/3CIJK7B5GzA4R6mN4hAAc7dhziBr+V
+tW4Ce+LdrGmsBZcOOWkxnurjB9aAg6KQ94N4/56ZeMBnLKvNwACmh6+/3iGVUP2s
+R8JU1v3kM7mN+JhcdxAjbAE3odHtbUrGkzUwvkfWrGQTQraesStQbpw8Nu2Wm4bF
+f7MWOfekO0P2D1OuH4Ki
+=qNGt
 -----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
index 830111e..211ed61 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.8.1.ebuild
@@ -74,7 +74,7 @@ src_install() {
 	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 ${gcclib}/include ${gcjhome}/include
 
 	dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac
 
@@ -86,7 +86,7 @@ pkg_postinst() {
 	# 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 "See http://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.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/"


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
@ 2013-12-26 19:12 Andrew John Hughes
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew John Hughes @ 2013-12-26 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     10e7e9f9b77668a9f8629db82079ab8de4f1b709
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Thu Dec 26 15:42:25 2013 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Thu Dec 26 15:42:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=10e7e9f9

Support only latest of each major gcc release.

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

---
 dev-java/gcj-jdk/ChangeLog                         |   9 ++
 dev-java/gcj-jdk/Manifest                          |  40 +++-----
 dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild              | 106 --------------------
 dev-java/gcj-jdk/gcj-jdk-4.6.1.ebuild              | 106 --------------------
 dev-java/gcj-jdk/gcj-jdk-4.6.2.ebuild              | 106 --------------------
 ...cj-jdk-4.6.2-r1.ebuild => gcj-jdk-4.6.4.ebuild} |   2 +-
 dev-java/gcj-jdk/gcj-jdk-4.7.0-r1.ebuild           | 110 ---------------------
 dev-java/gcj-jdk/gcj-jdk-4.7.0.ebuild              | 106 --------------------
 dev-java/gcj-jdk/gcj-jdk-4.7.1-r1.ebuild           | 110 ---------------------
 dev-java/gcj-jdk/gcj-jdk-4.7.1.ebuild              | 110 ---------------------
 dev-java/gcj-jdk/gcj-jdk-4.7.2-r1.ebuild           |  98 ------------------
 dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild              | 101 -------------------
 dev-java/gcj-jdk/gcj-jdk-4.8.0-r1.ebuild           |  98 ------------------
 13 files changed, 25 insertions(+), 1077 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index cc67a79..7ee940d 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gcj-jdk-4.6.4 (26 Dec 2013)
+
+  26 Dec 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +gcj-jdk-4.6.4.ebuild, -gcj-jdk-4.6.0.ebuild, -gcj-jdk-4.6.1.ebuild,
+  -gcj-jdk-4.6.2-r1.ebuild, -gcj-jdk-4.6.2.ebuild, -gcj-jdk-4.7.0-r1.ebuild,
+  -gcj-jdk-4.7.0.ebuild, -gcj-jdk-4.7.1-r1.ebuild, -gcj-jdk-4.7.1.ebuild,
+  -gcj-jdk-4.7.2-r1.ebuild, -gcj-jdk-4.7.2.ebuild, -gcj-jdk-4.8.0-r1.ebuild:
+  Support only latest of each major gcc release.
+
 *gcj-jdk-4.8.2 (26 Dec 2013)
 
   26 Dec 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 7703245..4eafc6d 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -3,35 +3,25 @@ Hash: SHA256
 
 AUX gcj-jdk.env 676 SHA256 d8c8aab55aebe15dd783e273b857da4042d5041f32d31277180b619a9715be68 SHA512 b843774ee68f82f2379fb01a7f5b482993d13cd01cefefee7dcd50292555ff2b459c81ae0c30a5837a145ed559adb62c57811790cfed6c245c37ed395ca1579a WHIRLPOOL 414b00a70a95d13a8b733c0168bb18c95487c553b76c5dff7056883e1e6d9bc23bb3dd84330504805b01930a60e05ef85a63141491203667299f0f9e268e3134
 AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8
-EBUILD gcj-jdk-4.6.0.ebuild 3630 SHA256 152d92cadd32b75d2dc76a0a9f0b55a9a40ecaed802ceff8080be93f457f7a69 SHA512 efb8d824b3aaafcc11a774fd6094cb444aff8bf3d07d5e9596b8cee9a71b4c541bbfa1e9e1d39a63c1430317eaadba76f2f793bebdf09a06404d4ad4f80f23da WHIRLPOOL ccda10d3d6d0088b54b6c4ec5a8c5e0466c7c0485e50ca58dbfff3831531e79b48cd38c63a9ee1bcbf290e9344ae0e5fffe88c837fb30672bbce5c8ab27aa1a5
-EBUILD gcj-jdk-4.6.1.ebuild 3630 SHA256 ef4096e3990c7cdabd44d40deccff7388d87dd4bf8a353a28d21507ceb293733 SHA512 0bbd17a0bffb24b1ee4bdd202f7d22cd7a14adbd2d64bedbbca58dbf8632bbaa755b1e15751fbd1565ce329ccaff1bcf741a1876bd5927ca197102fef2fd3483 WHIRLPOOL f5c0adde67978c8b39636db603da65df23e113168fd6ce08ba7ee534f84a9ad59be3f2022aa4acab1fdc9866026f7f87baf4942b0425a6a0acef2d92c6bc335f
-EBUILD gcj-jdk-4.6.2-r1.ebuild 3715 SHA256 3732377fd8db111de0202063ab97d981fa94d373475b91439026307abbdee010 SHA512 7b0ce0ae995866ab959d50c82df9521ad45f94a888b0acd0138259f34a5b4abfce770ac322b62af72cc7100484cbffe5d258b18cac469a6c16738bfa7beab083 WHIRLPOOL 3c2274923d972d727a53b6dd69e505462309804ef5a06aa513a66f941f4db5762a1b3b383d7f0b44772006b021d61a34b3c8acf34e49fc38a8e880174c239890
-EBUILD gcj-jdk-4.6.2.ebuild 3630 SHA256 1c2c0a94c83cfa63afcbf58109bba0a690ba259aa1d9af6df6e69d7ee61f2e89 SHA512 20008cc93a3cd9a52456839ba20d761f7798db9b5cf50c0d614f5360ebbe462279471b0b8a41333a9c9ab70257b7d620106d3ceff80eaacc7a39e27d983a2ec9 WHIRLPOOL b48d2bc830c03a8dbd2154fcacfdcd1ea7e2e559659d793342816786b61de54990204bbce48239ee568c7bf2c282a0e3f9a5b2afff933e11cbcf9a0aa0549171
-EBUILD gcj-jdk-4.7.0-r1.ebuild 3714 SHA256 f822bfd5d744e69eeed4ddb4251454c1ff6177e78266f7f8374470514d4880c4 SHA512 c221e4eb63a2a277dabfcc42a93c2779cbeae44baec158646e93f8b6fd3cf9a7efcd3d9b96b458cfeb428ce715b3c41dcbb92eaf689d17b344d744a8b7f31165 WHIRLPOOL 7bb2800f0dcd7c3f141ae0abe7bcfa634950153af120f74b1bca7134209fd5a93c93427378111572ad69a6237b5400cf41f46ff3fa7b52236e3080c456b86351
-EBUILD gcj-jdk-4.7.0.ebuild 3634 SHA256 1664408bb52a0991e956834bea1211bd354ed6adb3478f6c949250d412340750 SHA512 88dfae7b5308f742148411a14ab11f78f664c17dccfa7606d40b567f52333ac4654541c9529e7b6cefa11acf023752cbf16de7365047fe3214f86f16d4f45201 WHIRLPOOL ccdc952974c315541470b09168c1b1e232b3dd2bdb585ff44c954f8cb0332790092714bce94726b983903fb0a21c5314948100905ed38f6fc8acb4a27881764c
-EBUILD gcj-jdk-4.7.1-r1.ebuild 3662 SHA256 5e05970a0302b3a563521e1cc1b47008cb20977348a97a3ab509ad74c45ef962 SHA512 be599b4e08c64b3fc5fa2e24356158f5a2d2e0038642429b456b735dd8f96cdd4ab7ffe10b25c1c5c7e703faa8505772ba3e9aac5a0e5251975a278bdc2599e1 WHIRLPOOL 44f73a9a69faa2eb147c5b7f9af918343b463f48f135ef838eda96c91a5d4961e77b8372ccd9c81b15f6f25d2a84eb907f92855b33b674c66c502669f7d35d2a
-EBUILD gcj-jdk-4.7.1.ebuild 3714 SHA256 f822bfd5d744e69eeed4ddb4251454c1ff6177e78266f7f8374470514d4880c4 SHA512 c221e4eb63a2a277dabfcc42a93c2779cbeae44baec158646e93f8b6fd3cf9a7efcd3d9b96b458cfeb428ce715b3c41dcbb92eaf689d17b344d744a8b7f31165 WHIRLPOOL 7bb2800f0dcd7c3f141ae0abe7bcfa634950153af120f74b1bca7134209fd5a93c93427378111572ad69a6237b5400cf41f46ff3fa7b52236e3080c456b86351
-EBUILD gcj-jdk-4.7.2-r1.ebuild 3455 SHA256 13156f274ff9af7a29e381f9d9030c6094a7f33f557a98a50d324e886399d8b9 SHA512 62211b7542c0adb962f557097c331bf5715d0d48cc3c5400fda12602afdfe9f0dd3b120a3919981b072877902afa9879897c4b99f97a0510e1ef5798a3e4d618 WHIRLPOOL 7b38bda6976df5d4c25cc56c72220e5fb8f293ba171f8bc374b062772523199fae09bbe232ff608145b1da9f17045173bfe90de81f4f14af6e3c63e7d8d4d570
-EBUILD gcj-jdk-4.7.2.ebuild 3392 SHA256 834eab03ae7b66605ae869fcb9c027f2add73457fdd442f6e14fca82f988fd58 SHA512 e6928094e152b9a85a287e5c2e7369605bdca6803fde5fd522f7bb10e58b90ad428e39d0eec0122b1dc5a6c345315ee7ba826f52c4ec62d32c20af8defff4430 WHIRLPOOL 4f36f8d05e3e6bd4c6b6c2635b6662cd0ed3eaca657fb5bf980d952052ca2ba51f3e961ba1ce672183c9d091aba315683e2fd80f9bcef55f3b1a2106feca16ad
+EBUILD gcj-jdk-4.6.4.ebuild 3680 SHA256 8c63f2ab224a7b39c73658cd92871ad012fcd91037dd5c9b8dc925774ab2f631 SHA512 6b5c62363400b2ed762de56e0a0921b6d90677ab21d35e3c59e8f83eeef0ebe8f069df37bb5399b92028c35d79336fe691a56d9c6b39395e2d57932c2f2b77d6 WHIRLPOOL da0f414ad5c1be2eb47b9e57697477d9de42119ea51b77e42b65fba8a0c0eb732af1465e82e6cc725b9dad52f0b34023c541750dc5968c5a0da98fafcae7cefd
 EBUILD gcj-jdk-4.7.3-r2.ebuild 3718 SHA256 a5513ece7a1efd99845b4252b234304fb71375602d68bb1110d9493c47c09721 SHA512 bbd6ddd58d17fec3cc67e39396f1922ae52ae49240c6effd1021d58e06c2c53499f034134894080eedb1f2ec7657bfbde05aeb945993b01de54cac2417fbe5cd WHIRLPOOL 5b94a0c0bf7e779fbc1fda00f1bfb01c1294a0b7b287787c404eaf682452c99e5f51525e3fa77a197ff29686e5ad2fc02e0a9510e485609d45b0e88471cc5798
-EBUILD gcj-jdk-4.8.0-r1.ebuild 3410 SHA256 34ee813a7affea50cb6e25d2641a8783dca8711a1e43f3b85803bdf62982e504 SHA512 a6ee480ed2c559429cfa3d6591f2f2404cc41f95a0a1d14a3cb1a1d15f95d83653a6ec3f30e13f8230c0fec1e148f149577c78dc28346c29d91d75f0038db562 WHIRLPOOL 1539d5be642305f927bb3a3b39bf40bed70b77f997611d582e17f30bd9f9e1985759c1d915e004d10d332adedd20b36aef1fcdbc622accea1f7a15f85819ead2
 EBUILD gcj-jdk-4.8.2.ebuild 3743 SHA256 9fd0d79e3df75a6dd28aa05fbc17cebc9845b9f7d7f20443c0563cb918c7d2b5 SHA512 ad8b039e2dcd091304e03abc7a2e9117b6c78faa05fa82041ff4229019622fbdd895f60f7ae2cd7a24090e7440dff5588736ea5d44c26e51572a99f14634465b WHIRLPOOL 0b1437ceae94f01bdf0b8c54695e8d541f18f733863513b0874be3cd39445d0da1246094b4fa2701ffcfc55dd924488beb1d8a110acc884183bb588557f23aef
-MISC ChangeLog 9980 SHA256 6f3062659e0e1ae110560beebdd78e218a02cb03d229da31a6e37dc03309d860 SHA512 fabcaff09e054086c78237dedc5e0a86fe535d98c328d562fdd89f4eff839a4362ca6bd4192ee2abe5ba19f0d7b0ede344df2eaf9ca89da4cc1029e9f9e27b8c WHIRLPOOL d8f4146dface3d0f83da2f56952847100a76ea119137e016f08c7939fe504fa58669c2c398faf00ab9efad1bdaafbb93ec9730f80079b6d7516377ef8c350b53
+MISC ChangeLog 10421 SHA256 5737c86bb8756c7d9c0b0d5191aa7e08d753f642a7a8b4068882715c7688f1ee SHA512 9b0535c9e5411440d2fb653e227e161940a6022d04e187d39aaa56d09d6066a68c5aa699099824eca7e0f62b0da62950c3be81a0b20c0c8e4ab0878df78fd097 WHIRLPOOL c690e976e0451e8f2ea1f826a5fce79872588adc1d7c80e3227e2acbfeb34809452b4ac3361d506bfefab4f9af0b6c9780152a6adfe07758ea18d9ccf9d203fd
 MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSvE3CAAoJEDuWpXgki9wHlkMQAKvG5kcTCSiVAT715yphGM45
-yrqinXOtXh3PjByyIYGDSWKxlm5+an8geU8maTUlRnTxgQLGGzY+q2+xy2xrbtRX
-LpHmX0UsnpR3+zF/PvjhLncdx4EgTxepQgIHvrU5aApksy7zYljdqOphw4+PQJcT
-TmmxXzfs1aXVn7vnWfNmtk69jiwE8R4Y9o/ZYwwT7vtvXGIw/ntSSAyVcuvPS1HF
-QwmRuMQgtD1mIUjiat3y8boRoaJtkGfcUqZBqPBXSzJbA//h+o31Dyz/MLNKrpzn
-aycCFk+ht6ulSTKhyKS5OreT1mQRk7aUAmk1KSvlmUJ636P1fSvq9gCzpAuEbtLB
-BbvgvUPEI4KTAvggFieEyxu6CFFbjqlVKwIPAb0maX1cWhBwPDl+FouxP93Fd9u2
-y0pXupEgROfpz1B9O6NFjtHCfdOxI2aCW34XNvsnDvombHMDEKWg0c+UrE+bp/F0
-OnMCIrw0Git004eg3GTswKEzNGuSCgCoPzAY2sRMtO0yTbMpincj9KpaPE9AWjPa
-LZ1LhHM04ka7IJ4KuskDt6MISrhU0Tvvb+pg15IbNQ/I1+rVKlo0VfqLa266eaKP
-TDrPUgXbN59Wx0UJ2Zwsy4GzeTHKK5XRIN7TMsvETWhuilivg5BNbp04wlFtcd0c
-BFLsZSpz1KlMbKV2Dud5
-=YN1L
+iQIbBAEBCAAGBQJSvE5gAAoJEDuWpXgki9wH9BsP907CN7DNxQgaQYlzam1p+fE+
+VDQvUnJD0Z6PE5awLhYrScaEliswHXqFfnCpe68KfQ+NCP3drjQtuqLJiW3ghzW6
+f5UItPJx9ESHzgT9O+3A6WzMOSElfzTCshMZCt0HH327WG8VO2uqMyQIF7aSuVDO
+c7mVHcuGgojUIGeHT279VhHPLgnQXNNpyoQX/OhwhVeZYqh9tqDSJmLVwBh0u734
+34AcH30vWyjRDM/6H4WbXgX10wX8F6VI2ZNWOp5U7N/dJIIBLLted9+4s8mxbvie
+q1QKgpshefepD5rqXe3szkC52fz+QHBDJ+94UZnhPbF/9U0bJV6wBcaeKz/DF9A+
+mnkvkFomzgIY+EZsWfDJBk6t+QtSphReiPmKvNxCzShrwgbpSqCSF1+LmO9CdSoX
+TZ/bui3osFeDXN0cr0jzrPxwFPy8OIcgvF3xsNXlz+2TRoQDV1VNMl2fWQQbCzzZ
+QI1zYmOAs0PhfvrFb3P5+2TX1tQ8W0hMMF3fMCSgYPGa0HP3ViSZmNFHvBcfjzwL
+ihvoOPqe7QczcpW90EFDG6Vz8kXKXKKdz8JqAClNTYGCSroIj1bdrwEAnD+658JC
+xoZl/Y0sPJCLAJxEy5DbmsmADglsFZiXmlyc2zVcnKi0JS4lhkixUxna/O7IzHpC
+U2umkLENeMdXpKY9bxo=
+=/KYe
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild
deleted file mode 100644
index ad4ec20..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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.6.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.1.ebuild
deleted file mode 100644
index 7ecef95..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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.6"
-
-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.6.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.2.ebuild
deleted file mode 100644
index f144b5b..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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.6"
-
-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.6.2-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.4.ebuild
similarity index 98%
rename from dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-4.6.4.ebuild
index 0276a69..409084d 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
-#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~amd64"
 SLOT="0"
 IUSE=""
 

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.0-r1.ebuild
deleted file mode 100644
index b7ef5df..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj,awt]
-	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/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
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# 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
-	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.7.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.0.ebuild
deleted file mode 100644
index 8f0e972..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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.6"
-
-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 ${gccbin}/gij ${gcjhome}/bin/java
-	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;
-
-	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.7.1-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.1-r1.ebuild
deleted file mode 100644
index cd0db51..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="
-	~sys-devel/gcc-${PV}[gcj,awt]
-	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"
-
-}

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.1.ebuild
deleted file mode 100644
index b7ef5df..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="~sys-devel/gcc-${PV}[gcj,awt]
-	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/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
-	dosym ${gccbin}/gcj-dbtool /usr/bin/gcj-dbtool
-
-	# 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
-	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.7.2-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.2-r1.ebuild
deleted file mode 100644
index ca7f3d3..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.2-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE="X"
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="
-	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[awt] )
-	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 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.7.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild
deleted file mode 100644
index f20494a..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-#KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ECJ_GCJ_SLOT="3.6"
-
-RDEPEND="
-	~sys-devel/gcc-${PV}[gcj,awt]
-	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}"}
-
-	# 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 ${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.8.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.8.0-r1.ebuild
deleted file mode 100644
index c4ee25c..0000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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}[awt] )
-	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 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"
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
@ 2013-12-26 19:12 Andrew John Hughes
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew John Hughes @ 2013-12-26 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f31cefbfde32c24988a88f5bcbe39ab7c56c4df7
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Thu Dec 26 15:39:46 2013 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Thu Dec 26 15:39:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=f31cefbf

Add support for gcc 4.8.2.  Change USE flag dependency from gtk to awt.

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

---
 dev-java/gcj-jdk/ChangeLog                         |  9 +++++
 dev-java/gcj-jdk/Manifest                          | 46 +++++++++++-----------
 dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild           |  4 +-
 dev-java/gcj-jdk/gcj-jdk-4.7.0-r1.ebuild           |  4 +-
 dev-java/gcj-jdk/gcj-jdk-4.7.1-r1.ebuild           |  4 +-
 dev-java/gcj-jdk/gcj-jdk-4.7.1.ebuild              |  4 +-
 dev-java/gcj-jdk/gcj-jdk-4.7.2-r1.ebuild           |  2 +-
 dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild              |  4 +-
 dev-java/gcj-jdk/gcj-jdk-4.7.3-r2.ebuild           |  2 +-
 dev-java/gcj-jdk/gcj-jdk-4.8.0-r1.ebuild           |  2 +-
 ...cj-jdk-4.8.1-r2.ebuild => gcj-jdk-4.8.2.ebuild} |  2 +-
 11 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 96af223..cc67a79 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gcj-jdk-4.8.2 (26 Dec 2013)
+
+  26 Dec 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +gcj-jdk-4.8.2.ebuild, -gcj-jdk-4.8.1-r2.ebuild, gcj-jdk-4.6.2-r1.ebuild,
+  gcj-jdk-4.7.0-r1.ebuild, gcj-jdk-4.7.1-r1.ebuild, gcj-jdk-4.7.1.ebuild,
+  gcj-jdk-4.7.2-r1.ebuild, gcj-jdk-4.7.2.ebuild, gcj-jdk-4.7.3-r2.ebuild,
+  gcj-jdk-4.8.0-r1.ebuild:
+  Add support for gcc 4.8.2.  Change USE flag dependency from gtk to awt.
+
 *gcj-jdk-4.7.3-r2 (20 Sep 2013)
 *gcj-jdk-4.8.1-r2 (20 Sep 2013)
 

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index fe4035e..7703245 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -5,33 +5,33 @@ AUX gcj-jdk.env 676 SHA256 d8c8aab55aebe15dd783e273b857da4042d5041f32d31277180b6
 AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8
 EBUILD gcj-jdk-4.6.0.ebuild 3630 SHA256 152d92cadd32b75d2dc76a0a9f0b55a9a40ecaed802ceff8080be93f457f7a69 SHA512 efb8d824b3aaafcc11a774fd6094cb444aff8bf3d07d5e9596b8cee9a71b4c541bbfa1e9e1d39a63c1430317eaadba76f2f793bebdf09a06404d4ad4f80f23da WHIRLPOOL ccda10d3d6d0088b54b6c4ec5a8c5e0466c7c0485e50ca58dbfff3831531e79b48cd38c63a9ee1bcbf290e9344ae0e5fffe88c837fb30672bbce5c8ab27aa1a5
 EBUILD gcj-jdk-4.6.1.ebuild 3630 SHA256 ef4096e3990c7cdabd44d40deccff7388d87dd4bf8a353a28d21507ceb293733 SHA512 0bbd17a0bffb24b1ee4bdd202f7d22cd7a14adbd2d64bedbbca58dbf8632bbaa755b1e15751fbd1565ce329ccaff1bcf741a1876bd5927ca197102fef2fd3483 WHIRLPOOL f5c0adde67978c8b39636db603da65df23e113168fd6ce08ba7ee534f84a9ad59be3f2022aa4acab1fdc9866026f7f87baf4942b0425a6a0acef2d92c6bc335f
-EBUILD gcj-jdk-4.6.2-r1.ebuild 3715 SHA256 c871d49bb81b908d4e94c71c74f91b7365a370200b6369111e7f6b122e54dba5 SHA512 15cf2973b693d398ea1a690fd9a50349bb0f4c086e7cdfa001f96a73fbcd03900eb0994b1d378d9f818f058a581cf48ae15f7b9c48431a24c04b366906d3923c WHIRLPOOL abbb13cea3f93dcbc057e5083005b2f1e95afe4279393542038401413368481ced158a42ad5112699b07dda362551a2f9f621e20627ba70f4599adfb4727be66
+EBUILD gcj-jdk-4.6.2-r1.ebuild 3715 SHA256 3732377fd8db111de0202063ab97d981fa94d373475b91439026307abbdee010 SHA512 7b0ce0ae995866ab959d50c82df9521ad45f94a888b0acd0138259f34a5b4abfce770ac322b62af72cc7100484cbffe5d258b18cac469a6c16738bfa7beab083 WHIRLPOOL 3c2274923d972d727a53b6dd69e505462309804ef5a06aa513a66f941f4db5762a1b3b383d7f0b44772006b021d61a34b3c8acf34e49fc38a8e880174c239890
 EBUILD gcj-jdk-4.6.2.ebuild 3630 SHA256 1c2c0a94c83cfa63afcbf58109bba0a690ba259aa1d9af6df6e69d7ee61f2e89 SHA512 20008cc93a3cd9a52456839ba20d761f7798db9b5cf50c0d614f5360ebbe462279471b0b8a41333a9c9ab70257b7d620106d3ceff80eaacc7a39e27d983a2ec9 WHIRLPOOL b48d2bc830c03a8dbd2154fcacfdcd1ea7e2e559659d793342816786b61de54990204bbce48239ee568c7bf2c282a0e3f9a5b2afff933e11cbcf9a0aa0549171
-EBUILD gcj-jdk-4.7.0-r1.ebuild 3714 SHA256 044093f56781f04a16a1ffbd86d796537ddbaee44b0805c6cfb07ea043e04978 SHA512 12832986e3a1c303d2bf5f910019378a0af09a13342a5a1069008c4e7b96bd11e586436537dff4d7227143ed46d28a4c40ccced31affab69dac32b1e5c994ef0 WHIRLPOOL 320ddbc1830b57ea6d61c4f08ab5eff7b5a83de0e5c4aeebf555371e96266edbc8a1508a0fa6255d75d0627bde21f348ad7eda64b5aef5025394f1b6ee92f423
+EBUILD gcj-jdk-4.7.0-r1.ebuild 3714 SHA256 f822bfd5d744e69eeed4ddb4251454c1ff6177e78266f7f8374470514d4880c4 SHA512 c221e4eb63a2a277dabfcc42a93c2779cbeae44baec158646e93f8b6fd3cf9a7efcd3d9b96b458cfeb428ce715b3c41dcbb92eaf689d17b344d744a8b7f31165 WHIRLPOOL 7bb2800f0dcd7c3f141ae0abe7bcfa634950153af120f74b1bca7134209fd5a93c93427378111572ad69a6237b5400cf41f46ff3fa7b52236e3080c456b86351
 EBUILD gcj-jdk-4.7.0.ebuild 3634 SHA256 1664408bb52a0991e956834bea1211bd354ed6adb3478f6c949250d412340750 SHA512 88dfae7b5308f742148411a14ab11f78f664c17dccfa7606d40b567f52333ac4654541c9529e7b6cefa11acf023752cbf16de7365047fe3214f86f16d4f45201 WHIRLPOOL ccdc952974c315541470b09168c1b1e232b3dd2bdb585ff44c954f8cb0332790092714bce94726b983903fb0a21c5314948100905ed38f6fc8acb4a27881764c
-EBUILD gcj-jdk-4.7.1-r1.ebuild 3662 SHA256 a342c8ec5bfbdbe18c17394927828a509c5aed44291c2d6a0d13eb8fdcceb9ca SHA512 d99455678c124ddb9a64ed68364c16c3a47544f1d13a3225da72ef34d1caba3a44a796ff82a960893c3e41d0c8e406f4763d1e9d3931b8da4d80bc12a387fa1f WHIRLPOOL 2afacef1562bf6838198db4cac4d1237dc299bcda909bbd6468ca5cb0163246ed3da62bd2c4d4300526781a1fa3c07dffd47a73276f008740a33c02c021344b1
-EBUILD gcj-jdk-4.7.1.ebuild 3714 SHA256 044093f56781f04a16a1ffbd86d796537ddbaee44b0805c6cfb07ea043e04978 SHA512 12832986e3a1c303d2bf5f910019378a0af09a13342a5a1069008c4e7b96bd11e586436537dff4d7227143ed46d28a4c40ccced31affab69dac32b1e5c994ef0 WHIRLPOOL 320ddbc1830b57ea6d61c4f08ab5eff7b5a83de0e5c4aeebf555371e96266edbc8a1508a0fa6255d75d0627bde21f348ad7eda64b5aef5025394f1b6ee92f423
-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.7.3-r2.ebuild 3718 SHA256 7ab52cc20176d48ce4b5c633e7ae0149842dd7c27a2b9c0a6143b5d00696c78d SHA512 dd5eb9346472f789234e10916369ab69087853595ace5d0a398d468e043fa2d6cc264264e8ae2a38e47e6ec63715301bb0313df287cf44243d27b785430ec367 WHIRLPOOL b2207a1888877134f9ecda2db86b841b65b2fbbf8dfce734e896fc4279c0c195fc89ea1da8947f2fbd2d3c15e255984cc4a5d13d81897f69a329bfccd3f71a98
-EBUILD gcj-jdk-4.8.0-r1.ebuild 3410 SHA256 3d74b788a2199f88b0238f39ac4656f16dda23de0400fb3c253c93f493007738 SHA512 a75c1be4f890945c00edcdb41e427a143401c7e3aacdff9ddf79054071287f9a1563bc8a683e4fc8e3da5984023eeb5d73e9d2397108121a3431eff4b32e1918 WHIRLPOOL ed2cbeb89613468bb4e3effae440b81086a4807707dc2dd3d8fb7d751c09b80596f746479b4d42e32f751f2a45c21e3680b98b82becccef2adf9e9ce53e9d46e
-EBUILD gcj-jdk-4.8.1-r2.ebuild 3743 SHA256 09915020bfa260e21d167c62f465d8c8d7c71443c45168a086aad9f94d7cd7f4 SHA512 1c1225538d02e9c1b54338150ffcc05fe350334f137a2506c5b17bf07cac73d3813d09a708333e92afd4a873821557bbd648eba322eb2012895a3b344dc7971a WHIRLPOOL 78f4ba9e27a8defe933dec351c13f513eaf1382211ea5cddf09174df82080edfdf0200cb9526843e9c6ec78c4b16aecc12e3ee2a55a9cb98081d2df383d5fec5
-MISC ChangeLog 9562 SHA256 ca4bff66d7430c1572cd97ce7d2ec06396cd7a9d4325a0ce192b862f452c6a43 SHA512 cc944534e680b86bcc3d5ef0a9b14948d6e7cc4734aa6de14ef3c77317990daaebe43b35367f0cacbb63c07f70e7ac8e260b4b99c439d930e78a7f519ee4e7ee WHIRLPOOL 5427a829ff60a55293624fdaf2c0382f8ef8d5a0c0dbb2a76d03a232b80410e8aaaee4f0222bda773d688e8d2dc216061580f86f630fb559a65a5f355157d331
+EBUILD gcj-jdk-4.7.1-r1.ebuild 3662 SHA256 5e05970a0302b3a563521e1cc1b47008cb20977348a97a3ab509ad74c45ef962 SHA512 be599b4e08c64b3fc5fa2e24356158f5a2d2e0038642429b456b735dd8f96cdd4ab7ffe10b25c1c5c7e703faa8505772ba3e9aac5a0e5251975a278bdc2599e1 WHIRLPOOL 44f73a9a69faa2eb147c5b7f9af918343b463f48f135ef838eda96c91a5d4961e77b8372ccd9c81b15f6f25d2a84eb907f92855b33b674c66c502669f7d35d2a
+EBUILD gcj-jdk-4.7.1.ebuild 3714 SHA256 f822bfd5d744e69eeed4ddb4251454c1ff6177e78266f7f8374470514d4880c4 SHA512 c221e4eb63a2a277dabfcc42a93c2779cbeae44baec158646e93f8b6fd3cf9a7efcd3d9b96b458cfeb428ce715b3c41dcbb92eaf689d17b344d744a8b7f31165 WHIRLPOOL 7bb2800f0dcd7c3f141ae0abe7bcfa634950153af120f74b1bca7134209fd5a93c93427378111572ad69a6237b5400cf41f46ff3fa7b52236e3080c456b86351
+EBUILD gcj-jdk-4.7.2-r1.ebuild 3455 SHA256 13156f274ff9af7a29e381f9d9030c6094a7f33f557a98a50d324e886399d8b9 SHA512 62211b7542c0adb962f557097c331bf5715d0d48cc3c5400fda12602afdfe9f0dd3b120a3919981b072877902afa9879897c4b99f97a0510e1ef5798a3e4d618 WHIRLPOOL 7b38bda6976df5d4c25cc56c72220e5fb8f293ba171f8bc374b062772523199fae09bbe232ff608145b1da9f17045173bfe90de81f4f14af6e3c63e7d8d4d570
+EBUILD gcj-jdk-4.7.2.ebuild 3392 SHA256 834eab03ae7b66605ae869fcb9c027f2add73457fdd442f6e14fca82f988fd58 SHA512 e6928094e152b9a85a287e5c2e7369605bdca6803fde5fd522f7bb10e58b90ad428e39d0eec0122b1dc5a6c345315ee7ba826f52c4ec62d32c20af8defff4430 WHIRLPOOL 4f36f8d05e3e6bd4c6b6c2635b6662cd0ed3eaca657fb5bf980d952052ca2ba51f3e961ba1ce672183c9d091aba315683e2fd80f9bcef55f3b1a2106feca16ad
+EBUILD gcj-jdk-4.7.3-r2.ebuild 3718 SHA256 a5513ece7a1efd99845b4252b234304fb71375602d68bb1110d9493c47c09721 SHA512 bbd6ddd58d17fec3cc67e39396f1922ae52ae49240c6effd1021d58e06c2c53499f034134894080eedb1f2ec7657bfbde05aeb945993b01de54cac2417fbe5cd WHIRLPOOL 5b94a0c0bf7e779fbc1fda00f1bfb01c1294a0b7b287787c404eaf682452c99e5f51525e3fa77a197ff29686e5ad2fc02e0a9510e485609d45b0e88471cc5798
+EBUILD gcj-jdk-4.8.0-r1.ebuild 3410 SHA256 34ee813a7affea50cb6e25d2641a8783dca8711a1e43f3b85803bdf62982e504 SHA512 a6ee480ed2c559429cfa3d6591f2f2404cc41f95a0a1d14a3cb1a1d15f95d83653a6ec3f30e13f8230c0fec1e148f149577c78dc28346c29d91d75f0038db562 WHIRLPOOL 1539d5be642305f927bb3a3b39bf40bed70b77f997611d582e17f30bd9f9e1985759c1d915e004d10d332adedd20b36aef1fcdbc622accea1f7a15f85819ead2
+EBUILD gcj-jdk-4.8.2.ebuild 3743 SHA256 9fd0d79e3df75a6dd28aa05fbc17cebc9845b9f7d7f20443c0563cb918c7d2b5 SHA512 ad8b039e2dcd091304e03abc7a2e9117b6c78faa05fa82041ff4229019622fbdd895f60f7ae2cd7a24090e7440dff5588736ea5d44c26e51572a99f14634465b WHIRLPOOL 0b1437ceae94f01bdf0b8c54695e8d541f18f733863513b0874be3cd39445d0da1246094b4fa2701ffcfc55dd924488beb1d8a110acc884183bb588557f23aef
+MISC ChangeLog 9980 SHA256 6f3062659e0e1ae110560beebdd78e218a02cb03d229da31a6e37dc03309d860 SHA512 fabcaff09e054086c78237dedc5e0a86fe535d98c328d562fdd89f4eff839a4362ca6bd4192ee2abe5ba19f0d7b0ede344df2eaf9ca89da4cc1029e9f9e27b8c WHIRLPOOL d8f4146dface3d0f83da2f56952847100a76ea119137e016f08c7939fe504fa58669c2c398faf00ab9efad1bdaafbb93ec9730f80079b6d7516377ef8c350b53
 MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSO74yAAoJEDuWpXgki9wHOPoP/0pPi2wVEEPrXfGcpKRpr7WB
-b7hXsW6tC4AlaqpNaj/9QUoLjvT/AoIp0fj9RVFlAg0vHUDplz35FpO+RaKc93xV
-VgBy8ax5W0+VWDTzkm7D+cnntEK8J6a1TSUFy3vDjMUWhqUAWZuW2ugAJuf82Ooj
-z2S5LKeML+oo4jLvc6cRGO4ar45wA91dpcaaQA+UeXDrcytauqFMpplFU4PG3LY4
-tr6/jL3MJgu5K9GW4lkZxRiEhDNKGQOPXaY66GQsZOAAt1YA9oigC/FmUWaG3NG9
-UM2yT5hEIkUu1OMwkjy5gb3Tv8jtGngGPI8rd5b6xNB8okr/lY56Eo0PI8Dus/KG
-8DBRaEioGLICiBlH1RdwxNwy00GV3O9C9Dn052Tay3TEMApMvTXh3kGwa+zExZvX
-0C8L2p4nAFGYsy0mQa/11ZMmTiTJI8pxXWUMSV0NIhveNBPDzrRe/ctBcO3D1SNl
-d23uT8+nwA93vayI+T3DZG4v4v5IdTPg+STgdnYtAguaZUlJJOitpVnPwL+GV7Ru
-62UL6oX5jsEy0ACHAixeB5za6aPo8HszRU/VH5y2Bfg4r3iyofxwfleBfQ9rQ6fB
-+gKspBjT12GcXldYujEpaTmcTsvizSPzIwK7/OOWYtWXaOf6sGz4VwETwLRU2SD1
-mhUjc0UIGpqqkaXpV0fI
-=Wpqu
+iQIcBAEBCAAGBQJSvE3CAAoJEDuWpXgki9wHlkMQAKvG5kcTCSiVAT715yphGM45
+yrqinXOtXh3PjByyIYGDSWKxlm5+an8geU8maTUlRnTxgQLGGzY+q2+xy2xrbtRX
+LpHmX0UsnpR3+zF/PvjhLncdx4EgTxepQgIHvrU5aApksy7zYljdqOphw4+PQJcT
+TmmxXzfs1aXVn7vnWfNmtk69jiwE8R4Y9o/ZYwwT7vtvXGIw/ntSSAyVcuvPS1HF
+QwmRuMQgtD1mIUjiat3y8boRoaJtkGfcUqZBqPBXSzJbA//h+o31Dyz/MLNKrpzn
+aycCFk+ht6ulSTKhyKS5OreT1mQRk7aUAmk1KSvlmUJ636P1fSvq9gCzpAuEbtLB
+BbvgvUPEI4KTAvggFieEyxu6CFFbjqlVKwIPAb0maX1cWhBwPDl+FouxP93Fd9u2
+y0pXupEgROfpz1B9O6NFjtHCfdOxI2aCW34XNvsnDvombHMDEKWg0c+UrE+bp/F0
+OnMCIrw0Git004eg3GTswKEzNGuSCgCoPzAY2sRMtO0yTbMpincj9KpaPE9AWjPa
+LZ1LhHM04ka7IJ4KuskDt6MISrhU0Tvvb+pg15IbNQ/I1+rVKlo0VfqLa266eaKP
+TDrPUgXbN59Wx0UJ2Zwsy4GzeTHKK5XRIN7TMsvETWhuilivg5BNbp04wlFtcd0c
+BFLsZSpz1KlMbKV2Dud5
+=YN1L
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild
index 7e4c747..0276a69 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ IUSE=""
 
 ECJ_GCJ_SLOT="3.6"
 
-RDEPEND="~sys-devel/gcc-${PV}[gcj,gtk]
+RDEPEND="~sys-devel/gcc-${PV}[gcj,awt]
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
 DEPEND="${RDEPEND}"
 

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.0-r1.ebuild
index f49cbfa..b7ef5df 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.0-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ IUSE=""
 
 ECJ_GCJ_SLOT="3.6"
 
-RDEPEND="~sys-devel/gcc-${PV}[gcj,gtk]
+RDEPEND="~sys-devel/gcc-${PV}[gcj,awt]
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
 DEPEND="${RDEPEND}"
 

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.1-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.1-r1.ebuild
index 6158064..cd0db51 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.1-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -18,7 +18,7 @@ IUSE=""
 ECJ_GCJ_SLOT="3.6"
 
 RDEPEND="
-	~sys-devel/gcc-${PV}[gcj,gtk]
+	~sys-devel/gcc-${PV}[gcj,awt]
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
 DEPEND="${RDEPEND}"
 

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.1.ebuild
index f49cbfa..b7ef5df 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ IUSE=""
 
 ECJ_GCJ_SLOT="3.6"
 
-RDEPEND="~sys-devel/gcc-${PV}[gcj,gtk]
+RDEPEND="~sys-devel/gcc-${PV}[gcj,awt]
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
 DEPEND="${RDEPEND}"
 

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.2-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.2-r1.ebuild
index d9a0efe..ca7f3d3 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.2-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.2-r1.ebuild
@@ -19,7 +19,7 @@ ECJ_GCJ_SLOT="3.6"
 
 RDEPEND="
 	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[gtk] )
+	X? ( ~sys-devel/gcc-${PV}[awt] )
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
 DEPEND="${RDEPEND}"
 

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild
index f15d754..f20494a 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -18,7 +18,7 @@ IUSE=""
 ECJ_GCJ_SLOT="3.6"
 
 RDEPEND="
-	~sys-devel/gcc-${PV}[gcj,gtk]
+	~sys-devel/gcc-${PV}[gcj,awt]
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
 DEPEND="${RDEPEND}"
 

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.3-r2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.3-r2.ebuild
index e679bf4..1d162d3 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.3-r2.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.3-r2.ebuild
@@ -19,7 +19,7 @@ ECJ_GCJ_SLOT="3.6"
 
 RDEPEND="
 	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[gtk] )
+	X? ( ~sys-devel/gcc-${PV}[awt] )
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
 DEPEND="${RDEPEND}"
 

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.8.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.8.0-r1.ebuild
index abe642d..c4ee25c 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.8.0-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.8.0-r1.ebuild
@@ -19,7 +19,7 @@ ECJ_GCJ_SLOT="4.2"
 
 RDEPEND="
 	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[gtk] )
+	X? ( ~sys-devel/gcc-${PV}[awt] )
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
 DEPEND="${RDEPEND}"
 

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.8.1-r2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild
similarity index 99%
rename from dev-java/gcj-jdk/gcj-jdk-4.8.1-r2.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild
index 7a04f5e..fdbfcf0 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.8.1-r2.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.8.2.ebuild
@@ -19,7 +19,7 @@ ECJ_GCJ_SLOT="4.2"
 
 RDEPEND="
 	~sys-devel/gcc-${PV}[gcj]
-	X? ( ~sys-devel/gcc-${PV}[gtk] )
+	X? ( ~sys-devel/gcc-${PV}[awt] )
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
 DEPEND="${RDEPEND}"
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
  2014-09-02  4:30 Andrew John Hughes
@ 2014-08-07 18:41 ` Andrew John Hughes
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew John Hughes @ 2014-08-07 18:41 UTC (permalink / raw
  To: gentoo-commits

commit:     08be7d8f6cf42dde49ef358b7a25af0ce2378906
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Thu Aug  7 18:40:12 2014 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Thu Aug  7 18:40:12 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=08be7d8f

Support gcc 4.9.0.

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

---
 dev-java/gcj-jdk/ChangeLog            |   8 ++-
 dev-java/gcj-jdk/Manifest             |  31 +++++-----
 dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild | 105 ++++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+), 16 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 7ee940d..f6c3896 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gcj-jdk-4.9.0 (07 Aug 2014)
+
+  07 Aug 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +gcj-jdk-4.9.0.ebuild:
+  Support gcc 4.9.0.
+
 *gcj-jdk-4.6.4 (26 Dec 2013)
 
   26 Dec 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 4eafc6d..07236ad 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -6,22 +6,23 @@ AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5
 EBUILD gcj-jdk-4.6.4.ebuild 3680 SHA256 8c63f2ab224a7b39c73658cd92871ad012fcd91037dd5c9b8dc925774ab2f631 SHA512 6b5c62363400b2ed762de56e0a0921b6d90677ab21d35e3c59e8f83eeef0ebe8f069df37bb5399b92028c35d79336fe691a56d9c6b39395e2d57932c2f2b77d6 WHIRLPOOL da0f414ad5c1be2eb47b9e57697477d9de42119ea51b77e42b65fba8a0c0eb732af1465e82e6cc725b9dad52f0b34023c541750dc5968c5a0da98fafcae7cefd
 EBUILD gcj-jdk-4.7.3-r2.ebuild 3718 SHA256 a5513ece7a1efd99845b4252b234304fb71375602d68bb1110d9493c47c09721 SHA512 bbd6ddd58d17fec3cc67e39396f1922ae52ae49240c6effd1021d58e06c2c53499f034134894080eedb1f2ec7657bfbde05aeb945993b01de54cac2417fbe5cd WHIRLPOOL 5b94a0c0bf7e779fbc1fda00f1bfb01c1294a0b7b287787c404eaf682452c99e5f51525e3fa77a197ff29686e5ad2fc02e0a9510e485609d45b0e88471cc5798
 EBUILD gcj-jdk-4.8.2.ebuild 3743 SHA256 9fd0d79e3df75a6dd28aa05fbc17cebc9845b9f7d7f20443c0563cb918c7d2b5 SHA512 ad8b039e2dcd091304e03abc7a2e9117b6c78faa05fa82041ff4229019622fbdd895f60f7ae2cd7a24090e7440dff5588736ea5d44c26e51572a99f14634465b WHIRLPOOL 0b1437ceae94f01bdf0b8c54695e8d541f18f733863513b0874be3cd39445d0da1246094b4fa2701ffcfc55dd924488beb1d8a110acc884183bb588557f23aef
-MISC ChangeLog 10421 SHA256 5737c86bb8756c7d9c0b0d5191aa7e08d753f642a7a8b4068882715c7688f1ee SHA512 9b0535c9e5411440d2fb653e227e161940a6022d04e187d39aaa56d09d6066a68c5aa699099824eca7e0f62b0da62950c3be81a0b20c0c8e4ab0878df78fd097 WHIRLPOOL c690e976e0451e8f2ea1f826a5fce79872588adc1d7c80e3227e2acbfeb34809452b4ac3361d506bfefab4f9af0b6c9780152a6adfe07758ea18d9ccf9d203fd
+EBUILD gcj-jdk-4.9.0.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88
+MISC ChangeLog 10560 SHA256 0a0e13599c0ba732e9d8d6a15343984cfb76e0baac17b61c5af3359af0955a79 SHA512 3309124b3ced6d1397456d7b985d764e12f96005f9c9695c2e4853ed1a82c993c7a4c528697ddbc7c019a440fcb995cad319aff7243ac916473595a670c63a01 WHIRLPOOL 62c615518fe5d7f75984b3542e0592ce6bc9cdd3c92b34a5537884ab31a7024ecc0d64a08d7a6d4fb2530c64dd5d3ad1938d4a0ca529400a129e3c00a08fa201
 MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIbBAEBCAAGBQJSvE5gAAoJEDuWpXgki9wH9BsP907CN7DNxQgaQYlzam1p+fE+
-VDQvUnJD0Z6PE5awLhYrScaEliswHXqFfnCpe68KfQ+NCP3drjQtuqLJiW3ghzW6
-f5UItPJx9ESHzgT9O+3A6WzMOSElfzTCshMZCt0HH327WG8VO2uqMyQIF7aSuVDO
-c7mVHcuGgojUIGeHT279VhHPLgnQXNNpyoQX/OhwhVeZYqh9tqDSJmLVwBh0u734
-34AcH30vWyjRDM/6H4WbXgX10wX8F6VI2ZNWOp5U7N/dJIIBLLted9+4s8mxbvie
-q1QKgpshefepD5rqXe3szkC52fz+QHBDJ+94UZnhPbF/9U0bJV6wBcaeKz/DF9A+
-mnkvkFomzgIY+EZsWfDJBk6t+QtSphReiPmKvNxCzShrwgbpSqCSF1+LmO9CdSoX
-TZ/bui3osFeDXN0cr0jzrPxwFPy8OIcgvF3xsNXlz+2TRoQDV1VNMl2fWQQbCzzZ
-QI1zYmOAs0PhfvrFb3P5+2TX1tQ8W0hMMF3fMCSgYPGa0HP3ViSZmNFHvBcfjzwL
-ihvoOPqe7QczcpW90EFDG6Vz8kXKXKKdz8JqAClNTYGCSroIj1bdrwEAnD+658JC
-xoZl/Y0sPJCLAJxEy5DbmsmADglsFZiXmlyc2zVcnKi0JS4lhkixUxna/O7IzHpC
-U2umkLENeMdXpKY9bxo=
-=/KYe
+iQIbBAEBCAAGBQJT48gLAAoJEDuWpXgki9wHX8YP9R5FjRE/6NB8aWd0AydWazZK
+Bq5+k3kq76hJ1m7Oe3pNx5uwq11jrldP1Y67gpWdn9T7Mzhb/IJM1uG75m4to8Qe
+C8Ikjduuw2mAiyRHZ1ZtjexHucCzt8VYpbfI1dtX8IG9pQz4Xv7N6pZpFMsBqMWM
+26D4E5jXZiUfY2OdC47HVaq/uBiHEaU0t/hJikM1DPa8hdOf+cEDtcKnjkJXZGnL
+E0VitDsCtZM5PZ4zCq+py6udaOsg6fQtsKcQlpWvv/WKs08bXq/HXI0GFUATrZXt
+dXDWMFXdYDC0gzoW6w+7nrcZZV98CJfUuZ7PFUCd0vzBD1COMjGaYhJxibj/A0xC
+zuKGcqKgZDXrqBA6eLvv+5K08XMom9jONo0y1AjGTjDxP7HxnG2FmAihpShVfT/u
+rhtKCV1g6TVFo/ZW/t5YZh2kNVDSZCNwdhoxj1HIxt8f0ZDJXCazTR4dzWpe9D8L
+/b6apQq4pjzoVdLwPYXAfavYBqXO0Dwg5nVhJe+ZY+tVbmt52tOfcHFOqJcYv26f
+B8cLA3bVdvlipe/PBQTZUhpBI3e/xEINE8ygzfUGW9cNkS0DAnFiraS3s1KzRsvS
++rp+44zQRV83xZ91HXftl7UYI5ECyroKYVoDOBlGggHsxOBwhXyhVXuuWDwCT3dR
+HEpdMGf3UJuRPXJQbbQ=
+=jR9f
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild
new file mode 100644
index 0000000..7b06370
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 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}[awt] )
+	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}/include
+
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+	| newexe - 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://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.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"
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
@ 2014-09-02  4:30 Andrew John Hughes
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew John Hughes @ 2014-09-02  4:30 UTC (permalink / raw
  To: gentoo-commits

commit:     31773bdadf36b75d0c7124983d9093605a6a8223
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Thu Aug 28 14:54:33 2014 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Thu Aug 28 14:54:33 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=31773bda

Support gcc 4.9.1.

Package-Manager: portage-2.2.11-r1
Manifest-Sign-Key: 248BDC07

---
 dev-java/gcj-jdk/ChangeLog            |   6 ++
 dev-java/gcj-jdk/Manifest             |  31 +++++-----
 dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild | 105 ++++++++++++++++++++++++++++++++++
 3 files changed, 127 insertions(+), 15 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index f6c3896..f604418 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gcj-jdk-4.9.1 (28 Aug 2014)
+
+  28 Aug 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +gcj-jdk-4.9.1.ebuild:
+  Support gcc 4.9.1.
+
 *gcj-jdk-4.9.0 (07 Aug 2014)
 
   07 Aug 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 07236ad..3b649cf 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -7,22 +7,23 @@ EBUILD gcj-jdk-4.6.4.ebuild 3680 SHA256 8c63f2ab224a7b39c73658cd92871ad012fcd910
 EBUILD gcj-jdk-4.7.3-r2.ebuild 3718 SHA256 a5513ece7a1efd99845b4252b234304fb71375602d68bb1110d9493c47c09721 SHA512 bbd6ddd58d17fec3cc67e39396f1922ae52ae49240c6effd1021d58e06c2c53499f034134894080eedb1f2ec7657bfbde05aeb945993b01de54cac2417fbe5cd WHIRLPOOL 5b94a0c0bf7e779fbc1fda00f1bfb01c1294a0b7b287787c404eaf682452c99e5f51525e3fa77a197ff29686e5ad2fc02e0a9510e485609d45b0e88471cc5798
 EBUILD gcj-jdk-4.8.2.ebuild 3743 SHA256 9fd0d79e3df75a6dd28aa05fbc17cebc9845b9f7d7f20443c0563cb918c7d2b5 SHA512 ad8b039e2dcd091304e03abc7a2e9117b6c78faa05fa82041ff4229019622fbdd895f60f7ae2cd7a24090e7440dff5588736ea5d44c26e51572a99f14634465b WHIRLPOOL 0b1437ceae94f01bdf0b8c54695e8d541f18f733863513b0874be3cd39445d0da1246094b4fa2701ffcfc55dd924488beb1d8a110acc884183bb588557f23aef
 EBUILD gcj-jdk-4.9.0.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88
-MISC ChangeLog 10560 SHA256 0a0e13599c0ba732e9d8d6a15343984cfb76e0baac17b61c5af3359af0955a79 SHA512 3309124b3ced6d1397456d7b985d764e12f96005f9c9695c2e4853ed1a82c993c7a4c528697ddbc7c019a440fcb995cad319aff7243ac916473595a670c63a01 WHIRLPOOL 62c615518fe5d7f75984b3542e0592ce6bc9cdd3c92b34a5537884ab31a7024ecc0d64a08d7a6d4fb2530c64dd5d3ad1938d4a0ca529400a129e3c00a08fa201
+EBUILD gcj-jdk-4.9.1.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88
+MISC ChangeLog 10699 SHA256 5fcd36ff8280256661c8f6f862073e9e5ea27bea18d35100a4f8ca26d8591a70 SHA512 f0a0c01dfb9306fe47858c81fddc0eaa6059f08ec90aea18cbfd6005d65e85782468cc787260634fd59fa81cedf5d93857c6e0c90c10de45d13fb5b9c19748f2 WHIRLPOOL b47b8a6d20cde5de0a0768dc70fc44e60f4ad344e95e66030f1bf4430f195cbd5aaf40abf8d477f61d1d1dfd9abe16ef09c2ddb74b6f0a6b97c2da8186645aec
 MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIbBAEBCAAGBQJT48gLAAoJEDuWpXgki9wHX8YP9R5FjRE/6NB8aWd0AydWazZK
-Bq5+k3kq76hJ1m7Oe3pNx5uwq11jrldP1Y67gpWdn9T7Mzhb/IJM1uG75m4to8Qe
-C8Ikjduuw2mAiyRHZ1ZtjexHucCzt8VYpbfI1dtX8IG9pQz4Xv7N6pZpFMsBqMWM
-26D4E5jXZiUfY2OdC47HVaq/uBiHEaU0t/hJikM1DPa8hdOf+cEDtcKnjkJXZGnL
-E0VitDsCtZM5PZ4zCq+py6udaOsg6fQtsKcQlpWvv/WKs08bXq/HXI0GFUATrZXt
-dXDWMFXdYDC0gzoW6w+7nrcZZV98CJfUuZ7PFUCd0vzBD1COMjGaYhJxibj/A0xC
-zuKGcqKgZDXrqBA6eLvv+5K08XMom9jONo0y1AjGTjDxP7HxnG2FmAihpShVfT/u
-rhtKCV1g6TVFo/ZW/t5YZh2kNVDSZCNwdhoxj1HIxt8f0ZDJXCazTR4dzWpe9D8L
-/b6apQq4pjzoVdLwPYXAfavYBqXO0Dwg5nVhJe+ZY+tVbmt52tOfcHFOqJcYv26f
-B8cLA3bVdvlipe/PBQTZUhpBI3e/xEINE8ygzfUGW9cNkS0DAnFiraS3s1KzRsvS
-+rp+44zQRV83xZ91HXftl7UYI5ECyroKYVoDOBlGggHsxOBwhXyhVXuuWDwCT3dR
-HEpdMGf3UJuRPXJQbbQ=
-=jR9f
+iQIcBAEBCAAGBQJT/0KpAAoJEDuWpXgki9wHhkEP/2ow6LxtA7pPW1uLpGVeTQCN
+tItOg2kV35ji3yfC5D5utdLwD8SEqUpe/fb9YzMdkLiJiZNjcy2x7DCGvybOW6y5
+YfLRRON7JXBDTdQHZ6pYMwtnIthn2vy217oozeNzmAeUMAclLGpoyjGYpeZSU1i/
+3FPg76+68QkBNx8BkOqbitTCXdJUMNN+LrY5ikd1pLUu6PbGZYZZuM6x6OzswtJK
+7n3ntv6kdK0uNLaVSjuzoarLSSL/fcTxdETdjFJkj+xpt7cbD9rbGKgHW7kQySP5
+Kkx3BXBu90FBTFeR6FnmlnwSXlpMb9M53ZwNyWqurqt2gNgKfMZ+NyuKHlCX8dWp
+JaQ4iA5p82eMnnFJTrQONFkRccPzgplUcKW7jCPnDSkCTJcEDxcxu9UvC6M0NN1z
+YbzMO554qulBUVyKGp1zAXgMdpCYQBCwV9eCpYyg/F7Q9qyYth5Ln78qyvqDr0hR
+Mzou5xSO2BjAcUFvTMN+vlDWnYCgKS3zNrDDDTHmuQN258wTEVRnz/0P8QXm5OQ+
+kJ3nXHr4oqG6yONvxZRCSAUJ8sU/so3z8VKlgZpPBqojcRFMvbVUN920r9JdXRgl
+uTJJinfLkkNFqRwz9NDEozW2OnHO70riYdwPxspCMcpU3gxueP8AT0sCCvuu9nq+
+EXHfslk8kdqVIJ+OcNhs
+=1c4s
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild
new file mode 100644
index 0000000..7b06370
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 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}[awt] )
+	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}/include
+
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+	| newexe - 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://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.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"
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
@ 2014-09-02  4:30 Andrew John Hughes
  2014-08-07 18:41 ` Andrew John Hughes
  0 siblings, 1 reply; 10+ messages in thread
From: Andrew John Hughes @ 2014-09-02  4:30 UTC (permalink / raw
  To: gentoo-commits

commit:     08be7d8f6cf42dde49ef358b7a25af0ce2378906
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Thu Aug  7 18:40:12 2014 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Thu Aug  7 18:40:12 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=08be7d8f

Support gcc 4.9.0.

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

---
 dev-java/gcj-jdk/ChangeLog            |   8 ++-
 dev-java/gcj-jdk/Manifest             |  31 +++++-----
 dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild | 105 ++++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+), 16 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 7ee940d..f6c3896 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gcj-jdk-4.9.0 (07 Aug 2014)
+
+  07 Aug 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +gcj-jdk-4.9.0.ebuild:
+  Support gcc 4.9.0.
+
 *gcj-jdk-4.6.4 (26 Dec 2013)
 
   26 Dec 2013; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 4eafc6d..07236ad 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -6,22 +6,23 @@ AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5
 EBUILD gcj-jdk-4.6.4.ebuild 3680 SHA256 8c63f2ab224a7b39c73658cd92871ad012fcd91037dd5c9b8dc925774ab2f631 SHA512 6b5c62363400b2ed762de56e0a0921b6d90677ab21d35e3c59e8f83eeef0ebe8f069df37bb5399b92028c35d79336fe691a56d9c6b39395e2d57932c2f2b77d6 WHIRLPOOL da0f414ad5c1be2eb47b9e57697477d9de42119ea51b77e42b65fba8a0c0eb732af1465e82e6cc725b9dad52f0b34023c541750dc5968c5a0da98fafcae7cefd
 EBUILD gcj-jdk-4.7.3-r2.ebuild 3718 SHA256 a5513ece7a1efd99845b4252b234304fb71375602d68bb1110d9493c47c09721 SHA512 bbd6ddd58d17fec3cc67e39396f1922ae52ae49240c6effd1021d58e06c2c53499f034134894080eedb1f2ec7657bfbde05aeb945993b01de54cac2417fbe5cd WHIRLPOOL 5b94a0c0bf7e779fbc1fda00f1bfb01c1294a0b7b287787c404eaf682452c99e5f51525e3fa77a197ff29686e5ad2fc02e0a9510e485609d45b0e88471cc5798
 EBUILD gcj-jdk-4.8.2.ebuild 3743 SHA256 9fd0d79e3df75a6dd28aa05fbc17cebc9845b9f7d7f20443c0563cb918c7d2b5 SHA512 ad8b039e2dcd091304e03abc7a2e9117b6c78faa05fa82041ff4229019622fbdd895f60f7ae2cd7a24090e7440dff5588736ea5d44c26e51572a99f14634465b WHIRLPOOL 0b1437ceae94f01bdf0b8c54695e8d541f18f733863513b0874be3cd39445d0da1246094b4fa2701ffcfc55dd924488beb1d8a110acc884183bb588557f23aef
-MISC ChangeLog 10421 SHA256 5737c86bb8756c7d9c0b0d5191aa7e08d753f642a7a8b4068882715c7688f1ee SHA512 9b0535c9e5411440d2fb653e227e161940a6022d04e187d39aaa56d09d6066a68c5aa699099824eca7e0f62b0da62950c3be81a0b20c0c8e4ab0878df78fd097 WHIRLPOOL c690e976e0451e8f2ea1f826a5fce79872588adc1d7c80e3227e2acbfeb34809452b4ac3361d506bfefab4f9af0b6c9780152a6adfe07758ea18d9ccf9d203fd
+EBUILD gcj-jdk-4.9.0.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88
+MISC ChangeLog 10560 SHA256 0a0e13599c0ba732e9d8d6a15343984cfb76e0baac17b61c5af3359af0955a79 SHA512 3309124b3ced6d1397456d7b985d764e12f96005f9c9695c2e4853ed1a82c993c7a4c528697ddbc7c019a440fcb995cad319aff7243ac916473595a670c63a01 WHIRLPOOL 62c615518fe5d7f75984b3542e0592ce6bc9cdd3c92b34a5537884ab31a7024ecc0d64a08d7a6d4fb2530c64dd5d3ad1938d4a0ca529400a129e3c00a08fa201
 MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIbBAEBCAAGBQJSvE5gAAoJEDuWpXgki9wH9BsP907CN7DNxQgaQYlzam1p+fE+
-VDQvUnJD0Z6PE5awLhYrScaEliswHXqFfnCpe68KfQ+NCP3drjQtuqLJiW3ghzW6
-f5UItPJx9ESHzgT9O+3A6WzMOSElfzTCshMZCt0HH327WG8VO2uqMyQIF7aSuVDO
-c7mVHcuGgojUIGeHT279VhHPLgnQXNNpyoQX/OhwhVeZYqh9tqDSJmLVwBh0u734
-34AcH30vWyjRDM/6H4WbXgX10wX8F6VI2ZNWOp5U7N/dJIIBLLted9+4s8mxbvie
-q1QKgpshefepD5rqXe3szkC52fz+QHBDJ+94UZnhPbF/9U0bJV6wBcaeKz/DF9A+
-mnkvkFomzgIY+EZsWfDJBk6t+QtSphReiPmKvNxCzShrwgbpSqCSF1+LmO9CdSoX
-TZ/bui3osFeDXN0cr0jzrPxwFPy8OIcgvF3xsNXlz+2TRoQDV1VNMl2fWQQbCzzZ
-QI1zYmOAs0PhfvrFb3P5+2TX1tQ8W0hMMF3fMCSgYPGa0HP3ViSZmNFHvBcfjzwL
-ihvoOPqe7QczcpW90EFDG6Vz8kXKXKKdz8JqAClNTYGCSroIj1bdrwEAnD+658JC
-xoZl/Y0sPJCLAJxEy5DbmsmADglsFZiXmlyc2zVcnKi0JS4lhkixUxna/O7IzHpC
-U2umkLENeMdXpKY9bxo=
-=/KYe
+iQIbBAEBCAAGBQJT48gLAAoJEDuWpXgki9wHX8YP9R5FjRE/6NB8aWd0AydWazZK
+Bq5+k3kq76hJ1m7Oe3pNx5uwq11jrldP1Y67gpWdn9T7Mzhb/IJM1uG75m4to8Qe
+C8Ikjduuw2mAiyRHZ1ZtjexHucCzt8VYpbfI1dtX8IG9pQz4Xv7N6pZpFMsBqMWM
+26D4E5jXZiUfY2OdC47HVaq/uBiHEaU0t/hJikM1DPa8hdOf+cEDtcKnjkJXZGnL
+E0VitDsCtZM5PZ4zCq+py6udaOsg6fQtsKcQlpWvv/WKs08bXq/HXI0GFUATrZXt
+dXDWMFXdYDC0gzoW6w+7nrcZZV98CJfUuZ7PFUCd0vzBD1COMjGaYhJxibj/A0xC
+zuKGcqKgZDXrqBA6eLvv+5K08XMom9jONo0y1AjGTjDxP7HxnG2FmAihpShVfT/u
+rhtKCV1g6TVFo/ZW/t5YZh2kNVDSZCNwdhoxj1HIxt8f0ZDJXCazTR4dzWpe9D8L
+/b6apQq4pjzoVdLwPYXAfavYBqXO0Dwg5nVhJe+ZY+tVbmt52tOfcHFOqJcYv26f
+B8cLA3bVdvlipe/PBQTZUhpBI3e/xEINE8ygzfUGW9cNkS0DAnFiraS3s1KzRsvS
++rp+44zQRV83xZ91HXftl7UYI5ECyroKYVoDOBlGggHsxOBwhXyhVXuuWDwCT3dR
+HEpdMGf3UJuRPXJQbbQ=
+=jR9f
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild
new file mode 100644
index 0000000..7b06370
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.9.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 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}[awt] )
+	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}/include
+
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+	| newexe - 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://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.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"
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
@ 2015-03-18 15:31 Andrew John Hughes
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew John Hughes @ 2015-03-18 15:31 UTC (permalink / raw
  To: gentoo-commits

commit:     269c6df8c55f1624a601205b2976c2a188f3e77c
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Wed Mar 18 15:31:47 2015 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Wed Mar 18 15:31:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=269c6df8

Support GCC 4.9.2.

Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222

 dev-java/gcj-jdk/ChangeLog            |   8 ++-
 dev-java/gcj-jdk/Manifest             |  19 ++----
 dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild | 105 ++++++++++++++++++++++++++++++++++
 3 files changed, 117 insertions(+), 15 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index f604418..aaafcb5 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gcj-jdk-4.9.2 (18 Mar 2015)
+
+  18 Mar 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +gcj-jdk-4.9.2.ebuild:
+  Support GCC 4.9.2.
+
 *gcj-jdk-4.9.1 (28 Aug 2014)
 
   28 Aug 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 3b649cf..4beae08 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -8,22 +8,13 @@ EBUILD gcj-jdk-4.7.3-r2.ebuild 3718 SHA256 a5513ece7a1efd99845b4252b234304fb7137
 EBUILD gcj-jdk-4.8.2.ebuild 3743 SHA256 9fd0d79e3df75a6dd28aa05fbc17cebc9845b9f7d7f20443c0563cb918c7d2b5 SHA512 ad8b039e2dcd091304e03abc7a2e9117b6c78faa05fa82041ff4229019622fbdd895f60f7ae2cd7a24090e7440dff5588736ea5d44c26e51572a99f14634465b WHIRLPOOL 0b1437ceae94f01bdf0b8c54695e8d541f18f733863513b0874be3cd39445d0da1246094b4fa2701ffcfc55dd924488beb1d8a110acc884183bb588557f23aef
 EBUILD gcj-jdk-4.9.0.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88
 EBUILD gcj-jdk-4.9.1.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88
-MISC ChangeLog 10699 SHA256 5fcd36ff8280256661c8f6f862073e9e5ea27bea18d35100a4f8ca26d8591a70 SHA512 f0a0c01dfb9306fe47858c81fddc0eaa6059f08ec90aea18cbfd6005d65e85782468cc787260634fd59fa81cedf5d93857c6e0c90c10de45d13fb5b9c19748f2 WHIRLPOOL b47b8a6d20cde5de0a0768dc70fc44e60f4ad344e95e66030f1bf4430f195cbd5aaf40abf8d477f61d1d1dfd9abe16ef09c2ddb74b6f0a6b97c2da8186645aec
+EBUILD gcj-jdk-4.9.2.ebuild 3743 SHA256 40ee19687c3c76971b78f964875ee1899bef7e34c8ca949a1507f4ed0c53ca3f SHA512 7f0ed8a57f1d2dfc0e4a9658b4b84675484b22a8070fba90a14b94e177231120dbf25a5c7138ce77eeaa68506ad22ac2681f9dae459e3f172cf1859dc3a07afc WHIRLPOOL ff26f01e0ad45883e51d10154f5febc19be068ffdb93d44f85e37ef132c7499d0801485c1ff708e8f5c63061444284ab9c76c3f07fe36a4f0d3b850c92715cae
+MISC ChangeLog 10838 SHA256 eb1f68195d9241af1413e19c7d21a6853f3179f220f78c7947d2815a3fb87b74 SHA512 75a85d4a768e194c784d4773ce81f2253cf0c5f4d77e15613f9b8f9f1af54f1a61df3170c40d2576bafb7b15e19b02008835c88cdda7c8f9c6125ec2eb4a006c WHIRLPOOL 433e1593edbe22c32744eed7f8746044a55071ed518e51cfd7f2c2b3adc20f4eaa11261a9078f7b60b0857782c495a4621f8d6dfbd49fdca20ada85e65313572
 MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT/0KpAAoJEDuWpXgki9wHhkEP/2ow6LxtA7pPW1uLpGVeTQCN
-tItOg2kV35ji3yfC5D5utdLwD8SEqUpe/fb9YzMdkLiJiZNjcy2x7DCGvybOW6y5
-YfLRRON7JXBDTdQHZ6pYMwtnIthn2vy217oozeNzmAeUMAclLGpoyjGYpeZSU1i/
-3FPg76+68QkBNx8BkOqbitTCXdJUMNN+LrY5ikd1pLUu6PbGZYZZuM6x6OzswtJK
-7n3ntv6kdK0uNLaVSjuzoarLSSL/fcTxdETdjFJkj+xpt7cbD9rbGKgHW7kQySP5
-Kkx3BXBu90FBTFeR6FnmlnwSXlpMb9M53ZwNyWqurqt2gNgKfMZ+NyuKHlCX8dWp
-JaQ4iA5p82eMnnFJTrQONFkRccPzgplUcKW7jCPnDSkCTJcEDxcxu9UvC6M0NN1z
-YbzMO554qulBUVyKGp1zAXgMdpCYQBCwV9eCpYyg/F7Q9qyYth5Ln78qyvqDr0hR
-Mzou5xSO2BjAcUFvTMN+vlDWnYCgKS3zNrDDDTHmuQN258wTEVRnz/0P8QXm5OQ+
-kJ3nXHr4oqG6yONvxZRCSAUJ8sU/so3z8VKlgZpPBqojcRFMvbVUN920r9JdXRgl
-uTJJinfLkkNFqRwz9NDEozW2OnHO70riYdwPxspCMcpU3gxueP8AT0sCCvuu9nq+
-EXHfslk8kdqVIJ+OcNhs
-=1c4s
+iF4EARYIAAYFAlUJmlwACgkQz9oPmzWWQiJK5gEAelLpI3ClvkZ32n4WcMZ4xvxC
+sRm7KEZcufdtiz0fZX4BAODJMMQT3PUQ8YL0NbGv4rPBwfjnZ39ZfRpCzTe8CX0I
+=OM5e
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
new file mode 100644
index 0000000..3fa0e80
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 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}[awt] )
+	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}/include
+
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+	| newexe - 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://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.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"
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
@ 2015-06-23  4:11 Andrew John Hughes
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew John Hughes @ 2015-06-23  4:11 UTC (permalink / raw
  To: gentoo-commits

commit:     ea4cef5e077ba3c416f45ea47c4f5c797edcefba
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Tue Jun 23 04:11:01 2015 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Tue Jun 23 04:11:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=ea4cef5e

Make javadoc symlink optional and provide it using GNU Classpath. Resolves bug #465572.

Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222

 dev-java/gcj-jdk/ChangeLog                                   |  7 +++++++
 dev-java/gcj-jdk/Manifest                                    | 12 ++++++------
 .../{gcj-jdk-5.1.0.ebuild => gcj-jdk-5.1.0-r1.ebuild}        |  7 ++++---
 dev-java/gcj-jdk/metadata.xml                                |  3 +++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 51dd655..591e2b0 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.19 2015/05/21 08:50:13 chewi Exp $
 
+*gcj-jdk-5.1.0-r1 (23 Jun 2015)
+
+  23 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +gcj-jdk-5.1.0-r1.ebuild, -gcj-jdk-5.1.0.ebuild, metadata.xml:
+  Make javadoc symlink optional and provide it using GNU Classpath. Resolves bug
+  #465572.
+
   21 May 2015; James Le Cuirot <chewi@gentoo.org> -gcj-jdk-4.8.3.ebuild,
   gcj-jdk-4.8.4.ebuild:
   ~ppc keyword.

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 0141b7d..b3cd8df 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 AUX gcj-jdk.env 676 SHA256 d8c8aab55aebe15dd783e273b857da4042d5041f32d31277180b619a9715be68 SHA512 b843774ee68f82f2379fb01a7f5b482993d13cd01cefefee7dcd50292555ff2b459c81ae0c30a5837a145ed559adb62c57811790cfed6c245c37ed395ca1579a WHIRLPOOL 414b00a70a95d13a8b733c0168bb18c95487c553b76c5dff7056883e1e6d9bc23bb3dd84330504805b01930a60e05ef85a63141491203667299f0f9e268e3134
 AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8
-EBUILD gcj-jdk-5.1.0.ebuild 3773 SHA256 725d6ad92722723d9b96d252f7f780181761c458066c661767084933cafab022 SHA512 eb5a7b7197815a5d898078c288f1dfc090edb1a35a16687229580670460033570cb25e828289061a38ceddeaf3e552550de1ebc327c8b90e9aa04c2f11e4248b WHIRLPOOL 555ae67f7fa3075de88c18290c3836ad595d89d8cc1f308d9669bdefdec1605b17378a010ba26967152ec3f3e724b3ee4db530a29a3833b67e34c3a2de3cd150
-MISC ChangeLog 5553 SHA256 b0306b510152d3042dc3d690f1d7fbb38d052b95acbe4aa40f2c325a2e2f5863 SHA512 415b3a4aeb717c5908af242050a743df79a116c713060ea7068c53dfb277bf531b4a398f9f5ee0f4f4303b719a1c3ed0f2ca2ab5ff3499b7829f35a499792d06 WHIRLPOOL 747a6d5b9ab017be0a88bdc2025bbbb0a21455368de20371285cca7f48c8a240115ebd4c97d278679120fd23b74d65375bc3bd69cf363145dae567cf4892ab39
-MISC metadata.xml 420 SHA256 b939a23db890e627c3f9435964b7d4b9d9ecb0896af86b288a81d41e825c25b9 SHA512 6a9921186f1cc07e32515e9837c41a7ec1c802809b30ce8c28520d64ee3d7123c57b58c7ec57f556f7f991792b87b8605514681c4cdf5843628daa0d12b082f2 WHIRLPOOL 526bd3b1a989e90dea71b50e80cbc7c3bf899efbd1f3d8825b920ce0c572daa32c58bd6b5458345d0681feb906862f9a80873d888f744f7d7b0a1aeae6f23d1e
+EBUILD gcj-jdk-5.1.0-r1.ebuild 3841 SHA256 700766807c4e77b72ddf3e17f151e4b84d0359cda5c223a7e8ec08bf0d83830e SHA512 b1e18546a9a70f5e51a830ec7eca17b679fb3a7cfb2328c08beaf042bf58f94031b98dfd21c0a7995cff73c282aae8c95af4cd0463945a905396c6b74c85a208 WHIRLPOOL 55721cb91bb123e2a77f2c7dd9a357e74becb397b05076684765096a20c283a860a867a6a8c1d7bcad5f2caf988b18be526d3029f535b4794b6aa72095f10156
+MISC ChangeLog 5806 SHA256 349eb02bb43ba7c130ba1d4020e6285a8b8fe301ba3cbe271e31f92c426e8563 SHA512 50ce2c57f5307a13a5624740c4d00392076da9d8f86316a0fea3cc572ee18a53cb19d6d81885f5528616ecebc7ada1153ce786d712f05bac15a74900265da89a WHIRLPOOL 348ff25ea170a85bbde31fea07320ac578b98cc522d29f249d9423447152d8ef23a1949a601a71a1bae12308f0555d8dee8ea476b75f3d5a6b98e1664c49cd67
+MISC metadata.xml 511 SHA256 57c9af1c94a64c95432c9462f2a56325c1a739289b622b74ea17aca150bd374c SHA512 6618e9d5e97b6db3fafe917271970e57c3d8145865df0abcfc8dadcfcbb35a438bc9c2b47f988e1cb902eea7cec7d37b884f131f8b38bc3f5cf1c72539d38af7 WHIRLPOOL 62aa67c5119e97971397e4f6fa67f35c0a96da7d781f9b4a24f57b10bc2ae6a77b087f027d85aaf130e545b8e6985e238040ead4ced1ca1d59e25479a1bdb245
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EARYIAAYFAlV2RqYACgkQz9oPmzWWQiKqjwD9FNPe0V54+8KWgiahjkBfMx+9
-a36raJehXREWSI/EtFYA+gLiecFVc9x7gthNOA7XRZoPpoFRUpF/lQXGkJnB1b8A
-=JeKs
+iF4EARYIAAYFAlWI3FAACgkQz9oPmzWWQiITAAEAludeYxFAMBBBq0kZW3JUSjkN
+RIeI4LUoH+cbMTSBa4MA/iwHdZ5+NafYeHsLiFxID7GZxbJrJwzzTE9cd+Vx3rYH
+=QzTd
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-5.1.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild
similarity index 96%
rename from dev-java/gcj-jdk/gcj-jdk-5.1.0.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild
index a2e271a..83d7ab5 100644
--- a/dev-java/gcj-jdk/gcj-jdk-5.1.0.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 #KEYWORDS="~amd64"
 SLOT="0"
-IUSE="X"
+IUSE="javadoc X"
 
 ECJ_GCJ_SLOT="3.6"
 
@@ -21,7 +21,8 @@ ECJ_GCJ_SLOT="3.6"
 RDEPEND="
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
 	dev-lang/perl
-	~sys-devel/gcc-${PV}[gcj]"
+	~sys-devel/gcc-${PV}[gcj]
+	javadoc? ( dev-java/gnu-classpath:0[gjdoc] )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"
@@ -45,7 +46,6 @@ src_install() {
 	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
@@ -69,6 +69,7 @@ src_install() {
 	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
+	use javadoc && dosym /usr/bin/gjdoc ${gcjhome}/bin/javadoc
 
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
 		${gcjhome}/jre/lib/rt.jar

diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml
index f988aaf..33d5fc2 100644
--- a/dev-java/gcj-jdk/metadata.xml
+++ b/dev-java/gcj-jdk/metadata.xml
@@ -8,4 +8,7 @@
   <name>Andrew John Hughes</name>
 </maintainer>
 <longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
+<use>
+  <flag name="javadoc">Provide javadoc using gjdoc from GNU Classpath.</flag>
+</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
@ 2015-08-19 22:14 James Le Cuirot
  0 siblings, 0 replies; 10+ messages in thread
From: James Le Cuirot @ 2015-08-19 22:14 UTC (permalink / raw
  To: gentoo-commits

commit:     e4fccac5b851feca81411b93aa5514448ec80c00
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 22:13:38 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 22:13:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=e4fccac5

dev-java/gcj-jdk: Respect eselect-ecj, fix path prefixes, X -> awt

 * The ecj-gcj SLOT was previously hardcoded but it still used the
   version eselected at build time. Now it will resolve at runtime.
 * Paths have been fixed for prefixed systems.
 * X flag has changed to awt to better reflect what it does.

These changes have been mirrored from the main tree.

Package-Manager: portage-2.2.20.1

 ...jdk-5.1.0-r1.ebuild => gcj-jdk-5.1.0-r2.ebuild} | 24 +++++++++++-----------
 dev-java/gcj-jdk/metadata.xml                      | 21 ++++++++++---------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild
similarity index 84%
rename from dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild
index 9564287..8790c66 100644
--- a/dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-5.1.0-r2.ebuild
@@ -13,15 +13,15 @@ SRC_URI=""
 LICENSE="GPL-2"
 #KEYWORDS="~amd64"
 SLOT="0"
-IUSE="javadoc X"
+IUSE="awt javadoc"
 
-ECJ_GCJ_SLOT="3.6"
+API_DIFF_PV="5.1.0"
 
 # perl is needed for javac wrapper
 RDEPEND="
-	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-java/ecj-gcj:*
 	dev-lang/perl
-	~sys-devel/gcc-${PV}[gcj]
+	~sys-devel/gcc-${PV}[awt?,gcj]
 	javadoc? ( dev-java/gnu-classpath:0[gjdoc] )"
 DEPEND="${RDEPEND}"
 
@@ -36,6 +36,7 @@ src_install() {
 	local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1)
 	gcclib=${gcclib#"${EPREFIX}"}
 	local gcjhome="/usr/$(get_libdir)/${P}"
+	local gcjprefix="${EPREFIX}${gcjhome}"
 	local gccchost="${CHOST}"
 	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
 	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
@@ -68,7 +69,7 @@ src_install() {
 	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
+	use awt && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
 	use javadoc && dosym /usr/bin/gjdoc ${gcjhome}/bin/javadoc
 
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
@@ -78,12 +79,11 @@ src_install() {
 		${gcjhome}/lib/tools.jar
 	dosym ${gcclib}/include ${gcjhome}/include
 
-	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
 	exeinto ${gcjhome}/bin
-	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
-		-e "s#@ECJ_JAR@#${ecj_jar}#" \
-		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
-		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+	sed -e "s#@JAVA@#${gcjprefix}/bin/java#" \
+		-e "s#@ECJ_JAR@#${EPREFIX}/usr/share/eclipse-ecj/ecj.jar#" \
+		-e "s#@RT_JAR@#${gcjprefix}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjprefix}/lib/tools.jar#" \
 		"${FILESDIR}"/javac.in \
 	| newexe - javac
 	assert
@@ -96,8 +96,8 @@ pkg_postinst() {
 	# java-vm-2_pkg_postinst
 
 	ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
-	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.html"
-	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${PV}.html"
+	ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
+	ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
 	ewarn "Check for existing bugs relating to missing APIs and file"
 	ewarn "new ones at http://gcc.gnu.org/bugzilla/"
 	ewarn

diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml
index 33d5fc2..872ab53 100644
--- a/dev-java/gcj-jdk/metadata.xml
+++ b/dev-java/gcj-jdk/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<herd>proxy-maintainers</herd>
-<maintainer>
-  <email>gnu_andrew@member.fsf.org</email>
-  <name>Andrew John Hughes</name>
-</maintainer>
-<longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
-<use>
-  <flag name="javadoc">Provide javadoc using gjdoc from GNU Classpath.</flag>
-</use>
+	<herd>java</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>gnu_andrew@member.fsf.org</email>
+		<name>Andrew John Hughes</name>
+	</maintainer>
+	<longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
+	<use>
+		<flag name="awt">Install AWT libraries, needed by some GUIs (not needed to build icedtea)</flag>
+		<flag name="javadoc">Provide javadoc using gjdoc from GNU Classpath.</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2015-08-19 22:14 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-02  4:30 [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/ Andrew John Hughes
  -- strict thread matches above, loose matches on Subject: below --
2015-08-19 22:14 James Le Cuirot
2015-06-23  4:11 Andrew John Hughes
2015-03-18 15:31 Andrew John Hughes
2014-09-02  4:30 Andrew John Hughes
2014-08-07 18:41 ` Andrew John Hughes
2013-12-26 19:12 Andrew John Hughes
2013-12-26 19:12 Andrew John Hughes
2013-09-04 23:28 Andrew John Hughes
2013-09-02 21:49 Andrew John Hughes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox