[gentoo-commits] gentoo-x86 commit in dev-java/jruby: jruby-1.6.5.1.ebuild jruby-1.7.12.ebuild ChangeLog

[Tom Wijsman (tomwij)]

tomwij      14/05/03 21:31:48

  Modified:             jruby-1.6.5.1.ebuild ChangeLog
  Added:                jruby-1.7.12.ebuild
  Log:
  Version bump to 1.7.12, masked as it is pending review by the Java and Ruby herds; for bug #442230, reported by Gian and in cooperation with mrueg and others.
  
  (Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

Revision  Changes    Path
1.5                  dev-java/jruby/jruby-1.6.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/jruby-1.6.5.1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/jruby-1.6.5.1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/jruby-1.6.5.1.ebuild?r1=1.4&r2=1.5

Index: jruby-1.6.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.5.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jruby-1.6.5.1.ebuild	25 Jun 2012 07:43:03 -0000	1.4
+++ jruby-1.6.5.1.ebuild	3 May 2014 21:31:48 -0000	1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.ebuild,v 1.4 2012/06/25 07:43:03 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.5.1.ebuild,v 1.5 2014/05/03 21:31:48 tomwij Exp $
 
 EAPI="4"
 JAVA_PKG_IUSE="doc source test"



1.96                 dev-java/jruby/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/ChangeLog?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/ChangeLog?r1=1.95&r2=1.96

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ChangeLog	3 Mar 2014 23:39:57 -0000	1.95
+++ ChangeLog	3 May 2014 21:31:48 -0000	1.96
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.95 2014/03/03 23:39:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.96 2014/05/03 21:31:48 tomwij Exp $
+
+*jruby-1.7.12 (03 May 2014)
+
+  03 May 2014; Tom Wijsman <TomWij@g.o>
+  +files/jruby-1.7.12-bash-launcher.patch, +jruby-1.7.12.ebuild,
+  jruby-1.6.5.1.ebuild:
+  Version bump to 1.7.12, masked as it is pending review by the Java and Ruby
+  herds; for bug #442230, reported by Gian and in cooperation with mrueg and
+  others.
 
   03 Mar 2014; Pacho Ramos <pacho@g.o> jruby-1.6.8-r1.ebuild:
   amd64 stable, bug #495016



1.1                  dev-java/jruby/jruby-1.7.12.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/jruby-1.7.12.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jruby/jruby-1.7.12.ebuild?rev=1.1&content-type=text/plain

Index: jruby-1.7.12.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.7.12.ebuild,v 1.1 2014/05/03 21:31:48 tomwij Exp $

EAPI="5"

JAVA_PKG_IUSE="doc source test"

inherit eutils java-pkg-2 java-ant-2

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
	http://dev.gentoo.org/~tomwij/files/dist/${P}-mvn-ant-ant.patch"

LICENSE="|| ( EPL-1.0 GPL-2 LGPL-2.1 )"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"

RUBY_VERSION=1.9
RUBY_REVISION=0

CDEPEND="
	dev-java/ant-core:0
	dev-java/asm:4
	dev-java/bsf:2.3
	>=dev-java/bytelist-1.0.8:0
	dev-java/headius-options:0
	dev-java/invokebinder:0
	dev-java/jcodings:1
	dev-java/jffi:1.2
	dev-java/jnr-constants:0
	dev-java/jnr-enxio:0
	dev-java/jnr-ffi:0.7
	>=dev-java/jnr-netdb-1.0:0
	dev-java/jnr-posix:2.4
	dev-java/jnr-unixsocket:0
	dev-java/joda-time:0
	dev-java/joni:2.1
	dev-java/nailgun:0
	dev-java/osgi-core-api:0
	dev-lang/ruby:${RUBY_VERSION}
	>=dev-java/snakeyaml-1.9:0
	dev-java/jzlib:1.1
"

RDEPEND="${CDEPEND}
	>=virtual/jre-1.8
"

DEPEND="${CDEPEND}
	>=virtual/jdk-1.8
	test? (
		dev-java/ant-junit4:0
		dev-java/ant-trax:0
		dev-java/commons-logging:0
		dev-java/junit:4
		dev-java/xalan:0
		java-virtuals/jdk-with-com-sun:0
	)
"

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-4 bsf-2.3 bytelist headius-options \
invokebinder jcodings-1 jffi-1.2 jnr-constants jnr-enxio jnr-ffi-0.7 jnr-netdb \
jnr-posix-2.4 jnr-unixsocket joda-time joni-2.1 nailgun osgi-core-api snakeyaml \
jzlib-1.1"

EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} ant-junit4 ant-trax \
commons-logging junit-4 xalan jdk-with-com-sun"

