4 files changed, 217 insertions, 12 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 6991af10e520..c3885ece5768 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.90 2013/07/16 09:01:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.91 2013/10/24 19:32:40 tomwij Exp $
+
+*jruby-1.6.7.2-r1 (24 Oct 2013)
+*jruby-1.6.8-r1 (24 Oct 2013)
+*jruby-1.6.5.1-r1 (24 Oct 2013)
+
+  24 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +jruby-1.6.5.1-r1.ebuild,
+  +jruby-1.6.7.2-r1.ebuild, +jruby-1.6.8-r1.ebuild, -jruby-1.6.7.2.ebuild,
+  -jruby-1.6.8.ebuild:
+  Revision bumps; fixed up snakeyaml dependency to use SLOT 1.9, fixed up
+  documentation because install phase was failing due to missing index.html.
 
   16 Jul 2013; Hans de Graaff <graaff@gentoo.org> jruby-1.6.8.ebuild:
   Add back accidentally dropped jvyamlb dependency, fixing bug 474488.
diff --git a/dev-java/jruby/jruby-1.6.5.1-r1.ebuild b/dev-java/jruby/jruby-1.6.5.1-r1.ebuild
new file mode 100644
index 000000000000..505fc034f4ef
--- /dev/null
+++ b/dev-java/jruby/jruby-1.6.5.1-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.5.1-r1.ebuild,v 1.1 2013/10/24 19:32:40 tomwij Exp $
+
+EAPI="4"
+JAVA_PKG_IUSE="doc source test"
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="${PV/_rc1/RC1}"
+
+DESCRIPTION="Java-based Ruby interpreter implementation"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz"
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bsf ssl"
+
+# jffi still needed? Or do we call that jnr-ffi?
+#  jnr-ffi depends on jffi which depends on libffi
+CDEPEND=">=dev-java/bytelist-1.0.8:0
+	>=dev-java/jline-0.9.94:0
+	>=dev-java/joni-1.1.3:0
+	>=dev-java/jnr-netdb-1.0:0
+	>=dev-java/jvyamlb-0.2.5:0
+	>=dev-java/asm-3.2:3
+	>=dev-java/jcodings-1.0.5:0
+	dev-java/jffi:1.0
+	dev-java/jnr-constants:0
+	dev-java/jnr-ffi:0.5
+	dev-java/jnr-posix:1.1
+	dev-java/joda-time:0
+	dev-util/jay:0[java]
+	dev-java/nailgun:0
+	dev-java/jgrapht:0
+	dev-java/ant-core:0
+	dev-java/bsf:2.3
+	dev-java/osgi-core-api:0
+	dev-java/snakeyaml:1.9"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+# Is jna-posix still needed? Or has that been renamed to jnr-posix?
+#  jna-posix is the original project name which was abononed years ago.
+#  jnr-posix < 1.1.8 are from the original fork
+#  later jnr-posix are from the jnr umbrella project.
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/ant-trax:0
+		dev-java/junit:4
+		java-virtuals/jdk-with-com-sun
+		dev-java/commons-logging:0
+		dev-java/xalan:0
+	)
+	!!<dev-ruby/jruby-1.3.1-r1"
+
+PDEPEND="ssl? ( dev-ruby/jruby-openssl )"
+
+# Tests fail.
+# Need to stop injecting jar's into classpath.
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+RUBY_HOME=/usr/share/${PN}/lib/ruby
+SITE_RUBY=${RUBY_HOME}/site_ruby
+GEMS=${RUBY_HOME}/gems
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist jnr-constants jay \
+jcodings jffi-1.0 jline \
+joda-time joni jnr-ffi-0.5 jnr-posix-1.1 jnr-netdb jvyamlb nailgun jgrapht osgi-core-api \
+snakeyaml-1.9"
+EANT_NEEDS_TOOLS="true"
+
+pkg_setup() {
+	unset RUBYOPT
+	java-pkg-2_pkg_setup
+
+	local fail
+
+	for directory in "${GEMS}" "${SITE_RUBY}"; do
+		if [[ -L ${directory} ]]; then
+			eerror "${directory} is a symlink. Please do the following to resolve the situation:"
+			echo 'emerge -an app-portage/gentoolkit'
+			echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > ~/jruby.fix'
+			echo 'emerge -1C $(< ~/jruby.fix)'
+			echo "rm ${directory}"
+			echo 'emerge -1 $(< ~/jruby.fix)'
+			echo 'rm ~/jruby.fix'
+
+			eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187"
+			fail="true"
+		fi
+	done
+
+	if [[ -n ${fail} ]]; then
+		die "Please address the above errors, then run emerge --resume"
+	fi
+}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-bash-launcher.patch
+	epatch "${FILESDIR}/1.5.1/build.xml.patch"
+
+	# We don't need to use Retroweaver. There is a jarjar and a regular jar
+	# target but even with jarjarclean, both are a pain. The latter target
+	# is slightly easier so go with this one.
+	sed -r -i \
+		-e 's/maxmemory="128m"/maxmemory="192m"/' \
+		-e "/RetroWeaverTask/d" \
+		-e "/yecht/! { /<zipfileset .+\/>/d }" \
+		build.xml || die
+
+	sed -i -e '/Arndt/d' src/org/jruby/RubyBigDecimal.java
+
+	# Delete the bundled JARs but keep invokedynamic.jar.
+	# No source is available and it's only a dummy anyway.
+	find build_lib -name "*.jar" ! -name "jsr292-mock.jar" ! -name "yecht.jar" -delete || die
+}
+
+src_compile() {
+	# Avoid generating the ri cache since that currently fails.
+	local flags="-Dgenerate-ri-cache.hasrun=true"
+	#local flags=""
+	use bsf && flags+=" -Dbsf.present=true"
+
+	export RUBYOPT=""
+	einfo $RUBYOPT
+	eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
+}
+
+src_test() {
+	if [ ${UID} == 0 ] ; then
+		ewarn 'The tests will fail if run as root so skipping them.'
+		ewarn 'Enable FEATURES="userpriv" if you want to run them.'
+		return
+	fi
+	# Our jruby.jar is unbundled so we need to add the classpath to this test.
+	sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" test/test_load_compiled_ruby_class_from_classpath.rb || die
+	sed -i "s@:refid => 'build.classpath'@:path =>\"#{ENV['JRUBY_CP']}:lib/jruby.jar\"@g" \
+		rakelib/commands.rake || die
+	#sed -i "s@:refid => 'test.class.path'@:path => \"#{ENV['JRUBY_CP']}@g" \
+	#	rakelib/commands.rake || die
+
+	#bsf optionally depends on jruby, which means that the previously
+	#installed jruby will be added to classpath, nasty things will happen.
+	local cpath=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4`
+	cpath="$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.jar:__g")"
+	cpath="${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan)"
+	EANT_GENTOO_CLASSPATH=""
+
+	local flags=""
+	use bsf && flags="-Dbsf.present=true"
+
+	#Clear RUBYOPT
+	export RUBYOPT=""
+	export JRUBY_CP="${cpath}"
+	ANT_TASKS="ant-junit4 ant-trax" \
+		JRUBY_OPTS="" eant test -Djdk1.5+=true -Djruby.bindir=bin \
+		-Dgentoo.classpath="${cpath}" ${flags}
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+	dodoc README docs/{*.txt,README.*} || die
+
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc src/org
+
+# Use the bash based launcher to preserve whitespace in arguments.
+# Ie allow >jruby -e "puts 'hello'"< to work otherwise
+# >jruby -e "\"puts 'hello'\""< is needed.
+#
+#	# We run the sed here in install so that we don't get the wrong
+#	# data during the test phase!
+#	sed \
+#		-e '/++ebuild-cut-here++/, /--ebuild-cut-here--/ d' \
+#		-e '/^JRUBY_HOME=/s:=:=/usr/share/jruby:' \
+#		bin/jruby.sh > "${T}"/jruby
+
+	newbin bin/jruby.bash jruby
+	dobin bin/j{irb{,_swing},rubyc}
+
+	insinto "${RUBY_HOME}"
+	doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby}
+
+	# Remove all the references to RubyGems as we're just going to
+	# install it through dev-ruby/rubygems.
+	find "${D}${RUBY_HOME}" -type f \
+		'(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
+		-delete || die
+}
diff --git a/dev-java/jruby/jruby-1.6.7.2.ebuild b/dev-java/jruby/jruby-1.6.7.2-r1.ebuild
index beb4b68da2fa..82ff477b24f4 100644
--- a/dev-java/jruby/jruby-1.6.7.2.ebuild
+++ b/dev-java/jruby/jruby-1.6.7.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.7.2.ebuild,v 1.2 2012/08/20 02:32:48 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.7.2-r1.ebuild,v 1.1 2013/10/24 19:32:40 tomwij Exp $
 
 EAPI="4"
 JAVA_PKG_IUSE="doc source test"
@@ -36,7 +36,7 @@ CDEPEND=">=dev-java/bytelist-1.0.8:0
 	dev-java/ant-core:0
 	dev-java/bsf:2.3
 	dev-java/osgi-core-api:0
-	>=dev-java/snakeyaml-1.9:0
+	dev-java/snakeyaml:1.9
 	dev-java/jzlib:1.1"
 
 RDEPEND="${CDEPEND}
@@ -75,7 +75,7 @@ JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
 EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist jnr-constants jay \
 jcodings jffi-1.0 jline \
 joda-time joni jnr-ffi-0.5 jnr-posix-1.1 jnr-netdb jvyamlb nailgun jgrapht osgi-core-api \
-snakeyaml jzlib-1.1"
+snakeyaml-1.9 jzlib-1.1"
 EANT_NEEDS_TOOLS="true"
 
 pkg_setup() {
@@ -132,8 +132,7 @@ src_compile() {
 
 	export RUBYOPT=""
 	einfo $RUBYOPT
-	#eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
-	eant -Djdk1.5+=true ${flags}
+	eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
 }
 
 src_test() {
diff --git a/dev-java/jruby/jruby-1.6.8.ebuild b/dev-java/jruby/jruby-1.6.8-r1.ebuild
index b905b35a022e..2ff185fbb0eb 100644
--- a/dev-java/jruby/jruby-1.6.8.ebuild
+++ b/dev-java/jruby/jruby-1.6.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.8.ebuild,v 1.2 2013/07/16 09:01:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.8-r1.ebuild,v 1.1 2013/10/24 19:32:40 tomwij Exp $
 
 EAPI="4"
 JAVA_PKG_IUSE="doc source test"
@@ -36,7 +36,7 @@ CDEPEND=">=dev-java/bytelist-1.0.8:0
 	dev-java/ant-core:0
 	dev-java/bsf:2.3
 	dev-java/osgi-core-api:0
-	>=dev-java/snakeyaml-1.9:0
+	dev-java/snakeyaml:1.9
 	dev-java/jzlib:1.1"
 
 RDEPEND="${CDEPEND}
@@ -75,7 +75,7 @@ JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
 EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist jnr-constants jay \
 jcodings jffi-1.0 jline \
 joda-time joni jnr-ffi-0.5 jnr-posix-1.1 jnr-netdb jvyamlb nailgun jgrapht osgi-core-api \
-snakeyaml jzlib-1.1"
+snakeyaml-1.9 jzlib-1.1"
 EANT_NEEDS_TOOLS="true"
 
 pkg_setup() {
@@ -132,8 +132,7 @@ src_compile() {
 
 	export RUBYOPT=""
 	einfo $RUBYOPT
-	#eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
-	eant -Djdk1.5+=true ${flags}
+	eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
 }
 
 src_test() {