Restrict compiler to javac which unlike ecj doesn't mind the API changes in 1.5+

Package-Manager: portage-2.1.4

3 files changed, 19 insertions, 10 deletions

diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index 01d2d0fb2fa6..6cf57409d504 100644
--- a/dev-java/icu4j/ChangeLog
+++ b/dev-java/icu4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icu4j
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.17 2008/01/11 15:11:22 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.18 2008/01/15 22:32:43 caster Exp $
+
+  15 Jan 2008; Vlastimil Babka <caster@gentoo.org> icu4j-3.6.1.ebuild:
+  Restrict compiler to javac which unlike ecj doesn't mind the API changes in
+  1.5+
 
 *icu4j-3.6.1 (11 Jan 2008)
 
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 6bf37644aa58..9fe249479a87 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -10,14 +10,14 @@ EBUILD icu4j-3.0-r1.ebuild 1103 RMD160 96ae817a6f6a98c3f300288f0ab671b0c6a0a09a
 MD5 ff05b99636d1f0306807b5da40b2a1f5 icu4j-3.0-r1.ebuild 1103
 RMD160 96ae817a6f6a98c3f300288f0ab671b0c6a0a09a icu4j-3.0-r1.ebuild 1103
 SHA256 227d9b0a26a601d3e75a40dd6987895c76263fc65cdf4117561408882c19f7e7 icu4j-3.0-r1.ebuild 1103
-EBUILD icu4j-3.6.1.ebuild 1983 RMD160 45fecdc02af634d572f941a1159c770bcb02a4b4 SHA1 d7bfca129820cfb5bbe51f947b97f22227fc517c SHA256 6a5e5f500c2db936d0da1d80fc66f474711b72368609bea0cd158130aab27b68
-MD5 47258d337cd1871d880b884f1348d9c3 icu4j-3.6.1.ebuild 1983
-RMD160 45fecdc02af634d572f941a1159c770bcb02a4b4 icu4j-3.6.1.ebuild 1983
-SHA256 6a5e5f500c2db936d0da1d80fc66f474711b72368609bea0cd158130aab27b68 icu4j-3.6.1.ebuild 1983
-MISC ChangeLog 2251 RMD160 da05cde20104e95e9c8871e6b9160a92700c010f SHA1 62bf94b0d4c8fe1372e7d9f39a9a0ec502a135dd SHA256 cae7728298817f9453e1a4a66097108d01892dd17cc4b14d102eb52608c30cf2
-MD5 3b1793985bba131808b962e0b086de20 ChangeLog 2251
-RMD160 da05cde20104e95e9c8871e6b9160a92700c010f ChangeLog 2251
-SHA256 cae7728298817f9453e1a4a66097108d01892dd17cc4b14d102eb52608c30cf2 ChangeLog 2251
+EBUILD icu4j-3.6.1.ebuild 2222 RMD160 df69c5f2a3905a294a58851b6a74dcceea347b10 SHA1 0cef8b42c4ca072ee6bc3ece262d97c6cd03af27 SHA256 b8deda99fd438c531ddd1e923ead202c65ef24b889f72fabc0b4dda1aac6f7df
+MD5 d0b7302c808b19f02e9fabd83e7c1e2a icu4j-3.6.1.ebuild 2222
+RMD160 df69c5f2a3905a294a58851b6a74dcceea347b10 icu4j-3.6.1.ebuild 2222
+SHA256 b8deda99fd438c531ddd1e923ead202c65ef24b889f72fabc0b4dda1aac6f7df icu4j-3.6.1.ebuild 2222
+MISC ChangeLog 2407 RMD160 eca4b4bc39924b54e2c85857fcbb6708e2dc6939 SHA1 70bd921c7a47b91971721204434e3d29c41181c1 SHA256 d67230b7deaa8087836bfda05b5b1bfc9547f4598208f4f590360a5d658a64f0
+MD5 a3a1e01d22362a0206019b2ee55d42ff ChangeLog 2407
+RMD160 eca4b4bc39924b54e2c85857fcbb6708e2dc6939 ChangeLog 2407
+SHA256 d67230b7deaa8087836bfda05b5b1bfc9547f4598208f4f590360a5d658a64f0 ChangeLog 2407
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
diff --git a/dev-java/icu4j/icu4j-3.6.1.ebuild b/dev-java/icu4j/icu4j-3.6.1.ebuild
index 0fefbb4a79a9..03ee29684fa4 100644
--- a/dev-java/icu4j/icu4j-3.6.1.ebuild
+++ b/dev-java/icu4j/icu4j-3.6.1.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/icu4j/icu4j-3.6.1.ebuild,v 1.2 2008/01/11 18:32:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.6.1.ebuild,v 1.3 2008/01/15 22:32:43 caster Exp $
 
 # We currently download the Javadoc documentation.
 # It could optionally be built using the Ant build file.
@@ -42,6 +42,11 @@ src_unpack() {
 }
 
 src_compile() {
+	# Classes extending CharsetICU not implementing Comparable
+	# Breaks with ecj on jdk 1.5+, javac doesn't mind - Sun's hack?
+	# Restricting to javac (didn't even care to try jikes) is better
+	# than forcing 1.4
+	java-pkg_force-compiler javac
 	eant jar || die "Compile failed"
 }