summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-08-03 15:57:40 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-08-03 15:57:40 +0000
commita7b337d8acf06ede5607f4b02800c8096d2126ca (patch)
tree4f7477f4f04e4dced5f4e20c8875235fa1c414c5 /dev-java/commons-betwixt
parentRemove monolithic ant support as split ant is stable now. (diff)
downloadgentoo-2-a7b337d8acf06ede5607f4b02800c8096d2126ca.tar.gz
gentoo-2-a7b337d8acf06ede5607f4b02800c8096d2126ca.tar.bz2
gentoo-2-a7b337d8acf06ede5607f4b02800c8096d2126ca.zip
Migrate src_test to splitted ant.
(Portage version: 2.1.3_rc9)
Diffstat (limited to 'dev-java/commons-betwixt')
-rw-r--r--dev-java/commons-betwixt/ChangeLog6
-rw-r--r--dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild18
2 files changed, 13 insertions, 11 deletions
diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog
index e918ac869b8f..e5a00019e4c1 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.12 2007/02/04 00:22:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.13 2007/08/03 15:57:40 betelgeuse Exp $
+
+ 03 Aug 2007; Petteri Räty <betelgeuse@gentoo.org>
+ commons-betwixt-0.7-r1.ebuild:
+ Migrate src_test to splitted ant.
04 Feb 2007; Vlastimil Babka <caster@gentoo.org>
-commons-betwixt-0.6-r1.ebuild:
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild
index 5ce4ed5961ce..40a308d8b8e6 100644
--- a/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild
+++ b/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild
@@ -1,6 +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/commons-betwixt/commons-betwixt-0.7-r1.ebuild,v 1.4 2007/01/20 22:03:35 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild,v 1.5 2007/08/03 15:57:40 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc test source"
inherit java-pkg-2 eutils java-ant-2
@@ -11,7 +13,7 @@ SRC_URI="mirror://apache/jakarta/commons/betwixt/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0.7"
KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="doc test source"
+IUSE=""
COMMON_DEP="
>=dev-java/commons-logging-1.0.2
@@ -21,13 +23,10 @@ RDEPEND=">=virtual/jre-1.3
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.3
${COMMON_DEP}
- !test? ( dev-java/ant-core )
test? (
- dev-java/ant
- dev-java/junit
+ dev-java/ant-junit
>=dev-java/xerces-2.7
- )
- source? ( app-arch/zip )"
+ )"
S="${WORKDIR}/${P}-src/"
@@ -42,8 +41,6 @@ src_unpack() {
java-pkg_jar-from commons-beanutils-1.7
java-pkg_jar-from commons-digester
java-pkg_jar-from commons-logging
- use test && java-pkg_jar-from --build-only xerces-2
- use test && java-pkg_jar-from --build-only junit
}
EANT_BUILD_TARGET="init jar"
@@ -60,5 +57,6 @@ src_install() {
}
src_test() {
- eant test -DJunit.present=true
+ java-pkg_jar-from --into target/lib xerces-2,junit
+ ANT_TASKS="ant-junit" eant test -DJunit.present=true
}