Version Bump to release candidate so we can test

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 181 insertions, 2 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 377679ada971..7fc9a4fb6f2a 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.36 2009/05/23 23:02:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.37 2009/05/27 20:19:55 ali_bush Exp $
+
+*jruby-1.3.0_rc1 (27 May 2009)
+
+  27 May 2009; Alistair Bush <ali_bush@gentoo.org> +jruby-1.3.0_rc1.ebuild:
+  Version Bump to release candidate for Flameeyes and so we can test
+  compatibility with previous versions.
 
   23 May 2009; Vlastimil Babka <caster@gentoo.org> jruby-1.2.0-r1.ebuild:
   Add pkg_setup checks to workaround bug #270953.
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index 607548e7b491..c67f34467057 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -7,8 +7,10 @@ AUX user-test-fixes.patch 5147 RMD160 6258879413ae81a18d0c6bcaa3b0661d86a0d14a S
 DIST jruby-src-1.0.3.tar.gz 5218289 RMD160 b717863f8455ea5f323dd2b73824c39732dbd7df SHA1 38c091dbd28102013b61b10d1d24c6c237f44937 SHA256 3d10f92d8fd0815529a2ddefc291af288b8f2f51749c347c29006b84a30a2c0a
 DIST jruby-src-1.0.tar.gz 4840184 RMD160 3de4dfa558a12a1643fa2357f3e144e34c5a718d SHA1 f4e18c6c112e1741024d76b10528fef7a242a018 SHA256 80088e32cceb929b0cd0d0115ed800577b7b800d42dca3356e840d1123047b03
 DIST jruby-src-1.2.0.tar.gz 10858426 RMD160 a12d9243eb7e5338f1674c0bc9f874bc617c2662 SHA1 69f13b5ec216a7e615f4077730908217a6a9f1fc SHA256 8bd4e007f4d132b15fe968d88f474c97b5058e8cdd1e674820363c2cdc5fb048
+DIST jruby-src-1.3.0RC1.tar.gz 11565041 RMD160 6c0a0295c64ff314077d2981390ad7ad9de6b499 SHA1 09e3e6adb37fcb1259372d853394533c373a386d SHA256 181c83f14099c7b5b3aba055dfd8288333c46597afe153c40f0f544687df73ce
 EBUILD jruby-1.0.0.ebuild 4643 RMD160 6da48b87bdb363864e78d8b5011033899ca03a6f SHA1 67508a52174b5efc940282094e93e9517ca0d306 SHA256 bfbcb8a3a02979527967408102b639bf510eb3eda96972c47c888d50da576cc3
 EBUILD jruby-1.0.3.ebuild 4462 RMD160 83c55f4dd8b7d4c2c92843dd26608da2485b004d SHA1 febe0773f61e855d8926ce880104a805a31f81fb SHA256 bb7b90dab07750d0ed11ba62ef73f98ca35db0b682c1f9d35d84fc993f04ad19
 EBUILD jruby-1.2.0-r1.ebuild 5020 RMD160 ed2d2e16f9524c60d2b6bfeaed59d2db8ff55a4a SHA1 f9fe83616587740bf701a97270f59dd37a647ccb SHA256 f18224f575fa63ee893aac13d67a3f52cbc42142e2690a92e5dbef4e51442677
