Improved build time dependencies. junitperf only needs ant-tasks when junit use flag...

Package-Manager: portage-2.0.53_rc6

diff --git a/dev-java/junitperf/ChangeLog b/dev-java/junitperf/ChangeLog
index 16ce85093a9245eb0c782e8d01a423908955c7cc..b63f7806deeed7c185173cec0b21a2fd5aed8228 100644 (file)
--- a/dev-java/junitperf/ChangeLog
+++ b/dev-java/junitperf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/junitperf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/ChangeLog,v 1.4 2005/05/12 16:17:10 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/ChangeLog,v 1.5 2005/10/21 16:01:43 betelgeuse Exp $
+
+  21 Oct 2005; Petteri Räty <betelgeuse@gentoo.org> junitperf-1.9.1.ebuild:
+  Improved build time dependencies. junitperf only needs ant-tasks when junit
+  use flag is on.
 
   12 May 2005; Jan Brinkmann <luckyduck@gentoo.org> junitperf-1.9.1.ebuild:
   stable on ppc, change junit and and ant-dependencies. fixes #91985

diff --git a/dev-java/junitperf/Manifest b/dev-java/junitperf/Manifest
index 0e07372f628d45857a5065bb86a5a33f89ff30e7..f5738346d27a218378b032080bd0c09cc8e0a393 100644 (file)
--- a/dev-java/junitperf/Manifest
+++ b/dev-java/junitperf/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f673e1eac03b275db269a450dfb0f501 junitperf-1.9.1.ebuild 989
-MD5 be6a9b2e86604fe423bbff4465a09a81 ChangeLog 811
-MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
+MD5 ba71522fb59d5e5d10566f2985aac3ec ChangeLog 986
 MD5 e6bd9c030c72847507dfa879c8cda062 files/digest-junitperf-1.9.1 64
+MD5 ea41b63c7f0d70932d43d366ee023faa junitperf-1.9.1.ebuild 1059
+MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC3EY9/rLF9B432nYRAvavAKC0Ea0oKWxa2ObWvUuRX4lncQfT9gCgmxPU
-P1Qa6+5oqVN9t5OpTy/2Tj4=
-=+4rv
+iD8DBQFDWREnQiJ/wx066S4RAqIKAJ0Rvhaq1bOppS6F+zNoT96E5zTWTACgizci
+OiXvyMkycrv+XMXWA214Ck4=
+=vO4G
 -----END PGP SIGNATURE-----

diff --git a/dev-java/junitperf/junitperf-1.9.1.ebuild b/dev-java/junitperf/junitperf-1.9.1.ebuild
index e568cd9976a7d6871468a9f5de3a552e94bfa24d..31a9b2fe95e8844ed6602ca7d7e15136c33237f0 100644 (file)
--- a/dev-java/junitperf/junitperf-1.9.1.ebuild
+++ b/dev-java/junitperf/junitperf-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/junitperf-1.9.1.ebuild,v 1.8 2005/07/19 00:15:43 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/junitperf-1.9.1.ebuild,v 1.9 2005/10/21 16:01:43 betelgeuse Exp $
 
 inherit java-pkg
 
@@ -13,12 +13,18 @@ KEYWORDS="x86 amd64 ppc"
 IUSE="doc jikes junit source"
 DEPEND=">=virtual/jdk-1.3
        app-arch/unzip
+       dev-java/ant-core
        jikes? ( >=dev-java/jikes-1.21 )
-       >=dev-java/junit-3.8.1
-       dev-java/ant
+       junit? ( dev-java/ant-tasks )
        source? ( app-arch/zip )"
+
 RDEPEND=">=virtual/jre-1.3"
 
+src_unpack () {
+       unpack ${A}
+       rm ${S}/lib/*.jar
+}
+
 src_compile() {
        local antflags="jar"
        use jikes && antflags="${antflags} -Dbuild.compiler=jikes"