Make gcj support work with stable gcc.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 33 insertions, 7 deletions

diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest
index aa5b36deb260..8e871a3b0c52 100644
--- a/dev-java/ant-antlr/Manifest
+++ b/dev-java/ant-antlr/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ant-1.7.0-gentoo.tar.bz2 11720 RMD160 51d24f2c0c98195ed6ef1852045201a567a5d9ea SHA1 41acb8398a5ac9713dec30d6305b5abc6c014fff SHA256 7b1e0c63bec193c010c3fcca7a3524e2e35cc4ca56b86e4571737ac1e169e35c
 DIST ant-1.7.1-gentoo.tar.bz2 11836 RMD160 9194996b5b04113d2a6542221890e1ef3f7953d0 SHA1 ef848268ec2b7ecd9aca2f8a3d6705ec8386a621 SHA256 4bacd711cc4981272b8377335dafcb8841dd1fac177c0c349f3faf78b0354fe5
 DIST apache-ant-1.7.0-src.tar.bz2 6831017 RMD160 e18ecde1996401f03529d80d2b6f3be2c55e64ab SHA1 3f01c35265ba50a49caafe1fb34ec8998bf45eb3 SHA256 a6698e8420f6d1cefd9e02c5a6b610b84495a3f9bfe1fc9e1b4fe8a8769e3779
 DIST apache-ant-1.7.1-src.tar.bz2 6979386 RMD160 09ff510a9801c734689db23e66ccf353b7361824 SHA1 8a468d3ce1e84739a78f779770416a8bd502eaf5 SHA256 4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6
 EBUILD ant-antlr-1.7.0.ebuild 541 RMD160 50e3f08847fcf148d6b4adc72c41a214e49065ff SHA1 be0bf68e19748089c80ab61a236f98968e8f416f SHA256 73287efd44aa3512e4823b7e2c59505b114da228c664a704602bc66b68f29ee8
-EBUILD ant-antlr-1.7.1.ebuild 481 RMD160 5b5036ce796fac3988728e105f8279f31394d081 SHA1 76ca0fbcc5a16bcbd5bbd49dd55e181f80095ca5 SHA256 fc54d74c8c73d9a1b92a2310336d6bc5e23c8b9f9195f6c0f5e30b370c40a5f5
-MISC ChangeLog 1521 RMD160 cea8d1a2fefb93918d77f1b86cfc4a562aa2d187 SHA1 42e84558c0fdb8621a7bce5bc2f65f6d2ac62a17 SHA256 a744687485bead9cd61edebb3c8c23eba10dbc38b39e6e2722aeb7e8a6f636dc
+EBUILD ant-antlr-1.7.1.ebuild 488 RMD160 1cacb6565714a0840fc362758b69b9dfc39c6896 SHA1 ec6cf478f858208eae2a79ee38890c8cd6ffa4fc SHA256 197802a39b404437bac41f2b1a88c0af57feed70b70a91d5c5d5eebebaeb65b0
+MISC ChangeLog 1652 RMD160 9ac4a363f6030907d4efd8c209ae045835a98ff1 SHA1 032f69cfba9d44a9e588b514d425981fcf7bcdce SHA256 d961aa24efb2fc5032489bfcd67b765d45030038a8e2e3c25ea4744c59263649
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjeH0AACgkQcxLzpIGCsLTFEQCbBwEkPTPjedLJ+TZ6yISJRwaj
+TNcAmwe017t4KNSUnM0u5gcc76BdxGOJ
+=eQ9w
+-----END PGP SIGNATURE-----
diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index 06d9538b77e6..659c7295fd0a 100644
--- a/dev-java/eclipse-ecj/ChangeLog
+++ b/dev-java/eclipse-ecj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/eclipse-ecj
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.45 2008/09/17 21:53:57 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.46 2008/09/27 11:53:45 betelgeuse Exp $
+
+  27 Sep 2008; Petteri Räty <betelgeuse@gentoo.org>
+  eclipse-ecj-3.4-r2.ebuild:
+  Make gcj support work with stable gcc.
 
   17 Sep 2008; Vlastimil Babka <caster@gentoo.org>
   eclipse-ecj-3.4-r2.ebuild:
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index cad83198ab57..9792e850d909 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX compiler-settings-3.2 258 RMD160 40710ab16453db1f23433a9e74637662e917c159 SHA1 28f78c5e169bfdc6f81441d96e3734c9eeed80db SHA256 ca705f626f3871697afc65b90f7844479b8846d8e969e4ead107615a0ef168e9
 AUX ecj-3.3 290 RMD160 2dfe9771f0b905052a9ae37a0dba84d0041288de SHA1 15167ae40c53c6a19fcce2f66502ebbf87509826 SHA256 d24c6dcd12a59ca9ba8d90cb7ff1f3dbc45fbef2ae1f277194465ebd063c8fa4
 AUX ecj-3.4 213 RMD160 ca988aa4ae8965b5f8c41e0dbcf87d3f7e86d07a SHA1 55a308d8deb46bfe05e49ee095776ba89ce23f3f SHA256 5e56e4bdda1f90000fe157fd82083d36b8affd7258c694e797f2c54b01eb6d53
