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

(Portage version: 2.1.4_rc9)

3 files changed, 24 insertions, 3 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/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