Fix compatibility with rubygems 1.8.x.

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

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index a7b3689d2a859a3a287461672d399701868eeb11..3aecd6f1d1e7c1cb48e27b32d90b03baac85fbc3 100644 (file)
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.76 2011/10/19 01:25:10 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.77 2011/10/22 11:35:07 graaff Exp $
+
+*jruby-1.5.6-r1 (22 Oct 2011)
+
+  22 Oct 2011; Hans de Graaff <graaff@gentoo.org> +jruby-1.5.6-r1.ebuild,
+  +files/jruby-1.5.6-rubygems-1.8.x.patch:
+  Fix compatibility with rubygems 1.8.x.
 
   19 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> jruby-1.5.6.ebuild:
   JDK 7 changes the way it handles method overloading so restricting

diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index 0f750787b4435396653ea0f7669db0d9e3c80b81..862f734c3d2c529cc12e98db8cc59ffc1f22f30c 100644 (file)
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
 AUX 10jruby 22 RMD160 ac56025539a2bbb7a1506a2df958c73cc1c3aba9 SHA1 caf6b109c0a7cfa53a1e470ba0ca5f27a6578723 SHA256 fb1240cfedd315ba3772830abbc238eb3061088fcf70eb4df7e9a99d92f124e4
@@ -7,6 +10,7 @@ AUX jruby 97 RMD160 500ca93e1a23897fb3d9ebd0b1a6ba7caec9be1d SHA1 ae79a6d60a9e28
 AUX jruby-1.4.0-bindir.patch 743 RMD160 ea3ea934abb45fda138afd336a0dee2bbcb7126a SHA1 918714ad3f86448e689c8c20daaba8383432f742 SHA256 27352afbc6a3898c50e3628911062c01090209d0cfdb7b221aca4aa526031b11
 AUX jruby-1.4.0-system-jars-r2.patch 8332 RMD160 d59ae12abcc4184c1d9f39a3dafe769d00a0f732 SHA1 a3fcb2a452d65757c838c6883420d1a3b84b91fa SHA256 92f67d30f0be4ff029d3045e9446b5191da474fe0280269e4b1dc5b026e51556
 AUX jruby-1.5.0-system-jars.patch 8113 RMD160 462a0f90f05e11ea28caf960ae647b4726421a49 SHA1 9e4203e877e50f09c5417a92e8d9700736ff8298 SHA256 8c386f1d0e08b75a9f986e317d822c393231316d46eca0030ed67fe40dfbe3b5
+AUX jruby-1.5.6-rubygems-1.8.x.patch 815 RMD160 cabdd1efaea18a4b3926b3adaacc79e98c13624b SHA1 2a1913fce9ee4ad9377744fc6e64fa57d7262025 SHA256 cb003cceee89149074c422c53cfaf7b49341bff8f2faf7aa70173fc954ccddd2
 AUX user-test-fixes.patch 5147 RMD160 6258879413ae81a18d0c6bcaa3b0661d86a0d14a SHA1 32d3f80db383cf664c9ad1f9e52c2688ae3cbe5c SHA256 f21469d41de9f9b5fb1682596f64899a71c92332db24bf27e8c50dbb1896a92e
 DIST jruby-src-1.3.1.tar.gz 12076705 RMD160 ef10395dbdf9490820caa65ff6236dd99e7c62c8 SHA1 e4de71e5c01f71f236b3135e07a5841784767fd8 SHA256 9095b0bec0ee8e6cd96b72c7f2aec8a90fa429b840484d57a48d8fb760aae600
 DIST jruby-src-1.4.1.tar.gz 12351374 RMD160 079036e7df373d444221083a9487b6ad8a676879 SHA1 282a730d33fe5ba0686297de6ff68eee443e67ab SHA256 685e6ba0a4709e06fab1158ef6e4d2b246ab91a770fe8b5c1b642d55d22c725a
@@ -18,6 +22,14 @@ EBUILD jruby-1.4.1.ebuild 5998 RMD160 208b070013917131cc2b1fdf31ee38d038212a68 S
 EBUILD jruby-1.5.2-r1.ebuild 5991 RMD160 c6d8fb7b61dd530e7ec6e6703e066c24f306ea5c SHA1 2732485cdcd5d8a2ec62632e03c3ff929bf1f9ba SHA256 5a1bde40da907e466e09ae4f8ee207c8019a6b4b7b85bb2bd63ff647f5a535cd
 EBUILD jruby-1.5.2.ebuild 5988 RMD160 fde151524377a1cd48accb0778a2d6ecc77a4bbf SHA1 31d7cccb02d15273a61f6052e1e0436c10b4fdba SHA256 1c0839a925f9fc7d25148ceeb776abce26351b6196712ba55d22572cabb66971
 EBUILD jruby-1.5.3.ebuild 6206 RMD160 d5dcd3884fcb76c069237a38fb7af7adf7dbaabf SHA1 2ed7f31ae65b196d52bb07f5164e829d33beb957 SHA256 d9ae2e1895ecf07dc32cda587bec28199e4ee23b071f2d2da00256790866b459
