While JRuby does not work yet, predispose the ebuild to support it; also add a patch to work with test-unit-1.2.3 on Ruby 1.9.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 49 insertions, 19 deletions

diff --git a/dev-ruby/racc/ChangeLog b/dev-ruby/racc/ChangeLog
index 21bb685467a7..7daf86970e96 100644
--- a/dev-ruby/racc/ChangeLog
+++ b/dev-ruby/racc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/racc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/ChangeLog,v 1.45 2010/01/04 11:44:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/ChangeLog,v 1.46 2010/01/21 11:23:46 flameeyes Exp $
+
+  21 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> racc-1.4.6.ebuild,
+  +files/racc-1.4.6-test-unit.patch:
+  While JRuby does not work yet, predispose the ebuild to support it; also
+  add a patch to work with test-unit-1.2.3 on Ruby 1.9.
 
   04 Jan 2010; Christian Faulhammer <fauli@gentoo.org> racc-1.4.6.ebuild:
   Transfer Prefix keywords
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index c5e6987cd6f4..42ac3868bb31 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX racc-1.4.6-test-unit.patch 307 RMD160 e5d74d5c4dddf9121bdef36d204529ab86ee3aea SHA1 1c3aa5e93d9f9968d320c39b1987e3ffcca55888 SHA256 233e631e1dda2ae7f4802860bd95d131e952a41a67b30394e4631ac87260180f
 DIST racc-1.4.5-all.tar.gz 143740 RMD160 55d65413ac2ba4c1184c05f819b57314f750497d SHA1 80ec24d4c9db09812514b5b2f0db988ce7de2898 SHA256 b5a58f56d8559e87de665561fff778a6cb79fbccadc080fb366fa15e1cd6f045
 DIST racc-1.4.6.gem 110592 RMD160 b755cc948519a22b5fc7fbf4d0b1a6519db6415b SHA1 3ce1fc7a7245cf388ec20e9b612fd5d1111b387e SHA256 5877e6d676b0512e9d8587b273acf71aa7e6bd7c77b5e3f4bc26d9b5ccd08378
 EBUILD racc-1.4.5.ebuild 640 RMD160 bd6f88343d57dcfdf7efa526405af12f393104d8 SHA1 92bf98abc3ae7da016128c5e6b55d05c0957d652 SHA256 363a3d30f5665e1da5bfef74811a574b410f12505f19be846b46b056be1ed522
-EBUILD racc-1.4.6.ebuild 1329 RMD160 63b7850432c75831d0473748172ee40c3a967e60 SHA1 d9ab8b957e680f0b78e893bde256e601ed0ed78e SHA256 06b691d9e01774d0dbdb4e1f551e8b015ff4c12483051802f10da9778309bee9
-MISC ChangeLog 5208 RMD160 38401edfa4c2b6918629a393474a0c8e1d7f1090 SHA1 20aee9afe61484ed529c71117800073c653d06bd SHA256 9dab90e848440707663e35d45eec179731cad741fa808ac4d3bbe1d78484e564
+EBUILD racc-1.4.6.ebuild 1742 RMD160 2282442dad7fac5bd3d207a42ab74bad476ae0dd SHA1 2531537b434eb5be9add05edf30b50f9b21a41ad SHA256 a3241d53097b2c61e6a316303e66f8cb75b93226cac446fce722f1b9b23497ce
+MISC ChangeLog 5456 RMD160 e0d9cb6f555e6db40ecbb6d1f0c4b8ef982a3849 SHA1 f383f139aaebfff609fee9fc36f7540210172cd0 SHA256 cfe7c519106f5cd878f329c69a4357212f7f59b7d6db5c1a45a80b2b52d49217
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktB1KMACgkQNQqtfCuFneNJJwCdGme1y1EoyxHJw8jxBPDtOXfC
-4hYAnjkDmDG1AMfbIvGDZlwsGpWSfeFQ
-=8Z8y
+iEYEARECAAYFAktYOMcACgkQAiZjviIA2XjU+gCfYPH7sGCh7ZmBxn1Aisq1FQAq
+/AkAn0Nhdkl3qg4Kzhal0BDe+25mMb6/
+=KGiP
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/racc/files/racc-1.4.6-test-unit.patch b/dev-ruby/racc/files/racc-1.4.6-test-unit.patch
new file mode 100644
index 000000000000..657454ac1113
--- /dev/null
+++ b/dev-ruby/racc/files/racc-1.4.6-test-unit.patch
@@ -0,0 +1,13 @@
+Index: racc-1.4.6/test/helper.rb
+===================================================================
+--- racc-1.4.6.orig/test/helper.rb
++++ racc-1.4.6/test/helper.rb
+@@ -84,5 +84,8 @@ module Racc
+         result ? assert(result) : raise(cmd)
+       end
+     end
++
++    def default_test
++    end
+   end
+ end
diff --git a/dev-ruby/racc/racc-1.4.6.ebuild b/dev-ruby/racc/racc-1.4.6.ebuild
index 99c153b88879..d1142a1a3b1a 100644
--- a/dev-ruby/racc/racc-1.4.6.ebuild
+++ b/dev-ruby/racc/racc-1.4.6.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.6.ebuild,v 1.2 2010/01/04 11:44:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.6.ebuild,v 1.3 2010/01/21 11:23:46 flameeyes Exp $
 
 EAPI=2
 
