From: Petteri Räty Date: Sun, 9 Mar 2008 15:15:39 +0000 (+0000) Subject: Use EANT_ variables and add a src_test but had to RESTRICT it because they failed... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5e94b07cd7fa88b68075fffe5ddf68cdc2dae269;p=gentoo.git Use EANT_ variables and add a src_test but had to RESTRICT it because they failed to find bcel. Package-Manager: portage-2.1.4.4 --- 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 + +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 -ant-contrib-1.0_beta2-r1.ebuild: diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest index 3bd1b5e75ea8..3a5d5206699f 100644 --- a/dev-java/ant-contrib/Manifest +++ b/dev-java/ant-contrib/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX tests-visibility.patch 755 RMD160 c31d22baf8876ca945b983e9d538b176d462f070 SHA1 cd6a2e4a9059a96f776b78f487056a441582e2a8 SHA256 c08c7bfc90e90b594b1e58164b3f9f37a3a37171e88ffe9d2e974d7687fb1bb4 DIST ant-contrib-1.0b2-src.tar.bz2 118216 RMD160 75a47ea59e6af1df723e48899b8e5cc124597573 SHA1 b93f62923922d9ec718239e4ecb3c1677c14a125 SHA256 29bdd00ee0df1d7b24e55b08bfff5641edf3f805e45a278641d42c0bf0ce9269 -EBUILD ant-contrib-1.0_beta2-r2.ebuild 1229 RMD160 0c92b3bbf6e3cdfef47d6f8573ed9b4e0d4c5117 SHA1 8c4d2ea7dc91b93c7c617be3e5cf5aee87980769 SHA256 63245d9221768369042aa462a5efc0abbca0082685eb6b45d7dca1f19c3ed691 -MISC ChangeLog 3840 RMD160 ed967725b453db2e8a9b55152105ecfeb11f635f SHA1 95063db30f6d6981f2f25dac362c96caa95c4cd9 SHA256 5387e46c11e77382cb618ea1010c6e6ab40202f2877f813d952bfca600ad7b08 +EBUILD ant-contrib-1.0_beta2-r2.ebuild 1667 RMD160 dbd11b256015e2af40c0c7ca96f7399f0b29b9a6 SHA1 2b2874561bd89adc9e81e2262ba5a70fe6c3d1a1 SHA256 e05b6fb5e3ceab5d3b49618d6f167b9908fde5a951808243f541aad224df9717 +MISC ChangeLog 4064 RMD160 afcaad47981f403cc6283317e3e909d2c0ba1b9c SHA1 5929662171b63e4fb5754cbb04acae0a8194203d SHA256 ea927a35293483ca12197ffb2c3636d4257d8b9ba439e6246b2524ea4e117cbf MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFH0/8mcxLzpIGCsLQRAmiyAJ9C6EjYuDndM0ugFGhtQlh2EzIjhQCaA1eu +vBI1VgJyFy85AYCesoelwzs= +=Ad7r +-----END PGP SIGNATURE----- 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() ) {