Fix building of testcases with -source 1.4, correct ant dependency for USE=test and add --build-only for junit jar-from. Test still restricted because it fails headless. Remove 0.9.6 as nothing uses it.

(Portage version: 2.1.2_rc2-r2)

3 files changed, 30 insertions, 7 deletions

diff --git a/dev-java/glazedlists/ChangeLog b/dev-java/glazedlists/ChangeLog
index 8f4b3920e98b..d0f92eb1ad1d 100644
--- a/dev-java/glazedlists/ChangeLog
+++ b/dev-java/glazedlists/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/glazedlists
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/ChangeLog,v 1.3 2006/10/28 23:32:32 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/ChangeLog,v 1.4 2006/11/29 02:11:28 caster Exp $
+
+  29 Nov 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/glazedlists-1.5.0-tests.patch, -glazedlists-0.9.6.ebuild,
+  glazedlists-1.5.0.ebuild:
+  Fix building of testcases with -source 1.4, correct ant dependency for
+  USE=test and add --build-only for junit jar-from. Test still restricted
+  because it fails headless. Remove 0.9.6 as nothing uses it.
 
 *glazedlists-1.5.0 (28 Oct 2006)
 
diff --git a/dev-java/glazedlists/files/glazedlists-1.5.0-tests.patch b/dev-java/glazedlists/files/glazedlists-1.5.0-tests.patch
new file mode 100644
index 000000000000..f06061794422
--- /dev/null
+++ b/dev-java/glazedlists/files/glazedlists-1.5.0-tests.patch
@@ -0,0 +1,11 @@
+--- test/ca/odell/glazedlists/ThresholdListTest.java	2005-12-21 23:19:06.000000000 +0100
++++ test/ca/odell/glazedlists/ThresholdListTest.java	2006-11-29 01:30:15.000000000 +0100
+@@ -944,7 +944,7 @@
+         }

+         

+         public int evaluate(Object object) {

+-            return Integer.valueOf((String)(String)object);

++            return Integer.valueOf((String)(String)object).intValue();

+         }

+     }

+     

diff --git a/dev-java/glazedlists/glazedlists-1.5.0.ebuild b/dev-java/glazedlists/glazedlists-1.5.0.ebuild
index 35b5dde62944..7655ad43f17c 100644
--- a/dev-java/glazedlists/glazedlists-1.5.0.ebuild
+++ b/dev-java/glazedlists/glazedlists-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/glazedlists-1.5.0.ebuild,v 1.1 2006/10/28 23:32:32 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/glazedlists-1.5.0.ebuild,v 1.2 2006/11/29 02:11:28 caster Exp $
 
 # java-ant-2 not needed - build.xml sets source/target properly
 inherit java-pkg-2 eutils
@@ -15,12 +15,15 @@ KEYWORDS="~x86"
 IUSE="doc source test"
 RDEPEND=">=virtual/jre-1.4"
 DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	test? ( dev-java/junit )
+	test? (
+		dev-java/junit
+		dev-java/ant
+	)
+	!test? ( dev-java/ant-core )
 	app-arch/unzip"
 S="${WORKDIR}"
 
-# looks like tests are not 1.4 ready (expect autoboxing)
+# tests need X otherwise fail
 RESTRICT="test"
 
 src_unpack() {
@@ -32,8 +35,10 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-build.xml.patch"
 
 	if use test; then
+		# make testcases -source 1.4 friendly
+		epatch "${FILESDIR}/${P}-tests.patch"
 		cd extensions
-		java-pkg_jar-from junit junit.jar
+		java-pkg_jar-from --build-only junit junit.jar
 	fi
 }
 
@@ -46,7 +51,7 @@ src_test() {
 }
 
 src_install() {
-	java-pkg_newjar "${PN}_java14.jar" "${PN}.jar"
+	java-pkg_newjar "${PN}_java14.jar"
 	if use doc; then
 		dohtml readme.html
 		java-pkg_dohtml -r docs/api