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
commit98a63de12119242886c2d06937a79672266fce02 (patch)
tree3973b668c96705964d116f3a7cd036802230a9a8 /dev-java/xmlunit
parentAdding blocker for gmpc-0.19 since the plugin API changed (bug 293287) (diff)
downloadhistorical-98a63de12119242886c2d06937a79672266fce02.tar.gz
historical-98a63de12119242886c2d06937a79672266fce02.tar.bz2
historical-98a63de12119242886c2d06937a79672266fce02.zip
Restrict tests because they fail with a 1.5+ JDK and we want to remove 1.4.
Package-Manager: portage-2.2_rc48/cvs/Linux x86_64
Diffstat (limited to 'dev-java/xmlunit')
-rw-r--r--dev-java/xmlunit/ChangeLog6
-rw-r--r--dev-java/xmlunit/Manifest4
-rw-r--r--dev-java/xmlunit/xmlunit-1.0-r2.ebuild7
3 files changed, 11 insertions, 6 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/Manifest b/dev-java/xmlunit/Manifest
index a32e4d542f5d..69179474220e 100644
--- a/dev-java/xmlunit/Manifest
+++ b/dev-java/xmlunit/Manifest
@@ -2,7 +2,7 @@ AUX xmlunit-1.0-gentoo.patch 993 RMD160 b5361f2cfe6d7455020d8b176abe3ad0358a634a
AUX xmlunit-1.0-r2-build.xml.patch 980 RMD160 92acd3a877c09592f6e77d9bd00bf932f58255f3 SHA1 57bbe252beb41d98861d5c832de3691391b17997 SHA256 d144de102440d906b58f51bd2cb62a3c6b47530e4177490e0614827e11e98b59
DIST xmlunit-1.3-src.zip 836670 RMD160 7f9c4d1467c9701a6d93cfab24cbe2a2be6d7573 SHA1 b0d05b7a67ca2343668f61c0ba0ca2eecda86746 SHA256 fe5ff18925a4b07a70d939a1211fed2c021496ac6bedaacff884c29c8d01b42f
DIST xmlunit1.0.zip 421131 RMD160 1cac117a5fb857f052d90731e110ce56f2bf78a1 SHA1 7fc03613f0534ca993c7395f3b964e3099992d5e SHA256 da85e544011fa0499b74ae9363a5130cc34c27a92349521bc4b6f25832ddee81
-EBUILD xmlunit-1.0-r2.ebuild 1659 RMD160 d328c3c4c4c38df30eff91d90fada59d48095df5 SHA1 fd8c3b6e48a509179a86b1559cc35f9cc84391b7 SHA256 e26e6ce8e318fe9aa118c3d8086ce9ab6343a4caf72d8c3ec6082dfd4bddb90d
+EBUILD xmlunit-1.0-r2.ebuild 1669 RMD160 5fbb776f78f6ed166dff37fdd3335e05b52f5557 SHA1 9a81c195f217f4a7761240324b2431d508c1dd68 SHA256 db951aca0692e6fc1577196e0dac3c8002fe347fd5289b9f9de66a8389aa5a38
EBUILD xmlunit-1.3.ebuild 1444 RMD160 b1b01be1dc89e93372c47e3163a2f201572f3261 SHA1 015513e23539f96c9a128ed5451ffc7994bd518b SHA256 8756dc566763200c124568699d3b82e57b2df643c5354a5e3e8ff7dffb723445
-MISC ChangeLog 2355 RMD160 c1484ee2893f1be409d5ed3e19eaf761b61bfe4c SHA1 32d02c251d0f8577998ca87281f2913e517cafdb SHA256 5031e3807de9d4c2d2684035911362da2fe567367113d61e3e0f0a02dc23c990
+MISC ChangeLog 2509 RMD160 d3a6c84197cc1dc4d903f50fea584c14252e8264 SHA1 e3cc0164cce29fc33fd6d8426f1a00b2df52783f SHA256 cd48b15b94796eda37764f228638a9b6c282bc9f9214d3f178c4f26e9efceada
MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
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() {