moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336. added patch to make compilation with jikes possible, introduced support for the jikes and source useflag.

(Portage version: 2.0.51.19)

4 files changed, 52 insertions, 26 deletions

diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog
index 5db2b39b356d..7460930747de 100644
--- a/dev-java/castor/ChangeLog
+++ b/dev-java/castor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/castor
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.4 2005/03/23 14:42:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.5 2005/03/27 20:39:27 luckyduck Exp $
+
+  27 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/0.9.5.3-jikes.patch, castor-0.9.5.3.ebuild:
+  moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336.
+  added patch to make compilation with jikes possible, introduced support for
+  the jikes and source useflag.
 
   23 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> castor-0.9.5.3.ebuild:
   Keyworded ~sparc wrt #84992
diff --git a/dev-java/castor/Manifest b/dev-java/castor/Manifest
index 6aebf283a909..b2a19b99eb13 100644
--- a/dev-java/castor/Manifest
+++ b/dev-java/castor/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 6e5b1a001da335efc13f358f80c2c63a castor-0.9.5.3.ebuild 1778
+MD5 71804aca1e70f54972883b60cf8b5299 ChangeLog 934
 MD5 774373e19c9c08854e8d705a1756afbb metadata.xml 416
-MD5 0e79a96dcf128ce0fb5eb2d6f62fdfd7 ChangeLog 638
-MD5 b1ae419a4a3c3a94ec98fd57d5a4b545 castor-0.9.5.3.ebuild 1590
+MD5 a07a47cbd64524563caccf7a0f649553 files/0.9.5.3-jikes.patch 1316
 MD5 925da383ab0658b27587273d0f315f06 files/build-xml.patch 2859
 MD5 943c414729ed76f67dc46a6373bd6094 files/digest-castor-0.9.5.3 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCQYB2KRy60XGEcJIRAlomAKCqRZFRG3VsOLJRRPpO6FOirhFz2wCfX7XS
-aI6wb9PF0SpBE+oD1M+LIO8=
-=tytc
------END PGP SIGNATURE-----
diff --git a/dev-java/castor/castor-0.9.5.3.ebuild b/dev-java/castor/castor-0.9.5.3.ebuild
index 6d969196a459..32702eb0a8f4 100644
--- a/dev-java/castor/castor-0.9.5.3.ebuild
+++ b/dev-java/castor/castor-0.9.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.5.3.ebuild,v 1.4 2005/03/23 14:42:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.5.3.ebuild,v 1.5 2005/03/27 20:39:27 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://castor.exolab.org/"
 LICENSE="Exolab"
 KEYWORDS="~x86 ~amd64 ~sparc"
 SLOT="0.9"
-IUSE="doc"
+IUSE="doc jikes source"
 
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}"
@@ -20,18 +20,21 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/adaptx-0.9.5.3
 	>=dev-java/commons-logging-1.0.4
 	>=dev-java/oro-2.0.5
-	>=dev-java/regexp-1.3
+	=dev-java/jakarta-regexp-1.3*
 	>=dev-java/jta-1.0.1
 	>=dev-java/ldapsdk-4.1.7
 	>=dev-java/junit-3.8
 	>=dev-java/log4j-1.2.8
-	>=dev-java/jdbc2-postgresql-7.3
 	=dev-java/servletapi-2.3*
-	=dev-java/xerces-1.3*"
+	=dev-java/xerces-1.3*
+	=dev-java/jdbc2-postgresql-7.3*"
 
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-jikes.patch
+
 	cd ${S}/src
 	epatch ${FILESDIR}/build-xml.patch
 
@@ -41,14 +44,14 @@ src_unpack() {
 	java-pkg_jar-from ant-core ant.jar
 	java-pkg_jar-from commons-logging
 	java-pkg_jar-from oro
-	java-pkg_jar-from regexp
+	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
 	java-pkg_jar-from jta
 	java-pkg_jar-from junit
 	java-pkg_jar-from log4j
-	java-pkg_jar-from jdbc2-postgresql-6
 	java-pkg_jar-from servletapi-2.3
 	java-pkg_jar-from xerces-1.3
 	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
+	java-pkg_jar-from jdbc2-postgresql-5
 }
 
 
@@ -56,16 +59,14 @@ src_compile() {
 	cd ${S}/src
 
 	local antflags="jar"
-	if use doc; then
-		antflags="${antflags} javadoc"
-	fi
+	use doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "compile failed"
 }
 
 src_install() {
 	java-pkg_dojar dist/*.jar
 
-	if use doc; then
-		java-pkg_dohtml -r build/doc/javadoc/*
-	fi
+	use doc && java-pkg_dohtml -r build/doc/javadoc/*
+	use source && java-pkg_dosrc src/main/*
 }
diff --git a/dev-java/castor/files/0.9.5.3-jikes.patch b/dev-java/castor/files/0.9.5.3-jikes.patch
new file mode 100644
index 000000000000..ed5ee06e152e
--- /dev/null
+++ b/dev-java/castor/files/0.9.5.3-jikes.patch
@@ -0,0 +1,28 @@
+diff -uprN castor-0.9.5.3.orig/src/main/org/exolab/castor/xml/Namespaces.java castor-0.9.5.3/src/main/org/exolab/castor/xml/Namespaces.java
+--- castor-0.9.5.3.orig/src/main/org/exolab/castor/xml/Namespaces.java	2005-03-27 21:30:49.181296264 +0200
++++ castor-0.9.5.3/src/main/org/exolab/castor/xml/Namespaces.java	2005-03-27 21:32:44.977692536 +0200
+@@ -475,14 +475,14 @@ public final class Namespaces {

+         public static final int URI = 0;

+         public static final int PREFIX = 1;

+ 

+-        private Namespace _namespace = null;

++        private org.exolab.castor.xml.Namespaces.Namespace _namespace = null;

+         private int _returnType = URI;

+ 

+-        NamespaceEnumerator(Namespace namespace) {

++        NamespaceEnumerator(org.exolab.castor.xml.Namespaces.Namespace namespace) {

+             _namespace = namespace;

+         }

+         

+-        NamespaceEnumerator(Namespace namespace, int returnType) {

++        NamespaceEnumerator(org.exolab.castor.xml.Namespaces.Namespace namespace, int returnType) {

+             _namespace = namespace;

+             _returnType = returnType;

+         }

+@@ -505,4 +505,4 @@ public final class Namespaces {

+         

+     } //-- class: NamespaceEnumerator

+ 

+-} //-- class: Namespaces
+\ No newline at end of file
++} //-- class: Namespaces