Add patch so that tests compile with ecj. Pointed out in bug #187616.

Package-Manager: portage-2.1.4_rc9

4 files changed, 39 insertions, 14 deletions

diff --git a/dev-java/joda-time/ChangeLog b/dev-java/joda-time/ChangeLog
index ec1f43dc6a5e..19c699dd1e73 100644
--- a/dev-java/joda-time/ChangeLog
+++ b/dev-java/joda-time/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/joda-time
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/ChangeLog,v 1.30 2007/12/19 16:35:09 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/ChangeLog,v 1.31 2007/12/20 22:49:30 betelgeuse Exp $
+
+  20 Dec 2007; Petteri Räty <betelgeuse@gentoo.org> +files/1.5.1-ecj.patch,
+  joda-time-1.5.1.ebuild:
+  Add patch so that tests compile with ecj. Pointed out in bug #187616.
 
 *joda-time-1.5.1 (19 Dec 2007)
 
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index e4d9b398d7f0..c48954878c4c 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.5.1-ecj.patch 675 RMD160 3b8f13f0df14cc25eb6eaf617fdb9add44cfe241 SHA1 701ac9803d121b3affcec0b1a0fbfe2a73e72eb8 SHA256 5e328c247172f6ec88de8350614a62eb501c0bc933499e48367e7d558e10f7fb
+MD5 b37cc364e136d64e37641749ea14e8b3 files/1.5.1-ecj.patch 675
+RMD160 3b8f13f0df14cc25eb6eaf617fdb9add44cfe241 files/1.5.1-ecj.patch 675
+SHA256 5e328c247172f6ec88de8350614a62eb501c0bc933499e48367e7d558e10f7fb files/1.5.1-ecj.patch 675
 DIST joda-time-1.4-src.tar.gz 1206046 RMD160 68cd218a762cc55e5477ddc61077f83b402bf2d0 SHA1 18bc53b3e14b914dec25bfe6dba46246c6da23f1 SHA256 31b4c1a3a3ff1742d41b5b5ec69fe1b84f38cd383bdb214fe0e07fc870b47a40
 DIST joda-time-1.5-src.tar.gz 1246173 RMD160 b0a4a68be001568111f0e003e3274c984c9d4ada SHA1 66ccf5038f86ce9574de961c13d7c25340dd7836 SHA256 d7627937b5aaf7cd470988b8c36231988c6100e0432d1e268660836d09733d2a
 DIST joda-time-1.5.1-src.tar.gz 1246386 RMD160 431c1d6a36188995534d1c621f8ed15193571878 SHA1 d1d91a50966df4b1c9fc88f189af541b5578701b SHA256 8bdcf4991ad9bbfe04e407e009e61988ab1804522a6b22c7383fd3b70e360f5c
@@ -8,18 +12,18 @@ EBUILD joda-time-1.4-r1.ebuild 1919 RMD160 762c59b8f015933fd8be8a033e80352a1c5d8
 MD5 2b95d2aa58ffe3891c1947e8c14700cc joda-time-1.4-r1.ebuild 1919
 RMD160 762c59b8f015933fd8be8a033e80352a1c5d804d joda-time-1.4-r1.ebuild 1919
 SHA256 7453dfd30e4ec2164ee0712726f012d1064769e24547f81149c07eec808cc474 joda-time-1.4-r1.ebuild 1919
-EBUILD joda-time-1.5.1.ebuild 1741 RMD160 3a36d89a68502477c7c9acee0e2fe68861d5f8fd SHA1 0f0b63e65cd601c9d6694bace3aed950fd8c5baa SHA256 958983e2b163aa249f93eadc056818e8edd5b035fb4762df9aad2a3908addbbc
-MD5 e3101752b1fbe5955e668e3528301833 joda-time-1.5.1.ebuild 1741
-RMD160 3a36d89a68502477c7c9acee0e2fe68861d5f8fd joda-time-1.5.1.ebuild 1741
-SHA256 958983e2b163aa249f93eadc056818e8edd5b035fb4762df9aad2a3908addbbc joda-time-1.5.1.ebuild 1741
+EBUILD joda-time-1.5.1.ebuild 1783 RMD160 22cf9b9dbbe8f4bc2b0c8baf02ac4feef900e992 SHA1 dfadc1e99a441e59bc1ca814bf9e12136f582384 SHA256 8936670c74211c31de33d5c7d3d48402d6f2ec834f77f60309bd69edf0b7bc84
+MD5 be0d2399c16ecf026e6b2a50716fee40 joda-time-1.5.1.ebuild 1783
+RMD160 22cf9b9dbbe8f4bc2b0c8baf02ac4feef900e992 joda-time-1.5.1.ebuild 1783
+SHA256 8936670c74211c31de33d5c7d3d48402d6f2ec834f77f60309bd69edf0b7bc84 joda-time-1.5.1.ebuild 1783
 EBUILD joda-time-1.5.ebuild 1739 RMD160 d08c976f8c2179ad6c55fee56d0c7b161cac0f3c SHA1 d95882b67d571d3643222c7315e69c8960d22cc8 SHA256 1a54efbadbde540ba751d09ce9bf6040dd380a4b90081f6f9033238255a0709e
 MD5 5f7e78c2ecbd71f46c9a88cf2484accc joda-time-1.5.ebuild 1739
 RMD160 d08c976f8c2179ad6c55fee56d0c7b161cac0f3c joda-time-1.5.ebuild 1739
 SHA256 1a54efbadbde540ba751d09ce9bf6040dd380a4b90081f6f9033238255a0709e joda-time-1.5.ebuild 1739
