diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-05-07 16:56:01 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-05-07 16:56:01 +0000 |
| commit | 49b8793251ce980361dbf9e94c8703ced8049ef5 (patch) | |
| tree | c6202f3f443e4ea72d4363a125d4f03653886964 /dev-java/xmlunit | |
| parent | New version 0.9.5, fixes bug 146956. (diff) | |
| download | gentoo-2-49b8793251ce980361dbf9e94c8703ced8049ef5.tar.gz gentoo-2-49b8793251ce980361dbf9e94c8703ced8049ef5.tar.bz2 gentoo-2-49b8793251ce980361dbf9e94c8703ced8049ef5.zip | |
Migrate to split-ant, fix compiling with java-strict.
(Portage version: 2.1.2.7)
Diffstat (limited to 'dev-java/xmlunit')
| -rw-r--r-- | dev-java/xmlunit/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/xmlunit/xmlunit-1.0-r2.ebuild | 43 |
2 files changed, 27 insertions, 21 deletions
diff --git a/dev-java/xmlunit/ChangeLog b/dev-java/xmlunit/ChangeLog index 39bfb885c57b..9e4d4d125266 100644 --- a/dev-java/xmlunit/ChangeLog +++ b/dev-java/xmlunit/ChangeLog @@ -1,6 +1,9 @@ # 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.9 2007/04/25 23:04:04 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/ChangeLog,v 1.10 2007/05/07 16:56:01 caster Exp $ + + 07 May 2007; Vlastimil Babka <caster@gentoo.org> xmlunit-1.0-r2.ebuild: + Migrate to split-ant, fix compiling with java-strict. 25 Apr 2007; Vlastimil Babka <caster@gentoo.org> -xmlunit-1.0.ebuild: Remove unused version. diff --git a/dev-java/xmlunit/xmlunit-1.0-r2.ebuild b/dev-java/xmlunit/xmlunit-1.0-r2.ebuild index 1830457b84b6..0f301ce780b7 100644 --- a/dev-java/xmlunit/xmlunit-1.0-r2.ebuild +++ b/dev-java/xmlunit/xmlunit-1.0-r2.ebuild @@ -1,9 +1,8 @@ # 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.1 2007/02/09 23:27:50 fordfrog Exp $ - -JAVA_PKG_IUSE="doc source" +# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/xmlunit-1.0-r2.ebuild,v 1.2 2007/05/07 16:56:01 caster Exp $ +JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-ant-2 DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML." @@ -12,42 +11,46 @@ HOMEPAGE="http://xmlunit.sourceforge.net/" LICENSE="BSD" SLOT="1" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="test" +IUSE="" # We depend on jdk-1.4 as tests fail with jdk > 1.4 # 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* - >=app-arch/unzip-5.50-r1 + app-arch/unzip test? ( - >=dev-java/ant-1.6 - =dev-java/junit-3.8* - dev-java/xalan + dev-java/ant-junit + dev-java/ant-trax ) - !test? ( >=dev-java/ant-core-1.6 ) - source? ( app-arch/zip )" -RDEPEND="=virtual/jre-1.4*" -EANT_BUILD_TARGET="jar" -EANT_DOC_TARGET="docs" + ${CDEPEND}" +RDEPEND="=virtual/jre-1.4* + ${CDEPEND}" -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PN}" src_unpack() { unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PN}-${PVR}-build.xml.patch - rm -f ${S}/lib/*.jar + cd "${S}" + + epatch "${FILESDIR}/${PN}-${PVR}-build.xml.patch" + rm -v ${S}/lib/*.jar || die + + java-ant_rewrite-classpath } +EANT_DOC_TARGET="docs" +EANT_GENTOO_CLASSPATH="junit" + src_test() { - eant test + ANT_TASKS="ant-junit ant-trax" eant test } src_install() { - java-pkg_newjar lib/${PN}${PV}.jar ${PN}.jar + java-pkg_newjar lib/${PN}${PV}.jar dodoc README.txt use doc && java-pkg_dojavadoc doc - use source && java-pkg_dosrc src/java/* + use source && java-pkg_dosrc src/java/org } pkg_postinst() { |