diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-06-18 12:18:59 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-06-18 12:18:59 +0000 |
| commit | b9eb74c1d08d51c768499eaaabae1a69386eca60 (patch) | |
| tree | 694b7b65793fae3c660f36b80d376adda2bb91d1 /dev-java/xmlunit | |
| parent | Committing some ebuild fixes submitted by martin capitano. (diff) | |
| download | gentoo-2-b9eb74c1d08d51c768499eaaabae1a69386eca60.tar.gz gentoo-2-b9eb74c1d08d51c768499eaaabae1a69386eca60.tar.bz2 gentoo-2-b9eb74c1d08d51c768499eaaabae1a69386eca60.zip | |
Pull and build with 1.4 JDK only when USE=test as only tests fail with 1.5, not whole compile.
(Portage version: 2.1.3_rc4)
Diffstat (limited to 'dev-java/xmlunit')
| -rw-r--r-- | dev-java/xmlunit/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/xmlunit/xmlunit-1.0-r2.ebuild | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-java/xmlunit/ChangeLog b/dev-java/xmlunit/ChangeLog index 9e4d4d125266..99b69f2b0f1f 100644 --- a/dev-java/xmlunit/ChangeLog +++ b/dev-java/xmlunit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/xmlunit # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/ChangeLog,v 1.10 2007/05/07 16:56:01 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/ChangeLog,v 1.11 2007/06/18 12:18:59 caster Exp $ + + 18 Jun 2007; Vlastimil Babka <caster@gentoo.org> xmlunit-1.0-r2.ebuild: + Pull and build with 1.4 JDK only when USE=test as only tests fail with 1.5, + not whole compile. 07 May 2007; Vlastimil Babka <caster@gentoo.org> xmlunit-1.0-r2.ebuild: Migrate to split-ant, fix compiling with java-strict. diff --git a/dev-java/xmlunit/xmlunit-1.0-r2.ebuild b/dev-java/xmlunit/xmlunit-1.0-r2.ebuild index 0f301ce780b7..1bf0c9255984 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-2007 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.2 2007/05/07 16:56:01 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/xmlunit-1.0-r2.ebuild,v 1.3 2007/06/18 12:18:59 caster Exp $ JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-ant-2 @@ -16,14 +16,16 @@ IUSE="" # see http://sourceforge.net/tracker/index.php?func=detail&aid=1614984&group_id=23187&atid=377768 # Also docs cannot be built with jdk > 1.5 CDEPEND="=dev-java/junit-3*" -DEPEND="=virtual/jdk-1.4* +DEPEND=" app-arch/unzip + !test? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) ) test? ( + =virtual/jdk-1.4* dev-java/ant-junit dev-java/ant-trax ) ${CDEPEND}" -RDEPEND="=virtual/jre-1.4* +RDEPEND=">=virtual/jre-1.4 ${CDEPEND}" S="${WORKDIR}/${PN}" @@ -34,7 +36,7 @@ src_unpack() { epatch "${FILESDIR}/${PN}-${PVR}-build.xml.patch" rm -v ${S}/lib/*.jar || die - + java-ant_rewrite-classpath } |