Disabled jikes support as per bug #123004.

(Portage version: 2.1_pre4-r1)

4 files changed, 15 insertions, 11 deletions

diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog
index f180aabf9fd4..d41e8b7b8694 100644
--- a/dev-java/dom4j/ChangeLog
+++ b/dev-java/dom4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/dom4j
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.28 2006/03/11 20:02:52 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.29 2006/03/14 05:00:53 nichoj Exp $
+
+  14 Mar 2006; Joshua Nichols <nichoj@gentoo.org> dom4j-1.6.1.ebuild:
+  Disabled jikes support as per bug #123004.
 
   11 Mar 2006; Michael Hanselmann <hansmi@gentoo.org> dom4j-1.6.1.ebuild:
   Stable on ppc.
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 8f8ac67166cc..3644c078c3d5 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -7,18 +7,18 @@ SHA256 9eaeb4e7847a5e409e3d70cddf2066bc29be77a31866a5a740b6aa22de0bad3a dom4j-1.
 MD5 f09885e1af374f78c781b7650d605989 dom4j-1.5.ebuild 979
 RMD160 21e9bf7b6b7747dc72ada17d98facddb5c1f9652 dom4j-1.5.ebuild 979
 SHA256 0a820e6631d3c31c5648dc2092ed4ecd0b6b758d85e37432a5c5d3e8891abd5b dom4j-1.5.ebuild 979
-MD5 4c823d2a634279b1148089ee78e9344b dom4j-1.6.1.ebuild 2195
-RMD160 46b6c7d843821f1dfcd506c5cc05dd46cfb63ed6 dom4j-1.6.1.ebuild 2195
-SHA256 249ffe99afe11b5dc52a3e854d2597ad134a829f613661632d13e568d63d3fb7 dom4j-1.6.1.ebuild 2195
+MD5 360ead574ed8ea218b94c9fc793a250f dom4j-1.6.1.ebuild 2138
+RMD160 55ae09e6bb00d71ef82db2e9f249250ba78c32cf dom4j-1.6.1.ebuild 2138
+SHA256 2e2f144a659e40715d3f816d158de694d8487ff5349b0a2140659cc2f3f70b04 dom4j-1.6.1.ebuild 2138
 MD5 48544058c2c90c92b7e7a2bd9c9de6d0 files/digest-dom4j-1.4-r1 63
 RMD160 4d462d10deac0510aaba78d8f01a286efe247fc4 files/digest-dom4j-1.4-r1 63
 SHA256 81c3e09fbde05974935c502d682da78b54e223ab4f835d41342f561d8789d8d3 files/digest-dom4j-1.4-r1 63
 MD5 08461e3c2f9380aa2a055cfb2f9865e1 files/digest-dom4j-1.5 63
 RMD160 544acfe4bbbd93ae79bb7033bbd0a74c8ff6b3c6 files/digest-dom4j-1.5 63
 SHA256 6dd5cf79a85b70a0125d03177738b8fb8e5e98fb58d1100565131280e0d5dd57 files/digest-dom4j-1.5 63
-MD5 d39295fd6f79fddbccc7d05723d49111 files/digest-dom4j-1.6.1 64
-RMD160 e3fdf5fc5d498dc221da310e0045084e4c7680a3 files/digest-dom4j-1.6.1 64
-SHA256 7b50346b57fe53da07ec328f84ccde36ad1f85c849223e3290e704891d367461 files/digest-dom4j-1.6.1 64
+MD5 291103053d94d006784aef1a70e0646c files/digest-dom4j-1.6.1 238
+RMD160 7a662cd4dad9c553d19f19d8df9ba19e44d4a3d2 files/digest-dom4j-1.6.1 238
+SHA256 daabc0a357c3f9f0cde1148c4a509c4fc7abdac6254085dd272a5c89c2671b77 files/digest-dom4j-1.6.1 238
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
diff --git a/dev-java/dom4j/dom4j-1.6.1.ebuild b/dev-java/dom4j/dom4j-1.6.1.ebuild
index 21c6f1f454ad..fd4f97a3623a 100644
--- a/dev-java/dom4j/dom4j-1.6.1.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1.ebuild,v 1.7 2006/03/11 20:02:52 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1.ebuild,v 1.8 2006/03/14 05:00:53 nichoj Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,8 @@ SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="1"
 KEYWORDS="amd64 ppc x86"
-IUSE="doc jikes source"
+# jikes disabled as per bug #123004
+IUSE="doc source"
 RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )
 	dev-java/jaxme
 	dev-java/jsr173
@@ -21,7 +22,6 @@ RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )
 	=dev-java/xerces-2*
 	dev-java/xsdlib"
 DEPEND="|| (  =virtual/jdk-1.4* =virtual/jdk-1.3* )
-	jikes? ( dev-java/jikes )
 	dev-java/ant-core
 	${RDEPEND}"
 
@@ -65,7 +65,6 @@ src_unpack() {
 src_compile() {
 	local antflags="clean package"
 	use doc && antflags="${antflags} -Dbuild.javadocs=build/doc/api javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
 	ant ${antflags} || die "Compilation failed"
 }
diff --git a/dev-java/dom4j/files/digest-dom4j-1.6.1 b/dev-java/dom4j/files/digest-dom4j-1.6.1
index b769bc4d8c00..d8185ba880ea 100644
--- a/dev-java/dom4j/files/digest-dom4j-1.6.1
+++ b/dev-java/dom4j/files/digest-dom4j-1.6.1
@@ -1 +1,3 @@
 MD5 1e7ef6d20939315714de4a8502f27b2d dom4j-1.6.1.tar.gz 9687211
+RMD160 d990d712a6b58c799366c526b32eb6c84a81e29c dom4j-1.6.1.tar.gz 9687211
+SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f dom4j-1.6.1.tar.gz 9687211