diff options
author | Petteri Räty <betelgeuse@gentoo.org> | 2008-03-05 17:10:08 +0000 |
---|---|---|
committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-03-05 17:10:08 +0000 |
commit | 1ee933004f2437225689a983a9755e571f7e25ef (patch) | |
tree | 891679a6b90c22d0f9aee6466b069221d32aedfd /dev-java/commons-logging | |
parent | Bump to avoid calling git during ebuild phases. Closes bug #212395. (diff) | |
download | gentoo-2-1ee933004f2437225689a983a9755e571f7e25ef.tar.gz gentoo-2-1ee933004f2437225689a983a9755e571f7e25ef.tar.bz2 gentoo-2-1ee933004f2437225689a983a9755e571f7e25ef.zip |
Add src_test support.
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-java/commons-logging')
-rw-r--r-- | dev-java/commons-logging/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/commons-logging/commons-logging-1.1.1.ebuild | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog index 98672d2d7e39..e1965e59c9d5 100644 --- a/dev-java/commons-logging/ChangeLog +++ b/dev-java/commons-logging/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-logging # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.59 2008/02/06 18:18:21 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.60 2008/03/05 17:10:08 betelgeuse Exp $ + + 05 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> + commons-logging-1.1.1.ebuild: + Add src_test support. 06 Feb 2008; Vlastimil Babka <caster@gentoo.org> -commons-logging-1.1-r2.ebuild, -commons-logging-1.1-r3.ebuild, diff --git a/dev-java/commons-logging/commons-logging-1.1.1.ebuild b/dev-java/commons-logging/commons-logging-1.1.1.ebuild index 1d90ee8b72a3..119f355f53f0 100644 --- a/dev-java/commons-logging/commons-logging-1.1.1.ebuild +++ b/dev-java/commons-logging/commons-logging-1.1.1.ebuild @@ -1,9 +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-logging/commons-logging-1.1.1.ebuild,v 1.1 2008/02/06 15:25:30 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1.1.ebuild,v 1.2 2008/03/05 17:10:08 betelgeuse Exp $ EAPI="1" -JAVA_PKG_IUSE="doc source" +JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-ant-2 java-osgi @@ -20,7 +20,8 @@ COMMON_DEP=" avalon-logkit? ( dev-java/avalon-logkit:1.2 ) log4j? ( dev-java/log4j:0 ) servletapi? ( java-virtuals/servlet-api:2.3 ) - avalon-framework? ( dev-java/avalon-framework:4.2 )" + avalon-framework? ( dev-java/avalon-framework:4.2 ) + test? ( dev-java/ant-junit:0 )" # ATTENTION: Add this when log4j-1.3 is out # =dev-java/log4j-1.3* RDEPEND=">=virtual/jre-1.4 @@ -30,6 +31,8 @@ DEPEND=">=virtual/jdk-1.4 S="${WORKDIR}/${P}-src/" +RESTRICT="!servletapi? ( test )" + src_unpack() { unpack ${A} cd "${S}" @@ -51,6 +54,10 @@ src_unpack() { use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties java-pkg_filter-compiler jikes ecj-3.2 + + if use test && ! use servletapi; then + eerror "Tests need use servletapi, tests not executed" + fi } EANT_BUILD_TARGET="compile" |