fix deps 74389

diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index c7ace5fcb8be45da7ab6bc96c9b1618a7fd0ef3a..97ababc6a5201fc91081301502c252a1f6fe0a8f 100644 (file)
--- a/app-benchmarks/jmeter/ChangeLog
+++ b/app-benchmarks/jmeter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/jmeter
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.14 2004/10/16 18:13:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.15 2004/12/14 16:26:48 axxo Exp $
+
+  14 Dec 2004; Thomas Matthijs <axxo@gentoo.org> jmeter-1.9.1.ebuild,
+  jmeter-2.0.1.ebuild:
+  fix deps 74389
 
   16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmeter-1.9.1.ebuild,
   jmeter-2.0.1-r1.ebuild, jmeter-2.0.1.ebuild:

diff --git a/app-benchmarks/jmeter/Manifest b/app-benchmarks/jmeter/Manifest
index 56e20de7baa5015f9bb544fad1d010e8aca03e8d..ccf9337815076b2ba6091405ae263a48394f3c0b 100644 (file)
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -2,9 +2,9 @@
 Hash: SHA1
 
 MD5 18834cd5e22f1c69c7efa25c59d2c639 jmeter-2.0.1-r1.ebuild 1884
-MD5 9336d453e6cf97d368a1d782574fa37d jmeter-2.0.1.ebuild 1132
-MD5 aac14a164c90ab641bbf162f92d02926 jmeter-1.9.1.ebuild 996
-MD5 0bb0872ffef504c080715e414f2080cb ChangeLog 2766
+MD5 85a890b693469ebb8aae400a7db3e44c jmeter-2.0.1.ebuild 1146
+MD5 887ce297c5f5969ff8b8e346af16303b jmeter-1.9.1.ebuild 1059
+MD5 f18efe87b760f9611039880b295693f0 ChangeLog 2877
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 a62f7266e5fa7c30d2b82af95a3fea55 files/digest-jmeter-1.9.1 74
 MD5 93ea369264f1330ccbcbe9b6b2da7424 files/digest-jmeter-2.0.1 74
@@ -12,7 +12,7 @@ MD5 93ea369264f1330ccbcbe9b6b2da7424 files/digest-jmeter-2.0.1-r1 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBcWTo/rLF9B432nYRAiqGAJ9oqmUuZNz1s58R2J7j8J7M72vvpwCgwduv
-Xp0oktHnxaGZHiO4bp3FyEw=
-=FDOn
+iD8DBQFBvxRm/rLF9B432nYRAvGyAJ4hiNj97VoR2b9a/s2Nv+3mjaSA/gCeJpuz
+KhKsFN3bjxhmLYx1eNkfMdI=
+=tDRy
 -----END PGP SIGNATURE-----

diff --git a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild b/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
index e25d71197cd730f43966d73837846e2d30060fce..c6f5986e94755ab3c82db49dd514dec1b277fdf6 100644 (file)
--- a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.5 2004/10/16 18:13:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.6 2004/12/14 16:26:48 axxo Exp $
 
 inherit java-pkg
 
@@ -8,6 +8,7 @@ DESCRIPTION="Load test and measure performance on HTTP/FTP services, and databas
 HOMEPAGE="http://jakarta.apache.org/jmeter/index.html"
 SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}.src.tgz"
 DEPEND=">=virtual/jdk-1.3
+       dev-java/ant
        jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jdk-1.3"
 LICENSE="Apache-1.1"
@@ -21,14 +22,14 @@ src_compile () {
        local antflags="package"
        use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
        use doc && antflags="${antflags} alldocs"
-       ant ${antflags}
+       ant ${antflags} || die "build failed"
 }
 
 src_install () {
        # Can't think of a better way to deal with this for now...
        DIROPTIONS="--mode=0775"
        dodir /opt/${PN}
-       cp -ar bin/ lib/ ${D}/opt/${PN}/
+       cp -ar bin/ lib/ ${D}/opt/${PN}/ || die "failed to install"
        dodoc README
        use doc && java-pkg_dohtml -r docs/*
 }

diff --git a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
index baa7fbaf8880801bb9936c7f474b7875c61fe604..01fbd3181e3e04cde5baf1ea6585140531a1cfe1 100644 (file)
--- a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1.ebuild,v 1.3 2004/10/16 18:13:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1.ebuild,v 1.4 2004/12/14 16:26:48 axxo Exp $
 
 inherit java-pkg
 
@@ -8,6 +8,7 @@ DESCRIPTION="Load test and measure performance on HTTP/FTP services and database
 HOMEPAGE="http://jakarta.apache.org/jmeter"
 SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
 DEPEND=">=virtual/jdk-1.3
+       dev-java/ant
        doc? ( >=dev-java/velocity-1.4 )"
        # jikes ( dev-java/jikes"
 RDEPEND=">=virtual/jdk-1.3"