Removed stray conditional jikes dep.

Package-Manager: portage-2.1.2_pre1-r3

3 files changed, 24 insertions, 21 deletions

diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog
index 96feba92f59d..2b8cfe486c39 100644
--- a/dev-java/mx4j/ChangeLog
+++ b/dev-java/mx4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/mx4j
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.8 2006/09/28 01:58:27 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.9 2006/09/28 20:56:24 caster Exp $
+
+  28 Sep 2006; Vlastimil Babka <caster@gentoo.org> mx4j-3.0.1-r1.ebuild:
+  Removed stray conditional jikes dep.
 
 *mx4j-3.0.1-r1 (28 Sep 2006)
 
diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
index c6ca758c0ba7..8337b7599c23 100644
--- a/dev-java/mx4j/Manifest
+++ b/dev-java/mx4j/Manifest
@@ -12,18 +12,18 @@ EBUILD mx4j-2.1.0.ebuild 1984 RMD160 94ed1ac9f0c1f4f9c0d8ac42f291009ac27741e4 SH
 MD5 577e162070ac052548f55d3370d5106c mx4j-2.1.0.ebuild 1984
 RMD160 94ed1ac9f0c1f4f9c0d8ac42f291009ac27741e4 mx4j-2.1.0.ebuild 1984
 SHA256 d637eb552ce5b269a542399a25a46164094fd262950f6791c59199e774a5102b mx4j-2.1.0.ebuild 1984
-EBUILD mx4j-3.0.1-r1.ebuild 1859 RMD160 86d20d8641d2e04654415974c7bb11db83df3406 SHA1 926eb282fb697cd6ff66b45ea1ab2fec3df7e16c SHA256 0cdbfece74096c0d21aaa0397750eb69b58b1292aa1de57661c11ca16bb99724
-MD5 c5d9e24b4caf8db035b270a92cce7e0b mx4j-3.0.1-r1.ebuild 1859
-RMD160 86d20d8641d2e04654415974c7bb11db83df3406 mx4j-3.0.1-r1.ebuild 1859
-SHA256 0cdbfece74096c0d21aaa0397750eb69b58b1292aa1de57661c11ca16bb99724 mx4j-3.0.1-r1.ebuild 1859
+EBUILD mx4j-3.0.1-r1.ebuild 1786 RMD160 e5d0bc15c88c8ad9930f473ea19e8a5fa0952a38 SHA1 16849ab2b155e70bfe16fe373eab99f53c17a510 SHA256 2eae61bbf053093279ec064412376bd00cd64a2657d25a4e5e74bcc7de528098
+MD5 7022422857f3903845af9a8203611652 mx4j-3.0.1-r1.ebuild 1786
+RMD160 e5d0bc15c88c8ad9930f473ea19e8a5fa0952a38 mx4j-3.0.1-r1.ebuild 1786
+SHA256 2eae61bbf053093279ec064412376bd00cd64a2657d25a4e5e74bcc7de528098 mx4j-3.0.1-r1.ebuild 1786
 EBUILD mx4j-3.0.1.ebuild 1988 RMD160 673b0e99f9189b4ae315b9d0525ba2b27837543e SHA1 0d7b84828750339b9f4fe9ff12821b2317907ccc SHA256 aab3b26d8fefd57aa4c40e4ec7b2b5743bbadd9bdc753ee07b1d8793bd2ea2fc
 MD5 1de85cca4be67bc79ea57133e3b1602a mx4j-3.0.1.ebuild 1988
 RMD160 673b0e99f9189b4ae315b9d0525ba2b27837543e mx4j-3.0.1.ebuild 1988
 SHA256 aab3b26d8fefd57aa4c40e4ec7b2b5743bbadd9bdc753ee07b1d8793bd2ea2fc mx4j-3.0.1.ebuild 1988
-MISC ChangeLog 1224 RMD160 928991c1d02a4d46c0281918fbd10a1eb8184593 SHA1 55cccae2844c67b8406bae1563101467c707a5ee SHA256 46507358c7a8d9f77dd0f92e7bb28ceaa38931d128ecca5ec7e61db7abe411b9
-MD5 81be2791d42a9e390ba187891e7f4345 ChangeLog 1224
-RMD160 928991c1d02a4d46c0281918fbd10a1eb8184593 ChangeLog 1224
-SHA256 46507358c7a8d9f77dd0f92e7bb28ceaa38931d128ecca5ec7e61db7abe411b9 ChangeLog 1224
+MISC ChangeLog 1337 RMD160 ea73de14590e8a20a05767afee68ed3337b4c5ed SHA1 d4176243f268ff7f94ed93a8d92de5cef34b5010 SHA256 eeb76108d6e04c387b94380811337f1398cfd71992f646ee16060117edfe560a
+MD5 609cd56eeebe64876bd802508d6d49db ChangeLog 1337
+RMD160 ea73de14590e8a20a05767afee68ed3337b4c5ed ChangeLog 1337
+SHA256 eeb76108d6e04c387b94380811337f1398cfd71992f646ee16060117edfe560a ChangeLog 1337
 MISC metadata.xml 756 RMD160 fc8a38a7f1afd54eb4c4761da3958eccca1ce56a SHA1 77c6dba4518af5234b3f9009774df80a8b4df0ce SHA256 0408b9087d726ef932597f150e1de741419993f0804c821b545c1097c8dec4e2
 MD5 7973f86372fa9120f93c1c7f5caeb4bf metadata.xml 756
 RMD160 fc8a38a7f1afd54eb4c4761da3958eccca1ce56a metadata.xml 756
diff --git a/dev-java/mx4j/mx4j-3.0.1-r1.ebuild b/dev-java/mx4j/mx4j-3.0.1-r1.ebuild
index 9b18bdb585d7..4dce5ac4e15e 100644
--- a/dev-java/mx4j/mx4j-3.0.1-r1.ebuild
+++ b/dev-java/mx4j/mx4j-3.0.1-r1.ebuild
@@ -1,18 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.1-r1.ebuild,v 1.1 2006/09/28 01:58:27 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.1-r1.ebuild,v 1.2 2006/09/28 20:56:24 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
-DESCRIPTION="MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX."
+DESCRIPTION="An Open Source implementation of the Java(TM) Management Extensions (JMX) and JMX Remote API (JSR 160) specifications."
 HOMEPAGE="http://mx4j.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.6
-	jikes? ( >=dev-java/jikes-1.21 )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3
-	dev-java/bcel
+RDEPEND="dev-java/bcel
 	dev-java/commons-logging
 	dev-java/log4j
 	=www-servers/axis-1*
@@ -21,9 +16,14 @@ RDEPEND=">=virtual/jre-1.3
 	=dev-java/gnu-javamail-1*
 	dev-java/jython
 	=dev-java/hessian-3.0.8*
-	=dev-java/burlap-3.0*
-"
-	
+	=dev-java/burlap-3.0*"
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.3
+	>=dev-java/ant-core-1.6
+	source? ( app-arch/zip )"
+RDEPEND="${RDEPEND}
+	>=virtual/jre-1.3"
+
 LICENSE="mx4j"
 SLOT="3.0"
 KEYWORDS="~amd64 ~x86"
@@ -56,7 +56,7 @@ src_install () {
 	java-pkg_dowar dist/lib/*.war
 
 	dodoc LICENSE README
-	use doc &&	java_pkg-dohtml -r dist/docs/api/*
+	use doc && java_pkg-dohtml -r dist/docs/api/*
 
 	use source && java-pkg_dosrc ${S}/src/core/*