Add ruby19 to the supported targets (with a patch to fix the tests).

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

4 files changed, 38 insertions, 8 deletions

diff --git a/dev-ruby/fast_xs/ChangeLog b/dev-ruby/fast_xs/ChangeLog
index 4d8770c3971c..eed2774d534d 100644
--- a/dev-ruby/fast_xs/ChangeLog
+++ b/dev-ruby/fast_xs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/fast_xs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_xs/ChangeLog,v 1.3 2012/01/25 00:52:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_xs/ChangeLog,v 1.4 2012/01/25 01:19:31 flameeyes Exp $
+
+  25 Jan 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/fast_xs-0.8.0+ruby-1.9.patch, fast_xs-0.8.0.ebuild:
+  Add ruby19 to the supported targets (with a patch to fix the tests).
 
 *fast_xs-0.8.0 (25 Jan 2012)
 
diff --git a/dev-ruby/fast_xs/Manifest b/dev-ruby/fast_xs/Manifest
index 88d051ca5d57..44d0051e9544 100644
--- a/dev-ruby/fast_xs/Manifest
+++ b/dev-ruby/fast_xs/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX fast_xs-0.8.0+ruby-1.9.patch 1090 RMD160 6947504295fdf357527f4694c43c814f732d9c93 SHA1 dc443252e4ef4200cb35f6b25f9e1d8ebcaac42e SHA256 5f4b59f7ae2aac87377d37d9124430ca752cfda0348a308464a1d06800aa8518
 DIST fast_xs-0.7.3.gem 20480 RMD160 6d8204f58299485daa610dc9f6f43b7cea3ba2de SHA1 ffa990e5ed1014f8f182602da311abe876cf55b5 SHA256 108e4e4099d1468970c4fe57f2deca31ad1ef923877352ee1c7394d31ab0538b
 DIST fast_xs-0.8.0.gem 22016 RMD160 28b0bfbeb7c5067fb7458c9b4530bd6048edbdef SHA1 1c3167438e5817324bffd6e7fbd021497623365d SHA256 5ff2e1b088bdad3d4eae2a71b118b8aa9b39975702853c3bb307e35db1facdc7
 EBUILD fast_xs-0.7.3-r1.ebuild 1108 RMD160 f751c6d43c241ea21bff2a87329da485b72ad573 SHA1 0a915224659822f2387f6d59f53b15d2531f3e0a SHA256 a8189659cb7725c7146286addb0d949cb12bd818dba86b02eee3a72e627e6e31
-EBUILD fast_xs-0.8.0.ebuild 1158 RMD160 f2ba1ec2458fe410e9b739bce9f90de86fd0af1c SHA1 6b494a0c4bb8d6aa61764e7df7aefbf22ff64424 SHA256 dfb804aa3085ea7f024caa8f36314d210d72436165a3b52f04bbda8da548433f
-MISC ChangeLog 692 RMD160 1d204d6d2cd9e038f439b5ef2f02de52a016670d SHA1 86408f9a4f8e31b415c4274cdf8a06657870afe0 SHA256 66dac12bffd584c35f333d852f28218ce959f5a5d1d66859bfec66ef38ece16c
+EBUILD fast_xs-0.8.0.ebuild 1205 RMD160 813f9a42eb55589e967c98044dfccfe150843ca3 SHA1 3438098fd95c0ebb51ab572eb65a67efb4fe67ba SHA256 e01023f980b9f6b37a57ff9ca878d57371504ece5d4720f80cca564579095847
+MISC ChangeLog 881 RMD160 9d037c73210ed546761a8373579abb6bd1812b68 SHA1 d2a065819edaca10800c8864dfc34772fb7919a3 SHA256 f0de2d0ae475917f5f3f3108435793193d485c15e973b90d98862c412853f710
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8fUjoACgkQAiZjviIA2XhLdgCgg/tPtr0tazazQx5qIiFcnQ5I
-GkEAnR1Ip0uRL1PxYNk/yuxMUd9qcL0E
-=zXjr
+iEYEARECAAYFAk8fWHoACgkQAiZjviIA2Xj5vgCfQbmzOsZ+Zp5KFBPZakiVJjIa
+a2AAn3KROoYxk9HCwla4pxV41Em48l/3
+=EQAf
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild
index 6494f85656b5..110845c2cf27 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild,v 1.1 2012/01/25 00:52:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild,v 1.2 2012/01/25 01:19:31 flameeyes Exp $
 
 EAPI=4
 
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ree18 ruby19"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -24,6 +24,8 @@ IUSE=""
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.3.2 )"
 ruby_add_bdepend "test? ( >=dev-ruby/hoe-2.3.2 virtual/ruby-test-unit )"
 
+RUBY_PATCHES=( "${P}+ruby-1.9.patch" )
+
 each_ruby_configure() {
 	${RUBY} -Cext/fast_xs extconf.rb || die "extconf.rb failed"
 	${RUBY} -Cext/fast_xs_extra extconf.rb || die "extconf.rb failed"
diff --git a/dev-ruby/fast_xs/files/fast_xs-0.8.0+ruby-1.9.patch b/dev-ruby/fast_xs/files/fast_xs-0.8.0+ruby-1.9.patch
new file mode 100644
index 000000000000..cdd72f2db3fb
--- /dev/null
+++ b/dev-ruby/fast_xs/files/fast_xs-0.8.0+ruby-1.9.patch
@@ -0,0 +1,23 @@
+Index: fast_xs-0.8.0/test/test_erb_util_module_overrides.rb
+===================================================================
+--- fast_xs-0.8.0.orig/test/test_erb_util_module_overrides.rb
++++ fast_xs-0.8.0/test/test_erb_util_module_overrides.rb
+@@ -35,11 +35,13 @@ class TestErbUtilModuleOverrides < Test:
+ 
+   def test_preserve_encoding
+     foo = "foo"
+-    foo.force_encoding Encoding::US_ASCII
+-    assert_equal Encoding::US_ASCII, url_encode(foo).encoding
+-    assert_equal Encoding::US_ASCII, html_escape(foo).encoding
+-    assert_equal Encoding::US_ASCII, u(foo).encoding
+-    assert_equal Encoding::US_ASCII, h(foo).encoding
++    ascii_encoding = (RUBY_VERSION =~ /1\.9/) ? Encoding::ASCII_8BIT : Encoding::US_ASCII
++
++    foo.force_encoding ascii_encoding
++    assert_equal ascii_encoding, url_encode(foo).encoding
++    assert_equal ascii_encoding, html_escape(foo).encoding
++    assert_equal ascii_encoding, u(foo).encoding
++    assert_equal ascii_encoding, h(foo).encoding
+ 
+     foo.force_encoding Encoding::BINARY
+     assert_equal Encoding::BINARY, url_encode(foo).encoding