Fixed jikes deps. disabled jikes in 2.0.1 as it doesn't compile, patches are welcome on bugs.gentoo.org

4 files changed, 20 insertions, 12 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/Manifest b/app-benchmarks/jmeter/Manifest
index 0a7c45524c0e..814149530a30 100644
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -2,9 +2,9 @@
 Hash: SHA1
 
 MD5 fa7313a97cc2a647c0c96fa22e04a2c2 jmeter-2.0.1-r1.ebuild 1875
-MD5 900723f87168b8d26b7c04c258b238dd jmeter-2.0.1.ebuild 1006
-MD5 c97c686cbc6ff06da185468aad4c954d jmeter-1.9.1.ebuild 940
-MD5 ae934a07a865640d6a039074d4e9292b ChangeLog 2343
+MD5 f5390c6cb85761accdea099590ca1423 jmeter-2.0.1.ebuild 1105
+MD5 0c8c4aa91015f7b715398b876defbc58 jmeter-1.9.1.ebuild 969
+MD5 e891682361f26ace6f950742e8be8fe9 ChangeLog 2545
 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)
 
-iD8DBQFBTd7m/rLF9B432nYRApLCAJ92JVN4HBeURWw9XXQF5hILOD4ouwCfUoz1
-6uLyMsIukeEOAeQhCse5JmU=
-=vQEn
+iD8DBQFBbDIE/rLF9B432nYRAts+AJ4rBhexnEQ3xvpjkp/CGwj3+tiGtACeLM2y
+28OX1bIJ45DMVZe2KC0Rhfw=
+=/e8F
 -----END PGP SIGNATURE-----
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"