Version bump, Closes #60052

5 files changed, 45 insertions, 5 deletions

diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index 013e5afdf9af..9792413e3681 100644
--- a/app-benchmarks/jmeter/ChangeLog
+++ b/app-benchmarks/jmeter/ChangeLog
@@ -1,6 +1,11 @@
 # 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.9 2004/06/24 21:28:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.10 2004/08/23 22:02:07 zx Exp $
+
+*jmeter-2.0.1 (23 Aug 2004)
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> +jmeter-2.0.1.ebuild:
+  Version bump. Closes #60052
 
   05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> jmeter-1.8.1.ebuild:
   inherit eutils due to epatch
diff --git a/app-benchmarks/jmeter/Manifest b/app-benchmarks/jmeter/Manifest
index ed87ec6073de..c6bb0a058820 100644
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -1,7 +1,9 @@
+MD5 6f56dfc61b02d23c481aa1df2cfc8b18 ChangeLog 1902
 MD5 6bb9b14e5696a27fae27031014c195a0 jmeter-1.8.1.ebuild 892
 MD5 21f1e280d3c30fbd2ffd27f1d06819f4 jmeter-1.9.1.ebuild 947
-MD5 6f56dfc61b02d23c481aa1df2cfc8b18 ChangeLog 1902
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 39ba6f903ec77a9818e377eff831a0a3 files/jmeter-1.8.1-gentoo.diff 1221
+MD5 511abf70b26948da0df1c866cf2aafb9 jmeter-2.0.1.ebuild 787
 MD5 95c741b3cec21124a6ed8ebcac8f8aef files/digest-jmeter-1.8.1 206
 MD5 a62f7266e5fa7c30d2b82af95a3fea55 files/digest-jmeter-1.9.1 74
+MD5 39ba6f903ec77a9818e377eff831a0a3 files/jmeter-1.8.1-gentoo.diff 1221
+MD5 93ea369264f1330ccbcbe9b6b2da7424 files/digest-jmeter-2.0.1 74
diff --git a/app-benchmarks/jmeter/files/digest-jmeter-2.0.1 b/app-benchmarks/jmeter/files/digest-jmeter-2.0.1
new file mode 100644
index 000000000000..a6eeedc103d4
--- /dev/null
+++ b/app-benchmarks/jmeter/files/digest-jmeter-2.0.1
@@ -0,0 +1 @@
+MD5 ba87b48f6054e03a8b0d4903dd80b4cb jakarta-jmeter-2.0.1_src.tgz 5368483
diff --git a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild b/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
index 38dc6028c31a..f6ef2abd2d99 100644
--- 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.2 2004/06/24 21:28:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.3 2004/08/23 22:02:07 zx Exp $
 
 DESCRIPTION="Load test and measure performance on HTTP/FTP services, and databases."
 HOMEPAGE="http://jakarta.apache.org/jmeter/index.html"
@@ -9,7 +9,7 @@ DEPEND=">=virtual/jdk-1.3"
 RDEPEND=">=virtual/jdk-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="doc jikes"
 
 S=${WORKDIR}/jakarta-${P}
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
new file mode 100644
index 000000000000..1e145bfd386b
--- /dev/null
+++ b/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
@@ -0,0 +1,32 @@
+# 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.1 2004/08/23 22:02:07 zx Exp $
+
+DESCRIPTION="Load test and measure performance on HTTP/FTP services and databases."
+HOMEPAGE="http://jakarta.apache.org/jmeter"
+SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
+DEPEND=">=virtual/jdk-1.3
+	doc? ( >=dev-java/velocity-1.4 )"
+RDEPEND=">=virtual/jdk-1.3"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc jikes"
+
+S=${WORKDIR}/jakarta-${P}
+
+src_compile () {
+	local antflags="package"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} docs-all"
+	use doc && cp /usr/share/velocity/lib/velocity-*.jar $S/lib
+	ant ${antflags} || die "compile problem"
+}
+
+src_install () {
+	DIROPTIONS="--mode=0775"
+	dodir /opt/${PN}
+	cp -ar bin/ lib/ printable_docs/ ${D}/opt/${PN}/
+	dodoc README
+	use doc && dohtml -r docs/*
+}