diff options
| -rw-r--r-- | dev-java/ant-contrib/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild | 25 | ||||
| -rw-r--r-- | dev-java/ant-contrib/files/tests-visibility.patch | 12 |
3 files changed, 38 insertions, 6 deletions
diff --git a/dev-java/ant-contrib/ChangeLog b/dev-java/ant-contrib/ChangeLog index f71316e0122c..0abbdc62a507 100644 --- a/dev-java/ant-contrib/ChangeLog +++ b/dev-java/ant-contrib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/ant-contrib # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.28 2008/01/04 20:16:17 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.29 2008/03/09 15:15:39 betelgeuse Exp $ + + 09 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> + +files/tests-visibility.patch, ant-contrib-1.0_beta2-r2.ebuild: + Use EANT_ variables and add a src_test but had to RESTRICT it because they + failed to find bcel. 04 Jan 2008; Vlastimil Babka <caster@gentoo.org> -ant-contrib-1.0_beta2-r1.ebuild: diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild index 5208e9b1d34e..9e3b334bdac0 100644 --- a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild +++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild,v 1.7 2007/11/25 10:12:01 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild,v 1.8 2008/03/09 15:15:39 betelgeuse Exp $ JAVA_PKG_IUSE="doc source" @@ -12,8 +12,9 @@ SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="doc source" +IUSE="" +# test? ( dev-java/ant-junit dev-java/ant-testutil ) RDEPEND=">=virtual/jre-1.4 >=dev-java/bcel-5.1 >=dev-java/xerces-2.7 @@ -25,14 +26,28 @@ S=${WORKDIR}/${PN} src_unpack() { unpack ${A} + cd "${S}" + epatch "${FILESDIR}/tests-visibility.patch" cd "${S}/lib" java-pkg_jar-from ant-core ant.jar java-pkg_jar-from bcel bcel.jar bcel-5.1.jar java-pkg_jar-from xerces-2 } -src_compile() { - eant jar -Dversion=${PV} $(use_doc docs) +EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true" +EANT_DOC_TARGET="docs" + +# The tests fail to find bcel and fail +RESTRICT="test" + +src_test() { + cd test/lib || die + java-pkg_jar-from junit junit.jar junit-3.8.1.jar + java-pkg_jar-from ant-testutil + cd "${S}" + local testutil=$(java-pkg_getjars ant-testutil) + EANT_TEST_EXTRA_ARGS="-Dtestutil.jar.location=${testutil}" \ + java-pkg-2_src_test } src_install() { diff --git a/dev-java/ant-contrib/files/tests-visibility.patch b/dev-java/ant-contrib/files/tests-visibility.patch new file mode 100644 index 000000000000..182a17f054e0 --- /dev/null +++ b/dev-java/ant-contrib/files/tests-visibility.patch @@ -0,0 +1,12 @@ +diff -ur ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java +--- ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java 2008-03-05 23:56:16.000000000 +0200 ++++ ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java 2008-03-05 23:56:55.000000000 +0200 +@@ -76,7 +76,7 @@ + * @param filename name of project file to run + * @exception BuildException Description of the Exception + */ +- protected void configureProject( String filename ) throws BuildException { ++ public void configureProject( String filename ) throws BuildException { + // find the build file + File f = new File( filename ); + if ( !f.exists() ) { |