+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
-MISC ChangeLog 14283 RMD160 fb7d0a0a248894ee10e17698e499c758339af6d5 SHA1 bb484edf18948d91d2ca1cd2ab0c69bbbb9375f5 SHA256 57e51c83b5e84e69ba03cc991947393c2a72e78bda26160a1ba36c3daf7f6eaa
+MISC ChangeLog 14471 RMD160 5f39b9228b9c46ac79267f649d5d9657d6d65cfa SHA1 77836693a79fce09de60983522c763f258d45078 SHA256 f8a4511fb454e4117366c2700f3709c9a20161359d70fb3540c4949b62352ff6
 MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk6iqnQACgkQiIP6VqMIqNdLQQD/QRXzJgvtZeMTfMZ0IU0bSbYb
+weCsaDdKBkeAnAVgqlYA/iVmGzKzb4J+pvymPGdXBP5lX18aqoZ3phpexV07W04H
+=u6cW
+-----END PGP SIGNATURE-----

diff --git a/dev-java/jruby/files/jruby-1.5.6-rubygems-1.8.x.patch b/dev-java/jruby/files/jruby-1.5.6-rubygems-1.8.x.patch
new file mode 100644 (file)
index 0000000..b90fc25
--- /dev/null
+++ b/dev-java/jruby/files/jruby-1.5.6-rubygems-1.8.x.patch
@@ -0,0 +1,19 @@
+Take into account that newer versions of rubygems (ca. 1.5 and newer)
+no longer have set_paths. Rescuing the error should be backward
+compatible. jruby 1.6 and newer have a newer bundled rubygems with a
+newer engine definition that should not have this problem.
+
+--- lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb.orig     2011-10-22 12:21:04.000000000 +0200
++++ lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb  2011-10-22 13:15:09.000000000 +0200
+@@ -14,7 +14,10 @@
+       original_ensure_gem_subdirectories(gemdir) unless jarred_path? gemdir.to_s
+     end
+ 
+-    alias_method :original_set_paths, :set_paths
++    begin
++      alias_method :original_set_paths, :set_paths
++    rescue NameError
++    end
+     def set_paths(gpaths)
+       original_set_paths(gpaths)
+       @gem_path.reject! {|p| !readable_path? p }

diff --git a/dev-java/jruby/jruby-1.5.6-r1.ebuild b/dev-java/jruby/jruby-1.5.6-r1.ebuild
new file mode 100644 (file)
index 0000000..5fc6089
--- /dev/null
+++ b/dev-java/jruby/jruby-1.5.6-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.6-r1.ebuild,v 1.1 2011/10/22 11:35:07 graaff Exp $
+
+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://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"
+
+CDEPEND=">=dev-java/bytelist-1.0.6:0
+       >=dev-java/constantine-0.6:0
+       >=dev-java/jline-0.9.94:0
+       >=dev-java/joni-1.1.3:0
+       >=dev-java/jnr-posix-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:0
+       >=dev-java/jffi-0.7_pre:0.4
+       dev-java/joda-time:0
+       dev-util/jay:0[java]
+       dev-java/nailgun:0
+       dev-java/jaffl:0
+       dev-java/jgrapht:0
+       dev-java/ant-core:0
+       dev-java/bsf:2.3"
+
+RDEPEND="${CDEPEND}
+       >=virtual/jre-1.6"
+
+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-java/jna-posix-1.0.1: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 constantine jay \
+jcodings jffi-0.4 jline constantine \
+joda-time joni jnr-posix jnr-netdb jvyamlb nailgun jaffl jgrapht"
+EANT_NEEDS_TOOLS="true"
+
+pkg_setup() {
+       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}-1.5.0-system-jars.patch
+       epatch "${FILESDIR}/1.5.1/build.xml.patch"
+       epatch "${FILESDIR}/1.5.1/testfixes.patch"
+       epatch "${FILESDIR}/${P}-rubygems-1.8.x.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
+
+       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" -delete || die
+
+       # change some defaults for Gentoo to work properly
+       cat - >> src/org/jruby/jruby.properties <<EOF
+jruby.bindir = /usr/bin
+EOF
+}
+
+src_compile() {
+       local flags=""
+       use bsf && flags="-Dbsf.present=true"
+
+       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() {
+       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
+
+       # 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 > "${T}"/jruby
+
+       dobin "${T}"/jruby "${S}"/bin/j{irb{,_swing},rubyc} || die
+
+       insinto "${RUBY_HOME}"
+       doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby} || die
+
+       # 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
+}
+
+pkg_postinst() {
+       ewarn "If you're updating from <=jruby-1.4.0, you're going to get errors related"
+       ewarn "to gentoo.rb load failure."
+       ewarn "This is due to a stray definition of JRUBY_OPTS variable from the previous ebuilds."
+       ewarn "To solve the problem, either login in a new shell, use 'env -i ${SHELL} --login'"
+       ewarn "or explicitly unset the variable before running jruby."
+       ewarn ""
+       ewarn "Currently this package introduces issues/bugs that are not present within upstream"
+       ewarn "releases.  Therefore if you are wanting a stable build of jruby please do not"
+       ewarn "use this package."
+}