Add patch to fix rudy.

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

4 files changed, 47 insertions, 7 deletions

diff --git a/dev-ruby/storable/ChangeLog b/dev-ruby/storable/ChangeLog
index efdb382ee64e..f63bac5e5441 100644
--- a/dev-ruby/storable/ChangeLog
+++ b/dev-ruby/storable/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/storable
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/storable/ChangeLog,v 1.5 2010/04/06 08:09:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/storable/ChangeLog,v 1.6 2010/04/06 08:48:36 flameeyes Exp $
+
+*storable-0.7.1-r1 (06 Apr 2010)
+
+  06 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -storable-0.7.1.ebuild, +storable-0.7.1-r1.ebuild,
+  +files/storable-0.7.1-emptysymbol.patch:
+  Add patch to fix rudy.
 
 *storable-0.7.1 (06 Apr 2010)
 
diff --git a/dev-ruby/storable/Manifest b/dev-ruby/storable/Manifest
index 34901dbf06fb..7229ffe97579 100644
--- a/dev-ruby/storable/Manifest
+++ b/dev-ruby/storable/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX storable-0.7.1-emptysymbol.patch 958 RMD160 138433956ab9c58bbd48c2c0776e3f09b5cfe263 SHA1 8bc2c3ca67d038b54c29189ad0487c12179a8330 SHA256 4f454413d5816457e80753959ba956167c18db68bd98a7914fd626144c4f0dd6
 DIST storable-0.6.3.gem 11776 RMD160 0db3a5b2e8f652499339eb8410d5b61d1d769b77 SHA1 90e61ca4648aca198e386afb8002e84355d3097c SHA256 0af90bfc17094879cc67ef72534dc69a05cf9f4a9a4124774a87527259df2099
 DIST storable-git-0.7.1.tgz 11907 RMD160 5f6e89d631eb7b57a95d579cf7143321cae68a24 SHA1 b4e799d129e560146b49e52edd5cb0bf25191681 SHA256 c3261a76bf90aaf6bc7e01376f3a24130c196de95afaf4e900081a71b628f34d
 EBUILD storable-0.6.3.ebuild 618 RMD160 c12a1c575c3400b88b951bd1c9eceac7d467122d SHA1 9625f4bc8e82506329b9140bd2c31983d9e47eef SHA256 557a28b84dfb308bf3fefac1006b56587c63ae96006f02714d271e1be7ed1ba5
-EBUILD storable-0.7.1.ebuild 938 RMD160 7b33059bc3cbfb6638155b2fbda68b8778a69c11 SHA1 1e1f4d483f928eba29ab82cf4cc89dc24ced13cb SHA256 4fa3c143115cda4492c93fdc7ea126655b76f211439f48ba73bc3f2697afd6fd
-MISC ChangeLog 1082 RMD160 d50b14e13eb30c53f4b47c0228cb0b4817635549 SHA1 4de9f47446d276f0ac1ba304d925555d11797025 SHA256 e7fa2f8bfc99e0548563b791193d3a7edfa67b82f0e5c97709330f8a0770c94f
+EBUILD storable-0.7.1-r1.ebuild 987 RMD160 2f81bdac41a9033a2c9b9a8ff020dad524ed378c SHA1 30bbe5db7cfdda1a7c186c3968f4e91f7eb877aa SHA256 6dfaf06d0169f92f3ef23b20ffeb0c5fe793164c42a4689c3bc8151eeab381b5
+MISC ChangeLog 1294 RMD160 3bbec94314e6f099fabd2aacf8699bd3f1087157 SHA1 d48adc2669e840e85173d346d2099c36b14131a9 SHA256 6e0d64f969d673590eb47da6fb31e5648cd992f62b35da215c346e37f3c69cd5
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku67CUACgkQAiZjviIA2XgpDgCfWEYH4F1ELQhtmkuVs29TgoVp
-E9kAoMwDNPe2z2cpkrf6vuNQGTyKodYT
-=/2Us
+iEYEARECAAYFAku69WwACgkQAiZjviIA2XgnxwCg8gT1Ktw9VMB6GOjCjBY1wnY3
+9HoAnA6casXlql8ETnEzgn6uSmztmq2p
+=TNpH
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/storable/files/storable-0.7.1-emptysymbol.patch b/dev-ruby/storable/files/storable-0.7.1-emptysymbol.patch
new file mode 100644
index 000000000000..eb036ecfb15c
--- /dev/null
+++ b/dev-ruby/storable/files/storable-0.7.1-emptysymbol.patch
@@ -0,0 +1,30 @@
+From 2e458688a077412bb1d050f5e9ca1edeb8d89bb0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Tue, 6 Apr 2010 10:31:24 +0200
+Subject: [PATCH] Handle empty symbols alike to the old Storable 0.6.4.
+
+Without this, rudy 0.9.8 aborts for me with:
+
+ERROR (ArgumentError): interning empty string
+
+because there it tries to create a symbol from an empty string.
+---
+ lib/storable.rb |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/storable.rb b/lib/storable.rb
+index 45a4d34..9d7c958 100644
+--- a/lib/storable.rb
++++ b/lib/storable.rb
+@@ -178,7 +178,7 @@ class Storable
+       
+       next if value_orig.nil?
+       
+-      if ftype == String && value_orig.to_s.empty?
++      if ( ftype == String or ftype == Symbol ) && value_orig.to_s.empty?
+         value = ''
+       elsif ftype == Array
+         value = Array === value_orig ? value_orig : [value_orig]
+-- 
+1.7.0.4
+
diff --git a/dev-ruby/storable/storable-0.7.1.ebuild b/dev-ruby/storable/storable-0.7.1-r1.ebuild
index b67382904ad8..c0dffe37a701 100644
--- a/dev-ruby/storable/storable-0.7.1.ebuild
+++ b/dev-ruby/storable/storable-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/storable/storable-0.7.1.ebuild,v 1.1 2010/04/06 08:09:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/storable/storable-0.7.1-r1.ebuild,v 1.1 2010/04/06 08:48:36 flameeyes Exp $
 
 EAPI=2
 
@@ -29,6 +29,8 @@ ruby_add_bdepend test dev-ruby/tryouts
 
 all_ruby_prepare() {
 	mv bin examples || die
+
+	epatch "${FILESDIR}"/${P}-emptysymbol.patch
 }
 
 each_ruby_test() {