summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2009-11-17 16:55:02 +0000
committerVlastimil Babka <caster@gentoo.org>2009-11-17 16:55:02 +0000
commitbb4959c6133f82d4e560b4b7582f777d0b6a152e (patch)
treea6c700acd0ef4629133e816221c367759cd74051 /dev-java
parentAdding blocker for gmpc-0.19 since the plugin API changed (bug 293287) (diff)
downloadgentoo-2-bb4959c6133f82d4e560b4b7582f777d0b6a152e.tar.gz
gentoo-2-bb4959c6133f82d4e560b4b7582f777d0b6a152e.tar.bz2
gentoo-2-bb4959c6133f82d4e560b4b7582f777d0b6a152e.zip
Restrict tests because they fail with a 1.5+ JDK and we want to remove 1.4.
(Portage version: 2.2_rc48/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/xmlunit/ChangeLog6
-rw-r--r--dev-java/xmlunit/xmlunit-1.0-r2.ebuild7
2 files changed, 9 insertions, 4 deletions
diff --git a/dev-java/xmlunit/ChangeLog b/dev-java/xmlunit/ChangeLog
index 50ba9c47b280..20104fbe4a71 100644
--- a/dev-java/xmlunit/ChangeLog
+++ b/dev-java/xmlunit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/xmlunit
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/ChangeLog,v 1.16 2009/10/27 11:18:26 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/ChangeLog,v 1.17 2009/11/17 16:55:02 caster Exp $
+
+ 17 Nov 2009; Vlastimil Babka <caster@gentoo.org> xmlunit-1.0-r2.ebuild:
+ Restrict tests because they fail with a 1.5+ JDK and we want to remove
+ 1.4.
*xmlunit-1.3 (27 Oct 2009)
diff --git a/dev-java/xmlunit/xmlunit-1.0-r2.ebuild b/dev-java/xmlunit/xmlunit-1.0-r2.ebuild
index d72f02180624..db30d34dddc7 100644
--- a/dev-java/xmlunit/xmlunit-1.0-r2.ebuild
+++ b/dev-java/xmlunit/xmlunit-1.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/xmlunit-1.0-r2.ebuild,v 1.7 2009/10/27 11:18:26 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/xmlunit-1.0-r2.ebuild,v 1.8 2009/11/17 16:55:02 caster Exp $
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
@@ -18,9 +18,8 @@ IUSE=""
CDEPEND="=dev-java/junit-3*"
DEPEND="
app-arch/unzip
- !test? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
+ || ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
test? (
- =virtual/jdk-1.4*
dev-java/ant-junit
dev-java/ant-trax
)
@@ -28,6 +27,8 @@ DEPEND="
RDEPEND=">=virtual/jre-1.4
${CDEPEND}"
+# tests fail with 1.5 JDK
+RESTRICT="test"
S="${WORKDIR}/${PN}"
src_unpack() {