summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-10-12 19:35:23 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-10-12 19:35:23 +0000
commitc9be4982c1f8230e651122739a27ac1fca628b8c (patch)
tree660cdb6a25d0bd1e3b932f84c16a8f7618aa95c2 /app-benchmarks
parentStrip unsupported flags. (Manifest recommit) (diff)
downloadgentoo-2-c9be4982c1f8230e651122739a27ac1fca628b8c.tar.gz
gentoo-2-c9be4982c1f8230e651122739a27ac1fca628b8c.tar.bz2
gentoo-2-c9be4982c1f8230e651122739a27ac1fca628b8c.zip
Fixed jikes deps. disabled jikes in 2.0.1 as it doesn't compile, patches are welcome on bugs.gentoo.org
Diffstat (limited to 'app-benchmarks')
-rw-r--r--app-benchmarks/jmeter/ChangeLog7
-rw-r--r--app-benchmarks/jmeter/jmeter-1.9.1.ebuild5
-rw-r--r--app-benchmarks/jmeter/jmeter-2.0.1.ebuild8
3 files changed, 14 insertions, 6 deletions
diff --git a/app-benchmarks/jmeter/ChangeLog b/app-benchmarks/jmeter/ChangeLog
index ed7dd766dc7c..d4a50baa9adf 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.12 2004/09/12 19:31:41 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/ChangeLog,v 1.13 2004/10/12 19:35:23 axxo Exp $
+
+ 12 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmeter-1.9.1.ebuild,
+ jmeter-2.0.1.ebuild:
+ Fixed jikes deps. disabled jikes in 2.0.1 as it doesn't compile, patches are
+ welcome on bugs.gentoo.org
*jmeter-2.0.1-r1 (12 Sep 2004)
diff --git a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild b/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
index f6ef2abd2d99..49b6efa6fac8 100644
--- a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
@@ -1,11 +1,12 @@
# 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.3 2004/08/23 22:02:07 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.4 2004/10/12 19:35:23 axxo Exp $
DESCRIPTION="Load test and measure performance on HTTP/FTP services, and databases."
HOMEPAGE="http://jakarta.apache.org/jmeter/index.html"
SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}.src.tgz"
-DEPEND=">=virtual/jdk-1.3"
+DEPEND=">=virtual/jdk-1.3
+ jikes? ( dev-java/jikes )"
RDEPEND=">=virtual/jdk-1.3"
LICENSE="Apache-1.1"
SLOT="0"
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
index 1e145bfd386b..9a16a1a35209 100644
--- a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
@@ -1,23 +1,25 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1.ebuild,v 1.2 2004/10/12 19:35:23 axxo 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 )"
+ # jikes ( dev-java/jikes"
RDEPEND=">=virtual/jdk-1.3"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~x86"
-IUSE="doc jikes"
+IUSE="doc" # jikes"
S=${WORKDIR}/jakarta-${P}
src_compile () {
local antflags="package"
- use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+ #Does not compile with jikes, patches welcome at bugs.gentoo.org
+ #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"