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 | 06176468ae0fd52eaccc62ba5c08aa0e201aba28 (patch) | |
| tree | 60eb133f3ddc8dd592511c0ddab353b4ef92ddcb /dev-java/xmlunit | |
| parent | Committing some ebuild fixes submitted by martin capitano. (diff) | |
| download | historical-06176468ae0fd52eaccc62ba5c08aa0e201aba28.tar.gz historical-06176468ae0fd52eaccc62ba5c08aa0e201aba28.tar.bz2 historical-06176468ae0fd52eaccc62ba5c08aa0e201aba28.zip | |
Pull and build with 1.4 JDK only when USE=test as only tests fail with 1.5, not whole compile.
Package-Manager: portage-2.1.3_rc4
Diffstat (limited to 'dev-java/xmlunit')
| -rw-r--r-- | dev-java/xmlunit/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/xmlunit/Manifest | 16 | ||||
| -rw-r--r-- | dev-java/xmlunit/xmlunit-1.0-r2.ebuild | 10 |
3 files changed, 19 insertions, 13 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/Manifest b/dev-java/xmlunit/Manifest index ddf77bd6fae5..aff854d3f3d6 100644 --- a/dev-java/xmlunit/Manifest +++ b/dev-java/xmlunit/Manifest @@ -11,14 +11,14 @@ EBUILD xmlunit-1.0-r1.ebuild 1250 RMD160 bed7d053046f411be74339d38f52289f7707f67 MD5 24a71de70d3801b3df21fe0af5a80856 xmlunit-1.0-r1.ebuild 1250 RMD160 bed7d053046f411be74339d38f52289f7707f672 xmlunit-1.0-r1.ebuild 1250 SHA256 db1c831b3c26f4d537f42f2c6e089e7930333a69b68c581d8aff762fb9236ca2 xmlunit-1.0-r1.ebuild 1250 -EBUILD xmlunit-1.0-r2.ebuild 1524 RMD160 debb9017a8e2c3321c19e78bb4df5ce67065a4fc SHA1 597e7abdbfbfc0de8d0f82b8873c798aa82fffac SHA256 68cfc4005abb51e9f8b340c3e9e7dc910bc73fe7744be5868f0802a19df59324 -MD5 4504dcdfc538de0de2ae1ddbe3a8a9f2 xmlunit-1.0-r2.ebuild 1524 -RMD160 debb9017a8e2c3321c19e78bb4df5ce67065a4fc xmlunit-1.0-r2.ebuild 1524 -SHA256 68cfc4005abb51e9f8b340c3e9e7dc910bc73fe7744be5868f0802a19df59324 xmlunit-1.0-r2.ebuild 1524 -MISC ChangeLog 1569 RMD160 96ad9e71e3f8cc459c5b87cbc1db287bbc050cbf SHA1 7049127e327e13b772c778927839e09648e4ba94 SHA256 4b6b7a9a9eab659934c171d6f83946d126cc73f7943a85939934229dac49aaa4 -MD5 07132dcdcf6a7ef01bc1b45a3c9d1cd1 ChangeLog 1569 -RMD160 96ad9e71e3f8cc459c5b87cbc1db287bbc050cbf ChangeLog 1569 -SHA256 4b6b7a9a9eab659934c171d6f83946d126cc73f7943a85939934229dac49aaa4 ChangeLog 1569 +EBUILD xmlunit-1.0-r2.ebuild 1581 RMD160 8227023ed68ce2737781a6e17079178bcea75a04 SHA1 2efe4bba2d40a5b57e89f260b678fdb311d07d89 SHA256 b1d958c08adfcaebba640d82b71034e8490798352197deeea0fdbb9c258b6772 +MD5 80e8857ab169e017e53d8163f3ac29b1 xmlunit-1.0-r2.ebuild 1581 +RMD160 8227023ed68ce2737781a6e17079178bcea75a04 xmlunit-1.0-r2.ebuild 1581 +SHA256 b1d958c08adfcaebba640d82b71034e8490798352197deeea0fdbb9c258b6772 xmlunit-1.0-r2.ebuild 1581 +MISC ChangeLog 1743 RMD160 5445c81534836c3499f1f54f976d9fc05a9c0a06 SHA1 dc790e5fc92fbaaddd1eaabb1f1d75b68d982227 SHA256 e1be1acca85dcaa97f7e4e3213fcf076586b48d9a4a93a21ac4b533869747d63 +MD5 23159395b577f357e5de8d5f1ec29051 ChangeLog 1743 +RMD160 5445c81534836c3499f1f54f976d9fc05a9c0a06 ChangeLog 1743 +SHA256 e1be1acca85dcaa97f7e4e3213fcf076586b48d9a4a93a21ac4b533869747d63 ChangeLog 1743 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 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 } |