moved from dev-java/oro to dev-java/jakarta-oro dependency. see #71337. introduced support for the jikes useflag

(Portage version: 2.0.51.19)

3 files changed, 25 insertions, 17 deletions

diff --git a/dev-java/radeox/ChangeLog b/dev-java/radeox/ChangeLog
index 1326b5b92a47..f9a27c5e5b41 100644
--- a/dev-java/radeox/ChangeLog
+++ b/dev-java/radeox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/radeox
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/ChangeLog,v 1.7 2004/10/22 10:02:37 absinthe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/ChangeLog,v 1.8 2005/03/29 16:18:19 luckyduck Exp $
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> radeox-1.0_beta2.ebuild:
+  moved from dev-java/oro to dev-java/jakarta-oro dependency. see #71337.
+  introduced support for the jikes useflag
 
   22 Oct 2004; Dylan Carlson <absinthe@gentoo.org> radeox-1.0_beta2.ebuild:
   Keywords ~amd64.
diff --git a/dev-java/radeox/Manifest b/dev-java/radeox/Manifest
index ceddbe71cd54..99d116779038 100644
--- a/dev-java/radeox/Manifest
+++ b/dev-java/radeox/Manifest
@@ -1,4 +1,4 @@
-MD5 a603eff1f5699fc64832cef8d304167d ChangeLog 728
+MD5 63b7ff1814663cef79fe94d31f0c3ecb ChangeLog 923
 MD5 51b360ad1459b4dae2f08ec2c406e915 metadata.xml 581
-MD5 40a9d8985fa99d3fd16bb2456df9431b radeox-1.0_beta2.ebuild 1328
+MD5 f0ce6df5fb977a52cbf2dd76fd438d64 radeox-1.0_beta2.ebuild 1391
 MD5 af5915048f26e92415eed2a0302e4184 files/digest-radeox-1.0_beta2 71
diff --git a/dev-java/radeox/radeox-1.0_beta2.ebuild b/dev-java/radeox/radeox-1.0_beta2.ebuild
index 37f0bbf44057..6087ed6ccfd3 100644
--- a/dev-java/radeox/radeox-1.0_beta2.ebuild
+++ b/dev-java/radeox/radeox-1.0_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/radeox-1.0_beta2.ebuild,v 1.6 2004/10/22 10:02:37 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/radeox-1.0_beta2.ebuild,v 1.7 2005/03/29 16:18:19 luckyduck Exp $
 
 inherit java-pkg
 
@@ -11,10 +11,14 @@ LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="doc"
-DEPEND="=dev-java/oro-2.0*
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant
+	jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/jakarta-oro-2.0*
 	=dev-java/junit-3.8*
-	=dev-java/commons-logging-1.0*
-	=dev-java/picocontainer-1.0*"
+	=dev-java/picocontainer-1.0*
+	=dev-java/commons-logging-1.0*"
 # karltk: is junit really necessary?
 S=${WORKDIR}/${PN}-1.0-BETA-2
 
@@ -24,10 +28,10 @@ src_unpack() {
 	rm -f ${S}/lib/*.jar
 	(
 		cd ${S}/lib
-		java-pkg_jar-from junit || die "Failed to link junit"
-		java-pkg_jar-from oro || die "Failed to link oro"
-		java-pkg_jar-from commons-logging || die "Failed to link commons-logging"
-		java-pkg_jar-from picocontainer || die "Failed to link picocontainer"
+		java-pkg_jar-from junit
+		java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar
+		java-pkg_jar-from commons-logging
+		java-pkg_jar-from picocontainer-1
 
 	)
 	rm -rf  ${S}/src/org/radeox/example/ \
@@ -36,10 +40,10 @@ src_unpack() {
 }
 
 src_compile() {
-	ant jar jar-api || die "Failed to build jar"
-	if use doc ; then
-		ant javadoc || die "Failed to build docs"
-	fi
+	local antflags="jar jar-api"
+	use doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compilation failed"
 }
 
 src_install() {