Revision bump to address #170058 and to use recently released jline-0.9.91 so we have one less patch to apply.

(Portage version: 2.1.2-r12)

4 files changed, 114 insertions, 1 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 0bed33d8cad3..be11540b3248 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.17 2007/03/09 13:46:32 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.18 2007/03/11 20:15:10 nichoj Exp $
+
+*jruby-0.9.8-r1 (11 Mar 2007)
+
+  11 Mar 2007; Joshua Nichols <nichoj@gentoo.org>
+  +files/jruby-0.9.8-sandbox.patch, +jruby-0.9.8-r1.ebuild:
+  Revision bump to address #170058 and to use recently released jline-0.9.91
+  so we have one less patch to apply.
 
   09 Mar 2007; Joshua Nichols <nichoj@gentoo.org> jruby-0.9.8.ebuild:
   Removed bundled jars while building.
diff --git a/dev-java/jruby/files/digest-jruby-0.9.8-r1 b/dev-java/jruby/files/digest-jruby-0.9.8-r1
new file mode 100644
index 000000000000..71a56f05491c
--- /dev/null
+++ b/dev-java/jruby/files/digest-jruby-0.9.8-r1
@@ -0,0 +1,3 @@
+MD5 cd7c531aecae4766f2e24f373faabba0 jruby-src-0.9.8.tar.gz 4671287
+RMD160 b0e7a17462d4b0ac47edb7adc1595336f1bc5a35 jruby-src-0.9.8.tar.gz 4671287
+SHA256 a85fbd888b4c4ca740e18937acb92885045b3366bcd0eea7958c432cbe279871 jruby-src-0.9.8.tar.gz 4671287
diff --git a/dev-java/jruby/files/jruby-0.9.8-sandbox.patch b/dev-java/jruby/files/jruby-0.9.8-sandbox.patch
new file mode 100644
index 000000000000..d7a436f363fa
--- /dev/null
+++ b/dev-java/jruby/files/jruby-0.9.8-sandbox.patch
@@ -0,0 +1,11 @@
+diff -ru jruby-0.9.8/build.xml jruby-0.9.8-patched/build.xml
+--- jruby-0.9.8/build.xml	2007-03-05 18:44:49.000000000 -0500
++++ jruby-0.9.8-patched/build.xml	2007-03-11 15:54:01.000000000 -0400
+@@ -137,6 +137,7 @@
+       <classpath refid="build.classpath"/>
+       <classpath path="${jruby.classes.dir}"/>
+       <sysproperty key="jruby.dump_invocations" value="${jruby.classes.dir}"/>
++      <jvmarg value="-Djruby.home=${basedir}"/>
+       <arg value="-rjava"/>
+       <arg value="${build.dir}/__empty.rb"/>
+     </java>
diff --git a/dev-java/jruby/jruby-0.9.8-r1.ebuild b/dev-java/jruby/jruby-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..38af0d43ccc7
--- /dev/null
+++ b/dev-java/jruby/jruby-0.9.8-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-0.9.8-r1.ebuild,v 1.1 2007/03/11 20:15:10 nichoj Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java based ruby interpreter implementation"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="http://dist.codehaus.org/${PN}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc source test"
+
+COMMON_DEPEND=">=dev-java/jvyaml-0.2
+	>=dev-java/jline-0.9.91
+	=dev-java/asm-2.2*
+	=dev-java/bsf-2.3*"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	!test? ( dev-java/ant-core )
+	test? (
+		dev-java/junit
+		dev-java/ant
+	)
+	source? ( app-arch/zip )
+	${COMMON_DEPEND}"
+
+EANT_DOC_TARGET="create-apidocs"
+
+# only use javac, see http://jira.codehaus.org/browse/JRUBY-675
+JAVA_PKG_FILTER_COMPILER="ecj-3.2 ecj-3.1 jikes"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# prevents /root/.jruby being created at build time with
+	# FEATURES="-userpriv"
+	# see http://bugs.gentoo.org/show_bug.cgi?id=170058
+	epatch ${FILESDIR}/${P}-sandbox.patch
+
+	cd ${S}/lib
+	rm *.jar
+
+	java-pkg_jar-from --build-only ant-core ant.jar
+	java-pkg_jar-from asm-2.2 asm.jar
+	java-pkg_jar-from asm-2.2 asm-commons.jar
+	java-pkg_jar-from bsf-2.3
+	java-pkg_jar-from jvyaml
+	java-pkg_jar-from jline
+	use test && java-pkg_jar-from --build-only junit
+}
+
+src_compile() {
+#	addpredict /root/.jruby # http://bugs.gentoo.org/show_bug.cgi?id=170058
+	eant jar $(use_doc create-apidocs) -Djruby.home=${T}/.jruby
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+
+	dodoc README COPYING COPYING.CPL COPYING.GPL COPYING.LGPL
+
+	if use doc; then
+		java-pkg_dojavadoc docs/api
+		docinto docs
+		dodoc docs/*
+	fi
+	use source && java-pkg_dosrc src/org
+	java-pkg_dolauncher ${PN} \
+		--main 'org.jruby.Main' \
+		--java_args '-Djruby.base=/usr/share/jruby -Djruby.home=/usr/share/jruby -Djruby.lib=/usr/share/jruby/lib -Djruby.script=jruby -Djruby.shell=/bin/sh'
+	newbin ${S}/bin/gem jgem
+	newbin ${S}/bin/gem_server jgem_server
+	newbin ${S}/bin/gemlock jgem_lock
+	newbin ${S}/bin/gemri jgemri
+	newbin ${S}/bin/gemwhich jgemwhich
+	newbin ${S}/bin/update_rubygems jupdate_rubygems
+#	newbin ${S}/bin/generate_yaml_index.rb jgenerate_yaml_index.rb
+	newbin ${S}/bin/index_gem_repository.rb jindex_gem_repository.rb
+	dobin ${S}/bin/jirb
+
+	dodir "/usr/share/${PN}/lib"
+	insinto "/usr/share/${PN}/lib"
+	doins -r "${S}/lib/ruby"
+}
+
+src_test() {
+	eant test
+}