Add src_test support.

Package-Manager: portage-2.1.4.4

3 files changed, 27 insertions, 6 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/Manifest b/dev-java/commons-logging/Manifest
index 374cf3b07e80..329b34989687 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX commons-logging-1.1-gentoo.patch 927 RMD160 7504a6f319f1ca894b218d9d30641c23904f310d SHA1 79abac64e5646d62083bcd8b0b94b0eb4abca6fb SHA256 c50883be252e835335c142a6f84e0d21a32403873802eee04a89241ad0c79498
 AUX commons-logging-1.1-manifest 299 RMD160 9f2d1a8889f64a8bb23b6563d27c851a09b7adaa SHA1 3ad2a066fb45ebe6d994d27ef6d09c67b5d2536c SHA256 34a591ce9b09ae23258d1414958bb537fe85ffd421d4de97307985dcb6bbc99d
 AUX commons-logging-1.1-servletapi.patch 1988 RMD160 78c13fc15add613a1cb17d73c3a31c8ee1cc69bd SHA1 cab5198471596f46a2faae282e8c6a8f786cbf51 SHA256 836afb926d95aae2dcade9234179df3274402f19bbcc54d77a19e18af30317b3
@@ -8,6 +11,13 @@ DIST commons-logging-1.1-src.tar.gz 173556 RMD160 5764ee09a541365adee55aded1a9ba
 DIST commons-logging-1.1.1-src.tar.gz 190670 RMD160 ddf1c4efe66f13b53341ba78d0b4ba6991e5f16d SHA1 9f5197e32d8b94dfecbb13d4099063b7b2743c96 SHA256 b49a79fa78ebfae15dc46ae6f0144fee6b94ab608a25518c54609d3419909eb2
 EBUILD commons-logging-1.1-r5.ebuild 2293 RMD160 4a35efc9e573034de6930826b789ff93f75b8ab6 SHA1 e40320346f66b25cb7788db65e4e8291f726db99 SHA256 88f57d45719e33fd946edfcf165a27ee1f3f5968deb1e5ebb6c2d9b016629938
 EBUILD commons-logging-1.1-r6.ebuild 2394 RMD160 92718e0a82f74671dbfaefaeb762bf37d5c9229e SHA1 05a4836026a2b9149758da993d449cc15a41ed17 SHA256 ea8a7bf0dee9cf071051b33c770946289ed7c88ef88be02d13aeee24826564f7
-EBUILD commons-logging-1.1.1.ebuild 2414 RMD160 093522af2027a6f51a2da83305ebaade63a7016c SHA1 92779a810cf4a9b1476d42846d678d7f52689a6a SHA256 fe611ffae071a05de934a540d29393b27ab51d484f6af8315fe4808952721eaa
-MISC ChangeLog 8855 RMD160 ae7217daf8b001f2733fa828ff7a9aaaa72ce907 SHA1 64f1ddf868ca0657cc97dfdfab91dc17ef55e668 SHA256 7ac0081cfadf692d090f196cd77664121ccfbd5f63a3196e161f667e7afe3462
+EBUILD commons-logging-1.1.1.ebuild 2588 RMD160 6ce20bfce6b677c32b896cdbab8917677a34feaf SHA1 88ceae73620cc98b8bd1aee3590fe802c5afe160 SHA256 3da5ffe20f062fe1dd4e13bdbc5fcafd447654b9bf73a9271e0018e119897e32
+MISC ChangeLog 8969 RMD160 45451556d612dbe9ad975f66901fbd2e23d137df SHA1 b973fb65e45284fa7d398c4b9d38964f04a09f11 SHA256 3d482c63d71ebc9fc2441d63063d49318ebd65a7041f0c88c1ac3ff369b12176
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHztPvcxLzpIGCsLQRArbUAJ4k1+UhCK0QajIjeG36+EDrvr9BJgCfZ7E6
++3F0tm2VdZZVOzHGN4G5QQ8=
+=Gerd
+-----END PGP SIGNATURE-----
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"