From 2db9f9d5a94c3d89c39e90145a1f343cd995fd50 Mon Sep 17 00:00:00 2001 From: Petteri Räty Date: Wed, 5 Mar 2008 19:34:55 +0000 Subject: Prepare ebuild for upcoming generic src_test. (Portage version: 2.1.4.4) --- dev-java/commons-beanutils/ChangeLog | 6 +++++- dev-java/commons-beanutils/commons-beanutils-1.7.0-r3.ebuild | 10 ++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'dev-java/commons-beanutils') diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog index e15218288394..5ab3df510c0b 100644 --- a/dev-java/commons-beanutils/ChangeLog +++ b/dev-java/commons-beanutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-beanutils # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.39 2008/02/13 18:07:26 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.40 2008/03/05 19:34:55 betelgeuse Exp $ + + 05 Mar 2008; Petteri Räty + commons-beanutils-1.7.0-r3.ebuild: + Prepare ebuild for upcoming generic src_test. *commons-beanutils-1.7.0-r3 (13 Feb 2008) diff --git a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r3.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r3.ebuild index 14768e97177c..e1c92d438c83 100644 --- a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r3.ebuild +++ b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r3.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0-r3.ebuild,v 1.1 2008/02/13 18:07:26 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0-r3.ebuild,v 1.2 2008/03/05 19:34:55 betelgeuse Exp $ -JAVA_PKG_IUSE="doc source" +EAPI=1 +JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-ant-2 @@ -20,7 +21,8 @@ COMMON_DEP=" >=dev-java/commons-logging-1.0.2" RDEPEND=">=virtual/jre-1.4 ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.4 +DEPEND="!test? ( >=virtual/jdk-1.4 ) + test? ( dev-java/junit:0 || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) ) ${COMMON_DEP}" S="${WORKDIR}/${P}-src" @@ -29,7 +31,7 @@ src_unpack() { unpack ${A} cd "${S}" rm -vr src/java/org/apache/commons/collections/ || die - java-ant_rewrite-classpath + JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath } EANT_GENTOO_CLASSPATH="commons-logging,commons-collections" -- cgit v1.2.3-65-gdbad