+# jruby → testsuite uses fork (incompatible with JRuby), and patched
+# one crashes JRuby 1.4.0.
 USE_RUBY="ruby18 ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
@@ -26,6 +28,8 @@ all_ruby_prepare() {
 	sed -i -e '/tasks\/email/s:^:#:' Rakefile || die "rakefile fix failed"
 	sed -i -e '/prerequisites/s:^:#:' tasks/test.rb || die "test task fix failed"
 	sed -i -e 's|/tmp/out|${TMPDIR:-/tmp}/out|' test/helper.rb || die "tests fix failed"
+
+	epatch "${FILESDIR}"/${P}-test-unit.patch
 }
 
 each_ruby_prepare() {
@@ -36,12 +40,19 @@ each_ruby_prepare() {
 }
 
 each_ruby_compile() {
-	${RUBY} -S rake build || die "build failed"
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	ruby_fakegem_newins ext/racc/cparse/cparse.so lib/racc/cparse.so
+	case ${RUBY} in
+		*jruby)
+			einfo "Under JRuby, racc cannot use the shared object parser, so instead"
+			einfo "you have to rely on the pure Ruby implementation."
+			;;
+		*)
+			${RUBY} -S rake build || die "build failed"
+			# Copy over the file here so that we don't have to do
+			# special ruby install for JRuby and the other
+			# implementations.
+			cp -l ext/racc/cparse/cparse.so lib/racc/cparse.so || die
+			;;
+	esac
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index 0345b79816f8..673c0e726e70 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST rack-test-0.5.3.gem 19456 RMD160 11857ae7b8c2489e7e76f7a80fc3164d2fa9bd41 SHA1 6612ea624001769228948af6ab008e81b98c7241 SHA256 5cc44349c68c5512d4beb055f80d854550aefbae8b600831b57d763fbd613b21
-EBUILD rack-test-0.5.3.ebuild 696 RMD160 a69b23e781f0276aef42db4741bebca789467d4a SHA1 2fddf579defba92fafb8d9ad3f7373b39442b675 SHA256 09fc1a8e38a7b1cc4e8cdcc38db5f0a938105c86cabebc24203cf1df69fb9a2a
-MISC ChangeLog 638 RMD160 b9bf449dd4f0d62a3fafdab694dc49ec74875d97 SHA1 eb66df9e4a68c1ffc95a567c5dabb7f0343c089c SHA256 1085f17fe26e5368ef40c527c0b8d63212ad4febed4cb0b504b5669bd5bb2c60
+EBUILD rack-test-0.5.3.ebuild 715 RMD160 c3786af952601d606ebd78b2a25f021780a2d42b SHA1 c09ba406a26eda41a354aef269b39fd5b956f5a8 SHA256 7f198b3ee83711e012e919f47c88a48f9a670f2899fc91eb41e703805880a662
+MISC ChangeLog 765 RMD160 dad770c4bb0b6030302407e1caeb35cf0dfed8b0 SHA1 0488e2be2b89a3d76012113a2624695e55f25b12 SHA256 b199025913aeb4f3fb896504ceaac1a6bff3a06834d276124f9162a24677db92
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktJ3D8ACgkQAiZjviIA2XhP9gCbBC5wM8D9S3gOOVDomVX+3Dal
-eT4AoJqNr1xhOWGaSY5cgwsRtGbqJJDF
-=2hnc
+iEYEARECAAYFAktYOcIACgkQAiZjviIA2XjOYgCgwwzLs4pgyIqdbkqx9WGrnpYJ
+Y4gAoIwT7UYUVivkGMA3KLNkqFriunmq
+=sAzR
 -----END PGP SIGNATURE-----