cleanup, removed old revision with a dependency to oro. marked stable on amd64.

(Portage version: 2.0.51.19)

4 files changed, 9 insertions, 52 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 7a7c236caca0..2124d17019dd 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.5 2005/03/29 14:42:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.6 2005/04/02 21:43:38 luckyduck Exp $
+
+  02 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> jruby-0.7.0-r1.ebuild,
+  -jruby-0.7.0.ebuild:
+  cleanup, removed old revision with a dependency to oro. marked stable on amd64.
 
 *jruby-0.7.0-r1 (29 Mar 2005)
 
diff --git a/dev-java/jruby/files/digest-jruby-0.7.0 b/dev-java/jruby/files/digest-jruby-0.7.0
deleted file mode 100644
index 52d8b949b064..000000000000
--- a/dev-java/jruby/files/digest-jruby-0.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59c49588b8931fa80644e0585b009aaa jruby-src-0.7.0.tar.gz 1872867
diff --git a/dev-java/jruby/jruby-0.7.0-r1.ebuild b/dev-java/jruby/jruby-0.7.0-r1.ebuild
index d8f50418c803..203ee833e684 100644
--- a/dev-java/jruby/jruby-0.7.0-r1.ebuild
+++ b/dev-java/jruby/jruby-0.7.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-0.7.0-r1.ebuild,v 1.1 2005/03/29 14:42:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-0.7.0-r1.ebuild,v 1.2 2005/04/02 21:43:38 luckyduck Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Java based ruby interpreter implementation"
 HOMEPAGE="http://jruby.sourceforge.net/"
 SRC_URI="mirror://sourceforge/jruby/${PN}-src-${PV}.tar.gz"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc examples jikes junit source"
@@ -18,7 +18,8 @@ RDEPEND=">=virtual/jre-1.4
 DEPEND="${RDEPEND}
 	>=dev-java/ant-1.4
 	jikes? ( dev-java/jikes )
-	junit? ( dev-java/junit )"
+	junit? ( dev-java/junit )
+	source? ( app-arch/zip )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-java/jruby/jruby-0.7.0.ebuild b/dev-java/jruby/jruby-0.7.0.ebuild
deleted file mode 100644
index 49525afd6fd5..000000000000
--- a/dev-java/jruby/jruby-0.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-0.7.0.ebuild,v 1.2 2005/02/05 20:47:20 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Java based ruby interpreter implementation"
-HOMEPAGE="http://jruby.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jruby/${PN}-src-${PV}.tar.gz"
-KEYWORDS="x86 ~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc jikes junit"
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/bsf-2.3*
-	=dev-java/oro-2.0*
-	=dev-java/gnu-regexp-1.1*"
-DEPEND="${RDEPEND}
-	>=dev-java/ant-1.4
-	jikes? ( dev-java/jikes )
-	junit? ( dev-java/junit )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/lib
-	rm -rf *.jar
-	java-pkg_jar-from bsf-2.3
-	java-pkg_jar-from oro
-	java-pkg_jar-from gnu-regexp-1
-	java-pkg_jar-from ant-core ant.jar
-	use junit && java-pkg_jar-from junit
-}
-
-src_compile() {
-	local antflags="jar"
-
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use junit && antflags="${antflags} test"
-	use doc && antflags="${antflags} create-apidocs"
-
-	ant ${antflags} || die "Compile Failed"
-}
-
-src_install() {
-	java-pkg_dojar ${S}/lib/jruby.jar
-	use doc && java-pkg_dohtml -r docs/api/*
-}