EANT_BUILD_TARGET="package"

pkg_setup() {
	export 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/^/=/ > /tmp/jruby.fix'
			echo 'emerge -1C $(< /tmp/jruby.fix)'
			echo "rm ${directory}"
			echo 'emerge -1 $(< /tmp/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() {
	einfo "Cleaning up bash launcher ..."
	epatch "${FILESDIR}"/${P}-bash-launcher.patch

	# When you capture a new patch, and it misses org.jruby.runtime.Constants;
	# add maven.build.resourceDir.1 as a pathelement to the javac task of the
	# compilation target. Also add jruby-core-GENTOO_JRUY_VER in ext classpaths.
	# Also reorder the root maven-build.xml such that core compiles before ext.
	einfo "Patching build.xml ..."
	epatch "${DISTDIR}"/${P}-mvn-ant-ant.patch
	find . -name '*build.xml' -exec \
		sed -i "s/jruby-core-GENTOO_JRUY_VER/jruby-core-${PV}/" {} \;

	einfo "Removing classes and jars ..."
	find . -name "*.class" -or -name "*.jar" -print -delete

	einfo "Fixing up properties ..."
	JRUBY_CONSTANTS="core/src/main/resources/org/jruby/runtime/Constants.java"
	for repvar in $(grep "@.*@\".*;" ${JRUBY_CONSTANTS} | sed 's:.*@\(.*\)@.*:\1:') ; do
		VAR=$(grep "<${repvar}>" pom.xml | sed 's/.*>\(.*\)<\/.*/\1/')
		sed -i "s/@${repvar}@/${VAR}/" \
			${JRUBY_CONSTANTS} || die
	done
	sed -i "s/String VERSION = \".*\"/String VERSION = \"${PV}\"/" \
		${JRUBY_CONSTANTS} || die

	einfo "Setting Ruby version to use ..."
	sed -i -e "s/String jruby_revision = \"\"/String jruby_revision = \"${RUBY_REVISION}\"/" \
		-e "s/String jruby_default_ruby_version = \"\"/String jruby_default_ruby_version = \"${RUBY_VERSION}\"/" \
		${JRUBY_CONSTANTS} || die
}

# Java based tests return propertly, I guess that is because there are none;
# I've found an executable that can you can run, but it bails out about libyaml.
#
#  $ bin/testrb test
# /usr/share/jruby/lib/ruby/1.9/yaml/store.rb:1:in `require':
# It seems your ruby installation is missing psych (for YAML output).
# To eliminate this warning, please install libyaml and reinstall your ruby.
# JRuby 1.9 mode only supports the `psych` YAML engine; ignoring `syck`
# NoMethodError: undefined method `to_yaml' for {}:Hash
#        Store at /usr/share/jruby/lib/ruby/1.9/yaml/store.rb:78
#        ...
RESTRICT="${RESTRICT} test"

src_test() {
	export RUBYOPT=""

	mv maven-build.xml build.xml || die

	java-pkg-2_src_test

	bin/testrb test || die ""
}

src_install() {
	java-pkg_newjar core/target/${PN}-core-${PV}.jar
	dodoc README.md docs/{*.txt,README.*} || die

	use doc && java-pkg_dojavadoc core/target/site/apidocs
	use source && java-pkg_dosrc core/src/main/java/org

	newbin bin/jruby.bash jruby
	dobin bin/j{irb{,_swing},rubyc}

	insinto "${RUBY_HOME}"
	doins -r "${S}"/lib/ruby/{1.8,1.9,2.0,shared}

	# Remove all the references to RubyGems as we're just going to
	# install it through dev-ruby/rubygems.
	find "${ED}${RUBY_HOME}" -type f \
		'(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
		-delete || die
}

pkg_postinst() {
	ewarn ""
	ewarn "Make sure RUBYOPT is unset in the environment when using JRuby:"
	ewarn ""
	ewarn "    export RUBYOPT=\"\""
	ewarn ""
}