From ae3ebcfb040f88afb98aa7d3a653ad8968485a53 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Wed, 20 Jun 2012 07:29:38 +0000 Subject: Use eclass src_test instead of custom one. Fixes test failures due to missing xerces deps in test classpath. #422457 (Portage version: 2.1.10.65/cvs/Linux x86_64) --- dev-java/commons-betwixt/ChangeLog | 8 ++++++-- dev-java/commons-betwixt/commons-betwixt-0.8.ebuild | 11 ++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'dev-java') diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog index e3ae89ebf1f0..d64fa1eae403 100644 --- a/dev-java/commons-betwixt/ChangeLog +++ b/dev-java/commons-betwixt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-betwixt -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.24 2010/03/20 10:53:03 betelgeuse Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.25 2012/06/20 07:29:38 sera Exp $ + + 20 Jun 2012; Ralph Sennhauser commons-betwixt-0.8.ebuild: + Use eclass src_test instead of custom one. Fixes test failures due to missing + xerces deps in test classpath. #422457 20 Mar 2010; Petteri Räty -commons-betwixt-0.7-r1.ebuild, -commons-betwixt-0.7-r2.ebuild: diff --git a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild index ea78b9d15184..4f8b339eac01 100644 --- a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild +++ b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild,v 1.7 2010/02/09 11:30:04 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild,v 1.8 2012/06/20 07:29:38 sera Exp $ EAPI=2 JAVA_PKG_IUSE="doc test source" @@ -24,7 +24,7 @@ RDEPEND=">=virtual/jre-1.4 DEPEND=">=virtual/jdk-1.4 ${COMMON_DEP} test? ( - dev-java/ant-junit + dev-java/ant-junit:0 >=dev-java/xerces-2.7:2 )" @@ -40,9 +40,10 @@ java_prepare() { epatch "${FILESDIR}/${PN}-0.8-test-dtd.patch" } +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},xerces-2" + src_test() { - java-pkg_jar-from --into target/lib xerces-2,junit - ANT_TASKS="ant-junit" eant test -DJunit.present=true + java-pkg-2_src_test } src_install() { -- cgit v1.2.3-65-gdbad