summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-04-13 09:01:32 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-04-13 09:01:32 +0000
commitf4a22769cf39eb1afcd94d6b9f41a36a8f5ce343 (patch)
tree7a172cb364e7e88d350d391a5db8019ed0438bb6
parentAdd --name to start-stop-daemon when starting amavisd-new, so baselayout2 kno... (diff)
downloadgentoo-2-f4a22769cf39eb1afcd94d6b9f41a36a8f5ce343.tar.gz
gentoo-2-f4a22769cf39eb1afcd94d6b9f41a36a8f5ce343.tar.bz2
gentoo-2-f4a22769cf39eb1afcd94d6b9f41a36a8f5ce343.zip
Migrate to splitted ant and make the src_test actually run the tests instead of just building them.
(Portage version: 2.1.2.3)
-rw-r--r--dev-java/xpp3/ChangeLog6
-rw-r--r--dev-java/xpp3/xpp3-1.1.4c.ebuild15
2 files changed, 11 insertions, 10 deletions
diff --git a/dev-java/xpp3/ChangeLog b/dev-java/xpp3/ChangeLog
index 9a0d6e4d6caf..263cca9a83e8 100644
--- a/dev-java/xpp3/ChangeLog
+++ b/dev-java/xpp3/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/xpp3
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/ChangeLog,v 1.8 2007/02/09 20:00:34 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/ChangeLog,v 1.9 2007/04/13 09:01:32 betelgeuse Exp $
+
+ 13 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> xpp3-1.1.4c.ebuild:
+ Migrate to splitted ant and make the src_test actually run the tests instead
+ of just building them.
*xpp3-1.1.4c (09 Feb 2007)
diff --git a/dev-java/xpp3/xpp3-1.1.4c.ebuild b/dev-java/xpp3/xpp3-1.1.4c.ebuild
index cc8228184560..4aaef80bbd76 100644
--- a/dev-java/xpp3/xpp3-1.1.4c.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c.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/xpp3/xpp3-1.1.4c.ebuild,v 1.1 2007/02/09 20:00:34 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/xpp3-1.1.4c.ebuild,v 1.2 2007/04/13 09:01:32 betelgeuse Exp $
JAVA_PKG_IUSE="doc source"
@@ -21,26 +21,23 @@ IUSE="test"
DEPEND=">=virtual/jdk-1.4
app-arch/unzip
test? (
- dev-java/ant
=dev-java/junit-3.8*
- )
- !test? ( dev-java/ant-core )"
+ || ( dev-java/ant-junit dev-java/ant-tasks )
+ )"
RDEPEND=">=virtual/jre-1.4"
S=${WORKDIR}/${MY_P}
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET="javadoc"
-
src_unpack() {
unpack "${A}"
cd "${S}"
- rm -f *.jar
+ rm -v *.jar || die
epatch "${FILESDIR}/${P}-build.xml.patch"
}
src_test() {
- eant -Dgentoo.classpath=$(java-pkg_getjars junit) tests_main
+ ANT_TASKS="ant-junit" \
+ eant -Dgentoo.classpath=$(java-pkg_getjars junit) junit_main
}
src_install() {