Version bump, now that jzlib is in tree.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

3 files changed, 217 insertions, 7 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index d8f0dab3d541..e96b738e6066 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.80 2012/04/14 07:12:32 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.81 2012/04/29 04:50:00 flameeyes Exp $
+
+*jruby-1.6.7 (29 Apr 2012)
+
+  29 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org> +jruby-1.6.7.ebuild:
+  Version bump, now that jzlib is in tree.
 
   14 Apr 2012; Hans de Graaff <graaff@gentoo.org> -jruby-1.5.2.ebuild,
   -jruby-1.5.2-r1.ebuild, -jruby-1.5.3.ebuild:
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index 27167ab432e2..25cfd053173d 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 1.5.1/build.xml.patch 916 RMD160 813663ea2f391ed36df4c185e7b8ad8726f35890 SHA1 72f0bdd4ee48f8abb602bcda6b05a1a34b288f2e SHA256 761a8835a43511f5c62fff5f3afa4ab05abf17d2c25348c91088ff6eb17f5d2e
 AUX 1.5.1/testfixes.patch 2490 RMD160 5cd23b036543075e718a7fdc3214e36d21cf6e90 SHA1 261879b1f7bdaaba2b8426ebf403883611906864 SHA256 457ad13912dc8131ddbf60c9afc7227e38e77fb2c389f3c3dde3cc7162dd6148
@@ -17,17 +17,23 @@ DIST jruby-src-1.3.1.tar.gz 12076705 RMD160 ef10395dbdf9490820caa65ff6236dd99e7c
 DIST jruby-src-1.4.1.tar.gz 12351374 RMD160 079036e7df373d444221083a9487b6ad8a676879 SHA1 282a730d33fe5ba0686297de6ff68eee443e67ab SHA256 685e6ba0a4709e06fab1158ef6e4d2b246ab91a770fe8b5c1b642d55d22c725a
 DIST jruby-src-1.5.6.tar.gz 11166177 RMD160 ecb3d9f08837c1d0c4342bcf0bcaa0fe0c16a0e1 SHA1 99c084b669a92ce548aa5ed731c2fb102a8fc293 SHA256 c0217d6852a1fbf8edd55c1ec866af623e7aaf5f7b0be7abfaf1baf365655efa
 DIST jruby-src-1.6.5.1.tar.gz 14284770 RMD160 a96de6c66055cbcebf48109c972d46f7d22a67c2 SHA1 8e1f6fbf609ed98ad848d3636aac1bcdcb63e3ff SHA256 1126f29b888b5427c2d416042a6c010849ab1d29ee9be97e592caf6859921be5
+DIST jruby-src-1.6.7.tar.gz 14579497 RMD160 250e24ee7bfd5e28aac11b1f571fd067a050ef71 SHA1 1b5ef0cdaf68f6d6add385136e74b330a5e1e7b6 SHA256 38a15bc4b9849c9fdfe87077b21be0427ad6432167c9bf55558fc09b57402c37
 EBUILD jruby-1.3.1-r1.ebuild 5350 RMD160 19a52b4bdb5fcc48a6a7d94ad9ede6aea3583327 SHA1 a92b88d5934a1e3e060c595d190782ce34165aaf SHA256 3f85aa08aa29e0f209544109f18b54318d450a28320a3692448213bee8521da4
 EBUILD jruby-1.4.1.ebuild 5998 RMD160 208b070013917131cc2b1fdf31ee38d038212a68 SHA1 250fea0c35426c0ea50e9fa44ad89c9ed953d7cb SHA256 7d3171a7b8b4faaa4917d692dfedcb5196c3e3c282f72cf5f43c3c9346e13237
 EBUILD jruby-1.5.6-r1.ebuild 6226 RMD160 652ce387de90b5374ac561f6dc6999ef422c4b5f SHA1 4a37c4d0d6438b5471163427b5382155f507834f SHA256 591df79a8e86dc7c2b966cf73e23f3aac943a7bc39de2c339eaff4ea630aa60e
 EBUILD jruby-1.5.6.ebuild 6175 RMD160 b36494f1a6ac8a8eede19295dd232eab319bd07e SHA1 f470dc94162f1d33fb1d5f1d68c77704d7ac7d01 SHA256 740bccc78a4130e3824678e06c46e8f8c665e41ee1cc077f01e70da3ce354613
 EBUILD jruby-1.6.5.1.ebuild 6166 RMD160 9a03ee1f5c5afb071fcb37921fd95d445b23c6e8 SHA1 04c09370eaf6ff53c58b04bd7ad78b6362ba91f4 SHA256 dbb1ce214ac109379bb4efb100e1c1d5fdd9cd1278e10c6c977d295d8c0be724
-MISC ChangeLog 14888 RMD160 1398d063593e3761f7744065244b8765e7775101 SHA1 0cf8e86c6c4889c39349e1a97e4f64d2329651f3 SHA256 85c89bf83d15453ab776dedfb976cd49b3585edcd12edb8c78b1459cde948267
+EBUILD jruby-1.6.7.ebuild 6234 RMD160 ad8b20d0610c0e2342373d789e17ea141990d721 SHA1 c8010e2d9a804946900c226a05aaac6f10a60aa3 SHA256 fb80292ba8d6d0259aa767def51efbdea558a8b5bb5f4d4c8483db35fdecd850
+MISC ChangeLog 15040 RMD160 e82a6a028a5f0b69abfc16703723240d1319754c SHA1 e3d183adcb3cf17695fb09d98a1f885289e4a706 SHA256 4832202bf01ead36abef6f79a6f428617b3cdbeb156c3734bc5e6ba3829ec8be
 MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF0EAREIAAYFAk+JI2UACgkQiIP6VqMIqNeTngD+OMIu+MSq3J7w4hVQKERZbjUh
-HY3NlXF0KI+bqQDkhaIA9Aw8NloUnZ1o/FI9tsdA2+jUre/uONLyWn4iFP19Vbw=
-=DoCV
+iQEcBAEBAgAGBQJPnMiRAAoJEBzRPIrUMBNC5QQIAIgZkkmjSrxR4oDdUZ6TejVX
+jQwrB2h7/7trWjmNbqVPMebfQuVKcsh7FX0flLPLTQP19I3lEu+xHyvPmU18lJIM
+siIBh7QVRUYJ5d4JUZojuH+YEe2Ms9PYvK8WPXx2aDuiDAevXtIXDzk/FUkz+PSE
+zr7zMW0Kp1VpZVhG4RgPJ3tOj2zdEuAwlGVgLoselfcOoB3My96GTZU7li0sxNcK
+vg02BIiAUhk4fQusVCeCws0/ZRvBQDLJ6PfckiwG7iNebGuSXCfG4ALBSNwnjCvX
+oybKaMoe4SpOwUyB2Zp3C1Hx1XT6loGvbSNGZPmr7ZEUdk0kCNsOS88xFYUlXNM=
+=hEtN
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jruby/jruby-1.6.7.ebuild b/dev-java/jruby/jruby-1.6.7.ebuild
new file mode 100644
index 000000000000..52ed34717b8a
--- /dev/null
+++ b/dev-java/jruby/jruby-1.6.7.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/04/29 04:50:00 flameeyes 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:0
+	dev-java/jzlib:1.1"
+
+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 jzlib-1.1"
+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" ! -name 'coro-mock-1.0-SNAPSHOT.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}
+	eant -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
+}