Add a patch to fix regexp encoding issues. Add ruby20.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 70 insertions, 5 deletions

diff --git a/dev-ruby/simple-rss/ChangeLog b/dev-ruby/simple-rss/ChangeLog
index bc5ffeed7e91..b33ac453b525 100644
--- a/dev-ruby/simple-rss/ChangeLog
+++ b/dev-ruby/simple-rss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/simple-rss
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/simple-rss/ChangeLog,v 1.12 2013/07/03 06:01:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/simple-rss/ChangeLog,v 1.13 2013/07/25 12:59:33 graaff Exp $
+
+*simple-rss-1.2.3-r2 (25 Jul 2013)
+
+  25 Jul 2013; Hans de Graaff <graaff@gentoo.org> +simple-rss-1.2.3-r2.ebuild,
+  +files/simple-rss-1.2.3-utf8.patch:
+  Add a patch to fix regexp encoding issues. Add ruby20.
 
   03 Jul 2013; Hans de Graaff <graaff@gentoo.org> -simple-rss-1.2.3.ebuild:
   Cleanup.
diff --git a/dev-ruby/simple-rss/Manifest b/dev-ruby/simple-rss/Manifest
index c20be6b56147..cf2b34318e2c 100644
--- a/dev-ruby/simple-rss/Manifest
+++ b/dev-ruby/simple-rss/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA256
 
 AUX simple-rss-1.2.3-no-media-rss.patch 2432 SHA256 21218720f613066b3edbf021b0e4be81a87344b7660ac0278bca2187b63fed32 SHA512 6885cbefdd26bb89fd2e0eb0dae1134f162b9fb5508213494ee4564cd14b81f1eca88499c909f07595adc19df964f79a9f71b8c0b3c5b4cf15ea5c658ee6570e WHIRLPOOL 11ac116402ae22cc4053fdfcac35b0e6e956b5081b020213f1c4d8376f4caf15f6a88f3d4f20d8b8b8f502141a56867a0f8fe95e46804bd8b361e460738eaab1
+AUX simple-rss-1.2.3-utf8.patch 1007 SHA256 c0c0f87b0056a2c6ff107e9af19b2555894ce5f458645bd016779bbbf94dff8c SHA512 808ef500ebcb8df1707b9b71103263c44f5052dce00ac34cca7b536eae440de37177a8b59483ec4e6b41933ab4c1638154c2618df0a7a0f1df0edffc140299eb WHIRLPOOL f010687ca710f3c619327fb2824a6601341f135c739cdd89d98d9ff635b7e90e57cfb85d6513184cd86cf14d754753df20f71ae75b5f8c9b0d1892fd0fda5418
 DIST simple-rss-1.2.3.gem 32256 SHA256 dc0673e66692099f9a106d2a78f8d7aabb4636f0456124dad67e0300179eb3af SHA512 ecbc397fed1360cd09a33913cfda448b39ab273dbe0f61a2bbec7cb60e69baa0476b3ded37a674e21ffd8e957f3afb0b4f97770763c451dd61abaf507c266fdb WHIRLPOOL c9d978b2e8f484e17b874cb8d1dad060da34b2d61d2d4f4dbad5a21683cb2db1b78c0cb313fd441196c8b00da2d0167273d3b5231c465bc81935ea75a7c5f29e
 EBUILD simple-rss-1.2.3-r1.ebuild 637 SHA256 46ffdef56887f892f18a079b9311addd0cab62376e965dd2e8044e927f8b92b9 SHA512 53d42faa28fa731b5f42975a1bfed7d7e7828bce29fe493cc9a9b49f7060191ef12296acb6765490acad4fa230c6821e3eb10b45224ca17a29beab9eb4bf1b74 WHIRLPOOL d6793c9c3211ab119f18917287c11b8cab4a1ef04d89b077e8456bce959bf75df5bb95124c83b1dd52ee163c1103ee0f3feef9a78183023d41ce27c094c5a6ac