-MISC ChangeLog 6161 RMD160 5be0ffee4995b0d4627db6dab0d35d63a33935c7 SHA1 d7c82f71093ec115cda20f688d6dd44c320b0ea1 SHA256 03f973ecd58d3e0a193570726099443b28914e64b08f7d828226541457e532c8
+EBUILD jruby-1.3.0_rc1.ebuild 5187 RMD160 3cd3a970006472fd709916502778d1072a7a16e1 SHA1 10ef63bdd376c6a4a4d26bbb59892e1221373332 SHA256 beb494c58aba99347c20d5fd74cf19320875732e61237a1e06d872edabea5b7d
+MISC ChangeLog 6381 RMD160 77c1689f0e6483b6c516ccd6e771e976975d0872 SHA1 a9529714a0aba4a7e97d2856ab223102d0740921 SHA256 c852944f2a6084bdd33aa6443f6de3883e09047591f8a1d3a8de24a996e4cfca
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/jruby/jruby-1.3.0_rc1.ebuild b/dev-java/jruby/jruby-1.3.0_rc1.ebuild
new file mode 100644
index 000000000000..a4e1be556452
--- /dev/null
+++ b/dev-java/jruby/jruby-1.3.0_rc1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.3.0_rc1.ebuild,v 1.1 2009/05/27 20:19:55 ali_bush Exp $
+
+# Note:this pmasked in gentoo-x86/profiles.
+# Please remove both once a full release is available.
+
+EAPI="2"
+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://dist.codehaus.org/${PN}/${MY_PV}/${PN}-src-${MY_PV}.tar.gz"
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bsf java6 ssl"
+
+CDEPEND=">=dev-java/bytelist-1.0.2:0
+	>=dev-java/constantine-0.5:0
+	>=dev-java/jline-0.9.94:0
+	>=dev-java/joni-1.1.3:0
+	>=dev-java/jna-posix-1.0:0
+	>=dev-java/jvyamlb-0.2.5:0
+	dev-java/asm:3
+	dev-java/jcodings:0
+	dev-java/jffi:0.4
+	dev-java/jna:0
+	dev-java/joda-time:0
+	dev-util/jay:0[java]
+	!java6? ( dev-java/backport-util-concurrent )"
+
+RDEPEND="${CDEPEND}
+	!java6? ( =virtual/jre-1.5* )
+	java6? ( >=virtual/jre-1.6 )"
+
+# using 1.6 produces 1.6 bytecode, not sure why
+DEPEND="${CDEPEND}
+	!java6? ( =virtual/jdk-1.5* )
+	java6? ( >=virtual/jdk-1.6 )
+	bsf? ( dev-java/bsf:2.3 )
+	test? (
+		dev-java/ant-junit
+		dev-java/ant-trax
+	)"
+
+PDEPEND="dev-ruby/rubygems
+	>=dev-ruby/rake-0.7.3
+	>=dev-ruby/rspec-1.0.4
+	ssl? ( dev-ruby/jruby-openssl )"
+
+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="asm-3 bytelist constantine jay jcodings jffi-0.4 jline joda-time joni jna jna-posix jvyamlb"
+EANT_NEEDS_TOOLS="true"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	use java6 || EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} backport-util-concurrent"
+
+	local fail
+
+	if [[ -d "${GEMS}" && ! -L "${GEMS}" ]]; then
+		eerror "${GEMS} is a directory. Please remove this directory."
+		fail="true"
+	fi
+
+	# the symlink creates a collision with rubygems, bug #270953
+	# cannot be currently solved by removing in pkg_preinst, bug #233278
+	if [[ -L "${SITE_RUBY}" ]]; then
+		eerror "${SITE_RUBY} is a symlink. Please remove this symlink."
+		fail="true"
+	fi
+
+	if [[ -n ${fail} ]]; then
+		eerror "Unmerging the old jruby version should also fix the problem(s)."
+		die "Please address the above errors, then run emerge --resume"
+	fi
+}
+
+java_prepare() {
+	epatch "${FILESDIR}/ftype-test-fixes.patch"
+	epatch "${FILESDIR}/user-test-fixes.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 "/<zipfileset .+\/>/d" \
+		build.xml || die
+
+	# Delete the bundled JARs but keep invokedynamic.jar.
+	# No source is available and it's only a dummy anyway.
+	find build_lib lib -name "*.jar" ! -name "invokedynamic.jar" -delete || die
+
+	if ! use bsf; then
+		# Remove BSF test cases.
+		cd "${S}/test/org/jruby"
+		rm -f test/TestAdoptedThreading.java || die
+		rm -f javasupport/test/TestBSF.java || die
+		sed -i '/TestBSF.class/d' javasupport/test/JavaSupportTestSuite.java || die
+		sed -i '/TestAdoptedThreading.class/d' test/MainTestSuite.java || die
+	fi
+}
+
+src_compile() {
+	eant jar $(use_doc create-apidocs) -Djdk1.5+=true
+}
+
+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
+
+	# BSF is a compile-time only dependency because it's just the adapter
+	# classes and they won't be used unless invoked from BSF itself.
+	use bsf && java-pkg_jar-from --into build_lib --with-dependencies bsf-2.3
+
+	# 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
+
+	ANT_TASKS="ant-junit ant-trax" JRUBY_CP=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,}` JRUBY_OPTS="" eant test -Djdk1.5+=true
+}
+
+src_install() {
+	local bin
+
+	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
+
+	dobin "${FILESDIR}/jruby" || die
+	exeinto "/usr/share/${PN}/bin"
+	doexe "${S}/bin/jruby" || die
+
+	# Install some jruby tools.
+	dobin "${S}"/bin/j{gem,irb{,_swing},rubyc} || die
+
+	# Symlink some common tools so that jruby can launch them internally.
+	for bin in {j,}gem jirb jrubyc rake rdoc ri spec{,_translator} ; do
+		dosym "/usr/bin/${bin}" "/usr/share/${PN}/bin/${bin}" || die
+	done
+
+	insinto "${RUBY_HOME}"
+	doins -r "${S}/lib/ruby/1.8" || die
+	doins -r "${S}/lib/ruby/site_ruby" || die
+
+	# Share gems with regular Ruby.
+	dosym /usr/$(get_libdir)/ruby/gems "${GEMS}" || die
+
+	# Autoload rubygems and append regular site_ruby to $LOAD_PATH.
+	# Unfortunately the -I option prepends instead.
+	insinto "${SITE_RUBY}"
+	doins "${FILESDIR}/gentoo.rb" || die
+	doenvd "${FILESDIR}/10jruby" || die
+}