@@ -10,6 +13,13 @@ EBUILD eclipse-ecj-3.2.2-r1.ebuild 1938 RMD160 1cc06ba577b62a9a2f209bb5a1922461f
 EBUILD eclipse-ecj-3.2.2.ebuild 1748 RMD160 674dc05a876d7b1a5f747724073b14b2bafd2740 SHA1 5baadf0d4f942da73df50537cbf4671531093ec8 SHA256 ea0266803ab75a56bf686d05f4d7a25224149db2b58a0264fc7fff945deb15e5
 EBUILD eclipse-ecj-3.3.0-r2.ebuild 1900 RMD160 4ca7823028f4e2afbc9c62d1b3bdc82ddf01e9d7 SHA1 70e2a170c65d0868121ca6d825dd124a0728805e SHA256 5b7ff6c71169b9388f98a1e71a2f46084634ea068311e9e9023eeec63062b6e0
 EBUILD eclipse-ecj-3.3.0-r3.ebuild 2126 RMD160 42f36a30477d8c2c3c3267df25b07df2fac1ecec SHA1 e9277bbbc9de8d9105b17c70e190f32ea5acd011 SHA256 46db80c32e4fed9635061f7b4e556432b1115eee13fdbe6c7ee75e86240b638c
-EBUILD eclipse-ecj-3.4-r2.ebuild 3262 RMD160 8c33fec7e97b2e8dccde8b4d91e779fd6ec62c20 SHA1 0e5c23b12e90d2ea43b6b422c36ae4c2059e240e SHA256 a2cc5d53c3f97f5d6e1ce544918ff3d7d43de76cca76d04b9e68e87eb1d2fff7
-MISC ChangeLog 6791 RMD160 2a24886b164df6cf2bcbbff22db25924b719218b SHA1 1234645883dcc2bd50f602949084e3f93f392c46 SHA256 ad25bcfcfdee7a250fa3bee29e489f24084ca2920ec915dd9414fee96c896079
+EBUILD eclipse-ecj-3.4-r2.ebuild 3380 RMD160 787b3c2ce66f0babfb54a7a160a358a332bdec73 SHA1 20b88632da839ad93ba0b995feba3b48b9771007 SHA256 eac8f5932b3e6f4d4c60f26d6620a3ef566cb8b3d33f41f02bee18f17e4c9b4e
+MISC ChangeLog 6919 RMD160 2bd555c8d2153aa832895dfbb27549ff25c38c8a SHA1 6112d5e23ca09d9da6a7629c651c202a077f937b SHA256 2f7d7c9231ab413a8236b983ea64fafdafd277977a33cbcaa9ebaa208627c167
 MISC metadata.xml 471 RMD160 a7f40a047de904e4e2f63fce4ae9377a36b66fa0 SHA1 c855f10cc8e043bcd1e59b48d570053304a66f49 SHA256 229f3cffb80ccec1b7c3ddff609d045bd11f8004724bcb9de5d3bf9104a37d20
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjeHtMACgkQcxLzpIGCsLSPJACfcOLY1eGUnTnFPWaUJ9XfE2Hq
+Q00AoJChsgmkICizUES0L604YxTGXYl8
+=8BeP
+-----END PGP SIGNATURE-----
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild
index f69c0ffdb2bc..c8fef8263fc6 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild,v 1.2 2008/09/17 21:53:57 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild,v 1.3 2008/09/27 11:53:45 betelgeuse Exp $
 
 inherit java-pkg-2
 
@@ -58,8 +58,10 @@ src_compile() {
 	if use gcj ; then
 		local gccbin="$(gcc-config -B $(ls -1r /etc/env.d/gcc/${CHOST}-* | head -1) || die)"
 		local gcj="${gccbin}/gcj"
-		javac="${gcj} -C"
+		javac="${gcj} -C -encoding ISO-8859-1"
 		jar="${gccbin}/gjar"
+		[[ -x ${jar} ]] || jar="${gccbin}/fastjar"
+		[[ -x ${jar} ]] || die "No jar found for gcc"
 		java="${gccbin}/gij"
 	else
 		javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"