Prepare ebuild for upcoming generic src_test.

Package-Manager: portage-2.1.4.4

diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog
index e15218288394834e84cfd33fbd3d3dd9a429dc53..5ab3df510c0b7ce273115ceedf0049e9874e47b6 100644 (file)
--- 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 <betelgeuse@gentoo.org>
+  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/Manifest b/dev-java/commons-beanutils/Manifest
index 8af48760cdb34709ce22adae55df62b4d52edaa1..580533cfa089f254d3e20c687dcc3858b108fc59 100644 (file)
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -5,13 +5,13 @@ DIST commons-beanutils-1.6.1-src.tar.gz 148249 RMD160 ef18dd9abc81cdbe790318bfda
 DIST commons-beanutils-1.7.0-src.tar.gz 258835 RMD160 1a9058a79cf6dfc8e5d384af2a5cdec3dcf3184b SHA1 3c1eceae87320fe7e0eec8573fd19b8ff283d1c5 SHA256 ffe3ff9208c3eb8a9c393ee244445fc1e70bb42213bee97dc86e71704fa40076
 EBUILD commons-beanutils-1.6.1-r3.ebuild 1157 RMD160 7184d43b63910f81f248474fd2b19469f7f9db52 SHA1 489bf187ece1bb54c9c16a0c35f02205aceaef2e SHA256 7d53ad92d304b4798d7d0bfefb1ce2d61f7f8f37ed11219c249c329f36cb4070
 EBUILD commons-beanutils-1.7.0-r2.ebuild 1283 RMD160 d0e57bebba4f7520eceeb62226bb20a20dcfc2e7 SHA1 d9737c7a11372c1610aaff7bef7358e16bf550a7 SHA256 e64139f9f8f358e9aba609951b91badad4d0357f0df9631d7d0f7193c0d86da8
-EBUILD commons-beanutils-1.7.0-r3.ebuild 1208 RMD160 7f9f56b036c28a45e725d476f2f1450ae1ac74cc SHA1 899de49bac8de19e7b9afa8da29e708d473acd4e SHA256 ef73512dbebb1db31a3905d1b0d497d29b3faaec6e473088acd75a954858956f
-MISC ChangeLog 6172 RMD160 688d1ba4359df5ceee75f62699dd38e8fce33671 SHA1 8e0347772dbc15f122a46ef3a891ff0ce9b73425 SHA256 7eb4b76100ed162ba1e0bdbca585de78a1c3c20119c369df4eb37eeffc99efe0
+EBUILD commons-beanutils-1.7.0-r3.ebuild 1339 RMD160 c85b83a098764958668c0a8adffeee7c39a630f8 SHA1 83dd8a691c3547c871e4781e3a0f6cf85dab6180 SHA256 8a8c37624adb1843b61002dc994be1ff762d55ad3c36536f5d365ec0ae44b318
+MISC ChangeLog 6311 RMD160 72af285225a1135a6c962909578dcea32ffc0dbb SHA1 6dc0d00888f1c2f7be6b88f9a90bc37b27947e31 SHA256 4ddd0a536e468b0b34a8816795e9c736b8c8ddef94c9fe7df59a661d79a7cfed
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHszHicxLzpIGCsLQRArA7AJ9f06dLgn3JzfHRiEh5Czr8xP0aEQCcCv3P
-S9p9iaZCjUggUid0tUWkN9I=
-=9Hse
+iD8DBQFHzvXecxLzpIGCsLQRAg5BAJ9GO4II5mKLdctqPvGarS5V8E74tgCeIBjU
+dlR7q3EYt4GBMgh9+OPzpJQ=
+=0mJ1
 -----END PGP SIGNATURE-----

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 14768e97177cbfb11661a3fabfbdf26bec92a9c5..e1c92d438c835d09b2ab1a18988d250be81b32b4 100644 (file)
--- 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"