-MISC ChangeLog 3820 RMD160 fe099e0dd1394acfd9931db41dca35e11bfe77fd SHA1 8b513eb951c3c9795a9fc4d886f3145b3a09a6d2 SHA256 da104f7f1f8727d6ed8c0207d924f115a8ad1fc0b6e1a5661575e296328ad810
-MD5 d831c347d47af3efe05a1369d3ab0cef ChangeLog 3820
-RMD160 fe099e0dd1394acfd9931db41dca35e11bfe77fd ChangeLog 3820
-SHA256 da104f7f1f8727d6ed8c0207d924f115a8ad1fc0b6e1a5661575e296328ad810 ChangeLog 3820
+MISC ChangeLog 3996 RMD160 820f4c3f5984771a237b7a21b5c60c05db1f4ef3 SHA1 bc8e1061fcb52da0a86b7b831ba19b43f296015d SHA256 30fc9debda56f36f3e1cee6a97fe4273ab15df73b0ca56643b0daa147fcebeec
+MD5 6c22d68fe1374dff62aaa7c633576a40 ChangeLog 3996
+RMD160 820f4c3f5984771a237b7a21b5c60c05db1f4ef3 ChangeLog 3996
+SHA256 30fc9debda56f36f3e1cee6a97fe4273ab15df73b0ca56643b0daa147fcebeec ChangeLog 3996
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -36,7 +40,7 @@ SHA256 b964fc2aa756c0aa6fe4231e796221458f59c5f2468ea6f86e58a9489526741e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHaUfEcxLzpIGCsLQRApFxAJ40CW6fhHQ5wbdMwI7FL6p0RoSvbACgiM7x
-pIXMdQA5TuNDr4csXAzIv20=
-=/uh4
+iD8DBQFHavGAcxLzpIGCsLQRAsR6AJ9LymDVt2WLCziDpKUugIQfYXDapgCcCYZ2
+chT5RL9XHcNaWfchtF8rVOg=
+=y9WJ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/joda-time/files/1.5.1-ecj.patch b/dev-java/joda-time/files/1.5.1-ecj.patch
new file mode 100644
index 000000000000..79f3f7863a76
--- /dev/null
+++ b/dev-java/joda-time/files/1.5.1-ecj.patch
@@ -0,0 +1,15 @@
+diff -ur joda-time-1.5.1-src.old/src/test/org/joda/time/convert/MockUnknownCalendar.java joda-time-1.5.1-src/src/test/org/joda/time/convert/MockUnknownCalendar.java
+--- joda-time-1.5.1-src.old/src/test/org/joda/time/convert/MockUnknownCalendar.java	2007-12-21 00:43:52.000000000 +0200
++++ joda-time-1.5.1-src/src/test/org/joda/time/convert/MockUnknownCalendar.java	2007-12-21 00:46:42.000000000 +0200
+@@ -34,7 +34,10 @@
+     MockUnknownCalendar(TimeZone zone) {

+         this.zone = zone;

+     }

+-    

++

++    public int compareTo(Object o) {

++        return super.compareTo((Calendar) o);

++    }

+     public long getTimeInMillis() {

+         return millis;

+     }

diff --git a/dev-java/joda-time/joda-time-1.5.1.ebuild b/dev-java/joda-time/joda-time-1.5.1.ebuild
index adb343106245..dd32ad28d088 100644
--- a/dev-java/joda-time/joda-time-1.5.1.ebuild
+++ b/dev-java/joda-time/joda-time-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/joda-time-1.5.1.ebuild,v 1.1 2007/12/19 16:35:09 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/joda-time-1.5.1.ebuild,v 1.2 2007/12/20 22:49:30 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc examples source test"
 
@@ -29,7 +29,9 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	rm -v "${S}"/*.jar || die
+	cd "${S}"
+	rm -v *.jar || die
+	epatch "${FILESDIR}/1.5.1-ecj.patch"
 }
 
 # chokes on static inner class making instance of non-static inner class