-MISC ChangeLog 1749 SHA256 fe2b9625d220479c44444e9234aa22ecbde8f0f754728f0b2d92194f7e3951dc SHA512 feeab5b24e20860588dcc04bf350f1071892d310fdf1468ce6c04113f28a500b8d5a6038f898d5047e5f36528c92ca00690118808dba31d31bbfccc8c1b9093b WHIRLPOOL 2053038ed723a89fd22a80627c43871fd5d4fedc163994ee2d510b4f32434dd5964f066ba8b12cad7fb77961a0417b2a1cd919ef8d2ed00c74cd9e93c6092030
+EBUILD simple-rss-1.2.3-r2.ebuild 661 SHA256 dac046fb6ad64d4b7070fb83a9359493274f2c01239f2dec5de6a1a771abfff8 SHA512 0fecf3da25b1d35d69a246882fa86c0d8c96641fd6136d636abda197d685d968bac79aca0b4fd37cdcde9a410f3ae04e91cb6e5eca95b46d3b81909f413a7c36 WHIRLPOOL f52f6dda5664bbcd175c89de64fee8b6e6a701eadd4760d31c5b93f9eb9e0d8728e41a165242b89d00396580e7646449a68a48be16705dcd2c8c22566af853c5
+MISC ChangeLog 1960 SHA256 d59db642429578193bb7fddc52eb0e5ee6de1d477398beaa08f2d829214ca1da SHA512 4ed6539df994a21ffa54fe254a634bf5c84861eb412bb0b12daa04b3b14268fa97d7b51c4dadb6b571b33e670996e9036be377163e9b03f7634db269f89e685b WHIRLPOOL 0bfc925ef964ac8148ebd2bdf0463c6ae1cf484d0843ab638b890833c18b6d3d125fb27df2c1c6c0a0981983321e9ab1d5470660042880c2dca61917545fe7e5
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHTvkEACgkQiIP6VqMIqNfnNgEAh75zfDVdjFRavQYv1SCl5at3
-/zkg+ninwsfrw0i66wMA/2d0LS5vibXpkc5Gvz5BzaDgIgJC6GAKhcBG8mzn/P5p
-=oWxT
+iF4EAREIAAYFAlHxIUIACgkQiIP6VqMIqNfvTAD/dUO5Fs+eojnsna0saoYthsBh
+Y+pHhknhjjxg08WZmmcA/R5YCpa9ln5QEbndoEIHMZcbTNQjWO1KWpyALtJtw55r
+=5vlB
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/simple-rss/files/simple-rss-1.2.3-utf8.patch b/dev-ruby/simple-rss/files/simple-rss-1.2.3-utf8.patch
new file mode 100644
index 000000000000..4be17b7276bb
--- /dev/null
+++ b/dev-ruby/simple-rss/files/simple-rss-1.2.3-utf8.patch
@@ -0,0 +1,34 @@
+commit ef0d5db568faa75073a43f45d5f544d4414a8ea3
+Author: Lucas Carlson <lucas@rufy.com>
+Date:   Tue Aug 24 14:42:26 2010 -0700
+
+    Adding support for regex of UTF8 characters
+
+Note that we also applied the change in 
+http://hightechsorcery.com/2011/04/fixing-a-bug-in-simple-rss/
+
+This effectively does not force an encoding for the regexp.
+
+diff --git a/lib/simple-rss.rb b/lib/simple-rss.rb
+index 38a5623..fc375ab 100644
+--- a/lib/simple-rss.rb
++++ b/lib/simple-rss.rb
+@@ -152,13 +152,13 @@ class SimpleRSS
+ 	end
+ 	
+   def unescape(content)
+-  	if content =~ /([^-_.!~*'()a-zA-Z\d;\/?:@&=+$,\[\]]%)/n then
+-  		CGI.unescape(content).gsub(/(<!\[CDATA\[|\]\]>)/,'').strip
++  	if content =~ /([^-_.!~*'()a-zA-Z\d;\/?:@&=+$,\[\]]%)/ then
++  		CGI.unescape(content).gsub(/(<!\[CDATA\[|\]\]>)/,'').strip
+   	else
+-  		content.gsub(/(<!\[CDATA\[|\]\]>)/,'').strip
++  		content.gsub(/(<!\[CDATA\[|\]\]>)/,'').strip
+   	end
+   end
+ end
+ 
+ class SimpleRSSError < StandardError
+-end
+\ No newline at end of file
++end
diff --git a/dev-ruby/simple-rss/simple-rss-1.2.3-r2.ebuild b/dev-ruby/simple-rss/simple-rss-1.2.3-r2.ebuild
new file mode 100644
index 000000000000..32a78e6e0971
--- /dev/null
+++ b/dev-ruby/simple-rss/simple-rss-1.2.3-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/simple-rss/simple-rss-1.2.3-r2.ebuild,v 1.1 2013/07/25 12:59:33 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple RSS is a simple, flexible, extensible, and liberal RSS and
+Atom reader for Ruby."
+HOMEPAGE="http://simple-rss.rubyforge.org/"
+LICENSE="LGPL-2"
+
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+SLOT="0"
+IUSE=""
+
+RUBY_PATCHES=( "${P}-no-media-rss.patch" "${P}-utf8.patch" )